@lumerahq/cli 0.11.0 → 0.11.1

package/dist/index.js

@@ -208,22 +208,22 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-GTG3QMVV.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-GTG3QMVV.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-GTG3QMVV.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-GTG3QMVV.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-GTG3QMVV.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-GTG3QMVV.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-ZRAW4EFI.js").then((m) => m.show(args.slice(1)));
         break;
       // Development
       case "dev":
@@ -234,7 +234,7 @@ async function main() {
         break;
       // Project
       case "init":
-        await import("./init-VNJNSU4Q.js").then((m) => m.init(args.slice(1)));
+        await import("./init-4JSHTLX2.js").then((m) => m.init(args.slice(1)));
         break;
       case "templates":
         await import("./templates-6KMZWOYH.js").then((m) => m.templates(subcommand, args.slice(2)));

package/dist/{init-VNJNSU4Q.js → init-4JSHTLX2.js}

@@ -49,22 +49,17 @@ function spinner(message) {
 function toTitleCase(str) {
   return str.split(/[-_]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 }
-var TEMPLATE_DEFAULTS = {
-  projectName: "my-lumera-app",
-  projectTitle: "My Lumera App"
-};
-function processTemplate(content, vars) {
+function processTemplate(content, replacements) {
   let result = content;
-  for (const [key, value] of Object.entries(vars)) {
-    const defaultValue = TEMPLATE_DEFAULTS[key];
-    if (defaultValue && defaultValue !== value) {
-      result = result.replaceAll(defaultValue, value);
+  for (const [from, to] of replacements) {
+    if (from !== to) {
+      result = result.replaceAll(from, to);
     }
   }
   return result;
 }
 var TEMPLATE_EXCLUDE = /* @__PURE__ */ new Set(["template.json"]);
-function copyDir(src, dest, vars, isRoot = true) {
+function copyDir(src, dest, replacements, isRoot = true) {
   if (!existsSync(dest)) {
     mkdirSync(dest, { recursive: true });
   }
@@ -73,10 +68,10 @@ function copyDir(src, dest, vars, isRoot = true) {
     const srcPath = join(src, entry.name);
     const destPath = join(dest, entry.name);
     if (entry.isDirectory()) {
-      copyDir(srcPath, destPath, vars, false);
+      copyDir(srcPath, destPath, replacements, false);
     } else {
       const content = readFileSync(srcPath, "utf-8");
-      const processed = processTemplate(content, vars);
+      const processed = processTemplate(content, replacements);
       writeFileSync(destPath, processed);
     }
   }
@@ -277,7 +272,7 @@ async function init(args) {
       type: "text",
       name: "projectName",
       message: "What is your project name?",
-      initial: "my-lumera-app",
+      initial: "my-app",
       validate: (value) => {
         if (!value) return "Project name is required";
         if (!/^[a-z0-9-]+$/.test(value)) {
@@ -346,11 +341,15 @@ async function init(args) {
     console.log(pc2.dim(`  Creating ${projectName}...`));
   }
   console.log();
-  const vars = {
-    projectName,
-    projectTitle
-  };
-  copyDir(templateDir, targetDir, vars);
+  const templatePkgPath = join(templateDir, "package.json");
+  const templatePkg = existsSync(templatePkgPath) ? JSON.parse(readFileSync(templatePkgPath, "utf-8")) : { name: "my-lumera-app" };
+  const sourceName = templatePkg.name || "my-lumera-app";
+  const sourceTitle = templatePkg.lumera?.name || toTitleCase(sourceName);
+  const replacements = [
+    [sourceName, projectName],
+    [sourceTitle, projectTitle]
+  ];
+  copyDir(templateDir, targetDir, replacements);
   function listFiles(dir, prefix = "") {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       const relativePath = prefix + entry.name;

package/dist/{resources-GTG3QMVV.js → resources-ZRAW4EFI.js}

@@ -233,7 +233,7 @@ function loadLocalCollections(platformDir, filterName) {
   }
   return collections;
 }
-function loadLocalAutomations(platformDir, filterName) {
+function loadLocalAutomations(platformDir, filterName, appName) {
   const automationsDir = join(platformDir, "automations");
   if (!existsSync(automationsDir)) {
     return [];
@@ -260,8 +260,12 @@ function loadLocalAutomations(platformDir, filterName) {
         continue;
       }
       if (!config.external_id) {
-        errors.push(`${entry.name}: missing external_id in config.json`);
-        continue;
+        if (appName) {
+          config.external_id = `${appName}:${entry.name}`;
+        } else {
+          errors.push(`${entry.name}: missing external_id in config.json`);
+          continue;
+        }
       }
       if (!config.name) {
         errors.push(`${entry.name}: missing name in config.json`);
@@ -286,7 +290,7 @@ function loadLocalAutomations(platformDir, filterName) {
   }
   return automations;
 }
-function loadLocalHooks(platformDir, filterName) {
+function loadLocalHooks(platformDir, filterName, appName) {
   const hooksDir = join(platformDir, "hooks");
   if (!existsSync(hooksDir)) {
     return [];
@@ -302,13 +306,20 @@ function loadLocalHooks(platformDir, filterName) {
       continue;
     }
     if (!config.external_id) {
-      console.log(pc.yellow(`  \u26A0 Skipping ${file}: missing external_id in config`));
-      continue;
+      if (appName) {
+        config.external_id = `${appName}:${file.replace(/\.(js|ts)$/, "")}`;
+      } else {
+        console.log(pc.yellow(`  \u26A0 Skipping ${file}: missing external_id in config`));
+        continue;
+      }
     }
     if (filterName && config.external_id !== filterName && file.replace(/\.(js|ts)$/, "") !== filterName) {
       continue;
     }
-    const script = extractHookScript(content);
+    let script = extractHookScript(content);
+    if (appName) {
+      script = script.replaceAll("{{app}}", appName);
+    }
     hooks.push({ hook: config, script, fileName: file });
   }
   return hooks;
@@ -324,9 +335,9 @@ function parseHookConfig(content) {
     const collection = content.match(/collection:\s*['"]([^'"]+)['"]/)?.[1];
     const trigger = content.match(/trigger:\s*['"]([^'"]+)['"]/)?.[1];
     const enabled = content.match(/enabled:\s*(true|false)/)?.[1];
-    if (!externalId || !collection || !trigger) return null;
+    if (!collection || !trigger) return null;
     return {
-      external_id: externalId,
+      external_id: externalId || "",
       collection,
       trigger,
       enabled: enabled !== "false"
@@ -812,7 +823,7 @@ ${hook.script.split("\n").map((line) => "  " + line).join("\n")}
     console.log(pc.green("  \u2713"), `${hook.name} \u2192 hooks/${fileName}`);
   }
 }
-async function listResources(api, platformDir, filterType) {
+async function listResources(api, platformDir, filterType, appName) {
   const results = [];
   if (!filterType || filterType === "collections") {
     const localCollections = loadLocalCollections(platformDir);
@@ -846,7 +857,7 @@ async function listResources(api, platformDir, filterType) {
     }
   }
   if (!filterType || filterType === "automations") {
-    const localAutomations = loadLocalAutomations(platformDir);
+    const localAutomations = loadLocalAutomations(platformDir, void 0, appName);
     const remoteAutomations = await api.listAutomations({ include_code: true });
     const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id && !a.managed).map((a) => [a.external_id, a]));
     const localIds = new Set(localAutomations.map((a) => a.automation.external_id));
@@ -872,7 +883,7 @@ async function listResources(api, platformDir, filterType) {
     }
   }
   if (!filterType || filterType === "hooks") {
-    const localHooks = loadLocalHooks(platformDir);
+    const localHooks = loadLocalHooks(platformDir, void 0, appName);
     const remoteHooks = await api.listHooks();
     const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
     const localIds = new Set(localHooks.map((h) => h.hook.external_id));
@@ -967,7 +978,7 @@ function planCollectionDelete(collections, platformDir) {
     cycleEdges
   };
 }
-async function destroyResources(api, platformDir, resourceType, resourceName, skipConfirm, forceCycles) {
+async function destroyResources(api, platformDir, resourceType, resourceName, skipConfirm, forceCycles, appName) {
   const toDelete = [];
   if (!resourceType || resourceType === "collections") {
     const localCollections = loadLocalCollections(platformDir, resourceName || void 0);
@@ -982,7 +993,7 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
   }
   if (!resourceType || resourceType === "automations") {
     try {
-      const localAutomations = loadLocalAutomations(platformDir, resourceName || void 0);
+      const localAutomations = loadLocalAutomations(platformDir, resourceName || void 0, appName);
       const remoteAutomations = await api.listAutomations();
       const remoteByExternalId = new Map(remoteAutomations.filter((a) => a.external_id).map((a) => [a.external_id, a]));
       for (const { automation } of localAutomations) {
@@ -995,7 +1006,7 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
     }
   }
   if (!resourceType || resourceType === "hooks") {
-    const localHooks = loadLocalHooks(platformDir, resourceName || void 0);
+    const localHooks = loadLocalHooks(platformDir, resourceName || void 0, appName);
     const remoteHooks = await api.listHooks();
     const remoteByExternalId = new Map(remoteHooks.filter((h) => h.external_id).map((h) => [h.external_id, h]));
     for (const { hook } of localHooks) {
@@ -1137,7 +1148,7 @@ async function destroyApp(skipConfirm) {
   }
   console.log(pc.green("  \u2713"), `App "${appRecord.name}" deleted from Lumera.`);
 }
-async function showResource(api, platformDir, resourceType, resourceName) {
+async function showResource(api, platformDir, resourceType, resourceName, appName) {
   if (resourceType === "collections") {
     const localCollections = loadLocalCollections(platformDir, resourceName);
     const remoteCollections = await api.listCollections();
@@ -1201,7 +1212,7 @@ async function showResource(api, platformDir, resourceType, resourceName) {
     }
     console.log();
   } else if (resourceType === "automations") {
-    const localAutomations = loadLocalAutomations(platformDir, resourceName);
+    const localAutomations = loadLocalAutomations(platformDir, resourceName, appName);
     const remoteAutomations = await api.listAutomations();
     const local = localAutomations[0];
     const remote = remoteAutomations.find((a) => a.external_id === resourceName || a.name === resourceName);
@@ -1224,7 +1235,7 @@ async function showResource(api, platformDir, resourceType, resourceName) {
     }
     console.log();
   } else if (resourceType === "hooks") {
-    const localHooks = loadLocalHooks(platformDir, resourceName);
+    const localHooks = loadLocalHooks(platformDir, resourceName, appName);
     const remoteHooks = await api.listHooks();
     const local = localHooks[0];
     const remote = remoteHooks.find((h) => h.external_id === resourceName);
@@ -1243,14 +1254,14 @@ async function showResource(api, platformDir, resourceType, resourceName) {
     const projectRoot = findProjectRoot();
     loadEnv(projectRoot);
     const token = getToken(projectRoot);
-    const appName = getAppName(projectRoot);
+    const appName2 = getAppName(projectRoot);
     const appTitle = getAppTitle(projectRoot);
     let apiUrl = getApiUrl().replace(/\/+$/, "").replace(/\/api$/, "");
     console.log();
-    console.log(pc.bold(`  App: ${appTitle || appName}`));
+    console.log(pc.bold(`  App: ${appTitle || appName2}`));
     console.log();
-    console.log(`  External ID: ${appName}`);
-    const filterParam = encodeURIComponent(JSON.stringify({ external_id: appName }));
+    console.log(`  External ID: ${appName2}`);
+    const filterParam = encodeURIComponent(JSON.stringify({ external_id: appName2 }));
     const searchRes = await fetch(
       `${apiUrl}/api/pb/collections/lm_custom_apps/records?filter=${filterParam}`,
       { headers: { Authorization: `Bearer ${token}` } }
@@ -1275,9 +1286,11 @@ async function plan(args) {
     showPlanHelp();
     return;
   }
-  loadEnv();
+  const projectRoot = findProjectRoot();
+  loadEnv(projectRoot);
   const platformDir = getPlatformDir();
   const api = createApiClient();
+  const appName = getAppName(projectRoot);
   const { type, name } = parseResource(args[0]);
   console.log();
   console.log(pc.cyan(pc.bold("  Plan")));
@@ -1299,14 +1312,14 @@ async function plan(args) {
     }
   }
   if (!type || type === "automations") {
-    const localAutomations = loadLocalAutomations(platformDir, name || void 0);
+    const localAutomations = loadLocalAutomations(platformDir, name || void 0, appName);
     if (localAutomations.length > 0) {
       const changes = await planAutomations(api, localAutomations);
       allChanges.push(...changes);
     }
   }
   if (!type || type === "hooks") {
-    const localHooks = loadLocalHooks(platformDir, name || void 0);
+    const localHooks = loadLocalHooks(platformDir, name || void 0, appName);
     if (localHooks.length > 0) {
       const changes = await planHooks(api, localHooks, collections);
       allChanges.push(...changes);
@@ -1342,9 +1355,11 @@ async function apply(args) {
     showApplyHelp();
     return;
   }
-  loadEnv();
+  const projectRoot = findProjectRoot();
+  loadEnv(projectRoot);
   const platformDir = getPlatformDir();
   const api = createApiClient();
+  const appName = getAppName(projectRoot);
   const { type, name } = parseResource(args[0]);
   console.log();
   console.log(pc.cyan(pc.bold("  Apply")));
@@ -1380,7 +1395,7 @@ async function apply(args) {
     collections = /* @__PURE__ */ new Map();
   }
   if (!type || type === "automations") {
-    const localAutomations = loadLocalAutomations(platformDir, name || void 0);
+    const localAutomations = loadLocalAutomations(platformDir, name || void 0, appName);
     if (localAutomations.length > 0) {
       console.log(pc.bold("  Automations:"));
       totalErrors += await applyAutomations(api, localAutomations);
@@ -1391,7 +1406,7 @@ async function apply(args) {
     }
   }
   if (!type || type === "hooks") {
-    const localHooks = loadLocalHooks(platformDir, name || void 0);
+    const localHooks = loadLocalHooks(platformDir, name || void 0, appName);
     if (localHooks.length > 0) {
       console.log(pc.bold("  Hooks:"));
       totalErrors += await applyHooks(api, localHooks, collections);
@@ -1403,8 +1418,8 @@ async function apply(args) {
   }
   if (!type) {
     try {
-      const projectRoot = findProjectRoot();
-      if (existsSync(join(projectRoot, "dist")) || existsSync(join(projectRoot, "src"))) {
+      const projectRoot2 = findProjectRoot();
+      if (existsSync(join(projectRoot2, "dist")) || existsSync(join(projectRoot2, "src"))) {
         console.log(pc.bold("  App:"));
         await applyApp(args);
         console.log();
@@ -1456,9 +1471,11 @@ async function destroy(args) {
     showDestroyHelp();
     return;
   }
-  loadEnv();
+  const projectRoot = findProjectRoot();
+  loadEnv(projectRoot);
   const platformDir = getPlatformDir();
   const api = createApiClient();
+  const appName = getAppName(projectRoot);
   const { type, name } = parseResource(args[0]);
   const skipConfirm = args.includes("--confirm");
   const forceCycles = args.includes("--force-cycles");
@@ -1468,7 +1485,7 @@ async function destroy(args) {
   if (type === "app") {
     await destroyApp(skipConfirm);
   } else {
-    await destroyResources(api, platformDir, type || void 0, name || void 0, skipConfirm, forceCycles);
+    await destroyResources(api, platformDir, type || void 0, name || void 0, skipConfirm, forceCycles, appName);
   }
   console.log();
 }
@@ -1477,16 +1494,18 @@ async function list(args) {
     showListHelp();
     return;
   }
-  loadEnv();
+  const projectRoot = findProjectRoot();
+  loadEnv(projectRoot);
   const platformDir = getPlatformDir();
   const api = createApiClient();
+  const appName = getAppName(projectRoot);
   const showAll = args.includes("--all");
   const positionalArgs = args.filter((a) => !a.startsWith("--"));
   const filterType = positionalArgs[0];
   console.log();
   console.log(pc.cyan(pc.bold("  Resources")));
   console.log();
-  const allResources = await listResources(api, platformDir, filterType);
+  const allResources = await listResources(api, platformDir, filterType, appName);
   const remoteOnlyCount = allResources.filter((r) => r.status === "remote-only").length;
   const resources = showAll ? allResources : allResources.filter((r) => r.status !== "remote-only");
   if (resources.length === 0 && remoteOnlyCount === 0) {
@@ -1555,9 +1574,11 @@ async function show(args) {
     if (args.length === 0) process.exit(1);
     return;
   }
-  loadEnv();
+  const projectRoot = findProjectRoot();
+  loadEnv(projectRoot);
   const platformDir = getPlatformDir();
   const api = createApiClient();
+  const appName = getAppName(projectRoot);
   const { type, name } = parseResource(args[0]);
   if (!type) {
     console.log(pc.red(`  Invalid resource path: ${args[0]}`));
@@ -1565,13 +1586,13 @@ async function show(args) {
     process.exit(1);
   }
   if (type === "app") {
-    await showResource(api, platformDir, "app", "");
+    await showResource(api, platformDir, "app", "", appName);
   } else if (!name) {
     console.log(pc.red(`  Resource name required`));
     console.log(pc.dim("  Use format: <type>/<name> (e.g., collections/users)"));
     process.exit(1);
   } else {
-    await showResource(api, platformDir, type, name);
+    await showResource(api, platformDir, type, name, appName);
   }
 }
 export {

package/package.json

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