@lumerahq/cli 0.17.1 → 0.18.0

package/dist/index.js

@@ -215,25 +215,25 @@ async function main() {
     switch (command) {
       // Resource commands
       case "plan":
-        await import("./resources-64MEBAL5.js").then((m) => m.plan(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.plan(args.slice(1)));
         break;
       case "apply":
-        await import("./resources-64MEBAL5.js").then((m) => m.apply(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.apply(args.slice(1)));
         break;
       case "pull":
-        await import("./resources-64MEBAL5.js").then((m) => m.pull(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.pull(args.slice(1)));
         break;
       case "destroy":
-        await import("./resources-64MEBAL5.js").then((m) => m.destroy(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.destroy(args.slice(1)));
         break;
       case "list":
-        await import("./resources-64MEBAL5.js").then((m) => m.list(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.list(args.slice(1)));
         break;
       case "show":
-        await import("./resources-64MEBAL5.js").then((m) => m.show(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.show(args.slice(1)));
         break;
       case "diff":
-        await import("./resources-64MEBAL5.js").then((m) => m.diff(args.slice(1)));
+        await import("./resources-HLQTZV37.js").then((m) => m.diff(args.slice(1)));
         break;
       // Development
       case "dev":

package/dist/{resources-64MEBAL5.js → resources-HLQTZV37.js}

@@ -252,8 +252,10 @@ function parseResource(resourcePath) {
   const parts = resourcePath.split("/");
   const type = parts[0];
   const name = parts.slice(1).join("/") || null;
-  if (!["collections", "automations", "hooks", "agents", "app"].includes(type)) {
-    return { type: null, name: null };
+  const validTypes = ["collections", "automations", "hooks", "agents", "app"];
+  if (!validTypes.includes(type)) {
+    console.log(pc.red(`  Unknown resource type "${type}". Valid types: ${validTypes.join(", ")}`));
+    process.exit(1);
   }
   return { type, name };
 }
@@ -301,6 +303,16 @@ function loadLocalCollections(platformDir, filterName) {
         errors.push(`${file}: collection name "${collection.name}" contains invalid characters`);
         continue;
       }
+      const existingById = collections.find((c) => c.id === collection.id);
+      if (existingById) {
+        errors.push(`${file}: duplicate collection id "${collection.id}" (also defined in another file)`);
+        continue;
+      }
+      const existingByName = collections.find((c) => c.name === collection.name);
+      if (existingByName) {
+        errors.push(`${file}: duplicate collection name "${collection.name}" (also defined in another file)`);
+        continue;
+      }
       collections.push(collection);
     } catch (e) {
       errors.push(`${file}: failed to parse - ${e}`);
@@ -357,6 +369,11 @@ function loadLocalAutomations(platformDir, filterName, appName) {
         errors.push(`${entry.name}: missing inputs.schema in config.json`);
         continue;
       }
+      const existingByExtId = automations.find((a) => a.automation.external_id === config.external_id);
+      if (existingByExtId) {
+        errors.push(`${entry.name}: duplicate external_id "${config.external_id}" (also defined in ${existingByExtId.automation.name})`);
+        continue;
+      }
       const code = readFileSync(mainPath, "utf-8");
       automations.push({ automation: config, code });
     } catch (e) {
@@ -409,22 +426,28 @@ function loadLocalHooks(platformDir, filterName, appName) {
 function parseHookConfig(content) {
   const configMatch = content.match(/export\s+const\s+config\s*[=:]\s*(\{[\s\S]*?\});?/);
   if (!configMatch) return null;
-  try {
-    let configStr = configMatch[1].replace(/'/g, '"').replace(/(\w+):/g, '"$1":').replace(/,\s*}/g, "}");
-    return JSON.parse(configStr);
-  } catch {
-    const externalId = content.match(/external_id:\s*['"]([^'"]+)['"]/)?.[1];
-    const collection = content.match(/collection:\s*['"]([^'"]+)['"]/)?.[1];
-    const trigger = content.match(/trigger:\s*['"]([^'"]+)['"]/)?.[1];
-    const enabled = content.match(/enabled:\s*(true|false)/)?.[1];
-    if (!collection || !trigger) return null;
-    return {
-      external_id: externalId || "",
-      collection,
-      trigger,
-      enabled: enabled !== "false"
-    };
+  const externalId = configMatch[1].match(/external_id\s*:\s*['"]([^'"]+)['"]/)?.[1];
+  const collection = configMatch[1].match(/collection\s*:\s*['"]([^'"]+)['"]/)?.[1];
+  const trigger = configMatch[1].match(/trigger\s*:\s*['"]([^'"]+)['"]/)?.[1];
+  const enabled = configMatch[1].match(/enabled\s*:\s*(true|false)/)?.[1];
+  const name = configMatch[1].match(/name\s*:\s*['"]([^'"]+)['"]/)?.[1];
+  if (!collection || !trigger) return null;
+  const hook = {
+    external_id: externalId || "",
+    collection,
+    trigger,
+    enabled: enabled !== "false"
+  };
+  if (name) hook.name = name;
+  const metadataMatch = configMatch[1].match(/metadata\s*:\s*(\{[^}]*\})/);
+  if (metadataMatch) {
+    try {
+      const metaStr = metadataMatch[1].replace(/'/g, '"').replace(/(\w+)\s*:/g, '"$1":').replace(/,\s*}/g, "}");
+      hook.metadata = JSON.parse(metaStr);
+    } catch {
+    }
   }
+  return hook;
 }
 function extractHookScript(content) {
   const handlerMatch = content.match(
@@ -508,8 +531,37 @@ function fieldsDiffer(local, remote) {
     if (localMultiple && remoteMaxSelect <= 1) return true;
     if (!localMultiple && remoteMaxSelect > 1) return true;
   }
-  if (local.min !== void 0 && local.min !== opts.min) return true;
-  if (local.max !== void 0 && local.max !== opts.max) return true;
+  const localMin = local.min !== void 0 ? local.min : void 0;
+  const remoteMin = opts.min !== void 0 ? opts.min : void 0;
+  if (localMin !== remoteMin) return true;
+  const localMax = local.max !== void 0 ? local.max : void 0;
+  const remoteMax = opts.max !== void 0 ? opts.max : void 0;
+  if (localMax !== remoteMax) return true;
+  return false;
+}
+function localIndexesToSql(local) {
+  if (!local.indexes || local.indexes.length === 0) return [];
+  return local.indexes.map((idx) => {
+    const fields = idx.fields.join(", ");
+    const unique = idx.unique ? "UNIQUE " : "";
+    const indexName = `idx_${local.id}_${idx.fields.join("_")}`;
+    return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
+  }).sort();
+}
+function normalizeRemoteIndexes(remoteIndexes) {
+  return remoteIndexes.filter((idx) => {
+    const lower = idx.toLowerCase();
+    if (lower.includes("external_id") || lower.includes("updated")) return false;
+    return true;
+  }).sort();
+}
+function indexesDiffer(local, remoteIndexes) {
+  const localSql = localIndexesToSql(local);
+  const remoteSql = normalizeRemoteIndexes(remoteIndexes);
+  if (localSql.length !== remoteSql.length) return true;
+  for (let i = 0; i < localSql.length; i++) {
+    if (localSql[i] !== remoteSql[i]) return true;
+  }
   return false;
 }
 async function planCollections(api, localCollections) {
@@ -548,11 +600,13 @@ async function planCollections(api, localCollections) {
           modified.push(name);
         }
       }
-      if (added.length > 0 || removed.length > 0 || modified.length > 0) {
+      const indexesChanged = indexesDiffer(local, remote.indexes || []);
+      if (added.length > 0 || removed.length > 0 || modified.length > 0 || indexesChanged) {
         const details = [];
         if (added.length > 0) details.push(`+${added.length} field${added.length > 1 ? "s" : ""}`);
         if (removed.length > 0) details.push(`-${removed.length} field${removed.length > 1 ? "s" : ""}`);
         if (modified.length > 0) details.push(`~${modified.length} field${modified.length > 1 ? "s" : ""} (${modified.join(", ")})`);
+        if (indexesChanged) details.push("indexes changed");
         const fieldDetails = [];
         for (const name of added) {
           const f = localFieldMap.get(name);
@@ -592,11 +646,19 @@ async function planAutomations(api, localAutomations) {
       const codeChanged = remote.code !== code;
       const nameChanged = remote.name !== automation.name;
       const descChanged = (remote.description || "") !== (automation.description || "");
-      if (codeChanged || nameChanged || descChanged) {
+      const localSchema = automation.inputs?.schema ? JSON.stringify(automation.inputs.schema) : "";
+      const remoteSchema = remote.input_schema ? typeof remote.input_schema === "string" ? remote.input_schema : JSON.stringify(remote.input_schema) : "";
+      const schemaChanged = localSchema !== remoteSchema;
+      const localCron = automation.schedule?.cron || "";
+      const remoteCron = remote.schedule || "";
+      const scheduleChanged = localCron !== remoteCron;
+      if (codeChanged || nameChanged || descChanged || schemaChanged || scheduleChanged) {
         const details = [];
         if (codeChanged) details.push("code");
         if (nameChanged) details.push("name");
         if (descChanged) details.push("description");
+        if (schemaChanged) details.push("input_schema");
+        if (scheduleChanged) details.push("schedule");
         const textDiffs = [];
         if (codeChanged) {
           textDiffs.push({ field: "main.py", oldText: remote.code || "", newText: code });
@@ -635,10 +697,16 @@ async function planHooks(api, localHooks, collections) {
     } else {
       const scriptChanged = remote.script.trim() !== script.trim();
       const eventChanged = remote.event !== hook.trigger;
-      if (scriptChanged || eventChanged) {
+      const enabledChanged = remote.enabled !== void 0 && remote.enabled !== (hook.enabled !== false);
+      const nameChanged = hook.name && remote.name !== hook.name || false;
+      const collectionChanged = remote.collection_id !== collectionId;
+      if (scriptChanged || eventChanged || enabledChanged || nameChanged || collectionChanged) {
         const details = [];
         if (scriptChanged) details.push("script");
         if (eventChanged) details.push("trigger");
+        if (enabledChanged) details.push("enabled");
+        if (nameChanged) details.push("name");
+        if (collectionChanged) details.push("collection");
         const textDiffs = [];
         if (scriptChanged) {
           textDiffs.push({ field: fileName, oldText: remote.script || "", newText: script });
@@ -660,30 +728,25 @@ async function applyCollections(api, localCollections) {
   let errors = 0;
   const hasRelations = localCollections.some((c) => c.fields.some((f) => f.type === "relation"));
   if (hasRelations) {
+    const pass1Failed = /* @__PURE__ */ new Set();
     for (const local of localCollections) {
-      const relationFieldNames = new Set(local.fields.filter((f) => f.type === "relation").map((f) => f.name));
-      const withoutRelations = {
-        ...local,
-        fields: local.fields.filter((f) => f.type !== "relation"),
-        indexes: local.indexes?.filter((idx) => !idx.fields.some((f) => relationFieldNames.has(f)))
-      };
-      const apiFormat = convertCollectionToApiFormat(withoutRelations);
       try {
-        await api.ensureCollection(local.name, apiFormat);
+        await api.ensureCollection(local.name, { id: local.id });
         console.log(pc.green("  \u2713"), `${local.name}`);
       } catch (e) {
         console.log(pc.red("  \u2717"), `${local.name}: ${e}`);
+        pass1Failed.add(local.name);
         errors++;
       }
     }
-    const collectionsWithRelations = localCollections.filter((c) => c.fields.some((f) => f.type === "relation"));
-    for (const local of collectionsWithRelations) {
+    for (const local of localCollections) {
+      if (pass1Failed.has(local.name)) continue;
       const apiFormat = convertCollectionToApiFormat(local);
       try {
         await api.ensureCollection(local.name, apiFormat);
-        console.log(pc.green("  \u2713"), `${local.name} (relations)`);
+        console.log(pc.green("  \u2713"), `${local.name} (schema)`);
       } catch (e) {
-        console.log(pc.red("  \u2717"), `${local.name} (relations): ${e}`);
+        console.log(pc.red("  \u2717"), `${local.name} (schema): ${e}`);
         errors++;
       }
     }
@@ -746,6 +809,9 @@ async function applyAutomations(api, localAutomations) {
 async function syncPresets(api, automationId, localPresets) {
   const remotePresets = await api.listPresets(automationId);
   const remoteByName = new Map(remotePresets.map((p) => [p.name, p]));
+  const localPresetNames = new Set(
+    Object.entries(localPresets).map(([key, preset]) => preset.label || key)
+  );
   for (const [presetKey, preset] of Object.entries(localPresets)) {
     const presetName = preset.label || presetKey;
     const existing = remoteByName.get(presetName);
@@ -761,6 +827,16 @@ async function syncPresets(api, automationId, localPresets) {
       console.log(pc.yellow(`    \u26A0 Failed to sync preset ${presetName}: ${e}`));
     }
   }
+  for (const remote of remotePresets) {
+    if (!localPresetNames.has(remote.name)) {
+      try {
+        await api.deletePreset(remote.id);
+        console.log(pc.dim(`    Deleted preset: ${remote.name}`));
+      } catch (e) {
+        console.log(pc.yellow(`    \u26A0 Failed to delete preset ${remote.name}: ${e}`));
+      }
+    }
+  }
 }
 async function setSchedule(api, automationId, schedule, localPresets) {
   const presetName = localPresets[schedule.preset]?.label || schedule.preset;
@@ -1706,7 +1782,8 @@ async function plan(args) {
   const api = createApiClient();
   const appName = getAppName(projectRoot);
   const projectId = getProjectId(projectRoot);
-  const { type, name } = parseResource(args[0]);
+  const positionalArgs = args.filter((a) => !a.startsWith("-"));
+  const { type, name } = parseResource(positionalArgs[0]);
   console.log();
   console.log(pc.cyan(pc.bold("  Plan")));
   console.log(pc.dim("  Comparing local files to remote state..."));
@@ -1803,7 +1880,8 @@ async function apply(args) {
   const api = createApiClient();
   const appName = getAppName(projectRoot);
   const projectId = getProjectId(projectRoot);
-  const { type, name } = parseResource(args.filter((a) => a !== "--yes" && a !== "-y")[0]);
+  const positionalArgs = args.filter((a) => !a.startsWith("-"));
+  const { type, name } = parseResource(positionalArgs[0]);
   const autoConfirm = args.includes("--yes") || args.includes("-y") || !!process.env.CI;
   if (type === "app") {
     console.log();

package/package.json

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