@lumerahq/cli 0.34.3 → 0.34.4

package/dist/index.js

@@ -293,7 +293,7 @@ async function main() {
         await import("./status-NPNIY3QP.js").then((m) => m.status(args.slice(1)));
         break;
       case "migrate":
-        await import("./migrate-DHNR3ESM.js").then((m) => m.migrate(args.slice(1)));
+        await import("./migrate-Q2QY3YSL.js").then((m) => m.migrate(args.slice(1)));
         break;
       // Skills
       case "skills":

package/dist/{migrate-DHNR3ESM.js → migrate-Q2QY3YSL.js}

@@ -14,7 +14,7 @@ import "./chunk-PNKVD2UK.js";
 // src/commands/migrate.ts
 import pc from "picocolors";
 import { execFileSync } from "child_process";
-import { existsSync, mkdirSync, renameSync, readdirSync, readFileSync, writeFileSync, rmSync, rmdirSync } from "fs";
+import { cpSync, existsSync, mkdirSync, renameSync, readdirSync, readFileSync, writeFileSync, rmSync, rmdirSync } from "fs";
 import { join, resolve } from "path";
 import { stringify } from "smol-toml";
 function showHelp() {
@@ -65,16 +65,26 @@ function rewriteAppImports(source, modules) {
   for (const moduleName of modules) {
     const escaped = moduleName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     rewritten = rewritten.replace(
-      new RegExp(`^(\\s*)import\\s+${escaped}(\\s*(?:#.*)?)$`, "gm"),
-      `$1from app import ${moduleName}$2`
+      new RegExp(`^(\\s*)import\\s+${escaped}(\\s+as\\s+\\w+)?(\\s*(?:#.*)?)$`, "gm"),
+      `$1from app import ${moduleName}$2$3`
     );
     rewritten = rewritten.replace(
-      new RegExp(`^(\\s*)from\\s+${escaped}\\s+import\\s+`, "gm"),
-      `$1from app.${moduleName} import `
+      new RegExp(`^(\\s*)from\\s+(${escaped}(?:\\.\\w+)*)\\s+import\\s+`, "gm"),
+      "$1from app.$2 import "
     );
   }
   return rewritten;
 }
+function moveAppAPISource(source, destination, renameDirectory = renameSync, copyDirectory = cpSync) {
+  try {
+    renameDirectory(source, destination);
+  } catch (error) {
+    if (error.code !== "EXDEV") throw error;
+    mkdirSync(destination);
+    copyDirectory(source, destination, { recursive: true, force: false, errorOnExist: true });
+    rmSync(source, { recursive: true });
+  }
+}
 function migrateAppAPI(projectRoot, dryRun) {
   const legacyDir = join(projectRoot, "app-api", "lambda");
   const destination = join(projectRoot, "platform", "app");
@@ -107,19 +117,24 @@ function migrateAppAPI(projectRoot, dryRun) {
     stdio: "inherit"
   });
   mkdirSync(join(projectRoot, "platform"), { recursive: true });
-  renameSync(legacyDir, destination);
+  moveAppAPISource(legacyDir, destination);
   rmSync(join(destination, "requirements.txt"), { force: true });
   if (!existsSync(join(destination, "__init__.py"))) {
     writeFileSync(join(destination, "__init__.py"), "", "utf8");
   }
   const modules = new Set(
-    readdirSync(destination, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".py")).map((entry) => entry.name.slice(0, -3)).filter((name) => name !== "__init__")
+    readdirSync(destination, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".py") || entry.isDirectory() && existsSync(join(destination, entry.name, "__init__.py"))).map((entry) => entry.isDirectory() ? entry.name : entry.name.slice(0, -3)).filter((name) => name !== "__init__")
   );
-  for (const entry of readdirSync(destination, { withFileTypes: true })) {
-    if (!entry.isFile() || !entry.name.endsWith(".py")) continue;
-    const path = join(destination, entry.name);
-    writeFileSync(path, rewriteAppImports(readFileSync(path, "utf8"), modules), "utf8");
-  }
+  const rewriteDirectory = (directory) => {
+    for (const entry of readdirSync(directory, { withFileTypes: true })) {
+      const path = join(directory, entry.name);
+      if (entry.isDirectory()) rewriteDirectory(path);
+      else if (entry.isFile() && entry.name.endsWith(".py")) {
+        writeFileSync(path, rewriteAppImports(readFileSync(path, "utf8"), modules), "utf8");
+      }
+    }
+  };
+  rewriteDirectory(destination);
   writeFileSync(
     pyprojectPath,
     addReleaseAppEntrypoint(readFileSync(pyprojectPath, "utf8"), projectRoot),
@@ -296,5 +311,6 @@ async function migrate(args) {
   console.log(pc.dim("Your project now uses the v1 structure."));
 }
 export {
-  migrate
+  migrate,
+  moveAppAPISource
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumerahq/cli",
-  "version": "0.34.3",
+  "version": "0.34.4",
   "description": "CLI for building and deploying Lumera apps",
   "type": "module",
   "engines": {