@webiny/api-headless-cms 6.4.11 → 6.6.0-alpha.1

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

@@ -1,4 +1,3 @@
-import { 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";
@@ -27,7 +26,7 @@ class UpdateEntryDataFactoryImpl {
             model,
             values: cleanedValues,
             entry: originalEntry,
-            skipValidators: options?.skipValidators
+            skipValidation: options?.skipValidation
         });
         const mergedValues = {
             ...originalEntry.values,
@@ -95,8 +94,7 @@ class UpdateEntryDataFactoryImpl {
         };
     }
 }
-const UpdateEntryDataFactory_UpdateEntryDataFactory = createImplementation({
-    abstraction: UpdateEntryDataFactory,
+const UpdateEntryDataFactory_UpdateEntryDataFactory = UpdateEntryDataFactory.createImplementation({
     implementation: UpdateEntryDataFactoryImpl,
     dependencies: [
         CmsContext,

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 {\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            skipValidation: options?.skipValidation\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 = FactoryAbstraction.createImplementation({\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","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":"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"}

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.d.ts

@@ -2,11 +2,11 @@ import { Result } from "@webiny/feature/api";
 import { CreateModelRepository as RepositoryAbstraction } from "./abstractions.js";
 import { ModelCache, PluginModelsProvider } from "../../../features/contentModel/shared/abstractions.js";
 import { ListModelsUseCase } from "../../../features/contentModel/ListModels/index.js";
-import { CmsContext, StorageOperations } from "../../../features/shared/abstractions.js";
+import { CmsContext } from "../../../features/shared/abstractions.js";
+import { CreateModelStorageOperation } from "../../../features/shared/storageOperations/model/CreateModelStorageOperation.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import type { CmsModel } from "../../../types/index.js";
 import { ModelFieldCompression } from "../../../features/contentModel/ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * CreateModelRepository - Validates domain rules and persists a new model.
  *
@@ -25,13 +25,12 @@ declare class CreateModelRepositoryImpl implements RepositoryAbstraction.Interfa
     private readonly modelCache;
     private readonly pluginModelsProvider;
     private readonly listModelsUseCase;
-    private readonly storageOperations;
+    private readonly createModel;
     private readonly tenantContext;
     private readonly cmsContext;
     private readonly modelFieldCompression;
-    private readonly runtimeTenant;
-    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, listModelsUseCase: ListModelsUseCase.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface, runtimeTenant: RuntimeTenant.Interface);
-    execute(initialModel: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>>;
+    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, listModelsUseCase: ListModelsUseCase.Interface, createModel: CreateModelStorageOperation.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
+    execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const CreateModelRepository: typeof CreateModelRepositoryImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ICreateModelRepository>;

package/features/contentModel/CreateModel/CreateModelRepository.js

@@ -4,7 +4,8 @@ import { CreateModelRepository } from "./abstractions.js";
 import { ModelCache, PluginModelsProvider } from "../shared/abstractions.js";
 import { ListModelsUseCase } from "../ListModels/index.js";
 import { ModelAlreadyExistsError, ModelPersistenceError, ModelValidationError } from "../../../domain/contentModel/errors.js";
-import { CmsContext, StorageOperations } from "../../shared/abstractions.js";
+import { CmsContext } from "../../shared/abstractions.js";
+import { CreateModelStorageOperation } from "../../shared/storageOperations/model/CreateModelStorageOperation.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { validateExistingModelId, validateModelIdAllowed } from "../../../crud/contentModel/validate/modelId.js";
 import { validateEndingAllowed } from "../../../crud/contentModel/validate/endingAllowed.js";
@@ -13,7 +14,6 @@ import { validateSingularApiName } from "../../../domain/contentModel/validation
 import { validatePluralApiName } from "../../../domain/contentModel/validation/pluralApiName.js";
 import { validateModelFields } from "../../../domain/contentModel/validation/modelFields.js";
 import { ModelFieldCompression } from "../ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 const getModelId = (model)=>{
     const { modelId, name } = model;
     const value = modelId ? modelId.trim() : null;
@@ -26,18 +26,16 @@ const getModelId = (model)=>{
     throw new ModelValidationError('There is no "modelId" or "name" passed into the create model method.');
 };
 class CreateModelRepositoryImpl {
-    constructor(modelCache, pluginModelsProvider, listModelsUseCase, storageOperations, tenantContext, cmsContext, modelFieldCompression, runtimeTenant){
+    constructor(modelCache, pluginModelsProvider, listModelsUseCase, createModel, tenantContext, cmsContext, modelFieldCompression){
         this.modelCache = modelCache;
         this.pluginModelsProvider = pluginModelsProvider;
         this.listModelsUseCase = listModelsUseCase;
-        this.storageOperations = storageOperations;
+        this.createModel = createModel;
         this.tenantContext = tenantContext;
         this.cmsContext = cmsContext;
         this.modelFieldCompression = modelFieldCompression;
-        this.runtimeTenant = runtimeTenant;
     }
-    async execute(initialModel) {
-        const model = this.runtimeTenant.assign(initialModel);
+    async execute(model) {
         try {
             const tenant = this.tenantContext.getTenant();
             const modelId = getModelId(model);
@@ -99,14 +97,14 @@ class CreateModelRepositoryImpl {
             }
             model.tags = ensureTypeTag(model);
             const fields = await this.modelFieldCompression.compress(model.fields);
-            await this.storageOperations.models.create({
+            await this.createModel.execute({
                 model: {
                     ...model,
                     fields
                 }
             });
             this.modelCache.clear();
-            return Result.ok(model);
+            return Result.ok();
         } catch (error) {
             console.error(error, error.stack);
             return Result.fail(new ModelPersistenceError(error));
@@ -119,11 +117,10 @@ const CreateModelRepository_CreateModelRepository = CreateModelRepository.create
         ModelCache,
         PluginModelsProvider,
         ListModelsUseCase,
-        StorageOperations,
+        CreateModelStorageOperation,
         TenantContext,
         CmsContext,
-        ModelFieldCompression,
-        RuntimeTenant
+        ModelFieldCompression
     ]
 });
 export { CreateModelRepository_CreateModelRepository as CreateModelRepository };

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 } from \"~/features/shared/abstractions.js\";\nimport { CreateModelStorageOperation } from \"~/features/shared/storageOperations/model/CreateModelStorageOperation.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\";\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 createModel: CreateModelStorageOperation.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>> {\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.createModel.execute({\n                model: {\n                    ...model,\n                    fields\n                }\n            });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok();\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        CreateModelStorageOperation,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelRepositoryImpl","modelCache","pluginModelsProvider","listModelsUseCase","createModel","tenantContext","cmsContext","modelFieldCompression","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","CreateModelStorageOperation","TenantContext","CmsContext","ModelFieldCompression"],"mappings":"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"}

package/features/contentModel/CreateModel/CreateModelUseCase.js

@@ -69,9 +69,9 @@ class CreateModelUseCaseImpl {
             return Result.fail(result.error);
         }
         await this.eventPublisher.publish(new ModelAfterCreateEvent({
-            model: result.value
+            model
         }));
-        return Result.ok(result.value);
+        return Result.ok(model);
     }
 }
 const CreateModelUseCase_CreateModelUseCase = CreateModelUseCase.createImplementation({

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModel/CreateModelUseCase.js","sources":["../../../../src/features/contentModel/CreateModel/CreateModelUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateModelUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateModelRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { ModelBeforeCreateEvent } from \"./events.js\";\nimport { ModelAfterCreateEvent } from \"./events.js\";\nimport { ModelCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelCreateValidation } from \"~/domain/contentModel/schemas.js\";\nimport { assignModelDefaultFields } from \"~/crud/contentModel/defaultFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateModelUseCase - Core model creation orchestration.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain model object\n * - Assign default fields if requested\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n *\n * Note: This use case is decorated by CreateModelValidator which handles:\n * - ModelId generation\n * - ModelId allowed validation\n * - API name ending validation\n * - Field validation and plugin conflict checks\n */\nclass CreateModelUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateModelRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(input: CmsModelCreateInput): Promise<Result<CmsModel, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessModel({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new ModelNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createModelCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(new ModelValidationError(zodError.message));\n        }\n\n        // Extract defaultFields flag and remove it from data\n        const { defaultFields, ...data } = removeUndefinedValues(validationResult.data);\n\n        // Assign default fields if requested\n        if (defaultFields) {\n            assignModelDefaultFields(data);\n        }\n\n        // Create the domain model object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...data,\n            icon: data.icon ?? null,\n            modelId: data.modelId ?? \"\", // Will be set by repository\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            },\n            description: data.description || \"\",\n            // Fields and layout from data\n            fields: data.fields || [],\n            layout: data.layout || [],\n            // Title/description/image field IDs\n            titleFieldId: data.titleFieldId || \"\",\n            descriptionFieldId: data.descriptionFieldId,\n            imageFieldId: data.imageFieldId\n        };\n\n        // Access control check on the created model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Publish before event\n        await this.eventPublisher.publish(new ModelBeforeCreateEvent({ model, input: data }));\n\n        // Persist via repository (repository will validate and set modelId)\n        const result = await this.repository.execute(model);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelCreateErrorEvent({\n                    input,\n                    model,\n                    error: result.error\n                })\n            );\n            return Result.fail(result.error);\n        }\n\n        // Publish after event\n        await this.eventPublisher.publish(\n            new ModelAfterCreateEvent({\n                model: result.value\n            })\n        );\n\n        return Result.ok(result.value);\n    }\n}\n\nexport const CreateModelUseCase = UseCaseAbstraction.createImplementation({\n    implementation: CreateModelUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateModelRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateModelUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","input","canAccess","Result","ModelNotAuthorizedError","validationResult","createModelCreateValidation","zodError","createZodError","ModelValidationError","defaultFields","data","removeUndefinedValues","assignModelDefaultFields","identity","tenant","model","Date","canAccessModel","ModelBeforeCreateEvent","result","ModelCreateErrorEvent","ModelAfterCreateEvent","CreateModelUseCase","UseCaseAbstraction","EventPublisher","CreateModelRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;;AAoCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CAAC,IAAIM,qBAAqBF,SAAS,OAAO;QAChE;QAGA,MAAM,EAAEG,aAAa,EAAE,GAAGC,MAAM,GAAGC,sBAAsBP,iBAAiB,IAAI;QAG9E,IAAIK,eACAG,yBAAyBF;QAI7B,MAAMG,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACP,MAAMA,KAAK,IAAI,IAAI;YACnB,SAASA,KAAK,OAAO,IAAI;YACzB,QAAQI,OAAO,EAAE;YACjB,WAAW,IAAIE,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIH,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;YACA,aAAaH,KAAK,WAAW,IAAI;YAEjC,QAAQA,KAAK,MAAM,IAAI,EAAE;YACzB,QAAQA,KAAK,MAAM,IAAI,EAAE;YAEzB,cAAcA,KAAK,YAAY,IAAI;YACnC,oBAAoBA,KAAK,kBAAkB;YAC3C,cAAcA,KAAK,YAAY;QACnC;QAGA,MAAMO,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOf,OAAO,IAAI,CAACC,wBAAwB,SAAS,CAACY;QAIzD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIG,uBAAuB;YAAEH;YAAO,OAAOL;QAAK;QAGlF,MAAMS,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;QAC7C,IAAII,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;gBACtBpB;gBACAe;gBACA,OAAOI,OAAO,KAAK;YACvB;YAEJ,OAAOjB,OAAO,IAAI,CAACiB,OAAO,KAAK;QACnC;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,sBAAsB;YACtB,OAAOF,OAAO,KAAK;QACvB;QAGJ,OAAOjB,OAAO,EAAE,CAACiB,OAAO,KAAK;IACjC;AACJ;AAEO,MAAMG,wCAAqBC,mBAAAA,oBAAuC,CAAC;IACtE,gBAAgB7B;IAChB,cAAc;QACV8B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModel/CreateModel/CreateModelUseCase.js","sources":["../../../../src/features/contentModel/CreateModel/CreateModelUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateModelUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateModelRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { ModelBeforeCreateEvent } from \"./events.js\";\nimport { ModelAfterCreateEvent } from \"./events.js\";\nimport { ModelCreateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelCreateValidation } from \"~/domain/contentModel/schemas.js\";\nimport { assignModelDefaultFields } from \"~/crud/contentModel/defaultFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelCreateInput } from \"~/types/index.js\";\n\n/**\n * CreateModelUseCase - Core model creation orchestration.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Create domain model object\n * - Assign default fields if requested\n * - Access control checks\n * - Publish before event\n * - Delegate to repository\n * - Publish after event or error event\n *\n * Note: This use case is decorated by CreateModelValidator which handles:\n * - ModelId generation\n * - ModelId allowed validation\n * - API name ending validation\n * - Field validation and plugin conflict checks\n */\nclass CreateModelUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateModelRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(input: CmsModelCreateInput): Promise<Result<CmsModel, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessModel({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new ModelNotAuthorizedError());\n        }\n\n        // Validate input\n        const validationResult = await createModelCreateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(new ModelValidationError(zodError.message));\n        }\n\n        // Extract defaultFields flag and remove it from data\n        const { defaultFields, ...data } = removeUndefinedValues(validationResult.data);\n\n        // Assign default fields if requested\n        if (defaultFields) {\n            assignModelDefaultFields(data);\n        }\n\n        // Create the domain model object\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...data,\n            icon: data.icon ?? null,\n            modelId: data.modelId ?? \"\", // Will be set by repository\n            tenant: tenant.id,\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            },\n            description: data.description || \"\",\n            // Fields and layout from data\n            fields: data.fields || [],\n            layout: data.layout || [],\n            // Title/description/image field IDs\n            titleFieldId: data.titleFieldId || \"\",\n            descriptionFieldId: data.descriptionFieldId,\n            imageFieldId: data.imageFieldId\n        };\n\n        // Access control check on the created model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Publish before event\n        await this.eventPublisher.publish(new ModelBeforeCreateEvent({ model, input: data }));\n\n        // Persist via repository (repository will validate and set modelId)\n        const result = await this.repository.execute(model);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelCreateErrorEvent({\n                    input,\n                    model,\n                    error: result.error\n                })\n            );\n            return Result.fail(result.error);\n        }\n\n        // Publish after event\n        await this.eventPublisher.publish(new ModelAfterCreateEvent({ model }));\n\n        return Result.ok(model);\n    }\n}\n\nexport const CreateModelUseCase = UseCaseAbstraction.createImplementation({\n    implementation: CreateModelUseCaseImpl,\n    dependencies: [\n        EventPublisher,\n        CreateModelRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateModelUseCaseImpl","eventPublisher","repository","accessControl","tenantContext","identityContext","input","canAccess","Result","ModelNotAuthorizedError","validationResult","createModelCreateValidation","zodError","createZodError","ModelValidationError","defaultFields","data","removeUndefinedValues","assignModelDefaultFields","identity","tenant","model","Date","canAccessModel","ModelBeforeCreateEvent","result","ModelCreateErrorEvent","ModelAfterCreateEvent","CreateModelUseCase","UseCaseAbstraction","EventPublisher","CreateModelRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;;AAoCA,MAAMA;IACF,YACYC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aALUJ,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QAAQC,KAA0B,EAAuD;QAE3F,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,mBAAmB,MAAMC,8BAA8B,cAAc,CAACL;QAC5E,IAAI,CAACI,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOF,OAAO,IAAI,CAAC,IAAIM,qBAAqBF,SAAS,OAAO;QAChE;QAGA,MAAM,EAAEG,aAAa,EAAE,GAAGC,MAAM,GAAGC,sBAAsBP,iBAAiB,IAAI;QAG9E,IAAIK,eACAG,yBAAyBF;QAI7B,MAAMG,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,QAAkB;YACpB,GAAGL,IAAI;YACP,MAAMA,KAAK,IAAI,IAAI;YACnB,SAASA,KAAK,OAAO,IAAI;YACzB,QAAQI,OAAO,EAAE;YACjB,WAAW,IAAIE,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,WAAW;gBACP,IAAIH,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;YACA,aAAaH,KAAK,WAAW,IAAI;YAEjC,QAAQA,KAAK,MAAM,IAAI,EAAE;YACzB,QAAQA,KAAK,MAAM,IAAI,EAAE;YAEzB,cAAcA,KAAK,YAAY,IAAI;YACnC,oBAAoBA,KAAK,kBAAkB;YAC3C,cAAcA,KAAK,YAAY;QACnC;QAGA,MAAMO,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEF;YAAO,KAAK;QAAI;QACjF,IAAI,CAACE,gBACD,OAAOf,OAAO,IAAI,CAACC,wBAAwB,SAAS,CAACY;QAIzD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIG,uBAAuB;YAAEH;YAAO,OAAOL;QAAK;QAGlF,MAAMS,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACJ;QAC7C,IAAII,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;gBACtBpB;gBACAe;gBACA,OAAOI,OAAO,KAAK;YACvB;YAEJ,OAAOjB,OAAO,IAAI,CAACiB,OAAO,KAAK;QACnC;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIE,sBAAsB;YAAEN;QAAM;QAEpE,OAAOb,OAAO,EAAE,CAACa;IACrB;AACJ;AAEO,MAAMO,wCAAqBC,mBAAAA,oBAAuC,CAAC;IACtE,gBAAgB7B;IAChB,cAAc;QACV8B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

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

@@ -30,7 +30,7 @@ export declare namespace CreateModelUseCase {
  * CreateModelRepository - Validates domain rules and persists a new model to storage.
  */
 export interface ICreateModelRepository {
-    execute(model: CmsModel): Promise<Result<CmsModel, RepositoryError>>;
+    execute(model: CmsModel): Promise<Result<void, RepositoryError>>;
 }
 export interface ICreateModelRepositoryErrors {
     alreadyExists: ModelAlreadyExistsError;

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModel/abstractions.js","sources":["../../../../src/features/contentModel/CreateModel/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelCreateInput } from \"~/types/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelNotAuthorizedError,\n    type ModelPersistenceError,\n    type ModelSlugTakenError,\n    type ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateModel Use Case\n */\nexport interface ICreateModelUseCase {\n    execute(input: CmsModelCreateInput): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface ICreateModelUseCaseErrors {\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    slugTaken: ModelSlugTakenError;\n    alreadyExists: ModelAlreadyExistsError;\n    persistence: ModelPersistenceError;\n    groupNotFound: GroupNotFoundError; // Reused from Group domain\n    groupNotAccessible: GroupNotAuthorizedError; // Reused from Group domain\n}\n\ntype UseCaseError = ICreateModelUseCaseErrors[keyof ICreateModelUseCaseErrors];\n\n/** Create a new content model. */\nexport const CreateModelUseCase = createAbstraction<ICreateModelUseCase>(\"CreateModelUseCase\");\n\nexport namespace CreateModelUseCase {\n    export type Interface = ICreateModelUseCase;\n    export type Input = CmsModelCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * CreateModelRepository - Validates domain rules and persists a new model to storage.\n */\nexport interface ICreateModelRepository {\n    execute(model: CmsModel): Promise<Result<CmsModel, RepositoryError>>;\n}\n\nexport interface ICreateModelRepositoryErrors {\n    alreadyExists: ModelAlreadyExistsError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n}\n\ntype RepositoryError = ICreateModelRepositoryErrors[keyof ICreateModelRepositoryErrors];\n\nexport const CreateModelRepository =\n    createAbstraction<ICreateModelRepository>(\"CreateModelRepository\");\n\nexport namespace CreateModelRepository {\n    export type Interface = ICreateModelRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateModelUseCase","createAbstraction","CreateModelRepository"],"mappings":";AAkCO,MAAMA,qBAAqBC,kBAAuC;AAyBlE,MAAMC,wBACTD,kBAA0C"}
+{"version":3,"file":"features/contentModel/CreateModel/abstractions.js","sources":["../../../../src/features/contentModel/CreateModel/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelCreateInput } from \"~/types/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelNotAuthorizedError,\n    type ModelPersistenceError,\n    type ModelSlugTakenError,\n    type ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateModel Use Case\n */\nexport interface ICreateModelUseCase {\n    execute(input: CmsModelCreateInput): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface ICreateModelUseCaseErrors {\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    slugTaken: ModelSlugTakenError;\n    alreadyExists: ModelAlreadyExistsError;\n    persistence: ModelPersistenceError;\n    groupNotFound: GroupNotFoundError; // Reused from Group domain\n    groupNotAccessible: GroupNotAuthorizedError; // Reused from Group domain\n}\n\ntype UseCaseError = ICreateModelUseCaseErrors[keyof ICreateModelUseCaseErrors];\n\n/** Create a new content model. */\nexport const CreateModelUseCase = createAbstraction<ICreateModelUseCase>(\"CreateModelUseCase\");\n\nexport namespace CreateModelUseCase {\n    export type Interface = ICreateModelUseCase;\n    export type Input = CmsModelCreateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * CreateModelRepository - Validates domain rules and persists a new model to storage.\n */\nexport interface ICreateModelRepository {\n    execute(model: CmsModel): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface ICreateModelRepositoryErrors {\n    alreadyExists: ModelAlreadyExistsError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n}\n\ntype RepositoryError = ICreateModelRepositoryErrors[keyof ICreateModelRepositoryErrors];\n\nexport const CreateModelRepository =\n    createAbstraction<ICreateModelRepository>(\"CreateModelRepository\");\n\nexport namespace CreateModelRepository {\n    export type Interface = ICreateModelRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateModelUseCase","createAbstraction","CreateModelRepository"],"mappings":";AAkCO,MAAMA,qBAAqBC,kBAAuC;AAyBlE,MAAMC,wBACTD,kBAA0C"}

package/features/contentModel/CreateModelFrom/CreateModelFromRepository.d.ts

@@ -1,11 +1,11 @@
 import { Result } from "@webiny/feature/api";
 import { CreateModelFromRepository as RepositoryAbstraction } from "./abstractions.js";
 import { ModelCache, ModelsFetcher, PluginModelsProvider } from "../../../features/contentModel/shared/abstractions.js";
-import { CmsContext, StorageOperations } from "../../../features/shared/abstractions.js";
+import { CmsContext } from "../../../features/shared/abstractions.js";
+import { CreateModelStorageOperation } from "../../../features/shared/storageOperations/model/CreateModelStorageOperation.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import type { CmsModel } from "../../../types/index.js";
 import { ModelFieldCompression } from "../../../features/contentModel/ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * CreateModelFromRepository - Validates domain rules and persists cloned model.
  *
@@ -24,13 +24,12 @@ declare class CreateModelFromRepositoryImpl implements RepositoryAbstraction.Int
     private readonly modelCache;
     private readonly pluginModelsProvider;
     private readonly modelsFetcher;
-    private readonly storageOperations;
+    private readonly createModel;
     private readonly tenantContext;
     private readonly cmsContext;
     private readonly modelFieldCompression;
-    private readonly runtimeTenant;
-    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface, runtimeTenant: RuntimeTenant.Interface);
-    execute(initialModel: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>>;
+    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, modelsFetcher: ModelsFetcher.Interface, createModel: CreateModelStorageOperation.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
+    execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const CreateModelFromRepository: typeof CreateModelFromRepositoryImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ICreateModelFromRepository>;

package/features/contentModel/CreateModelFrom/CreateModelFromRepository.js

@@ -3,7 +3,8 @@ import { Result } from "@webiny/feature/api";
 import { CreateModelFromRepository } from "./abstractions.js";
 import { ModelCache, ModelsFetcher, PluginModelsProvider } from "../shared/abstractions.js";
 import { ModelAlreadyExistsError, ModelPersistenceError, ModelValidationError } from "../../../domain/contentModel/errors.js";
-import { CmsContext, StorageOperations } from "../../shared/abstractions.js";
+import { CmsContext } from "../../shared/abstractions.js";
+import { CreateModelStorageOperation } from "../../shared/storageOperations/model/CreateModelStorageOperation.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { validateExistingModelId, validateModelIdAllowed } from "../../../crud/contentModel/validate/modelId.js";
 import { validateEndingAllowed } from "../../../crud/contentModel/validate/endingAllowed.js";
@@ -12,7 +13,6 @@ import { validatePluralApiName } from "../../../domain/contentModel/validation/p
 import { validateModelFields } from "../../../domain/contentModel/validation/modelFields.js";
 import { ensureTypeTag } from "../../../domain/contentModel/ensureTypeTag.js";
 import { ModelFieldCompression } from "../ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 const getModelId = (model)=>{
     const { modelId, name } = model;
     const value = modelId ? modelId.trim() : null;
@@ -25,18 +25,16 @@ const getModelId = (model)=>{
     throw new ModelValidationError('There is no "modelId" or "name" passed into the create model from method.');
 };
 class CreateModelFromRepositoryImpl {
-    constructor(modelCache, pluginModelsProvider, modelsFetcher, storageOperations, tenantContext, cmsContext, modelFieldCompression, runtimeTenant){
+    constructor(modelCache, pluginModelsProvider, modelsFetcher, createModel, tenantContext, cmsContext, modelFieldCompression){
         this.modelCache = modelCache;
         this.pluginModelsProvider = pluginModelsProvider;
         this.modelsFetcher = modelsFetcher;
-        this.storageOperations = storageOperations;
+        this.createModel = createModel;
         this.tenantContext = tenantContext;
         this.cmsContext = cmsContext;
         this.modelFieldCompression = modelFieldCompression;
-        this.runtimeTenant = runtimeTenant;
     }
-    async execute(initialModel) {
-        const model = this.runtimeTenant.assign(initialModel);
+    async execute(model) {
         try {
             const tenant = this.tenantContext.getTenant();
             const modelId = getModelId(model);
@@ -102,14 +100,14 @@ class CreateModelFromRepositoryImpl {
             }
             model.tags = ensureTypeTag(model);
             const fields = await this.modelFieldCompression.compress(model.fields);
-            await this.storageOperations.models.create({
+            await this.createModel.execute({
                 model: {
                     ...model,
                     fields
                 }
             });
             this.modelCache.clear();
-            return Result.ok(model);
+            return Result.ok();
         } catch (error) {
             return Result.fail(new ModelPersistenceError(error));
         }
@@ -121,11 +119,10 @@ const CreateModelFromRepository_CreateModelFromRepository = CreateModelFromRepos
         ModelCache,
         PluginModelsProvider,
         ModelsFetcher,
-        StorageOperations,
+        CreateModelStorageOperation,
         TenantContext,
         CmsContext,
-        ModelFieldCompression,
-        RuntimeTenant
+        ModelFieldCompression
     ]
 });
 export { CreateModelFromRepository_CreateModelFromRepository as CreateModelFromRepository };