@lumerahq/cli 0.23.0-dev.1 → 0.23.0-dev.2

package/dist/index.js

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

package/dist/{resources-GBEHZL5A.js → resources-7243WXIF.js}

@@ -31,7 +31,7 @@ import pc2 from "picocolors";
 import prompts from "prompts";
 import { execFileSync, execSync } from "child_process";
 import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
-import { join as join2, resolve } from "path";
+import { join as join2, basename as basename2, resolve } from "path";
 
 // src/lib/lint/index.ts
 import { existsSync, readFileSync, readdirSync } from "fs";
@@ -164,6 +164,15 @@ var collectionSchemaRule = {
         if (typeof field.type !== "string" || field.type.trim() === "") {
           issues.push(error(target, `Field ${typeof field.name === "string" ? `"${field.name}"` : `at index ${i}`} is missing required string field "type".`));
         }
+        const fieldLabel = typeof field.name === "string" ? `"${field.name}"` : `at index ${i}`;
+        if (field.type === "select") {
+          if (field.options !== void 0) {
+            issues.push(error(target, `Select field ${fieldLabel} must define choices with top-level "values", not "options.values".`));
+          }
+          if (!Array.isArray(field.values) || field.values.length === 0 || !field.values.every((value) => typeof value === "string" && value.trim() !== "")) {
+            issues.push(error(target, `Select field ${fieldLabel} must include a non-empty string array "values".`));
+          }
+        }
       }
     }
     if (audit !== void 0 && typeof audit !== "boolean") {
@@ -897,6 +906,11 @@ function stripNamespacePrefix(name, appName) {
   }
   return name;
 }
+function namespacedCollectionID(id, appName) {
+  if (!appName) return id;
+  const prefix = sanitizeSlugForCollectionName(appName) + NAMESPACE_SEPARATOR;
+  return id.startsWith(prefix) ? id : prefix + id;
+}
 var AGENT_IDLE_REAP_TIMEOUT_MIN_SECONDS = 10;
 var AGENT_IDLE_REAP_TIMEOUT_MAX_SECONDS = 900;
 function buildCollectionIdMap(collections, appName) {
@@ -908,6 +922,7 @@ function buildCollectionIdMap(collections, appName) {
   for (const collection of collections) {
     add(collection.id, collection.id);
     add(collection.name, collection.id);
+    add(stripNamespacePrefix(collection.id, appName), collection.id);
     const stripped = stripNamespacePrefix(collection.name, appName);
     add(stripped, collection.id);
     if (collection.name.includes(NAMESPACE_SEPARATOR)) {
@@ -1586,7 +1601,7 @@ function normalizeConstraintValue(fieldType, value) {
   }
   return value;
 }
-function fieldsDiffer(local, remote) {
+function fieldsDiffer(local, remote, appName) {
   if (mapFieldType(local.type) !== remote.type) return true;
   if ((local.required || false) !== (remote.required || false)) return true;
   const opts = remote.options || {};
@@ -1600,7 +1615,8 @@ function fieldsDiffer(local, remote) {
     if (!localMultiple && remoteMaxSelect > 1) return true;
   }
   if (local.type === "relation") {
-    if (local.collection && local.collection !== opts.collectionId) return true;
+    const remoteCollection = stripNamespacePrefix(opts.collectionId || "", appName);
+    if (local.collection && local.collection !== remoteCollection) return true;
     const localMultiple = local.multiple || false;
     const remoteMaxSelect = opts.maxSelect || 1;
     if (localMultiple && remoteMaxSelect <= 1) return true;
@@ -1667,12 +1683,13 @@ function normalizeCollectionSearch(search) {
     } : {}
   });
 }
-async function planCollections(api, localCollections) {
+async function planCollections(api, localCollections, appName) {
   const changes = [];
   const remoteCollections = await api.listCollections();
   const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
+  const remoteByLocalName = new Map(remoteCollections.map((c) => [stripNamespacePrefix(c.name, appName), c]));
   for (const local of localCollections) {
-    const remote = remoteById.get(local.id);
+    const remote = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
     if (!remote) {
       const details = [`${local.fields.length} fields`];
       if (local.audit) details.push("record audit enabled");
@@ -1701,7 +1718,7 @@ async function planCollections(api, localCollections) {
         if (!remoteFieldNames.has(name)) continue;
         const localField = localFieldMap.get(name);
         const remoteField = remoteFieldMap.get(name);
-        if (fieldsDiffer(localField, remoteField)) {
+        if (fieldsDiffer(localField, remoteField, appName)) {
           modified.push(name);
         }
       }
@@ -2189,6 +2206,17 @@ async function pullCollections(api, platformDir, filterName, appName) {
   const collectionsDir = join2(platformDir, "collections");
   mkdirSync(collectionsDir, { recursive: true });
   const collections = await api.listCollections();
+  const existingFiles = /* @__PURE__ */ new Map();
+  for (const file of readdirSync2(collectionsDir)) {
+    if (!file.endsWith(".json")) continue;
+    const filePath = join2(collectionsDir, file);
+    try {
+      const existing = JSON.parse(readFileSync2(filePath, "utf-8"));
+      if (typeof existing.id === "string") existingFiles.set(existing.id, filePath);
+      if (typeof existing.name === "string") existingFiles.set(existing.name, filePath);
+    } catch {
+    }
+  }
   for (const collection of collections) {
     if (collection.system || collection.managed) continue;
     if (appName && collection.name.includes(NAMESPACE_SEPARATOR)) {
@@ -2196,11 +2224,12 @@ async function pullCollections(api, platformDir, filterName, appName) {
       if (prefix !== sanitizeSlugForCollectionName(appName)) continue;
     }
     const localName = stripNamespacePrefix(collection.name, appName);
-    if (filterName && localName !== filterName && collection.name !== filterName && collection.id !== filterName) {
+    const localID = stripNamespacePrefix(collection.id, appName);
+    if (filterName && localName !== filterName && localID !== filterName && collection.name !== filterName && collection.id !== filterName) {
       continue;
     }
     const localFormat = {
-      id: collection.id,
+      id: localID,
       name: localName,
       audit: collection.audit,
       fields: collection.schema.map((field) => {
@@ -2211,7 +2240,9 @@ async function pullCollections(api, platformDir, filterName, appName) {
         };
         if (field.options) {
           if (field.options.values) localField.values = field.options.values;
-          if (field.options.collectionId) localField.collection = field.options.collectionId;
+          if (field.options.collectionId) {
+            localField.collection = stripNamespacePrefix(field.options.collectionId, appName);
+          }
           if (field.options.maxSelect && field.options.maxSelect > 1) localField.multiple = true;
           if (field.options.defaultCurrency) {
             localField.defaultCurrency = field.options.defaultCurrency;
@@ -2231,10 +2262,10 @@ async function pullCollections(api, platformDir, filterName, appName) {
       }).filter((idx) => idx !== null),
       search: collection.search
     };
-    const fileName = toSafeFilename(localName);
-    const filePath = join2(collectionsDir, `${fileName}.json`);
+    const fileName = `${toSafeFilename(localName)}.json`;
+    const filePath = existingFiles.get(localFormat.id) || existingFiles.get(localFormat.name) || join2(collectionsDir, fileName);
     writeFileSync(filePath, JSON.stringify(localFormat, null, 2) + "\n");
-    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${fileName}.json`);
+    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${basename2(filePath)}`);
   }
 }
 async function pullAutomations(api, platformDir, filterName, projectId) {
@@ -2820,9 +2851,9 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
     const localCollections = loadLocalCollections(platformDir, resourceName || void 0);
     const remoteCollections = await api.listCollections();
     const remoteById = new Map(remoteCollections.map((c) => [c.id, c]));
-    const remoteByName = new Map(remoteCollections.map((c) => [c.name, c]));
+    const remoteByLocalName = new Map(remoteCollections.map((c) => [stripNamespacePrefix(c.name, appName), c]));
     for (const local of localCollections) {
-      const remote = remoteById.get(local.id) || remoteByName.get(local.name);
+      const remote = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
       if (remote) {
         toDelete.push({ type: "collection", id: local.id, name: local.name, remoteId: remote.id });
       }
@@ -3025,7 +3056,9 @@ async function showResource(api, platformDir, resourceType, resourceName, appNam
     const localCollections = loadLocalCollections(platformDir, resourceName);
     const remoteCollections = await api.listCollections();
     const local = localCollections[0];
-    const remote = remoteCollections.find((c) => c.name === resourceName || c.id === resourceName);
+    const remote = remoteCollections.find(
+      (collection) => stripNamespacePrefix(collection.name, appName) === resourceName || stripNamespacePrefix(collection.id, appName) === resourceName
+    );
     if (!local && !remote) {
       console.log(pc2.red(`  Collection "${resourceName}" not found`));
       process.exit(1);
@@ -3256,7 +3289,7 @@ async function plan(args) {
   if (!type || type === "collections") {
     const localCollections = loadLocalCollections(platformDir, name || void 0);
     if (localCollections.length > 0) {
-      const changes = await planCollections(api, localCollections);
+      const changes = await planCollections(api, localCollections, appName);
       allChanges.push(...changes);
     }
   }
@@ -3403,7 +3436,7 @@ async function apply(args) {
   const localHooks = !type || type === "hooks" ? loadLocalHooks(platformDir, name || void 0, appName) : [];
   const localAgents = !type || type === "agents" ? loadLocalAgents(platformDir, name || void 0, appName) : [];
   const localMailboxes = !type || type === "mailboxes" ? loadLocalMailboxes(platformDir, name || void 0) : [];
-  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections));
+  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections, appName));
   if (localAutomations.length > 0) allChanges.push(...await planAutomations(api, localAutomations, projectId));
   if (localHooks.length > 0) allChanges.push(...await planHooks(api, localHooks, collections, projectId));
   if (localAgents.length > 0) allChanges.push(...await planAgents(api, localAgents, projectId));

package/package.json

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