@ykdz/template 0.0.10 → 0.0.12

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

@@ -3,7 +3,7 @@ import path from "node:path";
 import { execa } from "execa";
 import * as v from "valibot";
 import { assembleGenerationContext } from "./generation-context.js";
-import { renderPlaywrightBrowserInstallCommand, } from "./module-graph.js";
+import { playwrightBrowserAssetsEnvironmentNeed, } from "./module-graph.js";
 import { planNextStepInstructions } from "./next-step-instructions.js";
 import { findPresetSourceManifestPreset } from "./preset-source.js";
 import { blueprintForPresetSourcePreset, projectPresetSourcePreset, } from "./projection-capabilities.js";
@@ -248,13 +248,18 @@ function machineVerifiableNextStepsForPreset(presetName, projectDir, manifest, o
     });
     return plan.steps
         .filter((step) => step.machineVerifiable && step.kind === "command")
-        .map((step) => ({
-        id: step.id,
-        command: step.command,
-        args: step.args,
-        cwd: step.cwd,
-        display: step.display,
-    }));
+        .map((step) => {
+        return {
+            id: step.id,
+            command: step.command,
+            args: step.args,
+            cwd: step.cwd,
+            display: step.display,
+            ...(step.environmentNeedKind === undefined
+                ? {}
+                : { environmentNeedKind: step.environmentNeedKind }),
+        };
+    });
 }
 function addedPresetEnvironmentNeeds(manifest, scenario, projectDir, addedPackagePath, options) {
     if (!scenario.addedPreset || !addedPackagePath) {
@@ -264,30 +269,35 @@ function addedPresetEnvironmentNeeds(manifest, scenario, projectDir, addedPackag
         if (need.owner.kind !== "package-boundary") {
             return need;
         }
-        return {
-            ...need,
+        return playwrightBrowserAssetsEnvironmentNeed({
+            browser: need.browser,
             owner: { kind: "package-boundary", path: addedPackagePath },
-        };
+            machineVerifiable: need.nextStep.machineVerifiable,
+        });
     });
 }
 function environmentNeedStep(need, projectDir) {
-    const display = renderPlaywrightBrowserInstallCommand(need);
-    const [command, ...args] = display.split(" ");
-    if (command === undefined) {
-        throw new Error(`Cannot parse environment setup command: ${display}`);
-    }
     return {
-        id: `install-${need.owner.path}-playwright-browsers`,
-        command,
-        args,
+        id: need.nextStep.id,
+        command: need.nextStep.command,
+        args: [...need.nextStep.args],
         cwd: projectDir,
-        display,
+        display: need.nextStep.display,
+        environmentNeedKind: need.kind,
     };
 }
+export function generatedScenarioEnvironmentNeedSteps(needs, projectDir) {
+    return needs
+        .filter((need) => need.nextStep.machineVerifiable)
+        .map((need) => environmentNeedStep(need, projectDir));
+}
+export function generatedScenarioRequiresSerializedRootCheck(steps) {
+    return steps.some((step) => step.environmentNeedKind === "playwright-browser-assets");
+}
 export function generatedScenarioQualityGateSteps(manifest, scenario, projectDir, addedPackagePath, options) {
     const normalizedOptions = normalizeRunnerOptions(options);
     const steps = machineVerifiableNextStepsForPreset(scenario.basePreset, projectDir, manifest, normalizedOptions);
-    const addedEnvironmentSteps = addedPresetEnvironmentNeeds(manifest, scenario, projectDir, addedPackagePath, normalizedOptions).map((need) => environmentNeedStep(need, projectDir));
+    const addedEnvironmentSteps = generatedScenarioEnvironmentNeedSteps(addedPresetEnvironmentNeeds(manifest, scenario, projectDir, addedPackagePath, normalizedOptions), projectDir);
     const existingDisplays = new Set(steps.map((step) => step.display));
     const extraEnvironmentSteps = addedEnvironmentSteps.filter((step) => !existingDisplays.has(step.display));
     if (extraEnvironmentSteps.length === 0) {
@@ -305,7 +315,7 @@ export function generatedScenarioQualityGateSteps(manifest, scenario, projectDir
 }
 async function runGeneratedScenarioQualityGate(manifest, scenario, projectDir, addedPackagePath, options) {
     const steps = generatedScenarioQualityGateSteps(manifest, scenario, projectDir, addedPackagePath, options);
-    const requiresSerializedPlaywrightRootCheck = steps.some((step) => step.id.endsWith("-playwright-browsers"));
+    const requiresSerializedPlaywrightRootCheck = generatedScenarioRequiresSerializedRootCheck(steps);
     for (const step of steps) {
         const env = step.id === "run-root-check" ? { CI: "1" } : undefined;
         const runStep = async () => {

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

@@ -1,4 +1,4 @@
-import type { PackageManager, ProjectBlueprint } from "./declarations.js";
+import type { PackageManager, ProjectBlueprint } from "@ykdz/template-shared";
 import type { ResolvedToolchainVersions } from "./toolchain-resolution.js";
 export type ProjectName = {
     readonly kind: "ProjectName";

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

@@ -13,6 +13,14 @@ export type CheckEnvironmentNeed = {
     readonly kind: "playwright-browser-assets";
     readonly browser: "chromium";
     readonly owner: ComponentOwner;
+    readonly nextStep: {
+        readonly id: string;
+        readonly label: string;
+        readonly command: string;
+        readonly args: readonly string[];
+        readonly display: string;
+        readonly machineVerifiable: boolean;
+    };
 };
 export type CheckComponent = {
     readonly kind: CheckComponentKind;
@@ -31,4 +39,14 @@ export type FixPlan = {
 };
 export declare function renderRootCheckCommand(plan: CheckPlan): string;
 export declare function renderFixCommand(plan: FixPlan): string;
-export declare function renderPlaywrightBrowserInstallCommand(need: CheckEnvironmentNeed): string;
+export declare function renderPlaywrightBrowserInstallCommand(need: CheckEnvironmentNeed, options?: {
+    readonly withDeps?: boolean;
+}): string;
+export declare function playwrightBrowserAssetsNextStepDescriptor(owner: ComponentOwner): Pick<CheckEnvironmentNeed["nextStep"], "id" | "label">;
+export declare function playwrightBrowserAssetsEnvironmentNeed(options: {
+    readonly browser: "chromium";
+    readonly owner: ComponentOwner;
+    readonly id?: string;
+    readonly label?: string;
+    readonly machineVerifiable?: boolean;
+}): CheckEnvironmentNeed;

package/node_modules/@ykdz/template-core/dist/module-graph.js

@@ -58,9 +58,48 @@ export function renderRootCheckCommand(plan) {
 export function renderFixCommand(plan) {
     return plan.components.map(renderFixComponentCommand).join(" && ");
 }
-export function renderPlaywrightBrowserInstallCommand(need) {
+function playwrightBrowserInstallArgs(need, options = {}) {
+    const installArgs = [
+        "exec",
+        "playwright",
+        "install",
+        ...(options.withDeps ? ["--with-deps"] : []),
+        need.browser,
+    ];
     if (need.owner.kind === "package-boundary" && need.owner.path !== ".") {
-        return `pnpm --filter ./${need.owner.path} exec playwright install ${need.browser}`;
+        return ["--filter", `./${need.owner.path}`, ...installArgs];
     }
-    return `pnpm exec playwright install ${need.browser}`;
+    return installArgs;
+}
+export function renderPlaywrightBrowserInstallCommand(need, options = {}) {
+    return ["pnpm", ...playwrightBrowserInstallArgs(need, options)].join(" ");
+}
+export function playwrightBrowserAssetsNextStepDescriptor(owner) {
+    if (owner.kind === "package-boundary" && owner.path !== ".") {
+        return {
+            id: `install-${owner.path.replaceAll("/", "-")}-playwright-browsers`,
+            label: `Install Playwright browser assets for ${owner.path} package`,
+        };
+    }
+    return {
+        id: "install-workspace-playwright-browsers",
+        label: "Install Playwright browser assets for workspace",
+    };
+}
+export function playwrightBrowserAssetsEnvironmentNeed(options) {
+    const args = playwrightBrowserInstallArgs(options);
+    const descriptor = playwrightBrowserAssetsNextStepDescriptor(options.owner);
+    return {
+        kind: "playwright-browser-assets",
+        browser: options.browser,
+        owner: options.owner,
+        nextStep: {
+            id: options.id ?? descriptor.id,
+            label: options.label ?? descriptor.label,
+            command: "pnpm",
+            args,
+            display: ["pnpm", ...args].join(" "),
+            machineVerifiable: options.machineVerifiable ?? true,
+        },
+    };
 }

package/node_modules/@ykdz/template-core/dist/next-step-instructions.d.ts

@@ -1,3 +1,4 @@
+import type { CheckEnvironmentNeed } from "./module-graph.js";
 import type { PresetProjectionPlan } from "./preset-projection.js";
 export type NextStepInstruction = {
     readonly id: string;
@@ -8,6 +9,7 @@ export type NextStepInstruction = {
     readonly cwd: string;
     readonly display: string;
     readonly machineVerifiable: boolean;
+    readonly environmentNeedKind?: CheckEnvironmentNeed["kind"];
 };
 export type NextStepInstructionPlan = {
     readonly targetDir: string;

package/node_modules/@ykdz/template-core/dist/next-step-instructions.js

@@ -1,4 +1,3 @@
-import { renderPlaywrightBrowserInstallCommand } from "./module-graph.js";
 function rootCheckInstruction() {
     return {
         id: "run-root-check",
@@ -70,27 +69,17 @@ function fixInstruction() {
     };
 }
 function checkEnvironmentInstructions(plan) {
-    return plan.checkPlan.environmentNeeds.map((need) => {
-        const display = renderPlaywrightBrowserInstallCommand(need);
-        const [command, ...args] = display.split(" ");
-        if (command === undefined) {
-            throw new Error(`Cannot parse environment setup command: ${display}`);
-        }
-        return {
-            id: need.owner.path === "apps/web"
-                ? "install-web-playwright-browsers"
-                : "install-playwright-browsers",
-            label: need.owner.path === "apps/web"
-                ? "Install Playwright browser assets for web workspace"
-                : "Install Playwright browser assets",
-            kind: "command",
-            command,
-            args,
-            cwd: "",
-            display,
-            machineVerifiable: true,
-        };
-    });
+    return plan.checkPlan.environmentNeeds.map((need) => ({
+        id: need.nextStep.id,
+        label: need.nextStep.label,
+        kind: "command",
+        command: need.nextStep.command,
+        args: need.nextStep.args,
+        cwd: "",
+        display: need.nextStep.display,
+        machineVerifiable: need.nextStep.machineVerifiable,
+        environmentNeedKind: need.kind,
+    }));
 }
 function projectionInstructions(plan) {
     const steps = [installDependenciesInstruction()];

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

@@ -1,5 +1,6 @@
+import type { PackageAdditionSupport as SharedPackageAdditionSupportType } from "@ykdz/template-shared";
 export declare const PackageAdditionSupport: {
     readonly Supported: "supported";
     readonly Unsupported: "unsupported";
 };
-export type PackageAdditionSupport = (typeof PackageAdditionSupport)[keyof typeof PackageAdditionSupport];
+export type PackageAdditionSupport = SharedPackageAdditionSupportType;

package/node_modules/@ykdz/template-core/dist/package-addition-support.js

@@ -1,4 +1,2 @@
-export const PackageAdditionSupport = {
-    Supported: "supported",
-    Unsupported: "unsupported",
-};
+import { PackageAdditionSupport as SharedPackageAdditionSupport } from "@ykdz/template-shared";
+export const PackageAdditionSupport = SharedPackageAdditionSupport;

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

@@ -1,8 +1,8 @@
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { validateProjectBlueprint, } from "./declarations.js";
+import { validateProjectBlueprint, } from "@ykdz/template-shared";
+import { PackageAdditionSupport, } from "@ykdz/template-shared";
 import { collectGeneratedManifestCatalogReferences, pnpmWorkspaceYamlWithCatalogDependencies, } from "./dependency-catalog.js";
-import { PackageAdditionSupport } from "./package-addition-support.js";
 import { assertTypeScriptPackageBoundaryForLinkIntent, packageTurboTasks, planPackageLinks, } from "./package-linking.js";
 import { findPresetSourceManifestPreset, } from "./preset-source.js";
 import { defaultPackagePathForPresetSourcePackageAddition, planPresetSourcePackageAddition, } from "./projection-capabilities.js";
@@ -407,21 +407,6 @@ function rootScriptWithTurboPackageTask(script, task, workspacePackageGlobs) {
     commands[turboCommandIndex] = turboPackageTaskCommand(task, workspacePackageGlobs);
     return commands.join(" && ");
 }
-function turboTaskNamesForPackageManifests(manifests) {
-    const taskNames = [];
-    for (const taskName of [
-        "typecheck",
-        "build",
-        "test",
-        "test:e2e",
-        "check",
-    ]) {
-        if (manifests.some((manifest) => typeof manifest.scripts?.[taskName] === "string")) {
-            taskNames.push(taskName);
-        }
-    }
-    return taskNames;
-}
 function rootScriptWithTurboPackageTasks(options) {
     const rootCommands = options.script
         .split(" && ")
@@ -429,11 +414,9 @@ function rootScriptWithTurboPackageTasks(options) {
     const turboCommands = options.taskNames.map((taskName) => turboPackageTaskCommand(taskName, options.workspacePackageGlobs));
     return [...rootCommands, ...turboCommands].join(" && ");
 }
-function rootPackageJsonWithPackageTaskFilters(input, blueprint, packageManifests) {
+function rootPackageJsonWithPackageTaskFilters(input, blueprint) {
     assertRootPackageJson(input);
     const workspacePackageGlobs = workspacePackageGlobsFromBlueprint(blueprint);
-    const taskNames = turboTaskNamesForPackageManifests(packageManifests);
-    const rootCheckTaskNames = taskNames.filter((taskName) => taskName !== "test:e2e");
     const checkScript = input.scripts.check;
     const fixScript = input.scripts.fix;
     if (checkScript === undefined || fixScript === undefined) {
@@ -445,7 +428,7 @@ function rootPackageJsonWithPackageTaskFilters(input, blueprint, packageManifest
             ...input.scripts,
             check: rootScriptWithTurboPackageTasks({
                 script: checkScript,
-                taskNames: rootCheckTaskNames,
+                taskNames: ["check"],
                 workspacePackageGlobs,
             }),
             fix: rootScriptWithTurboPackageTask(fixScript, "fix", workspacePackageGlobs),
@@ -539,7 +522,7 @@ async function planRootUpdates(root, blueprint, packageName, packagePath, packag
         manifestOverrides,
     });
     const workspaceText = pnpmWorkspaceYamlWithCatalogDependencies(workspaceTextWithPackageGlob(await readFile(path.join(root, "pnpm-workspace.yaml"), "utf8"), workspacePackageGlob), catalogDependenciesWithSharedOxcRuntimeDependencies(catalogDependencies, requiresSharedOxcConfiguration));
-    const rootPackageJson = rootPackageJsonWithPackageTaskFilters(await readJson(path.join(root, "package.json")), nextBlueprint, packageManifests);
+    const rootPackageJson = rootPackageJsonWithPackageTaskFilters(await readJson(path.join(root, "package.json")), nextBlueprint);
     return {
         blueprint: nextBlueprint,
         rootPackageJson: rootPackageJsonWithSharedOxcRuntimeDependencies(rootPackageJson, requiresSharedOxcConfiguration),

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

@@ -1,15 +1,11 @@
-export type PackageRole = "runtime-service" | "shared-library";
-export type PackageSourcePreset = "hono-api" | "ts-lib" | "vue-app";
+import type { PackageLinkIntent, PackageRole, PackageSourcePreset } from "@ykdz/template-shared";
+export type { PackageLinkIntent, PackageRole, PackageSourcePreset, } from "@ykdz/template-shared";
 export type PackageDefinition = {
     readonly name: string;
     readonly path: string;
     readonly role?: PackageRole;
     readonly sourcePreset?: PackageSourcePreset;
 };
-export type PackageLinkIntent = {
-    readonly consumerPackagePath: string;
-    readonly providerPackagePath: string;
-};
 export type JitSourcePackageExposure = {
     readonly kind: "jit-source";
     readonly entrypoint: string;

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

@@ -75,7 +75,7 @@ export function packageTurboTasks({ dependencyBuildsRequired, }) {
         "test:e2e": {
             dependsOn: dependencyBuildsRequired ? ["build", "^build"] : ["build"],
         },
-        check: { dependsOn: ["typecheck", "build", "test", "test:e2e"] },
+        check: { dependsOn: ["typecheck", "build", "test"] },
         fix: { cache: false },
     };
 }

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

@@ -1,8 +1,7 @@
-import type { BuiltInPreset, ProjectBlueprint } from "./declarations.js";
+import type { BuiltInPreset, PackageRole, PackageSourcePreset, ProjectBlueprint } from "@ykdz/template-shared";
 import type { GenerationContext } from "./generation-context.js";
 import { type CheckPlan, type FixPlan } from "./module-graph.js";
 import { type NextStepInstruction } from "./next-step-instructions.js";
-import type { PackageRole, PackageSourcePreset } from "./package-linking.js";
 import type { DependencyMaintenancePolicy } from "./project-github.js";
 import type { RenderOperation } from "./renderer.js";
 export type PresetPackageAdditionOptions = {