@webiny/api-headless-cms 6.4.5 → 6.6.0-alpha.0

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory,\n    type ICreatePublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>> {\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\n            createdOn: getDate(latestEntry.createdOn),\n            modifiedOn: getDate(currentDateTime),\n            savedOn: getDate(currentDateTime),\n            firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n            lastPublishedOn: getDate(currentDateTime),\n            createdBy: getIdentity(latestEntry.createdBy),\n            modifiedBy: getIdentity(currentIdentity),\n            savedBy: getIdentity(currentIdentity),\n            firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreatePublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","latestEntry","validateModelEntryDataOrThrow","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EAChCC,WAA8B,EACmB;QACjD,MAAMC,8BAA8B;YAChC,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,QAAQ;YACR,WAAWC,QAAQP,YAAY,SAAS;YACxC,YAAYO,QAAQL;YACpB,SAASK,QAAQL;YACjB,kBAAkBK,QAAQP,YAAY,gBAAgB,EAAEE;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYR,YAAY,SAAS;YAC5C,YAAYQ,YAAYJ;YACxB,SAASI,YAAYJ;YACrB,kBAAkBI,YAAYR,YAAY,gBAAgB,EAAEI;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQR,cAAc,iBAAiB;YAC1D,iBAAiBQ,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,0BAA0BK,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYT,cAAc,iBAAiB;YAC9D,iBAAiBS,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BI,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAASL,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,8DAAgCC,qBAAqB;IAC9D,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory,\n    type ICreatePublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>> {\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\n            createdOn: getDate(latestEntry.createdOn),\n            modifiedOn: getDate(currentDateTime),\n            savedOn: getDate(currentDateTime),\n            firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n            lastPublishedOn: getDate(currentDateTime),\n            createdBy: getIdentity(latestEntry.createdBy),\n            modifiedBy: getIdentity(currentIdentity),\n            savedBy: getIdentity(currentIdentity),\n            firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreatePublishEntryDataFactory = FactoryAbstraction.createImplementation({\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","latestEntry","validateModelEntryDataOrThrow","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;AAaA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EAChCC,WAA8B,EACmB;QACjD,MAAMC,8BAA8B;YAChC,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,QAAQ;YACR,WAAWC,QAAQP,YAAY,SAAS;YACxC,YAAYO,QAAQL;YACpB,SAASK,QAAQL;YACjB,kBAAkBK,QAAQP,YAAY,gBAAgB,EAAEE;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYR,YAAY,SAAS;YAC5C,YAAYQ,YAAYJ;YACxB,SAASI,YAAYJ;YACrB,kBAAkBI,YAAYR,YAAY,gBAAgB,EAAEI;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQR,cAAc,iBAAiB;YAC1D,iBAAiBQ,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,0BAA0BK,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYT,cAAc,iBAAiB;YAC9D,iBAAiBS,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BI,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAASL,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,8DAAgCC,8BAAAA,oBAAuC,CAAC;IACjF,gBAAgBf;IAChB,cAAc;QAACgB;QAAYC;KAAgB;AAC/C"}

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

@@ -8,5 +8,7 @@ declare class CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEnt
     constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
     create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<ICreateRepublishEntryDataResponse<TValues>>;
 }
-export declare const CreateRepublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateRepublishEntryDataFactoryImpl>;
+export declare const CreateRepublishEntryDataFactory: typeof CreateRepublishEntryDataFactoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<ICreateRepublishEntryDataFactory>;
+};
 export {};

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

@@ -1,4 +1,3 @@
-import { createImplementation } from "@webiny/feature/api";
 import { CreateRepublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
@@ -49,8 +48,7 @@ class CreateRepublishEntryDataFactoryImpl {
         };
     }
 }
-const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = createImplementation({
-    abstraction: CreateRepublishEntryDataFactory,
+const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = CreateRepublishEntryDataFactory.createImplementation({
     implementation: CreateRepublishEntryDataFactoryImpl,
     dependencies: [
         CmsContext,

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory,\n    type ICreateRepublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>> {\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity)!,\n            modifiedBy: getIdentity(currentIdentity),\n            firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n            lastPublishedOn: getDate(currentDateTime),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity)!,\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACmB;QACnD,MAAMC,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,kBAAkBG,QAAQR,cAAc,gBAAgB,EAAEG;YAC1D,kBAAkBM,YAAYT,cAAc,gBAAgB,EAAEK;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BG,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,0BAA0BM,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASD,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory,\n    type ICreateRepublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>> {\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity)!,\n            modifiedBy: getIdentity(currentIdentity),\n            firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n            lastPublishedOn: getDate(currentDateTime),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity)!,\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = FactoryAbstraction.createImplementation({\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;AAaA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACmB;QACnD,MAAMC,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,kBAAkBG,QAAQR,cAAc,gBAAgB,EAAEG;YAC1D,kBAAkBM,YAAYT,cAAc,gBAAgB,EAAEK;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BG,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,0BAA0BM,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASD,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,gCAAAA,oBAAuC,CAAC;IACnF,gBAAgBf;IAChB,cAAc;QAACgB;QAAYC;KAAgB;AAC/C"}

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

@@ -6,5 +6,7 @@ declare class CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEnt
     constructor(identityContext: IdentityContext.Interface);
     create<TValues extends CmsEntryValues = CmsEntryValues>(originalEntry: CmsEntry<TValues>): Promise<ICreateUnpublishEntryDataResponse<TValues>>;
 }
-export declare const CreateUnpublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateUnpublishEntryDataFactoryImpl>;
+export declare const CreateUnpublishEntryDataFactory: typeof CreateUnpublishEntryDataFactoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<ICreateUnpublishEntryDataFactory>;
+};
 export {};

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

@@ -1,4 +1,3 @@
-import { createImplementation } from "@webiny/feature/api";
 import { CreateUnpublishEntryDataFactory } from "./abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { STATUS_UNPUBLISHED } from "../statuses.js";
@@ -29,8 +28,7 @@ class CreateUnpublishEntryDataFactoryImpl {
         };
     }
 }
-const CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory = createImplementation({
-    abstraction: CreateUnpublishEntryDataFactory,
+const CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory = CreateUnpublishEntryDataFactory.createImplementation({
     implementation: CreateUnpublishEntryDataFactoryImpl,
     dependencies: [
         IdentityContext

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory,\n    type ICreateUnpublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(private readonly identityContext: IdentityContext.Interface) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateUnpublishEntryDataResponse<TValues>> {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity),\n            modifiedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            live: null\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [IdentityContext]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","identityContext","originalEntry","currentDateTime","Date","currentIdentity","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","createImplementation","FactoryAbstraction","IdentityContext"],"mappings":";;;;;;AAYA,MAAMA;IACF,YAAoCC,eAA0C,CAAE;aAA5CA,eAAe,GAAfA;IAA6C;IAEjF,MAAa,OACTC,aAAgC,EACmB;QACnD,MAAMC,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,MAAM;QACV;QAEA,OAAO;YAAEC;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBZ;IAChB,cAAc;QAACa;KAAgB;AACnC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory,\n    type ICreateUnpublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(private readonly identityContext: IdentityContext.Interface) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateUnpublishEntryDataResponse<TValues>> {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity),\n            modifiedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            live: null\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = FactoryAbstraction.createImplementation({\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [IdentityContext]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","identityContext","originalEntry","currentDateTime","Date","currentIdentity","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","FactoryAbstraction","IdentityContext"],"mappings":";;;;;AAWA,MAAMA;IACF,YAAoCC,eAA0C,CAAE;aAA5CA,eAAe,GAAfA;IAA6C;IAEjF,MAAa,OACTC,aAAgC,EACmB;QACnD,MAAMC,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,MAAM;QACV;QAEA,OAAO;YAAEC;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,gCAAAA,oBAAuC,CAAC;IACnF,gBAAgBX;IAChB,cAAc;QAACY;KAAgB;AACnC"}

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

@@ -8,5 +8,7 @@ declare class UpdateEntryDataFactoryImpl implements IUpdateEntryDataFactory {
     constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
     create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, rawInput: UpdateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: UpdateCmsEntryOptionsInput): Promise<IUpdateEntryDataResponse<TValues>>;
 }
-export declare const UpdateEntryDataFactory: import("@webiny/di").Implementation<typeof UpdateEntryDataFactoryImpl>;
+export declare const UpdateEntryDataFactory: typeof UpdateEntryDataFactoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IUpdateEntryDataFactory>;
+};
 export {};

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/ContentModelFeature.js

@@ -10,6 +10,7 @@ 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 { ModelFieldCompressionFeature } from "./ModelFieldCompression/feature.js";
 const ContentModelFeature = createFeature({
     name: "ContentModel",
@@ -18,6 +19,7 @@ const ContentModelFeature = createFeature({
         container.register(PluginModelsProvider).inSingletonScope();
         container.register(ModelsFetcher).inSingletonScope();
         ModelToAstConverterFeature.register(container);
+        ValuesSelectionGeneratorFeature.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 { 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\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","ModelFieldCompressionFeature","GetModelFeature","ListModelsFeature","CreateModelFeature","CreateModelFromFeature","UpdateModelFeature","DeleteModelFeature"],"mappings":";;;;;;;;;;;;;;AAeO,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;QAEzCO,6BAA6B,QAAQ,CAACP;QAGtCQ,gBAAgB,QAAQ,CAACR;QACzBS,kBAAkB,QAAQ,CAACT;QAG3BU,mBAAmB,QAAQ,CAACV;QAC5BW,uBAAuB,QAAQ,CAACX;QAChCY,mBAAmB,QAAQ,CAACZ;QAC5Ba,mBAAmB,QAAQ,CAACb;IAChC;AACJ"}

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

@@ -2,7 +2,8 @@ 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";
@@ -24,11 +25,11 @@ 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;
-    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, listModelsUseCase: ListModelsUseCase.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
+    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 & {

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";
@@ -25,11 +26,11 @@ 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){
+    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;
@@ -96,7 +97,7 @@ 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
@@ -116,7 +117,7 @@ const CreateModelRepository_CreateModelRepository = CreateModelRepository.create
         ModelCache,
         PluginModelsProvider,
         ListModelsUseCase,
-        StorageOperations,
+        CreateModelStorageOperation,
         TenantContext,
         CmsContext,
         ModelFieldCompression

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\";\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    ) {}\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.storageOperations.models.create({\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        StorageOperations,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelRepositoryImpl","modelCache","pluginModelsProvider","listModelsUseCase","storageOperations","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","StorageOperations","TenantContext","CmsContext","ModelFieldCompression"],"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/CreateModelFrom/CreateModelFromRepository.d.ts

@@ -1,7 +1,8 @@
 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";
@@ -23,11 +24,11 @@ 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;
-    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
+    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 & {

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";
@@ -24,11 +25,11 @@ 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){
+    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;
@@ -99,7 +100,7 @@ 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
@@ -118,7 +119,7 @@ const CreateModelFromRepository_CreateModelFromRepository = CreateModelFromRepos
         ModelCache,
         PluginModelsProvider,
         ModelsFetcher,
-        StorageOperations,
+        CreateModelStorageOperation,
         TenantContext,
         CmsContext,
         ModelFieldCompression

package/features/contentModel/CreateModelFrom/CreateModelFromRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromRepository.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport {\n    ModelCache,\n    ModelsFetcher,\n    PluginModelsProvider\n} from \"~/features/contentModel/shared/abstractions.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 { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.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 from method.`\n    );\n};\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned 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 CreateModelFromRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly modelsFetcher: ModelsFetcher.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    ) {}\n\n    async execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Generate modelId using the exact logic from beforeCreate.ts\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({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate modelId uniqueness (database)\n            const modelsResult = await this.modelsFetcher.fetchAll();\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const existingModel = modelsResult.value.find(m => m.modelId === modelId);\n            if (existingModel) {\n                return Result.fail(new ModelAlreadyExistsError({ modelId }));\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 (\n                    pm.modelId === model.modelId ||\n                    pm.singularApiName === model.singularApiName ||\n                    pm.pluralApiName === model.pluralApiName\n                );\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            const models = modelsResult.value;\n\n            try {\n                // Validate uniqueness\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                // Validate model fields\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            // Ensure type tags\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();\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelFromRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelFromRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ModelsFetcher,\n        StorageOperations,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelFromRepositoryImpl","modelCache","pluginModelsProvider","modelsFetcher","storageOperations","tenantContext","cmsContext","modelFieldCompression","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","modelsResult","ModelPersistenceError","existingModel","m","ModelAlreadyExistsError","pluginModels","pluginModelConflict","pm","models","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","CreateModelFromRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ModelsFetcher","StorageOperations","TenantContext","CmsContext","ModelFieldCompression"],"mappings":"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"}
+{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromRepository.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport {\n    ModelCache,\n    ModelsFetcher,\n    PluginModelsProvider\n} from \"~/features/contentModel/shared/abstractions.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 { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.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 from method.`\n    );\n};\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned 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 CreateModelFromRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly modelsFetcher: ModelsFetcher.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            // Generate modelId using the exact logic from beforeCreate.ts\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({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate modelId uniqueness (database)\n            const modelsResult = await this.modelsFetcher.fetchAll();\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const existingModel = modelsResult.value.find(m => m.modelId === modelId);\n            if (existingModel) {\n                return Result.fail(new ModelAlreadyExistsError({ modelId }));\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 (\n                    pm.modelId === model.modelId ||\n                    pm.singularApiName === model.singularApiName ||\n                    pm.pluralApiName === model.pluralApiName\n                );\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            const models = modelsResult.value;\n\n            try {\n                // Validate uniqueness\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                // Validate model fields\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            // Ensure type tags\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            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelFromRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelFromRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ModelsFetcher,\n        CreateModelStorageOperation,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelFromRepositoryImpl","modelCache","pluginModelsProvider","modelsFetcher","createModel","tenantContext","cmsContext","modelFieldCompression","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","modelsResult","ModelPersistenceError","existingModel","m","ModelAlreadyExistsError","pluginModels","pluginModelConflict","pm","models","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","CreateModelFromRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ModelsFetcher","CreateModelStorageOperation","TenantContext","CmsContext","ModelFieldCompression"],"mappings":";;;;;;;;;;;;;;;AA+BA,MAAMA,aAAa,CAACC;IAChB,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAGF;IAC1B,MAAMG,QAAQF,UAAUA,QAAQ,IAAI,KAAK;IACzC,IAAIE,OAAO;QACP,MAAMC,iBAAiBC,UAAUF,OAAO,WAAW,OAAOA,MAAM,WAAW;QAC3E,IAAIC,gBACA,OAAOD;QAEX,OAAOE,UAAUF;IACrB;IAAO,IAAID,MACP,OAAOG,UAAUH,KAAK,IAAI;IAE9B,MAAM,IAAII,qBACN;AAER;AAgBA,MAAMC;IACF,YACqBC,UAAgC,EAChCC,oBAAoD,EACpDC,aAAsC,EACtCC,WAAkD,EAClDC,aAAsC,EACtCC,UAAgC,EAChCC,qBAAsD,CACzE;aAPmBN,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,aAAa,GAAbA;aACAC,WAAW,GAAXA;aACAC,aAAa,GAAbA;aACAC,UAAU,GAAVA;aACAC,qBAAqB,GAArBA;IAClB;IAEH,MAAM,QAAQd,KAAe,EAAsD;QAC/E,IAAI;YACA,MAAMe,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,MAAMd,UAAUF,WAAWC;YAC3BA,MAAM,OAAO,GAAGC;YAGhB,IAAI;gBACAe,uBAAuB;oBAAEhB;gBAAM;YACnC,EAAE,OAAOiB,OAAO;gBACZ,OAAOC,OAAO,IAAI,CACd,IAAIZ,qBAAqB;oBAAE,SAASW,MAAM,OAAO;oBAAE,MAAMA,MAAM,IAAI;gBAAC;YAE5E;YAGA,IAAI;gBACAE,sBAAsB;oBAAEnB;gBAAM;YAClC,EAAE,OAAOiB,OAAO;gBACZ,OAAOC,OAAO,IAAI,CACd,IAAIZ,qBAAqB;oBAAE,SAASW,MAAM,OAAO;oBAAE,MAAMA,MAAM,IAAI;gBAAC;YAE5E;YAGA,MAAMG,eAAe,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ;YACtD,IAAIA,aAAa,MAAM,IACnB,OAAOF,OAAO,IAAI,CAAC,IAAIG,sBAAsBD,aAAa,KAAK;YAGnE,MAAME,gBAAgBF,aAAa,KAAK,CAAC,IAAI,CAACG,CAAAA,IAAKA,EAAE,OAAO,KAAKtB;YACjE,IAAIqB,eACA,OAAOJ,OAAO,IAAI,CAAC,IAAIM,wBAAwB;gBAAEvB;YAAQ;YAI7D,MAAMwB,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAACV,OAAO,EAAE;YACnE,MAAMW,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAEtCA,GAAG,OAAO,KAAK3B,MAAM,OAAO,IAC5B2B,GAAG,eAAe,KAAK3B,MAAM,eAAe,IAC5C2B,GAAG,aAAa,KAAK3B,MAAM,aAAa;YAIhD,IAAI0B,qBACA,OAAOR,OAAO,IAAI,CACd,IAAIM,wBAAwB;gBACxBvB;gBACA,SAAS,CAAC,OAAO,EAAEA,QAAQ,qCAAqC,CAAC;YACrE;YAIR,MAAM2B,SAASR,aAAa,KAAK;YAEjC,IAAI;gBAEA,KAAK,MAAME,iBAAiBM,OAAQ;oBAChCC,wBAAwB;wBACpBP;wBACAtB;oBACJ;oBACA8B,wBAAwB;wBACpBR;wBACAtB;oBACJ;oBACA+B,sBAAsB;wBAClBT;wBACAtB;oBACJ;gBACJ;gBAGA,MAAMgC,oBAAoB;oBACtBJ;oBACA5B;oBACA,SAAS,IAAI,CAAC,UAAU;gBAC5B;YACJ,EAAE,OAAOiB,OAAO;gBACZ,OAAOC,OAAO,IAAI,CACd,IAAIZ,qBAAqB;oBAAE,SAASW,MAAM,OAAO;oBAAE,MAAMA,MAAM,IAAI;gBAAC;YAE5E;YAGAjB,MAAM,IAAI,GAAGiC,cAAcjC;YAE3B,MAAMkC,SAAS,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAClC,MAAM,MAAM;YAGrE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAC3B,OAAO;oBACH,GAAGA,KAAK;oBACRkC;gBACJ;YACJ;YAGA,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOhB,OAAO,EAAE;QACpB,EAAE,OAAOD,OAAO;YACZ,OAAOC,OAAO,IAAI,CAAC,IAAIG,sBAAsBJ;QACjD;IACJ;AACJ;AAEO,MAAMkB,sDAA4BC,0BAAAA,oBAA0C,CAAC;IAChF,gBAAgB7B;IAChB,cAAc;QACV8B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModel/DeleteModel/DeleteModelRepository.d.ts

@@ -1,7 +1,7 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteModelRepository as RepositoryAbstraction } from "./abstractions.js";
 import { ModelCache, ModelsFetcher } from "../../../features/contentModel/shared/abstractions.js";
-import { StorageOperations } from "../../../features/shared/abstractions.js";
+import { DeleteModelStorageOperation } from "../../../features/shared/storageOperations/model/DeleteModelStorageOperation.js";
 import type { CmsModel } from "../../../types/index.js";
 /**
  * DeleteModelRepository - Validates and deletes a model from storage.
@@ -16,8 +16,8 @@ import type { CmsModel } from "../../../types/index.js";
 declare class DeleteModelRepositoryImpl implements RepositoryAbstraction.Interface {
     private modelCache;
     private modelsFetcher;
-    private storageOperations;
-    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface);
+    private deleteModel;
+    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, deleteModel: DeleteModelStorageOperation.Interface);
     execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const DeleteModelRepository: typeof DeleteModelRepositoryImpl & {

package/features/contentModel/DeleteModel/DeleteModelRepository.js

@@ -2,19 +2,19 @@ import { Result } from "@webiny/feature/api";
 import { DeleteModelRepository } from "./abstractions.js";
 import { ModelCache, ModelsFetcher } from "../shared/abstractions.js";
 import { ModelCannotDeleteCodeModelError, ModelPersistenceError } from "../../../domain/contentModel/errors.js";
-import { StorageOperations } from "../../shared/abstractions.js";
+import { DeleteModelStorageOperation } from "../../shared/storageOperations/model/DeleteModelStorageOperation.js";
 class DeleteModelRepositoryImpl {
-    constructor(modelCache, modelsFetcher, storageOperations){
+    constructor(modelCache, modelsFetcher, deleteModel){
         this.modelCache = modelCache;
         this.modelsFetcher = modelsFetcher;
-        this.storageOperations = storageOperations;
+        this.deleteModel = deleteModel;
     }
     async execute(model) {
         try {
             const existingModelResult = await this.modelsFetcher.fetchById(model.modelId);
             if (existingModelResult.isFail()) return Result.fail(new ModelPersistenceError(existingModelResult.error));
             if (existingModelResult.value.isPlugin) return Result.fail(new ModelCannotDeleteCodeModelError(model.modelId));
-            await this.storageOperations.models.delete({
+            await this.deleteModel.execute({
                 model
             });
             this.modelCache.clear();
@@ -29,7 +29,7 @@ const DeleteModelRepository_DeleteModelRepository = DeleteModelRepository.create
     dependencies: [
         ModelCache,
         ModelsFetcher,
-        StorageOperations
+        DeleteModelStorageOperation
     ]
 });
 export { DeleteModelRepository_DeleteModelRepository as DeleteModelRepository };

package/features/contentModel/DeleteModel/DeleteModelRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/DeleteModel/DeleteModelRepository.js","sources":["../../../../src/features/contentModel/DeleteModel/DeleteModelRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache, ModelsFetcher } from \"~/features/contentModel/shared/abstractions.js\";\nimport {\n    ModelCannotDeleteCodeModelError,\n    ModelPersistenceError\n} from \"~/domain/contentModel/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport type { CmsModel } from \"~/types/index.js\";\n\n/**\n * DeleteModelRepository - Validates and deletes a model from storage.\n *\n * Responsibilities:\n * - Validate model is not defined via plugin (core domain rule)\n * - Delete from storage\n * - Clear ModelCache after successful deletion\n *\n * Note: Entry validation and cleanup is handled by decorator\n */\nclass DeleteModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private modelCache: ModelCache.Interface,\n        private modelsFetcher: ModelsFetcher.Interface,\n        private storageOperations: StorageOperations.Interface\n    ) {}\n\n    async execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if this is a plugin model\n            const existingModelResult = await this.modelsFetcher.fetchById(model.modelId);\n            if (existingModelResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(existingModelResult.error));\n            }\n\n            if (existingModelResult.value.isPlugin) {\n                return Result.fail(new ModelCannotDeleteCodeModelError(model.modelId));\n            }\n\n            // Delete from storage\n            await this.storageOperations.models.delete({ model });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteModelRepositoryImpl,\n    dependencies: [ModelCache, ModelsFetcher, StorageOperations]\n});\n"],"names":["DeleteModelRepositoryImpl","modelCache","modelsFetcher","storageOperations","model","existingModelResult","Result","ModelPersistenceError","ModelCannotDeleteCodeModelError","error","DeleteModelRepository","RepositoryAbstraction","ModelCache","ModelsFetcher","StorageOperations"],"mappings":";;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,aAAsC,EACtCC,iBAA8C,CACxD;aAHUF,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YAEA,MAAMC,sBAAsB,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAACD,MAAM,OAAO;YAC5E,IAAIC,oBAAoB,MAAM,IAC1B,OAAOC,OAAO,IAAI,CAAC,IAAIC,sBAAsBF,oBAAoB,KAAK;YAG1E,IAAIA,oBAAoB,KAAK,CAAC,QAAQ,EAClC,OAAOC,OAAO,IAAI,CAAC,IAAIE,gCAAgCJ,MAAM,OAAO;YAIxE,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOE,OAAO,EAAE;QACpB,EAAE,OAAOG,OAAO;YACZ,OAAOH,OAAO,IAAI,CAAC,IAAIC,sBAAsBE;QACjD;IACJ;AACJ;AAEO,MAAMC,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBX;IAChB,cAAc;QAACY;QAAYC;QAAeC;KAAkB;AAChE"}
+{"version":3,"file":"features/contentModel/DeleteModel/DeleteModelRepository.js","sources":["../../../../src/features/contentModel/DeleteModel/DeleteModelRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache, ModelsFetcher } from \"~/features/contentModel/shared/abstractions.js\";\nimport {\n    ModelCannotDeleteCodeModelError,\n    ModelPersistenceError\n} from \"~/domain/contentModel/errors.js\";\nimport { DeleteModelStorageOperation } from \"~/features/shared/storageOperations/model/DeleteModelStorageOperation.js\";\nimport type { CmsModel } from \"~/types/index.js\";\n\n/**\n * DeleteModelRepository - Validates and deletes a model from storage.\n *\n * Responsibilities:\n * - Validate model is not defined via plugin (core domain rule)\n * - Delete from storage\n * - Clear ModelCache after successful deletion\n *\n * Note: Entry validation and cleanup is handled by decorator\n */\nclass DeleteModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private modelCache: ModelCache.Interface,\n        private modelsFetcher: ModelsFetcher.Interface,\n        private deleteModel: DeleteModelStorageOperation.Interface\n    ) {}\n\n    async execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if this is a plugin model\n            const existingModelResult = await this.modelsFetcher.fetchById(model.modelId);\n            if (existingModelResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(existingModelResult.error));\n            }\n\n            if (existingModelResult.value.isPlugin) {\n                return Result.fail(new ModelCannotDeleteCodeModelError(model.modelId));\n            }\n\n            // Delete from storage\n            await this.deleteModel.execute({ model });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const DeleteModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteModelRepositoryImpl,\n    dependencies: [ModelCache, ModelsFetcher, DeleteModelStorageOperation]\n});\n"],"names":["DeleteModelRepositoryImpl","modelCache","modelsFetcher","deleteModel","model","existingModelResult","Result","ModelPersistenceError","ModelCannotDeleteCodeModelError","error","DeleteModelRepository","RepositoryAbstraction","ModelCache","ModelsFetcher","DeleteModelStorageOperation"],"mappings":";;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,aAAsC,EACtCC,WAAkD,CAC5D;aAHUF,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,WAAW,GAAXA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YAEA,MAAMC,sBAAsB,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAACD,MAAM,OAAO;YAC5E,IAAIC,oBAAoB,MAAM,IAC1B,OAAOC,OAAO,IAAI,CAAC,IAAIC,sBAAsBF,oBAAoB,KAAK;YAG1E,IAAIA,oBAAoB,KAAK,CAAC,QAAQ,EAClC,OAAOC,OAAO,IAAI,CAAC,IAAIE,gCAAgCJ,MAAM,OAAO;YAIxE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAAEA;YAAM;YAGvC,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOE,OAAO,EAAE;QACpB,EAAE,OAAOG,OAAO;YACZ,OAAOH,OAAO,IAAI,CAAC,IAAIC,sBAAsBE;QACjD;IACJ;AACJ;AAEO,MAAMC,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBX;IAChB,cAAc;QAACY;QAAYC;QAAeC;KAA4B;AAC1E"}

package/features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.d.ts

@@ -13,6 +13,7 @@ declare class DeleteModelWithEntryCleanupImpl implements DeleteModelUseCase.Inte
     private cmsContext;
     private decoratee;
     constructor(cmsContext: CmsContext.Interface, decoratee: DeleteModelUseCase.Interface);
+    private get cms();
     execute(modelId: string): Promise<Result<void, DeleteModelUseCase.Error>>;
     private deleteSingletonEntries;
     private canDelete;