@ykdz/template 0.0.35 → 0.0.36

package/node_modules/@ykdz/template-core/dist/renderer.js

@@ -24,18 +24,6 @@ export function resolveTemplateSource(source, relativePath) {
     }
     return resolveContainedPath(root, relativePath);
 }
-function expandTemplatePath(templatePath, variables) {
-    return templatePath.replaceAll(/\{\{([A-Za-z][A-Za-z0-9_]*)\}\}/g, (_, name) => {
-        const value = variables[name];
-        if (!value) {
-            throw new Error(`Missing renderer variable: ${name}`);
-        }
-        if (!/^[A-Za-z0-9._-]+$/.test(value)) {
-            throw new Error(`Renderer variable ${name} is not safe for a path segment`);
-        }
-        return value;
-    });
-}
 function resolveContainedPath(root, relativePath) {
     if (path.isAbsolute(relativePath)) {
         throw new Error(`Renderer paths must be relative: ${relativePath}`);
@@ -49,13 +37,9 @@ function resolveContainedPath(root, relativePath) {
     }
     return resolvedPath;
 }
-function expandOperationPath(relativePath, options) {
-    return expandTemplatePath(relativePath, options.variables ?? {});
-}
 async function renderCopyFile(operation, options) {
-    const variables = options.variables ?? {};
-    const from = resolveTemplateSource(operation.source, expandTemplatePath(operation.from, variables));
-    const to = resolveContainedPath(options.targetRoot, expandTemplatePath(operation.to, variables));
+    const from = resolveTemplateSource(operation.source, operation.from);
+    const to = resolveContainedPath(options.targetRoot, operation.to);
     const sourceMode = (await stat(from)).mode;
     await mkdir(path.dirname(to), { recursive: true });
     await copyGeneratedFile(from, to, operation.overwrite ?? false);
@@ -126,21 +110,20 @@ async function writeJsonFile(targetRoot, toPath, value, multilineArrays, keyOrde
         : new Map(nestedKeyOrder.map((key, index) => [key, index]))), overwrite);
 }
 async function renderWriteJson(operation, options) {
-    await writeJsonFile(options.targetRoot, expandOperationPath(operation.to, options), operation.value, operation.multilineArrays, operation.keyOrder, operation.nestedKeyOrder, operation.overwrite);
+    await writeJsonFile(options.targetRoot, operation.to, operation.value, operation.multilineArrays, operation.keyOrder, operation.nestedKeyOrder, operation.overwrite);
 }
 async function renderMergeJson(operation, options) {
     await mergeJsonIntoFile({
         options,
         patch: operation.value,
-        toPath: expandOperationPath(operation.to, options),
+        toPath: operation.to,
         multilineArrays: operation.multilineArrays,
         keyOrder: operation.keyOrder,
         nestedKeyOrder: operation.nestedKeyOrder,
     });
 }
 async function renderMergeJsonTemplate(operation, options) {
-    const variables = options.variables ?? {};
-    const sourcePath = resolveTemplateSource(operation.source, expandTemplatePath(operation.from, variables));
+    const sourcePath = resolveTemplateSource(operation.source, operation.from);
     let patch;
     try {
         patch = JSON.parse(await readFile(sourcePath, "utf8"));
@@ -151,7 +134,7 @@ async function renderMergeJsonTemplate(operation, options) {
     await mergeJsonIntoFile({
         options,
         patch,
-        toPath: expandOperationPath(operation.to, options),
+        toPath: operation.to,
         multilineArrays: operation.multilineArrays,
         keyOrder: operation.keyOrder,
         nestedKeyOrder: operation.nestedKeyOrder,
@@ -171,16 +154,14 @@ async function mergeJsonIntoFile(options) {
     await writeJsonFile(options.options.targetRoot, options.toPath, mergeJsonValue(existing, options.patch), options.multilineArrays, options.keyOrder, options.nestedKeyOrder, true);
 }
 async function renderWriteText(operation, options) {
-    const toPath = expandOperationPath(operation.to, options);
-    const to = resolveContainedPath(options.targetRoot, toPath);
+    const to = resolveContainedPath(options.targetRoot, operation.to);
     await mkdir(path.dirname(to), { recursive: true });
     await writeGeneratedFile(to, operation.text);
 }
-async function loadTextFragments(operation, options) {
+async function loadTextFragments(operation) {
     return Promise.all(operation.fragments.map(async (fragment) => {
-        const fromPath = expandTemplatePath(fragment.from, options.variables ?? {});
-        const from = resolveTemplateSource(fragment.source, fromPath);
-        return { from: fromPath, text: await readFile(from, "utf8") };
+        const from = resolveTemplateSource(fragment.source, fragment.from);
+        return { from: fragment.from, text: await readFile(from, "utf8") };
     }));
 }
 async function validateDevelopmentContainerDockerfileOperation(operation, fragments) {
@@ -212,16 +193,15 @@ async function preflightDevelopmentContainerDockerfiles(options) {
             operation.validation !== "development-container-dockerfile") {
             continue;
         }
-        const fragments = await loadTextFragments(operation, options);
+        const fragments = await loadTextFragments(operation);
         await validateDevelopmentContainerDockerfileOperation(operation, fragments);
         loadedFragments.set(operation, fragments);
     }
     return loadedFragments;
 }
 async function renderWriteTextFromFragments(operation, options, preloadedFragments) {
-    const toPath = expandOperationPath(operation.to, options);
-    const to = resolveContainedPath(options.targetRoot, toPath);
-    const fragments = preloadedFragments ?? (await loadTextFragments(operation, options));
+    const to = resolveContainedPath(options.targetRoot, operation.to);
+    const fragments = preloadedFragments ?? (await loadTextFragments(operation));
     await validateDevelopmentContainerDockerfileOperation(operation, fragments);
     await mkdir(path.dirname(to), { recursive: true });
     await writeGeneratedFile(to, fragments.map(({ text }) => text.trimEnd()).join("\n\n") + "\n", operation.overwrite ?? false);
@@ -244,15 +224,14 @@ function replaceTextTemplateVariables(sourceText, replacements) {
     return rendered;
 }
 async function renderWriteTextTemplate(operation, options) {
-    const toPath = expandOperationPath(operation.to, options);
-    const from = resolveTemplateSource(operation.source, expandTemplatePath(operation.from, options.variables ?? {}));
-    const to = resolveContainedPath(options.targetRoot, toPath);
+    const from = resolveTemplateSource(operation.source, operation.from);
+    const to = resolveContainedPath(options.targetRoot, operation.to);
     const sourceText = await readFile(from, "utf8");
     await mkdir(path.dirname(to), { recursive: true });
     await writeGeneratedFile(to, replaceTextTemplateVariables(sourceText, operation.replacements), operation.overwrite);
 }
 async function renderSetExecutable(operation, options) {
-    const filePath = resolveContainedPath(options.targetRoot, expandOperationPath(operation.path, options));
+    const filePath = resolveContainedPath(options.targetRoot, operation.path);
     const currentMode = (await stat(filePath)).mode;
     const executeBits = 0o111;
     const mode = operation.executable
@@ -314,7 +293,7 @@ async function renderReplaceAnchors(operation, options) {
     if (operation.language !== "typescript") {
         throw new Error("Checked Transform Anchor only supports TypeScript");
     }
-    const filePath = resolveContainedPath(options.targetRoot, expandOperationPath(operation.path, options));
+    const filePath = resolveContainedPath(options.targetRoot, operation.path);
     const sourceText = await readFile(filePath, "utf8");
     const ranges = await findTypeScriptAnchorRanges(sourceText);
     for (const anchorName of Object.keys(operation.replacements)) {

package/node_modules/@ykdz/template-core/dist/template-boundary-check.d.ts

@@ -1,4 +1,4 @@
-import type { ProjectBlueprintV2 } from "./project-blueprint-v2.ts";
+import type { ProjectBlueprint } from "./project-blueprint.ts";
 import { type RenderOperation } from "./renderer.ts";
 export type TemplateBoundaryViolation = {
     readonly preset: string;
@@ -43,7 +43,7 @@ export type CheckTemplateSourceBoundaryOptions = {
         readonly planningContribution?: string;
         readonly generatedPath: ".github/workflows/check.yml";
         /** The original Blueprint, before Foundation composes workflow facts. */
-        readonly blueprint: ProjectBlueprintV2;
+        readonly blueprint: ProjectBlueprint;
         /** Raw Package Contribution declarations, not the composed plan field. */
         readonly diagnosticArtifactDeclarations: readonly unknown[];
         readonly operations: readonly RenderOperation[];

package/node_modules/@ykdz/template-core/dist/template-boundary-check.js

@@ -70,6 +70,12 @@ export function isProtectedGeneratedPath(generatedPath) {
         normalizedPath === ".github/dependabot.yml" ||
         normalizedPath.startsWith(".github/workflows/") ||
         normalizedPath.startsWith(".vscode/") ||
+        normalizedPath.startsWith("scripts/npm-publication/") ||
+        normalizedPath.startsWith("scripts/npm-publication-setup/") ||
+        fileName === "CHANGELOG.md" ||
+        fileName === "LICENSE" ||
+        fileName === "README.md" ||
+        fileName === "RELEASING.md" ||
         fileName === "oxfmt.config.ts" ||
         fileName === "oxlint.config.ts" ||
         fileName === "playwright.config.ts" ||

package/node_modules/@ykdz/template-core/dist/toolchain-resolution.d.ts

@@ -32,4 +32,6 @@ export type OnlineToolchainResolutionContractResult = {
 };
 export declare function resolveToolchainVersions(options?: ResolveToolchainVersionsOptions): Promise<ResolvedToolchainVersions>;
 export declare function checkOnlineToolchainResolutionContract(options?: OnlineToolchainResolutionContractOptions): Promise<OnlineToolchainResolutionContractResult>;
+export declare function isValidNodeLtsMajor(value: string): boolean;
+export declare function isValidPackageManagerPin(value: string): boolean;
 export {};

package/node_modules/@ykdz/template-core/dist/toolchain-resolution.js

@@ -2,7 +2,7 @@ export const nodeReleaseIndexUrl = "https://nodejs.org/dist/index.json";
 export const pnpmRegistryUrl = "https://registry.npmjs.org/pnpm";
 const bundledFallbackToolchain = {
     nodeLtsMajor: nodeLtsMajor("24"),
-    packageManagerPin: packageManagerPin("11.11.0"),
+    packageManagerPin: packageManagerPin("11.21.0"),
 };
 export async function resolveToolchainVersions(options = {}) {
     const source = options.source ?? "online";
@@ -66,14 +66,20 @@ function fallbackResult(diagnostics) {
         diagnostics,
     };
 }
+export function isValidNodeLtsMajor(value) {
+    return /^\d+$/.test(value);
+}
+export function isValidPackageManagerPin(value) {
+    return /^pnpm@\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(value);
+}
 function nodeLtsMajor(value) {
-    if (!/^\d+$/.test(value)) {
+    if (!isValidNodeLtsMajor(value)) {
         throw new Error(`Invalid Node LTS major: ${value}`);
     }
     return { kind: "NodeLtsMajor", value };
 }
 function packageManagerPin(version) {
-    if (!/^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(version)) {
+    if (!isValidPackageManagerPin(`pnpm@${version}`)) {
         throw new Error(`Invalid pnpm version: ${version}`);
     }
     return { kind: "PackageManagerPin", value: `pnpm@${version}` };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ykdz/template",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "private": false,
   "description": "Project template generator for YKDZ starter projects.",
   "keywords": [
@@ -60,16 +60,16 @@
     "semver": "^7.8.5",
     "typescript": "npm:typescript@^6.0.3",
     "valibot": "^1.4.2",
-    "@ykdz/template-core": "0.0.0",
-    "@ykdz/template-builtin-presets": "0.0.0"
+    "@ykdz/template-builtin-presets": "0.0.0",
+    "@ykdz/template-core": "0.0.0"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
     "@ykdz/template-builtin-presets-source": "link:../builtin-presets",
     "@ykdz/template-core-source": "link:../core",
-    "execa": "^10.0.0",
+    "execa": "^10.0.1",
     "oxfmt": "^0.58.0",
-    "oxlint": "^1.73.0",
+    "oxlint": "^1.77.0",
     "oxlint-tsgolint": "^7.0.2001",
     "typescript-7": "npm:typescript@^7.0.2",
     "vitest": "^4.1.10"

package/node_modules/@ykdz/template-core/dist/project-blueprint-v2.d.ts

@@ -1,33 +0,0 @@
-/**
- * The durable, preset-agnostic topology used by local template follow-up
- * operations. Preset provenance deliberately belongs in Generation Record.
- */
-export type PackageRole = "cli-tool" | "runtime-service" | "shared-library" | "native-package";
-export type PackageDefinition = {
-    readonly name: string;
-    readonly path: string;
-    readonly role: PackageRole;
-};
-export type PackageLinkIntent = {
-    readonly consumerPackagePath: string;
-    readonly providerPackagePath: string;
-};
-export type ProjectBlueprintV2 = {
-    readonly schemaVersion: 2;
-    readonly packages: readonly PackageDefinition[];
-    readonly packageLinkIntents?: readonly PackageLinkIntent[];
-};
-export type BlueprintV2ValidationIssue = {
-    readonly path: string;
-    readonly message: string;
-};
-export type BlueprintV2ValidationResult = {
-    readonly ok: true;
-    readonly value: ProjectBlueprintV2;
-} | {
-    readonly ok: false;
-    readonly issues: readonly BlueprintV2ValidationIssue[];
-};
-/** Validates persisted metadata before it is used to plan or render changes. */
-export declare function validateProjectBlueprintV2(value: unknown): BlueprintV2ValidationResult;
-export declare function assertProjectBlueprintV2(value: unknown): ProjectBlueprintV2;

package/node_modules/@ykdz/template-core/dist/project-blueprint-v2.js

@@ -1,182 +0,0 @@
-const packageName = /^@[a-z0-9][a-z0-9-]*\/[a-z0-9][a-z0-9-]*$/;
-const packagePath = /^[a-z0-9][a-z0-9-]*\/[a-z0-9][a-z0-9-]*$/;
-const reservedWorkspaceCollections = new Set([
-    ".git",
-    ".github",
-    ".devcontainer",
-    ".template",
-    "node_modules",
-    "dist",
-    "target",
-]);
-const roles = new Set([
-    "cli-tool",
-    "runtime-service",
-    "shared-library",
-    "native-package",
-]);
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function reportUnknownKeys(value, allowed, path, issues) {
-    for (const key of Object.keys(value)) {
-        if (!allowed.includes(key)) {
-            issues.push({
-                path: `${path}.${key}`,
-                message: "Unknown Blueprint v2 field",
-            });
-        }
-    }
-}
-/** Validates persisted metadata before it is used to plan or render changes. */
-export function validateProjectBlueprintV2(value) {
-    const issues = [];
-    if (!isRecord(value)) {
-        return {
-            ok: false,
-            issues: [
-                { path: ".", message: "Local Template Metadata must be an object" },
-            ],
-        };
-    }
-    reportUnknownKeys(value, ["schemaVersion", "packages", "packageLinkIntents"], ".", issues);
-    if (value.schemaVersion !== 2) {
-        issues.push({
-            path: ".schemaVersion",
-            message: `Unsupported Local Template Metadata schema version ${String(value.schemaVersion)}; expected 2`,
-        });
-    }
-    if (!Array.isArray(value.packages)) {
-        issues.push({
-            path: ".packages",
-            message: "Package Definitions must be an array",
-        });
-    }
-    const definitions = [];
-    if (Array.isArray(value.packages)) {
-        for (const [index, item] of value.packages.entries()) {
-            const itemPath = `.packages[${index}]`;
-            if (!isRecord(item)) {
-                issues.push({
-                    path: itemPath,
-                    message: "Package Definition must be an object",
-                });
-                continue;
-            }
-            reportUnknownKeys(item, ["name", "path", "role"], itemPath, issues);
-            const workspaceCollection = typeof item.path === "string" ? item.path.split("/", 1)[0] : undefined;
-            const usesReservedWorkspaceCollection = workspaceCollection !== undefined &&
-                reservedWorkspaceCollections.has(workspaceCollection);
-            if (typeof item.name !== "string" || !packageName.test(item.name)) {
-                issues.push({
-                    path: `${itemPath}.name`,
-                    message: "Package name must be a scoped lowercase package name",
-                });
-            }
-            if (usesReservedWorkspaceCollection) {
-                issues.push({
-                    path: `${itemPath}.path`,
-                    message: `Package Path ${item.path} uses reserved workspace collection ${workspaceCollection}`,
-                });
-            }
-            else if (typeof item.path !== "string" ||
-                !packagePath.test(item.path)) {
-                issues.push({
-                    path: `${itemPath}.path`,
-                    message: "Package Path must be exactly two safe path segments",
-                });
-            }
-            if (typeof item.role !== "string" ||
-                !roles.has(item.role)) {
-                issues.push({
-                    path: `${itemPath}.role`,
-                    message: "Package Role must be cli-tool, runtime-service, shared-library, or native-package",
-                });
-            }
-            if (typeof item.name === "string" &&
-                typeof item.path === "string" &&
-                typeof item.role === "string" &&
-                packageName.test(item.name) &&
-                packagePath.test(item.path) &&
-                !usesReservedWorkspaceCollection &&
-                roles.has(item.role)) {
-                definitions.push(item);
-            }
-        }
-    }
-    for (const [property, label] of [
-        ["name", "Package name"],
-        ["path", "Package Path"],
-    ]) {
-        const seen = new Set();
-        for (const definition of definitions) {
-            const member = definition[property];
-            if (seen.has(member))
-                issues.push({
-                    path: ".packages",
-                    message: `${label} must be unique: ${member}`,
-                });
-            seen.add(member);
-        }
-    }
-    if (value.packageLinkIntents !== undefined &&
-        !Array.isArray(value.packageLinkIntents)) {
-        issues.push({
-            path: ".packageLinkIntents",
-            message: "Package Link Intents must be an array",
-        });
-    }
-    const paths = new Set(definitions.map((definition) => definition.path));
-    const links = new Set();
-    if (Array.isArray(value.packageLinkIntents)) {
-        for (const [index, item] of value.packageLinkIntents.entries()) {
-            const itemPath = `.packageLinkIntents[${index}]`;
-            if (!isRecord(item)) {
-                issues.push({
-                    path: itemPath,
-                    message: "Package Link Intent must be an object",
-                });
-                continue;
-            }
-            reportUnknownKeys(item, ["consumerPackagePath", "providerPackagePath"], itemPath, issues);
-            const consumer = item.consumerPackagePath;
-            const provider = item.providerPackagePath;
-            if (typeof consumer !== "string" || !paths.has(consumer))
-                issues.push({
-                    path: `${itemPath}.consumerPackagePath`,
-                    message: "Package Link Intent references an unknown consumer package",
-                });
-            if (typeof provider !== "string" || !paths.has(provider))
-                issues.push({
-                    path: `${itemPath}.providerPackagePath`,
-                    message: "Package Link Intent references an unknown provider package",
-                });
-            if (consumer === provider && typeof consumer === "string")
-                issues.push({
-                    path: itemPath,
-                    message: "Package Link Intent cannot link a package to itself",
-                });
-            if (typeof consumer === "string" && typeof provider === "string") {
-                const key = `${consumer}\u0000${provider}`;
-                if (links.has(key))
-                    issues.push({
-                        path: itemPath,
-                        message: "Package Link Intent must be unique",
-                    });
-                links.add(key);
-            }
-        }
-    }
-    return issues.length === 0
-        ? { ok: true, value: value }
-        : { ok: false, issues };
-}
-export function assertProjectBlueprintV2(value) {
-    const result = validateProjectBlueprintV2(value);
-    if (!result.ok) {
-        throw new Error(result.issues
-            .map((issue) => `${issue.path}: ${issue.message}`)
-            .join("\n"));
-    }
-    return result.value;
-}