@podosoft/podokit 0.16.0 → 0.16.2

package/dist/deploy-render.js

@@ -38,7 +38,7 @@ ${annotations.map((annotation) => `        ${annotation}`).join("\n")}`;
 }
 function storageClassLine(dependency) {
     return dependency.storageClassName
-        ? `      storageClassName: ${quote(dependency.storageClassName)}\n`
+        ? `        storageClassName: ${quote(dependency.storageClassName)}\n`
         : "";
 }
 function resources(profile, indent = 10) {

package/dist/deploy.js

@@ -529,9 +529,13 @@ function deploymentLockName(profile) {
     const prefix = profile.target.release.slice(0, 39).replace(/-+$/g, "");
     return `${prefix}-${suffix}-deploy-lock`;
 }
+function kubernetesMicroTime(date) {
+    return `${date.toISOString().slice(0, -1)}000Z`;
+}
 function acquireDeploymentLock(profile, runner) {
     const name = deploymentLockName(profile);
     const holderIdentity = `podokit:${(0, node_crypto_1.randomUUID)()}`;
+    const timestamp = kubernetesMicroTime(new Date());
     const temporaryRoot = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "podokit-deploy-lock-"));
     const manifestPath = (0, node_path_1.join)(temporaryRoot, "lease.json");
     (0, node_fs_1.writeFileSync)(manifestPath, JSON.stringify({
@@ -544,8 +548,8 @@ function acquireDeploymentLock(profile, runner) {
         spec: {
             holderIdentity,
             leaseDurationSeconds: 3600,
-            acquireTime: new Date().toISOString(),
-            renewTime: new Date().toISOString(),
+            acquireTime: timestamp,
+            renewTime: timestamp,
         },
     }));
     try {

package/dist/update.js

@@ -23,6 +23,56 @@ function diskContent(projectRoot, path) {
     const abs = (0, node_path_1.join)(projectRoot, path);
     return (0, node_fs_1.existsSync)(abs) ? (0, node_fs_1.readFileSync)(abs) : null;
 }
+/**
+ * Expand the recorded module list against the target manifests. A module may
+ * gain a new requirement after it was first added to a project; updates must
+ * apply that requirement before rebuilding the dependent module or the target
+ * tree can contain imports and wiring for files that were never installed.
+ */
+function targetModules(projectRoot, templatesDir, modules) {
+    const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
+    const recorded = new Map(modules.map((module) => [module.name, module]));
+    const ordered = [];
+    const visiting = new Set();
+    const visited = new Set();
+    const visit = (name, requiredBy) => {
+        if (visited.has(name))
+            return;
+        if (visiting.has(name)) {
+            throw new Error(`Module dependency cycle detected at "${name}".`);
+        }
+        const existing = recorded.get(name);
+        const resolved = (0, add_1.resolveModule)(existing?.packageName ?? name, modulesDir, projectRoot);
+        if (!resolved) {
+            throw new Error(requiredBy
+                ? `Module "${requiredBy}" requires unknown module "${name}".`
+                : `Cannot resolve module "${name}" while updating the project.`);
+        }
+        visiting.add(name);
+        const moduleManifest = (0, add_1.readModuleManifest)(resolved.dir);
+        for (const required of moduleManifest.requires ?? [])
+            visit(required, name);
+        visiting.delete(name);
+        visited.add(name);
+        ordered.push({
+            ...(existing ?? {
+                name: resolved.name,
+                addedWith: (0, lockfile_1.podokitVersion)(),
+            }),
+            order: ordered.length,
+            ...(resolved.packageName
+                ? {
+                    packageName: resolved.packageName,
+                    moduleVersion: resolved.moduleVersion,
+                }
+                : {}),
+        });
+    };
+    for (const module of [...modules].sort((a, b) => a.order - b.order)) {
+        visit(module.name);
+    }
+    return ordered;
+}
 function targetManagedOverrides(projectRoot, templatesDir, modules, current = []) {
     const overrides = new Set(current);
     const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
@@ -56,16 +106,17 @@ function planUpdate(projectRoot, templatesDir) {
     const lock = (0, lockfile_1.readFilesLock)(projectRoot);
     if (!manifest || !lock)
         throw new inspect_1.NotAProjectError();
+    const modules = targetModules(projectRoot, templatesDir, manifest.modules);
     const newTree = (0, assemble_1.assembleProject)({
         templatesDir,
         template: manifest.template,
         answers: manifest.answers,
-        modules: manifest.modules,
+        modules,
         projectRoot,
     });
-    const managedOverrides = targetManagedOverrides(projectRoot, templatesDir, manifest.modules, manifest.managedOverrides);
-    const ownedGlobs = targetOwnedGlobs(projectRoot, templatesDir, manifest.modules, manifest.ownedGlobs);
-    const pendingMigrations = (0, module_migrations_1.collectPendingMigrations)(projectRoot, templatesDir, manifest.modules);
+    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, lock, pendingMigrations);
     const changes = migrationPlan.moves.map((move) => ({
         path: move.to,
@@ -147,7 +198,7 @@ function planUpdate(projectRoot, templatesDir) {
         fromVersion: manifest.podokitVersion,
         toVersion: (0, lockfile_1.podokitVersion)(),
         template: manifest.template,
-        modules: manifest.modules.map((m) => m.name),
+        modules: modules.map((module) => module.name),
         changes,
     };
 }
@@ -247,7 +298,7 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     if (!manifest || !previousLock)
         throw new inspect_1.NotAProjectError();
     const plan = planUpdate(projectRoot, templatesDir);
-    const modules = manifest.modules;
+    const modules = targetModules(projectRoot, templatesDir, manifest.modules);
     const newTree = (0, assemble_1.assembleProject)({
         templatesDir,
         template: manifest.template,
@@ -273,13 +324,13 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     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);
+        const previousModules = previousExternalModules(projectRoot, options.oldTemplatesDir, manifest.modules, options.oldExternalModulesRoot);
         try {
             oldTree = (0, assemble_1.assembleProject)({
                 templatesDir: options.oldTemplatesDir,
                 template: manifest.template,
                 answers: manifest.answers,
-                modules,
+                modules: manifest.modules,
                 projectRoot: previousModules.root,
             });
         }
@@ -332,7 +383,7 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
         ids.push(pending.migration.id);
         appliedMigrations.set(pending.module, ids);
     }
-    const refreshedModules = manifest.modules.map((module) => {
+    const refreshedModules = modules.map((module) => {
         const resolved = (0, add_1.resolveModule)(module.packageName ?? module.name, modulesDir, projectRoot);
         const applied = [
             ...new Set([

package/package.json

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