@lumerahq/cli 0.24.1 → 0.24.2-dev.0

package/dist/index.js

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

package/dist/{resources-CGMBV3T6.js → resources-7VQAR6F4.js}

@@ -182,6 +182,14 @@ var collectionSchemaRule = {
           }
           if (!Array.isArray(index.fields) || !index.fields.every((field) => typeof field === "string" && field.trim() !== "")) {
             issues.push(error(target, `Index at index ${i} must include a non-empty string array "fields".`));
+          } else if (index.fields.length === 1) {
+            const fieldName = index.fields[0].trim().toLowerCase();
+            if (fieldName === "updated" || fieldName === "external_id") {
+              issues.push(error(
+                target,
+                `Index at index ${i} declares system field "${fieldName}" by itself; Lumera already manages that index. Remove the redundant declaration.`
+              ));
+            }
           }
         }
       }
@@ -897,6 +905,13 @@ function stripNamespacePrefix(name, appName) {
   }
   return name;
 }
+function buildIndexSql(local, idx, appName) {
+  const fields = idx.fields.join(", ");
+  const unique = idx.unique ? "UNIQUE " : "";
+  const physicalId = appName ? sanitizeSlugForCollectionName(appName) + NAMESPACE_SEPARATOR + local.id : local.id;
+  const indexName = `idx_${physicalId}_${idx.fields.join("_")}`;
+  return `CREATE ${unique}INDEX ${indexName} ON ${local.name} (${fields})`;
+}
 var AGENT_IDLE_REAP_TIMEOUT_MIN_SECONDS = 10;
 var AGENT_IDLE_REAP_TIMEOUT_MAX_SECONDS = 900;
 function buildCollectionIdMap(collections, appName) {
@@ -1515,7 +1530,7 @@ function loadLocalHooks(platformDir, filterName, appName) {
   }
   return hooks;
 }
-function convertCollectionToApiFormat(local) {
+function convertCollectionToApiFormat(local, appName) {
   const schema = local.fields.map((field) => {
     const apiField = {
       name: field.name,
@@ -1544,12 +1559,7 @@ function convertCollectionToApiFormat(local) {
     }
     return apiField;
   });
-  const indexes = 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})`;
-  });
+  const indexes = local.indexes?.map((idx) => buildIndexSql(local, idx, appName));
   return {
     id: local.id,
     name: local.name,
@@ -1622,24 +1632,15 @@ function fieldsDiffer(local, remote) {
   if (localMax !== remoteMax) return true;
   return false;
 }
-function localIndexesToSql(local) {
+function localIndexesToSql(local, appName) {
   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();
+  return local.indexes.map((idx) => buildIndexSql(local, idx, appName)).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();
+  return [...remoteIndexes].sort();
 }
-function indexesDiffer(local, remoteIndexes) {
-  const localSql = localIndexesToSql(local);
+function indexesDiffer(local, remoteIndexes, appName) {
+  const localSql = localIndexesToSql(local, appName);
   const remoteSql = normalizeRemoteIndexes(remoteIndexes);
   if (localSql.length !== remoteSql.length) return true;
   for (let i = 0; i < localSql.length; i++) {
@@ -1667,7 +1668,7 @@ 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]));
@@ -1706,7 +1707,7 @@ async function planCollections(api, localCollections) {
           modified.push(name);
         }
       }
-      const indexesChanged = indexesDiffer(local, remote.indexes || []);
+      const indexesChanged = indexesDiffer(local, remote.indexes || [], appName);
       const searchChanged = normalizeCollectionSearch(local.search) !== normalizeCollectionSearch(remote.search);
       const auditChanged = local.audit !== void 0 && local.audit !== remote.audit;
       if (added.length > 0 || removed.length > 0 || modified.length > 0 || indexesChanged || searchChanged || auditChanged) {
@@ -1975,7 +1976,7 @@ async function planHooks(api, localHooks, collections, projectId) {
   }
   return changes;
 }
-async function applyCollections(api, localCollections) {
+async function applyCollections(api, localCollections, appName) {
   let errors = 0;
   const hasRelations = localCollections.some((c) => c.fields.some((f) => f.type === "relation"));
   if (hasRelations) {
@@ -1992,7 +1993,7 @@ async function applyCollections(api, localCollections) {
     }
     for (const local of localCollections) {
       if (pass1Failed.has(local.name)) continue;
-      const apiFormat = convertCollectionToApiFormat(local);
+      const apiFormat = convertCollectionToApiFormat(local, appName);
       try {
         await api.ensureCollection(local.name, apiFormat);
         console.log(pc2.green("  \u2713"), `${local.name} (schema)`);
@@ -2003,7 +2004,7 @@ async function applyCollections(api, localCollections) {
     }
   } else {
     for (const local of localCollections) {
-      const apiFormat = convertCollectionToApiFormat(local);
+      const apiFormat = convertCollectionToApiFormat(local, appName);
       try {
         await api.ensureCollection(local.name, apiFormat);
         console.log(pc2.green("  \u2713"), `${local.name}`);
@@ -3265,7 +3266,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);
     }
   }
@@ -3412,7 +3413,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));
@@ -3487,7 +3488,7 @@ async function apply(args) {
   let totalSkipped = 0;
   if (localCollections.length > 0) {
     console.log(pc2.bold("  Collections:"));
-    totalErrors += await applyCollections(api, localCollections);
+    totalErrors += await applyCollections(api, localCollections, appName);
     console.log();
   }
   try {

package/package.json

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