cleanup, prettier

mjnichols12 · Dec 16, 2020 · 8c1884d · 8c1884d
1 parent 511576c
commit 8c1884d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/build/scss.js b/build/scss.js
@@ -1,23 +1,21 @@
 import { writeFile } from "fs";
 import { colors, themes } from "../dist/colors.modern.js";
 function generateThemeVars(theme) {
-    let data = "";
-    for (const [key] of Object.entries(theme.variables)) {
-        data += `  --calcite-ui-${key}: #{$ui-${key}-${theme.name}};\n`;
-    }
-    return data;
+    return Object.entries(theme.variables).map(([key, value]) => `$ui-${key}-${theme.name}: ${value};\n`).join("");
+}
+function generateTheme(theme) {
+    return `${generateThemeVars(theme)}\n@mixin calcite-theme-${theme.name}() {\n${generateCSSThemeVars(theme)}}\n`;
+}
+function generateCSSThemeVars(theme) {
+    return Object.entries(theme.variables).map(([key]) => `  --calcite-ui-${key}: #{$ui-${key}-${theme.name}};\n`).join("");
+}
+function generateColors() {
+    return Object.entries(colors).map(([key, value]) => `$${key}: ${value};\n`).join("");
+}
+function generateThemes() {
+    return themes.map((theme) => generateTheme(theme)).join("");
 }
 function generateData() {
-    let data = "";
-    for (const [key, value] of Object.entries(colors)) {
-        data += `$${key}: ${value};\n`;
-    }
-    themes.forEach((theme) => {
-        for (const [key, value] of Object.entries(theme.variables)) {
-            data += `$ui-${key}-${theme.name}: ${value};\n`;
-        }
-        data += `\n@mixin calcite-theme-${theme.name}() {\n${generateThemeVars(theme)}}\n`;
-    });
-    return data;
+    return `${generateColors()}${generateThemes()}`;
 }
 writeFile("dist/colors.scss", generateData(), () => { });
diff --git a/build/scss.ts b/build/scss.ts
@@ -2,32 +2,35 @@ import { writeFile } from "fs";
 import { colors, themes, CalciteTheme } from "../dist/colors.modern.js";
 
 function generateThemeVars(theme: CalciteTheme): string {
-  let data: string = "";
-
-  for (const [key] of Object.entries(theme.variables)) {
-    data += `  --calcite-ui-${key}: #{$ui-${key}-${theme.name}};\n`;
-  }
-
-  return data;
+  return Object.entries(theme.variables)
+    .map(([key, value]) => `$ui-${key}-${theme.name}: ${value};\n`)
+    .join("");
 }
 
-function generateData(): string {
-  let data: string = "";
-
-  for (const [key, value] of Object.entries(colors)) {
-    data += `$${key}: ${value};\n`;
-  }
+function generateTheme(theme: CalciteTheme): string {
+  return `${generateThemeVars(theme)}\n@mixin calcite-theme-${
+    theme.name
+  }() {\n${generateCSSThemeVars(theme)}}\n`;
+}
 
-  themes.forEach((theme) => {
+function generateCSSThemeVars(theme: CalciteTheme): string {
+  return Object.entries(theme.variables)
+    .map(([key]) => `  --calcite-ui-${key}: #{$ui-${key}-${theme.name}};\n`)
+    .join("");
+}
 
-    for (const [key, value] of Object.entries(theme.variables)) {
-      data += `$ui-${key}-${theme.name}: ${value};\n`;
-    }
+function generateColors(): string {
+  return Object.entries(colors)
+    .map(([key, value]) => `$${key}: ${value};\n`)
+    .join("");
+}
 
-    data += `\n@mixin calcite-theme-${theme.name}() {\n${generateThemeVars(theme)}}\n`;
-  });
+function generateThemes(): string {
+  return themes.map((theme: CalciteTheme) => generateTheme(theme)).join("");
+}
 
-  return data;
+function generateData(): string {
+  return `${generateColors()}${generateThemes()}`;
 }
 
 writeFile("dist/colors.scss", generateData(), () => {});
diff --git a/src/colors.ts b/src/colors.ts
@@ -349,7 +349,7 @@ export const chartColorSets: ChartColorSet[] = [
   },
 ];
 
-export const colors: Record<string, string>  = {
+export const colors: Record<string, string> = {
   "h-yy-010": "#fff7cc",
   "h-yy-020": "#fef3ad",
   "h-yy-030": "#fcee8d",