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

package/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.js

@@ -1,14 +1,19 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { UpdateEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { getDate } from "../../../../utils/date.js";
 import { getIdentity } from "../../../../utils/identity.js";
-import { validateModelEntryDataOrThrow } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { validateModelEntryData } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
 import { referenceFieldsMapping } from "../../../../crud/contentEntry/referenceFieldsMapping.js";
 import { mapAndCleanUpdatedInputData } from "../mapAndCleanUpdatedInputData.js";
 import { getSystem } from "../system.js";
 import { getExpiresAt } from "../expiresAt.js";
+import { ModelToAstConverter } from "../../../contentModel/ModelToAstConverter/abstractions.js";
+import { ensureItemIds } from "../../ensureItemIds.js";
+import { hasEntryContentChanged } from "../hasEntryContentChanged.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 const allowedEntryStatus = [
     "draft",
     "published",
@@ -16,23 +21,33 @@ const allowedEntryStatus = [
 ];
 const transformEntryStatus = (status)=>allowedEntryStatus.includes(status) ? status : "draft";
 class UpdateEntryDataFactoryImpl {
-    constructor(cmsContext, identityContext){
+    constructor(cmsContext, identityContext, modelToAstConverter, getLatestRevision){
         this.cmsContext = cmsContext;
         this.identityContext = identityContext;
+        this.modelToAstConverter = modelToAstConverter;
+        this.getLatestRevision = getLatestRevision;
     }
     async create(model, rawInput, originalEntry, options) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
         const cleanedValues = mapAndCleanUpdatedInputData(model, rawInput?.values || {});
-        await validateModelEntryDataOrThrow({
+        const invalidFields = await validateModelEntryData({
             context: this.cmsContext,
             model,
             values: cleanedValues,
             entry: originalEntry,
-            skipValidators: options?.skipValidators
+            skipValidation: options?.skipValidation
         });
+        if (invalidFields.length > 0) return Result.fail(new EntryValidationError("Validation failed.", invalidFields));
         const mergedValues = {
             ...originalEntry.values,
             ...cleanedValues
         };
+        const modelAst = this.modelToAstConverter.toAst(model);
+        await ensureItemIds(modelAst, mergedValues);
         const values = await referenceFieldsMapping({
             context: this.cmsContext,
             model,
@@ -41,36 +56,62 @@ class UpdateEntryDataFactoryImpl {
         });
         const currentIdentity = this.identityContext.getIdentity();
         const currentDateTime = new Date();
+        const contentChanged = hasEntryContentChanged({
+            values,
+            baselineValues: originalEntry.values
+        });
+        const entryLevelSaved = contentChanged ? {
+            savedOn: currentDateTime,
+            modifiedOn: currentDateTime,
+            savedBy: currentIdentity,
+            modifiedBy: currentIdentity
+        } : {
+            savedOn: latestEntry.savedOn,
+            modifiedOn: latestEntry.modifiedOn,
+            savedBy: latestEntry.savedBy,
+            modifiedBy: latestEntry.modifiedBy
+        };
+        const revisionLevelSaved = contentChanged ? {
+            revisionSavedOn: currentDateTime,
+            revisionModifiedOn: currentDateTime,
+            revisionSavedBy: currentIdentity,
+            revisionModifiedBy: currentIdentity
+        } : {
+            revisionSavedOn: originalEntry.revisionSavedOn,
+            revisionModifiedOn: originalEntry.revisionModifiedOn,
+            revisionSavedBy: originalEntry.revisionSavedBy,
+            revisionModifiedBy: originalEntry.revisionModifiedBy
+        };
         const entry = {
             ...originalEntry,
             revisionCreatedOn: getDate(rawInput.revisionCreatedOn, originalEntry.revisionCreatedOn),
-            revisionModifiedOn: getDate(rawInput.revisionModifiedOn, currentDateTime),
-            revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),
-            revisionDeletedOn: getDate(rawInput.revisionDeletedOn, null),
-            revisionRestoredOn: getDate(rawInput.revisionRestoredOn, null),
+            revisionModifiedOn: getDate(rawInput.revisionModifiedOn, revisionLevelSaved.revisionModifiedOn),
+            revisionSavedOn: getDate(rawInput.revisionSavedOn, revisionLevelSaved.revisionSavedOn),
+            revisionDeletedOn: getDate(rawInput.revisionDeletedOn, originalEntry.revisionDeletedOn),
+            revisionRestoredOn: getDate(rawInput.revisionRestoredOn, originalEntry.revisionRestoredOn),
             revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, originalEntry.revisionFirstPublishedOn),
             revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, originalEntry.revisionLastPublishedOn),
             revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, originalEntry.revisionCreatedBy),
-            revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, currentIdentity),
-            revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity),
-            revisionDeletedBy: getIdentity(rawInput.revisionSavedBy, null),
-            revisionRestoredBy: getIdentity(rawInput.revisionRestoredBy, null),
+            revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, revisionLevelSaved.revisionModifiedBy),
+            revisionSavedBy: getIdentity(rawInput.revisionSavedBy, revisionLevelSaved.revisionSavedBy),
+            revisionDeletedBy: getIdentity(rawInput.revisionDeletedBy, originalEntry.revisionDeletedBy),
+            revisionRestoredBy: getIdentity(rawInput.revisionRestoredBy, originalEntry.revisionRestoredBy),
             revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, originalEntry.revisionFirstPublishedBy),
             revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, originalEntry.revisionLastPublishedBy),
-            createdOn: getDate(rawInput.createdOn, originalEntry.createdOn),
-            savedOn: getDate(rawInput.savedOn, currentDateTime),
-            modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),
-            deletedOn: getDate(rawInput.deletedOn, null),
-            restoredOn: getDate(rawInput.restoredOn, null),
-            firstPublishedOn: getDate(rawInput.firstPublishedOn, originalEntry.firstPublishedOn),
-            lastPublishedOn: getDate(rawInput.lastPublishedOn, originalEntry.lastPublishedOn),
-            createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy),
-            savedBy: getIdentity(rawInput.savedBy, currentIdentity),
-            modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),
-            deletedBy: getIdentity(rawInput.deletedBy, null),
-            restoredBy: getIdentity(rawInput.restoredBy, null),
-            firstPublishedBy: getIdentity(rawInput.firstPublishedBy, originalEntry.firstPublishedBy),
-            lastPublishedBy: getIdentity(rawInput.lastPublishedBy, originalEntry.lastPublishedBy),
+            createdOn: getDate(rawInput.createdOn, latestEntry.createdOn),
+            savedOn: getDate(rawInput.savedOn, entryLevelSaved.savedOn),
+            modifiedOn: getDate(rawInput.modifiedOn, entryLevelSaved.modifiedOn),
+            deletedOn: getDate(rawInput.deletedOn, latestEntry.deletedOn),
+            restoredOn: getDate(rawInput.restoredOn, latestEntry.restoredOn),
+            firstPublishedOn: getDate(rawInput.firstPublishedOn, latestEntry.firstPublishedOn),
+            lastPublishedOn: getDate(rawInput.lastPublishedOn, latestEntry.lastPublishedOn),
+            createdBy: getIdentity(rawInput.createdBy, latestEntry.createdBy),
+            savedBy: getIdentity(rawInput.savedBy, entryLevelSaved.savedBy),
+            modifiedBy: getIdentity(rawInput.modifiedBy, entryLevelSaved.modifiedBy),
+            deletedBy: getIdentity(rawInput.deletedBy, latestEntry.deletedBy),
+            restoredBy: getIdentity(rawInput.restoredBy, latestEntry.restoredBy),
+            firstPublishedBy: getIdentity(rawInput.firstPublishedBy, latestEntry.firstPublishedBy),
+            lastPublishedBy: getIdentity(rawInput.lastPublishedBy, latestEntry.lastPublishedBy),
             values,
             status: transformEntryStatus(originalEntry.status),
             system: getSystem({
@@ -86,13 +127,13 @@ class UpdateEntryDataFactoryImpl {
         if (folderId) entry.location = {
             folderId
         };
-        return {
+        return Result.ok({
             entry,
             input: {
                 ...rawInput,
                 values: structuredClone(values)
             }
-        };
+        });
     }
 }
 const UpdateEntryDataFactory_UpdateEntryDataFactory = createImplementation({
@@ -100,7 +141,9 @@ const UpdateEntryDataFactory_UpdateEntryDataFactory = createImplementation({
     implementation: UpdateEntryDataFactoryImpl,
     dependencies: [
         CmsContext,
-        IdentityContext
+        IdentityContext,
+        ModelToAstConverter,
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { UpdateEntryDataFactory_UpdateEntryDataFactory as UpdateEntryDataFactory };

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    type IUpdateEntryDataFactory,\n    type IUpdateEntryDataResponse,\n    UpdateEntryDataFactory as FactoryAbstraction\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type {\n    CmsEntry,\n    CmsEntryStatus,\n    CmsEntryValues,\n    CmsModel,\n    UpdateCmsEntryInput,\n    UpdateCmsEntryOptionsInput\n} from \"~/types/index.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { mapAndCleanUpdatedInputData } from \"../mapAndCleanUpdatedInputData.js\";\nimport { getSystem } from \"../system.js\";\nimport { getExpiresAt } from \"../expiresAt.js\";\n\nconst allowedEntryStatus: string[] = [\"draft\", \"published\", \"unpublished\"];\n\nconst transformEntryStatus = (status: CmsEntryStatus | string): CmsEntryStatus => {\n    return allowedEntryStatus.includes(status) ? (status as CmsEntryStatus) : \"draft\";\n};\n\nclass UpdateEntryDataFactoryImpl implements IUpdateEntryDataFactory {\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        rawInput: UpdateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: UpdateCmsEntryOptionsInput\n    ): Promise<IUpdateEntryDataResponse<TValues>> {\n        const cleanedValues = mapAndCleanUpdatedInputData<TValues>(\n            model,\n            rawInput?.values || ({} as TValues)\n        );\n\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: cleanedValues,\n            entry: originalEntry,\n            skipValidators: options?.skipValidators\n        });\n\n        const mergedValues: TValues = {\n            ...originalEntry.values,\n            ...cleanedValues\n        };\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: mergedValues,\n            validateEntries: false\n        });\n\n        const currentIdentity = this.identityContext.getIdentity();\n        const currentDateTime = new Date();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            revisionCreatedOn: getDate(rawInput.revisionCreatedOn, originalEntry.revisionCreatedOn),\n            revisionModifiedOn: getDate(rawInput.revisionModifiedOn, currentDateTime),\n            revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),\n            revisionDeletedOn: getDate(rawInput.revisionDeletedOn, null),\n            revisionRestoredOn: getDate(rawInput.revisionRestoredOn, null),\n            revisionFirstPublishedOn: getDate(\n                rawInput.revisionFirstPublishedOn,\n                originalEntry.revisionFirstPublishedOn\n            ),\n            revisionLastPublishedOn: getDate(\n                rawInput.revisionLastPublishedOn,\n                originalEntry.revisionLastPublishedOn\n            ),\n            revisionCreatedBy: getIdentity(\n                rawInput.revisionCreatedBy,\n                originalEntry.revisionCreatedBy\n            )!,\n            revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, currentIdentity),\n            revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity)!,\n            revisionDeletedBy: getIdentity(rawInput.revisionSavedBy, null),\n            revisionRestoredBy: getIdentity(rawInput.revisionRestoredBy, null),\n            revisionFirstPublishedBy: getIdentity(\n                rawInput.revisionFirstPublishedBy,\n                originalEntry.revisionFirstPublishedBy\n            ),\n            revisionLastPublishedBy: getIdentity(\n                rawInput.revisionLastPublishedBy,\n                originalEntry.revisionLastPublishedBy\n            ),\n            createdOn: getDate(rawInput.createdOn, originalEntry.createdOn),\n            savedOn: getDate(rawInput.savedOn, currentDateTime),\n            modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),\n            deletedOn: getDate(rawInput.deletedOn, null),\n            restoredOn: getDate(rawInput.restoredOn, null),\n            firstPublishedOn: getDate(rawInput.firstPublishedOn, originalEntry.firstPublishedOn),\n            lastPublishedOn: getDate(rawInput.lastPublishedOn, originalEntry.lastPublishedOn),\n            createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy)!,\n            savedBy: getIdentity(rawInput.savedBy, currentIdentity)!,\n            modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),\n            deletedBy: getIdentity(rawInput.deletedBy, null),\n            restoredBy: getIdentity(rawInput.restoredBy, null),\n            firstPublishedBy: getIdentity(\n                rawInput.firstPublishedBy,\n                originalEntry.firstPublishedBy\n            ),\n            lastPublishedBy: getIdentity(rawInput.lastPublishedBy, originalEntry.lastPublishedBy),\n            values,\n            status: transformEntryStatus(originalEntry.status),\n            system: getSystem({\n                input: rawInput,\n                original: originalEntry\n            }),\n            live: originalEntry.live,\n            expiresAt: getExpiresAt({ expiresAt: rawInput.expiresAt }, originalEntry)\n        };\n\n        const folderId = rawInput.wbyAco_location?.folderId;\n        if (folderId) {\n            entry.location = {\n                folderId\n            };\n        }\n\n        return {\n            entry,\n            input: {\n                ...rawInput,\n                values: structuredClone(values)\n            }\n        };\n    }\n}\n\nexport const UpdateEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: UpdateEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["allowedEntryStatus","transformEntryStatus","status","UpdateEntryDataFactoryImpl","cmsContext","identityContext","model","rawInput","originalEntry","options","cleanedValues","mapAndCleanUpdatedInputData","validateModelEntryDataOrThrow","mergedValues","values","referenceFieldsMapping","currentIdentity","currentDateTime","Date","entry","getDate","getIdentity","getSystem","getExpiresAt","folderId","structuredClone","UpdateEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":"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"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    type IUpdateEntryDataFactory,\n    UpdateEntryDataFactory as FactoryAbstraction\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type {\n    CmsEntry,\n    CmsEntryStatus,\n    CmsEntryValues,\n    CmsModel,\n    UpdateCmsEntryInput,\n    UpdateCmsEntryOptionsInput\n} from \"~/types/index.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { validateModelEntryData } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { mapAndCleanUpdatedInputData } from \"../mapAndCleanUpdatedInputData.js\";\nimport { getSystem } from \"../system.js\";\nimport { getExpiresAt } from \"../expiresAt.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 allowedEntryStatus: string[] = [\"draft\", \"published\", \"unpublished\"];\n\nconst transformEntryStatus = (status: CmsEntryStatus | string): CmsEntryStatus => {\n    return allowedEntryStatus.includes(status) ? (status as CmsEntryStatus) : \"draft\";\n};\n\nclass UpdateEntryDataFactoryImpl implements IUpdateEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly modelToAstConverter: ModelToAstConverter.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        rawInput: UpdateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: UpdateCmsEntryOptionsInput\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 cleanedValues = mapAndCleanUpdatedInputData<TValues>(\n            model,\n            rawInput?.values || ({} as TValues)\n        );\n\n        const invalidFields = await validateModelEntryData({\n            context: this.cmsContext,\n            model,\n            values: cleanedValues,\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 mergedValues: TValues = {\n            ...originalEntry.values,\n            ...cleanedValues\n        };\n\n        const modelAst = this.modelToAstConverter.toAst(model);\n        await ensureItemIds(modelAst, mergedValues);\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: mergedValues,\n            validateEntries: false\n        });\n\n        const currentIdentity = this.identityContext.getIdentity();\n        const currentDateTime = new Date();\n\n        /**\n         * Saving without changing the content (e.g. clicking \"Save\" without editing anything) is\n         * not a modification, so the saved/modified meta fields are kept. Entry-level values are\n         * then taken from the latest revision, because storage copies them onto the latest\n         * revision when a non-latest revision is updated. Revision-level values are this\n         * revision's own. Explicitly provided meta field values always take precedence.\n         */\n        const contentChanged = hasEntryContentChanged({\n            values,\n            baselineValues: originalEntry.values\n        });\n\n        const entryLevelSaved = contentChanged\n            ? {\n                  savedOn: currentDateTime,\n                  modifiedOn: currentDateTime,\n                  savedBy: currentIdentity,\n                  modifiedBy: currentIdentity\n              }\n            : {\n                  savedOn: latestEntry.savedOn,\n                  modifiedOn: latestEntry.modifiedOn,\n                  savedBy: latestEntry.savedBy,\n                  modifiedBy: latestEntry.modifiedBy\n              };\n\n        const revisionLevelSaved = contentChanged\n            ? {\n                  revisionSavedOn: currentDateTime,\n                  revisionModifiedOn: currentDateTime,\n                  revisionSavedBy: currentIdentity,\n                  revisionModifiedBy: currentIdentity\n              }\n            : {\n                  revisionSavedOn: originalEntry.revisionSavedOn,\n                  revisionModifiedOn: originalEntry.revisionModifiedOn,\n                  revisionSavedBy: originalEntry.revisionSavedBy,\n                  revisionModifiedBy: originalEntry.revisionModifiedBy\n              };\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            revisionCreatedOn: getDate(rawInput.revisionCreatedOn, originalEntry.revisionCreatedOn),\n            revisionModifiedOn: getDate(\n                rawInput.revisionModifiedOn,\n                revisionLevelSaved.revisionModifiedOn\n            ),\n            revisionSavedOn: getDate(rawInput.revisionSavedOn, revisionLevelSaved.revisionSavedOn),\n            revisionDeletedOn: getDate(rawInput.revisionDeletedOn, originalEntry.revisionDeletedOn),\n            revisionRestoredOn: getDate(\n                rawInput.revisionRestoredOn,\n                originalEntry.revisionRestoredOn\n            ),\n            revisionFirstPublishedOn: getDate(\n                rawInput.revisionFirstPublishedOn,\n                originalEntry.revisionFirstPublishedOn\n            ),\n            revisionLastPublishedOn: getDate(\n                rawInput.revisionLastPublishedOn,\n                originalEntry.revisionLastPublishedOn\n            ),\n            revisionCreatedBy: getIdentity(\n                rawInput.revisionCreatedBy,\n                originalEntry.revisionCreatedBy\n            )!,\n            revisionModifiedBy: getIdentity(\n                rawInput.revisionModifiedBy,\n                revisionLevelSaved.revisionModifiedBy\n            ),\n            revisionSavedBy: getIdentity(\n                rawInput.revisionSavedBy,\n                revisionLevelSaved.revisionSavedBy\n            )!,\n            revisionDeletedBy: getIdentity(\n                rawInput.revisionDeletedBy,\n                originalEntry.revisionDeletedBy\n            ),\n            revisionRestoredBy: getIdentity(\n                rawInput.revisionRestoredBy,\n                originalEntry.revisionRestoredBy\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                rawInput.revisionFirstPublishedBy,\n                originalEntry.revisionFirstPublishedBy\n            ),\n            revisionLastPublishedBy: getIdentity(\n                rawInput.revisionLastPublishedBy,\n                originalEntry.revisionLastPublishedBy\n            ),\n            createdOn: getDate(rawInput.createdOn, latestEntry.createdOn),\n            savedOn: getDate(rawInput.savedOn, entryLevelSaved.savedOn),\n            modifiedOn: getDate(rawInput.modifiedOn, entryLevelSaved.modifiedOn),\n            deletedOn: getDate(rawInput.deletedOn, latestEntry.deletedOn),\n            restoredOn: getDate(rawInput.restoredOn, latestEntry.restoredOn),\n            firstPublishedOn: getDate(rawInput.firstPublishedOn, latestEntry.firstPublishedOn),\n            lastPublishedOn: getDate(rawInput.lastPublishedOn, latestEntry.lastPublishedOn),\n            createdBy: getIdentity(rawInput.createdBy, latestEntry.createdBy)!,\n            savedBy: getIdentity(rawInput.savedBy, entryLevelSaved.savedBy)!,\n            modifiedBy: getIdentity(rawInput.modifiedBy, entryLevelSaved.modifiedBy),\n            deletedBy: getIdentity(rawInput.deletedBy, latestEntry.deletedBy),\n            restoredBy: getIdentity(rawInput.restoredBy, latestEntry.restoredBy),\n            firstPublishedBy: getIdentity(rawInput.firstPublishedBy, latestEntry.firstPublishedBy),\n            lastPublishedBy: getIdentity(rawInput.lastPublishedBy, latestEntry.lastPublishedBy),\n            values,\n            status: transformEntryStatus(originalEntry.status),\n            system: getSystem({\n                input: rawInput,\n                original: originalEntry\n            }),\n            live: originalEntry.live,\n            expiresAt: getExpiresAt({ expiresAt: rawInput.expiresAt }, originalEntry)\n        };\n\n        const folderId = rawInput.wbyAco_location?.folderId;\n        if (folderId) {\n            entry.location = {\n                folderId\n            };\n        }\n\n        return Result.ok({\n            entry,\n            input: {\n                ...rawInput,\n                values: structuredClone(values)\n            }\n        });\n    }\n}\n\nexport const UpdateEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: UpdateEntryDataFactoryImpl,\n    dependencies: [\n        CmsContext,\n        IdentityContext,\n        ModelToAstConverter,\n        GetLatestRevisionByEntryIdUseCase\n    ]\n});\n"],"names":["allowedEntryStatus","transformEntryStatus","status","UpdateEntryDataFactoryImpl","cmsContext","identityContext","modelToAstConverter","getLatestRevision","model","rawInput","originalEntry","options","latestResult","Result","latestEntry","cleanedValues","mapAndCleanUpdatedInputData","invalidFields","validateModelEntryData","EntryValidationError","mergedValues","modelAst","ensureItemIds","values","referenceFieldsMapping","currentIdentity","currentDateTime","Date","contentChanged","hasEntryContentChanged","entryLevelSaved","revisionLevelSaved","entry","getDate","getIdentity","getSystem","getExpiresAt","folderId","structuredClone","UpdateEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","ModelToAstConverter","GetLatestRevisionByEntryIdUseCase"],"mappings":"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"}

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

@@ -1,13 +1,27 @@
+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, UpdateCmsEntryInput, UpdateCmsEntryOptionsInput } from "../../../../types/index.js";
 export interface IUpdateEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
     input: UpdateCmsEntryInput<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being updated.
+ */
+export interface IUpdateEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+    validation: EntryValidationError;
+}
+type FactoryError = IUpdateEntryDataFactoryErrors[keyof IUpdateEntryDataFactoryErrors];
 export interface IUpdateEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, rawInput: UpdateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: UpdateCmsEntryOptionsInput): Promise<IUpdateEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, rawInput: UpdateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: UpdateCmsEntryOptionsInput): Promise<Result<IUpdateEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const UpdateEntryDataFactory: import("@webiny/di").Abstraction<IUpdateEntryDataFactory>;
 export declare namespace UpdateEntryDataFactory {
     type Interface = IUpdateEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<IUpdateEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = IUpdateEntryDataResponse<TValues>;
 }
+export {};

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/UpdateEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    UpdateCmsEntryInput,\n    UpdateCmsEntryOptionsInput\n} from \"~/types/index.js\";\n\nexport interface IUpdateEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n    input: UpdateCmsEntryInput<TValues>;\n}\n\nexport interface IUpdateEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        rawInput: UpdateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: UpdateCmsEntryOptionsInput\n    ): Promise<IUpdateEntryDataResponse<TValues>>;\n}\n\nexport const UpdateEntryDataFactory = createAbstraction<IUpdateEntryDataFactory>(\n    \"Cms/Entry/UpdateEntryDataFactory\"\n);\n\nexport namespace UpdateEntryDataFactory {\n    export type Interface = IUpdateEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        IUpdateEntryDataResponse<TValues>;\n}\n"],"names":["UpdateEntryDataFactory","createAbstraction"],"mappings":";AAuBO,MAAMA,yBAAyBC,kBAClC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/UpdateEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/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 {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    UpdateCmsEntryInput,\n    UpdateCmsEntryOptionsInput\n} from \"~/types/index.js\";\n\nexport interface IUpdateEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n    input: UpdateCmsEntryInput<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being updated.\n */\nexport interface IUpdateEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n    validation: EntryValidationError;\n}\n\ntype FactoryError = IUpdateEntryDataFactoryErrors[keyof IUpdateEntryDataFactoryErrors];\n\nexport interface IUpdateEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        rawInput: UpdateCmsEntryInput<TValues>,\n        originalEntry: CmsEntry<TValues>,\n        options?: UpdateCmsEntryOptionsInput\n    ): Promise<Result<IUpdateEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const UpdateEntryDataFactory = createAbstraction<IUpdateEntryDataFactory>(\n    \"Cms/Entry/UpdateEntryDataFactory\"\n);\n\nexport namespace UpdateEntryDataFactory {\n    export type Interface = IUpdateEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        IUpdateEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        IUpdateEntryDataResponse<TValues>;\n}\n"],"names":["UpdateEntryDataFactory","createAbstraction"],"mappings":";AAmCO,MAAMA,yBAAyBC,kBAClC"}

package/features/contentEntry/entryDataFactories/expiresAt.js

@@ -1,7 +1,7 @@
 const getExpiresAt = (input, original)=>{
     if (void 0 === input.expiresAt) return original?.expiresAt ?? null;
-    else if (input.expiresAt instanceof Date) return input.expiresAt.getTime() / 1000;
-    else if ("number" == typeof input.expiresAt && !isNaN(input.expiresAt) && input.expiresAt > 0) return input.expiresAt;
+    if (input.expiresAt instanceof Date) return input.expiresAt.getTime() / 1000;
+    if ("number" == typeof input.expiresAt && !isNaN(input.expiresAt) && input.expiresAt > 0) return input.expiresAt;
     return null;
 };
 export { getExpiresAt };

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/expiresAt.js","sources":["../../../../src/features/contentEntry/entryDataFactories/expiresAt.ts"],"sourcesContent":["import type { CmsEntry } from \"~/types/index.js\";\n\nexport interface IRawInput {\n    expiresAt: Date | number | null | undefined;\n}\n\nexport const getExpiresAt = (input: IRawInput, original?: CmsEntry): number | null => {\n    if (input.expiresAt === undefined) {\n        return original?.expiresAt ?? null;\n    } else if (input.expiresAt instanceof Date) {\n        return input.expiresAt.getTime() / 1000;\n    } else if (\n        typeof input.expiresAt === \"number\" &&\n        !isNaN(input.expiresAt) &&\n        input.expiresAt > 0\n    ) {\n        return input.expiresAt;\n    }\n    return null;\n};\n"],"names":["getExpiresAt","input","original","undefined","Date","isNaN"],"mappings":"AAMO,MAAMA,eAAe,CAACC,OAAkBC;IAC3C,IAAID,AAAoBE,WAApBF,MAAM,SAAS,EACf,OAAOC,UAAU,aAAa;SAC3B,IAAID,MAAM,SAAS,YAAYG,MAClC,OAAOH,MAAM,SAAS,CAAC,OAAO,KAAK;SAChC,IACH,AAA2B,YAA3B,OAAOA,MAAM,SAAS,IACtB,CAACI,MAAMJ,MAAM,SAAS,KACtBA,MAAM,SAAS,GAAG,GAElB,OAAOA,MAAM,SAAS;IAE1B,OAAO;AACX"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/expiresAt.js","sources":["../../../../src/features/contentEntry/entryDataFactories/expiresAt.ts"],"sourcesContent":["import type { CmsEntry } from \"~/types/index.js\";\n\nexport interface IRawInput {\n    expiresAt: Date | number | null | undefined;\n}\n\nexport const getExpiresAt = (input: IRawInput, original?: CmsEntry): number | null => {\n    if (input.expiresAt === undefined) {\n        return original?.expiresAt ?? null;\n    } else if (input.expiresAt instanceof Date) {\n        return input.expiresAt.getTime() / 1000;\n    } else if (\n        typeof input.expiresAt === \"number\" &&\n        !isNaN(input.expiresAt) &&\n        input.expiresAt > 0\n    ) {\n        return input.expiresAt;\n    }\n    return null;\n};\n"],"names":["getExpiresAt","input","original","undefined","Date","isNaN"],"mappings":"AAMO,MAAMA,eAAe,CAACC,OAAkBC;IAC3C,IAAID,AAAoBE,WAApBF,MAAM,SAAS,EACf,OAAOC,UAAU,aAAa;IAC3B,IAAID,MAAM,SAAS,YAAYG,MAClC,OAAOH,MAAM,SAAS,CAAC,OAAO,KAAK;IAChC,IACH,AAA2B,YAA3B,OAAOA,MAAM,SAAS,IACtB,CAACI,MAAMJ,MAAM,SAAS,KACtBA,MAAM,SAAS,GAAG,GAElB,OAAOA,MAAM,SAAS;IAE1B,OAAO;AACX"}

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

@@ -0,0 +1,24 @@
+import type { CmsEntryValues } from "../../../types/index.js";
+export interface IHasEntryContentChangedParams<TValues extends CmsEntryValues = CmsEntryValues> {
+    /**
+     * The values as they will be stored (normalized).
+     */
+    values: TValues;
+    /**
+     * The values to compare against, as currently stored.
+     */
+    baselineValues: TValues;
+}
+/**
+ * Decides whether saving `values` changes the content of an entry. Used to keep the
+ * saved/modified meta fields untouched when an entry is saved without actual changes, e.g. when
+ * the "Save" button is clicked without editing anything.
+ *
+ * Only the content counts: moving an entry to another folder is not a content change, the same
+ * as with the dedicated move operation.
+ *
+ * Values must already be normalized the same way as the stored ones (item IDs assigned, reference
+ * fields mapped). A value that does not normalize identically is treated as a change, which only
+ * means the meta fields get updated, exactly as they did before this check existed.
+ */
+export declare const hasEntryContentChanged: <TValues extends CmsEntryValues = CmsEntryValues>(params: IHasEntryContentChangedParams<TValues>) => boolean;

package/features/contentEntry/entryDataFactories/hasEntryContentChanged.js

@@ -0,0 +1,13 @@
+import isEqual from "lodash/isEqual.js";
+const withoutEmptyKeys = (value)=>{
+    if (Array.isArray(value)) return value.map(withoutEmptyKeys);
+    if (null === value || "object" != typeof value || value instanceof Date) return value;
+    return Object.entries(value).reduce((result, [key, item])=>{
+        if (null != item) result[key] = withoutEmptyKeys(item);
+        return result;
+    }, {});
+};
+const hasEntryContentChanged = (params)=>!isEqual(withoutEmptyKeys(params.values), withoutEmptyKeys(params.baselineValues));
+export { hasEntryContentChanged };
+
+//# sourceMappingURL=hasEntryContentChanged.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentEntry/entryDataFactories/hasEntryContentChanged.js","sources":["../../../../src/features/contentEntry/entryDataFactories/hasEntryContentChanged.ts"],"sourcesContent":["import lodashIsEqual from \"lodash/isEqual.js\";\nimport type { CmsEntryValues } from \"~/types/index.js\";\n\n/**\n * Removes object keys with `null` or `undefined` values, recursively, so that a field that was\n * never set and a field that is explicitly empty compare as equal.\n */\nconst withoutEmptyKeys = (value: unknown): unknown => {\n    if (Array.isArray(value)) {\n        return value.map(withoutEmptyKeys);\n    }\n    if (value === null || typeof value !== \"object\" || value instanceof Date) {\n        return value;\n    }\n    return Object.entries(value).reduce<Record<string, unknown>>((result, [key, item]) => {\n        if (item !== null && item !== undefined) {\n            result[key] = withoutEmptyKeys(item);\n        }\n        return result;\n    }, {});\n};\n\nexport interface IHasEntryContentChangedParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    /**\n     * The values as they will be stored (normalized).\n     */\n    values: TValues;\n    /**\n     * The values to compare against, as currently stored.\n     */\n    baselineValues: TValues;\n}\n\n/**\n * Decides whether saving `values` changes the content of an entry. Used to keep the\n * saved/modified meta fields untouched when an entry is saved without actual changes, e.g. when\n * the \"Save\" button is clicked without editing anything.\n *\n * Only the content counts: moving an entry to another folder is not a content change, the same\n * as with the dedicated move operation.\n *\n * Values must already be normalized the same way as the stored ones (item IDs assigned, reference\n * fields mapped). A value that does not normalize identically is treated as a change, which only\n * means the meta fields get updated, exactly as they did before this check existed.\n */\nexport const hasEntryContentChanged = <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: IHasEntryContentChangedParams<TValues>\n): boolean => {\n    return !lodashIsEqual(withoutEmptyKeys(params.values), withoutEmptyKeys(params.baselineValues));\n};\n"],"names":["withoutEmptyKeys","value","Array","Date","Object","result","key","item","hasEntryContentChanged","params","lodashIsEqual"],"mappings":";AAOA,MAAMA,mBAAmB,CAACC;IACtB,IAAIC,MAAM,OAAO,CAACD,QACd,OAAOA,MAAM,GAAG,CAACD;IAErB,IAAIC,AAAU,SAAVA,SAAkB,AAAiB,YAAjB,OAAOA,SAAsBA,iBAAiBE,MAChE,OAAOF;IAEX,OAAOG,OAAO,OAAO,CAACH,OAAO,MAAM,CAA0B,CAACI,QAAQ,CAACC,KAAKC,KAAK;QAC7E,IAAIA,QAAAA,MACAF,MAAM,CAACC,IAAI,GAAGN,iBAAiBO;QAEnC,OAAOF;IACX,GAAG,CAAC;AACR;AAyBO,MAAMG,yBAAyB,CAClCC,SAEO,CAACC,QAAcV,iBAAiBS,OAAO,MAAM,GAAGT,iBAAiBS,OAAO,cAAc"}

package/features/contentModel/ComponentMapGenerator/ComponentMapGenerator.d.ts

@@ -0,0 +1,14 @@
+import { type IComponentMapGenerator } from "./abstractions.js";
+import { ModelToAstConverter } from "../ModelToAstConverter/abstractions.js";
+import type { CmsModel } from "../../../types/index.js";
+declare class ComponentMapGeneratorImpl implements IComponentMapGenerator {
+    private readonly modelToAst;
+    constructor(modelToAst: ModelToAstConverter.Interface);
+    generate(model: CmsModel): Record<string, string>;
+    private walkNode;
+    private walkCollection;
+}
+export declare const ComponentMapGenerator: typeof ComponentMapGeneratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IComponentMapGenerator>;
+};
+export {};

package/features/contentModel/ComponentMapGenerator/ComponentMapGenerator.js

@@ -0,0 +1,32 @@
+import { ComponentMapGenerator } from "./abstractions.js";
+import { ModelToAstConverter } from "../ModelToAstConverter/abstractions.js";
+class ComponentMapGeneratorImpl {
+    constructor(modelToAst){
+        this.modelToAst = modelToAst;
+    }
+    generate(model) {
+        const ast = this.modelToAst.toAst(model);
+        const map = {};
+        this.walkNode(ast, map);
+        return map;
+    }
+    walkNode(node, map) {
+        for (const child of node.children)if ("collection" === child.type) this.walkCollection(child, map);
+        else this.walkNode(child, map);
+    }
+    walkCollection(node, map) {
+        const { collection } = node;
+        if (collection.componentName && collection.id) map[collection.id] = collection.componentName;
+        for (const child of node.children)if ("collection" === child.type) this.walkCollection(child, map);
+        else this.walkNode(child, map);
+    }
+}
+const ComponentMapGenerator_ComponentMapGenerator = ComponentMapGenerator.createImplementation({
+    implementation: ComponentMapGeneratorImpl,
+    dependencies: [
+        ModelToAstConverter
+    ]
+});
+export { ComponentMapGenerator_ComponentMapGenerator as ComponentMapGenerator };
+
+//# sourceMappingURL=ComponentMapGenerator.js.map

package/features/contentModel/ComponentMapGenerator/ComponentMapGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/ComponentMapGenerator/ComponentMapGenerator.js","sources":["../../../../src/features/contentModel/ComponentMapGenerator/ComponentMapGenerator.ts"],"sourcesContent":["import {\n    ComponentMapGenerator as Abstraction,\n    type IComponentMapGenerator\n} from \"./abstractions.js\";\nimport { ModelToAstConverter } from \"../ModelToAstConverter/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsModelAst,\n    CmsModelFieldAstNode,\n    CmsModelFieldAstNodeCollection\n} from \"~/types/index.js\";\n\nclass ComponentMapGeneratorImpl implements IComponentMapGenerator {\n    constructor(private readonly modelToAst: ModelToAstConverter.Interface) {}\n\n    generate(model: CmsModel): Record<string, string> {\n        const ast = this.modelToAst.toAst(model);\n        const map: Record<string, string> = {};\n        this.walkNode(ast, map);\n        return map;\n    }\n\n    private walkNode(node: CmsModelAst | CmsModelFieldAstNode, map: Record<string, string>) {\n        for (const child of node.children) {\n            if (child.type === \"collection\") {\n                this.walkCollection(child, map);\n            } else {\n                this.walkNode(child, map);\n            }\n        }\n    }\n\n    private walkCollection(node: CmsModelFieldAstNodeCollection, map: Record<string, string>) {\n        const { collection } = node;\n        if (collection.componentName && collection.id) {\n            map[collection.id] = collection.componentName;\n        }\n\n        for (const child of node.children) {\n            if (child.type === \"collection\") {\n                this.walkCollection(child, map);\n            } else {\n                this.walkNode(child, map);\n            }\n        }\n    }\n}\n\nexport const ComponentMapGenerator = Abstraction.createImplementation({\n    implementation: ComponentMapGeneratorImpl,\n    dependencies: [ModelToAstConverter]\n});\n"],"names":["ComponentMapGeneratorImpl","modelToAst","model","ast","map","node","child","collection","ComponentMapGenerator","Abstraction","ModelToAstConverter"],"mappings":";;AAYA,MAAMA;IACF,YAA6BC,UAAyC,CAAE;aAA3CA,UAAU,GAAVA;IAA4C;IAEzE,SAASC,KAAe,EAA0B;QAC9C,MAAMC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAACD;QAClC,MAAME,MAA8B,CAAC;QACrC,IAAI,CAAC,QAAQ,CAACD,KAAKC;QACnB,OAAOA;IACX;IAEQ,SAASC,IAAwC,EAAED,GAA2B,EAAE;QACpF,KAAK,MAAME,SAASD,KAAK,QAAQ,CAC7B,IAAIC,AAAe,iBAAfA,MAAM,IAAI,EACV,IAAI,CAAC,cAAc,CAACA,OAAOF;aAE3B,IAAI,CAAC,QAAQ,CAACE,OAAOF;IAGjC;IAEQ,eAAeC,IAAoC,EAAED,GAA2B,EAAE;QACtF,MAAM,EAAEG,UAAU,EAAE,GAAGF;QACvB,IAAIE,WAAW,aAAa,IAAIA,WAAW,EAAE,EACzCH,GAAG,CAACG,WAAW,EAAE,CAAC,GAAGA,WAAW,aAAa;QAGjD,KAAK,MAAMD,SAASD,KAAK,QAAQ,CAC7B,IAAIC,AAAe,iBAAfA,MAAM,IAAI,EACV,IAAI,CAAC,cAAc,CAACA,OAAOF;aAE3B,IAAI,CAAC,QAAQ,CAACE,OAAOF;IAGjC;AACJ;AAEO,MAAMI,8CAAwBC,sBAAAA,oBAAgC,CAAC;IAClE,gBAAgBT;IAChB,cAAc;QAACU;KAAoB;AACvC"}

package/features/contentModel/ComponentMapGenerator/abstractions.d.ts

@@ -0,0 +1,8 @@
+import type { CmsModel } from "../../../types/index.js";
+export interface IComponentMapGenerator {
+    generate(model: CmsModel): Record<string, string>;
+}
+export declare const ComponentMapGenerator: import("@webiny/di").Abstraction<IComponentMapGenerator>;
+export declare namespace ComponentMapGenerator {
+    type Interface = IComponentMapGenerator;
+}

package/features/contentModel/ComponentMapGenerator/abstractions.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const ComponentMapGenerator = createAbstraction("ComponentMapGenerator");
+export { ComponentMapGenerator };
+
+//# sourceMappingURL=abstractions.js.map

package/features/contentModel/ComponentMapGenerator/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/ComponentMapGenerator/abstractions.js","sources":["../../../../src/features/contentModel/ComponentMapGenerator/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\n\nexport interface IComponentMapGenerator {\n    generate(model: CmsModel): Record<string, string>;\n}\n\nexport const ComponentMapGenerator =\n    createAbstraction<IComponentMapGenerator>(\"ComponentMapGenerator\");\n\nexport namespace ComponentMapGenerator {\n    export type Interface = IComponentMapGenerator;\n}\n"],"names":["ComponentMapGenerator","createAbstraction"],"mappings":";AAOO,MAAMA,wBACTC,kBAA0C"}

package/features/contentModel/ComponentMapGenerator/feature.d.ts

@@ -0,0 +1,4 @@
+export declare const ComponentMapGeneratorFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/contentModel/ComponentMapGenerator/feature.js

@@ -0,0 +1,11 @@
+import { createFeature } from "@webiny/feature/api";
+import { ComponentMapGenerator } from "./ComponentMapGenerator.js";
+const ComponentMapGeneratorFeature = createFeature({
+    name: "CmsContentModel/ComponentMapGenerator",
+    register (container) {
+        container.register(ComponentMapGenerator);
+    }
+});
+export { ComponentMapGeneratorFeature };
+
+//# sourceMappingURL=feature.js.map

package/features/contentModel/ComponentMapGenerator/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/ComponentMapGenerator/feature.js","sources":["../../../../src/features/contentModel/ComponentMapGenerator/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { ComponentMapGenerator } from \"./ComponentMapGenerator.js\";\n\nexport const ComponentMapGeneratorFeature = createFeature({\n    name: \"CmsContentModel/ComponentMapGenerator\",\n    register(container) {\n        container.register(ComponentMapGenerator);\n    }\n});\n"],"names":["ComponentMapGeneratorFeature","createFeature","container","ComponentMapGenerator"],"mappings":";;AAGO,MAAMA,+BAA+BC,cAAc;IACtD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

package/features/contentModel/ComponentMapGenerator/index.d.ts

@@ -0,0 +1,2 @@
+export { ComponentMapGenerator } from "./abstractions.js";
+export { ComponentMapGeneratorFeature } from "./feature.js";

package/features/contentModel/ComponentMapGenerator/index.js

@@ -0,0 +1,2 @@
+export { ComponentMapGenerator } from "./abstractions.js";
+export { ComponentMapGeneratorFeature } from "./feature.js";

package/features/contentModel/ContentModelFeature.js

@@ -10,6 +10,9 @@ import { DeleteModelFeature } from "./DeleteModel/feature.js";
 import { GetModelFeature } from "./GetModel/feature.js";
 import { ListModelsFeature } from "./ListModels/feature.js";
 import { ModelToAstConverterFeature } from "./ModelToAstConverter/feature.js";
+import { ValuesSelectionGeneratorFeature } from "./ValuesSelectionGenerator/feature.js";
+import { ComponentMapGeneratorFeature } from "./ComponentMapGenerator/feature.js";
+import { RefModelsGeneratorFeature } from "./RefModelsGenerator/feature.js";
 import { ModelFieldCompressionFeature } from "./ModelFieldCompression/feature.js";
 const ContentModelFeature = createFeature({
     name: "ContentModel",
@@ -18,6 +21,9 @@ const ContentModelFeature = createFeature({
         container.register(PluginModelsProvider).inSingletonScope();
         container.register(ModelsFetcher).inSingletonScope();
         ModelToAstConverterFeature.register(container);
+        ValuesSelectionGeneratorFeature.register(container);
+        ComponentMapGeneratorFeature.register(container);
+        RefModelsGeneratorFeature.register(container);
         ModelFieldCompressionFeature.register(container);
         GetModelFeature.register(container);
         ListModelsFeature.register(container);

package/features/contentModel/ContentModelFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/ContentModelFeature.js","sources":["../../../src/features/contentModel/ContentModelFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { createMemoryCache } from \"~/utils/index.js\";\nimport { PluginModelsProvider } from \"./shared/PluginModelsProvider.js\";\nimport { ModelCache } from \"./shared/abstractions.js\";\nimport { ModelsFetcher } from \"./shared/ModelsFetcher.js\";\nimport { CreateModelFeature } from \"./CreateModel/feature.js\";\nimport { CreateModelFromFeature } from \"./CreateModelFrom/feature.js\";\nimport { UpdateModelFeature } from \"./UpdateModel/feature.js\";\nimport { DeleteModelFeature } from \"./DeleteModel/feature.js\";\nimport { GetModelFeature } from \"./GetModel/feature.js\";\nimport { ListModelsFeature } from \"./ListModels/feature.js\";\nimport { ModelToAstConverterFeature } from \"./ModelToAstConverter/feature.js\";\nimport { ModelFieldCompressionFeature } from \"./ModelFieldCompression/feature.js\";\n\nexport const ContentModelFeature = createFeature({\n    name: \"ContentModel\",\n    register(container) {\n        container.registerInstance(ModelCache, createMemoryCache());\n        container.register(PluginModelsProvider).inSingletonScope();\n        container.register(ModelsFetcher).inSingletonScope();\n\n        ModelToAstConverterFeature.register(container);\n\n        ModelFieldCompressionFeature.register(container);\n\n        // Query features\n        GetModelFeature.register(container);\n        ListModelsFeature.register(container);\n\n        // Command features\n        CreateModelFeature.register(container);\n        CreateModelFromFeature.register(container);\n        UpdateModelFeature.register(container);\n        DeleteModelFeature.register(container);\n    }\n});\n"],"names":["ContentModelFeature","createFeature","container","ModelCache","createMemoryCache","PluginModelsProvider","ModelsFetcher","ModelToAstConverterFeature","ModelFieldCompressionFeature","GetModelFeature","ListModelsFeature","CreateModelFeature","CreateModelFromFeature","UpdateModelFeature","DeleteModelFeature"],"mappings":";;;;;;;;;;;;;AAcO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,gBAAgB,CAACC,YAAYC;QACvCF,UAAU,QAAQ,CAACG,sBAAsB,gBAAgB;QACzDH,UAAU,QAAQ,CAACI,eAAe,gBAAgB;QAElDC,2BAA2B,QAAQ,CAACL;QAEpCM,6BAA6B,QAAQ,CAACN;QAGtCO,gBAAgB,QAAQ,CAACP;QACzBQ,kBAAkB,QAAQ,CAACR;QAG3BS,mBAAmB,QAAQ,CAACT;QAC5BU,uBAAuB,QAAQ,CAACV;QAChCW,mBAAmB,QAAQ,CAACX;QAC5BY,mBAAmB,QAAQ,CAACZ;IAChC;AACJ"}
+{"version":3,"file":"features/contentModel/ContentModelFeature.js","sources":["../../../src/features/contentModel/ContentModelFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { createMemoryCache } from \"~/utils/index.js\";\nimport { PluginModelsProvider } from \"./shared/PluginModelsProvider.js\";\nimport { ModelCache } from \"./shared/abstractions.js\";\nimport { ModelsFetcher } from \"./shared/ModelsFetcher.js\";\nimport { CreateModelFeature } from \"./CreateModel/feature.js\";\nimport { CreateModelFromFeature } from \"./CreateModelFrom/feature.js\";\nimport { UpdateModelFeature } from \"./UpdateModel/feature.js\";\nimport { DeleteModelFeature } from \"./DeleteModel/feature.js\";\nimport { GetModelFeature } from \"./GetModel/feature.js\";\nimport { ListModelsFeature } from \"./ListModels/feature.js\";\nimport { ModelToAstConverterFeature } from \"./ModelToAstConverter/feature.js\";\nimport { ValuesSelectionGeneratorFeature } from \"./ValuesSelectionGenerator/feature.js\";\nimport { ComponentMapGeneratorFeature } from \"./ComponentMapGenerator/feature.js\";\nimport { RefModelsGeneratorFeature } from \"./RefModelsGenerator/feature.js\";\nimport { ModelFieldCompressionFeature } from \"./ModelFieldCompression/feature.js\";\n\nexport const ContentModelFeature = createFeature({\n    name: \"ContentModel\",\n    register(container) {\n        container.registerInstance(ModelCache, createMemoryCache());\n        container.register(PluginModelsProvider).inSingletonScope();\n        container.register(ModelsFetcher).inSingletonScope();\n\n        ModelToAstConverterFeature.register(container);\n        ValuesSelectionGeneratorFeature.register(container);\n        ComponentMapGeneratorFeature.register(container);\n        RefModelsGeneratorFeature.register(container);\n\n        ModelFieldCompressionFeature.register(container);\n\n        // Query features\n        GetModelFeature.register(container);\n        ListModelsFeature.register(container);\n\n        // Command features\n        CreateModelFeature.register(container);\n        CreateModelFromFeature.register(container);\n        UpdateModelFeature.register(container);\n        DeleteModelFeature.register(container);\n    }\n});\n"],"names":["ContentModelFeature","createFeature","container","ModelCache","createMemoryCache","PluginModelsProvider","ModelsFetcher","ModelToAstConverterFeature","ValuesSelectionGeneratorFeature","ComponentMapGeneratorFeature","RefModelsGeneratorFeature","ModelFieldCompressionFeature","GetModelFeature","ListModelsFeature","CreateModelFeature","CreateModelFromFeature","UpdateModelFeature","DeleteModelFeature"],"mappings":";;;;;;;;;;;;;;;;AAiBO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,gBAAgB,CAACC,YAAYC;QACvCF,UAAU,QAAQ,CAACG,sBAAsB,gBAAgB;QACzDH,UAAU,QAAQ,CAACI,eAAe,gBAAgB;QAElDC,2BAA2B,QAAQ,CAACL;QACpCM,gCAAgC,QAAQ,CAACN;QACzCO,6BAA6B,QAAQ,CAACP;QACtCQ,0BAA0B,QAAQ,CAACR;QAEnCS,6BAA6B,QAAQ,CAACT;QAGtCU,gBAAgB,QAAQ,CAACV;QACzBW,kBAAkB,QAAQ,CAACX;QAG3BY,mBAAmB,QAAQ,CAACZ;QAC5Ba,uBAAuB,QAAQ,CAACb;QAChCc,mBAAmB,QAAQ,CAACd;QAC5Be,mBAAmB,QAAQ,CAACf;IAChC;AACJ"}

package/features/contentModel/CreateModel/CreateModelRepository.js

@@ -21,7 +21,8 @@ const getModelId = (model)=>{
         const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();
         if (isModelIdValid) return value;
         return camelCase(value);
-    } else if (name) return camelCase(name.trim());
+    }
+    if (name) return camelCase(name.trim());
     throw new ModelValidationError('There is no "modelId" or "name" passed into the create model method.');
 };
 class CreateModelRepositoryImpl {

package/features/contentModel/CreateModel/CreateModelRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModel/CreateModelRepository.js","sources":["../../../../src/features/contentModel/CreateModel/CreateModelRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache, PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { ListModelsUseCase } from \"~/features/contentModel/ListModels/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsContext, StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    validateExistingModelId,\n    validateModelIdAllowed\n} from \"~/crud/contentModel/validate/modelId.js\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * Generate modelId from model following the exact logic from beforeCreate.ts\n */\nconst getModelId = (model: { modelId?: string; name?: string }): string => {\n    const { modelId, name } = model;\n    const value = modelId ? modelId.trim() : null;\n    if (value) {\n        const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();\n        if (isModelIdValid) {\n            return value;\n        }\n        return camelCase(value);\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new ModelValidationError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`\n    );\n};\n\n/**\n * CreateModelRepository - Validates domain rules and persists a new model.\n *\n * Responsibilities:\n * - Generate modelId from input\n * - Validate modelId is allowed (not in disallowed list)\n * - Validate API name endings\n * - Validate modelId uniqueness (database + plugins)\n * - Validate API name uniqueness (database + plugins)\n * - Validate plugin conflicts\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful create\n */\nclass CreateModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly listModelsUseCase: ListModelsUseCase.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface,\n        private readonly runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialModel: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>> {\n        const model = this.runtimeTenant.assign(initialModel);\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // TODO: this will eventually become part of the Model domain object.\n            const modelId = getModelId(model);\n            model.modelId = modelId;\n\n            // Validate modelId is allowed (not in disallowed list)\n            try {\n                validateModelIdAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({\n                        message: error.message,\n                        data: error.data\n                    })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({\n                        message: error.message,\n                        data: error.data\n                    })\n                );\n            }\n\n            // Check for plugin model conflicts\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n            const pluginModelConflict = pluginModels.find(pm => {\n                return pm.modelId === model.modelId;\n            });\n\n            if (pluginModelConflict) {\n                return Result.fail(\n                    new ModelAlreadyExistsError({\n                        modelId,\n                        message: `Model \"${modelId}\" is already registered via a plugin.`\n                    })\n                );\n            }\n\n            // Get all models for further validation\n            const modelsResult = await this.listModelsUseCase.execute();\n\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const models = modelsResult.value;\n\n            try {\n                /**\n                 * We need to check for the existence of:\n                 * - modelId\n                 * - singularApiName\n                 * - pluralApiName\n                 */\n                for (const existingModel of models) {\n                    validateExistingModelId({\n                        existingModel,\n                        model\n                    });\n                    validateSingularApiName({\n                        existingModel,\n                        model\n                    });\n                    validatePluralApiName({\n                        existingModel,\n                        model\n                    });\n                }\n\n                await validateModelFields({\n                    models,\n                    model,\n                    context: this.cmsContext\n                });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // TODO: ideally, this will eventually be handled by the Model domain object\n            model.tags = ensureTypeTag(model);\n\n            const fields = await this.modelFieldCompression.compress(model.fields);\n\n            // Persist to storage\n            await this.storageOperations.models.create({\n                model: {\n                    ...model,\n                    fields\n                }\n            });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok(model);\n        } catch (error) {\n            console.error(error, error.stack);\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ListModelsUseCase,\n        StorageOperations,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression,\n        RuntimeTenant\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelRepositoryImpl","modelCache","pluginModelsProvider","listModelsUseCase","storageOperations","tenantContext","cmsContext","modelFieldCompression","runtimeTenant","initialModel","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","pluginModels","pluginModelConflict","pm","ModelAlreadyExistsError","modelsResult","ModelPersistenceError","models","existingModel","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","console","CreateModelRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ListModelsUseCase","StorageOperations","TenantContext","CmsContext","ModelFieldCompression","RuntimeTenant"],"mappings":"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"}
+{"version":3,"file":"features/contentModel/CreateModel/CreateModelRepository.js","sources":["../../../../src/features/contentModel/CreateModel/CreateModelRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache, PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { ListModelsUseCase } from \"~/features/contentModel/ListModels/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsContext, StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    validateExistingModelId,\n    validateModelIdAllowed\n} from \"~/crud/contentModel/validate/modelId.js\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * Generate modelId from model following the exact logic from beforeCreate.ts\n */\nconst getModelId = (model: { modelId?: string; name?: string }): string => {\n    const { modelId, name } = model;\n    const value = modelId ? modelId.trim() : null;\n    if (value) {\n        const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();\n        if (isModelIdValid) {\n            return value;\n        }\n        return camelCase(value);\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new ModelValidationError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`\n    );\n};\n\n/**\n * CreateModelRepository - Validates domain rules and persists a new model.\n *\n * Responsibilities:\n * - Generate modelId from input\n * - Validate modelId is allowed (not in disallowed list)\n * - Validate API name endings\n * - Validate modelId uniqueness (database + plugins)\n * - Validate API name uniqueness (database + plugins)\n * - Validate plugin conflicts\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful create\n */\nclass CreateModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly listModelsUseCase: ListModelsUseCase.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface,\n        private readonly runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialModel: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>> {\n        const model = this.runtimeTenant.assign(initialModel);\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // TODO: this will eventually become part of the Model domain object.\n            const modelId = getModelId(model);\n            model.modelId = modelId;\n\n            // Validate modelId is allowed (not in disallowed list)\n            try {\n                validateModelIdAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({\n                        message: error.message,\n                        data: error.data\n                    })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({\n                        message: error.message,\n                        data: error.data\n                    })\n                );\n            }\n\n            // Check for plugin model conflicts\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n            const pluginModelConflict = pluginModels.find(pm => {\n                return pm.modelId === model.modelId;\n            });\n\n            if (pluginModelConflict) {\n                return Result.fail(\n                    new ModelAlreadyExistsError({\n                        modelId,\n                        message: `Model \"${modelId}\" is already registered via a plugin.`\n                    })\n                );\n            }\n\n            // Get all models for further validation\n            const modelsResult = await this.listModelsUseCase.execute();\n\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const models = modelsResult.value;\n\n            try {\n                /**\n                 * We need to check for the existence of:\n                 * - modelId\n                 * - singularApiName\n                 * - pluralApiName\n                 */\n                for (const existingModel of models) {\n                    validateExistingModelId({\n                        existingModel,\n                        model\n                    });\n                    validateSingularApiName({\n                        existingModel,\n                        model\n                    });\n                    validatePluralApiName({\n                        existingModel,\n                        model\n                    });\n                }\n\n                await validateModelFields({\n                    models,\n                    model,\n                    context: this.cmsContext\n                });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // TODO: ideally, this will eventually be handled by the Model domain object\n            model.tags = ensureTypeTag(model);\n\n            const fields = await this.modelFieldCompression.compress(model.fields);\n\n            // Persist to storage\n            await this.storageOperations.models.create({\n                model: {\n                    ...model,\n                    fields\n                }\n            });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok(model);\n        } catch (error) {\n            console.error(error, error.stack);\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ListModelsUseCase,\n        StorageOperations,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression,\n        RuntimeTenant\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelRepositoryImpl","modelCache","pluginModelsProvider","listModelsUseCase","storageOperations","tenantContext","cmsContext","modelFieldCompression","runtimeTenant","initialModel","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","pluginModels","pluginModelConflict","pm","ModelAlreadyExistsError","modelsResult","ModelPersistenceError","models","existingModel","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","console","CreateModelRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ListModelsUseCase","StorageOperations","TenantContext","CmsContext","ModelFieldCompression","RuntimeTenant"],"mappings":"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"}

package/features/contentModel/CreateModelFrom/CreateModelFromRepository.js

@@ -20,7 +20,8 @@ const getModelId = (model)=>{
         const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();
         if (isModelIdValid) return value;
         return camelCase(value);
-    } else if (name) return camelCase(name.trim());
+    }
+    if (name) return camelCase(name.trim());
     throw new ModelValidationError('There is no "modelId" or "name" passed into the create model from method.');
 };
 class CreateModelFromRepositoryImpl {