aplance-ui 1.5.2 → 1.6.0

package/dist/frameworks/vite-react/vite.config.ts.template

@@ -19,7 +19,7 @@ export default defineConfig({
   plugins: [react()],
   resolve: {
     alias: {
-      "{{alias}}": resolve(__dirname, "./{{srcDir}}"),
+      "{{alias}}": resolve(import.meta.dirname, "./{{srcDir}}"),
     },
   },
   css: {

package/dist/index.js

@@ -188,10 +188,11 @@ var applyFileOps = async (ops, opts) => {
         ensureDir(op.target);
         writeFileSync(op.target, op.content);
       } catch (err) {
-        const cause = err instanceof Error ? err.message : String(err);
+        const reason = err instanceof Error ? err.message : String(err);
         throw new Error(
-          `Failed to write ${rel}: ${cause}
-${written} file(s) were already written before this failure. Fix the underlying issue (permissions? disk space?) and re-run - identical files will be detected as unchanged and skipped.`
+          `Failed to write ${rel}: ${reason}
+${written} file(s) were already written before this failure. Fix the underlying issue (permissions? disk space?) and re-run - identical files will be detected as unchanged and skipped.`,
+          { cause: err }
         );
       }
       logger.ok(`wrote  ${rel}`);
@@ -1118,18 +1119,18 @@ var firstExisting = (cwd, names) => {
 var readDeclaredDeps = (packageJsonPath) => {
   try {
     const pkg2 = JSON.parse(readFileSync7(packageJsonPath, "utf8"));
-    return /* @__PURE__ */ new Set([
-      ...Object.keys(pkg2.dependencies ?? {}),
-      ...Object.keys(pkg2.devDependencies ?? {}),
-      ...Object.keys(pkg2.peerDependencies ?? {})
+    return new Map([
+      ...Object.entries(pkg2.peerDependencies ?? {}),
+      ...Object.entries(pkg2.devDependencies ?? {}),
+      ...Object.entries(pkg2.dependencies ?? {})
     ]);
   } catch {
-    return /* @__PURE__ */ new Set();
+    return /* @__PURE__ */ new Map();
   }
 };
 var detectProject = (cwd) => {
   const packageJsonPath = existsSync6(join6(cwd, "package.json")) ? join6(cwd, "package.json") : null;
-  const declaredDeps = packageJsonPath ? readDeclaredDeps(packageJsonPath) : /* @__PURE__ */ new Set();
+  const declaredDeps = packageJsonPath ? readDeclaredDeps(packageJsonPath) : /* @__PURE__ */ new Map();
   const viteConfigPath = firstExisting(cwd, VITE_CONFIG_NAMES);
   const nextConfigPath = firstExisting(cwd, NEXT_CONFIG_NAMES);
   const astroConfigPath = firstExisting(cwd, ASTRO_CONFIG_NAMES);
@@ -1400,35 +1401,84 @@ var detectPackageManager = (cwd) => {
   if (existsSync8(join8(cwd, "package-lock.json"))) return "npm";
   return "npm";
 };
-var computeDependencyPlan = (input) => {
-  const { registry, units, cfg, project } = input;
-  const meta = registry.installMeta;
-  const dependencies = { ...meta.baseDependencies };
-  const devDependencies = { ...meta.baseDevDependencies };
-  if (cfg.utilities.enabled) {
-    Object.assign(devDependencies, meta.utilitiesDevDependencies);
+var leadingMajor = (spec) => {
+  const value = spec.trim();
+  if (value.includes("||") || value.includes(":") || /\s-\s/.test(value)) {
+    return null;
   }
+  const match = /^(?:\^|~|>=|=|v)?\s*(\d+)(?:[.\s]|$)/.exec(value);
+  return match ? Number(match[1]) : null;
+};
+var isOlderMajor = (declared, required) => {
+  const have = leadingMajor(declared);
+  const need = leadingMajor(required);
+  return have !== null && need !== null && have < need;
+};
+var unitDependencies = (meta, units) => {
+  const deps = {};
   for (const unit of units) {
     for (const pkg2 of unit.externalDeps) {
-      if (pkg2 in dependencies) continue;
       const version = meta.packageVersions[pkg2];
-      if (!version) continue;
-      dependencies[pkg2] = version;
+      if (version) deps[pkg2] = version;
     }
   }
-  const skipped = [];
-  const filter = (bag) => {
-    for (const name of Object.keys(bag)) {
-      if (project.declaredDeps.has(name)) {
-        skipped.push({ name, reason: "already-declared" });
-        delete bag[name];
+  return deps;
+};
+var settleDeclared = (bags, meta, project) => {
+  const toolchain = /* @__PURE__ */ new Set([
+    ...Object.keys(meta.baseDependencies),
+    ...Object.keys(meta.baseDevDependencies),
+    ...Object.keys(meta.utilitiesDevDependencies)
+  ]);
+  const settled = {
+    skipped: [],
+    upgraded: [],
+    outdated: []
+  };
+  for (const bag of bags) {
+    for (const [name, required] of Object.entries(bag)) {
+      const declared = project.declaredDeps.get(name);
+      if (declared === void 0) continue;
+      if (!isOlderMajor(declared, required)) {
+        settled.skipped.push({ name, reason: "already-declared" });
+      } else if (toolchain.has(name)) {
+        settled.outdated.push({ name, declared, required });
+      } else {
+        settled.upgraded.push({ name, from: declared, to: required });
+        continue;
       }
+      delete bag[name];
     }
+  }
+  return settled;
+};
+var computeDependencyPlan = (input) => {
+  const { registry, units, cfg, project } = input;
+  const meta = registry.installMeta;
+  const dependencies = { ...meta.baseDependencies };
+  for (const [name, range] of Object.entries(unitDependencies(meta, units))) {
+    if (!(name in dependencies)) dependencies[name] = range;
+  }
+  const devDependencies = {
+    ...meta.baseDevDependencies,
+    ...cfg.utilities.enabled ? meta.utilitiesDevDependencies : {}
+  };
+  return {
+    dependencies,
+    devDependencies,
+    ...settleDeclared([dependencies, devDependencies], meta, project)
+  };
+};
+var computeUnitDependencyPlan = (input) => {
+  const meta = input.registry.installMeta;
+  const dependencies = unitDependencies(meta, input.units);
+  return {
+    dependencies,
+    devDependencies: {},
+    ...settleDeclared([dependencies], meta, input.project)
   };
-  filter(dependencies);
-  filter(devDependencies);
-  return { dependencies, devDependencies, skipped };
 };
+var quoteArg = (arg) => /^[\w@./:=+-]+$/.test(arg) ? arg : `"${arg}"`;
 var buildInstallCommands = (pm, plan) => {
   const commands = [];
   const runtimeSpecs = Object.entries(plan.dependencies).map(
@@ -1439,20 +1489,13 @@ var buildInstallCommands = (pm, plan) => {
   );
   const runtimeArgs = installArgs(pm, runtimeSpecs, false);
   const devArgs = installArgs(pm, devSpecs, true);
-  if (runtimeSpecs.length > 0) {
-    commands.push({
-      bin: pm,
-      args: runtimeArgs,
-      label: `${pm} ${runtimeArgs.join(" ")}`
-    });
-  }
-  if (devSpecs.length > 0) {
-    commands.push({
-      bin: pm,
-      args: devArgs,
-      label: `${pm} ${devArgs.join(" ")}`
-    });
-  }
+  const command = (args) => ({
+    bin: pm,
+    args,
+    label: [pm, ...args].map(quoteArg).join(" ")
+  });
+  if (runtimeSpecs.length > 0) commands.push(command(runtimeArgs));
+  if (devSpecs.length > 0) commands.push(command(devArgs));
   return commands;
 };
 var installArgs = (pm, specs, dev) => {
@@ -1477,12 +1520,12 @@ var runInstall = async (commands, opts) => {
   for (const cmd of commands) {
     opts.onCommand?.(cmd);
     await new Promise((resolve, reject) => {
-      const child = spawn(cmd.bin, cmd.args, {
+      const spawnOptions = {
         cwd: opts.cwd,
         stdio: "inherit",
-        env: { ...process.env, ...opts.env },
-        shell: process.platform === "win32"
-      });
+        env: { ...process.env, ...opts.env }
+      };
+      const child = process.platform === "win32" ? spawn(cmd.label, { ...spawnOptions, shell: true }) : spawn(cmd.bin, cmd.args, spawnOptions);
       child.on("error", reject);
       child.on("close", (code) => {
         if (code === 0) resolve();
@@ -1498,7 +1541,11 @@ var runInstall = async (commands, opts) => {
 };
 var describePlan = (plan) => {
   const lines = [];
-  const rows = (bag) => Object.entries(bag).sort(([a], [b]) => a.localeCompare(b)).map(([name, v]) => `  ${name} ${v}`);
+  const upgradedFrom = new Map(plan.upgraded.map((u) => [u.name, u.from]));
+  const rows = (bag) => Object.entries(bag).sort(([a], [b]) => a.localeCompare(b)).map(([name, v]) => {
+    const from = upgradedFrom.get(name);
+    return `  ${name} ${v}${from ? ` (upgrades ${from})` : ""}`;
+  });
   if (Object.keys(plan.dependencies).length) {
     lines.push("dependencies:");
     lines.push(...rows(plan.dependencies));
@@ -1513,6 +1560,13 @@ var describePlan = (plan) => {
     lines.push("already declared (kept as-is):");
     lines.push(...plan.skipped.map((s) => `  ${s.name}`));
   }
+  if (plan.outdated.length) {
+    if (lines.length) lines.push("");
+    lines.push("older major kept as-is (upgrade when you can):");
+    lines.push(
+      ...plan.outdated.map((o) => `  ${o.name} ${o.declared} (scaffold expects ${o.required})`)
+    );
+  }
   if (!lines.length) lines.push("nothing to install - all deps already declared.");
   return lines.join("\n");
 };
@@ -1832,7 +1886,7 @@ var runInit = async (opts) => {
 ${snippet.content.split("\n").map((l) => "    " + l).join("\n")}`);
   }
   steps.push(
-    `${pc4.cyan(String(stepIdx++))}  ${pc4.bold("Add more components anytime")}
+    `${pc4.cyan(String(stepIdx))}  ${pc4.bold("Add more components anytime")}
     npx aplance-ui add <name>     ${pc4.dim("# e.g. button modal tooltip")}
     npx aplance-ui add             ${pc4.dim("# interactive multi-select")}
     npx aplance-ui list            ${pc4.dim("# see everything available")}`
@@ -1892,7 +1946,7 @@ var runAdd = async (opts) => {
   });
   const summary = `${result.written} written \xB7 ${result.skipped} skipped \xB7 ${result.unchanged} unchanged`;
   const project = detectProject(opts.cwd);
-  const plan = computeRuntimePlan(registry, units, project);
+  const plan = computeUnitDependencyPlan({ registry, units, project });
   const pm = opts.packageManager ?? detectPackageManager(opts.cwd);
   const installCommands = buildInstallCommands(pm, plan);
   const hasWork = installCommands.length > 0;
@@ -1950,25 +2004,6 @@ var runAdd = async (opts) => {
   logger.info(summary);
   goodbye(`Added ${units.length} unit${units.length === 1 ? "" : "s"}.`);
 };
-var computeRuntimePlan = (registry, units, project) => {
-  const dependencies = {};
-  const skipped = [];
-  const meta = registry.installMeta;
-  for (const unit of units) {
-    for (const pkg2 of unit.externalDeps) {
-      const version = meta.packageVersions[pkg2];
-      if (!version) continue;
-      if (project.declaredDeps.has(pkg2)) {
-        if (!skipped.some((entry) => entry.name === pkg2)) {
-          skipped.push({ name: pkg2, reason: "already-declared" });
-        }
-        continue;
-      }
-      dependencies[pkg2] = version;
-    }
-  }
-  return { dependencies, devDependencies: {}, skipped };
-};
 var pickUnits = async (all) => multiselect2({
   message: `Select units to add ${pc5.dim("(space to toggle, enter to confirm)")}`,
   options: groupedUnitOptions(all),