@yamada-ui/cli 1.2.1 → 1.2.2-dev-20241010145523

package/dist/command/theme/index.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
@@ -44,12 +44,6 @@ __export(theme_exports, {
 });
 module.exports = __toCommonJS(theme_exports);
 init_cjs_shims();
-var import_dns = __toESM(require("dns"));
-var import_fs2 = require("fs");
-var import_promises = require("fs/promises");
-var import_node_stream = require("stream");
-var import_promises2 = require("stream/promises");
-var import_path2 = __toESM(require("path"));
 var p = __toESM(require("@clack/prompts"));
 
 // ../../node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js
@@ -548,6 +542,12 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/command/theme/index.ts
+var import_dns = __toESM(require("dns"));
+var import_fs2 = require("fs");
+var import_promises = require("fs/promises");
+var import_node_stream = require("stream");
+var import_promises2 = require("stream/promises");
+var import_path2 = __toESM(require("path"));
 var import_tar = require("tar");
 var import_typescript = require("typescript");
 
@@ -575,7 +575,10 @@ init_cjs_shims();
 var import_fs = __toESM(require("fs"));
 var isWriteable = async (directory) => {
   try {
-    await import_fs.default.promises.access(directory, (import_fs.default.constants || import_fs.default).W_OK);
+    await import_fs.default.promises.access(
+      directory,
+      ("constants" in import_fs.default ? import_fs.default.constants : import_fs.default).W_OK
+    );
     return true;
   } catch {
     return false;
@@ -586,7 +589,7 @@ var isWriteable = async (directory) => {
 var ORG_NAME = "yamada-ui";
 var REPO_NAME = "yamada-ui";
 var DEFAULT_BRANCH_NAME = "main";
-var isOnline = () => {
+var isOnline = async () => {
   return new Promise((resolve) => {
     import_dns.default.lookup("github.com", (err) => {
       if (err && err.code === "ENOTFOUND") {
@@ -641,9 +644,9 @@ var getFileMap = async (cwd, branch) => {
     (0, import_tar.t)({
       cwd,
       filter,
-      onReadEntry,
+      newer: true,
       strip: 4,
-      newer: true
+      onReadEntry
     })
   );
   return fileMap;

package/dist/command/tokens/create-theme-typings.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
@@ -50,6 +50,13 @@ init_cjs_shims();
 var isObject = (obj) => obj !== null && (typeof obj === "object" || typeof obj === "function") && !isArray(obj);
 var isArray = (value) => Array.isArray(value);
 
+// src/utils/object.ts
+init_cjs_shims();
+var getObject = (obj, path2) => {
+  const keys = path2.split(".");
+  return keys.reduce((obj2, key) => obj2[key] ?? {}, obj);
+};
+
 // src/utils/prettier.ts
 init_cjs_shims();
 var import_path = __toESM(require("path"));
@@ -69,13 +76,6 @@ var prettier = async (content, options) => {
   }
 };
 
-// src/utils/object.ts
-init_cjs_shims();
-var getObject = (obj, path2) => {
-  const keys = path2.split(".");
-  return keys.reduce((obj2, key) => obj2[key] ?? {}, obj);
-};
-
 // src/command/tokens/config.ts
 init_cjs_shims();
 var config = [
@@ -111,18 +111,15 @@ var printComponent = (components) => `components: { ${Object.entries(components)
 var print = (unions) => Object.entries(unions).sort(([a], [b]) => a.localeCompare(b)).map(
   ([key, union]) => `${key}: ${union.map((value) => `"${value}"`).concat(["(string & {})"]).join(" | ")};`
 ).join("\n");
-var extractComponents = ({ components = {} }) => Object.entries(components).reduce(
-  (obj, [key, { sizes, variants }]) => {
-    if (sizes || variants) {
-      obj[key] = {
-        sizes: Object.keys(sizes ?? {}),
-        variants: Object.keys(variants ?? {})
-      };
-    }
-    return obj;
-  },
-  {}
-);
+var extractComponents = ({ components = {} }) => Object.entries(components).reduce((obj, [key, { sizes, variants }]) => {
+  if (sizes || variants) {
+    obj[key] = {
+      sizes: Object.keys(sizes ?? {}),
+      variants: Object.keys(variants ?? {})
+    };
+  }
+  return obj;
+}, {});
 var isTone = (value) => {
   if (!isObject(value)) return false;
   const keys = Object.keys(value);
@@ -132,13 +129,13 @@ var extractColorSchemes = (theme) => {
   const { colors, semantics } = theme;
   let colorSchemes = [];
   let colorSchemeColors = [];
-  if (!isObject(colors)) return { colorSchemes, colorSchemeColors };
+  if (!isObject(colors)) return { colorSchemeColors, colorSchemes };
   Object.entries(colors).forEach(([key, value]) => {
     if (!isTone(value)) return;
     colorSchemes.push(key);
   });
   if (!isObject(semantics?.colorSchemes))
-    return { colorSchemes, colorSchemeColors };
+    return { colorSchemeColors, colorSchemes };
   Object.entries(semantics.colorSchemes).forEach(([key, value]) => {
     if (isTone(value)) {
       colorSchemes.push(key);
@@ -150,7 +147,7 @@ var extractColorSchemes = (theme) => {
       colorSchemeColors.push(...TONES.map((tone) => `${key}.${tone}`));
     }
   });
-  return { colorSchemes, colorSchemeColors };
+  return { colorSchemeColors, colorSchemes };
 };
 var extractThemeSchemes = (theme) => {
   const { themeSchemes } = theme;
@@ -190,10 +187,10 @@ var createThemeTypings = async (theme, { responsive = false }) => {
   const tokens = config.reduce(
     (prev, {
       key,
-      replaceKey,
+      flatMap = (value) => value,
       maxScanDepth,
       omitScanKeys,
-      flatMap = (value) => value
+      replaceKey
     }) => {
       const target = getObject(theme, key);
       prev[replaceKey ?? key] = [];
@@ -213,7 +210,7 @@ var createThemeTypings = async (theme, { responsive = false }) => {
           omitScanKeys,
           shouldProcess
         ).flatMap(flatMap);
-        prev[replaceKey ?? key].push(...semanticKeys);
+        prev[replaceKey ?? key]?.push(...semanticKeys);
       }
       return prev;
     },
@@ -221,10 +218,10 @@ var createThemeTypings = async (theme, { responsive = false }) => {
   );
   const textStyles = extractKeys(theme, "styles.textStyles");
   const layerStyles = extractKeys(theme, "styles.layerStyles");
-  const { colorSchemes, colorSchemeColors } = extractColorSchemes(theme);
+  const { colorSchemeColors, colorSchemes } = extractColorSchemes(theme);
   const themeSchemes = extractThemeSchemes(theme);
   const components = extractComponents(theme);
-  tokens.colors = [...tokens.colors, ...colorSchemeColors];
+  tokens.colors = [...tokens.colors ?? [], ...colorSchemeColors];
   return prettier(
     [
       `import type { UITheme } from './ui-theme.types'`,
@@ -232,9 +229,9 @@ var createThemeTypings = async (theme, { responsive = false }) => {
       `export interface GeneratedTheme extends UITheme {`,
       print({
         ...tokens,
-        textStyles,
-        layerStyles,
         colorSchemes,
+        layerStyles,
+        textStyles,
         themeSchemes
       }),
       printComponent(components),

package/dist/command/tokens/index.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.0.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.0_@swc+core@1.7.26_@swc+helpers@0.5.5__jiti@2.3.3_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
@@ -45,8 +45,6 @@ __export(tokens_exports, {
 });
 module.exports = __toCommonJS(tokens_exports);
 init_cjs_shims();
-var import_promises = require("fs/promises");
-var import_path3 = __toESM(require("path"));
 var p = __toESM(require("@clack/prompts"));
 
 // ../../node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js
@@ -546,69 +544,72 @@ var source_default = chalk;
 
 // src/command/tokens/index.ts
 var import_chokidar = __toESM(require("chokidar"));
+var import_promises = require("fs/promises");
+var import_path3 = __toESM(require("path"));
 
 // src/utils/assertion.ts
 init_cjs_shims();
 var isObject = (obj) => obj !== null && (typeof obj === "object" || typeof obj === "function") && !isArray(obj);
 var isArray = (value) => Array.isArray(value);
 
-// src/utils/prettier.ts
-init_cjs_shims();
-var import_path = __toESM(require("path"));
-var import_prettier = require("prettier");
-var prettier = async (content, options) => {
-  const prettierConfig = await (0, import_prettier.resolveConfig)(
-    import_path.default.join(process.cwd(), ".prettierrc")
-  );
-  try {
-    return (0, import_prettier.format)(content, {
-      ...prettierConfig,
-      parser: "typescript",
-      ...options
-    });
-  } catch {
-    return content;
-  }
-};
-
-// src/utils/object.ts
-init_cjs_shims();
-var getObject = (obj, path4) => {
-  const keys = path4.split(".");
-  return keys.reduce((obj2, key) => obj2[key] ?? {}, obj);
-};
-
 // src/utils/module.ts
 init_cjs_shims();
-var import_fs = require("fs");
-var import_vm = require("vm");
 var import_esbuild = require("esbuild");
+var import_fs = require("fs");
 var import_node_eval = __toESM(require("node-eval"));
+var import_vm = require("vm");
 var getModule = async (file, cwd) => {
   const result = await (0, import_esbuild.build)({
-    platform: "node",
-    format: "cjs",
-    mainFields: ["module", "main"],
     absWorkingDir: cwd,
+    bundle: true,
     entryPoints: [file],
+    format: "cjs",
+    mainFields: ["module", "main"],
+    metafile: true,
     outfile: "out.js",
-    write: false,
-    bundle: true,
+    platform: "node",
     sourcemap: false,
-    metafile: true
+    write: false
   });
-  const { text: code } = result.outputFiles[0];
-  const dependencies = result.metafile ? Object.keys(result.metafile.inputs) : [];
+  const { text: code } = result.outputFiles[0] ?? {};
+  const dependencies = isObject(result.metafile) ? Object.keys(result.metafile.inputs) : [];
   try {
     const realFileName = import_fs.realpathSync.native(file);
+    if (!code) throw new Error("code is undefined");
     const script = new import_vm.Script(code, { filename: realFileName });
     const mod = { exports: {} };
     const require2 = (id) => id === realFileName ? mod.exports : require2(id);
     script.runInThisContext()(mod.exports, require2, mod);
-    return { mod, code, dependencies };
+    return { code, dependencies, mod };
   } catch {
     const mod = (0, import_node_eval.default)(code);
-    return { mod, code, dependencies };
+    return { code, dependencies, mod };
+  }
+};
+
+// src/utils/object.ts
+init_cjs_shims();
+var getObject = (obj, path4) => {
+  const keys = path4.split(".");
+  return keys.reduce((obj2, key) => obj2[key] ?? {}, obj);
+};
+
+// src/utils/prettier.ts
+init_cjs_shims();
+var import_path = __toESM(require("path"));
+var import_prettier = require("prettier");
+var prettier = async (content, options) => {
+  const prettierConfig = await (0, import_prettier.resolveConfig)(
+    import_path.default.join(process.cwd(), ".prettierrc")
+  );
+  try {
+    return (0, import_prettier.format)(content, {
+      ...prettierConfig,
+      parser: "typescript",
+      ...options
+    });
+  } catch {
+    return content;
   }
 };
 
@@ -650,18 +651,15 @@ var printComponent = (components) => `components: { ${Object.entries(components)
 var print = (unions) => Object.entries(unions).sort(([a], [b]) => a.localeCompare(b)).map(
   ([key, union]) => `${key}: ${union.map((value) => `"${value}"`).concat(["(string & {})"]).join(" | ")};`
 ).join("\n");
-var extractComponents = ({ components = {} }) => Object.entries(components).reduce(
-  (obj, [key, { sizes, variants }]) => {
-    if (sizes || variants) {
-      obj[key] = {
-        sizes: Object.keys(sizes ?? {}),
-        variants: Object.keys(variants ?? {})
-      };
-    }
-    return obj;
-  },
-  {}
-);
+var extractComponents = ({ components = {} }) => Object.entries(components).reduce((obj, [key, { sizes, variants }]) => {
+  if (sizes || variants) {
+    obj[key] = {
+      sizes: Object.keys(sizes ?? {}),
+      variants: Object.keys(variants ?? {})
+    };
+  }
+  return obj;
+}, {});
 var isTone = (value) => {
   if (!isObject(value)) return false;
   const keys = Object.keys(value);
@@ -671,13 +669,13 @@ var extractColorSchemes = (theme) => {
   const { colors, semantics } = theme;
   let colorSchemes = [];
   let colorSchemeColors = [];
-  if (!isObject(colors)) return { colorSchemes, colorSchemeColors };
+  if (!isObject(colors)) return { colorSchemeColors, colorSchemes };
   Object.entries(colors).forEach(([key, value]) => {
     if (!isTone(value)) return;
     colorSchemes.push(key);
   });
   if (!isObject(semantics?.colorSchemes))
-    return { colorSchemes, colorSchemeColors };
+    return { colorSchemeColors, colorSchemes };
   Object.entries(semantics.colorSchemes).forEach(([key, value]) => {
     if (isTone(value)) {
       colorSchemes.push(key);
@@ -689,7 +687,7 @@ var extractColorSchemes = (theme) => {
       colorSchemeColors.push(...TONES.map((tone) => `${key}.${tone}`));
     }
   });
-  return { colorSchemes, colorSchemeColors };
+  return { colorSchemeColors, colorSchemes };
 };
 var extractThemeSchemes = (theme) => {
   const { themeSchemes } = theme;
@@ -729,10 +727,10 @@ var createThemeTypings = async (theme, { responsive = false }) => {
   const tokens = config.reduce(
     (prev, {
       key,
-      replaceKey,
+      flatMap = (value) => value,
       maxScanDepth,
       omitScanKeys,
-      flatMap = (value) => value
+      replaceKey
     }) => {
       const target = getObject(theme, key);
       prev[replaceKey ?? key] = [];
@@ -752,7 +750,7 @@ var createThemeTypings = async (theme, { responsive = false }) => {
           omitScanKeys,
           shouldProcess
         ).flatMap(flatMap);
-        prev[replaceKey ?? key].push(...semanticKeys);
+        prev[replaceKey ?? key]?.push(...semanticKeys);
       }
       return prev;
     },
@@ -760,10 +758,10 @@ var createThemeTypings = async (theme, { responsive = false }) => {
   );
   const textStyles = extractKeys(theme, "styles.textStyles");
   const layerStyles = extractKeys(theme, "styles.layerStyles");
-  const { colorSchemes, colorSchemeColors } = extractColorSchemes(theme);
+  const { colorSchemeColors, colorSchemes } = extractColorSchemes(theme);
   const themeSchemes = extractThemeSchemes(theme);
   const components = extractComponents(theme);
-  tokens.colors = [...tokens.colors, ...colorSchemeColors];
+  tokens.colors = [...tokens.colors ?? [], ...colorSchemeColors];
   return prettier(
     [
       `import type { UITheme } from './ui-theme.types'`,
@@ -771,9 +769,9 @@ var createThemeTypings = async (theme, { responsive = false }) => {
       `export interface GeneratedTheme extends UITheme {`,
       print({
         ...tokens,
-        textStyles,
-        layerStyles,
         colorSchemes,
+        layerStyles,
+        textStyles,
         themeSchemes
       }),
       printComponent(components),
@@ -784,8 +782,8 @@ var createThemeTypings = async (theme, { responsive = false }) => {
 
 // src/command/tokens/resolve-output-path.ts
 init_cjs_shims();
-var import_path2 = __toESM(require("path"));
 var import_glob = require("glob");
+var import_path2 = __toESM(require("path"));
 var themePath = [
   "node_modules",
   "@yamada-ui",
@@ -823,9 +821,9 @@ var resolveOutputPath = async (outPath) => {
 
 // src/command/tokens/index.ts
 var generateThemeTypings = async ({
-  theme,
   config: config2,
-  outFile
+  outFile,
+  theme
 }) => {
   p.intro(source_default.magenta(`Generating Yamada UI theme typings`));
   const s = p.spinner();
@@ -853,15 +851,15 @@ var generateThemeTypings = async ({
 var actionTokens = async (themePath2, { cwd = import_path3.default.resolve(), out: outFile, watch: watchFile }) => {
   const readFile = async () => {
     const filePath = import_path3.default.resolve(themePath2);
-    const { mod, dependencies: dependencies2 } = await getModule(filePath, cwd);
+    const { dependencies: dependencies2, mod } = await getModule(filePath, cwd);
     const theme2 = mod?.default ?? mod?.theme ?? mod?.customTheme ?? mod?.defaultTheme ?? {};
     const config3 = mod?.config ?? mod?.customConfig ?? mod?.defaultConfig ?? {};
-    return { theme: theme2, config: config3, dependencies: dependencies2 };
+    return { config: config3, dependencies: dependencies2, theme: theme2 };
   };
   let file = await readFile();
-  const { theme, config: config2, dependencies } = file;
+  const { config: config2, dependencies, theme } = file;
   const buildFile = async () => {
-    await generateThemeTypings({ theme, config: config2, outFile });
+    await generateThemeTypings({ config: config2, outFile, theme });
     if (watchFile) console.log("\n", "\u231B\uFE0F Watching for changes...");
   };
   if (watchFile) {

package/dist/command/tokens/resolve-output-path.js

@@ -34,8 +34,8 @@ __export(resolve_output_path_exports, {
   themePath: () => themePath
 });
 module.exports = __toCommonJS(resolve_output_path_exports);
-var import_path = __toESM(require("path"));
 var import_glob = require("glob");
+var import_path = __toESM(require("path"));
 var themePath = [
   "node_modules",
   "@yamada-ui",