@podosoft/podokit 0.12.0 → 0.12.2

package/dist/update.d.ts

@@ -28,6 +28,8 @@ export declare function planUpdate(projectRoot: string, templatesDir: string): U
 export interface ApplyOptions {
     /** Templates for the version the project is currently on, for 3-way merges. */
     oldTemplatesDir?: string;
+    /** Preinstalled previous external modules. Primarily useful for offline updates. */
+    oldExternalModulesRoot?: string;
 }
 export interface ApplyResult {
     written: string[];

package/dist/update.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.planUpdate = planUpdate;
 exports.applyUpdate = applyUpdate;
 exports.summarize = summarize;
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const podokit_template_engine_1 = require("@podosoft/podokit-template-engine");
 const assemble_1 = require("./assemble");
@@ -124,6 +126,48 @@ function planUpdate(projectRoot, templatesDir) {
         changes,
     };
 }
+function assertRecordedExternalModules(moduleRoot, templatesDir, modules) {
+    const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
+    for (const module of modules) {
+        if (!module.packageName || !module.moduleVersion)
+            continue;
+        const resolved = (0, add_1.resolveModule)(module.packageName, modulesDir, moduleRoot);
+        if (resolved?.moduleVersion === module.moduleVersion)
+            continue;
+        const actual = resolved?.moduleVersion ?? "not installed";
+        throw new Error(`Previous external module root has ${module.packageName} at ${actual}; ` +
+            `expected ${module.moduleVersion} from the project manifest.`);
+    }
+}
+function previousExternalModules(projectRoot, templatesDir, modules, providedRoot) {
+    const external = modules.filter((module) => Boolean(module.packageName && module.moduleVersion));
+    if (!external.length)
+        return { root: projectRoot, cleanup: false };
+    if (providedRoot) {
+        assertRecordedExternalModules(providedRoot, templatesDir, external);
+        return { root: providedRoot, cleanup: false };
+    }
+    const currentMatchesRecorded = external.every((module) => {
+        const resolved = (0, add_1.resolveModule)(module.packageName, (0, node_path_1.join)(templatesDir, "modules"), projectRoot);
+        return resolved?.moduleVersion === module.moduleVersion;
+    });
+    if (currentMatchesRecorded)
+        return { root: projectRoot, cleanup: false };
+    const root = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "podokit-update-modules-"));
+    const devDependencies = Object.fromEntries(external.map((module) => [module.packageName, module.moduleVersion]));
+    (0, node_fs_1.writeFileSync)((0, node_path_1.join)(root, "package.json"), `${JSON.stringify({ name: "podokit-update-modules", private: true, devDependencies }, null, 2)}\n`);
+    try {
+        (0, node_child_process_1.execFileSync)("npm", ["install", "--ignore-scripts", "--no-audit", "--no-fund", "--package-lock=false"], { cwd: root, stdio: "pipe" });
+        assertRecordedExternalModules(root, templatesDir, external);
+    }
+    catch {
+        (0, node_fs_1.rmSync)(root, { recursive: true, force: true });
+        const expected = external.map((module) => `${module.packageName}@${module.moduleVersion}`).join(", ");
+        throw new Error(`Cannot install previous external modules (${expected}) for the 3-way merge. ` +
+            "Check npm registry access and try again.");
+    }
+    return { root, cleanup: true };
+}
 function writeFile(projectRoot, path, content) {
     const abs = (0, node_path_1.join)(projectRoot, path);
     (0, node_fs_1.mkdirSync)((0, node_path_1.dirname)(abs), { recursive: true });
@@ -188,15 +232,24 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     });
     const managedOverrides = targetManagedOverrides(projectRoot, templatesDir, modules, manifest.managedOverrides);
     const ownedGlobs = targetOwnedGlobs(projectRoot, templatesDir, modules, manifest.ownedGlobs);
-    const oldTree = options.oldTemplatesDir
-        ? (0, assemble_1.assembleProject)({
-            templatesDir: options.oldTemplatesDir,
-            template: manifest.template,
-            answers: manifest.answers,
-            modules,
-            projectRoot,
-        })
-        : null;
+    const needsMergeBase = plan.changes.some((change) => change.action === "conflict");
+    let oldTree = null;
+    if (options.oldTemplatesDir && needsMergeBase) {
+        const previousModules = previousExternalModules(projectRoot, options.oldTemplatesDir, modules, options.oldExternalModulesRoot);
+        try {
+            oldTree = (0, assemble_1.assembleProject)({
+                templatesDir: options.oldTemplatesDir,
+                template: manifest.template,
+                answers: manifest.answers,
+                modules,
+                projectRoot: previousModules.root,
+            });
+        }
+        finally {
+            if (previousModules.cleanup)
+                (0, node_fs_1.rmSync)(previousModules.root, { recursive: true, force: true });
+        }
+    }
     const result = { written: [], removed: [], merged: [], conflicts: [] };
     for (const change of plan.changes) {
         const newText = treeText(newTree, change.path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podosoft/podokit",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "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": {