@ykdz/template 0.0.7 → 0.0.9

package/{templates → node_modules/@ykdz/template-builtin-source/templates}/preset-source.json

@@ -18,6 +18,10 @@
       "id": "shared-oxc-format",
       "path": "shared/oxc/oxfmt.config.ts"
     },
+    {
+      "id": "shared-oxc-root-tsconfig",
+      "path": "shared/oxc/tsconfig.config.json"
+    },
     {
       "id": "shared-oxc-vue",
       "path": "shared/oxc/vue"
@@ -145,6 +149,7 @@
         "@types/node",
         "oxfmt",
         "oxlint",
+        "oxlint-tsgolint",
         "turbo",
         "typescript",
         "valibot"
@@ -170,7 +175,8 @@
           "shared-devcontainer",
           "shared-editor-customization",
           "shared-oxc-node",
-          "shared-oxc-format"
+          "shared-oxc-format",
+          "shared-oxc-root-tsconfig"
         ]
       }
     },
@@ -198,6 +204,7 @@
         "hono",
         "oxfmt",
         "oxlint",
+        "oxlint-tsgolint",
         "tsc-alias",
         "turbo",
         "typescript",
@@ -234,7 +241,8 @@
           "shared-devcontainer",
           "shared-editor-customization",
           "shared-oxc-node",
-          "shared-oxc-format"
+          "shared-oxc-format",
+          "shared-oxc-root-tsconfig"
         ]
       }
     },
@@ -266,6 +274,7 @@
         "@vueuse/core",
         "oxfmt",
         "oxlint",
+        "oxlint-tsgolint",
         "pinia",
         "tailwindcss",
         "turbo",
@@ -320,6 +329,7 @@
           "shared-devcontainer",
           "shared-editor-customization",
           "shared-oxc-format",
+          "shared-oxc-root-tsconfig",
           "shared-oxc-vue"
         ]
       }
@@ -354,6 +364,7 @@
         "hono",
         "oxfmt",
         "oxlint",
+        "oxlint-tsgolint",
         "pinia",
         "tailwindcss",
         "tsc-alias",
@@ -435,6 +446,7 @@
           "shared-editor-customization",
           "shared-oxc-node",
           "shared-oxc-format",
+          "shared-oxc-root-tsconfig",
           "shared-oxc-vue"
         ]
       }

package/node_modules/@ykdz/template-builtin-source/templates/shared/oxc/node/oxlint.config.ts

@@ -0,0 +1,34 @@
+import { defineConfig } from "oxlint";
+
+export default defineConfig({
+  options: {
+    typeAware: true,
+  },
+  categories: {
+    correctness: "error",
+    suspicious: "warn",
+  },
+  plugins: [
+    "eslint",
+    "typescript",
+    "unicorn",
+    "oxc",
+    "node",
+    "import",
+    "vitest",
+    "promise",
+  ],
+  rules: {
+    "typescript/consistent-return": "off",
+    "typescript/no-misused-promises": "error",
+    "typescript/no-unsafe-argument": "warn",
+    "typescript/no-unsafe-assignment": "warn",
+    "typescript/no-unsafe-call": "warn",
+    "typescript/no-unsafe-member-access": "warn",
+    "typescript/no-unsafe-return": "warn",
+    "typescript/switch-exhaustiveness-check": "error",
+    "vitest/expect-expect": "off",
+    "vitest/no-conditional-expect": "off",
+    "vitest/require-to-throw-message": "off",
+  },
+});

package/node_modules/@ykdz/template-builtin-source/templates/shared/oxc/tsconfig.config.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "erasableSyntaxOnly": true,
+    "exactOptionalPropertyTypes": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
+    "skipLibCheck": false,
+    "strict": true,
+    "target": "es2023",
+    "verbatimModuleSyntax": true
+  },
+  "include": ["oxlint.config.ts", "oxfmt.config.ts"]
+}

package/node_modules/@ykdz/template-builtin-source/templates/shared/oxc/vue/oxlint.config.ts

@@ -0,0 +1,36 @@
+import { defineConfig } from "oxlint";
+
+export default defineConfig({
+  options: {
+    typeAware: true,
+  },
+  categories: {
+    correctness: "error",
+    suspicious: "warn",
+  },
+  plugins: [
+    "eslint",
+    "typescript",
+    "unicorn",
+    "oxc",
+    "node",
+    "import",
+    "vitest",
+    "promise",
+    "vue",
+  ],
+  rules: {
+    "typescript/consistent-return": "off",
+    "import/no-unassigned-import": ["warn", { allow: ["**/*.css"] }],
+    "typescript/no-misused-promises": "error",
+    "typescript/no-unsafe-argument": "warn",
+    "typescript/no-unsafe-assignment": "warn",
+    "typescript/no-unsafe-call": "warn",
+    "typescript/no-unsafe-member-access": "warn",
+    "typescript/no-unsafe-return": "warn",
+    "typescript/switch-exhaustiveness-check": "error",
+    "vitest/expect-expect": "off",
+    "vitest/no-conditional-expect": "off",
+    "vitest/require-to-throw-message": "off",
+  },
+});

package/node_modules/@ykdz/template-builtin-source/templates/vue-app/env.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="vite/client" />
+
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+
+  const component: DefineComponent<object, object, unknown>;
+  export default component;
+}

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

@@ -0,0 +1,16 @@
+/// <reference types="vite/client" />
+
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+
+  const component: DefineComponent<object, object, unknown>;
+  export default component;
+}
+
+interface ImportMetaEnv {
+  readonly VITE_API_BASE_URL?: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

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

@@ -38,7 +38,6 @@ export type ProjectBlueprint = {
     packages?: ProjectPackage[];
     packageLinkIntents?: PackageLinkIntent[];
 };
-export declare const builtInPresets: readonly BuiltInPreset[];
 export declare const presetFileJsonSchema: {
     readonly $schema: "https://json-schema.org/draft/2020-12/schema";
     readonly $id: "https://ykdz.dev/schemas/project-kit/preset-file.schema.json";
@@ -195,6 +194,10 @@ export type ValidationResult<T> = {
     ok: false;
     issues: ValidationIssue[];
 };
-export declare function validatePresetFile(input: unknown): ValidationResult<PresetFile>;
-export declare function findBuiltInPreset(name: string): BuiltInPreset | undefined;
-export declare function validateProjectBlueprint(input: unknown): ValidationResult<ProjectBlueprint>;
+export type PresetCatalogValidationOptions = {
+    readonly presets?: readonly BuiltInPreset[];
+    readonly presetLabel?: string;
+};
+export declare function validatePresetFile(input: unknown, options?: PresetCatalogValidationOptions): ValidationResult<PresetFile>;
+export declare function findPreset(presets: readonly BuiltInPreset[], name: string): BuiltInPreset | undefined;
+export declare function validateProjectBlueprint(input: unknown, options?: PresetCatalogValidationOptions): ValidationResult<ProjectBlueprint>;

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

@@ -1,6 +1,4 @@
 import * as v from "valibot";
-import { loadBuiltInPresetSourceManifest } from "./preset-source.js";
-export const builtInPresets = loadBuiltInPresetSourceManifest().presets;
 const featureNames = [
     "pnpm-catalog",
     "oxc-format-lint",
@@ -180,7 +178,7 @@ function unsupportedSinglePackageProjectShapeIssue(path) {
         message: "single-package Project Shape is unsupported in V1; use the workspace monorepo Project Shape",
     };
 }
-export function validatePresetFile(input) {
+export function validatePresetFile(input, options = {}) {
     const result = v.safeParse(presetFileSchema, input);
     if (!result.success) {
         return { ok: false, issues: shapeIssues(result.issues) };
@@ -193,9 +191,9 @@ export function validatePresetFile(input) {
     if (result.output.supportedProjectKinds.includes("single-package")) {
         semanticIssues.push(unsupportedSinglePackageProjectShapeIssue("$.supportedProjectKinds"));
     }
-    const builtInPreset = findBuiltInPreset(result.output.name);
-    const unsupportedGeneration = builtInPreset
-        ? generationSupportIssue(builtInPreset, "$.name")
+    const catalogPreset = findPreset(options.presets ?? [], result.output.name);
+    const unsupportedGeneration = catalogPreset
+        ? generationSupportIssue(catalogPreset, "$.name")
         : undefined;
     if (unsupportedGeneration) {
         semanticIssues.push(unsupportedGeneration);
@@ -205,29 +203,62 @@ export function validatePresetFile(input) {
     }
     return { ok: true, value: result.output };
 }
-export function findBuiltInPreset(name) {
-    return builtInPresets.find((preset) => preset.name === name);
+export function findPreset(presets, name) {
+    return presets.find((preset) => preset.name === name);
 }
-export function validateProjectBlueprint(input) {
+function normalizeProjectBlueprint(blueprint) {
+    return {
+        schemaVersion: blueprint.schemaVersion,
+        preset: blueprint.preset,
+        ...(blueprint.packageManager === undefined
+            ? {}
+            : { packageManager: blueprint.packageManager }),
+        projectKind: blueprint.projectKind,
+        features: [...blueprint.features],
+        ...(blueprint.packages === undefined
+            ? {}
+            : {
+                packages: blueprint.packages.map((projectPackage) => ({
+                    name: projectPackage.name,
+                    path: projectPackage.path,
+                    ...(projectPackage.role === undefined
+                        ? {}
+                        : { role: projectPackage.role }),
+                    ...(projectPackage.sourcePreset === undefined
+                        ? {}
+                        : { sourcePreset: projectPackage.sourcePreset }),
+                })),
+            }),
+        ...(blueprint.packageLinkIntents === undefined
+            ? {}
+            : {
+                packageLinkIntents: blueprint.packageLinkIntents.map((intent) => ({
+                    consumerPackagePath: intent.consumerPackagePath,
+                    providerPackagePath: intent.providerPackagePath,
+                })),
+            }),
+    };
+}
+export function validateProjectBlueprint(input, options = {}) {
     const result = v.safeParse(projectBlueprintSchema, input);
     if (!result.success) {
         return { ok: false, issues: shapeIssues(result.issues) };
     }
-    const blueprint = result.output;
-    const preset = findBuiltInPreset(blueprint.preset);
+    const blueprint = normalizeProjectBlueprint(result.output);
+    const preset = findPreset(options.presets ?? [], blueprint.preset);
     const semanticIssues = [
         ...duplicateIssues(blueprint.features, "$.features"),
     ];
     if (blueprint.projectKind === "single-package") {
         semanticIssues.push(unsupportedSinglePackageProjectShapeIssue("$.projectKind"));
     }
-    if (!preset) {
+    if (options.presets && !preset) {
         semanticIssues.push({
             path: "$.preset",
-            message: `Unknown built-in preset: ${blueprint.preset}`,
+            message: `Unknown ${options.presetLabel ?? "built-in"} preset: ${blueprint.preset}`,
         });
     }
-    else {
+    else if (preset) {
         const unsupportedGeneration = generationSupportIssue(preset, "$.preset");
         if (unsupportedGeneration) {
             semanticIssues.push(unsupportedGeneration);

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

@@ -4,8 +4,10 @@ import { fileURLToPath } from "node:url";
 function templateRepositoryRoot() {
     const moduleDir = path.dirname(fileURLToPath(import.meta.url));
     const candidates = [
+        moduleDir,
         path.resolve(moduleDir, ".."),
         path.resolve(moduleDir, "..", ".."),
+        path.resolve(moduleDir, "..", "..", ".."),
     ];
     return (candidates.find((candidate) => existsSync(path.join(candidate, "pnpm-workspace.yaml"))) ?? candidates[0]);
 }
@@ -24,7 +26,12 @@ function parseTemplateDependencyCatalog(workspaceYaml) {
         if (!match) {
             continue;
         }
-        catalog[match[1] ?? match[2]] = match[3];
+        const key = match[1] ?? match[2];
+        const version = match[3];
+        if (key === undefined || version === undefined) {
+            continue;
+        }
+        catalog[key] = version;
     }
     return catalog;
 }
@@ -33,7 +40,7 @@ export function loadTemplateDependencyCatalog() {
 }
 export function selectTemplateDependencyCatalogEntries(dependencies, catalog = loadTemplateDependencyCatalog()) {
     const selected = {};
-    for (const dependency of [...dependencies].sort()) {
+    for (const dependency of dependencies.toSorted()) {
         const version = catalog[dependency];
         if (version === undefined) {
             throw new Error(`Template Dependency Catalog is missing dependency: ${dependency}`);
@@ -59,7 +66,7 @@ export function collectGeneratedManifestCatalogDependencies(manifests) {
             }
         }
     }
-    return [...dependencies].sort();
+    return [...dependencies].toSorted();
 }
 export function collectGeneratedManifestCatalogReferences(manifests) {
     const dependencies = new Set();
@@ -77,7 +84,7 @@ export function collectGeneratedManifestCatalogReferences(manifests) {
             }
         }
     }
-    return [...dependencies].sort();
+    return [...dependencies].toSorted();
 }
 function renderCatalogKey(key) {
     return key.startsWith("@") ? JSON.stringify(key) : key;
@@ -104,7 +111,7 @@ export function pnpmWorkspaceYamlWithCatalogDependencies(workspaceYaml, dependen
     const catalogLines = [
         "catalog:",
         ...Object.entries(nextCatalog)
-            .sort(([left], [right]) => left.localeCompare(right))
+            .toSorted(([left], [right]) => left.localeCompare(right))
             .map(([dependency, version]) => `  ${renderCatalogKey(dependency)}: ${version}`),
         "",
     ];
@@ -124,7 +131,7 @@ export function renderGeneratedPnpmWorkspaceYaml(options) {
     ];
     if (options.allowBuilds) {
         lines.push("allowBuilds:", ...Object.entries(options.allowBuilds)
-            .sort(([left], [right]) => left.localeCompare(right))
+            .toSorted(([left], [right]) => left.localeCompare(right))
             .map(([dependency, allowed]) => `  ${dependency}: ${allowed}`), "");
     }
     lines.push("catalog:", ...Object.entries(catalog).map(([dependency, version]) => `  ${renderCatalogKey(dependency)}: ${version}`), "");

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

@@ -38,21 +38,21 @@ export declare function dockerfileFirstNodePnpmDevcontainer(options: {
     readonly name: string;
     readonly layer: DevelopmentContainerNodePnpmLayer;
     readonly extensions: readonly string[];
-    readonly settings?: Record<string, unknown>;
+    readonly settings?: Record<string, unknown> | undefined;
 }): DevelopmentContainerPlan;
 export declare function checkedDockerfileFirstNodePnpmDevcontainer(options: {
     readonly name: string;
     readonly layer: DevelopmentContainerNodePnpmLayer;
-    readonly additionalLayers?: readonly DevelopmentContainerCapabilityLayer[];
+    readonly additionalLayers?: readonly DevelopmentContainerCapabilityLayer[] | undefined;
     readonly extensions: readonly string[];
-    readonly settings?: Record<string, unknown>;
-    readonly mounts?: readonly string[];
+    readonly settings?: Record<string, unknown> | undefined;
+    readonly mounts?: readonly string[] | undefined;
 }): DevelopmentContainerPlan;
 export declare function dockerfileFirstRustPnpmDevcontainer(options: {
     readonly name: string;
     readonly nodeLayer: DevelopmentContainerNodePnpmLayer;
     readonly rustLayer: DevelopmentContainerRustLayer;
     readonly extensions: readonly string[];
-    readonly settings?: Record<string, unknown>;
+    readonly settings?: Record<string, unknown> | undefined;
 }): DevelopmentContainerPlan;
 export {};

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

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import * as v from "valibot";
 const capabilityOrder = [
     "oxc-format-lint",
     "vue",
@@ -12,13 +13,28 @@ const defaultOxcConfigPaths = {
     formatter: "./oxfmt.config.ts",
     lint: "./oxlint.config.ts",
 };
+const capabilityProjectionSchema = v.object({
+    extensions: v.array(v.string()),
+    settings: v.record(v.string(), v.unknown()),
+});
+const editorCustomizationDeclarationsSchema = v.object({
+    capabilities: v.object({
+        "oxc-format-lint": capabilityProjectionSchema,
+        vue: capabilityProjectionSchema,
+        tailwind: capabilityProjectionSchema,
+        "rust-tooling": capabilityProjectionSchema,
+        vitest: capabilityProjectionSchema,
+    }),
+});
 const declarations = loadEditorCustomizationDeclarations();
 function editorCustomizationDeclarationPath() {
     const moduleDirectory = path.dirname(fileURLToPath(import.meta.url));
-    const relativeDeclarationPath = "templates/shared/editor-customization/capabilities.json";
+    const relativeDeclarationPath = "builtin-source/templates/shared/editor-customization/capabilities.json";
     const candidates = [
         path.resolve(moduleDirectory, "..", relativeDeclarationPath),
         path.resolve(moduleDirectory, "..", "..", relativeDeclarationPath),
+        path.resolve(moduleDirectory, "..", "..", "template-builtin-source", "templates", "shared", "editor-customization", "capabilities.json"),
+        path.resolve(moduleDirectory, "..", "..", "..", "packages", relativeDeclarationPath),
     ];
     const declarationPath = candidates.find((candidate) => existsSync(candidate));
     if (!declarationPath) {
@@ -26,38 +42,15 @@ function editorCustomizationDeclarationPath() {
     }
     return declarationPath;
 }
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function assertCapabilityProjection(capability, value) {
-    if (!isRecord(value)) {
-        throw new Error(`Editor customization ${capability} must be an object`);
-    }
-    const extensions = value.extensions;
-    const settings = value.settings;
-    if (!Array.isArray(extensions) ||
-        extensions.some((extension) => typeof extension !== "string")) {
-        throw new Error(`Editor customization ${capability} must declare string extensions`);
-    }
-    if (!isRecord(settings)) {
-        throw new Error(`Editor customization ${capability} must declare object settings`);
-    }
-}
 function loadEditorCustomizationDeclarations() {
     const source = JSON.parse(readFileSync(editorCustomizationDeclarationPath(), "utf8"));
-    if (!isRecord(source) || !isRecord(source.capabilities)) {
-        throw new Error("Editor customization declarations must contain capabilities");
+    const result = v.safeParse(editorCustomizationDeclarationsSchema, source);
+    if (!result.success) {
+        throw new Error(`Editor customization declarations are invalid: ${result.issues
+            .map((issue) => issue.message)
+            .join("; ")}`);
     }
-    const capabilities = source.capabilities;
-    for (const capability of capabilityOrder) {
-        assertCapabilityProjection(capability, capabilities[capability]);
-    }
-    return {
-        capabilities: Object.fromEntries(capabilityOrder.map((capability) => [
-            capability,
-            capabilities[capability],
-        ])),
-    };
+    return result.output;
 }
 function oxcConfigPathSettings(configPaths) {
     if (configPaths === "nested") {

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

@@ -1,4 +1,5 @@
 import type { PresetSourceManifest } from "./preset-source.js";
+import { type PresetProjectionSourceRoots } from "./projection-capabilities.js";
 export type GeneratedScenarioSet = "init" | "package-addition-matrix";
 export type GeneratedScenario = {
     readonly set: GeneratedScenarioSet;
@@ -28,8 +29,8 @@ export type GeneratedScenarioCommandStep = {
     readonly display: string;
 };
 export type GeneratedScenarioCommandRunner = (command: string, args: readonly string[], cwd: string, options?: {
-    readonly env?: Record<string, string>;
-    readonly logPrefix?: string;
+    readonly env?: Record<string, string> | undefined;
+    readonly logPrefix?: string | undefined;
 }) => Promise<void>;
 export type GeneratedScenarioReporter = {
     readonly info?: (message: string) => void;
@@ -38,6 +39,7 @@ export type GeneratedScenarioReporter = {
 export type GeneratedScenarioRunnerOptions = {
     readonly repoRoot: string;
     readonly cliPath: string;
+    readonly projectionSourceRoots: PresetProjectionSourceRoots;
     readonly runCommand?: GeneratedScenarioCommandRunner;
     readonly reporter?: GeneratedScenarioReporter;
     readonly deterministicToolchainEnv?: Record<string, string>;
@@ -52,8 +54,8 @@ export declare function generatedScenarioLabel(scenario: Pick<GeneratedScenario,
 export declare function selectGeneratedScenarios(manifest: PresetSourceManifest, set: GeneratedScenarioSet): GeneratedScenarioSelection;
 export declare function packageLeafNameForAddedPreset(manifest: PresetSourceManifest, presetName: string): string;
 export declare function defaultGeneratedScenarioCommandRunner(command: string, args: readonly string[], cwd: string, options?: {
-    readonly env?: Record<string, string>;
-    readonly logPrefix?: string;
+    readonly env?: Record<string, string> | undefined;
+    readonly logPrefix?: string | undefined;
 }): Promise<void>;
 export declare function generatedScenarioQualityGateSteps(manifest: PresetSourceManifest, scenario: GeneratedScenario, projectDir: string, addedPackagePath: string | undefined, options: GeneratedScenarioRunnerOptions): GeneratedScenarioCommandStep[];
 export declare function fixtureConcurrency(scenarioCount: number): number;