@dyrected/core 2.9.0 → 2.10.0

package/dist/index.js

@@ -101,7 +101,7 @@ import {
   validatePreviewUrlExpression,
   wordCount,
   workflowCapabilities
-} from "./chunk-XRIONGRY.js";
+} from "./chunk-TYPDQTE2.js";
 import "./chunk-JSBRDJBE.js";
 
 // src/types/workflows.ts
@@ -114,44 +114,17 @@ var LIFECYCLE_EVENT_NAMES = [
 
 // src/types/views.ts
 function defineView(config) {
-  return {
-    slug: config.slug,
-    label: config.label,
-    icon: config.icon,
-    layout: config.layout ?? "table",
-    filter: config.filter,
-    groupBy: config.groupBy,
-    dateField: config.dateField,
-    startDateField: config.startDateField,
-    endDateField: config.endDateField,
-    columns: config.columns,
-    sort: config.sort,
-    actions: config.actions,
-    features: config.features,
-    actionOrder: config.actionOrder,
-    metrics: config.metrics,
-    access: config.access
-  };
+  return config;
 }
 function defineAction(config) {
-  return {
-    name: config.name,
-    label: config.label,
-    icon: config.icon,
-    type: config.type ?? "row",
-    confirm: config.confirm,
-    fields: config.fields,
-    mutation: config.mutation,
-    handler: config.handler,
-    access: config.access
-  };
+  return config;
 }
 
 // src/utils/parse-where.ts
 function assertNever(op, context) {
   throw new Error(`[dyrected/core] Unhandled where operator "${op}" in ${context}`);
 }
-function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "LIKE") {
+function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = placeholder === "pg" ? "ILIKE" : "LIKE") {
   const params = [];
   let pgIndex = 1;
   function next() {
@@ -162,8 +135,16 @@ function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "L
   }
   function buildOperator(field, value) {
     const c = col(field);
+    const isJsonExtract = c.startsWith("data->>") || c.startsWith("json_extract(") || c.startsWith("JSON_UNQUOTE(");
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
-      params.push(typeof value === "boolean" ? String(value) : value);
+      if (value === null) {
+        return `${c} IS NULL`;
+      }
+      if (value === "" && placeholder === "pg") {
+        params.push("");
+        return `(${c})::text = ${next()}`;
+      }
+      params.push(typeof value === "boolean" && isJsonExtract ? String(value) : value);
       return `${c} = ${next()}`;
     }
     const entries = Object.entries(value);
@@ -174,18 +155,63 @@ function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "L
     return buildSingleOp(c, op, operand);
   }
   function buildSingleOp(c, op, operand) {
+    const isJsonExtract = c.startsWith("data->>") || c.startsWith("json_extract(") || c.startsWith("JSON_UNQUOTE(");
     switch (op) {
       case "equals":
-        params.push(typeof operand === "boolean" ? String(operand) : operand);
+        if (operand === null) {
+          return `${c} IS NULL`;
+        }
+        if (operand === "" && placeholder === "pg") {
+          params.push("");
+          return `(${c})::text = ${next()}`;
+        }
+        if (typeof operand === "boolean") {
+          if (placeholder === "?") {
+            params.push(operand ? 1 : 0);
+          } else if (isJsonExtract) {
+            params.push(String(operand));
+          } else {
+            params.push(operand);
+          }
+        } else {
+          params.push(operand);
+        }
         return `${c} = ${next()}`;
       case "not_equals":
-        params.push(typeof operand === "boolean" ? String(operand) : operand);
+        if (operand === null) {
+          return `${c} IS NOT NULL`;
+        }
+        if (operand === "" && placeholder === "pg") {
+          params.push("");
+          return `(${c})::text != ${next()}`;
+        }
+        if (typeof operand === "boolean") {
+          if (placeholder === "?") {
+            params.push(operand ? 1 : 0);
+          } else if (isJsonExtract) {
+            params.push(String(operand));
+          } else {
+            params.push(operand);
+          }
+        } else {
+          params.push(operand);
+        }
         return `${c} != ${next()}`;
       case "in": {
         const vals = Array.isArray(operand) ? operand : [operand];
         if (vals.length === 0) return "1=0";
         const placeholders = vals.map((v) => {
-          params.push(typeof v === "boolean" ? String(v) : v);
+          if (typeof v === "boolean") {
+            if (placeholder === "?") {
+              params.push(v ? 1 : 0);
+            } else if (isJsonExtract) {
+              params.push(String(v));
+            } else {
+              params.push(v);
+            }
+          } else {
+            params.push(v);
+          }
           return next();
         });
         return `${c} IN (${placeholders.join(", ")})`;
@@ -194,7 +220,7 @@ function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "L
         const vals = Array.isArray(operand) ? operand : [operand];
         if (vals.length === 0) return "1=1";
         const placeholders = vals.map((v) => {
-          params.push(typeof v === "boolean" ? String(v) : v);
+          params.push(typeof v === "boolean" && isJsonExtract ? String(v) : v);
           return next();
         });
         return `${c} NOT IN (${placeholders.join(", ")})`;
@@ -220,10 +246,10 @@ function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "L
       case "contains":
       case "like":
         params.push(`%${operand}%`);
-        return `${c} ${likeOperator} ${next()}`;
+        return placeholder === "pg" ? `(${c})::text ${likeOperator} ${next()}` : `${c} ${likeOperator} ${next()}`;
       case "starts_with":
         params.push(`${operand}%`);
-        return `${c} ${likeOperator} ${next()}`;
+        return placeholder === "pg" ? `(${c})::text ${likeOperator} ${next()}` : `${c} ${likeOperator} ${next()}`;
       case "exists":
         return operand ? `${c} IS NOT NULL` : `${c} IS NULL`;
       default:

package/dist/server.cjs

@@ -6247,9 +6247,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 +6288,8 @@ var CollectionController = class {
     }
     const result = await db.aggregate({
       collection: this.collection.slug,
-      aggregates: sanitizedAggregates
+      aggregates: sanitizedAggregates,
+      ...groupBy ? { groupBy } : {}
     });
     return c.json(result);
   }
@@ -8959,39 +8974,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 +9072,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 +9848,8 @@ async function serializeViewForApi(view, serializeAccess) {
     columns: view.columns,
     sort: view.sort,
     metrics: view.metrics,
+    features: view.features,
+    actionOrder: view.actionOrder,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -9829,6 +9926,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, b4 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DQhcrGDE.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, b4 as DyrectedObservabilityConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DQhcrGDE.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-TYPDQTE2.js";
 import {
   attachRequestMetrics,
   bindObservabilityRuntime,
@@ -2200,9 +2200,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 } = await import("./where-sanitizer-3MNFMYA2.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 +2241,8 @@ var CollectionController = class {
     }
     const result = await db.aggregate({
       collection: this.collection.slug,
-      aggregates: sanitizedAggregates
+      aggregates: sanitizedAggregates,
+      ...groupBy ? { groupBy } : {}
     });
     return c.json(result);
   }
@@ -4564,6 +4579,8 @@ async function serializeViewForApi(view, serializeAccess) {
     columns: view.columns,
     sort: view.sort,
     metrics: view.metrics,
+    features: view.features,
+    actionOrder: view.actionOrder,
     actions: await Promise.all(
       (view.actions || []).map(async (action) => ({
         name: action.name,
@@ -4640,6 +4657,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/package.json

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