@podosoft/podokit 0.13.0 → 0.15.0

package/dist/templates/todo/tests/playwright.config.ts

@@ -1,10 +1,15 @@
 import { defineConfig, devices } from "@playwright/test";
+import { loadPlaywrightProjects } from "./playwright.extensions";
 
 // The suite runs against a live stack: web on E2E_BASE_URL (proxying /api/* to
 // the API). Start it first (see docs/testing.md) — locally via the dev harness,
 // in CI via scripts/e2e-ci.mjs. Two projects: `api` (request-only, backend e2e)
 // and `ui` (chromium, pages). Files are routed by suffix (*.api/*.ui.spec.ts).
 const baseURL = process.env.E2E_BASE_URL ?? "http://localhost:5001";
+const coreProjects = [
+  { name: "api", testMatch: /.*\.api\.spec\.ts/ },
+  { name: "ui", testMatch: /.*\.ui\.spec\.ts/, use: { ...devices["Desktop Chrome"] } },
+];
 
 export default defineConfig({
   testDir: ".",
@@ -18,8 +23,5 @@ export default defineConfig({
     trace: "on-first-retry",
     screenshot: "only-on-failure",
   },
-  projects: [
-    { name: "api", testMatch: /.*\.api\.spec\.ts/ },
-    { name: "ui", testMatch: /.*\.ui\.spec\.ts/, use: { ...devices["Desktop Chrome"] } },
-  ],
+  projects: [...coreProjects, ...loadPlaywrightProjects(coreProjects)],
 });

package/dist/templates/todo/tests/playwright.extensions.ts

@@ -0,0 +1,44 @@
+import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
+import { join } from "node:path";
+import type { TestConfig } from "@playwright/test";
+
+type Projects = NonNullable<TestConfig["projects"]>;
+
+const requireFromTests = createRequire(__filename);
+
+function projectName(project: unknown): string | null {
+  if (typeof project !== "object" || project === null || !("name" in project)) return null;
+  return typeof project.name === "string" && project.name.length > 0 ? project.name : null;
+}
+
+/**
+ * Merge application-owned Playwright projects into PodoKit's managed config.
+ * The optional CommonJS file stays owned so applications can add devices and
+ * browsers without creating a 3-way merge hotspot in playwright.config.ts.
+ */
+export function loadPlaywrightProjects(coreProjects: Projects): Projects {
+  const extensionPath = join(__dirname, "playwright.projects.cjs");
+  if (!existsSync(extensionPath)) return [];
+
+  const loaded = requireFromTests(extensionPath) as unknown;
+  if (!Array.isArray(loaded)) {
+    throw new Error("tests/playwright.projects.cjs must export an array of Playwright projects.");
+  }
+
+  const names = new Set(
+    coreProjects.map((project) => projectName(project)).filter((name): name is string => name !== null),
+  );
+  for (const project of loaded) {
+    const name = projectName(project);
+    if (!name) {
+      throw new Error("Every project in tests/playwright.projects.cjs must have a non-empty name.");
+    }
+    if (names.has(name)) {
+      throw new Error(`Duplicate Playwright project name: ${name}`);
+    }
+    names.add(name);
+  }
+
+  return loaded as Projects;
+}

package/dist/update.d.ts

@@ -5,9 +5,11 @@ import { type Tier } from "./lockfile";
  * working copy, classifying each file. Applying the plan (writing files, 3-way
  * merging) is a later step (see ADR-0009).
  */
-export type Action = "update" | "merge" | "conflict" | "add" | "remove" | "skip" | "up-to-date";
+export type Action = "update" | "merge" | "conflict" | "add" | "move" | "remove" | "skip" | "up-to-date";
 export interface FileChange {
     path: string;
+    /** Previous path when this change is an update migration move. */
+    fromPath?: string;
     tier: Tier;
     action: Action;
     /** Why the action was chosen (for the report). */
@@ -33,6 +35,11 @@ export interface ApplyOptions {
 }
 export interface ApplyResult {
     written: string[];
+    /** Files relocated by module update migrations. */
+    moved: {
+        from: string;
+        to: string;
+    }[];
     removed: string[];
     /** Files 3-way merged cleanly. */
     merged: string[];

package/dist/update.js

@@ -12,6 +12,7 @@ const assemble_1 = require("./assemble");
 const lockfile_1 = require("./lockfile");
 const inspect_1 = require("./inspect");
 const add_1 = require("./add");
+const module_migrations_1 = require("./module-migrations");
 function treeText(tree, path) {
     const file = tree.get(path);
     if (!file)
@@ -64,26 +65,50 @@ function planUpdate(projectRoot, templatesDir) {
     });
     const managedOverrides = targetManagedOverrides(projectRoot, templatesDir, manifest.modules, manifest.managedOverrides);
     const ownedGlobs = targetOwnedGlobs(projectRoot, templatesDir, manifest.modules, manifest.ownedGlobs);
-    const changes = [];
+    const pendingMigrations = (0, module_migrations_1.collectPendingMigrations)(projectRoot, templatesDir, manifest.modules);
+    const migrationPlan = (0, module_migrations_1.planModuleMigrations)(projectRoot, newTree, lock, pendingMigrations);
+    const changes = migrationPlan.moves.map((move) => ({
+        path: move.to,
+        fromPath: move.from,
+        tier: move.tier,
+        action: "move",
+        note: "module path migration",
+    }));
+    for (const conflict of migrationPlan.conflicts) {
+        changes.push({
+            path: "module migration",
+            tier: "managed",
+            action: "conflict",
+            note: conflict,
+        });
+    }
+    const movedSources = new Set(migrationPlan.moves.map((move) => move.from));
+    const movedTargets = new Set(migrationPlan.moves.map((move) => move.to));
     const paths = new Set([...newTree.keys(), ...Object.keys(lock.files)]);
     for (const path of [...paths].sort()) {
+        if (movedSources.has(path) || movedTargets.has(path))
+            continue;
         const locked = lock.files[path];
         const newText = treeText(newTree, path);
         const disk = diskContent(projectRoot, path);
-        // A newer module can explicitly take responsibility for a path that older
-        // projects classified under a broad owned glob (notably generated skills).
-        const managedByTarget = managedOverrides.some((glob) => (0, lockfile_1.matchGlob)(path, glob));
-        const ownedByTarget = ownedGlobs.some((glob) => (0, lockfile_1.matchGlob)(path, glob));
-        const tier = managedByTarget
-            ? "managed"
-            : ownedByTarget
-                ? "owned"
-                : locked?.tier ??
-                    (newText !== null
-                        ? (0, lockfile_1.classifyTier)(path, newText, ownedGlobs, managedOverrides)
-                        : "managed");
+        // Use the same ownership precedence as lockfile classification. In
+        // particular, an exact path recorded by `podo eject` must keep winning over
+        // a module's managed override, while managed overrides may still reclaim a
+        // path covered only by a broad owned glob.
+        const controlledByTarget = managedOverrides.some((glob) => (0, lockfile_1.matchGlob)(path, glob)) ||
+            ownedGlobs.some((glob) => (0, lockfile_1.matchGlob)(path, glob));
+        const classified = (0, lockfile_1.classifyTier)(path, newText ?? disk ?? "", ownedGlobs, managedOverrides);
+        const tier = controlledByTarget ? classified : locked?.tier ?? classified;
         if (tier === "owned") {
-            changes.push({ path, tier, action: "skip", note: "owned — never modified" });
+            const explicitlyOwned = ownedGlobs.some((glob) => !glob.includes("*") && (0, lockfile_1.matchGlob)(path, glob));
+            changes.push({
+                path,
+                tier,
+                action: "skip",
+                note: explicitlyOwned && disk === null && newText !== null
+                    ? "explicitly owned — missing or relocated; not restored"
+                    : "owned — never modified",
+            });
             continue;
         }
         // File removed upstream.
@@ -232,6 +257,19 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     });
     const managedOverrides = targetManagedOverrides(projectRoot, templatesDir, modules, manifest.managedOverrides);
     const ownedGlobs = targetOwnedGlobs(projectRoot, templatesDir, modules, manifest.ownedGlobs);
+    const pendingMigrations = (0, module_migrations_1.collectPendingMigrations)(projectRoot, templatesDir, modules);
+    const migrationPlan = (0, module_migrations_1.planModuleMigrations)(projectRoot, newTree, previousLock, pendingMigrations);
+    if (migrationPlan.conflicts.length) {
+        throw new Error(`Cannot apply module path migration:\n${migrationPlan.conflicts
+            .map((conflict) => `  - ${conflict}`)
+            .join("\n")}`);
+    }
+    const migratedOwnedGlobs = [
+        ...new Set(ownedGlobs.map((glob) => (0, module_migrations_1.migrateConfiguredPath)(glob, pendingMigrations))),
+    ];
+    const migratedManagedOverrides = [
+        ...new Set(managedOverrides.map((glob) => (0, module_migrations_1.migrateConfiguredPath)(glob, pendingMigrations))),
+    ];
     const needsMergeBase = plan.changes.some((change) => change.action === "conflict");
     let oldTree = null;
     if (options.oldTemplatesDir && needsMergeBase) {
@@ -250,7 +288,13 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
                 (0, node_fs_1.rmSync)(previousModules.root, { recursive: true, force: true });
         }
     }
-    const result = { written: [], removed: [], merged: [], conflicts: [] };
+    const result = {
+        written: [],
+        moved: (0, module_migrations_1.applyModuleMigrations)(projectRoot, migrationPlan),
+        removed: [],
+        merged: [],
+        conflicts: [],
+    };
     for (const change of plan.changes) {
         const newText = treeText(newTree, change.path);
         if (change.action === "update" || change.action === "add") {
@@ -280,22 +324,37 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     // Keep the assembled target as the managed baseline. A merged working file
     // intentionally remains drifted so a future update performs another 3-way
     // merge instead of treating the user's lines as clean generated output.
-    (0, lockfile_1.writeFilesLock)(projectRoot, updatedFilesLock(projectRoot, newTree, previousLock, ownedGlobs, managedOverrides));
+    (0, lockfile_1.writeFilesLock)(projectRoot, updatedFilesLock(projectRoot, newTree, previousLock, migratedOwnedGlobs, migratedManagedOverrides));
     const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
+    const appliedMigrations = new Map();
+    for (const pending of pendingMigrations) {
+        const ids = appliedMigrations.get(pending.module) ?? [];
+        ids.push(pending.migration.id);
+        appliedMigrations.set(pending.module, ids);
+    }
     const refreshedModules = manifest.modules.map((module) => {
         const resolved = (0, add_1.resolveModule)(module.packageName ?? module.name, modulesDir, projectRoot);
-        return resolved?.packageName
-            ? {
-                ...module,
-                packageName: resolved.packageName,
-                moduleVersion: resolved.moduleVersion,
-            }
-            : module;
+        const applied = [
+            ...new Set([
+                ...(module.appliedMigrations ?? []),
+                ...(appliedMigrations.get(module.name) ?? []),
+            ]),
+        ];
+        return {
+            ...module,
+            ...(resolved?.packageName
+                ? {
+                    packageName: resolved.packageName,
+                    moduleVersion: resolved.moduleVersion,
+                }
+                : {}),
+            ...(applied.length ? { appliedMigrations: applied } : {}),
+        };
     });
     (0, lockfile_1.writeManifest)(projectRoot, {
         ...manifest,
-        ownedGlobs,
-        managedOverrides,
+        ownedGlobs: migratedOwnedGlobs,
+        managedOverrides: migratedManagedOverrides,
         modules: refreshedModules,
         podokitVersion: (0, lockfile_1.podokitVersion)(),
     });
@@ -308,6 +367,7 @@ function summarize(plan) {
         merge: 0,
         conflict: 0,
         add: 0,
+        move: 0,
         remove: 0,
         skip: 0,
         "up-to-date": 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podosoft/podokit",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "An opinionated but extensible starter toolkit and CLI for full-stack TypeScript apps with NestJS, SvelteKit, TailwindCSS, shadcn-svelte, Docker, and k3s.",
   "license": "Apache-2.0",
   "repository": {