material-theme-builder 3.3.0 → 5.0.0

package/dist/cli.js

@@ -3,12 +3,11 @@
 // src/cli.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
-import { Command as Command2 } from "commander";
+import { Command, Option as Option2 } from "commander";
 import { z } from "zod";
 
 // src/cli.options.ts
 import {
-  Command,
   InvalidArgumentError,
   Option
 } from "commander";
@@ -683,8 +682,8 @@ function buildShadcnAliases(ctx) {
   const lines = Object.entries(toShadcnAliasVars(ctx.prefix)).map(
     ([name, value]) => `--${name}: ${value};`
   );
-  return `:root,
-.dark {
+  return `:root:root,
+.dark.dark {
   ${lines.join("\n  ")}
 }
 `;
@@ -870,6 +869,9 @@ function assertHexInputs(source, cores, customColors) {
     (color, i) => assertHexColor(`customColors[${i}].hex`, color.hex)
   );
 }
+function optionalHex(hex) {
+  return hex?.trim() || void 0;
+}
 var STANDARD_TONES = [
   0,
   4,
@@ -1038,16 +1040,20 @@ function builder(hexSource, {
   customColors: hexCustomColors = DEFAULT_CUSTOM_COLORS,
   prefix = DEFAULT_PREFIX
 } = {}) {
-  assertHexInputs(
-    hexSource,
-    { primary, secondary, tertiary, error, neutral, neutralVariant },
-    hexCustomColors
-  );
+  const cores = {
+    primary: optionalHex(primary),
+    secondary: optionalHex(secondary),
+    tertiary: optionalHex(tertiary),
+    error: optionalHex(error),
+    neutral: optionalHex(neutral),
+    neutralVariant: optionalHex(neutralVariant)
+  };
+  assertHexInputs(hexSource, cores, hexCustomColors);
   const sourceArgb = argbFromHex2(hexSource);
   const sourceHct = Hct2.fromInt(sourceArgb);
-  const effectiveSource = primary || hexSource;
+  const effectiveSource = cores.primary || hexSource;
   const effectiveSourceArgb = argbFromHex2(effectiveSource);
-  const effectiveSourceForHarmonization = primary ? argbFromHex2(primary) : sourceArgb;
+  const effectiveSourceForHarmonization = cores.primary ? argbFromHex2(cores.primary) : sourceArgb;
   const SchemeClass = schemesMap[scheme];
   const primaryHct = Hct2.fromInt(effectiveSourceArgb);
   const baseScheme = new SchemeClass(primaryHct, false, contrast);
@@ -1055,32 +1061,32 @@ function builder(hexSource, {
     // Core colors (hex may be undefined)
     {
       name: "primary",
-      hex: primary,
+      hex: cores.primary,
       core: true,
       chromaSource: "primary"
     },
     {
       name: "secondary",
-      hex: secondary,
+      hex: cores.secondary,
       core: true,
       chromaSource: "primary"
     },
     {
       name: "tertiary",
-      hex: tertiary,
+      hex: cores.tertiary,
       core: true,
       chromaSource: "primary"
     },
-    { name: "error", hex: error, core: true, chromaSource: "primary" },
+    { name: "error", hex: cores.error, core: true, chromaSource: "primary" },
     {
       name: "neutral",
-      hex: neutral,
+      hex: cores.neutral,
       core: true,
       chromaSource: "neutral"
     },
     {
       name: "neutralVariant",
-      hex: neutralVariant,
+      hex: cores.neutralVariant,
       core: true,
       chromaSource: "neutralVariant"
     },
@@ -1231,7 +1237,6 @@ function addThemeOptions(command) {
     DEFAULT_PREFIX
   );
 }
-var THEME_OPTIONS = addThemeOptions(new Command()).options;
 function builderOptions(opts) {
   return {
     scheme: opts.scheme,
@@ -1245,16 +1250,6 @@ function builderOptions(opts) {
     prefix: opts.prefix
   };
 }
-function specifiedThemeArgs(command) {
-  const args = [];
-  for (const option of THEME_OPTIONS) {
-    const name = option.attributeName();
-    if (command.getOptionValueSource(name) !== "cli") continue;
-    if (option.long) args.push(option.long);
-    if (!option.negate) args.push(String(command.opts()[name]));
-  }
-  return args;
-}
 function themeFrom(command) {
   const opts = command.opts();
   return {
@@ -1263,256 +1258,48 @@ function themeFrom(command) {
     // opposite of the API's, and deliberately so: a CLI knows the source color,
     // which is what makes baking its colors in as the fallbacks free. See
     // `buildShadcnRegistryItem()`.
-    fallback: opts.fallback ?? true,
-    args: specifiedThemeArgs(command)
+    fallback: opts.fallback ?? true
   };
 }
 
 // src/cli.shadcn.ts
 import { spawnSync } from "child_process";
 import * as fs from "fs";
-import * as os from "os";
 import * as path from "path";
-import { InvalidArgumentError as InvalidArgumentError2 } from "commander";
+import "commander";
 var NPX = ["npx", "--yes"];
 var DEFAULT_SHADCN = "shadcn@latest";
-var SELF = "material-theme-builder";
-var INIT_TARGET = "shadcn init";
-var ADD_TARGET = "shadcn add";
+var YES = "--yes";
 var ITEM = "mtb.json";
-var APP_NAME = "material-theme-app";
-var NAME = { long: "--name", short: "-n", value: APP_NAME };
-var YES = { long: "--yes", short: "-y" };
-var INIT_DEFAULTS = [
-  { long: "--preset", short: "-p", value: "b0" },
-  { long: "--template", short: "-t", value: "vite" },
-  NAME,
-  YES
-];
-var ADD_DEFAULTS = [YES];
-function parseShadcnSpec(value) {
-  if (value.startsWith("-"))
-    throw new InvalidArgumentError2(
-      "A package spec cannot start with '-': npx would read it as one of its own options."
-    );
-  if (/^\d/.test(value))
-    throw new InvalidArgumentError2(
-      `That is a version, not a package spec -- write 'shadcn@${value}'.`
-    );
-  return value;
-}
-function addChainOptions(command) {
-  return command.option(
-    "--shadcn-cli <spec>",
-    "npx package spec for the shadcn CLI to run (a version, tag, fork or tarball \u2014 anything npx resolves)",
-    parseShadcnSpec,
-    DEFAULT_SHADCN
-  ).option(
-    "--print",
-    "Print the equivalent shell chain instead of running it"
-  );
-}
-function mentions(args, { long, short }) {
-  return args.some(
-    (arg) => arg === long || arg.startsWith(`${long}=`) || arg.startsWith(short)
-  );
-}
-function mergeDefaults(defaults, forwarded) {
-  const injected = defaults.filter((option) => !mentions(forwarded, option)).flatMap(
-    ({ long, value }) => value === void 0 ? [long] : [long, value]
-  );
-  return [...injected, ...forwarded];
-}
-function lastName(args) {
-  for (let i = args.length - 1; i >= 0; i--) {
-    const arg = args[i] ?? "";
-    if (arg === NAME.long || arg === NAME.short) return args[i + 1];
-    if (arg.startsWith(`${NAME.long}=`)) return arg.slice(NAME.long.length + 1);
-    if (arg.length > NAME.short.length && arg.startsWith(NAME.short))
-      return arg.slice(NAME.short.length);
-  }
-  return void 0;
-}
-function ownOptionIn(declared, forwarded) {
-  return forwarded.find(
-    (arg) => declared.some(
-      (option) => arg === option.long || arg === option.short || option.long !== void 0 && arg.startsWith(`${option.long}=`)
-    )
-  );
-}
-function refuseOwnOptions(command, forwarded, target) {
-  const misplaced = ownOptionIn(command.options, forwarded);
-  if (misplaced !== void 0)
-    fail(
-      `${misplaced} is ours, not shadcn's, so it belongs before the \`--\`. Everything after the separator is handed to \`${target}\` untouched.`
-    );
-}
-var DEFAULT_THEME = { options: {}, fallback: true, args: [] };
-function chainOptionsFrom(command) {
-  return { theme: themeFrom(command), shadcn: command.opts().shadcnCli };
-}
-function initPlan(source, forwarded = [], {
-  theme = DEFAULT_THEME,
-  shadcn = DEFAULT_SHADCN
-} = {}) {
-  const args = mergeDefaults(INIT_DEFAULTS, forwarded);
-  const dir = lastName(args) ?? APP_NAME;
-  return {
-    source,
-    theme,
-    dir,
-    steps: [
-      {
-        kind: "spawn",
-        label: INIT_TARGET,
-        argv: [...NPX, shadcn, "init", ...args],
-        where: "cwd"
-      },
-      { kind: "cd", dir },
-      { kind: "item", file: ITEM },
-      // The same spec as the step above, deliberately: a chain pinned for the
-      // scaffold and floating for the install is worse than one that floats
-      // throughout, since the two would disagree about the registry format
-      // without saying so.
-      {
-        kind: "spawn",
-        label: ADD_TARGET,
-        argv: [
-          ...NPX,
-          shadcn,
-          "add",
-          `./${ITEM}`,
-          ...mergeDefaults(ADD_DEFAULTS, [])
-        ],
-        where: "project"
-      },
-      { kind: "rm", file: ITEM },
-      // The handover: long-running by design, stdio inherited, ctrl-C reaching
-      // it. Package-manager detection is out of scope -- `shadcn init` under
-      // `npx` writes a `package-lock.json` and the `dev` script npm will run.
-      {
-        kind: "spawn",
-        label: "npm run dev",
-        argv: ["npm", "run", "dev"],
-        where: "project"
-      }
-    ]
-  };
-}
-function applyPlan(source, forwarded = [], {
-  theme = DEFAULT_THEME,
-  shadcn = DEFAULT_SHADCN
-} = {}) {
-  return {
-    source,
-    theme,
-    steps: [
-      { kind: "item", file: ITEM },
-      {
-        kind: "spawn",
-        label: ADD_TARGET,
-        argv: [
-          ...NPX,
-          shadcn,
-          "add",
-          `./${ITEM}`,
-          ...mergeDefaults(ADD_DEFAULTS, forwarded)
-        ],
-        where: "cwd"
-      },
-      { kind: "rm", file: ITEM }
-    ]
-  };
-}
-var SHELL_SAFE = /^[\w@%+=:,./-]+$/;
-function quote(argv) {
-  return argv.map(
-    (arg) => SHELL_SAFE.test(arg) ? arg : `'${arg.replaceAll("'", `'\\''`)}'`
-  ).join(" ");
-}
-function renderStep(plan, step) {
-  switch (step.kind) {
-    case "spawn":
-      return quote(step.argv);
-    case "cd":
-      return `cd ${step.dir}`;
-    // Rendered as the command someone could have run themselves -- theme options
-    // included, or the line would describe a different theme from the one the
-    // runner generates. The runner does the same thing in-process, being the very
-    // binary this spawns.
-    case "item":
-      return `${quote([...NPX, SELF, plan.source, ...plan.theme.args, "--format", "registry-item"])} > ${step.file}`;
-    case "rm":
-      return `rm ${step.file}`;
-  }
-}
-function renderChain(plan) {
-  return plan.steps.map((step) => renderStep(plan, step)).join(" && ");
+function addArgv(shadcn, forwarded = []) {
+  return [...NPX, shadcn, "add", `./${ITEM}`, YES, ...forwarded];
 }
 function fail(message, code = 1) {
   console.error(`Error: ${message}`);
   process.exit(code);
 }
-function run({ label, argv }, cwd) {
-  const [command = "", ...args] = argv;
-  const { error, status, signal } = spawnSync(command, args, {
-    cwd,
-    stdio: "inherit",
-    shell: false
-  });
-  if (error) fail(`${label} could not be started: ${error.message}`);
-  if (signal) process.exit(128 + (os.constants.signals[signal] ?? 0));
-  if (status !== 0) fail(`${label} failed`, status ?? 1);
-}
-function writeItem({ source, theme }, file) {
+function writeItem(source, command, file) {
   if (fs.existsSync(file))
     fail(
       `${path.basename(file)} already exists and would be overwritten, then deleted. Move it aside first.`
     );
   process.on("exit", () => fs.rmSync(file, { force: true }));
-  const item = builder(source, theme.options).toShadcnRegistryItem({
-    fallback: theme.fallback
-  });
+  const { options, fallback } = themeFrom(command);
+  const item = builder(source, options).toShadcnRegistryItem({ fallback });
   fs.writeFileSync(file, `${JSON.stringify(item, null, 2)}
 `);
 }
-function runStep(plan, step, projectDir) {
-  switch (step.kind) {
-    case "spawn":
-      return run(step, step.where === "project" ? projectDir : process.cwd());
-    case "item":
-      return writeItem(plan, path.join(projectDir, step.file));
-    case "rm":
-      return fs.rmSync(path.join(projectDir, step.file), { force: true });
-    // Nothing to do: the runner resolved the directory up front, where a shell
-    // would have changed into it. The step exists so that `--print` can say so.
-    case "cd":
-      return;
-  }
-}
-function runChain(plan) {
-  const projectDir = plan.dir ? path.resolve(plan.dir) : process.cwd();
-  if (plan.dir && fs.existsSync(projectDir))
-    fail(
-      `./${plan.dir} already exists. Pick another name with \`-- -n other-name\`, or remove it first.`
-    );
-  for (const step of plan.steps) runStep(plan, step, projectDir);
-}
-function execute(plan, command) {
-  if (command.opts().print === true) {
-    process.stdout.write(`${renderChain(plan)}
-`);
-    return;
-  }
-  runChain(plan);
-}
-function runInit(source, forwarded, command) {
-  refuseOwnOptions(command, forwarded, INIT_TARGET);
-  execute(initPlan(source, forwarded, chainOptionsFrom(command)), command);
-}
 function runApply(source, forwarded, command) {
-  refuseOwnOptions(command, forwarded, ADD_TARGET);
-  execute(applyPlan(source, forwarded, chainOptionsFrom(command)), command);
+  const file = path.resolve(ITEM);
+  writeItem(source, command, file);
+  const [bin = "", ...args] = addArgv(command.opts().shadcnCli, forwarded);
+  const { error, status } = spawnSync(bin, args, {
+    stdio: "inherit",
+    shell: false
+  });
+  if (error) fail(`shadcn add could not be started: ${error.message}`);
+  if (status !== 0) fail("shadcn add failed", status ?? 1);
+  fs.rmSync(file, { force: true });
 }
 
 // src/cli.ts
@@ -1534,9 +1321,20 @@ function writeFigmaTokens(theme, outputDir) {
     console.error(`wrote ${filePath}`);
   }
 }
+var FORMATS = [
+  "json",
+  "css",
+  "figma",
+  "tailwind",
+  "shadcn",
+  "registry-item",
+  "flutter"
+];
 function writeOutput(theme, opts) {
   const json = (value) => JSON.stringify(value, null, 2) + "\n";
   switch (opts.format) {
+    case "json":
+      return process.stdout.write(json(theme.toJson()));
     case "css":
       return process.stdout.write(theme.toCss());
     case "tailwind":
@@ -1551,11 +1349,9 @@ function writeOutput(theme, opts) {
       return process.stdout.write(theme.toFlutter());
     case "figma":
       return writeFigmaTokens(theme, opts.output ?? "material-theme");
-    default:
-      return process.stdout.write(json(theme.toJson()));
   }
 }
-var program = new Command2();
+var program = new Command();
 addThemeOptions(
   addSourceArgument(
     program.name("material-theme-builder").description("Generate a color theme from a source color")
@@ -1563,10 +1359,8 @@ addThemeOptions(
 ).option(
   "--custom-colors <json>",
   `Custom colors as JSON array (e.g. '[{"name":"brand","hex":"#FF5733","blend":true}]')`
-).option(
-  "--format <type>",
-  "Output format: json, css, figma, tailwind, shadcn, registry-item, or flutter",
-  "figma"
+).addOption(
+  new Option2("--format <type>", "Output format").choices(FORMATS).default("figma")
 ).option("--output <dir>", "Output directory (required for figma format)").option(
   "--shadcn",
   "Append the shadcn var() alias block to --format tailwind (for concrete values, use --format shadcn)"
@@ -1609,29 +1403,17 @@ addThemeOptions(
   });
   writeOutput(result, opts);
 });
-addChainOptions(
-  addThemeOptions(
-    addSourceArgument(
-      program.command("shadcn-init").description(
-        "Scaffold a new shadcn app themed from a source color, and start it"
-      )
-    ).argument(
-      "[shadcn-args...]",
-      "Options after a `--`, forwarded verbatim to `shadcn init`"
-    )
-  )
-).action(
-  (source, shadcnArgs, _opts, command) => runInit(source, shadcnArgs, command)
-);
-addChainOptions(
-  addThemeOptions(
-    addSourceArgument(
-      program.command("shadcn-apply").description("Theme the shadcn project in the current directory")
-    ).argument(
-      "[shadcn-args...]",
-      "Options after a `--`, forwarded verbatim to `shadcn add`"
-    )
+addThemeOptions(
+  addSourceArgument(
+    program.command("shadcn-apply").description("Theme the shadcn project in the current directory")
+  ).argument(
+    "[shadcn-args...]",
+    "Options after a `--`, forwarded verbatim to `shadcn add`"
   )
+).option(
+  "--shadcn-cli <spec>",
+  "npx package spec for the shadcn CLI to run (a version, tag, fork or tarball \u2014 anything npx resolves)",
+  DEFAULT_SHADCN
 ).action(
   (source, shadcnArgs, _opts, command) => runApply(source, shadcnArgs, command)
 );

package/dist/index.js

@@ -668,8 +668,8 @@ function buildShadcnAliases(ctx) {
   const lines = Object.entries(toShadcnAliasVars(ctx.prefix)).map(
     ([name, value]) => `--${name}: ${value};`
   );
-  return `:root,
-.dark {
+  return `:root:root,
+.dark.dark {
   ${lines.join("\n  ")}
 }
 `;
@@ -846,6 +846,9 @@ function assertHexInputs(source, cores, customColors) {
     (color, i) => assertHexColor(`customColors[${i}].hex`, color.hex)
   );
 }
+function optionalHex(hex) {
+  return hex?.trim() || void 0;
+}
 var STANDARD_TONES = [
   0,
   4,
@@ -1014,16 +1017,20 @@ function builder(hexSource, {
   customColors: hexCustomColors = DEFAULT_CUSTOM_COLORS,
   prefix = DEFAULT_PREFIX
 } = {}) {
-  assertHexInputs(
-    hexSource,
-    { primary, secondary, tertiary, error, neutral, neutralVariant },
-    hexCustomColors
-  );
+  const cores = {
+    primary: optionalHex(primary),
+    secondary: optionalHex(secondary),
+    tertiary: optionalHex(tertiary),
+    error: optionalHex(error),
+    neutral: optionalHex(neutral),
+    neutralVariant: optionalHex(neutralVariant)
+  };
+  assertHexInputs(hexSource, cores, hexCustomColors);
   const sourceArgb = argbFromHex2(hexSource);
   const sourceHct = Hct2.fromInt(sourceArgb);
-  const effectiveSource = primary || hexSource;
+  const effectiveSource = cores.primary || hexSource;
   const effectiveSourceArgb = argbFromHex2(effectiveSource);
-  const effectiveSourceForHarmonization = primary ? argbFromHex2(primary) : sourceArgb;
+  const effectiveSourceForHarmonization = cores.primary ? argbFromHex2(cores.primary) : sourceArgb;
   const SchemeClass = schemesMap[scheme];
   const primaryHct = Hct2.fromInt(effectiveSourceArgb);
   const baseScheme = new SchemeClass(primaryHct, false, contrast);
@@ -1031,32 +1038,32 @@ function builder(hexSource, {
     // Core colors (hex may be undefined)
     {
       name: "primary",
-      hex: primary,
+      hex: cores.primary,
       core: true,
       chromaSource: "primary"
     },
     {
       name: "secondary",
-      hex: secondary,
+      hex: cores.secondary,
       core: true,
       chromaSource: "primary"
     },
     {
       name: "tertiary",
-      hex: tertiary,
+      hex: cores.tertiary,
       core: true,
       chromaSource: "primary"
     },
-    { name: "error", hex: error, core: true, chromaSource: "primary" },
+    { name: "error", hex: cores.error, core: true, chromaSource: "primary" },
     {
       name: "neutral",
-      hex: neutral,
+      hex: cores.neutral,
       core: true,
       chromaSource: "neutral"
     },
     {
       name: "neutralVariant",
-      hex: neutralVariant,
+      hex: cores.neutralVariant,
       core: true,
       chromaSource: "neutralVariant"
     },