@lumerahq/cli 0.32.7 → 0.32.8-dev.0

package/dist/index.js

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

package/dist/{resources-4677FHV6.js → resources-RBGDP6E2.js}

@@ -1178,6 +1178,29 @@ function buildIndexSql(local, idx, appName) {
 }
 var AGENT_IDLE_REAP_TIMEOUT_MIN_SECONDS = 10;
 var AGENT_IDLE_REAP_TIMEOUT_MAX_SECONDS = 900;
+var FIELD_OPTION_KEYS_BY_TYPE = {
+  text: ["min", "max", "pattern"],
+  number: ["min", "max", "noDecimal"],
+  bool: [],
+  relation: ["cascadeDelete", "minSelect", "maxSelect"],
+  json: ["maxSize"],
+  lumera_file: ["maxSelect", "maxSize", "mimeTypes", "protected"],
+  editor: ["maxSize", "convertURLs"],
+  date: ["min", "max"],
+  select: ["values", "maxSelect"],
+  currency: ["defaultCurrency", "decimalPrecision"]
+};
+var FIELD_OPTION_DEFAULTS = {
+  text: { min: 0, max: 0, pattern: "" },
+  number: { noDecimal: false },
+  relation: { cascadeDelete: false, minSelect: 0, maxSelect: 1 },
+  json: { maxSize: 0 },
+  lumera_file: { maxSelect: 1, maxSize: 0, mimeTypes: [], protected: false },
+  editor: { maxSize: 0, convertURLs: false },
+  date: { min: "", max: "" },
+  select: { values: [], maxSelect: 1 },
+  currency: { defaultCurrency: "USD", decimalPrecision: 2 }
+};
 function buildCollectionIdMap(collections, appName) {
   const result = /* @__PURE__ */ new Map();
   const add = (key, id) => {
@@ -1811,35 +1834,57 @@ function loadLocalHooks(platformDir, filterName, appName) {
   }
   return hooks;
 }
+function fieldOptionKeys(type) {
+  return FIELD_OPTION_KEYS_BY_TYPE[mapFieldType(type)] || [];
+}
+function convertCollectionFieldToApiFormat(field) {
+  const type = mapFieldType(field.type);
+  const apiField = {
+    name: field.name,
+    type,
+    required: field.required
+  };
+  if (field.id) apiField.id = field.id;
+  if (field.hidden !== void 0) apiField.hidden = field.hidden;
+  if (field.presentable !== void 0) apiField.presentable = field.presentable;
+  const options = {};
+  for (const key of fieldOptionKeys(type)) {
+    const value = field[key];
+    if (value !== void 0) options[key] = value;
+  }
+  if (type === "relation" && field.collection !== void 0) {
+    options.collectionId = field.collection;
+  }
+  if (options.maxSelect === void 0 && type === "select" && field.values) {
+    options.maxSelect = field.multiple ? field.values.length : 1;
+  }
+  if (options.maxSelect === void 0 && type === "relation" && field.collection) {
+    options.maxSelect = field.multiple ? 999 : 1;
+  }
+  if (Object.keys(options).length > 0) apiField.options = options;
+  return apiField;
+}
+function convertApiFieldToLocalFormat(field) {
+  const localField = {
+    name: field.name,
+    type: field.type,
+    required: field.required
+  };
+  if (field.id) localField.id = field.id;
+  if (field.hidden !== void 0) localField.hidden = field.hidden;
+  if (field.presentable !== void 0) localField.presentable = field.presentable;
+  const options = field.options || {};
+  const writableLocalField = localField;
+  for (const key of fieldOptionKeys(field.type)) {
+    if (options[key] !== void 0) writableLocalField[key] = options[key];
+  }
+  if (field.type === "relation" && options.collectionId !== void 0) {
+    localField.collection = options.collectionId;
+  }
+  return localField;
+}
 function convertCollectionToApiFormat(local, appName) {
-  const schema = local.fields.map((field) => {
-    const apiField = {
-      name: field.name,
-      type: mapFieldType(field.type),
-      required: field.required
-    };
-    const options = {};
-    if (field.type === "select" && field.values) {
-      options.values = field.values;
-      options.maxSelect = field.multiple ? field.values.length : 1;
-    }
-    if (field.type === "relation" && field.collection) {
-      options.collectionId = field.collection;
-      options.maxSelect = field.multiple ? 999 : 1;
-    }
-    if (field.type === "currency") {
-      if (field.defaultCurrency) options.defaultCurrency = field.defaultCurrency;
-      if (field.decimalPrecision !== void 0) {
-        options.decimalPrecision = field.decimalPrecision;
-      }
-    }
-    if (field.max !== void 0) options.max = field.max;
-    if (field.min !== void 0) options.min = field.min;
-    if (Object.keys(options).length > 0) {
-      apiField.options = options;
-    }
-    return apiField;
-  });
+  const schema = local.fields.map(convertCollectionFieldToApiFormat);
   const indexes = local.indexes?.map((idx) => buildIndexSql(local, idx, appName));
   return {
     id: local.id,
@@ -1867,50 +1912,36 @@ function mapFieldType(type) {
   };
   return typeMap[type] || type;
 }
-function normalizeConstraintValue(fieldType, value) {
-  if (value === void 0 || value === null) return void 0;
-  if (["text", "email", "url", "editor"].includes(fieldType) && value === 0) {
-    return void 0;
-  }
-  if (fieldType === "date" && value === "") {
-    return void 0;
+function normalizeFieldOption(type, key, value) {
+  if (value === void 0 || value === null) {
+    return FIELD_OPTION_DEFAULTS[type]?.[key];
   }
+  if (key === "defaultCurrency") return String(value).trim().toUpperCase();
   return value;
 }
+function fieldOptionValuesEqual(left, right) {
+  if (Array.isArray(left) || Array.isArray(right)) {
+    return JSON.stringify(left) === JSON.stringify(right);
+  }
+  return left === right;
+}
 function fieldsDiffer(local, remote) {
-  if (mapFieldType(local.type) !== remote.type) return true;
+  const type = mapFieldType(local.type);
+  if (type !== remote.type) return true;
   if ((local.required || false) !== (remote.required || false)) return true;
-  const opts = remote.options || {};
-  if (local.type === "select") {
-    const localValues = [...local.values || []].sort();
-    const remoteValues = [...opts.values || []].sort();
-    if (localValues.join(",") !== remoteValues.join(",")) return true;
-    const localMultiple = local.multiple || false;
-    const remoteMaxSelect = opts.maxSelect || 1;
-    if (localMultiple && remoteMaxSelect <= 1) return true;
-    if (!localMultiple && remoteMaxSelect > 1) return true;
-  }
-  if (local.type === "relation") {
-    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;
-    if (!localMultiple && remoteMaxSelect > 1) return true;
-  }
-  if (local.type === "currency") {
-    const localDefaultCurrency = (local.defaultCurrency || "USD").trim().toUpperCase();
-    const remoteDefaultCurrency = (opts.defaultCurrency || "USD").trim().toUpperCase();
-    if (localDefaultCurrency !== remoteDefaultCurrency) return true;
-    const localDecimalPrecision = local.decimalPrecision !== void 0 ? local.decimalPrecision : 2;
-    const remoteDecimalPrecision = opts.decimalPrecision !== void 0 ? opts.decimalPrecision : 2;
-    if (localDecimalPrecision !== remoteDecimalPrecision) return true;
-  }
-  const localMin = normalizeConstraintValue(local.type, local.min);
-  const remoteMin = normalizeConstraintValue(local.type, opts.min);
-  if (localMin !== remoteMin) return true;
-  const localMax = normalizeConstraintValue(local.type, local.max);
-  const remoteMax = normalizeConstraintValue(local.type, opts.max);
-  if (localMax !== remoteMax) return true;
+  if ((local.hidden || false) !== (remote.hidden || false)) return true;
+  if ((local.presentable || false) !== (remote.presentable || false)) return true;
+  if (local.id !== void 0 && local.id !== remote.id) return true;
+  const localOptions = convertCollectionFieldToApiFormat(local).options || {};
+  const remoteOptions = remote.options || {};
+  if (type === "relation") {
+    if ((localOptions.collectionId || "") !== (remoteOptions.collectionId || "")) return true;
+  }
+  for (const key of fieldOptionKeys(type)) {
+    const localValue = normalizeFieldOption(type, key, localOptions[key]);
+    const remoteValue = normalizeFieldOption(type, key, remoteOptions[key]);
+    if (!fieldOptionValuesEqual(localValue, remoteValue)) return true;
+  }
   return false;
 }
 function localIndexesToSql(local, appName) {
@@ -2540,25 +2571,7 @@ async function pullCollections(api, platformDir, filterName, projectId) {
       id: collection.id,
       name: localName,
       audit: collection.audit,
-      fields: collection.schema.map((field) => {
-        const localField = {
-          name: field.name,
-          type: field.type,
-          required: field.required
-        };
-        if (field.options) {
-          if (field.options.values) localField.values = field.options.values;
-          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;
-          }
-          if (field.options.decimalPrecision !== void 0) {
-            localField.decimalPrecision = field.options.decimalPrecision;
-          }
-        }
-        return localField;
-      }),
+      fields: collection.schema.map(convertApiFieldToLocalFormat),
       indexes: collection.indexes?.map((idx) => {
         const match = idx.match(/CREATE\s+(UNIQUE\s+)?INDEX\s+\w+\s+ON\s+\w+\s+\(([^)]+)\)/i);
         if (match) {

package/package.json

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