f

primer · Apr 25, 2024 · 19d2f90 · 19d2f90
1 parent eb81e99
commit 19d2f90
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/src/PrimerStyleDictionary.ts b/src/PrimerStyleDictionary.ts
@@ -33,7 +33,7 @@ import {
   cssCustomMedia,
   jsonOneDimensional,
   jsonPostCssFallback,
-  cssMediaQuery,
+  cssAdvanced,
   jsonFigma,
 } from './formats'
 
@@ -48,13 +48,13 @@ StyleDictionary.registerParser(w3cJsonParser)
  *
  */
 StyleDictionary.registerFormat({
-  name: 'css/customMedia',
-  formatter: cssCustomMedia,
+  name: 'css/advanced',
+  formatter: cssAdvanced,
 })
 
 StyleDictionary.registerFormat({
-  name: 'css/mediaQuery',
-  formatter: cssMediaQuery,
+  name: 'css/customMedia',
+  formatter: cssCustomMedia,
 })
 
 StyleDictionary.registerFormat({

diff --git a/src/formats/cssMediaQuery.test.ts → src/formats/cssAdvanced.test.ts b/src/formats/cssMediaQuery.test.ts → src/formats/cssAdvanced.test.ts
@@ -1,4 +1,4 @@
-import {cssMediaQuery} from './cssMediaQuery'
+import {cssAdvanced} from './cssAdvanced'
 import {getMockDictionary, getMockFormatterArguments, getMockToken} from '../test-utilities'
 import {format} from 'prettier'
 import type {TransformedToken} from 'style-dictionary'
@@ -12,7 +12,7 @@ describe('Format: tokens nested in media query', () => {
       }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Wrap all tokens in screen media query', () => {
@@ -37,7 +37,7 @@ describe('Format: tokens nested in media query', () => {
       }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Ignore if no matching media query is found', () => {
@@ -55,7 +55,7 @@ describe('Format: tokens nested in media query', () => {
         },
       },
     })
-    expect(cssMediaQuery(input)).toStrictEqual('')
+    expect(cssAdvanced(input)).toStrictEqual('')
   })
 
   it('Wraps in defined media query if files match', () => {
@@ -91,7 +91,7 @@ describe('Format: tokens nested in media query', () => {
       }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Show comment if option.description is true', () => {
@@ -131,7 +131,7 @@ describe('Format: tokens nested in media query', () => {
       }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Hides comment if option.description is false or not set', () => {
@@ -197,7 +197,7 @@ describe('Format: tokens nested in media query', () => {
       }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
-    expect(cssMediaQuery(inputUnset)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(inputUnset)).toStrictEqual(expectedOutput)
   })
 })
diff --git a/src/formats/cssMediaQuery.ts → src/formats/cssAdvanced.ts b/src/formats/cssMediaQuery.ts → src/formats/cssAdvanced.ts
@@ -12,7 +12,7 @@ const wrapWithSelector = (css: string, selector: string | false): string => {
   return `${selector} { ${css} }`
 }
 
-export const cssMediaQuery: StyleDictionary.Formatter = ({
+export const cssAdvanced: StyleDictionary.Formatter = ({
   dictionary: originalDictionary,
   options = {
     queries: [],

diff --git a/src/formats/cssThemed.test.ts b/src/formats/cssThemed.test.ts
@@ -1,4 +1,4 @@
-import {cssMediaQuery} from './cssMediaQuery'
+import {cssAdvanced} from './cssAdvanced'
 import {getMockFormatterArguments} from '../test-utilities'
 import {format} from 'prettier'
 
@@ -14,7 +14,7 @@ describe('Format: Css Themed', () => {
         printWidth: 500,
       },
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with custom selectors', () => {
@@ -48,7 +48,7 @@ describe('Format: Css Themed', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with only one selector', () => {
@@ -72,6 +72,6 @@ describe('Format: Css Themed', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 })
diff --git a/src/formats/cssVariables.test.ts b/src/formats/cssVariables.test.ts
@@ -1,4 +1,4 @@
-import {cssMediaQuery} from './cssMediaQuery'
+import {cssAdvanced} from './cssAdvanced'
 import {getMockFormatterArguments} from '../test-utilities'
 import {format} from 'prettier'
 
@@ -14,7 +14,7 @@ describe('Format: css/variables', () => {
         printWidth: 500,
       },
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with custom selectors', () => {
@@ -33,7 +33,7 @@ describe('Format: css/variables', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 
   it('Formats tokens with only options.selector', () => {
@@ -52,6 +52,6 @@ describe('Format: css/variables', () => {
     }`,
       {parser: 'css', printWidth: 500},
     )
-    expect(cssMediaQuery(input)).toStrictEqual(expectedOutput)
+    expect(cssAdvanced(input)).toStrictEqual(expectedOutput)
   })
 })
diff --git a/src/formats/index.ts b/src/formats/index.ts
@@ -1,5 +1,5 @@
 export {cssCustomMedia} from './cssCustomMedia'
-export {cssMediaQuery} from './cssMediaQuery'
+export {cssAdvanced} from './cssAdvanced'
 export {jsonFigma} from './jsonFigma'
 export {javascriptCommonJs} from './javascriptCommonJs'
 export {javascriptEsm} from './javascriptEsm'