cleaning up some more sd files

digdir · Jun 6, 2024 · fc9f330 · fc9f330
1 parent 4589ff9
commit fc9f330
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/packages/cli/src/tokens/actions.ts b/packages/cli/src/tokens/actions.ts
@@ -6,14 +6,19 @@ import * as R from 'ramda';
 
 export const makeEntryFile: Action = {
   name: 'make_entryfile',
-  do: async function (dictionary, config) {
-    console.log(chalk.green('Creating entry file'));
-    const { outPath, folderName } = config;
-    const files = await glob(`**/*`, { cwd: config.buildPath });
+  do: async function (dictionary, platform) {
+    const { outPath, theme } = platform;
+
+    const writePath = `${outPath}/${theme}.css`;
+
+    console.log(chalk.green(`Creating entry file: ${writePath}`));
+
+    const files = await glob(`**/*`, { cwd: platform.buildPath });
     const content = R.reverse(R.sortBy(R.includes('light'), files))
-      .map((file) => `@import url('./${folderName}/${file}');`)
+      .map((file) => `@import url('./${theme}/${file}');`)
       .join('\n');
-    await fs.writeFile(`${outPath}/${folderName}.css`, content);
+
+    await fs.writeFile(writePath, content);
   },
   undo: async function noOp() {},
 };
diff --git a/packages/cli/src/tokens/build.ts b/packages/cli/src/tokens/build.ts
@@ -16,6 +16,8 @@ type Options = {
   preview: boolean;
 };
 
+// type FormattedCSSPlatform = { css: { output: string; destination: string }[] };
+
 const sd = new StyleDictionary();
 
 export async function run(options: Options): Promise<void> {

diff --git a/packages/cli/src/tokens/configs.ts b/packages/cli/src/tokens/configs.ts
@@ -71,8 +71,7 @@ export const tokensConfig: GetConfig = ({ mode = 'light', outPath, theme }) => {
         // custom
         outPath,
         mode,
-        fileName: mode,
-        folderName: theme,
+        theme,
         basePxFontSize,
         selector,
         //
@@ -176,7 +175,7 @@ export const getConfigs = (
 
       const [mode, theme, semantic, fontSize, typography] = processThemeName(name);
 
-      console.log({ mode, theme, semantic, fontSize, typography });
+      // console.log({ mode, theme, semantic, fontSize, typography });
 
       const paritionPrimitives = /(?!.*global\.json).*primitives.*/;
       const [source, include] = R.partition(R.test(paritionPrimitives), setsWithPaths);

diff --git a/packages/cli/src/tokens/formats/css-classes.ts b/packages/cli/src/tokens/formats/css-classes.ts
@@ -9,8 +9,6 @@ type Typgraphy = {
   fontFamily: string;
 };
 
-// const isTransformedToken = (token: TransformedTokens): token is TransformedToken => token;
-
 /**
  * Creates CSS classes from typography tokens
  */
@@ -20,6 +18,8 @@ export const cssClasses: Format = {
     const { usesDtcg } = options;
     const { basePxFontSize } = platform;
 
+    const header = await fileHeader({ file });
+
     const classNames = R.map((token) => {
       if (!Array.isArray(token)) {
         const typography = (usesDtcg ? token.$value : token.value) as Typgraphy;
@@ -28,8 +28,7 @@ export const cssClasses: Format = {
         const fontSize = `${parseInt(typography.fontSize) / baseFontPx}rem`;
         const selector = R.replace('-typography', '', token.name);
 
-        const className = `
-  .${selector} {
+        const className = `.${selector} {
     font-size: ${fontSize};
     line-height: ${typography?.lineHeight};
     font-weight: ${typography?.fontWeight};
@@ -39,10 +38,6 @@ export const cssClasses: Format = {
       }
     }, dictionary.allTokens);
 
-    return fileHeader({ file }).then(
-      (fileHeaderText) => `${fileHeaderText}@layer ds.typography {
-${classNames.join('\n')}
-}\n`,
-    );
+    return header + `@layer ds.typography {\n${classNames.join('\n')}\n}\n`;
   },
 };
diff --git a/packages/cli/src/tokens/formats/css-variables.ts b/packages/cli/src/tokens/formats/css-variables.ts
@@ -1,9 +1,6 @@
 import type { Format } from 'style-dictionary/types';
 import { fileHeader, createPropertyFormatter } from 'style-dictionary/utils';
 
-/**
- *  CSS variables format with option to include source references for matched token through `options.referencesFilter`
- */
 export const cssVariables: Format = {
   name: 'ds/css-variables',
   format: async function ({ dictionary, file, options, platform }) {
@@ -19,12 +16,8 @@ export const cssVariables: Format = {
       format: 'css',
     });
 
-    const tokens = allTokens.map(format);
+    const formattedVariables = allTokens.map(format);
 
-    return `
-${header}
-${selector} {
-${tokens.join('\n')}
-}\n`;
+    return header + `${selector} {\n${formattedVariables.join('\n')}\n}\n`;
   },
 };