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

package/dist/index.js

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

package/dist/{resources-7243WXIF.js → resources-QCCLRDOL.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, basename as basename2, resolve } from "path";
+import { join as join2, resolve } from "path";
 
 // src/lib/lint/index.ts
 import { existsSync, readFileSync, readdirSync } from "fs";
@@ -124,9 +124,9 @@ var collectionSchemaRule = {
     const id = parsed.id;
     const name = parsed.name;
     const fields = parsed.fields;
-    const audit = parsed.audit;
     const indexes = parsed.indexes;
     const search = parsed.search;
+    const audit = parsed.audit;
     const localFieldTypes = /* @__PURE__ */ new Map();
     if (Array.isArray(fields)) {
       for (const field of fields) {
@@ -164,15 +164,6 @@ 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") {
@@ -906,11 +897,6 @@ 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) {
@@ -922,7 +908,6 @@ 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)) {
@@ -1570,8 +1555,8 @@ function convertCollectionToApiFormat(local) {
     name: local.name,
     schema,
     indexes,
-    ...local.audit !== void 0 ? { audit: local.audit } : {},
-    search: local.search ?? null
+    search: local.search ?? null,
+    ...local.audit !== void 0 ? { audit: local.audit } : {}
   };
 }
 function mapFieldType(type) {
@@ -1579,8 +1564,8 @@ function mapFieldType(type) {
     text: "text",
     number: "number",
     bool: "bool",
-    email: "email",
-    url: "url",
+    email: "text",
+    url: "text",
     date: "date",
     select: "select",
     relation: "relation",
@@ -1601,7 +1586,7 @@ function normalizeConstraintValue(fieldType, value) {
   }
   return value;
 }
-function fieldsDiffer(local, remote, appName) {
+function fieldsDiffer(local, remote) {
   if (mapFieldType(local.type) !== remote.type) return true;
   if ((local.required || false) !== (remote.required || false)) return true;
   const opts = remote.options || {};
@@ -1615,8 +1600,7 @@ function fieldsDiffer(local, remote, appName) {
     if (!localMultiple && remoteMaxSelect > 1) return true;
   }
   if (local.type === "relation") {
-    const remoteCollection = stripNamespacePrefix(opts.collectionId || "", appName);
-    if (local.collection && local.collection !== remoteCollection) return true;
+    if (local.collection && local.collection !== opts.collectionId) return true;
     const localMultiple = local.multiple || false;
     const remoteMaxSelect = opts.maxSelect || 1;
     if (localMultiple && remoteMaxSelect <= 1) return true;
@@ -1683,22 +1667,22 @@ function normalizeCollectionSearch(search) {
     } : {}
   });
 }
-async function planCollections(api, localCollections, appName) {
+async function planCollections(api, localCollections) {
   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 = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
+    const remote = remoteById.get(local.id);
     if (!remote) {
-      const details = [`${local.fields.length} fields`];
-      if (local.audit) details.push("record audit enabled");
       changes.push({
         type: "create",
         resource: "collection",
         id: local.id,
         name: local.name,
-        details: details.join(", "),
+        details: [
+          `${local.fields.length} fields`,
+          ...local.audit !== void 0 ? [local.audit ? "audit enabled" : "audit disabled"] : []
+        ].join(", "),
         fieldDetails: local.fields.map((f) => ({
           action: "+",
           name: f.name,
@@ -1718,7 +1702,7 @@ async function planCollections(api, localCollections, appName) {
         if (!remoteFieldNames.has(name)) continue;
         const localField = localFieldMap.get(name);
         const remoteField = remoteFieldMap.get(name);
-        if (fieldsDiffer(localField, remoteField, appName)) {
+        if (fieldsDiffer(localField, remoteField)) {
           modified.push(name);
         }
       }
@@ -1732,7 +1716,7 @@ async function planCollections(api, localCollections, appName) {
         if (modified.length > 0) details.push(`~${modified.length} field${modified.length > 1 ? "s" : ""} (${modified.join(", ")})`);
         if (indexesChanged) details.push("indexes changed");
         if (searchChanged) details.push("search changed");
-        if (auditChanged) details.push(local.audit ? "record audit enabled" : "record audit disabled");
+        if (auditChanged) details.push(local.audit ? "audit enabled" : "audit disabled");
         const fieldDetails = [];
         for (const name of added) {
           const f = localFieldMap.get(name);
@@ -2202,34 +2186,20 @@ async function applyApp(args) {
   const distDir = resolve(projectRoot, "dist");
   await deploy({ token, appName, appTitle, distDir, apiUrl });
 }
-async function pullCollections(api, platformDir, filterName, appName) {
+async function pullCollections(api, platformDir, filterName, projectId) {
   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)) {
-      const prefix = collection.name.split(NAMESPACE_SEPARATOR)[0];
-      if (prefix !== sanitizeSlugForCollectionName(appName)) continue;
-    }
-    const localName = stripNamespacePrefix(collection.name, appName);
-    const localID = stripNamespacePrefix(collection.id, appName);
-    if (filterName && localName !== filterName && localID !== filterName && collection.name !== filterName && collection.id !== filterName) {
+    if (projectId && collection.project_id !== projectId) continue;
+    if (!projectId && collection.project_id) continue;
+    const localName = collection.name;
+    if (filterName && localName !== filterName && collection.name !== filterName && collection.id !== filterName) {
       continue;
     }
     const localFormat = {
-      id: localID,
+      id: collection.id,
       name: localName,
       audit: collection.audit,
       fields: collection.schema.map((field) => {
@@ -2240,9 +2210,7 @@ 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 = stripNamespacePrefix(field.options.collectionId, appName);
-          }
+          if (field.options.collectionId) localField.collection = field.options.collectionId;
           if (field.options.maxSelect && field.options.maxSelect > 1) localField.multiple = true;
           if (field.options.defaultCurrency) {
             localField.defaultCurrency = field.options.defaultCurrency;
@@ -2262,10 +2230,10 @@ async function pullCollections(api, platformDir, filterName, appName) {
       }).filter((idx) => idx !== null),
       search: collection.search
     };
-    const fileName = `${toSafeFilename(localName)}.json`;
-    const filePath = existingFiles.get(localFormat.id) || existingFiles.get(localFormat.name) || join2(collectionsDir, fileName);
+    const fileName = toSafeFilename(localName);
+    const filePath = join2(collectionsDir, `${fileName}.json`);
     writeFileSync(filePath, JSON.stringify(localFormat, null, 2) + "\n");
-    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${basename2(filePath)}`);
+    console.log(pc2.green("  \u2713"), `${localName} \u2192 collections/${fileName}.json`);
   }
 }
 async function pullAutomations(api, platformDir, filterName, projectId) {
@@ -2637,7 +2605,11 @@ async function listResources(api, platformDir, filterType, appName, projectId) {
   if (!filterType || filterType === "collections") {
     const localCollections = loadLocalCollections(platformDir);
     const remoteCollections = await api.listCollections();
-    const remoteByName = new Map(remoteCollections.filter((c) => !c.system && !c.managed).map((c) => [stripNamespacePrefix(c.name, appName), c]));
+    const projectCollections = remoteCollections.filter((collection) => {
+      if (collection.system || collection.managed) return false;
+      return projectId ? collection.project_id === projectId : !collection.project_id;
+    });
+    const remoteByName = new Map(projectCollections.map((collection) => [collection.name, collection]));
     const localNames = new Set(localCollections.map((c) => c.name));
     for (const local of localCollections) {
       const remote = remoteByName.get(local.name);
@@ -2658,15 +2630,9 @@ async function listResources(api, platformDir, filterType, appName, projectId) {
         }
       }
     }
-    for (const remote of remoteCollections) {
-      if (remote.system || remote.managed) continue;
-      if (appName && remote.name.includes(NAMESPACE_SEPARATOR)) {
-        const prefix = remote.name.split(NAMESPACE_SEPARATOR)[0];
-        if (prefix !== sanitizeSlugForCollectionName(appName)) continue;
-      }
-      const stripped = stripNamespacePrefix(remote.name, appName);
-      if (!localNames.has(stripped)) {
-        results.push({ name: stripped, type: "collections", status: "remote-only" });
+    for (const remote of projectCollections) {
+      if (!localNames.has(remote.name)) {
+        results.push({ name: remote.name, type: "collections", status: "remote-only" });
       }
     }
   }
@@ -2850,10 +2816,9 @@ async function destroyResources(api, platformDir, resourceType, resourceName, sk
   if (!resourceType || resourceType === "collections") {
     const localCollections = loadLocalCollections(platformDir, resourceName || void 0);
     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]));
+    const remoteByName = new Map(remoteCollections.map((c) => [c.name, c]));
     for (const local of localCollections) {
-      const remote = remoteByLocalName.get(local.name) ?? remoteById.get(namespacedCollectionID(local.id, appName)) ?? (!appName ? remoteById.get(local.id) : void 0);
+      const remote = remoteByName.get(local.name);
       if (remote) {
         toDelete.push({ type: "collection", id: local.id, name: local.name, remoteId: remote.id });
       }
@@ -3056,9 +3021,7 @@ 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(
-      (collection) => stripNamespacePrefix(collection.name, appName) === resourceName || stripNamespacePrefix(collection.id, appName) === resourceName
-    );
+    const remote = remoteCollections.find((c) => c.name === resourceName || c.id === resourceName);
     if (!local && !remote) {
       console.log(pc2.red(`  Collection "${resourceName}" not found`));
       process.exit(1);
@@ -3289,7 +3252,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, appName);
+      const changes = await planCollections(api, localCollections);
       allChanges.push(...changes);
     }
   }
@@ -3436,7 +3399,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, appName));
+  if (localCollections.length > 0) allChanges.push(...await planCollections(api, localCollections));
   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));
@@ -3630,7 +3593,7 @@ async function pull(args) {
   console.log();
   if (!type || type === "collections") {
     console.log(pc2.bold("  Collections:"));
-    await pullCollections(api, platformDir, name || void 0, appName);
+    await pullCollections(api, platformDir, name || void 0, projectId);
     console.log();
     if (!name) {
       console.log(pc2.bold("  Resource shares:"));
@@ -3961,9 +3924,9 @@ export {
   applyCollections,
   convertCollectionToApiFormat,
   destroy,
-  destroyResources,
   diff,
   list,
+  loadLocalCollections,
   plan,
   planCollections,
   pull,

package/package.json

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

package/templates/default/package.json

@@ -24,7 +24,7 @@
     "check:ci": "biome check . && tsr generate && tsc --noEmit"
   },
   "dependencies": {
-    "@lumerahq/ui": "^0.13.0",
+    "@lumerahq/ui": "^0.13.0-dev.2",
     "@tanstack/react-query": "^5.90.11",
     "@tanstack/react-router": "1.155.0",
     "clsx": "^2.1.1",