@podosoft/podokit 0.13.0 → 0.14.0

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,9 +65,29 @@ 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);
@@ -232,6 +253,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 +284,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 +320,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 +363,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.14.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": {