@ykdz/template 0.0.7 → 0.0.9

package/{dist/src → node_modules/@ykdz/template-core/dist}/renderer.d.ts

@@ -50,9 +50,9 @@ export type ReplaceAnchorsOperation = {
 export type RenderOperation = CopyFileOperation | WriteJsonOperation | MergeJsonOperation | WriteTextOperation | WriteTextFromFragmentsOperation | WriteTextTemplateOperation | SetExecutableOperation | ReplaceAnchorsOperation;
 export type RenderProjectOptions = {
     sourceRoot: string;
-    sourceRoots?: Record<string, string>;
+    sourceRoots?: Record<string, string> | undefined;
     targetRoot: string;
-    variables?: RenderVariables;
+    variables?: RenderVariables | undefined;
     operations: RenderOperation[];
 };
 export declare function renderProject(options: RenderProjectOptions): Promise<void>;

package/{dist/src → node_modules/@ykdz/template-core/dist}/renderer.js

@@ -65,7 +65,7 @@ function serializeJsonValue(value, indentation, pathSegments, multilineArrays, r
     if (!isRecord(value)) {
         return JSON.stringify(value);
     }
-    const entries = Object.entries(value).sort(([left], [right]) => compareJsonKeys(left, right, pathSegments, rootKeyOrder));
+    const entries = Object.entries(value).toSorted(([left], [right]) => compareJsonKeys(left, right, pathSegments, rootKeyOrder));
     if (entries.length === 0) {
         return "{}";
     }
@@ -325,7 +325,7 @@ async function findTypeScriptAnchorRanges(sourceText) {
 }
 function replaceRanges(sourceText, ranges, replacements) {
     let nextText = sourceText;
-    for (const range of [...ranges].sort((a, b) => b.start - a.start)) {
+    for (const range of ranges.toSorted((a, b) => b.start - a.start)) {
         const replacement = replacements[range.name];
         if (replacement === undefined) {
             continue;
@@ -380,7 +380,9 @@ async function copyGeneratedFile(from, to) {
     }
     catch (error) {
         if (isNodeError(error) && error.code === "EEXIST") {
-            throw new Error(`Refusing to overwrite existing file: ${to}`);
+            throw new Error(`Refusing to overwrite existing file: ${to}`, {
+                cause: error,
+            });
         }
         throw error;
     }
@@ -394,7 +396,9 @@ async function writeGeneratedFile(to, text, overwrite = false) {
     }
     catch (error) {
         if (isNodeError(error) && error.code === "EEXIST") {
-            throw new Error(`Refusing to overwrite existing file: ${to}`);
+            throw new Error(`Refusing to overwrite existing file: ${to}`, {
+                cause: error,
+            });
         }
         throw error;
     }
@@ -447,7 +451,9 @@ async function commitStagedProject(stagingRoot, targetRoot) {
                 // The target disappeared between the emptiness check and commit.
             }
             else if (isNodeError(error) && error.code === "ENOTEMPTY") {
-                throw new Error(`Target directory is not empty: ${targetRoot}`);
+                throw new Error(`Target directory is not empty: ${targetRoot}`, {
+                    cause: error,
+                });
             }
             else {
                 throw error;
@@ -460,7 +466,9 @@ async function commitStagedProject(stagingRoot, targetRoot) {
     catch (error) {
         if (isNodeError(error) &&
             ["EEXIST", "ENOTEMPTY", "ENOTDIR", "EISDIR"].includes(error.code ?? "")) {
-            throw new Error(`Refusing to overwrite existing target: ${targetRoot}`);
+            throw new Error(`Refusing to overwrite existing target: ${targetRoot}`, {
+                cause: error,
+            });
         }
         throw error;
     }

package/{dist/src → node_modules/@ykdz/template-core/dist}/runtime-paths.js

@@ -2,6 +2,8 @@ import { existsSync } from "node:fs";
 import path from "node:path";
 export function packageTemplateRoot(moduleDir, ...segments) {
     const candidates = [
+        path.join(moduleDir, "..", "..", "builtin-source", "templates", ...segments),
+        path.join(moduleDir, "..", "..", "template-builtin-source", "templates", ...segments),
         path.join(moduleDir, "..", "..", "templates", ...segments),
         path.join(moduleDir, "..", "templates", ...segments),
         path.join(moduleDir, "..", "..", "..", "templates", ...segments),

package/{dist/src → node_modules/@ykdz/template-core/dist}/template-boundary-check.d.ts

@@ -18,7 +18,7 @@ export type TemplateBoundaryCheckProjection = {
     readonly sourceFilePath: string;
     readonly plan: {
         readonly sourceRoot: string;
-        readonly sourceRoots?: Record<string, string>;
+        readonly sourceRoots?: Record<string, string> | undefined;
         readonly operations: readonly RenderOperation[];
     };
 };

package/{dist/src → node_modules/@ykdz/template-core/dist}/template-boundary-check.js

@@ -233,14 +233,12 @@ function jsonValuesEqual(left, right) {
         return false;
     }
     const leftEntries = Object.entries(left);
-    const rightRecord = right;
-    const rightKeys = new Set(Object.keys(rightRecord));
-    return (leftEntries.length === rightKeys.size &&
+    const rightEntries = Object.entries(right);
+    const rightValues = new Map(rightEntries);
+    return (leftEntries.length === rightEntries.length &&
         leftEntries.every(([key, value]) => {
-            rightKeys.delete(key);
-            return jsonValuesEqual(value, rightRecord[key]);
-        }) &&
-        rightKeys.size === 0);
+            return (rightValues.has(key) && jsonValuesEqual(value, rightValues.get(key)));
+        }));
 }
 function expressionMatchesJsonValue(expression, expectedValue) {
     const literalValue = expressionLiteralJsonValue(expression);
@@ -383,12 +381,12 @@ function isStructuralTurboValue(value) {
     });
 }
 const rootTsconfigConfigCompilerOptions = {
-    module: "NodeNext",
-    moduleResolution: "NodeNext",
+    module: "nodenext",
+    moduleResolution: "nodenext",
     noEmitOnError: true,
     skipLibCheck: false,
     strict: true,
-    target: "ES2022",
+    target: "es2023",
 };
 const rootTsconfigConfigIncludes = new Set([
     "oxlint.config.ts",

package/{dist/src → node_modules/@ykdz/template-core/dist}/toolchain-resolution.d.ts

@@ -14,15 +14,15 @@ export type ResolvedToolchainVersions = {
     readonly diagnostics: string[];
 };
 export type ResolveToolchainVersionsOptions = {
-    readonly source?: ToolchainResolutionSource | "auto";
-    readonly fetchJson?: (url: string) => Promise<unknown>;
-    readonly nodeReleaseIndexUrl?: string;
-    readonly pnpmRegistryUrl?: string;
+    readonly source?: ToolchainResolutionSource | "auto" | undefined;
+    readonly fetchJson?: ((url: string) => Promise<unknown>) | undefined;
+    readonly nodeReleaseIndexUrl?: string | undefined;
+    readonly pnpmRegistryUrl?: string | undefined;
 };
 export declare const nodeReleaseIndexUrl = "https://nodejs.org/dist/index.json";
 export declare const pnpmRegistryUrl = "https://registry.npmjs.org/pnpm";
 type OnlineToolchainResolutionContractOptions = {
-    readonly fetchJson?: (url: string) => Promise<unknown>;
+    readonly fetchJson?: ((url: string) => Promise<unknown>) | undefined;
 };
 export type OnlineToolchainResolutionContractResult = {
     readonly nodeLtsMajor: NodeLtsMajor;

package/{dist/src → node_modules/@ykdz/template-core/dist}/toolchain-resolution.js

@@ -53,7 +53,7 @@ async function contractPhase(phase, operation) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Online toolchain resolution contract failed during ${phase}: ${message}`, error instanceof Error ? { cause: error } : undefined);
+        throw new Error(`Online toolchain resolution contract failed during ${phase}: ${message}`, { cause: error });
     }
 }
 function fallbackResult(diagnostics) {
@@ -122,15 +122,14 @@ function parsePnpmRegistryMetadata(value) {
         if (!isRecord(metadata)) {
             continue;
         }
-        versions[version] = {
-            engines: isRecord(metadata.engines)
-                ? {
-                    node: typeof metadata.engines.node === "string"
-                        ? metadata.engines.node
-                        : undefined,
-                }
-                : undefined,
-        };
+        const nodeRange = isRecord(metadata.engines)
+            ? metadata.engines.node
+            : undefined;
+        versions[version] = isRecord(metadata.engines)
+            ? {
+                engines: typeof nodeRange === "string" ? { node: nodeRange } : {},
+            }
+            : {};
     }
     return { versions };
 }
@@ -139,7 +138,7 @@ function latestCompatiblePnpmVersion(metadata, nodeMajor) {
         .filter(([version]) => /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(version))
         .filter(([, packageMetadata]) => nodeSatisfiesRange(nodeMajor, packageMetadata.engines?.node))
         .map(([version]) => version)
-        .sort(compareSemver);
+        .toSorted(compareSemver);
     const latest = candidates.at(-1);
     if (!latest) {
         throw new Error(`pnpm registry metadata did not contain a release compatible with Node ${nodeMajor}`);

package/node_modules/@ykdz/template-core/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "@ykdz/template-core",
+  "version": "0.0.9",
+  "private": true,
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "exports": {
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
+    }
+  },
+  "scripts": {
+    "build": "rm -rf dist && tsc -p tsconfig.build.json && cp ../../pnpm-workspace.yaml dist/pnpm-workspace.yaml",
+    "format:check": "oxfmt --check --config ../../oxfmt.config.ts --ignore-path ../../.oxfmtignore .",
+    "format:write": "oxfmt --write --config ../../oxfmt.config.ts --ignore-path ../../.oxfmtignore .",
+    "lint": "oxlint --config ../../oxlint.config.ts --ignore-pattern dist .",
+    "lint:fix": "oxlint --config ../../oxlint.config.ts --ignore-pattern dist . --fix",
+    "typecheck": "tsc -p tsconfig.json --noEmit"
+  },
+  "dependencies": {
+    "typescript": "catalog:",
+    "valibot": "catalog:"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "execa": "catalog:",
+    "oxfmt": "catalog:",
+    "oxlint": "catalog:",
+    "oxlint-tsgolint": "catalog:"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ykdz/template",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "private": false,
   "description": "Project template generator for YKDZ starter projects.",
   "keywords": [
@@ -18,17 +18,13 @@
     "url": "git+https://github.com/YKDZ/template.git"
   },
   "bin": {
-    "template": "dist/src/cli.js"
+    "template": "dist/cli.js"
   },
   "files": [
     "dist",
-    "pnpm-workspace.yaml",
-    "templates",
-    "!templates/registry.ts",
-    "!templates/projection-plans.ts",
-    "!templates/*/projection.ts",
-    "!templates/shared/oxc/tsconfig.json",
-    "!templates/**/node_modules"
+    "node_modules/@ykdz/template-core",
+    "node_modules/@ykdz/template-builtin-source",
+    "!**/node_modules/**/node_modules"
   ],
   "type": "module",
   "publishConfig": {
@@ -36,38 +32,29 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "valibot": "^1.4.2"
+    "valibot": "^1.4.2",
+    "@ykdz/template-builtin-source": "0.0.9",
+    "@ykdz/template-core": "0.0.9"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",
-    "execa": "^9.6.1",
     "oxfmt": "^0.57.0",
     "oxlint": "^1.72.0",
-    "oxlint-tsgolint": "^0.24.0",
-    "tsx": "^4.22.4",
-    "vitest": "^4.1.9",
-    "yaml": "^2.9.0"
+    "oxlint-tsgolint": "^0.24.0"
   },
+  "bundleDependencies": [
+    "@ykdz/template-builtin-source",
+    "@ykdz/template-core"
+  ],
   "engines": {
     "node": ">=24.0.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.build.json",
-    "check": "pnpm run check:format && pnpm run typecheck && pnpm run test && pnpm run check:generated && pnpm run check:templates",
-    "check:format": "oxfmt --check --config templates/shared/oxc/oxfmt.config.ts --ignore-path .oxfmtignore .",
-    "check:fixtures": "tsx scripts/check-fixtures.ts",
-    "check:generated": "tsx scripts/check-generated.ts",
-    "check:templates": "pnpm run check:templates:shared-oxc && pnpm run check:templates:github-yaml && pnpm run check:templates:boundary && pnpm run check:templates:static-source",
-    "check:toolchain:online": "tsx scripts/check-online-toolchain-resolution-contract.ts",
-    "check:templates:boundary": "tsx scripts/check-template-boundary.ts",
-    "check:templates:github-yaml": "tsx scripts/check-template-github-yaml.ts",
-    "check:templates:shared-oxc": "pnpm run check:templates:shared-oxc:format && pnpm run check:templates:shared-oxc:lint && pnpm run check:templates:shared-oxc:typecheck",
-    "check:templates:shared-oxc:format": "oxfmt --check templates/shared/oxc",
-    "check:templates:shared-oxc:lint": "oxlint templates/shared/oxc --deny-warnings",
-    "check:templates:shared-oxc:typecheck": "tsc -p templates/shared/oxc/tsconfig.json --noEmit",
-    "check:templates:static-source": "rustfmt --check templates/rust-bin/src/main.rs",
-    "fix": "pnpm run build",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run"
+    "format:check": "oxfmt --check --config ../../oxfmt.config.ts --ignore-path ../../.oxfmtignore .",
+    "format:write": "oxfmt --write --config ../../oxfmt.config.ts --ignore-path ../../.oxfmtignore .",
+    "lint": "oxlint --config ../../oxlint.config.ts --ignore-pattern dist .",
+    "lint:fix": "oxlint --config ../../oxlint.config.ts --ignore-pattern dist . --fix",
+    "typecheck": "tsc -p tsconfig.json --noEmit"
   }
 }

package/README.md

@@ -1,35 +0,0 @@
-# @ykdz/template
-
-Project template generator for YKDZ starter projects.
-
-## Usage
-
-```sh
-pnpm dlx @ykdz/template init my-project --preset ts-lib --yes
-```
-
-Available commands:
-
-```sh
-template init <dir> --preset <name> --yes
-template add package --preset <name> --name <name> [--path <package-path>]
-template presets
-template schema preset
-template schema blueprint
-template preset validate <path>
-template blueprint validate <path>
-```
-
-Supported presets are `ts-lib`, `hono-api`, `vue-app`, `vue-hono-app`, and
-`rust-bin`.
-
-## Publishing
-
-This package is intended to publish through npm Trusted Publishing from the
-GitHub Actions release workflow. Maintainers should complete
-[the Trusted Publishing checklist](docs/npm-trusted-publishing.md) before the
-first public release.
-
-## License
-
-MIT

package/dist/src/package-addition.d.ts

@@ -1,8 +0,0 @@
-export type AddPackageOptions = {
-    cwd: string;
-    preset: string;
-    name: string;
-    path?: string;
-    linkFrom?: readonly string[];
-};
-export declare function addPackage(options: AddPackageOptions): Promise<void>;

package/templates/shared/oxc/node/oxlint.config.ts

@@ -1,9 +0,0 @@
-import { defineConfig } from "oxlint";
-
-export default defineConfig({
-  categories: {
-    correctness: "error",
-    suspicious: "error",
-  },
-  plugins: ["typescript", "oxc"],
-});

package/templates/shared/oxc/vue/oxlint.config.ts

@@ -1,9 +0,0 @@
-import { defineConfig } from "oxlint";
-
-export default defineConfig({
-  categories: {
-    correctness: "error",
-    suspicious: "error",
-  },
-  plugins: ["typescript", "oxc", "vue"],
-});

package/templates/vue-app/env.d.ts

@@ -1 +0,0 @@
-/// <reference types="vite/client" />

package/templates/vue-hono-app/web/env.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_API_BASE_URL?: string;
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}