@webiny/api-headless-cms 6.5.0-beta.0 → 6.5.0-beta.1

package/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/CreateEntryRevisionFromDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/CreateEntryRevisionFromDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/CreateEntryRevisionFromDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateEntryRevisionFromDataFactory as FactoryAbstraction,\n    type ICreateEntryRevisionFromDataFactory,\n    type ICreateEntryRevisionFromDataResponse\n} from \"./abstractions.js\";\nimport { AccessControl, CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types/index.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { mapAndCleanUpdatedInputData } from \"../mapAndCleanUpdatedInputData.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { createIdentifier, parseIdentifier } from \"@webiny/utils\";\nimport WebinyError from \"@webiny/error\";\nimport { STATUS_DRAFT, STATUS_PUBLISHED, STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { NotAuthorizedError } from \"~/utils/errors.js\";\nimport { getSystem } from \"../system.js\";\nimport { ModelToAstConverter } from \"~/features/contentModel/ModelToAstConverter/abstractions.js\";\nimport { ensureItemIds } from \"../../ensureItemIds.js\";\n\nconst increaseEntryIdVersion = (id: string) => {\n    const { id: entryId, version } = parseIdentifier(id);\n    if (!version) {\n        throw new WebinyError(\n            \"Cannot increase version on the ID without the version part.\",\n            \"WRONG_ID\",\n            {\n                id\n            }\n        );\n    }\n    return {\n        entryId,\n        version: version + 1,\n        id: createIdentifier({\n            id: entryId,\n            version: version + 1\n        })\n    };\n};\n\nclass CreateEntryRevisionFromDataFactoryImpl implements ICreateEntryRevisionFromDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly accessControl: AccessControl.Interface,\n        private readonly modelToAstConverter: ModelToAstConverter.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        sourceId: string,\n        model: CmsModel,\n        rawInput: CreateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        latestStorageEntry: CmsEntry<TValues>,\n        options?: CreateCmsEntryOptionsInput\n    ): Promise<ICreateEntryRevisionFromDataResponse<TValues>> {\n        const initialValues = {\n            ...originalEntry.values,\n            ...mapAndCleanUpdatedInputData<TValues>(model, rawInput.values)\n        };\n\n        const modelAst = this.modelToAstConverter.toAst(model);\n        await ensureItemIds(modelAst, initialValues);\n\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: initialValues,\n            entry: originalEntry,\n            skipValidation: options?.skipValidation\n        });\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: initialValues,\n            validateEntries: false\n        });\n\n        const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;\n        const { id, version: nextVersion } = increaseEntryIdVersion(latestId);\n\n        const currentIdentity = this.identityContext.getIdentity();\n        const currentDateTime = new Date();\n\n        const status = rawInput.status || STATUS_DRAFT;\n        if (status !== STATUS_DRAFT) {\n            if (status === STATUS_PUBLISHED) {\n                const canPublish = await this.accessControl.canAccessEntry({ model, pw: \"p\" });\n                if (!canPublish) {\n                    throw new NotAuthorizedError(\n                        `Not allowed to access \"${model.modelId}\" entries.`\n                    );\n                }\n            } else if (status === STATUS_UNPUBLISHED) {\n                const canUnpublish = await this.accessControl.canAccessEntry({ model, pw: \"u\" });\n                if (!canUnpublish) {\n                    throw new NotAuthorizedError(\n                        `Not allowed to access \"${model.modelId}\" entries.`\n                    );\n                }\n            }\n        }\n\n        const locked = status !== STATUS_DRAFT;\n\n        let revisionLevelPublishingMetaFields: Pick<\n            CmsEntry,\n            | \"revisionFirstPublishedOn\"\n            | \"revisionLastPublishedOn\"\n            | \"revisionFirstPublishedBy\"\n            | \"revisionLastPublishedBy\"\n        > = {\n            revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, null),\n            revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, null),\n            revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, null),\n            revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, null)\n        };\n\n        let entryLevelPublishingMetaFields: Pick<\n            CmsEntry,\n            \"firstPublishedOn\" | \"lastPublishedOn\" | \"firstPublishedBy\" | \"lastPublishedBy\"\n        > = {\n            firstPublishedOn: getDate(\n                rawInput.firstPublishedOn,\n                latestStorageEntry.firstPublishedOn\n            ),\n            lastPublishedOn: getDate(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),\n            firstPublishedBy: getIdentity(\n                rawInput.firstPublishedBy,\n                latestStorageEntry.firstPublishedBy\n            ),\n            lastPublishedBy: getIdentity(\n                rawInput.lastPublishedBy,\n                latestStorageEntry.lastPublishedBy\n            )\n        };\n\n        if (status === STATUS_PUBLISHED) {\n            revisionLevelPublishingMetaFields = {\n                revisionFirstPublishedOn: getDate(\n                    rawInput.revisionFirstPublishedOn,\n                    currentDateTime\n                ),\n                revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, currentDateTime),\n                revisionFirstPublishedBy: getIdentity(\n                    rawInput.revisionFirstPublishedBy,\n                    currentIdentity\n                ),\n                revisionLastPublishedBy: getIdentity(\n                    rawInput.revisionLastPublishedBy,\n                    currentIdentity\n                )\n            };\n\n            entryLevelPublishingMetaFields = {\n                firstPublishedOn: getDate(\n                    rawInput.firstPublishedOn,\n                    latestStorageEntry.firstPublishedOn\n                ),\n                lastPublishedOn: getDate(rawInput.lastPublishedOn, currentDateTime),\n                firstPublishedBy: getIdentity(\n                    rawInput.firstPublishedBy,\n                    latestStorageEntry.firstPublishedBy\n                ),\n                lastPublishedBy: getIdentity(rawInput.lastPublishedBy, currentIdentity)\n            };\n        }\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            id,\n            version: nextVersion,\n            createdOn: getDate(rawInput.createdOn, latestStorageEntry.createdOn),\n            savedOn: getDate(rawInput.savedOn, currentDateTime),\n            modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),\n            createdBy: getIdentity(rawInput.createdBy, latestStorageEntry.createdBy)!,\n            savedBy: getIdentity(rawInput.savedBy, currentIdentity)!,\n            modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),\n            ...entryLevelPublishingMetaFields,\n            revisionCreatedOn: getDate(rawInput.revisionCreatedOn, currentDateTime),\n            revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),\n            revisionModifiedOn: getDate(rawInput.revisionModifiedOn, null),\n            revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, currentIdentity)!,\n            revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity)!,\n            revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, null),\n            revisionDescription: undefined,\n            ...revisionLevelPublishingMetaFields,\n            locked,\n            status,\n            values,\n            system: getSystem({\n                input: rawInput,\n                original: originalEntry\n            }),\n            live: originalEntry.live,\n            expiresAt: null\n        };\n\n        return {\n            entry,\n            input: {\n                ...rawInput,\n                values: structuredClone(values)\n            }\n        };\n    }\n}\n\nexport const CreateEntryRevisionFromDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateEntryRevisionFromDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext, AccessControl, ModelToAstConverter]\n});\n"],"names":["increaseEntryIdVersion","id","entryId","version","parseIdentifier","WebinyError","createIdentifier","CreateEntryRevisionFromDataFactoryImpl","cmsContext","identityContext","accessControl","modelToAstConverter","sourceId","model","rawInput","originalEntry","latestStorageEntry","options","initialValues","mapAndCleanUpdatedInputData","modelAst","ensureItemIds","validateModelEntryDataOrThrow","values","referenceFieldsMapping","latestId","nextVersion","currentIdentity","currentDateTime","Date","status","STATUS_DRAFT","STATUS_PUBLISHED","canPublish","NotAuthorizedError","STATUS_UNPUBLISHED","canUnpublish","locked","revisionLevelPublishingMetaFields","getDate","getIdentity","entryLevelPublishingMetaFields","entry","undefined","getSystem","structuredClone","CreateEntryRevisionFromDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","AccessControl","ModelToAstConverter"],"mappings":"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"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/CreateEntryRevisionFromDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/CreateEntryRevisionFromDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreateEntryRevisionFromDataFactory as FactoryAbstraction,\n    type ICreateEntryRevisionFromDataFactory\n} from \"./abstractions.js\";\nimport { AccessControl, CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types/index.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { mapAndCleanUpdatedInputData } from \"../mapAndCleanUpdatedInputData.js\";\nimport { validateModelEntryData } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { createIdentifier, parseIdentifier } from \"@webiny/utils\";\nimport WebinyError from \"@webiny/error\";\nimport { STATUS_DRAFT, STATUS_PUBLISHED, STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { NotAuthorizedError } from \"~/utils/errors.js\";\nimport { getSystem } from \"../system.js\";\nimport { ModelToAstConverter } from \"~/features/contentModel/ModelToAstConverter/abstractions.js\";\nimport { ensureItemIds } from \"../../ensureItemIds.js\";\nimport { hasEntryContentChanged } from \"../hasEntryContentChanged.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nconst increaseEntryIdVersion = (id: string) => {\n    const { id: entryId, version } = parseIdentifier(id);\n    if (!version) {\n        throw new WebinyError(\n            \"Cannot increase version on the ID without the version part.\",\n            \"WRONG_ID\",\n            {\n                id\n            }\n        );\n    }\n    return {\n        entryId,\n        version: version + 1,\n        id: createIdentifier({\n            id: entryId,\n            version: version + 1\n        })\n    };\n};\n\nclass CreateEntryRevisionFromDataFactoryImpl implements ICreateEntryRevisionFromDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly accessControl: AccessControl.Interface,\n        private readonly modelToAstConverter: ModelToAstConverter.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        sourceId: string,\n        model: CmsModel,\n        rawInput: CreateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: CreateCmsEntryOptionsInput\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestStorageEntry = latestResult.value;\n\n        const initialValues = {\n            ...originalEntry.values,\n            ...mapAndCleanUpdatedInputData<TValues>(model, rawInput.values)\n        };\n\n        const modelAst = this.modelToAstConverter.toAst(model);\n        await ensureItemIds(modelAst, initialValues);\n\n        const invalidFields = await validateModelEntryData({\n            context: this.cmsContext,\n            model,\n            values: initialValues,\n            entry: originalEntry,\n            skipValidation: options?.skipValidation\n        });\n        if (invalidFields.length > 0) {\n            return Result.fail(new EntryValidationError(\"Validation failed.\", invalidFields));\n        }\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: initialValues,\n            validateEntries: false\n        });\n\n        const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;\n        const { id, version: nextVersion } = increaseEntryIdVersion(latestId);\n\n        const currentIdentity = this.identityContext.getIdentity();\n        const currentDateTime = new Date();\n\n        const status = rawInput.status || STATUS_DRAFT;\n        if (status !== STATUS_DRAFT) {\n            if (status === STATUS_PUBLISHED) {\n                const canPublish = await this.accessControl.canAccessEntry({ model, pw: \"p\" });\n                if (!canPublish) {\n                    return Result.fail(\n                        new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`)\n                    );\n                }\n            } else if (status === STATUS_UNPUBLISHED) {\n                const canUnpublish = await this.accessControl.canAccessEntry({ model, pw: \"u\" });\n                if (!canUnpublish) {\n                    return Result.fail(\n                        new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`)\n                    );\n                }\n            }\n        }\n\n        const locked = status !== STATUS_DRAFT;\n\n        let revisionLevelPublishingMetaFields: Pick<\n            CmsEntry,\n            | \"revisionFirstPublishedOn\"\n            | \"revisionLastPublishedOn\"\n            | \"revisionFirstPublishedBy\"\n            | \"revisionLastPublishedBy\"\n        > = {\n            revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, null),\n            revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, null),\n            revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, null),\n            revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, null)\n        };\n\n        let entryLevelPublishingMetaFields: Pick<\n            CmsEntry,\n            \"firstPublishedOn\" | \"lastPublishedOn\" | \"firstPublishedBy\" | \"lastPublishedBy\"\n        > = {\n            firstPublishedOn: getDate(\n                rawInput.firstPublishedOn,\n                latestStorageEntry.firstPublishedOn\n            ),\n            lastPublishedOn: getDate(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),\n            firstPublishedBy: getIdentity(\n                rawInput.firstPublishedBy,\n                latestStorageEntry.firstPublishedBy\n            ),\n            lastPublishedBy: getIdentity(\n                rawInput.lastPublishedBy,\n                latestStorageEntry.lastPublishedBy\n            )\n        };\n\n        if (status === STATUS_PUBLISHED) {\n            revisionLevelPublishingMetaFields = {\n                revisionFirstPublishedOn: getDate(\n                    rawInput.revisionFirstPublishedOn,\n                    currentDateTime\n                ),\n                revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, currentDateTime),\n                revisionFirstPublishedBy: getIdentity(\n                    rawInput.revisionFirstPublishedBy,\n                    currentIdentity\n                ),\n                revisionLastPublishedBy: getIdentity(\n                    rawInput.revisionLastPublishedBy,\n                    currentIdentity\n                )\n            };\n\n            entryLevelPublishingMetaFields = {\n                firstPublishedOn: getDate(\n                    rawInput.firstPublishedOn,\n                    latestStorageEntry.firstPublishedOn\n                ),\n                lastPublishedOn: getDate(rawInput.lastPublishedOn, currentDateTime),\n                firstPublishedBy: getIdentity(\n                    rawInput.firstPublishedBy,\n                    latestStorageEntry.firstPublishedBy\n                ),\n                lastPublishedBy: getIdentity(rawInput.lastPublishedBy, currentIdentity)\n            };\n        }\n\n        /**\n         * Creating a revision without changing the entry's content (e.g. \"New revision\" in the\n         * revisions list, or saving a published entry without editing anything) is not a\n         * modification, so the entry-level saved/modified meta fields are kept. The new revision\n         * is compared with the latest revision, not the source revision: creating a revision from\n         * an older one reverts the content, which is a change. Explicitly provided meta field\n         * values always take precedence.\n         */\n        const contentChanged = hasEntryContentChanged({\n            values,\n            baselineValues: latestStorageEntry.values\n        });\n\n        const entryLevelSaved = contentChanged\n            ? {\n                  savedOn: currentDateTime,\n                  modifiedOn: currentDateTime,\n                  savedBy: currentIdentity,\n                  modifiedBy: currentIdentity\n              }\n            : {\n                  savedOn: latestStorageEntry.savedOn,\n                  modifiedOn: latestStorageEntry.modifiedOn,\n                  savedBy: latestStorageEntry.savedBy,\n                  modifiedBy: latestStorageEntry.modifiedBy\n              };\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            id,\n            version: nextVersion,\n            createdOn: getDate(rawInput.createdOn, latestStorageEntry.createdOn),\n            savedOn: getDate(rawInput.savedOn, entryLevelSaved.savedOn),\n            modifiedOn: getDate(rawInput.modifiedOn, entryLevelSaved.modifiedOn),\n            createdBy: getIdentity(rawInput.createdBy, latestStorageEntry.createdBy)!,\n            savedBy: getIdentity(rawInput.savedBy, entryLevelSaved.savedBy)!,\n            modifiedBy: getIdentity(rawInput.modifiedBy, entryLevelSaved.modifiedBy),\n            ...entryLevelPublishingMetaFields,\n            revisionCreatedOn: getDate(rawInput.revisionCreatedOn, currentDateTime),\n            revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),\n            revisionModifiedOn: getDate(rawInput.revisionModifiedOn, null),\n            revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, currentIdentity)!,\n            revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity)!,\n            revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, null),\n            revisionDescription: undefined,\n            ...revisionLevelPublishingMetaFields,\n            locked,\n            status,\n            values,\n            system: getSystem({\n                input: rawInput,\n                original: originalEntry\n            }),\n            live: originalEntry.live,\n            expiresAt: null\n        };\n\n        return Result.ok({\n            entry,\n            input: {\n                ...rawInput,\n                values: structuredClone(values)\n            }\n        });\n    }\n}\n\nexport const CreateEntryRevisionFromDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateEntryRevisionFromDataFactoryImpl,\n    dependencies: [\n        CmsContext,\n        IdentityContext,\n        AccessControl,\n        ModelToAstConverter,\n        GetLatestRevisionByEntryIdUseCase\n    ]\n});\n"],"names":["increaseEntryIdVersion","id","entryId","version","parseIdentifier","WebinyError","createIdentifier","CreateEntryRevisionFromDataFactoryImpl","cmsContext","identityContext","accessControl","modelToAstConverter","getLatestRevision","sourceId","model","rawInput","originalEntry","options","latestResult","Result","latestStorageEntry","initialValues","mapAndCleanUpdatedInputData","modelAst","ensureItemIds","invalidFields","validateModelEntryData","EntryValidationError","values","referenceFieldsMapping","latestId","nextVersion","currentIdentity","currentDateTime","Date","status","STATUS_DRAFT","STATUS_PUBLISHED","canPublish","NotAuthorizedError","STATUS_UNPUBLISHED","canUnpublish","locked","revisionLevelPublishingMetaFields","getDate","getIdentity","entryLevelPublishingMetaFields","contentChanged","hasEntryContentChanged","entryLevelSaved","entry","undefined","getSystem","structuredClone","CreateEntryRevisionFromDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","AccessControl","ModelToAstConverter","GetLatestRevisionByEntryIdUseCase"],"mappings":"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"}

package/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.d.ts

@@ -1,13 +1,29 @@
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
+import type { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
+import type { NotAuthorizedError } from "../../../../utils/errors.js";
 import type { CmsEntry, CmsEntryValues, CmsModel, CreateCmsEntryInput, CreateCmsEntryOptionsInput } from "../../../../types/index.js";
 export interface ICreateEntryRevisionFromDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
     input: CreateCmsEntryInput<TValues>;
 }
+/**
+ * Expected failures of building the data of a new entry revision.
+ */
+export interface ICreateEntryRevisionFromDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+    validation: EntryValidationError;
+    notAuthorized: NotAuthorizedError;
+}
+type FactoryError = ICreateEntryRevisionFromDataFactoryErrors[keyof ICreateEntryRevisionFromDataFactoryErrors];
 export interface ICreateEntryRevisionFromDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(sourceId: string, model: CmsModel, rawInput: CreateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, latestStorageEntry: CmsEntry<TValues>, options?: CreateCmsEntryOptionsInput): Promise<ICreateEntryRevisionFromDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(sourceId: string, model: CmsModel, rawInput: CreateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: CreateCmsEntryOptionsInput): Promise<Result<ICreateEntryRevisionFromDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreateEntryRevisionFromDataFactory: import("@webiny/di").Abstraction<ICreateEntryRevisionFromDataFactory>;
 export declare namespace CreateEntryRevisionFromDataFactory {
     type Interface = ICreateEntryRevisionFromDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreateEntryRevisionFromDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreateEntryRevisionFromDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types/index.js\";\n\nexport interface ICreateEntryRevisionFromDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n    input: CreateCmsEntryInput<TValues>;\n}\n\nexport interface ICreateEntryRevisionFromDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        sourceId: string,\n        model: CmsModel,\n        rawInput: CreateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        latestStorageEntry: CmsEntry<TValues>,\n        options?: CreateCmsEntryOptionsInput\n    ): Promise<ICreateEntryRevisionFromDataResponse<TValues>>;\n}\n\nexport const CreateEntryRevisionFromDataFactory =\n    createAbstraction<ICreateEntryRevisionFromDataFactory>(\n        \"Cms/Entry/CreateEntryRevisionFromDataFactory\"\n    );\n\nexport namespace CreateEntryRevisionFromDataFactory {\n    export type Interface = ICreateEntryRevisionFromDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateEntryRevisionFromDataResponse<TValues>;\n}\n"],"names":["CreateEntryRevisionFromDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,qCACTC,kBACI"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateEntryRevisionFromDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport type { NotAuthorizedError } from \"~/utils/errors.js\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types/index.js\";\n\nexport interface ICreateEntryRevisionFromDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n    input: CreateCmsEntryInput<TValues>;\n}\n\n/**\n * Expected failures of building the data of a new entry revision.\n */\nexport interface ICreateEntryRevisionFromDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n    validation: EntryValidationError;\n    notAuthorized: NotAuthorizedError;\n}\n\ntype FactoryError =\n    ICreateEntryRevisionFromDataFactoryErrors[keyof ICreateEntryRevisionFromDataFactoryErrors];\n\nexport interface ICreateEntryRevisionFromDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        sourceId: string,\n        model: CmsModel,\n        rawInput: CreateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: CreateCmsEntryOptionsInput\n    ): Promise<Result<ICreateEntryRevisionFromDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreateEntryRevisionFromDataFactory =\n    createAbstraction<ICreateEntryRevisionFromDataFactory>(\n        \"Cms/Entry/CreateEntryRevisionFromDataFactory\"\n    );\n\nexport namespace CreateEntryRevisionFromDataFactory {\n    export type Interface = ICreateEntryRevisionFromDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreateEntryRevisionFromDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateEntryRevisionFromDataResponse<TValues>;\n}\n"],"names":["CreateEntryRevisionFromDataFactory","createAbstraction"],"mappings":";AAyCO,MAAMA,qCACTC,kBACI"}

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.d.ts

@@ -1,12 +1,14 @@
-import { type ICreatePublishEntryDataFactory, type ICreatePublishEntryDataResponse } from "./abstractions.js";
+import { CreatePublishEntryDataFactory as FactoryAbstraction, type ICreatePublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../../features/shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {
     private readonly cmsContext;
     private readonly identityContext;
-    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>, latestEntry: CmsEntry<TValues>): Promise<ICreatePublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface, getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreatePublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreatePublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js

@@ -1,23 +1,32 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreatePublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { STATUS_PUBLISHED } from "../statuses.js";
-import { validateModelEntryDataOrThrow } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { validateModelEntryData } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreatePublishEntryDataFactoryImpl {
-    constructor(cmsContext, identityContext){
+    constructor(cmsContext, identityContext, getLatestRevision){
         this.cmsContext = cmsContext;
         this.identityContext = identityContext;
+        this.getLatestRevision = getLatestRevision;
     }
-    async create(model, originalEntry, latestEntry) {
-        await validateModelEntryDataOrThrow({
+    async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
+        const invalidFields = await validateModelEntryData({
             context: this.cmsContext,
             model,
             values: originalEntry.values,
             entry: originalEntry
         });
+        if (invalidFields.length > 0) return Result.fail(new EntryValidationError("Validation failed.", invalidFields));
         const currentDateTime = new Date().toISOString();
         const currentIdentity = this.identityContext.getIdentity();
         const entry = {
@@ -25,32 +34,28 @@ class CreatePublishEntryDataFactoryImpl {
             status: STATUS_PUBLISHED,
             locked: true,
             createdOn: getDate(latestEntry.createdOn),
-            modifiedOn: getDate(currentDateTime),
-            savedOn: getDate(currentDateTime),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
             firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),
             lastPublishedOn: getDate(currentDateTime),
             createdBy: getIdentity(latestEntry.createdBy),
-            modifiedBy: getIdentity(currentIdentity),
-            savedBy: getIdentity(currentIdentity),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
             firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),
             lastPublishedBy: getIdentity(currentIdentity),
             revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),
-            revisionSavedOn: getDate(currentDateTime),
-            revisionModifiedOn: getDate(currentDateTime),
             revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),
             revisionLastPublishedOn: getDate(currentDateTime),
             revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),
-            revisionSavedBy: getIdentity(currentIdentity),
-            revisionModifiedBy: getIdentity(currentIdentity),
             revisionFirstPublishedBy: getIdentity(originalEntry.revisionFirstPublishedBy, currentIdentity),
             revisionLastPublishedBy: getIdentity(currentIdentity),
             live: {
                 version: originalEntry.version
             }
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreatePublishEntryDataFactory_CreatePublishEntryDataFactory = createImplementation({
@@ -58,7 +63,8 @@ const CreatePublishEntryDataFactory_CreatePublishEntryDataFactory = createImplem
     implementation: CreatePublishEntryDataFactoryImpl,
     dependencies: [
         CmsContext,
-        IdentityContext
+        IdentityContext,
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreatePublishEntryDataFactory_CreatePublishEntryDataFactory as CreatePublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory,\n    type ICreatePublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>> {\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\n            createdOn: getDate(latestEntry.createdOn),\n            modifiedOn: getDate(currentDateTime),\n            savedOn: getDate(currentDateTime),\n            firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n            lastPublishedOn: getDate(currentDateTime),\n            createdBy: getIdentity(latestEntry.createdBy),\n            modifiedBy: getIdentity(currentIdentity),\n            savedBy: getIdentity(currentIdentity),\n            firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreatePublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","latestEntry","validateModelEntryDataOrThrow","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EAChCC,WAA8B,EACmB;QACjD,MAAMC,8BAA8B;YAChC,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,QAAQ;YACR,WAAWC,QAAQP,YAAY,SAAS;YACxC,YAAYO,QAAQL;YACpB,SAASK,QAAQL;YACjB,kBAAkBK,QAAQP,YAAY,gBAAgB,EAAEE;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYR,YAAY,SAAS;YAC5C,YAAYQ,YAAYJ;YACxB,SAASI,YAAYJ;YACrB,kBAAkBI,YAAYR,YAAY,gBAAgB,EAAEI;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQR,cAAc,iBAAiB;YAC1D,iBAAiBQ,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,0BAA0BK,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYT,cAAc,iBAAiB;YAC9D,iBAAiBS,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BI,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAASL,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,8DAAgCC,qBAAqB;IAC9D,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { validateModelEntryData } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        const invalidFields = await validateModelEntryData({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n        if (invalidFields.length > 0) {\n            return Result.fail(new EntryValidationError(\"Validation failed.\", invalidFields));\n        }\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        /**\n         * Publishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is published. Revision-level\n         * values are the published revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\n            createdOn: getDate(latestEntry.createdOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n            lastPublishedOn: getDate(currentDateTime),\n            createdBy: getIdentity(latestEntry.createdBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreatePublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext, GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","invalidFields","validateModelEntryData","EntryValidationError","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;;;;;AAeA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,EAC1CC,iBAA8D,CACjF;aAHmBF,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAEtC,MAAMG,gBAAgB,MAAMC,uBAAuB;YAC/C,SAAS,IAAI,CAAC,UAAU;YACxBN;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QACA,IAAII,cAAc,MAAM,GAAG,GACvB,OAAOF,OAAO,IAAI,CAAC,IAAII,qBAAqB,sBAAsBF;QAGtE,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAQxD,MAAMC,QAA2B;YAC7B,GAAGV,aAAa;YAChB,QAAQW;YACR,QAAQ;YACR,WAAWC,QAAQT,YAAY,SAAS;YACxC,YAAYS,QAAQT,YAAY,UAAU;YAC1C,SAASS,QAAQT,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,kBAAkBY,QAAQT,YAAY,gBAAgB,EAAEI;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYV,YAAY,SAAS;YAC5C,YAAYU,YAAYV,YAAY,UAAU;YAC9C,SAASU,YAAYV,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,kBAAkBa,YAAYV,YAAY,gBAAgB,EAAEM;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQZ,cAAc,iBAAiB;YAC1D,0BAA0BY,QACtBZ,cAAc,wBAAwB,EACtCO;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYb,cAAc,iBAAiB;YAC9D,0BAA0Ba,YACtBb,cAAc,wBAAwB,EACtCS;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAAST,cAAc,OAAO;YAClC;QACJ;QAEA,OAAOE,OAAO,EAAE,CAAC;YAAEQ;QAAM;IAC7B;AACJ;AAEO,MAAMI,8DAAgCC,qBAAqB;IAC9D,aAAaC;IACb,gBAAgBrB;IAChB,cAAc;QAACsB;QAAYC;QAAiBC;KAAkC;AAClF"}

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,26 @@
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
+import type { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being published.
+ */
+export interface ICreatePublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+    validation: EntryValidationError;
+}
+type FactoryError = ICreatePublishEntryDataFactoryErrors[keyof ICreatePublishEntryDataFactoryErrors];
 export interface ICreatePublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>, latestEntry: CmsEntry<TValues>): Promise<ICreatePublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreatePublishEntryDataFactory: import("@webiny/di").Abstraction<ICreatePublishEntryDataFactory>;
 export declare namespace CreatePublishEntryDataFactory {
     type Interface = ICreatePublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreatePublishEntryDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n}\n\nexport interface ICreatePublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>>;\n}\n\nexport const CreatePublishEntryDataFactory = createAbstraction<ICreatePublishEntryDataFactory>(\n    \"Cms/Entry/CreatePublishEntryDataFactory\"\n);\n\nexport namespace CreatePublishEntryDataFactory {\n    export type Interface = ICreatePublishEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreatePublishEntryDataResponse<TValues>;\n}\n"],"names":["CreatePublishEntryDataFactory","createAbstraction"],"mappings":";AAeO,MAAMA,gCAAgCC,kBACzC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being published.\n */\nexport interface ICreatePublishEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n    validation: EntryValidationError;\n}\n\ntype FactoryError =\n    ICreatePublishEntryDataFactoryErrors[keyof ICreatePublishEntryDataFactoryErrors];\n\nexport interface ICreatePublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreatePublishEntryDataFactory = createAbstraction<ICreatePublishEntryDataFactory>(\n    \"Cms/Entry/CreatePublishEntryDataFactory\"\n);\n\nexport namespace CreatePublishEntryDataFactory {\n    export type Interface = ICreatePublishEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreatePublishEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreatePublishEntryDataResponse<TValues>;\n}\n"],"names":["CreatePublishEntryDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,gCAAgCC,kBACzC"}

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.d.ts

@@ -1,12 +1,14 @@
-import { type ICreateRepublishEntryDataFactory, type ICreateRepublishEntryDataResponse } from "./abstractions.js";
+import { CreateRepublishEntryDataFactory as FactoryAbstraction, type ICreateRepublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../../features/shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {
     private readonly cmsContext;
     private readonly identityContext;
-    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<ICreateRepublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface, getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreateRepublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateRepublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js

@@ -1,4 +1,4 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreateRepublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
@@ -6,12 +6,19 @@ import { referenceFieldsMapping } from "../../../../crud/contentEntry/referenceF
 import { STATUS_PUBLISHED } from "../statuses.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreateRepublishEntryDataFactoryImpl {
-    constructor(cmsContext, identityContext){
+    constructor(cmsContext, identityContext, getLatestRevision){
         this.cmsContext = cmsContext;
         this.identityContext = identityContext;
+        this.getLatestRevision = getLatestRevision;
     }
     async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
         const values = await referenceFieldsMapping({
             context: this.cmsContext,
             model,
@@ -23,18 +30,14 @@ class CreateRepublishEntryDataFactoryImpl {
         const entry = {
             ...originalEntry,
             status: STATUS_PUBLISHED,
-            savedOn: getDate(currentDateTime),
-            modifiedOn: getDate(currentDateTime),
-            savedBy: getIdentity(currentIdentity),
-            modifiedBy: getIdentity(currentIdentity),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
             firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),
             firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),
             lastPublishedOn: getDate(currentDateTime),
             lastPublishedBy: getIdentity(currentIdentity),
-            revisionSavedOn: getDate(currentDateTime),
-            revisionModifiedOn: getDate(currentDateTime),
-            revisionSavedBy: getIdentity(currentIdentity),
-            revisionModifiedBy: getIdentity(currentIdentity),
             revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),
             revisionFirstPublishedBy: getIdentity(originalEntry.revisionFirstPublishedBy, currentIdentity),
             revisionLastPublishedOn: getDate(currentDateTime),
@@ -44,9 +47,9 @@ class CreateRepublishEntryDataFactoryImpl {
                 version: originalEntry.version
             }
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = createImplementation({
@@ -54,7 +57,8 @@ const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = createIm
     implementation: CreateRepublishEntryDataFactoryImpl,
     dependencies: [
         CmsContext,
-        IdentityContext
+        IdentityContext,
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory as CreateRepublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory,\n    type ICreateRepublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>> {\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity)!,\n            modifiedBy: getIdentity(currentIdentity),\n            firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n            lastPublishedOn: getDate(currentDateTime),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity)!,\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACmB;QACnD,MAAMC,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,kBAAkBG,QAAQR,cAAc,gBAAgB,EAAEG;YAC1D,kBAAkBM,YAAYT,cAAc,gBAAgB,EAAEK;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BG,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,0BAA0BM,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASD,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        /**\n         * Republishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is republished. Revision-level\n         * values are the republished revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n            lastPublishedOn: getDate(currentDateTime),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext, GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,EAC1CC,iBAA8D,CACjF;aAHmBF,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAEtC,MAAMG,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBN;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMM,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAQxD,MAAMC,QAA2B;YAC7B,GAAGT,aAAa;YAChB,QAAQU;YACR,SAASC,QAAQR,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,YAAYW,QAAQR,YAAY,UAAU;YAC1C,SAASS,YAAYT,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,YAAYY,YAAYT,YAAY,UAAU;YAC9C,kBAAkBQ,QAAQX,cAAc,gBAAgB,EAAEM;YAC1D,kBAAkBM,YAAYZ,cAAc,gBAAgB,EAAEQ;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,0BAA0BG,QACtBX,cAAc,wBAAwB,EACtCM;YAEJ,0BAA0BM,YACtBZ,cAAc,wBAAwB,EACtCQ;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASJ,cAAc,OAAO;YAClC;QACJ;QAEA,OAAOE,OAAO,EAAE,CAAC;YAAEO;QAAM;IAC7B;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBpB;IAChB,cAAc;QAACqB;QAAYC;QAAiBC;KAAkC;AAClF"}

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,24 @@
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreateRepublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being republished.
+ */
+export interface ICreateRepublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+}
+type FactoryError = ICreateRepublishEntryDataFactoryErrors[keyof ICreateRepublishEntryDataFactoryErrors];
 export interface ICreateRepublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<ICreateRepublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreateRepublishEntryDataFactory: import("@webiny/di").Abstraction<ICreateRepublishEntryDataFactory>;
 export declare namespace CreateRepublishEntryDataFactory {
     type Interface = ICreateRepublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreateRepublishEntryDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreateRepublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\nexport interface ICreateRepublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>>;\n}\n\nexport const CreateRepublishEntryDataFactory = createAbstraction<ICreateRepublishEntryDataFactory>(\n    \"Cms/Entry/CreateRepublishEntryDataFactory\"\n);\n\nexport namespace CreateRepublishEntryDataFactory {\n    export type Interface = ICreateRepublishEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateRepublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateRepublishEntryDataFactory","createAbstraction"],"mappings":";AAgBO,MAAMA,kCAAkCC,kBAC3C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreateRepublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being republished.\n */\nexport interface ICreateRepublishEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n}\n\ntype FactoryError =\n    ICreateRepublishEntryDataFactoryErrors[keyof ICreateRepublishEntryDataFactoryErrors];\n\nexport interface ICreateRepublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreateRepublishEntryDataFactory = createAbstraction<ICreateRepublishEntryDataFactory>(\n    \"Cms/Entry/CreateRepublishEntryDataFactory\"\n);\n\nexport namespace CreateRepublishEntryDataFactory {\n    export type Interface = ICreateRepublishEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreateRepublishEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateRepublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateRepublishEntryDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,kCAAkCC,kBAC3C"}

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.d.ts

@@ -1,10 +1,10 @@
-import { type ICreateUnpublishEntryDataFactory, type ICreateUnpublishEntryDataResponse } from "./abstractions.js";
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import type { CmsEntry, CmsEntryValues } from "../../../../types/index.js";
+import { CreateUnpublishEntryDataFactory as FactoryAbstraction, type ICreateUnpublishEntryDataFactory } from "./abstractions.js";
+import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {
-    private readonly identityContext;
-    constructor(identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(originalEntry: CmsEntry<TValues>): Promise<ICreateUnpublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreateUnpublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateUnpublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js

@@ -1,39 +1,38 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreateUnpublishEntryDataFactory } from "./abstractions.js";
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { STATUS_UNPUBLISHED } from "../statuses.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreateUnpublishEntryDataFactoryImpl {
-    constructor(identityContext){
-        this.identityContext = identityContext;
+    constructor(getLatestRevision){
+        this.getLatestRevision = getLatestRevision;
     }
-    async create(originalEntry) {
-        const currentDateTime = new Date().toISOString();
-        const currentIdentity = this.identityContext.getIdentity();
+    async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
         const entry = {
             ...originalEntry,
             status: STATUS_UNPUBLISHED,
-            savedOn: getDate(currentDateTime),
-            modifiedOn: getDate(currentDateTime),
-            savedBy: getIdentity(currentIdentity),
-            modifiedBy: getIdentity(currentIdentity),
-            revisionSavedOn: getDate(currentDateTime),
-            revisionModifiedOn: getDate(currentDateTime),
-            revisionSavedBy: getIdentity(currentIdentity),
-            revisionModifiedBy: getIdentity(currentIdentity),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
             live: null
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory = createImplementation({
     abstraction: CreateUnpublishEntryDataFactory,
     implementation: CreateUnpublishEntryDataFactoryImpl,
     dependencies: [
-        IdentityContext
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory as CreateUnpublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory,\n    type ICreateUnpublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(private readonly identityContext: IdentityContext.Interface) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateUnpublishEntryDataResponse<TValues>> {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity),\n            modifiedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            live: null\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [IdentityContext]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","identityContext","originalEntry","currentDateTime","Date","currentIdentity","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","createImplementation","FactoryAbstraction","IdentityContext"],"mappings":";;;;;;AAYA,MAAMA;IACF,YAAoCC,eAA0C,CAAE;aAA5CA,eAAe,GAAfA;IAA6C;IAEjF,MAAa,OACTC,aAAgC,EACmB;QACnD,MAAMC,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,MAAM;QACV;QAEA,OAAO;YAAEC;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBZ;IAChB,cAAc;QAACa;KAAgB;AACnC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory\n} from \"./abstractions.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        /**\n         * Unpublishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is unpublished. Revision-level\n         * values are the unpublished revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            live: null\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","createImplementation","FactoryAbstraction","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;AAWA,MAAMA;IACF,YACqBC,iBAA8D,CACjF;aADmBA,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAQtC,MAAMG,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQH,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,YAAYM,QAAQH,YAAY,UAAU;YAC1C,SAASI,YAAYJ,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,YAAYO,YAAYJ,YAAY,UAAU;YAC9C,MAAM;QACV;QAEA,OAAOD,OAAO,EAAE,CAAC;YAAEE;QAAM;IAC7B;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBb;IAChB,cAAc;QAACc;KAAkC;AACrD"}

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,24 @@
-import type { CmsEntry, CmsEntryValues } from "../../../../types/index.js";
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
+import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreateUnpublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being unpublished.
+ */
+export interface ICreateUnpublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+}
+type FactoryError = ICreateUnpublishEntryDataFactoryErrors[keyof ICreateUnpublishEntryDataFactoryErrors];
 export interface ICreateUnpublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(originalEntry: CmsEntry<TValues>): Promise<ICreateUnpublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreateUnpublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreateUnpublishEntryDataFactory: import("@webiny/di").Abstraction<ICreateUnpublishEntryDataFactory>;
 export declare namespace CreateUnpublishEntryDataFactory {
     type Interface = ICreateUnpublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreateUnpublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreateUnpublishEntryDataResponse<TValues>;
 }
+export {};