From 19d2f90cea2f9486e678adff77d3f4d68ccd7083 Mon Sep 17 00:00:00 2001 From: Lukas Oppermann Date: Thu, 25 Apr 2024 11:57:21 +0200 Subject: [PATCH] f --- src/PrimerStyleDictionary.ts | 10 +++++----- ...cssMediaQuery.test.ts => cssAdvanced.test.ts} | 16 ++++++++-------- src/formats/{cssMediaQuery.ts => cssAdvanced.ts} | 2 +- src/formats/cssThemed.test.ts | 8 ++++---- src/formats/cssVariables.test.ts | 8 ++++---- src/formats/index.ts | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) rename src/formats/{cssMediaQuery.test.ts => cssAdvanced.test.ts} (90%) rename src/formats/{cssMediaQuery.ts => cssAdvanced.ts} (98%) diff --git a/src/PrimerStyleDictionary.ts b/src/PrimerStyleDictionary.ts index e7da1956d..25cd250b7 100644 --- 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 b/src/formats/cssAdvanced.test.ts similarity index 90% rename from src/formats/cssMediaQuery.test.ts rename to src/formats/cssAdvanced.test.ts index 3084bb874..58fb31013 100644 --- a/src/formats/cssMediaQuery.test.ts +++ b/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 b/src/formats/cssAdvanced.ts similarity index 98% rename from src/formats/cssMediaQuery.ts rename to src/formats/cssAdvanced.ts index a85bc1fbc..8e0c6c854 100644 --- a/src/formats/cssMediaQuery.ts +++ b/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 index 6ed4b4057..fca95fc39 100644 --- 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 index 4ac203fb7..3ae304a62 100644 --- 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 index 1697588a5..480d276cf 100644 --- 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'