@dyrected/core 2.5.59 → 2.5.61

package/dist/index.cjs

@@ -24,6 +24,7 @@ __export(index_exports, {
   LIFECYCLE_EVENT_NAMES: () => LIFECYCLE_EVENT_NAMES,
   WORKFLOW_HISTORY_COLLECTION: () => WORKFLOW_HISTORY_COLLECTION,
   availableWorkflowTransitions: () => availableWorkflowTransitions,
+  buildSqlOrderBy: () => buildSqlOrderBy,
   canViewWorkflowDraft: () => canViewWorkflowDraft,
   createLifecycleEvent: () => createLifecycleEvent,
   createWorkflowDocument: () => createWorkflowDocument,
@@ -50,6 +51,7 @@ __export(index_exports, {
   defineRichTextField: () => defineRichTextField,
   defineRowField: () => defineRowField,
   defineSelectField: () => defineSelectField,
+  defineTab: () => defineTab,
   defineTextField: () => defineTextField,
   defineTextareaField: () => defineTextareaField,
   defineTimeField: () => defineTimeField,
@@ -64,6 +66,7 @@ __export(index_exports, {
   initializeWorkflowDocument: () => initializeWorkflowDocument,
   materializeWorkflowDocument: () => materializeWorkflowDocument,
   normalizeConfig: () => normalizeConfig,
+  numericFieldNames: () => numericFieldNames,
   parseMongoWhere: () => parseMongoWhere,
   parseSort: () => parseSort,
   parseSqlWhere: () => parseSqlWhere,
@@ -71,6 +74,7 @@ __export(index_exports, {
   resolveAdminAuthCollection: () => resolveAdminAuthCollection,
   runCollectionHooks: () => runCollectionHooks,
   saveWorkflowDraft: () => saveWorkflowDraft,
+  simplePublishingWorkflow: () => simplePublishingWorkflow,
   transitionWorkflow: () => transitionWorkflow,
   workflowCapabilities: () => workflowCapabilities
 });
@@ -109,6 +113,20 @@ function publishingWorkflow() {
     ]
   };
 }
+function simplePublishingWorkflow() {
+  return {
+    initialState: "draft",
+    draftState: "draft",
+    states: [
+      { name: "draft", label: "Draft", color: "neutral" },
+      { name: "published", label: "Published", color: "success", published: true }
+    ],
+    transitions: [
+      { name: "publish", label: "Publish", from: "draft", to: "published" },
+      { name: "unpublish", label: "Unpublish", from: "published", to: "draft", unpublish: true }
+    ]
+  };
+}
 function publicMetadata(meta) {
   const { availableTransitions: _availableTransitions, ...safe } = meta;
   return safe;
@@ -142,9 +160,23 @@ function initializeWorkflowDocument(data, workflow) {
     __workflow: { state: workflow.initialState, revision: 1 }
   };
 }
+function publishedStateName(workflow) {
+  return workflow.states.find((state) => state.published)?.name ?? workflow.states[workflow.states.length - 1]?.name ?? workflow.initialState;
+}
 function materializeWorkflowDocument(doc, workflow, user) {
   const meta = doc.__workflow;
-  if (!meta) return doc;
+  if (!meta) {
+    const { __published: _legacyPublished, __workflow: _legacyWorkflow, ...working2 } = doc;
+    const state = publishedStateName(workflow);
+    return {
+      ...working2,
+      _workflow: {
+        state,
+        revision: 1,
+        availableTransitions: availableWorkflowTransitions(workflow, state, user).map((item) => item.name)
+      }
+    };
+  }
   const { __published, __workflow, ...working } = doc;
   if (!canViewWorkflowDraft(workflow, user)) {
     if (!__published || typeof __published !== "object") return null;
@@ -419,6 +451,7 @@ var AUDIT_COLLECTION = {
     { name: "timestamp", type: "date", label: "Timestamp", required: true },
     { name: "changes", type: "json", label: "Changes" }
   ],
+  access: { read: () => false, create: () => false, update: () => false, delete: () => false },
   admin: { hidden: true }
 };
 var WORKFLOW_HISTORY_COLLECTION_CONFIG = {
@@ -461,7 +494,7 @@ function normalizeConfig(config) {
   const collections = config?.collections || [];
   const globals = config?.globals || [];
   const needsAudit = collections.some((col) => col.audit);
-  const needsWorkflow = collections.some((col) => col.workflow);
+  const needsWorkflow = collections.some((col) => col.workflow || col.drafts);
   const adminAuthCollectionSlug = getAdminAuthCollection({
     collections,
     adminAuth: config.adminAuth
@@ -523,6 +556,12 @@ function normalizeConfig(config) {
         if (field.name === "email") {
           return {
             ...field,
+            // Email is the login identifier. Keep the integrity constraints
+            // auth relies on even when the field is explicitly redefined, so a
+            // custom `email` field can never silently drop uniqueness.
+            required: true,
+            unique: true,
+            promoted: true,
             access: {
               ...field.access || {},
               update: "!id"
@@ -532,6 +571,9 @@ function normalizeConfig(config) {
         if (field.name === "password") {
           return {
             ...field,
+            // Password is required to authenticate; enforce it regardless of
+            // how the field was declared.
+            required: true,
             admin: { ...field.admin || {} },
             access: {
               ...field.access || {},
@@ -587,8 +629,10 @@ function normalizeConfig(config) {
     }
     const updatedFieldNames = new Set(fields.map((f) => f.name));
     const fieldsToInject = SYSTEM_FIELDS.filter((f) => !updatedFieldNames.has(f.name));
+    const workflow = col.workflow || (col.drafts ? simplePublishingWorkflow() : void 0);
     return {
       ...col,
+      workflow,
       fields: [...fields, ...fieldsToInject]
     };
   });
@@ -612,7 +656,7 @@ function normalizeConfig(config) {
 function assertNever(op, context) {
   throw new Error(`[dyrected/core] Unhandled where operator "${op}" in ${context}`);
 }
-function parseSqlWhere(where, getJsonField, placeholder = "?") {
+function parseSqlWhere(where, getJsonField, placeholder = "?", likeOperator = "LIKE") {
   const params = [];
   let pgIndex = 1;
   function next() {
@@ -674,10 +718,10 @@ function parseSqlWhere(where, getJsonField, placeholder = "?") {
         return `${c} <= ${next()}`;
       case "contains":
         params.push(`%${operand}%`);
-        return `${c} LIKE ${next()}`;
+        return `${c} ${likeOperator} ${next()}`;
       case "starts_with":
         params.push(`${operand}%`);
-        return `${c} LIKE ${next()}`;
+        return `${c} ${likeOperator} ${next()}`;
       case "exists":
         return operand ? `${c} IS NOT NULL` : `${c} IS NULL`;
       default:
@@ -782,6 +826,33 @@ function parseSort(sort, fallback = { field: "createdAt", direction: "DESC" }) {
   }).filter((clause) => Boolean(clause));
   return clauses.length > 0 ? clauses : [fallback];
 }
+function numericFieldNames(fields) {
+  const names = /* @__PURE__ */ new Set();
+  for (const field of fields ?? []) {
+    if (field.type === "number" && "name" in field && field.name) {
+      names.add(field.name);
+    }
+  }
+  return names;
+}
+var TIMESTAMP_COLUMNS = {
+  createdat: "created_at",
+  created_at: "created_at",
+  updatedat: "updated_at",
+  updated_at: "updated_at"
+};
+function buildSqlOrderBy(sort, existingColumns, numericFields, dialect) {
+  return parseSort(sort).map(({ field, direction }) => {
+    const timestamp = TIMESTAMP_COLUMNS[field.toLowerCase()];
+    if (timestamp) return `${dialect.quoteIdent(timestamp)} ${direction}`;
+    if (existingColumns.includes(field) && field !== "id" && field !== "data") {
+      return `${dialect.quoteIdent(field)} ${direction}`;
+    }
+    const extracted = dialect.jsonExtract(field);
+    const expr = numericFields.has(field) ? dialect.castNumeric(extracted) : extracted;
+    return `${expr} ${direction}`;
+  }).join(", ");
+}
 
 // src/utils/hooks.ts
 async function runCollectionHooks(hooks, args, options = {}) {
@@ -947,6 +1018,15 @@ async function executeFieldAfterRead(fields, doc, user, db) {
 }
 
 // src/utils/openapi.ts
+function getCollectionLabels(collection) {
+  return collection.labels || { singular: collection.slug, plural: collection.slug };
+}
+function getCollectionTag(collection) {
+  return `Collection: ${getCollectionLabels(collection).plural}`;
+}
+function getGlobalTag(global) {
+  return `Global: ${global.label || global.slug}`;
+}
 function generateOpenApi(config) {
   const spec = {
     openapi: "3.0.0",
@@ -978,15 +1058,7 @@ function generateOpenApi(config) {
         },
         WorkflowHistoryEntry: {
           type: "object",
-          required: [
-            "collection",
-            "documentId",
-            "transition",
-            "from",
-            "to",
-            "revision",
-            "createdAt"
-          ],
+          required: ["collection", "documentId", "transition", "from", "to", "revision", "createdAt"],
           properties: {
             id: { type: "string" },
             collection: { type: "string" },
@@ -1000,6 +1072,21 @@ function generateOpenApi(config) {
             createdAt: { type: "string", format: "date-time" }
           }
         },
+        AuditEntry: {
+          type: "object",
+          required: ["collection", "operation", "timestamp"],
+          properties: {
+            id: { type: "string" },
+            collection: { type: "string" },
+            documentId: { type: "string", nullable: true },
+            operation: { type: "string" },
+            user: { type: "string", nullable: true },
+            timestamp: { type: "string", format: "date-time" },
+            changes: {
+              oneOf: [{ type: "string" }, { type: "object", additionalProperties: true }, { type: "null" }]
+            }
+          }
+        },
         Error: {
           type: "object",
           properties: {
@@ -1088,17 +1175,13 @@ function generateOpenApi(config) {
     get: {
       tags: ["Preferences"],
       summary: "Get an authenticated user preference",
-      parameters: [
-        { name: "key", in: "path", required: true, schema: { type: "string" } }
-      ],
+      parameters: [{ name: "key", in: "path", required: true, schema: { type: "string" } }],
       responses: { 200: { description: "Preference value" } }
     },
     put: {
       tags: ["Preferences"],
       summary: "Set an authenticated user preference",
-      parameters: [
-        { name: "key", in: "path", required: true, schema: { type: "string" } }
-      ],
+      parameters: [{ name: "key", in: "path", required: true, schema: { type: "string" } }],
       requestBody: {
         required: true,
         content: { "application/json": { schema: { type: "object" } } }
@@ -1129,6 +1212,39 @@ function generateOpenApi(config) {
       responses: { 200: { description: "Preview document data" } }
     }
   };
+  spec.paths["/api/audit"] = {
+    get: {
+      tags: ["Audit"],
+      summary: "Get audit entries across all readable audited collections",
+      parameters: [
+        { name: "limit", in: "query", schema: { type: "integer", default: 50, maximum: 100 } },
+        { name: "page", in: "query", schema: { type: "integer", default: 1 } },
+        { name: "where", in: "query", schema: { type: "string" }, description: "JSON filter" },
+        { name: "sort", in: "query", schema: { type: "string", default: "-timestamp" } }
+      ],
+      responses: {
+        200: {
+          description: "Audit entries",
+          content: {
+            "application/json": {
+              schema: {
+                type: "object",
+                properties: {
+                  docs: {
+                    type: "array",
+                    items: { $ref: "#/components/schemas/AuditEntry" }
+                  },
+                  total: { type: "integer" },
+                  limit: { type: "integer" },
+                  page: { type: "integer" }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  };
   for (const collection of config.collections) {
     spec.components.schemas[collection.slug] = collectionToSchema(collection);
   }
@@ -1138,10 +1254,11 @@ function generateOpenApi(config) {
   for (const collection of config.collections) {
     const slug = collection.slug;
     const path = `/api/collections/${slug}`;
-    const labels = collection.labels || { singular: slug, plural: `${slug}s` };
+    const labels = getCollectionLabels(collection);
+    const collectionTag = getCollectionTag(collection);
     spec.paths[path] = {
       get: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Find ${labels.plural}`,
         parameters: [
           {
@@ -1190,7 +1307,7 @@ function generateOpenApi(config) {
         }
       },
       post: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Create ${labels.singular}`,
         requestBody: {
           required: true,
@@ -1214,7 +1331,7 @@ function generateOpenApi(config) {
     };
     spec.paths[`${path}/{id}`] = {
       get: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Get a single ${labels.singular}`,
         parameters: [
           {
@@ -1236,7 +1353,7 @@ function generateOpenApi(config) {
         }
       },
       patch: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Update ${labels.singular}`,
         parameters: [
           {
@@ -1266,7 +1383,7 @@ function generateOpenApi(config) {
         }
       },
       delete: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Delete ${labels.singular}`,
         parameters: [
           {
@@ -1283,7 +1400,7 @@ function generateOpenApi(config) {
     };
     spec.paths[`${path}/delete-many`] = {
       delete: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Delete multiple ${labels.plural}`,
         requestBody: {
           required: true,
@@ -1302,9 +1419,46 @@ function generateOpenApi(config) {
         responses: { 200: { description: "Deleted and failed document IDs" } }
       }
     };
+    if (collection.audit) {
+      spec.paths[`${path}/__audit`] = {
+        get: {
+          tags: [collectionTag],
+          summary: `Get ${labels.singular} audit entries`,
+          parameters: [
+            { name: "limit", in: "query", schema: { type: "integer", default: 50, maximum: 100 } },
+            { name: "page", in: "query", schema: { type: "integer", default: 1 } },
+            { name: "where", in: "query", schema: { type: "string" }, description: "JSON filter" },
+            { name: "sort", in: "query", schema: { type: "string", default: "-timestamp" } }
+          ],
+          responses: {
+            200: {
+              description: "Audit entries for this collection",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: {
+                      docs: {
+                        type: "array",
+                        items: { $ref: "#/components/schemas/AuditEntry" }
+                      },
+                      total: { type: "integer" },
+                      limit: { type: "integer" },
+                      page: { type: "integer" }
+                    }
+                  }
+                }
+              }
+            },
+            403: { description: "Collection read access denied" },
+            404: { description: "Audit is not enabled for this collection" }
+          }
+        }
+      };
+    }
     spec.paths[`${path}/seed`] = {
       post: {
-        tags: ["Collections"],
+        tags: [collectionTag],
         summary: `Seed initial ${labels.plural}`,
         responses: { 200: { description: "Seeded documents" } }
       }
@@ -1312,12 +1466,12 @@ function generateOpenApi(config) {
     if (collection.upload) {
       spec.paths[`${path}/media`] = {
         get: {
-          tags: ["Media"],
+          tags: [collectionTag],
           summary: `List ${labels.plural}`,
           responses: { 200: { description: "Paginated media documents" } }
         },
         post: {
-          tags: ["Media"],
+          tags: [collectionTag],
           summary: `Upload ${labels.singular}`,
           requestBody: {
             required: true,
@@ -1336,7 +1490,7 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/media/{filename}`] = {
         get: {
-          tags: ["Media"],
+          tags: [collectionTag],
           summary: `Serve ${labels.singular} bytes`,
           parameters: [
             {
@@ -1356,7 +1510,7 @@ function generateOpenApi(config) {
     }
     if (collection.auth) {
       const publicAuthPost = (summary) => ({
-        tags: ["Authentication"],
+        tags: [collectionTag],
         summary,
         security: [],
         requestBody: {
@@ -1398,14 +1552,14 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/logout`] = {
         post: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: `Log out of ${labels.plural}`,
           responses: { 200: { description: "Logged out" } }
         }
       };
       spec.paths[`${path}/init`] = {
         get: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: `Get ${labels.plural} initialization state`,
           security: [],
           responses: { 200: { description: "Initialization state" } }
@@ -1416,14 +1570,14 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/me`] = {
         get: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: `Get the current ${labels.singular}`,
           responses: { 200: { description: "Authenticated user" } }
         }
       };
       spec.paths[`${path}/refresh-token`] = {
         post: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: "Refresh an authentication token",
           responses: { 200: { description: "Refreshed token" } }
         }
@@ -1436,7 +1590,7 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/invite`] = {
         post: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: `Invite a ${labels.singular}`,
           responses: { 200: { description: "Invitation sent" } }
         }
@@ -1446,7 +1600,7 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/{id}/change-password`] = {
         post: {
-          tags: ["Authentication"],
+          tags: [collectionTag],
           summary: `Change a ${labels.singular} password`,
           parameters: [
             {
@@ -1463,7 +1617,7 @@ function generateOpenApi(config) {
     if (collection.workflow) {
       spec.paths[`${path}/{id}/transitions/{transition}`] = {
         post: {
-          tags: ["Workflows"],
+          tags: [collectionTag],
           summary: `Transition ${labels.singular} workflow`,
           parameters: [
             {
@@ -1508,7 +1662,7 @@ function generateOpenApi(config) {
       };
       spec.paths[`${path}/{id}/workflow-history`] = {
         get: {
-          tags: ["Workflows"],
+          tags: [collectionTag],
           summary: `Get ${labels.singular} workflow history`,
           parameters: [
             {
@@ -1554,9 +1708,10 @@ function generateOpenApi(config) {
   for (const global of config.globals) {
     const slug = global.slug;
     const path = `/api/globals/${slug}`;
+    const globalTag = getGlobalTag(global);
     spec.paths[path] = {
       get: {
-        tags: ["Globals"],
+        tags: [globalTag],
         summary: `Get ${global.label || slug}`,
         responses: {
           200: {
@@ -1570,7 +1725,7 @@ function generateOpenApi(config) {
         }
       },
       patch: {
-        tags: ["Globals"],
+        tags: [globalTag],
         summary: `Update ${global.label || slug}`,
         requestBody: {
           required: true,
@@ -1594,7 +1749,7 @@ function generateOpenApi(config) {
     };
     spec.paths[`${path}/seed`] = {
       post: {
-        tags: ["Globals"],
+        tags: [globalTag],
         summary: `Seed ${global.label || slug}`,
         responses: { 200: { description: "Seeded global" } }
       }
@@ -1673,10 +1828,7 @@ function fieldToSchema(field) {
       break;
     case "url":
       schema = {
-        oneOf: [
-          { type: "string" },
-          { type: "object", additionalProperties: true }
-        ]
+        oneOf: [{ type: "string" }, { type: "object", additionalProperties: true }]
       };
       break;
     case "icon":
@@ -1812,12 +1964,19 @@ var defineUrlField = createFieldDefiner("url");
 var defineIconField = createFieldDefiner("icon");
 var defineJoinField = createFieldDefiner("join");
 var defineRowField = createFieldDefiner("row");
+function defineTab(args) {
+  return args.fields.map((field) => ({
+    ...field,
+    admin: { ...field.admin ?? {}, tab: args.label }
+  }));
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIFECYCLE_EVENTS_COLLECTION,
   LIFECYCLE_EVENT_NAMES,
   WORKFLOW_HISTORY_COLLECTION,
   availableWorkflowTransitions,
+  buildSqlOrderBy,
   canViewWorkflowDraft,
   createLifecycleEvent,
   createWorkflowDocument,
@@ -1844,6 +2003,7 @@ var defineRowField = createFieldDefiner("row");
   defineRichTextField,
   defineRowField,
   defineSelectField,
+  defineTab,
   defineTextField,
   defineTextareaField,
   defineTimeField,
@@ -1858,6 +2018,7 @@ var defineRowField = createFieldDefiner("row");
   initializeWorkflowDocument,
   materializeWorkflowDocument,
   normalizeConfig,
+  numericFieldNames,
   parseMongoWhere,
   parseSort,
   parseSqlWhere,
@@ -1865,6 +2026,7 @@ var defineRowField = createFieldDefiner("row");
   resolveAdminAuthCollection,
   runCollectionHooks,
   saveWorkflowDraft,
+  simplePublishingWorkflow,
   transitionWorkflow,
   workflowCapabilities
 });