@lumerahq/cli 0.23.0-dev.1 → 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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.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-GBEHZL5A.js → resources-QCCLRDOL.js}

@@ -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) {
@@ -1555,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) {
@@ -1564,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",
@@ -1674,14 +1674,15 @@ async function planCollections(api, localCollections) {
   for (const local of localCollections) {
     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,
@@ -1715,7 +1716,7 @@ async function planCollections(api, localCollections) {
         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);
@@ -2185,17 +2186,15 @@ 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();
   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);
+    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;
     }
@@ -2606,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);
@@ -2627,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" });
       }
     }
   }
@@ -2819,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 remoteByName = new Map(remoteCollections.map((c) => [c.name, c]));
     for (const local of localCollections) {
-      const remote = remoteById.get(local.id) || remoteByName.get(local.name);
+      const remote = remoteByName.get(local.name);
       if (remote) {
         toDelete.push({ type: "collection", id: local.id, name: local.name, remoteId: remote.id });
       }
@@ -3597,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:"));
@@ -3928,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.1",
+  "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",