@dyrected/core 2.9.0 → 2.10.1

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
@@ -6247,9 +6266,23 @@ var CollectionController = class {
         400
       );
     }
+    let rawAggregates;
+    let groupBy;
+    if ("aggregates" in body && typeof body.aggregates === "object" && body.aggregates !== null && !Array.isArray(body.aggregates)) {
+      rawAggregates = body.aggregates;
+      if (typeof body.groupBy === "string" && body.groupBy.trim()) {
+        groupBy = body.groupBy.trim();
+      }
+    } else {
+      rawAggregates = body;
+      const queryGroupBy = c.req.query("groupBy");
+      if (typeof queryGroupBy === "string" && queryGroupBy.trim()) {
+        groupBy = queryGroupBy.trim();
+      }
+    }
     const { sanitizeWhereClause: sanitizeWhereClause2 } = await Promise.resolve().then(() => (init_where_sanitizer(), where_sanitizer_exports));
     const sanitizedAggregates = {};
-    for (const [key, op] of Object.entries(body)) {
+    for (const [key, op] of Object.entries(rawAggregates)) {
       if (!op || typeof op !== "object" || Array.isArray(op)) {
         return c.json(
           {
@@ -6274,7 +6307,8 @@ var CollectionController = class {
     }
     const result = await db.aggregate({
       collection: this.collection.slug,
-      aggregates: sanitizedAggregates
+      aggregates: sanitizedAggregates,
+      ...groupBy ? { groupBy } : {}
     });
     return c.json(result);
   }
@@ -6670,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/")) {
@@ -6692,7 +6727,7 @@ var MediaController = class {
       }
     }
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -6705,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,
@@ -8959,39 +8995,94 @@ function generateOpenApi(config) {
       post: {
         tags: [collectionTag],
         summary: `Aggregate ${labels.plural}`,
-        description: `Compute statistical aggregations (count, sum, avg, min, max) across ${labels.plural}.`,
+        description: `Compute statistical aggregations (count, countDistinct, distinct, sum, avg, min, max, groupBy) across ${labels.plural}.`,
+        parameters: [
+          {
+            name: "groupBy",
+            in: "query",
+            description: "Optional field name to compute aggregates grouped by distinct values",
+            required: false,
+            schema: { type: "string" }
+          }
+        ],
         requestBody: {
           required: true,
           content: {
             "application/json": {
               schema: {
-                type: "object",
-                additionalProperties: {
-                  type: "object",
-                  properties: {
-                    count: { type: "string", example: "*" },
-                    sum: { type: "string", description: "Field to sum" },
-                    avg: { type: "string", description: "Field to average" },
-                    min: { type: "string", description: "Field for minimum" },
-                    max: { type: "string", description: "Field for maximum" },
-                    cast: {
-                      type: "string",
-                      enum: [
-                        "number",
-                        "integer",
-                        "float",
-                        "boolean",
-                        "date",
-                        "string"
-                      ]
-                    },
-                    where: {
+                oneOf: [
+                  {
+                    type: "object",
+                    description: "Flat aggregate operations dictionary",
+                    additionalProperties: {
                       type: "object",
-                      description: "Per-aggregate filter condition",
-                      additionalProperties: true
+                      properties: {
+                        count: { type: "string", example: "*" },
+                        countDistinct: { type: "string", description: "Field to count unique non-null values" },
+                        distinct: { type: "string", description: "Field to extract unique non-null values" },
+                        sum: { type: "string", description: "Field to sum" },
+                        avg: { type: "string", description: "Field to average" },
+                        min: { type: "string", description: "Field for minimum" },
+                        max: { type: "string", description: "Field for maximum" },
+                        cast: {
+                          type: "string",
+                          enum: [
+                            "number",
+                            "integer",
+                            "float",
+                            "boolean",
+                            "date",
+                            "string"
+                          ]
+                        },
+                        where: {
+                          type: "object",
+                          description: "Per-aggregate filter condition",
+                          additionalProperties: true
+                        }
+                      }
                     }
+                  },
+                  {
+                    type: "object",
+                    description: "Grouped aggregate payload with explicit groupBy property",
+                    properties: {
+                      groupBy: { type: "string", description: "Field name to group aggregates by" },
+                      aggregates: {
+                        type: "object",
+                        additionalProperties: {
+                          type: "object",
+                          properties: {
+                            count: { type: "string", example: "*" },
+                            countDistinct: { type: "string", description: "Field to count unique non-null values" },
+                            distinct: { type: "string", description: "Field to extract unique non-null values" },
+                            sum: { type: "string", description: "Field to sum" },
+                            avg: { type: "string", description: "Field to average" },
+                            min: { type: "string", description: "Field for minimum" },
+                            max: { type: "string", description: "Field for maximum" },
+                            cast: {
+                              type: "string",
+                              enum: [
+                                "number",
+                                "integer",
+                                "float",
+                                "boolean",
+                                "date",
+                                "string"
+                              ]
+                            },
+                            where: {
+                              type: "object",
+                              description: "Per-aggregate filter condition",
+                              additionalProperties: true
+                            }
+                          }
+                        }
+                      }
+                    },
+                    required: ["aggregates"]
                   }
-                }
+                ]
               }
             }
           }
@@ -9002,11 +9093,36 @@ function generateOpenApi(config) {
             content: {
               "application/json": {
                 schema: {
-                  type: "object",
-                  additionalProperties: {
-                    type: "number",
-                    nullable: true
-                  }
+                  oneOf: [
+                    {
+                      type: "object",
+                      description: "Flat aggregate results map",
+                      additionalProperties: {
+                        oneOf: [
+                          { type: "number", nullable: true },
+                          { type: "array", items: { type: "string" } }
+                        ]
+                      }
+                    },
+                    {
+                      type: "object",
+                      description: "Grouped aggregate results breakdown",
+                      properties: {
+                        groups: {
+                          type: "object",
+                          additionalProperties: {
+                            type: "object",
+                            additionalProperties: {
+                              oneOf: [
+                                { type: "number", nullable: true },
+                                { type: "array", items: { type: "string" } }
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
                 }
               }
             }
@@ -9753,6 +9869,9 @@ async function serializeViewForApi(view, serializeAccess) {
     columns: view.columns,
     sort: view.sort,
     metrics: view.metrics,
+    features: view.features,
+    actionOrder: view.actionOrder,
+    components: view.components,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -9760,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.
@@ -9829,6 +9949,7 @@ function registerRoutes(app, config) {
         auth: !!col.auth,
         audit: !!col.audit,
         drafts: !!col.drafts,
+        defaultView: col.defaultView ?? col.admin?.defaultView,
         views: await Promise.all((col.views || []).map((view) => serializeViewForApi(view, serializeAccess))),
         admin: col.admin,
         detail: serializeDetailForApi(col.detail),

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, b2 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-gEQJFvnN.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';
@@ -498,7 +498,7 @@ declare class CollectionController {
     }, 403, "json">) | (Response & hono.TypedResponse<{
         message: string;
     }, 400, "json">) | (Response & hono.TypedResponse<{
-        [x: string]: number | null;
+        [x: string]: any;
     }, hono_utils_http_status.ContentfulStatusCode, "json">)>;
 }
 

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, b2 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-gEQJFvnN.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';
@@ -498,7 +498,7 @@ declare class CollectionController {
     }, 403, "json">) | (Response & hono.TypedResponse<{
         message: string;
     }, 400, "json">) | (Response & hono.TypedResponse<{
-        [x: string]: number | null;
+        [x: string]: any;
     }, hono_utils_http_status.ContentfulStatusCode, "json">)>;
 }
 

package/dist/server.js

@@ -30,7 +30,7 @@ import {
   touchAuthSession,
   transitionWorkflow,
   verifyCollectionToken
-} from "./chunk-XRIONGRY.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
@@ -2200,9 +2213,23 @@ var CollectionController = class {
         400
       );
     }
-    const { sanitizeWhereClause } = await import("./where-sanitizer-3MNFMYA2.js");
+    let rawAggregates;
+    let groupBy;
+    if ("aggregates" in body && typeof body.aggregates === "object" && body.aggregates !== null && !Array.isArray(body.aggregates)) {
+      rawAggregates = body.aggregates;
+      if (typeof body.groupBy === "string" && body.groupBy.trim()) {
+        groupBy = body.groupBy.trim();
+      }
+    } else {
+      rawAggregates = body;
+      const queryGroupBy = c.req.query("groupBy");
+      if (typeof queryGroupBy === "string" && queryGroupBy.trim()) {
+        groupBy = queryGroupBy.trim();
+      }
+    }
+    const { sanitizeWhereClause } = await import("./where-sanitizer-47QPJQ6O.js");
     const sanitizedAggregates = {};
-    for (const [key, op] of Object.entries(body)) {
+    for (const [key, op] of Object.entries(rawAggregates)) {
       if (!op || typeof op !== "object" || Array.isArray(op)) {
         return c.json(
           {
@@ -2227,7 +2254,8 @@ var CollectionController = class {
     }
     const result = await db.aggregate({
       collection: this.collection.slug,
-      aggregates: sanitizedAggregates
+      aggregates: sanitizedAggregates,
+      ...groupBy ? { groupBy } : {}
     });
     return c.json(result);
   }
@@ -2509,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/")) {
@@ -2531,7 +2560,7 @@ var MediaController = class {
       }
     }
     const fileData = await storage.upload({
-      filename: file.name,
+      filename: uniqueFilename,
       buffer,
       mimeType: file.type,
       prefix
@@ -2544,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,
@@ -4564,6 +4594,9 @@ async function serializeViewForApi(view, serializeAccess) {
     columns: view.columns,
     sort: view.sort,
     metrics: view.metrics,
+    features: view.features,
+    actionOrder: view.actionOrder,
+    components: view.components,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -4571,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.
@@ -4640,6 +4674,7 @@ function registerRoutes(app, config) {
         auth: !!col.auth,
         audit: !!col.audit,
         drafts: !!col.drafts,
+        defaultView: col.defaultView ?? col.admin?.defaultView,
         views: await Promise.all((col.views || []).map((view) => serializeViewForApi(view, serializeAccess))),
         admin: col.admin,
         detail: serializeDetailForApi(col.detail),

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.9.0",
+  "version": "2.10.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",