@dyrected/core 2.5.62 → 2.5.63

package/dist/index.cjs

@@ -81,6 +81,7 @@ __export(index_exports, {
   parseMongoWhere: () => parseMongoWhere,
   parseSort: () => parseSort,
   parseSqlWhere: () => parseSqlWhere,
+  publishedStateName: () => publishedStateName,
   publishingWorkflow: () => publishingWorkflow,
   resolveAdminAuthCollection: () => resolveAdminAuthCollection,
   runCollectionHooks: () => runCollectionHooks,
@@ -222,6 +223,7 @@ function publishedStateName(workflow) {
 }
 function materializeWorkflowDocument(doc, workflow, user) {
   const meta = doc.__workflow;
+  const publishedState = publishedStateName(workflow);
   if (!meta) {
     const { __published: _legacyPublished, __workflow: _legacyWorkflow, ...working2 } = doc;
     const state = publishedStateName(workflow);
@@ -236,7 +238,12 @@ function materializeWorkflowDocument(doc, workflow, user) {
   }
   const { __published, __workflow, ...working } = doc;
   if (!canViewWorkflowDraft(workflow, user)) {
-    if (!__published || typeof __published !== "object") return null;
+    if (!__published || typeof __published !== "object") {
+      if (meta.state === publishedState) {
+        return { ...working, _workflow: publicMetadata(meta) };
+      }
+      return null;
+    }
     return { id: doc.id, ...__published, _workflow: publicMetadata(meta) };
   }
   return {
@@ -316,20 +323,34 @@ async function saveWorkflowDraft(args) {
   const workflow = collection.workflow;
   if (!db.transaction) throw new Error(`The configured database adapter does not support workflow transactions.`);
   const previous = originalDoc.__workflow;
+  const isLegacyPublishedDoc = !previous;
+  const baselineRevision = previous?.revision ?? 1;
   const event = createLifecycleEvent({
     name: "revision.created",
     collection: collection.slug,
     documentId: id,
     actorId: user?.sub,
-    payload: { revision: previous.revision + 1, previousRevision: previous.revision }
+    payload: {
+      revision: baselineRevision + 1,
+      previousRevision: isLegacyPublishedDoc ? baselineRevision : previous?.revision ?? null
+    }
   });
   const doc = await db.transaction(async (tx) => {
     const nextMeta = {
-      ...previous,
-      state: originalDoc.__published ? workflow.draftState ?? workflow.initialState : previous.state,
-      revision: previous.revision + 1
+      ...previous ?? {},
+      state: isLegacyPublishedDoc ? workflow.draftState ?? workflow.initialState : originalDoc.__published ? workflow.draftState ?? workflow.initialState : previous.state,
+      revision: baselineRevision + 1,
+      ...isLegacyPublishedDoc ? { publishedRevision: baselineRevision } : {}
     };
-    const updated = await tx.update({ collection: collection.slug, id, data: { ...data, __workflow: nextMeta } });
+    const updateData = {
+      ...data,
+      __workflow: nextMeta
+    };
+    if (isLegacyPublishedDoc) {
+      const { __workflow: _legacyWorkflow, __published: _legacyPublished, ...publishedSnapshot } = originalDoc;
+      updateData.__published = publishedSnapshot;
+    }
+    const updated = await tx.update({ collection: collection.slug, id, data: updateData });
     await persistEvent(tx, event);
     return updated;
   });
@@ -2319,6 +2340,7 @@ function defineTab(args) {
   parseMongoWhere,
   parseSort,
   parseSqlWhere,
+  publishedStateName,
   publishingWorkflow,
   resolveAdminAuthCollection,
   runCollectionHooks,

package/dist/index.d.cts

@@ -282,6 +282,8 @@ declare function initializeWorkflowDocument(data: Record<string, unknown>, workf
         revision: number;
     };
 };
+/** The state a legacy document is treated as: the published one, else the last. */
+declare function publishedStateName(workflow: WorkflowConfig): string;
 declare function materializeWorkflowDocument(doc: BaseDocument, workflow: WorkflowConfig, user?: AuthenticatedUser): BaseDocument | null;
 declare function createLifecycleEvent(args: {
     name: LifecycleEventName;
@@ -569,4 +571,4 @@ declare function defineTab<const T extends readonly Field[]>(args: {
     fields: T;
 }): T;
 
-export { AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, BlocksField, BooleanField, CollectionConfig, DateField, DateTimeField, DyrectedConfig, EmailField, Field, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MultiSelectField, NumberField, ObjectField, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SqlWhereResult, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, numericFieldNames, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, simplePublishingWorkflow, transitionWorkflow, workflowCapabilities };
+export { AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, BlocksField, BooleanField, CollectionConfig, DateField, DateTimeField, DyrectedConfig, EmailField, Field, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MultiSelectField, NumberField, ObjectField, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SqlWhereResult, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, numericFieldNames, parseMongoWhere, parseSort, parseSqlWhere, publishedStateName, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, simplePublishingWorkflow, transitionWorkflow, workflowCapabilities };

package/dist/index.d.ts

@@ -282,6 +282,8 @@ declare function initializeWorkflowDocument(data: Record<string, unknown>, workf
         revision: number;
     };
 };
+/** The state a legacy document is treated as: the published one, else the last. */
+declare function publishedStateName(workflow: WorkflowConfig): string;
 declare function materializeWorkflowDocument(doc: BaseDocument, workflow: WorkflowConfig, user?: AuthenticatedUser): BaseDocument | null;
 declare function createLifecycleEvent(args: {
     name: LifecycleEventName;
@@ -569,4 +571,4 @@ declare function defineTab<const T extends readonly Field[]>(args: {
     fields: T;
 }): T;
 
-export { AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, BlocksField, BooleanField, CollectionConfig, DateField, DateTimeField, DyrectedConfig, EmailField, Field, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MultiSelectField, NumberField, ObjectField, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SqlWhereResult, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, numericFieldNames, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, simplePublishingWorkflow, transitionWorkflow, workflowCapabilities };
+export { AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, BlocksField, BooleanField, CollectionConfig, DateField, DateTimeField, DyrectedConfig, EmailField, Field, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MultiSelectField, NumberField, ObjectField, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SqlWhereResult, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, numericFieldNames, parseMongoWhere, parseSort, parseSqlWhere, publishedStateName, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, simplePublishingWorkflow, transitionWorkflow, workflowCapabilities };

package/dist/index.js

@@ -16,6 +16,7 @@ import {
   initializeWorkflowDocument,
   materializeWorkflowDocument,
   normalizeConfig,
+  publishedStateName,
   publishingWorkflow,
   resolveAdminAuthCollection,
   runCollectionHooks,
@@ -23,7 +24,7 @@ import {
   simplePublishingWorkflow,
   transitionWorkflow,
   workflowCapabilities
-} from "./chunk-BQV3QW3Y.js";
+} from "./chunk-TEGRS6J7.js";
 
 // src/types/workflows.ts
 var LIFECYCLE_EVENT_NAMES = [
@@ -334,6 +335,7 @@ export {
   parseMongoWhere,
   parseSort,
   parseSqlWhere,
+  publishedStateName,
   publishingWorkflow,
   resolveAdminAuthCollection,
   runCollectionHooks,

package/dist/server.cjs

@@ -1630,6 +1630,7 @@ function publishedStateName(workflow) {
 }
 function materializeWorkflowDocument(doc, workflow, user) {
   const meta = doc.__workflow;
+  const publishedState = publishedStateName(workflow);
   if (!meta) {
     const { __published: _legacyPublished, __workflow: _legacyWorkflow, ...working2 } = doc;
     const state = publishedStateName(workflow);
@@ -1644,7 +1645,12 @@ function materializeWorkflowDocument(doc, workflow, user) {
   }
   const { __published, __workflow, ...working } = doc;
   if (!canViewWorkflowDraft(workflow, user)) {
-    if (!__published || typeof __published !== "object") return null;
+    if (!__published || typeof __published !== "object") {
+      if (meta.state === publishedState) {
+        return { ...working, _workflow: publicMetadata(meta) };
+      }
+      return null;
+    }
     return { id: doc.id, ...__published, _workflow: publicMetadata(meta) };
   }
   return {
@@ -1708,20 +1714,34 @@ async function saveWorkflowDraft(args) {
   const workflow = collection.workflow;
   if (!db.transaction) throw new Error(`The configured database adapter does not support workflow transactions.`);
   const previous = originalDoc.__workflow;
+  const isLegacyPublishedDoc = !previous;
+  const baselineRevision = previous?.revision ?? 1;
   const event = createLifecycleEvent({
     name: "revision.created",
     collection: collection.slug,
     documentId: id,
     actorId: user?.sub,
-    payload: { revision: previous.revision + 1, previousRevision: previous.revision }
+    payload: {
+      revision: baselineRevision + 1,
+      previousRevision: isLegacyPublishedDoc ? baselineRevision : previous?.revision ?? null
+    }
   });
   const doc = await db.transaction(async (tx) => {
     const nextMeta = {
-      ...previous,
-      state: originalDoc.__published ? workflow.draftState ?? workflow.initialState : previous.state,
-      revision: previous.revision + 1
+      ...previous ?? {},
+      state: isLegacyPublishedDoc ? workflow.draftState ?? workflow.initialState : originalDoc.__published ? workflow.draftState ?? workflow.initialState : previous.state,
+      revision: baselineRevision + 1,
+      ...isLegacyPublishedDoc ? { publishedRevision: baselineRevision } : {}
     };
-    const updated = await tx.update({ collection: collection.slug, id, data: { ...data, __workflow: nextMeta } });
+    const updateData = {
+      ...data,
+      __workflow: nextMeta
+    };
+    if (isLegacyPublishedDoc) {
+      const { __workflow: _legacyWorkflow, __published: _legacyPublished, ...publishedSnapshot } = originalDoc;
+      updateData.__published = publishedSnapshot;
+    }
+    const updated = await tx.update({ collection: collection.slug, id, data: updateData });
     await persistEvent(tx, event);
     return updated;
   });
@@ -1954,7 +1974,25 @@ var CollectionController = class {
       where = beforeReadResult;
     }
     if (this.collection.workflow && !canViewWorkflowDraft(this.collection.workflow, user)) {
-      where = where ? { AND: [where, { __published: { exists: true } }] } : { __published: { exists: true } };
+      const publicWorkflowState = publishedStateName(this.collection.workflow);
+      where = where ? {
+        AND: [
+          where,
+          {
+            OR: [
+              { __published: { exists: true } },
+              { __workflow: { exists: false } },
+              { "__workflow.state": { equals: publicWorkflowState } }
+            ]
+          }
+        ]
+      } : {
+        OR: [
+          { __published: { exists: true } },
+          { __workflow: { exists: false } },
+          { "__workflow.state": { equals: publicWorkflowState } }
+        ]
+      };
     }
     const access = await this.evaluateAccess(c, "read");
     if (!access.allowed) {
@@ -2504,8 +2542,9 @@ var CollectionController = class {
       },
       { isolated: true }
     );
+    const responseDoc = this.collection.workflow ? materializeWorkflowDocument(doc, this.collection.workflow, user) : doc;
     const readDoc = await runCollectionHooks(this.collection.hooks?.afterRead, {
-      doc,
+      doc: responseDoc,
       req: c.req,
       user,
       db: readonlyDb

package/dist/server.js

@@ -24,6 +24,7 @@ import {
   materializeWorkflowDocument,
   mergeDynamicConfig,
   normalizeConfig,
+  publishedStateName,
   redactHeaders,
   renderPrometheusMetrics,
   revokeAllAuthSessions,
@@ -35,7 +36,7 @@ import {
   touchAuthSession,
   transitionWorkflow,
   verifyCollectionToken
-} from "./chunk-BQV3QW3Y.js";
+} from "./chunk-TEGRS6J7.js";
 
 // src/app.ts
 import { Hono } from "hono";
@@ -785,7 +786,25 @@ var CollectionController = class {
       where = beforeReadResult;
     }
     if (this.collection.workflow && !canViewWorkflowDraft(this.collection.workflow, user)) {
-      where = where ? { AND: [where, { __published: { exists: true } }] } : { __published: { exists: true } };
+      const publicWorkflowState = publishedStateName(this.collection.workflow);
+      where = where ? {
+        AND: [
+          where,
+          {
+            OR: [
+              { __published: { exists: true } },
+              { __workflow: { exists: false } },
+              { "__workflow.state": { equals: publicWorkflowState } }
+            ]
+          }
+        ]
+      } : {
+        OR: [
+          { __published: { exists: true } },
+          { __workflow: { exists: false } },
+          { "__workflow.state": { equals: publicWorkflowState } }
+        ]
+      };
     }
     const access = await this.evaluateAccess(c, "read");
     if (!access.allowed) {
@@ -1335,8 +1354,9 @@ var CollectionController = class {
       },
       { isolated: true }
     );
+    const responseDoc = this.collection.workflow ? materializeWorkflowDocument(doc, this.collection.workflow, user) : doc;
     const readDoc = await runCollectionHooks(this.collection.hooks?.afterRead, {
-      doc,
+      doc: responseDoc,
       req: c.req,
       user,
       db: readonlyDb

package/package.json

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