@ykdz/template 0.0.31 → 0.0.33

package/node_modules/@ykdz/template-builtin-presets/dist/src/rust-bin/definition.js

@@ -18,11 +18,10 @@ function packageScripts() {
         test: "cargo test --workspace",
     };
 }
-function rustContribution(context) {
-    const cargoName = cargoPackageName(context.projectName);
+function rustContribution(options) {
     const definition = {
-        name: `@${context.scope}/${cargoName}-native`,
-        path: `packages/${cargoName}`,
+        name: `@${options.context.scope}/${options.packageLeafName}`,
+        path: options.packagePath,
         role: "native-package",
     };
     const operations = [
@@ -32,14 +31,14 @@ function rustContribution(context) {
             source: templateSources.rustBin,
             from: "Cargo.toml",
             to: `${definition.path}/Cargo.toml`,
-            replacements: { CARGO_PACKAGE_NAME: cargoName },
+            replacements: { CARGO_PACKAGE_NAME: options.packageLeafName },
         },
         {
             kind: "writeTextTemplate",
             source: templateSources.rustBin,
             from: "Cargo.lock",
             to: `${definition.path}/Cargo.lock`,
-            replacements: { CARGO_PACKAGE_NAME: cargoName },
+            replacements: { CARGO_PACKAGE_NAME: options.packageLeafName },
         },
         {
             kind: "copyFile",
@@ -68,7 +67,7 @@ function rustContribution(context) {
             version: "0.0.0",
             private: true,
             scripts: packageScripts(),
-            engines: { node: context.toolchain.nodeLtsMajor },
+            engines: { node: options.context.toolchain.nodeLtsMajor },
         },
         operations,
         environmentNeeds: [
@@ -93,6 +92,44 @@ function rustContribution(context) {
                 directories: { cargo: `/${definition.path}` },
                 interval: "weekly",
             },
+            developmentContainerToolLayers: [
+                {
+                    identity: "rust",
+                    dockerfile: {
+                        source: templateSources.rustBin,
+                        from: "devcontainer/rust.Dockerfile",
+                    },
+                    requires: ["node-pnpm"],
+                    buildArguments: [{ name: "RUST_TOOLCHAIN", value: "stable" }],
+                    mounts: [
+                        {
+                            identity: "cargo-registry",
+                            type: "volume",
+                            source: "${devcontainerId}-cargo-registry",
+                            target: "/usr/local/cargo/registry",
+                        },
+                        {
+                            identity: "cargo-git",
+                            type: "volume",
+                            source: "${devcontainerId}-cargo-git",
+                            target: "/usr/local/cargo/git",
+                        },
+                    ],
+                    probes: [
+                        { identity: "cargo", command: "cargo", args: ["--version"] },
+                        { identity: "rustc", command: "rustc", args: ["--version"] },
+                    ],
+                },
+            ],
+            templateFiles: [
+                {
+                    identity: "rust-toolchain",
+                    source: templateSources.rustBin,
+                    from: "rust-toolchain.toml",
+                    to: "rust-toolchain.toml",
+                    replacements: { RUST_TOOLCHAIN: "stable" },
+                },
+            ],
         },
     };
 }
@@ -105,10 +142,30 @@ export const rustBinDefinition = {
     source: templateSources.rustBin,
     plannerSourceFile: fileURLToPath(import.meta.url),
     blueprint(context) {
+        const packageLeafName = cargoPackageName(context.projectName);
         return {
             schemaVersion: 2,
-            packages: [rustContribution(context).definition],
+            packages: [
+                rustContribution({
+                    context,
+                    packageLeafName,
+                    packagePath: `packages/${packageLeafName}`,
+                }).definition,
+            ],
         };
     },
-    planInitialization: rustContribution,
+    planInitialization(context) {
+        const packageLeafName = cargoPackageName(context.projectName);
+        return rustContribution({
+            context,
+            packageLeafName,
+            packagePath: `packages/${packageLeafName}`,
+        });
+    },
+    defaultPackagePath({ packageLeafName }) {
+        return `packages/${packageLeafName}`;
+    },
+    planPackageAddition({ context, packageLeafName, packagePath }) {
+        return rustContribution({ context, packageLeafName, packagePath });
+    },
 };

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/development-container.d.ts

@@ -0,0 +1,2 @@
+import type { DevelopmentContainerToolLayer } from "#template-core/development-container-tool-layer";
+export declare function browserTestDevelopmentContainerToolLayer(): DevelopmentContainerToolLayer;

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/development-container.js

@@ -0,0 +1,35 @@
+import { loadTemplateDependencyCatalog } from "#template-core/dependency-catalog";
+import { templateSources } from "../template-sources.js";
+export function browserTestDevelopmentContainerToolLayer() {
+    const playwrightTestVersion = loadTemplateDependencyCatalog()["@playwright/test"];
+    if (playwrightTestVersion === undefined) {
+        throw new Error("Template Dependency Catalog is missing dependency: @playwright/test");
+    }
+    return {
+        identity: "browser-test",
+        dockerfile: {
+            source: templateSources.sharedDevcontainer,
+            from: "browser-test.Dockerfile",
+        },
+        requires: ["node-pnpm"],
+        buildArguments: [
+            {
+                name: "PLAYWRIGHT_CLI_PACKAGE",
+                value: `@playwright/test@${playwrightTestVersion}`,
+            },
+        ],
+        probes: [
+            {
+                identity: "playwright",
+                command: "npx",
+                args: [
+                    "--yes",
+                    "--package",
+                    `@playwright/test@${playwrightTestVersion}`,
+                    "playwright",
+                    "--version",
+                ],
+            },
+        ],
+    };
+}

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/typescript.d.ts

@@ -0,0 +1,13 @@
+import type { PackageContribution } from "#template-core/package-contribution";
+import type { GenerationContext } from "#template-core/preset-definition";
+import type { PackageDefinition } from "#template-core/project-blueprint-v2";
+import type { RenderOperation, TemplateSourceHandle } from "#template-core/renderer";
+export declare function typescriptConfigPackageName(context: GenerationContext): string;
+export declare function typescriptConfigPackageDefinition(context: GenerationContext): PackageDefinition;
+export declare function typescriptConfigSourceOperation(options: {
+    readonly context: GenerationContext;
+    readonly source: TemplateSourceHandle;
+    readonly from: string;
+    readonly to: string;
+}): RenderOperation;
+export declare function typescriptConfigContribution(context: GenerationContext): PackageContribution;

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/typescript.js

@@ -0,0 +1,70 @@
+import { templateSources } from "../template-sources.js";
+export function typescriptConfigPackageName(context) {
+    return `@${context.scope}/typescript-config`;
+}
+export function typescriptConfigPackageDefinition(context) {
+    return {
+        name: typescriptConfigPackageName(context),
+        path: "packages/typescript-config",
+        role: "shared-library",
+    };
+}
+export function typescriptConfigSourceOperation(options) {
+    return {
+        kind: "writeTextTemplate",
+        source: options.source,
+        from: options.from,
+        to: options.to,
+        replacements: {
+            TYPESCRIPT_CONFIG_PACKAGE: typescriptConfigPackageName(options.context),
+        },
+    };
+}
+export function typescriptConfigContribution(context) {
+    const definition = typescriptConfigPackageDefinition(context);
+    return {
+        definition,
+        exposure: { exports: {}, imports: {} },
+        manifest: {
+            name: definition.name,
+            version: "0.0.0",
+            private: true,
+            files: ["base.json"],
+            scripts: {
+                "format:check": "oxfmt --list-different --config ../../oxfmt.config.ts .",
+                "format:write": "oxfmt --write --config ../../oxfmt.config.ts .",
+            },
+            devDependencies: { oxfmt: "catalog:" },
+            engines: { node: context.toolchain.nodeLtsMajor },
+        },
+        operations: [
+            {
+                kind: "writeJson",
+                to: `${definition.path}/package.json`,
+                value: {},
+                multilineArrays: ["files"],
+            },
+            {
+                kind: "copyFile",
+                source: templateSources.foundation,
+                from: "typescript-config/base.json",
+                to: `${definition.path}/base.json`,
+            },
+            {
+                kind: "copyFile",
+                source: templateSources.foundation,
+                from: "typescript-config/turbo.json",
+                to: `${definition.path}/turbo.json`,
+            },
+        ],
+        environmentNeeds: [],
+        foundation: {
+            toolchains: {},
+            editorCapabilities: ["oxc-format-lint"],
+            dependencyMaintenance: {
+                ecosystems: ["npm", "github-actions", "docker"],
+                interval: "weekly",
+            },
+        },
+    };
+}

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/vue.d.ts

@@ -22,10 +22,11 @@ export declare const vueApplicationExposure: {
     };
 };
 export declare function vueApplicationScripts(): Record<string, string>;
-export declare function sharedVueSourceOperations(packagePath: string): readonly RenderOperation[];
+export declare function sharedVueSourceOperations(context: GenerationContext, packagePath: string): readonly RenderOperation[];
 /** Vike shares Vue's compiler runner, but owns its distinct Vike source tree. */
 export declare function vueTypecheckRunnerSourceOperation(packagePath: string): RenderOperation;
 export declare function vueApplicationEnvironmentNeeds(packagePath: string): import("@ykdz/template-core/module-graph").PlaywrightBrowserAssetsEnvironmentNeed[];
+export declare function vueApplicationDevelopmentContainerToolLayers(): import("@ykdz/template-core/development-container-tool-layer").DevelopmentContainerToolLayer[];
 export declare function vueApplicationManifest(options: {
     readonly context: GenerationContext;
     readonly definition: PackageDefinition;

package/node_modules/@ykdz/template-builtin-presets/dist/src/shared/vue.js

@@ -1,5 +1,7 @@
 import { playwrightBrowserAssetsEnvironmentNeed } from "#template-core/module-graph";
 import { templateSources } from "../template-sources.js";
+import { browserTestDevelopmentContainerToolLayer } from "./development-container.js";
+import { typescriptConfigSourceOperation } from "./typescript.js";
 /** Vue's tooling peers need these repository policy overrides, never Core defaults. */
 export const vuePnpmDependencyOverrides = {
     "pinia>typescript": "-",
@@ -33,13 +35,23 @@ export function vueApplicationScripts() {
         "test:e2e": "node --conditions=source scripts/run-playwright.ts",
     };
 }
-export function sharedVueSourceOperations(packagePath) {
-    return sharedVueSourceFiles.map((from) => ({
-        kind: "copyFile",
-        source: templateSources.vue,
-        from,
-        to: `${packagePath}/${from.replace("typescript/", "scripts/")}`,
-    }));
+export function sharedVueSourceOperations(context, packagePath) {
+    return sharedVueSourceFiles.map((from) => {
+        const to = `${packagePath}/${from.replace("typescript/", "scripts/")}`;
+        return from === "tsconfig.app.json" || from === "tsconfig.node.json"
+            ? typescriptConfigSourceOperation({
+                context,
+                source: templateSources.vue,
+                from,
+                to,
+            })
+            : {
+                kind: "copyFile",
+                source: templateSources.vue,
+                from,
+                to,
+            };
+    });
 }
 /** Vike shares Vue's compiler runner, but owns its distinct Vike source tree. */
 export function vueTypecheckRunnerSourceOperation(packagePath) {
@@ -58,6 +70,9 @@ export function vueApplicationEnvironmentNeeds(packagePath) {
         }),
     ];
 }
+export function vueApplicationDevelopmentContainerToolLayers() {
+    return [browserTestDevelopmentContainerToolLayer()];
+}
 export function vueApplicationManifest(options) {
     return {
         name: options.definition.name,

package/node_modules/@ykdz/template-builtin-presets/dist/src/ts-cli/definition.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { typescriptConfigSourceOperation } from "../shared/typescript.js";
 import { templateSources } from "../template-sources.js";
 function packageScripts() {
     return {
@@ -43,12 +44,12 @@ function cliContribution(options) {
             value: {},
             multilineArrays: ["files"],
         },
-        {
-            kind: "copyFile",
+        typescriptConfigSourceOperation({
+            context: options.context,
             source: templateSources.tsCli,
             from: "tsconfig.json",
             to: `${definition.path}/tsconfig.json`,
-        },
+        }),
         {
             kind: "copyFile",
             source: templateSources.tsCli,

package/node_modules/@ykdz/template-builtin-presets/dist/src/ts-lib/definition.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { typescriptConfigSourceOperation } from "../shared/typescript.js";
 import { templateSources } from "../template-sources.js";
 function packageScripts() {
     return {
@@ -34,12 +35,12 @@ function libraryContribution(options) {
     };
     const operations = [
         { kind: "writeJson", to: `${definition.path}/package.json`, value: {} },
-        {
-            kind: "copyFile",
+        typescriptConfigSourceOperation({
+            context: options.context,
             source: templateSources.tsLib,
             from: "tsconfig.json",
             to: `${definition.path}/tsconfig.json`,
-        },
+        }),
         {
             kind: "copyFile",
             source: templateSources.tsLib,

package/node_modules/@ykdz/template-builtin-presets/dist/src/vike-app/definition.js

@@ -1,5 +1,7 @@
 import { fileURLToPath } from "node:url";
 import { dockerEngineEnvironmentNeed, playwrightBrowserAssetsEnvironmentNeed, shellCheckEnvironmentNeed, } from "#template-core/module-graph";
+import { browserTestDevelopmentContainerToolLayer } from "../shared/development-container.js";
+import { typescriptConfigSourceOperation } from "../shared/typescript.js";
 import { vueTypecheckRunnerSourceOperation } from "../shared/vue.js";
 import { templateSources } from "../template-sources.js";
 function definitions(context) {
@@ -34,6 +36,51 @@ function foundation() {
         workspacePackageGlobs: ["apps/*", "packages/*"],
     };
 }
+function shellCheckDevelopmentContainerToolLayer() {
+    return {
+        identity: "shellcheck",
+        dockerfile: {
+            source: templateSources.vikeApp,
+            from: "devcontainer/shellcheck.Dockerfile",
+        },
+        requires: ["node-pnpm"],
+        probes: [
+            { identity: "shellcheck", command: "shellcheck", args: ["--version"] },
+        ],
+    };
+}
+function dockerClientDevelopmentContainerToolLayer() {
+    return {
+        identity: "docker-client",
+        dockerfile: {
+            source: templateSources.vikeApp,
+            from: "devcontainer/docker-client.Dockerfile",
+        },
+        requires: ["node-pnpm"],
+        mounts: [
+            {
+                identity: "docker-socket",
+                type: "bind",
+                source: "/var/run/docker.sock",
+                target: "/var/run/docker.sock",
+            },
+        ],
+        probes: [
+            {
+                identity: "docker-cli",
+                command: "docker",
+                args: ["--version"],
+                failureMessage: "Docker CLI is unavailable; rebuild the Development Container to install the Docker Client Tool Layer.",
+            },
+            {
+                identity: "docker-daemon",
+                command: "docker",
+                args: ["version"],
+                failureMessage: "Docker daemon is inaccessible through /var/run/docker.sock; verify the host daemon is running and the standard socket is accessible.",
+            },
+        ],
+    };
+}
 function webScripts() {
     const prepareDatabase = "DATABASE_FILE=../../apps/web/data/app.sqlite pnpm --dir ../../packages/db-migrations run db:prepare:dev";
     return {
@@ -81,13 +128,29 @@ function migrationScripts(databasePackageName) {
         typecheck: "tsc -p tsconfig.json --noEmit --pretty false",
     };
 }
-function copyOperations(packagePath, sourceFiles) {
-    return sourceFiles.map((from) => ({
-        kind: "copyFile",
-        source: templateSources.vikeApp,
-        from,
-        to: `${packagePath}/${from.replace(/^(?:web|db|db-migrations)\//, "")}`,
-    }));
+function copyOperations(context, packagePath, sourceFiles) {
+    const policyConfigs = new Set([
+        "web/tsconfig.app.json",
+        "web/tsconfig.node.json",
+        "db/tsconfig.json",
+        "db-migrations/tsconfig.json",
+    ]);
+    return sourceFiles.map((from) => {
+        const to = `${packagePath}/${from.replace(/^(?:web|db|db-migrations)\//, "")}`;
+        return policyConfigs.has(from)
+            ? typescriptConfigSourceOperation({
+                context,
+                source: templateSources.vikeApp,
+                from,
+                to,
+            })
+            : {
+                kind: "copyFile",
+                source: templateSources.vikeApp,
+                from,
+                to,
+            };
+    });
 }
 function webContribution(context) {
     const { web, db } = definitions(context);
@@ -125,7 +188,7 @@ function webContribution(context) {
             value: {},
             multilineArrays: ["files"],
         },
-        ...copyOperations(web.path, sourceFiles),
+        ...copyOperations(context, web.path, sourceFiles),
         {
             kind: "writeTextTemplate",
             source: templateSources.vikeApp,
@@ -252,8 +315,16 @@ function webContribution(context) {
             playwrightBrowserAssetsEnvironmentNeed({ browser: "chromium", owner }),
             shellCheckEnvironmentNeed(owner),
         ],
+        ciDiagnosticArtifacts: [{ kind: "playwright", owner }],
         deploymentEnvironmentNeeds: [dockerEngineEnvironmentNeed()],
-        foundation: foundation(),
+        foundation: {
+            ...foundation(),
+            developmentContainerToolLayers: [
+                browserTestDevelopmentContainerToolLayer(),
+                shellCheckDevelopmentContainerToolLayer(),
+                dockerClientDevelopmentContainerToolLayer(),
+            ],
+        },
     };
 }
 function databaseContribution(context) {
@@ -311,7 +382,7 @@ function databaseContribution(context) {
         },
         operations: [
             { kind: "writeJson", to: `${db.path}/package.json`, value: {} },
-            ...copyOperations(db.path, sourceFiles),
+            ...copyOperations(context, db.path, sourceFiles),
         ],
         environmentNeeds: [],
         foundation: foundation(),
@@ -355,7 +426,7 @@ function migrationsContribution(context) {
                 value: {},
                 multilineArrays: ["files"],
             },
-            ...copyOperations(migrations.path, sourceFiles),
+            ...copyOperations(context, migrations.path, sourceFiles),
         ],
         environmentNeeds: [],
         foundation: foundation(),

package/node_modules/@ykdz/template-builtin-presets/dist/src/vue-app/definition.js

@@ -1,4 +1,4 @@
-import { sharedVueSourceOperations, vueApplicationEnvironmentNeeds, vueApplicationExposure, vueApplicationManifest, vueApplicationScripts, } from "../shared/vue.js";
+import { sharedVueSourceOperations, vueApplicationDevelopmentContainerToolLayers, vueApplicationEnvironmentNeeds, vueApplicationExposure, vueApplicationManifest, vueApplicationScripts, } from "../shared/vue.js";
 import { templateSources } from "../template-sources.js";
 function packageScripts() {
     return {
@@ -32,7 +32,7 @@ function appContribution(options) {
             from,
             to: `${definition.path}/${from.replace("typescript/", "scripts/")}`,
         })),
-        ...sharedVueSourceOperations(definition.path),
+        ...sharedVueSourceOperations(options.context, definition.path),
     ];
     return {
         definition,
@@ -44,6 +44,12 @@ function appContribution(options) {
         }),
         operations,
         environmentNeeds: vueApplicationEnvironmentNeeds(definition.path),
+        ciDiagnosticArtifacts: [
+            {
+                kind: "playwright",
+                owner: { kind: "package-boundary", path: definition.path },
+            },
+        ],
         foundation: {
             toolchains: {},
             editorCapabilities: ["oxc-format-lint", "vue", "tailwind", "vitest"],
@@ -52,6 +58,7 @@ function appContribution(options) {
                 interval: "weekly",
             },
             workspacePackageGlobs: [`${options.packagePath.split("/")[0]}/*`],
+            developmentContainerToolLayers: vueApplicationDevelopmentContainerToolLayers(),
         },
     };
 }

package/node_modules/@ykdz/template-builtin-presets/dist/src/vue-hono-app/definition.js

@@ -1,4 +1,5 @@
-import { sharedVueSourceOperations, vueApplicationEnvironmentNeeds, vueApplicationExposure, vueApplicationManifest, vueApplicationScripts, } from "../shared/vue.js";
+import { typescriptConfigSourceOperation } from "../shared/typescript.js";
+import { sharedVueSourceOperations, vueApplicationDevelopmentContainerToolLayers, vueApplicationEnvironmentNeeds, vueApplicationExposure, vueApplicationManifest, vueApplicationScripts, } from "../shared/vue.js";
 import { templateSources } from "../template-sources.js";
 function apiScripts() {
     return {
@@ -16,7 +17,7 @@ function apiScripts() {
 function webScripts() {
     return {
         ...vueApplicationScripts(),
-        typecheck: "node --conditions=source scripts/run-vue-tsc.ts --build --pretty false",
+        typecheck: "node --conditions=source scripts/run-vue-tsc.ts --build --noEmit --pretty false",
     };
 }
 function packageFoundation() {
@@ -60,12 +61,19 @@ function apiContribution(context) {
     ];
     const operations = [
         { kind: "writeJson", to: `${definition.path}/package.json`, value: {} },
-        ...sourceFiles.map((from) => ({
-            kind: "copyFile",
-            source: templateSources.vueHonoApp,
-            from: `api/${from}`,
-            to: `${definition.path}/${from}`,
-        })),
+        ...sourceFiles.map((from) => from === "tsconfig.json"
+            ? typescriptConfigSourceOperation({
+                context,
+                source: templateSources.vueHonoApp,
+                from: `api/${from}`,
+                to: `${definition.path}/${from}`,
+            })
+            : {
+                kind: "copyFile",
+                source: templateSources.vueHonoApp,
+                from: `api/${from}`,
+                to: `${definition.path}/${from}`,
+            }),
     ];
     return {
         definition,
@@ -120,7 +128,7 @@ function webContribution(context) {
             from: `web/${from}`,
             to: `${definition.path}/${from}`,
         })),
-        ...sharedVueSourceOperations(definition.path),
+        ...sharedVueSourceOperations(context, definition.path),
     ];
     return {
         definition,
@@ -132,7 +140,16 @@ function webContribution(context) {
         }),
         operations,
         environmentNeeds: vueApplicationEnvironmentNeeds(definition.path),
-        foundation: packageFoundation(),
+        ciDiagnosticArtifacts: [
+            {
+                kind: "playwright",
+                owner: { kind: "package-boundary", path: definition.path },
+            },
+        ],
+        foundation: {
+            ...packageFoundation(),
+            developmentContainerToolLayers: vueApplicationDevelopmentContainerToolLayers(),
+        },
     };
 }
 export const vueHonoAppDefinition = {

package/node_modules/@ykdz/template-builtin-presets/package.json

@@ -33,7 +33,7 @@
     "format:write": "oxfmt --write --config ../../oxfmt.config.ts .",
     "lint": "oxlint --quiet --format=unix --config ../../oxlint.config.ts --ignore-pattern dist --ignore-pattern templates .",
     "lint:fix": "oxlint --format=unix --config ../../oxlint.config.ts --ignore-pattern dist --ignore-pattern templates . --fix",
-    "test": "vitest run --config vitest.config.ts --reporter=agent --silent=passed-only",
+    "test": "vitest run --config vitest.config.ts --reporter=agent --silent=passed-only --maxWorkers=1",
     "typecheck": "tsc -p tsconfig.json --noEmit --pretty false"
   },
   "dependencies": {