@dyrected/core 2.10.0 → 2.10.1

package/dist/index.js

@@ -101,7 +101,7 @@ import {
   validatePreviewUrlExpression,
   wordCount,
   workflowCapabilities
-} from "./chunk-TYPDQTE2.js";
+} from "./chunk-H7DVVW2P.js";
 import "./chunk-JSBRDJBE.js";
 
 // src/types/workflows.ts
@@ -389,6 +389,346 @@ function buildSqlOrderBy(sort, existingColumns, numericFields, dialect) {
   }).join(", ");
 }
 
+// src/utils/conditions.ts
+function formatJexlValue(v) {
+  if (v === null || v === void 0) return "null";
+  if (typeof v === "boolean" || typeof v === "number") return String(v);
+  if (typeof v === "string") {
+    if (v.startsWith("'") && v.endsWith("'") || v.startsWith('"') && v.endsWith('"') || v.includes("+") || v.includes("?") || v.includes("(") || v.includes(" ")) {
+      return v;
+    }
+    if (v.startsWith("/")) {
+      return `'${v}'`;
+    }
+    if (v === "null" || v === "true" || v === "false") {
+      return v;
+    }
+    if (/^[a-zA-Z_$][a-zA-Z0-9_$.]*$/.test(v)) {
+      return v;
+    }
+    return `'${v}'`;
+  }
+  return String(v);
+}
+var MatchBuilder = class {
+  branches = [];
+  /**
+   * Adds a conditional branch (`condition ? value : ...`).
+   */
+  case(condition, value) {
+    this.branches.push({ condition, value });
+    return this;
+  }
+  /**
+   * Final fallback value when no cases match.
+   */
+  otherwise(fallback = "null") {
+    if (this.branches.length === 0) return formatJexlValue(fallback);
+    let expr = formatJexlValue(fallback);
+    for (let i = this.branches.length - 1; i >= 0; i--) {
+      const b = this.branches[i];
+      expr = `${b.condition} ? ${formatJexlValue(b.value)} : ${expr}`;
+    }
+    return expr;
+  }
+};
+var FieldConditionBuilder = class {
+  constructor(field) {
+    this.field = field;
+  }
+  field;
+  /**
+   * Generates equality condition (`field == value`).
+   */
+  equals(value) {
+    return `${this.field} == ${JSON.stringify(value)}`;
+  }
+  /**
+   * Generates inequality condition (`field != value`).
+   */
+  notEquals(value) {
+    return `${this.field} != ${JSON.stringify(value)}`;
+  }
+  /**
+   * Generates set membership condition (`field in [val1, val2]`).
+   */
+  in(...values) {
+    const flat = values.flat();
+    return `${this.field} in [${flat.map((v) => JSON.stringify(v)).join(", ")}]`;
+  }
+  /**
+   * Generates inverted set membership condition (`!(field in [val1, val2])`).
+   */
+  notIn(...values) {
+    const flat = values.flat();
+    return `!(${this.field} in [${flat.map((v) => JSON.stringify(v)).join(", ")}])`;
+  }
+  /**
+   * Generates boolean true check (`field == true`).
+   */
+  isTrue() {
+    return `${this.field} == true`;
+  }
+  /**
+   * Generates boolean false check (`field != true`).
+   */
+  isFalse() {
+    return `${this.field} != true`;
+  }
+  /**
+   * Checks that the field is neither null/undefined nor an empty string.
+   */
+  notEmpty() {
+    return `${this.field} != null && ${this.field} != ''`;
+  }
+  /**
+   * Checks that the field is null, undefined, or an empty string.
+   */
+  isEmpty() {
+    return `${this.field} == null || ${this.field} == ''`;
+  }
+  /**
+   * Numerical greater than (`field > num`).
+   */
+  greaterThan(num) {
+    return `${this.field} > ${typeof num === "number" ? num : num}`;
+  }
+  /**
+   * Numerical greater than or equal (`field >= num`).
+   */
+  greaterThanOrEqual(num) {
+    return `${this.field} >= ${typeof num === "number" ? num : num}`;
+  }
+  /**
+   * Numerical less than (`field < num`).
+   */
+  lessThan(num) {
+    return `${this.field} < ${typeof num === "number" ? num : num}`;
+  }
+  /**
+   * Numerical less than or equal (`field <= num`).
+   */
+  lessThanOrEqual(num) {
+    return `${this.field} <= ${typeof num === "number" ? num : num}`;
+  }
+  /**
+   * Numerical range check (`field >= min && field <= max`).
+   */
+  between(min2, max2) {
+    return `${this.field} >= ${min2} && ${this.field} <= ${max2}`;
+  }
+  /**
+   * String prefix check using JEXL `startsWith(field, prefix)`.
+   */
+  startsWith(prefix) {
+    return `startsWith(${this.field}, ${JSON.stringify(prefix)})`;
+  }
+  /**
+   * String suffix check using JEXL `endsWith(field, suffix)`.
+   */
+  endsWith(suffix) {
+    return `endsWith(${this.field}, ${JSON.stringify(suffix)})`;
+  }
+  /**
+   * Substring or array item check using JEXL `includes(field, item)`.
+   */
+  contains(val) {
+    return `includes(${this.field}, ${JSON.stringify(val)})`;
+  }
+  /**
+   * Checks if array/string length exceeds a threshold.
+   */
+  hasLengthGreaterThan(length2) {
+    return `length(${this.field}) > ${length2}`;
+  }
+  /**
+   * Checks if array/string length is at least a threshold.
+   */
+  hasLengthAtLeast(length2) {
+    return `length(${this.field}) >= ${length2}`;
+  }
+};
+function createWhen() {
+  const whenFn = ((fieldName) => new FieldConditionBuilder(fieldName));
+  whenFn.user = (userProp) => new FieldConditionBuilder(`user.${userProp}`);
+  whenFn.sibling = (siblingProp) => new FieldConditionBuilder(`siblingData.${siblingProp}`);
+  whenFn.concat = (...parts) => {
+    if (parts.length === 0) return "''";
+    return parts.map((p) => formatJexlValue(p)).join(" + ");
+  };
+  whenFn.slugify = (field) => `slugify(${field})`;
+  whenFn.lower = (field) => `lower(${field})`;
+  whenFn.upper = (field) => `upper(${field})`;
+  whenFn.trim = (field) => `trim(${field})`;
+  whenFn.access = {
+    isOwner: (ownerField = "author") => {
+      return `${ownerField} == user.id || ${ownerField}.id == user.id`;
+    },
+    isAdmin: () => {
+      return "user.role == 'admin' || (user.roles != null && 'admin' in user.roles)";
+    },
+    hasRole: (...roles) => {
+      return whenFn.userRole(...roles);
+    },
+    isPublishedOrAdmin: (statusField = "status") => {
+      return `${statusField} == 'published' || user.role == 'admin' || (user.roles != null && 'admin' in user.roles)`;
+    }
+  };
+  whenFn.then = (condition, ifTrue, ifFalse = "null") => {
+    return `${condition} ? ${formatJexlValue(ifTrue)} : ${formatJexlValue(ifFalse)}`;
+  };
+  whenFn.match = () => new MatchBuilder();
+  whenFn.cases = (...branches) => {
+    const builder = new MatchBuilder();
+    let fallback = "null";
+    for (const b of branches) {
+      if (Array.isArray(b)) {
+        builder.case(b[0], b[1]);
+      } else {
+        fallback = b;
+      }
+    }
+    return builder.otherwise(fallback);
+  };
+  whenFn.all = (...conditions) => {
+    const valid = conditions.filter(Boolean);
+    if (valid.length === 0) return "true";
+    if (valid.length === 1) return valid[0];
+    return valid.map((c) => c.includes(" ") ? `(${c})` : c).join(" && ");
+  };
+  whenFn.and = whenFn.all;
+  whenFn.any = (...conditions) => {
+    const valid = conditions.filter(Boolean);
+    if (valid.length === 0) return "true";
+    if (valid.length === 1) return valid[0];
+    return valid.map((c) => c.includes(" ") ? `(${c})` : c).join(" || ");
+  };
+  whenFn.or = whenFn.any;
+  whenFn.not = (condition) => {
+    if (!condition) return "false";
+    return `!(${condition})`;
+  };
+  whenFn.variant = (...variants) => {
+    const flat = variants.flat();
+    if (flat.length === 0) return "true";
+    if (flat.length === 1) return `variant == '${flat[0]}'`;
+    return `variant in [${flat.map((v) => `'${v}'`).join(", ")}]`;
+  };
+  whenFn.notVariant = (...variants) => {
+    const flat = variants.flat();
+    if (flat.length === 0) return "false";
+    if (flat.length === 1) return `variant != '${flat[0]}'`;
+    return `!(variant in [${flat.map((v) => `'${v}'`).join(", ")}])`;
+  };
+  whenFn.block = (...blocks) => {
+    const flat = blocks.flat();
+    if (flat.length === 0) return "true";
+    if (flat.length === 1) return `block == '${flat[0]}'`;
+    return `block in [${flat.map((b) => `'${b}'`).join(", ")}]`;
+  };
+  whenFn.notBlock = (...blocks) => {
+    const flat = blocks.flat();
+    if (flat.length === 0) return "false";
+    if (flat.length === 1) return `block != '${flat[0]}'`;
+    return `!(block in [${flat.map((b) => `'${b}'`).join(", ")}])`;
+  };
+  whenFn.fieldEquals = (field, value) => {
+    return `${field} == ${JSON.stringify(value)}`;
+  };
+  whenFn.fieldNotEquals = (field, value) => {
+    return `${field} != ${JSON.stringify(value)}`;
+  };
+  whenFn.fieldIn = (field, ...values) => {
+    const flat = values.flat();
+    return `${field} in [${flat.map((v) => JSON.stringify(v)).join(", ")}]`;
+  };
+  whenFn.fieldNotIn = (field, ...values) => {
+    const flat = values.flat();
+    return `!(${field} in [${flat.map((v) => JSON.stringify(v)).join(", ")}])`;
+  };
+  whenFn.fieldNotEmpty = (field) => {
+    return `${field} != null && ${field} != ''`;
+  };
+  whenFn.fieldEmpty = (field) => {
+    return `${field} == null || ${field} == ''`;
+  };
+  whenFn.fieldIsTrue = (field) => {
+    return `${field} == true`;
+  };
+  whenFn.fieldIsFalse = (field) => {
+    return `${field} != true`;
+  };
+  whenFn.fieldGreaterThan = (field, value) => {
+    return `${field} > ${value}`;
+  };
+  whenFn.fieldGreaterThanOrEqual = (field, value) => {
+    return `${field} >= ${value}`;
+  };
+  whenFn.fieldLessThan = (field, value) => {
+    return `${field} < ${value}`;
+  };
+  whenFn.fieldLessThanOrEqual = (field, value) => {
+    return `${field} <= ${value}`;
+  };
+  whenFn.fieldBetween = (field, min2, max2) => {
+    return `${field} >= ${min2} && ${field} <= ${max2}`;
+  };
+  whenFn.fieldStartsWith = (field, prefix) => {
+    return `startsWith(${field}, ${JSON.stringify(prefix)})`;
+  };
+  whenFn.fieldEndsWith = (field, suffix) => {
+    return `endsWith(${field}, ${JSON.stringify(suffix)})`;
+  };
+  whenFn.fieldContains = (field, item) => {
+    return `includes(${field}, ${JSON.stringify(item)})`;
+  };
+  whenFn.arrayNotEmpty = (field) => {
+    return `length(${field}) > 0`;
+  };
+  whenFn.arrayEmpty = (field) => {
+    return `length(${field}) == 0`;
+  };
+  whenFn.arrayCountGreaterThan = (field, count2) => {
+    return `length(${field}) > ${count2}`;
+  };
+  whenFn.arrayCountAtLeast = (field, count2) => {
+    return `length(${field}) >= ${count2}`;
+  };
+  whenFn.arrayCountLessThan = (field, count2) => {
+    return `length(${field}) < ${count2}`;
+  };
+  whenFn.userRole = (...roles) => {
+    const flat = roles.flat();
+    if (flat.length === 1) {
+      return `user.role == '${flat[0]}' || (user.roles != null && '${flat[0]}' in user.roles)`;
+    }
+    const roleArray = `[${flat.map((r) => `'${r}'`).join(", ")}]`;
+    return `user.role in ${roleArray} || (user.roles != null && includes(${roleArray}, user.role))`;
+  };
+  whenFn.userEmailDomain = (domain) => {
+    const clean = domain.startsWith("@") ? domain : `@${domain}`;
+    return `endsWith(user.email, '${clean}')`;
+  };
+  whenFn.userAttributeEquals = (attr, value) => {
+    return `user.${attr} == ${JSON.stringify(value)}`;
+  };
+  whenFn.isNewDocument = () => {
+    return "id == null";
+  };
+  whenFn.isExistingDocument = () => {
+    return "id != null";
+  };
+  whenFn.statusEquals = (status) => {
+    return `status == '${status}'`;
+  };
+  whenFn.statusIn = (...statuses) => {
+    const flat = statuses.flat();
+    return `status in [${flat.map((s) => `'${s}'`).join(", ")}]`;
+  };
+  return whenFn;
+}
+var when = createWhen();
+
 // src/index.ts
 function defineCollection(config) {
   return config;
@@ -439,8 +779,10 @@ function defineTab(args) {
 export {
   BUILTIN_JEXL_HELPERS,
   ConfigValidationError,
+  FieldConditionBuilder,
   LIFECYCLE_EVENTS_COLLECTION,
   LIFECYCLE_EVENT_NAMES,
+  MatchBuilder,
   WORKFLOW_HISTORY_COLLECTION,
   abs,
   addDays,
@@ -522,6 +864,7 @@ export {
   floor,
   formatConfigDiagnostics,
   formatDate,
+  formatJexlValue,
   generateDefaultDetailSchema,
   generateOpenApi,
   get,
@@ -573,6 +916,7 @@ export {
   validateDeclarativeAccessExpression,
   validateDeclarativeHookExpression,
   validatePreviewUrlExpression,
+  when,
   wordCount,
   workflowCapabilities
 };

package/dist/server.cjs

@@ -2318,11 +2318,12 @@ function sanitizeWhereClause(where, fields) {
   function walk(node) {
     const result = {};
     for (const [key, value] of Object.entries(node)) {
-      if (key === "AND" || key === "OR") {
+      const upperKey = key.toUpperCase();
+      if (upperKey === "AND" || upperKey === "OR") {
         if (Array.isArray(value)) {
           const processed = value.map((v) => walk(v)).filter((v) => Object.keys(v).length > 0);
           if (processed.length > 0) {
-            result[key] = processed;
+            result[upperKey] = processed;
           }
         }
         continue;
@@ -3144,6 +3145,11 @@ function registerJexlHelpers(jexlInstance = import_jexl2.default) {
   try {
     jexlInstance.addBinaryOp("and", 20, (left, right) => Boolean(left && right));
     jexlInstance.addBinaryOp("or", 10, (left, right) => Boolean(left || right));
+    jexlInstance.addBinaryOp("in", 30, (left, right) => {
+      if (Array.isArray(right)) return right.includes(left);
+      if (typeof right === "string") return right.includes(String(left ?? ""));
+      return false;
+    });
   } catch {
   }
 }
@@ -4036,6 +4042,17 @@ function validateUpload(file, config) {
   }
   return null;
 }
+function generateUniqueUploadFilename(filename) {
+  const lastDotIndex = filename.lastIndexOf(".");
+  const ext = lastDotIndex !== -1 ? filename.substring(lastDotIndex).toLowerCase() : "";
+  const baseName = lastDotIndex !== -1 ? filename.substring(0, lastDotIndex) : filename;
+  const sanitizedBase = baseName.toLowerCase().normalize("NFKD").replace(/[\u0300-\u036f]/g, "").replace(/[^a-z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "file";
+  if (/-\d{10,13}-[a-z0-9]{4,10}$/.test(sanitizedBase)) {
+    return `${sanitizedBase}${ext}`;
+  }
+  const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
+  return `${sanitizedBase}-${uniqueSuffix}${ext}`;
+}
 
 // src/auth/jexl.ts
 var import_jexl5 = __toESM(require_Jexl(), 1);
@@ -5366,6 +5383,7 @@ var CollectionController = class {
       createdBy: user?.sub ?? null,
       updatedBy: user?.sub ?? null
     };
+    data = DefaultsService.apply(this.collection.fields, data);
     if (this.collection.workflow) {
       data = initializeWorkflowDocument(data, this.collection.workflow);
     }
@@ -5487,8 +5505,9 @@ var CollectionController = class {
     const siteId = c.get("siteId");
     const workspaceId = c.get("workspaceId");
     const prefix = workspaceId ? `${workspaceId}/${siteId}` : siteId;
+    const uniqueFilename = generateUniqueUploadFilename(file.name);
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -6685,6 +6704,7 @@ var MediaController = class {
     const buffer = new Uint8Array(await file.arrayBuffer());
     const workspaceId = c.get("workspaceId");
     const prefix = workspaceId ? `${workspaceId}/${siteId}` : siteId || "default";
+    const uniqueFilename = generateUniqueUploadFilename(file.name);
     let imageMetadata = {};
     let imageSizes = {};
     if (imageService && file.type.startsWith("image/")) {
@@ -6707,7 +6727,7 @@ var MediaController = class {
       }
     }
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -6720,9 +6740,10 @@ var MediaController = class {
     };
     if (imageSizes) {
       for (const [sizeName, sizeData] of Object.entries(imageSizes)) {
-        const ext = file.name.split(".").pop();
-        const baseName = file.name.substring(0, file.name.lastIndexOf("."));
-        const sizeFilename = `${baseName}-${sizeName}.${ext}`;
+        const lastDot = uniqueFilename.lastIndexOf(".");
+        const ext = lastDot !== -1 ? uniqueFilename.substring(lastDot) : "";
+        const baseName = lastDot !== -1 ? uniqueFilename.substring(0, lastDot) : uniqueFilename;
+        const sizeFilename = `${baseName}-${sizeName}${ext}`;
         try {
           const sizeFileData = await storage.upload({
             filename: sizeFilename,
@@ -9850,6 +9871,7 @@ async function serializeViewForApi(view, serializeAccess) {
     metrics: view.metrics,
     features: view.features,
     actionOrder: view.actionOrder,
+    components: view.components,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -9857,6 +9879,7 @@ async function serializeViewForApi(view, serializeAccess) {
         icon: action.icon,
         type: action.type ?? "row",
         confirm: action.confirm,
+        submitLabel: action.submitLabel,
         fields: action.fields?.map(serializeFieldForApi),
         mutation: action.mutation,
         // Self-hosted handlers are intentionally omitted: they never leave the server.

package/dist/server.d.cts

@@ -2,7 +2,7 @@ import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Context, Hono } from 'hono';
 import { Logger } from 'pino';
-import { D as DyrectedConfig, b4 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DQhcrGDE.cjs';
+import { D as DyrectedConfig, b5 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-BLC7WoyL.cjs';
 import { JWTPayload } from 'jose';
 import { Tracer, Counter, Attributes, Histogram, Span } from '@opentelemetry/api';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';

package/dist/server.d.ts

@@ -2,7 +2,7 @@ import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Context, Hono } from 'hono';
 import { Logger } from 'pino';
-import { D as DyrectedConfig, b4 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DQhcrGDE.js';
+import { D as DyrectedConfig, b5 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-BLC7WoyL.js';
 import { JWTPayload } from 'jose';
 import { Tracer, Counter, Attributes, Histogram, Span } from '@opentelemetry/api';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';

package/dist/server.js

@@ -30,7 +30,7 @@ import {
   touchAuthSession,
   transitionWorkflow,
   verifyCollectionToken
-} from "./chunk-TYPDQTE2.js";
+} from "./chunk-H7DVVW2P.js";
 import {
   attachRequestMetrics,
   bindObservabilityRuntime,
@@ -436,6 +436,17 @@ function validateUpload(file, config) {
   }
   return null;
 }
+function generateUniqueUploadFilename(filename) {
+  const lastDotIndex = filename.lastIndexOf(".");
+  const ext = lastDotIndex !== -1 ? filename.substring(lastDotIndex).toLowerCase() : "";
+  const baseName = lastDotIndex !== -1 ? filename.substring(0, lastDotIndex) : filename;
+  const sanitizedBase = baseName.toLowerCase().normalize("NFKD").replace(/[\u0300-\u036f]/g, "").replace(/[^a-z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "file";
+  if (/-\d{10,13}-[a-z0-9]{4,10}$/.test(sanitizedBase)) {
+    return `${sanitizedBase}${ext}`;
+  }
+  const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
+  return `${sanitizedBase}-${uniqueSuffix}${ext}`;
+}
 
 // src/auth/jexl.ts
 var import_jexl2 = __toESM(require_Jexl(), 1);
@@ -1021,7 +1032,7 @@ var CollectionController = class {
       if (this.collection.admin?.filterable === false) {
         where = void 0;
       } else {
-        const { sanitizeWhereClause } = await import("./where-sanitizer-3MNFMYA2.js");
+        const { sanitizeWhereClause } = await import("./where-sanitizer-47QPJQ6O.js");
         where = sanitizeWhereClause(where, this.collection.fields);
         if (Object.keys(where).length === 0) {
           where = void 0;
@@ -1319,6 +1330,7 @@ var CollectionController = class {
       createdBy: user?.sub ?? null,
       updatedBy: user?.sub ?? null
     };
+    data = DefaultsService.apply(this.collection.fields, data);
     if (this.collection.workflow) {
       data = initializeWorkflowDocument(data, this.collection.workflow);
     }
@@ -1440,8 +1452,9 @@ var CollectionController = class {
     const siteId = c.get("siteId");
     const workspaceId = c.get("workspaceId");
     const prefix = workspaceId ? `${workspaceId}/${siteId}` : siteId;
+    const uniqueFilename = generateUniqueUploadFilename(file.name);
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -2214,7 +2227,7 @@ var CollectionController = class {
         groupBy = queryGroupBy.trim();
       }
     }
-    const { sanitizeWhereClause } = await import("./where-sanitizer-3MNFMYA2.js");
+    const { sanitizeWhereClause } = await import("./where-sanitizer-47QPJQ6O.js");
     const sanitizedAggregates = {};
     for (const [key, op] of Object.entries(rawAggregates)) {
       if (!op || typeof op !== "object" || Array.isArray(op)) {
@@ -2524,6 +2537,7 @@ var MediaController = class {
     const buffer = new Uint8Array(await file.arrayBuffer());
     const workspaceId = c.get("workspaceId");
     const prefix = workspaceId ? `${workspaceId}/${siteId}` : siteId || "default";
+    const uniqueFilename = generateUniqueUploadFilename(file.name);
     let imageMetadata = {};
     let imageSizes = {};
     if (imageService && file.type.startsWith("image/")) {
@@ -2546,7 +2560,7 @@ var MediaController = class {
       }
     }
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -2559,9 +2573,10 @@ var MediaController = class {
     };
     if (imageSizes) {
       for (const [sizeName, sizeData] of Object.entries(imageSizes)) {
-        const ext = file.name.split(".").pop();
-        const baseName = file.name.substring(0, file.name.lastIndexOf("."));
-        const sizeFilename = `${baseName}-${sizeName}.${ext}`;
+        const lastDot = uniqueFilename.lastIndexOf(".");
+        const ext = lastDot !== -1 ? uniqueFilename.substring(lastDot) : "";
+        const baseName = lastDot !== -1 ? uniqueFilename.substring(0, lastDot) : uniqueFilename;
+        const sizeFilename = `${baseName}-${sizeName}${ext}`;
         try {
           const sizeFileData = await storage.upload({
             filename: sizeFilename,
@@ -4581,6 +4596,7 @@ async function serializeViewForApi(view, serializeAccess) {
     metrics: view.metrics,
     features: view.features,
     actionOrder: view.actionOrder,
+    components: view.components,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -4588,6 +4604,7 @@ async function serializeViewForApi(view, serializeAccess) {
         icon: action.icon,
         type: action.type ?? "row",
         confirm: action.confirm,
+        submitLabel: action.submitLabel,
         fields: action.fields?.map(serializeFieldForApi),
         mutation: action.mutation,
         // Self-hosted handlers are intentionally omitted: they never leave the server.

package/dist/{where-sanitizer-3MNFMYA2.js → where-sanitizer-47QPJQ6O.js}

@@ -28,11 +28,12 @@ function sanitizeWhereClause(where, fields) {
   function walk(node) {
     const result = {};
     for (const [key, value] of Object.entries(node)) {
-      if (key === "AND" || key === "OR") {
+      const upperKey = key.toUpperCase();
+      if (upperKey === "AND" || upperKey === "OR") {
         if (Array.isArray(value)) {
           const processed = value.map((v) => walk(v)).filter((v) => Object.keys(v).length > 0);
           if (processed.length > 0) {
-            result[key] = processed;
+            result[upperKey] = processed;
           }
         }
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/core",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",