@ykdz/template 0.0.40 → 0.0.42

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

@@ -47,6 +47,7 @@ export type MergeJsonTemplateOperation = {
     from: string;
     to: string;
     source: TemplateSourceHandle;
+    replacements?: Record<string, string>;
     multilineArrays?: string[];
     keyOrder?: readonly string[];
     nestedKeyOrder?: readonly string[];

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

@@ -124,13 +124,17 @@ async function renderMergeJson(operation, options) {
 }
 async function renderMergeJsonTemplate(operation, options) {
     const sourcePath = resolveTemplateSource(operation.source, operation.from);
+    const sourceText = await readFile(sourcePath, "utf8");
     let patch;
     try {
-        patch = JSON.parse(await readFile(sourcePath, "utf8"));
+        patch = JSON.parse(sourceText);
     }
     catch (error) {
         throw new Error(`Invalid JSON Template Source ${operation.from}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
     }
+    if (operation.replacements !== undefined) {
+        patch = replaceJsonTemplateVariables(patch, operation.replacements);
+    }
     await mergeJsonIntoFile({
         options,
         patch,
@@ -140,6 +144,40 @@ async function renderMergeJsonTemplate(operation, options) {
         nestedKeyOrder: operation.nestedKeyOrder,
     });
 }
+function replaceJsonTemplateVariables(value, replacements) {
+    const used = new Set();
+    const replaceString = (source) => source.replaceAll(/\{\{([A-Za-z][A-Za-z0-9_]*)\}\}/g, (_placeholder, name) => {
+        const replacement = replacements[name];
+        if (replacement === undefined) {
+            throw new Error(`JSON 模板缺少变量：${name}`);
+        }
+        used.add(name);
+        return replacement;
+    });
+    const visit = (current) => {
+        if (typeof current === "string") {
+            return replaceString(current);
+        }
+        if (Array.isArray(current)) {
+            return current.map(visit);
+        }
+        if (typeof current === "object" && current !== null) {
+            const entries = Object.entries(current).map(([key, nestedValue]) => [replaceString(key), visit(nestedValue)]);
+            if (new Set(entries.map(([key]) => key)).size !== entries.length) {
+                throw new Error("JSON 模板变量替换后产生重复对象键");
+            }
+            return Object.fromEntries(entries);
+        }
+        return current;
+    };
+    const rendered = visit(value);
+    for (const name of Object.keys(replacements)) {
+        if (!used.has(name)) {
+            throw new Error(`JSON 模板替换项未被使用：${name}`);
+        }
+    }
+    return rendered;
+}
 async function mergeJsonIntoFile(options) {
     const to = resolveContainedPath(options.options.targetRoot, options.toPath);
     let existing = {};

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

@@ -612,14 +612,20 @@ const workflowTemplateVariants = new Map([
         ".github/workflows/check-diagnostics.yml",
         {
             operationKind: "writeTextTemplate",
-            replacementKeys: ["DIAGNOSTIC_OWNER_PATHS"],
+            replacementKeys: [
+                "PLAYWRIGHT_DIAGNOSTIC_OWNER_PATHS",
+                "VITEST_BROWSER_DIAGNOSTIC_OWNER_PATHS",
+            ],
         },
     ],
     [
         ".github/workflows/check-deployment-diagnostics.yml",
         {
             operationKind: "writeTextTemplate",
-            replacementKeys: ["DIAGNOSTIC_OWNER_PATHS"],
+            replacementKeys: [
+                "PLAYWRIGHT_DIAGNOSTIC_OWNER_PATHS",
+                "VITEST_BROWSER_DIAGNOSTIC_OWNER_PATHS",
+            ],
         },
     ],
 ]);
@@ -650,20 +656,25 @@ function isSafePackageBoundaryPath(value) {
 function expectedDiagnosticOwnerPaths(options) {
     const blueprintPackagePaths = options.blueprint.packages.map((packageDefinition) => packageDefinition.path);
     if (!blueprintPackagePaths.every(isSafePackageBoundaryPath)) {
-        return { valid: false, value: "" };
+        return { valid: false, playwright: "", vitestBrowser: "" };
     }
     const blueprintOwners = new Set(blueprintPackagePaths);
-    const owners = new Set();
+    const owners = {
+        playwright: new Set(),
+        "vitest-browser": new Set(),
+    };
     for (const declaration of options.diagnosticArtifactDeclarations) {
         if (!isRecord(declaration) ||
             !hasExactKeys(declaration, ["kind", "owner"])) {
-            return { valid: false, value: "" };
+            return { valid: false, playwright: "", vitestBrowser: "" };
         }
-        if (declaration.kind !== "playwright" || !isRecord(declaration.owner)) {
-            return { valid: false, value: "" };
+        if ((declaration.kind !== "playwright" &&
+            declaration.kind !== "vitest-browser") ||
+            !isRecord(declaration.owner)) {
+            return { valid: false, playwright: "", vitestBrowser: "" };
         }
         if (!hasExactKeys(declaration.owner, ["kind", "path"])) {
-            return { valid: false, value: "" };
+            return { valid: false, playwright: "", vitestBrowser: "" };
         }
         const ownerPath = declaration.owner.path;
         const workspaceOwner = declaration.owner.kind === "workspace-orchestration" && ownerPath === ".";
@@ -672,13 +683,16 @@ function expectedDiagnosticOwnerPaths(options) {
             isSafePackageBoundaryPath(ownerPath) &&
             blueprintOwners.has(ownerPath);
         if (!workspaceOwner && !packageOwner) {
-            return { valid: false, value: "" };
+            return { valid: false, playwright: "", vitestBrowser: "" };
         }
-        owners.add(ownerPath);
+        owners[declaration.kind].add(ownerPath);
     }
     return {
         valid: true,
-        value: [...owners].toSorted().join("\n            "),
+        playwright: [...owners.playwright].toSorted().join("\n            "),
+        vitestBrowser: [...owners["vitest-browser"]]
+            .toSorted()
+            .join("\n            "),
     };
 }
 function sourceFileForWorkflowOperation(options) {
@@ -723,21 +737,25 @@ async function protectedWorkflowProjectionViolations(plans) {
             : undefined;
         const replacementValid = operation?.kind === "writeTextTemplate" &&
             hasExactReplacementKeys(operation.replacements, [
-                "DIAGNOSTIC_OWNER_PATHS",
+                "PLAYWRIGHT_DIAGNOSTIC_OWNER_PATHS",
+                "VITEST_BROWSER_DIAGNOSTIC_OWNER_PATHS",
             ]) &&
-            operation.replacements.DIAGNOSTIC_OWNER_PATHS ===
-                expectedDiagnosticOwners.value;
+            operation.replacements.PLAYWRIGHT_DIAGNOSTIC_OWNER_PATHS ===
+                expectedDiagnosticOwners.playwright &&
+            operation.replacements.VITEST_BROWSER_DIAGNOSTIC_OWNER_PATHS ===
+                expectedDiagnosticOwners.vitestBrowser;
         const sourceBackedExactlyOnce = matchingOperations.length === 1 &&
             operation !== undefined &&
             (operation.kind === "copyFile" || operation.kind === "writeTextTemplate");
-        const diagnosticsExpected = expectedDiagnosticOwners.value !== "";
+        const diagnosticsExpected = expectedDiagnosticOwners.playwright !== "" ||
+            expectedDiagnosticOwners.vitestBrowser !== "";
         const operationValid = expectedDiagnosticOwners.valid &&
             sourceBackedExactlyOnce &&
             variant !== undefined &&
             operation?.kind === variant.operationKind &&
             (operation.kind === "copyFile"
                 ? variant.replacementKeys.length === 0 && !diagnosticsExpected
-                : variant.replacementKeys.length === 1 &&
+                : variant.replacementKeys.length === 2 &&
                     diagnosticsExpected &&
                     replacementValid);
         if (operationValid)

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

@@ -36,10 +36,5 @@
   },
   "peerDependencies": {
     "typescript": ">=6 <7"
-  },
-  "turbo": {
-    "tags": [
-      "template-core"
-    ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ykdz/template",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "private": false,
   "description": "Project template generator for YKDZ starter projects.",
   "keywords": [
@@ -67,8 +67,7 @@
     "oxfmt": "^0.71.0",
     "oxlint": "^1.77.0",
     "oxlint-tsgolint": "^7.0.2001",
-    "typescript-7": "npm:typescript@^7.0.2",
-    "vitest": "^5.0.0"
+    "typescript-7": "npm:typescript@^7.0.2"
   },
   "bundleDependencies": [
     "@valibot/to-json-schema",
@@ -88,11 +87,6 @@
   "engines": {
     "node": "^24.21.0"
   },
-  "turbo": {
-    "tags": [
-      "template-cli"
-    ]
-  },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.build.json",
     "format:check": "oxfmt --list-different --config ../../oxfmt.config.ts .",
@@ -100,8 +94,8 @@
     "lint": "oxlint --quiet --format=unix --config ../../oxlint.config.ts --ignore-pattern dist .",
     "lint:fix": "oxlint --format=unix --config ../../oxlint.config.ts --ignore-pattern dist . --fix",
     "pack:bundled": "pnpm --config.node-linker=hoisted pack",
-    "publish:bundled": "pnpm --config.node-linker=hoisted publish",
-    "test": "vitest run --config vitest.config.ts test/unit test/integration --reporter=verbose",
+    "test": "node --conditions=source --experimental-strip-types --test --test-concurrency=2 --test-timeout=60000 --test-reporter=spec --test-reporter=@ykdz/template-builtin-presets/node-test-count-reporter --test-reporter-destination=stdout --test-reporter-destination=stderr 'test/**/*.light.test.ts'",
+    "test:integration": "node --conditions=source --experimental-strip-types --test --test-concurrency=1 --test-timeout=300000 --test-reporter=spec --test-reporter=@ykdz/template-builtin-presets/node-test-count-reporter --test-reporter-destination=stdout --test-reporter-destination=stderr 'test/**/*.integration.test.ts'",
     "test:e2e": "node --conditions=source test/e2e/check-source-and-distribution.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit --pretty false"
   }

package/node_modules/@ykdz/template-builtin-presets/templates/rust-bin/.github/workflows/check.yml

@@ -1,23 +0,0 @@
-name: Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
-        with:
-          node-version-file: package.json
-      - run: corepack enable
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: rustfmt, clippy
-      - uses: Swatinem/rust-cache@v2
-      - run: pnpm install
-      - run: pnpm run check

package/node_modules/@ykdz/template-builtin-presets/templates/ts-lib/.github/workflows/check.yml

@@ -1,19 +0,0 @@
-name: Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
-        with:
-          node-version-file: package.json
-      - run: corepack enable
-      - run: pnpm install
-      - run: pnpm run check

package/node_modules/@ykdz/template-builtin-presets/templates/vue-app/.github/workflows/check.yml

@@ -1,20 +0,0 @@
-name: Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
-        with:
-          node-version-file: package.json
-      - run: corepack enable
-      - run: pnpm install
-      - run: pnpm --filter ./apps/web exec playwright install --with-deps chromium
-      - run: pnpm run check

package/node_modules/@ykdz/template-builtin-presets/templates/vue-app/vitest.config.ts

@@ -1,8 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  test: {
-    exclude: ["test/e2e/**", "node_modules/**", "dist/**"],
-    globals: true,
-  },
-});

package/node_modules/@ykdz/template-builtin-presets/templates/vue-hono-app/api/vitest.config.ts

@@ -1,15 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  resolve: {
-    conditions: ["source"],
-  },
-  ssr: {
-    resolve: {
-      conditions: ["source"],
-    },
-  },
-  test: {
-    globals: true,
-  },
-});

package/node_modules/@ykdz/template-builtin-presets/templates/vue-hono-app/web/vitest.config.ts

@@ -1,10 +0,0 @@
-import vue from "@vitejs/plugin-vue";
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  plugins: [vue()],
-  test: {
-    exclude: ["test/e2e/**", "node_modules/**", "dist/**"],
-    globals: true,
-  },
-});