@ykdz/template 0.0.17 → 0.0.19

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/web/scripts/run-playwright.ts

@@ -0,0 +1,62 @@
+import { spawn } from "node:child_process";
+import { createServer } from "node:net";
+
+async function availablePort(): Promise<string> {
+  return await new Promise((resolve, reject) => {
+    const server = createServer();
+
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+
+      if (typeof address !== "object" || address === null) {
+        server.close(() => {
+          reject(new Error("Could not allocate a Playwright web port"));
+        });
+        return;
+      }
+
+      const port = String(address.port);
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+
+        resolve(port);
+      });
+    });
+  });
+}
+
+async function playwrightEnv(): Promise<NodeJS.ProcessEnv> {
+  return {
+    ...process.env,
+    PLAYWRIGHT_WEB_PORT:
+      process.env.PLAYWRIGHT_WEB_PORT ?? (await availablePort()),
+  };
+}
+
+const env = await playwrightEnv();
+delete env.NO_COLOR;
+
+const command = process.platform === "win32" ? "playwright.cmd" : "playwright";
+const child = spawn(command, ["test", ...process.argv.slice(2)], {
+  env,
+  stdio: "inherit",
+});
+
+child.once("error", (error: Error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
+
+child.once("exit", (code: number | null, signal: NodeJS.Signals | null) => {
+  if (signal) {
+    console.error(`Playwright exited with signal ${signal}`);
+    process.exitCode = 1;
+    return;
+  }
+
+  process.exitCode = code ?? 1;
+});

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/{server → web/server}/app.ts

@@ -2,7 +2,7 @@ import vike from "@vikejs/hono";
 import { Hono } from "hono";
 import { Telefunc } from "telefunc/node";
 
-import { createDatabase } from "#/database/db";
+// @template-anchor db-package-import
 import { api } from "#/server/api";
 
 const telefunc = new Telefunc();

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/{test → web/test}/e2e/app.spec.ts

@@ -3,7 +3,7 @@ import { expect, test } from "@playwright/test";
 test("renders the Vike home page", async ({ page }) => {
   const todoTitle = `编写生成项目端到端测试 ${Date.now()}`;
 
-  await page.goto("/");
+  await page.goto("/", { waitUntil: "networkidle" });
   await expect(
     page.getByRole("heading", { name: "全栈 Vike 应用" }),
   ).toBeVisible();

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/web/turbo.json

@@ -0,0 +1,12 @@
+{
+  "extends": ["//"],
+  "tags": ["app"],
+  "tasks": {
+    "build:run": {
+      "outputs": ["dist/**"]
+    },
+    "test:e2e:run": {
+      "cache": false
+    }
+  }
+}

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/{types → web/types}/global.d.ts

@@ -1,4 +1,4 @@
-import type { Database } from "#/database/db";
+// @template-anchor db-package-import
 
 declare global {
   namespace Telefunc {

package/node_modules/@ykdz/template-builtin-source/templates/vike-app/{vite.config.ts → web/vite.config.ts}

@@ -14,6 +14,7 @@ export default defineConfig({
   resolve: {
     alias: {
       "#": fileURLToPath(new URL(".", import.meta.url)),
+      "#db": fileURLToPath(new URL("../../packages/db/src", import.meta.url)),
     },
   },
 });

package/node_modules/@ykdz/template-builtin-source/templates/vue-app/playwright.config.ts

@@ -1,15 +1,28 @@
 import { defineConfig, devices } from "@playwright/test";
 
+function requiredPort(name: string): number {
+  const value = process.env[name];
+
+  if (!value) {
+    throw new Error(`${name} must be set by scripts/run-playwright.ts`);
+  }
+
+  return Number(value);
+}
+
+const previewPort = requiredPort("PLAYWRIGHT_WEB_PORT");
+const previewUrl = `http://127.0.0.1:${previewPort}`;
+
 export default defineConfig({
   testDir: "./test/e2e",
   use: {
-    baseURL: "http://127.0.0.1:4173",
+    baseURL: previewUrl,
     trace: "on-first-retry",
   },
   webServer: {
-    command: "pnpm run preview --host 127.0.0.1 --port 4173",
+    command: `pnpm run preview --host 127.0.0.1 --port ${previewPort}`,
     reuseExistingServer: !process.env.CI,
-    url: "http://127.0.0.1:4173",
+    url: previewUrl,
   },
   projects: [
     {

package/node_modules/@ykdz/template-builtin-source/templates/vue-app/scripts/run-playwright.ts

@@ -1,6 +1,43 @@
 import { spawn } from "node:child_process";
+import { createServer } from "node:net";
 
-const env: NodeJS.ProcessEnv = { ...process.env };
+async function availablePort(): Promise<string> {
+  return await new Promise((resolve, reject) => {
+    const server = createServer();
+
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+
+      if (typeof address !== "object" || address === null) {
+        server.close(() => {
+          reject(new Error("Could not allocate a Playwright web port"));
+        });
+        return;
+      }
+
+      const port = String(address.port);
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+
+        resolve(port);
+      });
+    });
+  });
+}
+
+async function playwrightEnv(): Promise<NodeJS.ProcessEnv> {
+  return {
+    ...process.env,
+    PLAYWRIGHT_WEB_PORT:
+      process.env.PLAYWRIGHT_WEB_PORT ?? (await availablePort()),
+  };
+}
+
+const env = await playwrightEnv();
 delete env.NO_COLOR;
 
 const command = process.platform === "win32" ? "playwright.cmd" : "playwright";

package/node_modules/@ykdz/template-builtin-source/templates/vue-app/turbo.json

@@ -1,5 +1,6 @@
 {
   "extends": ["//"],
+  "tags": ["app"],
   "tasks": {
     "build:run": {
       "outputs": ["dist/**"]

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/api/turbo.json

@@ -1,5 +1,6 @@
 {
   "extends": ["//"],
+  "tags": ["app"],
   "tasks": {
     "build:run": {
       "outputs": ["dist/**"]

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

@@ -1,19 +1,17 @@
 import { defineConfig, devices } from "@playwright/test";
 
-function workspacePortOffset(): number {
-  let hash = 0;
+function requiredPort(name: string): number {
+  const value = process.env[name];
 
-  for (const character of process.cwd()) {
-    hash = (hash * 31 + character.charCodeAt(0)) % 5_000;
+  if (!value) {
+    throw new Error(`${name} must be set by scripts/run-playwright.ts`);
   }
 
-  return hash * 2;
+  return Number(value);
 }
 
-const fallbackApiPort = 43_000 + workspacePortOffset();
-const fallbackWebPort = fallbackApiPort + 1;
-const apiPort = Number(process.env.PLAYWRIGHT_API_PORT ?? fallbackApiPort);
-const webPort = Number(process.env.PLAYWRIGHT_WEB_PORT ?? fallbackWebPort);
+const apiPort = requiredPort("PLAYWRIGHT_API_PORT");
+const webPort = requiredPort("PLAYWRIGHT_WEB_PORT");
 const apiBaseUrl = `http://127.0.0.1:${apiPort}`;
 const apiHealthUrl = `${apiBaseUrl}/api/health`;
 const webBaseUrl = `http://127.0.0.1:${webPort}`;

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/web/scripts/run-playwright.ts

@@ -1,6 +1,84 @@
 import { spawn } from "node:child_process";
+import { createServer } from "node:net";
 
-const env: NodeJS.ProcessEnv = { ...process.env };
+async function listenOnAvailablePort(): Promise<{
+  readonly port: string;
+  readonly server: ReturnType<typeof createServer>;
+}> {
+  return await new Promise((resolve, reject) => {
+    const server = createServer();
+
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+
+      if (typeof address !== "object" || address === null) {
+        server.close(() => {
+          reject(new Error("Could not allocate a Playwright server port"));
+        });
+        return;
+      }
+
+      resolve({ port: String(address.port), server });
+    });
+  });
+}
+
+async function availablePorts(count: number): Promise<string[]> {
+  const leases: Array<{
+    readonly port: string;
+    readonly server: ReturnType<typeof createServer>;
+  }> = [];
+
+  try {
+    for (let index = 0; index < count; index += 1) {
+      leases.push(await listenOnAvailablePort());
+    }
+
+    return leases.map((lease) => lease.port);
+  } finally {
+    await Promise.all(
+      leases.map(
+        (lease) =>
+          new Promise<void>((resolve, reject) => {
+            lease.server.close((error) => {
+              if (error) {
+                reject(error);
+                return;
+              }
+
+              resolve();
+            });
+          }),
+      ),
+    );
+  }
+}
+
+async function playwrightEnv(): Promise<NodeJS.ProcessEnv> {
+  const missingPortNames = [
+    process.env.PLAYWRIGHT_API_PORT === undefined
+      ? "PLAYWRIGHT_API_PORT"
+      : undefined,
+    process.env.PLAYWRIGHT_WEB_PORT === undefined
+      ? "PLAYWRIGHT_WEB_PORT"
+      : undefined,
+  ].filter((name) => name !== undefined);
+  const ports = await availablePorts(missingPortNames.length);
+  const allocatedPorts = Object.fromEntries(
+    missingPortNames.map((name, index) => [name, ports[index]]),
+  );
+
+  return {
+    ...process.env,
+    PLAYWRIGHT_API_PORT:
+      process.env.PLAYWRIGHT_API_PORT ?? allocatedPorts.PLAYWRIGHT_API_PORT,
+    PLAYWRIGHT_WEB_PORT:
+      process.env.PLAYWRIGHT_WEB_PORT ?? allocatedPorts.PLAYWRIGHT_WEB_PORT,
+  };
+}
+
+const env = await playwrightEnv();
 delete env.NO_COLOR;
 
 const command = process.platform === "win32" ? "playwright.cmd" : "playwright";

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/web/src/App.vue

@@ -2,7 +2,7 @@
 import { storeToRefs } from "pinia";
 import { onMounted, onUnmounted, ref } from "vue";
 
-import { api } from "#/api";
+import { getHealth } from "#/api";
 import { useCounterStore } from "#/stores/counter";
 
 const counter = useCounterStore();
@@ -27,8 +27,7 @@ onUnmounted(() => {
 });
 
 onMounted(async () => {
-  const response = await api.api.health.$get();
-  const body = await response.json();
+  const body = await getHealth();
   apiStatus.value = body.status === "ok" ? "正常" : body.status;
 });
 </script>
@@ -41,9 +40,9 @@ onMounted(async () => {
       <p class="text-sm font-medium tracking-wide text-cyan-300 uppercase">
         Vue + Hono 应用预设
       </p>
-      <h1 class="mt-4 text-4xl font-semibold">Vue、Hono 和类型化 RPC</h1>
+      <h1 class="mt-4 text-4xl font-semibold">Vue 和 Hono 工作区</h1>
       <p class="mt-4 text-lg text-slate-300">
-        这个生成的工作区会让 Web 包根据 API 契约进行类型检查。
+        Web 和 API 是独立应用包，共享代码应放入 packages/*。
       </p>
       <div class="mt-8 flex flex-wrap items-center gap-4">
         <button

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/web/src/api.ts

@@ -1,5 +1,11 @@
-// @template-anchor api-type-imports
-
 const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? "/";
 
-export const api = hc<AppType>(apiBaseUrl);
+export async function getHealth(): Promise<{ status: "ok" }> {
+  const response = await fetch(`${apiBaseUrl.replace(/\/$/, "")}/api/health`);
+
+  if (!response.ok) {
+    throw new Error(`Health check failed with ${response.status}`);
+  }
+
+  return (await response.json()) as { status: "ok" };
+}

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/web/test/e2e/app.spec.ts

@@ -4,7 +4,7 @@ test("renders the web app and calls the API", async ({ page }) => {
   await page.goto("/");
 
   await expect(
-    page.getByRole("heading", { name: "Vue、Hono 和类型化 RPC" }),
+    page.getByRole("heading", { name: "Vue 和 Hono 工作区" }),
   ).toBeVisible();
   await expect(page.getByText("API 状态：正常")).toBeVisible();
   const counterButton = page.getByRole("button", { name: "计数：0" });

package/node_modules/@ykdz/template-builtin-source/templates/vue-hono-app/web/turbo.json

@@ -1,5 +1,6 @@
 {
   "extends": ["//"],
+  "tags": ["app"],
   "tasks": {
     "build:run": {
       "outputs": ["dist/**"]

package/node_modules/@ykdz/template-core/dist/Cargo.lock

@@ -0,0 +1,16 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anyhow"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+
+[[package]]
+name = "template-cargo-dependencies"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+]

package/node_modules/@ykdz/template-core/dist/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "template-cargo-dependencies"
+version = "0.0.0"
+edition = "2024"
+publish = false
+
+[[bin]]
+name = "template-cargo-dependencies"
+path = "packages/builtin-source/templates/rust-bin/src/main.rs"
+
+[dependencies]
+anyhow = "1.0.100"

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

@@ -1,4 +1,5 @@
 export type TemplateDependencyCatalog = Record<string, string>;
+export type TemplateCargoDependencyVersions = Record<string, string>;
 export type GeneratedDependencyCatalogOptions = {
     readonly dependencies: readonly string[];
     readonly packages?: readonly string[];
@@ -12,6 +13,13 @@ export type GeneratedPackageManifestDependencies = {
 };
 export declare function loadTemplateDependencyCatalog(): TemplateDependencyCatalog;
 export declare function selectTemplateDependencyCatalogEntries(dependencies: readonly string[], catalog?: TemplateDependencyCatalog): TemplateDependencyCatalog;
+export declare function loadTemplateCargoDependencyVersions(): TemplateCargoDependencyVersions;
+export declare function renderCargoLockForPackage(options: {
+    readonly packageName: string;
+    readonly packageVersion: string;
+}): string;
+export declare function selectTemplateCargoDependencyVersions(dependencies: readonly string[], catalog?: TemplateCargoDependencyVersions): TemplateCargoDependencyVersions;
+export declare function renderCargoDependencyTomlEntries(dependencies: readonly string[], catalog?: TemplateCargoDependencyVersions): string[];
 export declare function collectGeneratedManifestCatalogDependencies(manifests: readonly GeneratedPackageManifestDependencies[]): string[];
 export declare function collectGeneratedManifestCatalogReferences(manifests: readonly GeneratedPackageManifestDependencies[]): string[];
 export declare function pnpmWorkspaceYamlWithCatalogDependencies(workspaceYaml: string, dependencies: readonly string[], templateCatalog?: TemplateDependencyCatalog): string;

package/node_modules/@ykdz/template-core/dist/dependency-catalog.js

@@ -11,10 +11,10 @@ function templateRepositoryRoot() {
     ];
     return (candidates.find((candidate) => existsSync(path.join(candidate, "pnpm-workspace.yaml"))) ?? candidates[0]);
 }
-function parseTemplateDependencyCatalog(workspaceYaml) {
+function parseTemplateCatalogSection(workspaceYaml, sectionName) {
     const catalog = {};
     const lines = workspaceYaml.split(/\r?\n/);
-    const catalogStart = lines.findIndex((line) => line === "catalog:");
+    const catalogStart = lines.findIndex((line) => line === `${sectionName}:`);
     if (catalogStart === -1) {
         return catalog;
     }
@@ -35,6 +35,9 @@ function parseTemplateDependencyCatalog(workspaceYaml) {
     }
     return catalog;
 }
+function parseTemplateDependencyCatalog(workspaceYaml) {
+    return parseTemplateCatalogSection(workspaceYaml, "catalog");
+}
 export function loadTemplateDependencyCatalog() {
     return parseTemplateDependencyCatalog(readFileSync(path.join(templateRepositoryRoot(), "pnpm-workspace.yaml"), "utf8"));
 }
@@ -49,6 +52,64 @@ export function selectTemplateDependencyCatalogEntries(dependencies, catalog = l
     }
     return selected;
 }
+function parseTemplateCargoDependencyVersions(cargoToml) {
+    const dependencies = {};
+    const lines = cargoToml.split(/\r?\n/);
+    const dependenciesStart = lines.findIndex((line) => line.trim() === "[dependencies]");
+    if (dependenciesStart === -1) {
+        return dependencies;
+    }
+    for (const line of lines.slice(dependenciesStart + 1)) {
+        const trimmed = line.trim();
+        if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+            break;
+        }
+        if (trimmed.length === 0 || trimmed.startsWith("#")) {
+            continue;
+        }
+        const match = /^(?:"([^"]+)"|([A-Za-z0-9_-]+))\s*=\s*"([^"]+)"\s*$/.exec(trimmed);
+        if (!match) {
+            throw new Error(`Unsupported Template Cargo dependency declaration: ${trimmed}`);
+        }
+        const dependency = match[1] ?? match[2];
+        const version = match[3];
+        if (dependency === undefined || version === undefined) {
+            continue;
+        }
+        dependencies[dependency] = version;
+    }
+    return dependencies;
+}
+export function loadTemplateCargoDependencyVersions() {
+    return parseTemplateCargoDependencyVersions(readFileSync(path.join(templateRepositoryRoot(), "Cargo.toml"), "utf8"));
+}
+function loadTemplateCargoLock() {
+    return readFileSync(path.join(templateRepositoryRoot(), "Cargo.lock"), "utf8");
+}
+export function renderCargoLockForPackage(options) {
+    return loadTemplateCargoLock()
+        .replace('name = "template-cargo-dependencies"', `name = ${JSON.stringify(options.packageName)}`)
+        .replace('version = "0.0.0"', `version = ${JSON.stringify(options.packageVersion)}`);
+}
+export function selectTemplateCargoDependencyVersions(dependencies, catalog = loadTemplateCargoDependencyVersions()) {
+    const selected = {};
+    for (const dependency of dependencies.toSorted()) {
+        const version = catalog[dependency];
+        if (version === undefined) {
+            throw new Error(`Template Cargo dependency versions are missing dependency: ${dependency}`);
+        }
+        selected[dependency] = version;
+    }
+    return selected;
+}
+function renderTomlKey(key) {
+    return /^[A-Za-z0-9_-]+$/.test(key) ? key : JSON.stringify(key);
+}
+export function renderCargoDependencyTomlEntries(dependencies, catalog = loadTemplateCargoDependencyVersions()) {
+    return Object.entries(selectTemplateCargoDependencyVersions(dependencies, catalog)).map(([dependency, version]) => {
+        return `${renderTomlKey(dependency)} = ${JSON.stringify(version)}`;
+    });
+}
 export function collectGeneratedManifestCatalogDependencies(manifests) {
     const dependencies = new Set();
     for (const manifest of manifests) {

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

@@ -1,7 +1,7 @@
 import { type CheckEnvironmentNeed } from "./module-graph.js";
 import type { PresetSourceManifest } from "./preset-source.js";
 import { type PresetProjectionSourceRoots } from "./projection-capabilities.js";
-export type GeneratedScenarioSet = "init" | "package-addition-matrix";
+export type GeneratedScenarioSet = "init" | "package-addition-matrix" | "focused";
 export type GeneratedScenario = {
     readonly set: GeneratedScenarioSet;
     readonly basePreset: string;