@kidd-cli/cli 0.3.0 → 0.3.1

package/dist/commands/init.mjs

@@ -5,24 +5,89 @@ import { command } from "@kidd-cli/core";
 import { dirname, join } from "node:path";
 import { readManifest } from "@kidd-cli/utils/manifest";
 import { z } from "zod";
-import { attempt } from "@kidd-cli/utils/fp";
-//#region src/generated/template-versions.ts
+import { existsSync, readFileSync } from "node:fs";
+import { attempt, err, match, ok } from "@kidd-cli/utils/fp";
+import { parse } from "yaml";
+//#region src/lib/template-versions.ts
 /**
-* Zod version from the workspace catalog.
+* Zod schema for the `catalog` field in `pnpm-workspace.yaml`.
+*
+* @private
+*/
+const catalogSchema = z.object({ catalog: z.object({
+	tsdown: z.string(),
+	typescript: z.string(),
+	vitest: z.string(),
+	zod: z.string()
+}) });
+/**
+* Known locations for `pnpm-workspace.yaml` relative to this module.
+*
+* - First path covers the built `dist/` layout (yaml copied to `dist/`).
+* - Second path covers running from source `src/lib/` during development.
+*
+* @private
+*/
+const CANDIDATE_PATHS = [join(import.meta.dirname, "..", "pnpm-workspace.yaml"), join(import.meta.dirname, "..", "..", "..", "..", "pnpm-workspace.yaml")];
+/**
+* Locate `pnpm-workspace.yaml` by checking known candidate paths.
+*
+* @returns The resolved path, or `null` when no candidate exists.
+* @private
 */
-const ZOD_VERSION = "^4.3.6";
+function findWorkspaceYaml() {
+	return CANDIDATE_PATHS.find(existsSync) ?? null;
+}
 /**
-* TypeScript version from the workspace catalog.
+* Range operator prefixes recognized in version strings.
+*
+* @private
 */
-const TYPESCRIPT_VERSION = "^5.9.3";
+const RANGE_PREFIXES = [
+	"^",
+	"~",
+	">",
+	"<",
+	"="
+];
 /**
-* Vitest version from the workspace catalog.
+* Normalize a version string to always include a caret range prefix.
+*
+* If the version already starts with a range operator (`^`, `~`, `>`, `<`, `=`)
+* it is returned as-is. Otherwise a `^` prefix is added.
+*
+* @param version - The raw version string from the catalog.
+* @returns The version prefixed with `^` when no range operator is present.
 */
-const VITEST_VERSION = "^4.0.18";
+function normalizeVersion(version) {
+	return match(RANGE_PREFIXES.some((prefix) => version.startsWith(prefix))).with(true, () => version).with(false, () => `^${version}`).exhaustive();
+}
 /**
-* Tsdown version from the workspace catalog.
+* Read template dependency versions from the workspace catalog (`pnpm-workspace.yaml`).
+*
+* Resolves the workspace file from known relative locations, parses the YAML,
+* validates the structure with Zod, and returns normalized version strings
+* suitable for scaffolding `package.json` files in new projects.
+*
+* @returns A `Result` tuple with the resolved versions or an error.
 */
-const TSDOWN_VERSION = "^0.21.1";
+function readTemplateVersions() {
+	const yamlPath = findWorkspaceYaml();
+	if (yamlPath === null) return err(/* @__PURE__ */ new Error("Could not locate pnpm-workspace.yaml"));
+	const [readError, content] = attempt(() => readFileSync(yamlPath, "utf8"));
+	if (readError) return err(readError);
+	const [parseError, rawParsed] = attempt(() => parse(content));
+	if (parseError) return err(parseError);
+	const validation = catalogSchema.safeParse(rawParsed);
+	if (!validation.success) return err(/* @__PURE__ */ new Error(`Invalid pnpm-workspace.yaml catalog: ${validation.error.message}`));
+	const { catalog } = validation.data;
+	return ok(Object.freeze({
+		tsdownVersion: normalizeVersion(catalog.tsdown),
+		typescriptVersion: normalizeVersion(catalog.typescript),
+		vitestVersion: normalizeVersion(catalog.vitest),
+		zodVersion: normalizeVersion(catalog.zod)
+	}));
+}
 //#endregion
 //#region src/commands/init.ts
 const initCommand = command({
@@ -45,6 +110,11 @@ const initCommand = command({
 		const includeExample = await resolveIncludeExample(ctx);
 		const includeConfig = await resolveIncludeConfig(ctx);
 		ctx.spinner.start("Scaffolding project...");
+		const [versionsError, templateVersions] = readTemplateVersions();
+		if (versionsError) {
+			ctx.spinner.stop("Failed");
+			return ctx.fail(versionsError.message);
+		}
 		const coreVersion = await resolveDependencyVersion("@kidd-cli/core");
 		const cliVersion = await resolveSelfVersion();
 		const [renderError, rendered] = await renderTemplate({
@@ -56,10 +126,7 @@ const initCommand = command({
 				includeConfig,
 				name: projectName,
 				packageManager,
-				tsdownVersion: TSDOWN_VERSION,
-				typescriptVersion: TYPESCRIPT_VERSION,
-				vitestVersion: VITEST_VERSION,
-				zodVersion: ZOD_VERSION
+				...templateVersions
 			}
 		});
 		if (renderError) {

package/dist/pnpm-workspace.yaml

@@ -0,0 +1,15 @@
+packages:
+  - packages/*
+  - examples/*
+
+catalog:
+  '@types/node': ^25.5.0
+  '@vitest/coverage-v8': ^4.1.0
+  es-toolkit: ^1.45.1
+  liquidjs: ^10.25.0
+  ts-pattern: ^5.9.0
+  tsdown: 0.21.3
+  tsx: ^4.21.0
+  typescript: ^5.9.3
+  vitest: ^4.1.0
+  zod: ^4.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kidd-cli/cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "DX companion CLI for the kidd framework",
   "keywords": [
     "cli",
@@ -25,21 +25,21 @@
     "fs-extra": "^11.3.4",
     "liquidjs": "^10.25.0",
     "picocolors": "^1.1.1",
+    "yaml": "^2.8.2",
     "zod": "^4.3.6",
-    "@kidd-cli/bundler": "0.2.0",
-    "@kidd-cli/config": "0.1.4",
-    "@kidd-cli/utils": "0.1.4",
-    "@kidd-cli/core": "0.5.0"
+    "@kidd-cli/bundler": "0.2.1",
+    "@kidd-cli/config": "0.1.5",
+    "@kidd-cli/core": "0.5.1",
+    "@kidd-cli/utils": "0.1.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "tsdown": "0.21.1",
+    "tsdown": "0.21.3",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.18",
-    "yaml": "^2.8.0"
+    "vitest": "^4.1.0"
   },
   "scripts": {
-    "build": "tsdown && mkdir -p dist/lib && cp -r src/lib/templates dist/lib/templates",
+    "build": "tsdown && mkdir -p dist/lib && cp -r src/lib/templates dist/lib/templates && cp ../../pnpm-workspace.yaml dist/pnpm-workspace.yaml",
     "typecheck": "tsgo --noEmit",
     "lint": "oxlint --ignore-pattern node_modules",
     "lint:fix": "oxlint --fix --ignore-pattern node_modules",