fixup! Feat(exporters): Variables exporter export new token structure…

… #DS-1435

exporters/variables-scss/generated/exporter.cjs

@@ -3445,6 +3445,11 @@ ${r}) !default;
         /\n{3,}/g,
         `
 
+`,
+      )),
+      (y = y.replace(
+        /\n{2,}$/,
+        `
 `,
       )),
       y

exporters/variables-scss/src/content/__fixtures__/formattedExample.scss

@@ -0,0 +1,5 @@
+$my-var: (
+    color: #000,
+    background: #fff,
+    border: 1px solid #000,
+) !default;

exporters/variables-scss/src/content/__fixtures__/unformattedExample.scss

@@ -0,0 +1,5 @@
+$my-var: (
+    color: #000,
+    background: #fff,
+    border: 1px solid #000,
+) !default;

exporters/variables-scss/src/content/formatters/__tests__/cssFormatter.test.ts

@@ -1,19 +1,16 @@
+import fs from 'fs';
+import path from 'path';
 import { formatCSS } from '../cssFormatter';
 
-const mockedCSS = `$my-var: (
-color: #000,
-background: #fff,
-border: 1px solid #000
-) !default;`;
+const mockedUnformattedCSS = fs.readFileSync(
+  path.join(__dirname, '../../__fixtures__/unformattedExample.scss'),
+  'utf-8',
+);
 
-const mockedFormattedCSS = `$my-var: (
-    color: #000,
-    background: #fff,
-    border: 1px solid #000
-) !default;\n`;
+const mockedFormattedCSS = fs.readFileSync(path.join(__dirname, '../../__fixtures__/formattedExample.scss'), 'utf-8');
 
 describe('formatCSS', () => {
   it('should correctly format CSS string', () => {
-    expect(formatCSS(mockedCSS)).toBe(mockedFormattedCSS);
+    expect(formatCSS(mockedUnformattedCSS)).toBe(mockedFormattedCSS);
   });
 });

exporters/variables-scss/src/content/formatters/cssFormatter.ts

@@ -19,5 +19,8 @@ export const formatCSS = (css: string): string => {
   // Remove extra blank lines
   formattedCSS = formattedCSS.replace(/\n{3,}/g, '\n\n');
 
+  // Replace two or more new lines at the end of the file with a single new line
+  formattedCSS = formattedCSS.replace(/\n{2,}$/, '\n');
+
   return formattedCSS;
 };

exporters/variables-scss/src/content/generators/__tests__/cssGenerator.test.ts

@@ -1,6 +1,6 @@
 import { DimensionToken, StringToken, Token, TokenGroup, TokenType } from '@supernovaio/sdk-exporters';
 import { generateCssFromTokens, tokenToCSSByType } from '../cssGenerator';
-import { exampleMockedGroups, exampleMockedTokens } from './mockedExampleTokens';
+import { exampleMockedGroups, exampleMockedTokens } from '../../__fixtures__/mockedExampleTokens';
 
 const mappedTokens: Map<string, Token> = new Map([]);
 const tokenGroups: Array<TokenGroup> = exampleMockedGroups;

exporters/variables-scss/src/content/generators/__tests__/cssObjectGenerator.test.ts

@@ -1,6 +1,6 @@
 import { Token, TokenGroup } from '@supernovaio/sdk-exporters';
 import { generateCssObjectFromTokens, generateObjectContent } from '../cssObjectGenerator';
-import { exampleMockedGroups, exampleMockedTokens } from './mockedExampleTokens';
+import { exampleMockedGroups, exampleMockedTokens } from '../../__fixtures__/mockedExampleTokens';
 
 const mappedTokens: Map<string, Token> = new Map([]);
 const tokenGroups: Array<TokenGroup> = exampleMockedGroups;

exporters/variables-scss/src/content/helpers/__tests__/tokenHelper.test.ts

@@ -1,6 +1,6 @@
 import { Token, TokenGroup } from '@supernovaio/sdk-exporters';
 import { tokenVariableName } from '../tokenHelper';
-import { exampleMockedGroups, exampleMockedTokens } from '../../generators/__tests__/mockedExampleTokens';
+import { exampleMockedGroups, exampleMockedTokens } from '../../__fixtures__/mockedExampleTokens';
 
 describe('tokenHelper', () => {
   it('should return the expected variable name for exampleToken', () => {