@webiny/api-headless-cms 0.0.0-unstable.e622468070 → 0.0.0-unstable.e6f0dc8ca7

package/features/contentModel/ModelToAstConverter/ModelToAstConverter.d.ts

@@ -1,6 +1,6 @@
 import { ModelToAstConverter as ConverterAbstraction } from "./abstractions.js";
 import type { CmsModel, CmsModelAst } from "../../../types/index.js";
-import { PluginsContainer } from "../../../legacy/abstractions.js";
+import { CmsModelFieldToGraphQLRegistry } from "../../../features/graphql/index.js";
 /**
  * ModelToAstConverter implementation
  *
@@ -8,8 +8,8 @@ import { PluginsContainer } from "../../../legacy/abstractions.js";
  * for converting models to AST representation (used for GraphQL schema generation)
  */
 declare class ModelToAstConverterImpl implements ConverterAbstraction.Interface {
-    private pluginsContainer;
-    constructor(pluginsContainer: PluginsContainer.Interface);
+    private readonly registry;
+    constructor(registry: CmsModelFieldToGraphQLRegistry.Interface);
     toAst(model: CmsModel): CmsModelAst;
 }
 export declare const ModelToAstConverter: typeof ModelToAstConverterImpl & {

package/features/contentModel/ModelToAstConverter/ModelToAstConverter.js

@@ -1,6 +1,6 @@
 import { ModelToAstConverter as ConverterAbstraction } from "./abstractions.js";
-import { CmsModelToAstConverter, CmsModelFieldToAstConverterFromPlugins } from "../../../utils/contentModelAst/index.js";
-import { PluginsContainer } from "../../../legacy/abstractions.js";
+import { CmsModelFieldToAstConverterFromPlugins, CmsModelToAstConverter } from "../../../utils/contentModelAst/index.js";
+import { CmsModelFieldToGraphQLRegistry } from "../../graphql/index.js";
 
 /**
  * ModelToAstConverter implementation
@@ -9,18 +9,18 @@ import { PluginsContainer } from "../../../legacy/abstractions.js";
  * for converting models to AST representation (used for GraphQL schema generation)
  */
 class ModelToAstConverterImpl {
-  constructor(pluginsContainer) {
-    this.pluginsContainer = pluginsContainer;
+  constructor(registry) {
+    this.registry = registry;
   }
   toAst(model) {
-    const fieldTypePlugins = this.pluginsContainer.byType("cms-model-field-to-graphql");
+    const fieldTypePlugins = this.registry.getAll();
     const converter = new CmsModelToAstConverter(new CmsModelFieldToAstConverterFromPlugins(fieldTypePlugins));
     return converter.toAst(model);
   }
 }
 export const ModelToAstConverter = ConverterAbstraction.createImplementation({
   implementation: ModelToAstConverterImpl,
-  dependencies: [PluginsContainer]
+  dependencies: [CmsModelFieldToGraphQLRegistry]
 });
 
 //# sourceMappingURL=ModelToAstConverter.js.map

package/features/contentModel/ModelToAstConverter/ModelToAstConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["ModelToAstConverter","ConverterAbstraction","CmsModelToAstConverter","CmsModelFieldToAstConverterFromPlugins","PluginsContainer","ModelToAstConverterImpl","constructor","pluginsContainer","toAst","model","fieldTypePlugins","byType","converter","createImplementation","implementation","dependencies"],"sources":["ModelToAstConverter.ts"],"sourcesContent":["import { ModelToAstConverter as ConverterAbstraction } from \"./abstractions.js\";\nimport {\n    CmsModelToAstConverter,\n    CmsModelFieldToAstConverterFromPlugins\n} from \"~/utils/contentModelAst/index.js\";\nimport type { CmsModel, CmsModelAst, CmsModelFieldToGraphQLPlugin } from \"~/types/index.js\";\nimport { PluginsContainer } from \"~/legacy/abstractions.js\";\n\n/**\n * ModelToAstConverter implementation\n *\n * Wraps CmsModelToAstConverter and provides it with field type plugins\n * for converting models to AST representation (used for GraphQL schema generation)\n */\nclass ModelToAstConverterImpl implements ConverterAbstraction.Interface {\n    public constructor(private pluginsContainer: PluginsContainer.Interface) {}\n\n    toAst(model: CmsModel): CmsModelAst {\n        const fieldTypePlugins = this.pluginsContainer.byType<CmsModelFieldToGraphQLPlugin>(\n            \"cms-model-field-to-graphql\"\n        );\n\n        const converter = new CmsModelToAstConverter(\n            new CmsModelFieldToAstConverterFromPlugins(fieldTypePlugins)\n        );\n\n        return converter.toAst(model);\n    }\n}\n\nexport const ModelToAstConverter = ConverterAbstraction.createImplementation({\n    implementation: ModelToAstConverterImpl,\n    dependencies: [PluginsContainer]\n});\n"],"mappings":"AAAA,SAASA,mBAAmB,IAAIC,oBAAoB;AACpD,SACIC,sBAAsB,EACtBC,sCAAsC;AAG1C,SAASC,gBAAgB;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,uBAAuB,CAA2C;EAC7DC,WAAWA,CAASC,gBAA4C,EAAE;IAAA,KAA9CA,gBAA4C,GAA5CA,gBAA4C;EAAG;EAE1EC,KAAKA,CAACC,KAAe,EAAe;IAChC,MAAMC,gBAAgB,GAAG,IAAI,CAACH,gBAAgB,CAACI,MAAM,CACjD,4BACJ,CAAC;IAED,MAAMC,SAAS,GAAG,IAAIV,sBAAsB,CACxC,IAAIC,sCAAsC,CAACO,gBAAgB,CAC/D,CAAC;IAED,OAAOE,SAAS,CAACJ,KAAK,CAACC,KAAK,CAAC;EACjC;AACJ;AAEA,OAAO,MAAMT,mBAAmB,GAAGC,oBAAoB,CAACY,oBAAoB,CAAC;EACzEC,cAAc,EAAET,uBAAuB;EACvCU,YAAY,EAAE,CAACX,gBAAgB;AACnC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["ModelToAstConverter","ConverterAbstraction","CmsModelFieldToAstConverterFromPlugins","CmsModelToAstConverter","CmsModelFieldToGraphQLRegistry","ModelToAstConverterImpl","constructor","registry","toAst","model","fieldTypePlugins","getAll","converter","createImplementation","implementation","dependencies"],"sources":["ModelToAstConverter.ts"],"sourcesContent":["import { ModelToAstConverter as ConverterAbstraction } from \"./abstractions.js\";\nimport {\n    CmsModelFieldToAstConverterFromPlugins,\n    CmsModelToAstConverter\n} from \"~/utils/contentModelAst/index.js\";\nimport type { CmsModel, CmsModelAst } from \"~/types/index.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\n/**\n * ModelToAstConverter implementation\n *\n * Wraps CmsModelToAstConverter and provides it with field type plugins\n * for converting models to AST representation (used for GraphQL schema generation)\n */\nclass ModelToAstConverterImpl implements ConverterAbstraction.Interface {\n    public constructor(private readonly registry: CmsModelFieldToGraphQLRegistry.Interface) {}\n\n    toAst(model: CmsModel): CmsModelAst {\n        const fieldTypePlugins = this.registry.getAll();\n\n        const converter = new CmsModelToAstConverter(\n            new CmsModelFieldToAstConverterFromPlugins(fieldTypePlugins)\n        );\n\n        return converter.toAst(model);\n    }\n}\n\nexport const ModelToAstConverter = ConverterAbstraction.createImplementation({\n    implementation: ModelToAstConverterImpl,\n    dependencies: [CmsModelFieldToGraphQLRegistry]\n});\n"],"mappings":"AAAA,SAASA,mBAAmB,IAAIC,oBAAoB;AACpD,SACIC,sCAAsC,EACtCC,sBAAsB;AAG1B,SAASC,8BAA8B;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,uBAAuB,CAA2C;EAC7DC,WAAWA,CAAkBC,QAAkD,EAAE;IAAA,KAApDA,QAAkD,GAAlDA,QAAkD;EAAG;EAEzFC,KAAKA,CAACC,KAAe,EAAe;IAChC,MAAMC,gBAAgB,GAAG,IAAI,CAACH,QAAQ,CAACI,MAAM,CAAC,CAAC;IAE/C,MAAMC,SAAS,GAAG,IAAIT,sBAAsB,CACxC,IAAID,sCAAsC,CAACQ,gBAAgB,CAC/D,CAAC;IAED,OAAOE,SAAS,CAACJ,KAAK,CAACC,KAAK,CAAC;EACjC;AACJ;AAEA,OAAO,MAAMT,mBAAmB,GAAGC,oBAAoB,CAACY,oBAAoB,CAAC;EACzEC,cAAc,EAAET,uBAAuB;EACvCU,YAAY,EAAE,CAACX,8BAA8B;AACjD,CAAC,CAAC","ignoreList":[]}

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

@@ -1 +1,4 @@
-export declare const ModelToAstConverterFeature: import("@webiny/feature/api/createFeature.js").FeatureDefinition<unknown>;
+export declare const ModelToAstConverterFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/contentModel/UpdateModel/UpdateModelRepository.d.ts

@@ -1,10 +1,9 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateModelRepository as RepositoryAbstraction } from "./abstractions.js";
-import { ModelCache } from "../../../features/contentModel/shared/abstractions.js";
-import { ModelsFetcher } from "../../../features/contentModel/shared/abstractions.js";
-import { StorageOperations } from "../../../features/shared/abstractions.js";
-import { CmsContext } from "../../../features/shared/abstractions.js";
+import { ModelCache, ModelsFetcher } from "../../../features/contentModel/shared/abstractions.js";
+import { CmsContext, StorageOperations } from "../../../features/shared/abstractions.js";
 import type { CmsModel } from "../../../types/index.js";
+import { ModelFieldCompression } from "../../../features/contentModel/ModelFieldCompression/index.js";
 /**
  * UpdateModelRepository - Validates domain rules and persists model updates.
  *
@@ -17,11 +16,12 @@ import type { CmsModel } from "../../../types/index.js";
  * - Clear ModelCache after successful update
  */
 declare class UpdateModelRepositoryImpl implements RepositoryAbstraction.Interface {
-    private modelCache;
-    private modelsFetcher;
-    private storageOperations;
-    private cmsContext;
-    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface, cmsContext: CmsContext.Interface);
+    private readonly modelCache;
+    private readonly modelsFetcher;
+    private readonly storageOperations;
+    private readonly cmsContext;
+    private readonly modelFieldCompression;
+    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
     execute(model: CmsModel, original: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const UpdateModelRepository: typeof UpdateModelRepositoryImpl & {

package/features/contentModel/UpdateModel/UpdateModelRepository.js

@@ -1,16 +1,14 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateModelRepository as RepositoryAbstraction } from "./abstractions.js";
-import { ModelCache } from "../shared/abstractions.js";
-import { ModelsFetcher } from "../shared/abstractions.js";
-import { ModelCannotUpdateCodeModelError } from "../../../domain/contentModel/errors.js";
-import { ModelPersistenceError } from "../../../domain/contentModel/errors.js";
-import { ModelValidationError } from "../../../domain/contentModel/errors.js";
-import { StorageOperations } from "../../shared/abstractions.js";
-import { CmsContext } from "../../shared/abstractions.js";
+import { ModelCache, ModelsFetcher } from "../shared/abstractions.js";
+import { ModelCannotUpdateCodeModelError, ModelPersistenceError, ModelValidationError } from "../../../domain/contentModel/errors.js";
+import { CmsContext, StorageOperations } from "../../shared/abstractions.js";
 import { validateEndingAllowed } from "../../../crud/contentModel/validate/endingAllowed.js";
 import { validateSingularApiName } from "../../../domain/contentModel/validation/singularApiName.js";
 import { validatePluralApiName } from "../../../domain/contentModel/validation/pluralApiName.js";
 import { validateModelFields } from "../../../domain/contentModel/validation/modelFields.js";
+import { ModelFieldCompression } from "../ModelFieldCompression/index.js";
+
 /**
  * UpdateModelRepository - Validates domain rules and persists model updates.
  *
@@ -23,11 +21,12 @@ import { validateModelFields } from "../../../domain/contentModel/validation/mod
  * - Clear ModelCache after successful update
  */
 class UpdateModelRepositoryImpl {
-  constructor(modelCache, modelsFetcher, storageOperations, cmsContext) {
+  constructor(modelCache, modelsFetcher, storageOperations, cmsContext, modelFieldCompression) {
     this.modelCache = modelCache;
     this.modelsFetcher = modelsFetcher;
     this.storageOperations = storageOperations;
     this.cmsContext = cmsContext;
+    this.modelFieldCompression = modelFieldCompression;
   }
   async execute(model, original) {
     try {
@@ -37,7 +36,10 @@ class UpdateModelRepositoryImpl {
           model
         });
       } catch (error) {
-        return Result.fail(new ModelValidationError(error.message));
+        return Result.fail(new ModelValidationError({
+          message: error.message,
+          data: error.data
+        }));
       }
 
       // Get all models for validation (excluding the current model)
@@ -80,12 +82,19 @@ class UpdateModelRepositoryImpl {
           context: this.cmsContext
         });
       } catch (error) {
-        return Result.fail(new ModelValidationError(error.message));
+        return Result.fail(new ModelValidationError({
+          message: error.message,
+          data: error.data
+        }));
       }
+      const fields = await this.modelFieldCompression.compress(model.fields);
 
       // Persist to storage
       await this.storageOperations.models.update({
-        model
+        model: {
+          ...model,
+          fields
+        }
       });
 
       // Clear cache
@@ -98,7 +107,7 @@ class UpdateModelRepositoryImpl {
 }
 export const UpdateModelRepository = RepositoryAbstraction.createImplementation({
   implementation: UpdateModelRepositoryImpl,
-  dependencies: [ModelCache, ModelsFetcher, StorageOperations, CmsContext]
+  dependencies: [ModelCache, ModelsFetcher, StorageOperations, CmsContext, ModelFieldCompression]
 });
 
 //# sourceMappingURL=UpdateModelRepository.js.map

package/features/contentModel/UpdateModel/UpdateModelRepository.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","UpdateModelRepository","RepositoryAbstraction","ModelCache","ModelsFetcher","ModelCannotUpdateCodeModelError","ModelPersistenceError","ModelValidationError","StorageOperations","CmsContext","validateEndingAllowed","validateSingularApiName","validatePluralApiName","validateModelFields","UpdateModelRepositoryImpl","constructor","modelCache","modelsFetcher","storageOperations","cmsContext","execute","model","original","error","fail","message","modelsResult","security","withoutAuthorization","fetchAll","isFail","allModels","value","models","filter","m","modelId","existingModelResult","fetchById","isPlugin","existingModel","context","update","clear","ok","createImplementation","implementation","dependencies"],"sources":["UpdateModelRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { UpdateModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache } from \"~/features/contentModel/shared/abstractions.js\";\nimport { ModelsFetcher } from \"~/features/contentModel/shared/abstractions.js\";\nimport { ModelCannotUpdateCodeModelError } from \"~/domain/contentModel/errors.js\";\nimport { ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\nimport { ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.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\";\n\n/**\n * UpdateModelRepository - Validates domain rules and persists model updates.\n *\n * Responsibilities:\n * - Validate API name endings\n * - Validate singularApiName uniqueness (excluding current model)\n * - Validate pluralApiName uniqueness (excluding current model)\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful update\n */\nclass UpdateModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private modelCache: ModelCache.Interface,\n        private modelsFetcher: ModelsFetcher.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private cmsContext: CmsContext.Interface\n    ) {}\n\n    async execute(\n        model: CmsModel,\n        original: CmsModel\n    ): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(new ModelValidationError((error as Error).message));\n            }\n\n            // Get all models for validation (excluding the current model)\n            const modelsResult = await this.cmsContext.security.withoutAuthorization(async () => {\n                return await this.modelsFetcher.fetchAll();\n            });\n\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const allModels = modelsResult.value;\n            const models = allModels.filter(m => m.modelId !== model.modelId);\n\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 ModelCannotUpdateCodeModelError(model.modelId));\n            }\n\n            // Validate uniqueness\n            try {\n                for (const existingModel of models) {\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                    original,\n                    context: this.cmsContext\n                });\n            } catch (error) {\n                return Result.fail(new ModelValidationError((error as Error).message));\n            }\n\n            // Persist to storage\n            await this.storageOperations.models.update({ 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 UpdateModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: UpdateModelRepositoryImpl,\n    dependencies: [ModelCache, ModelsFetcher, StorageOperations, CmsContext]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Result","UpdateModelRepository","RepositoryAbstraction","ModelCache","ModelsFetcher","ModelCannotUpdateCodeModelError","ModelPersistenceError","ModelValidationError","CmsContext","StorageOperations","validateEndingAllowed","validateSingularApiName","validatePluralApiName","validateModelFields","ModelFieldCompression","UpdateModelRepositoryImpl","constructor","modelCache","modelsFetcher","storageOperations","cmsContext","modelFieldCompression","execute","model","original","error","fail","message","data","modelsResult","security","withoutAuthorization","fetchAll","isFail","allModels","value","models","filter","m","modelId","existingModelResult","fetchById","isPlugin","existingModel","context","fields","compress","update","clear","ok","createImplementation","implementation","dependencies"],"sources":["UpdateModelRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { UpdateModelRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ModelCache, ModelsFetcher } from \"~/features/contentModel/shared/abstractions.js\";\nimport {\n    ModelCannotUpdateCodeModelError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsContext, StorageOperations } from \"~/features/shared/abstractions.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 { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\n\n/**\n * UpdateModelRepository - Validates domain rules and persists model updates.\n *\n * Responsibilities:\n * - Validate API name endings\n * - Validate singularApiName uniqueness (excluding current model)\n * - Validate pluralApiName uniqueness (excluding current model)\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful update\n */\nclass UpdateModelRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly modelsFetcher: ModelsFetcher.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async execute(\n        model: CmsModel,\n        original: CmsModel\n    ): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\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            // Get all models for validation (excluding the current model)\n            const modelsResult = await this.cmsContext.security.withoutAuthorization(async () => {\n                return await this.modelsFetcher.fetchAll();\n            });\n\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const allModels = modelsResult.value;\n            const models = allModels.filter(m => m.modelId !== model.modelId);\n\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 ModelCannotUpdateCodeModelError(model.modelId));\n            }\n\n            // Validate uniqueness\n            try {\n                for (const existingModel of models) {\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                    original,\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            const fields = await this.modelFieldCompression.compress(model.fields);\n\n            // Persist to storage\n            await this.storageOperations.models.update({\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 UpdateModelRepository = RepositoryAbstraction.createImplementation({\n    implementation: UpdateModelRepositoryImpl,\n    dependencies: [ModelCache, ModelsFetcher, StorageOperations, CmsContext, ModelFieldCompression]\n});\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,qBAAqB;AAC5C,SAASC,qBAAqB,IAAIC,qBAAqB;AACvD,SAASC,UAAU,EAAEC,aAAa;AAClC,SACIC,+BAA+B,EAC/BC,qBAAqB,EACrBC,oBAAoB;AAExB,SAASC,UAAU,EAAEC,iBAAiB;AACtC,SAASC,qBAAqB;AAC9B,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,SAASC,mBAAmB;AAE5B,SAASC,qBAAqB;;AAE9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,yBAAyB,CAA4C;EAChEC,WAAWA,CACGC,UAAgC,EAChCC,aAAsC,EACtCC,iBAA8C,EAC9CC,UAAgC,EAChCC,qBAAsD,EACzE;IAAA,KALmBJ,UAAgC,GAAhCA,UAAgC;IAAA,KAChCC,aAAsC,GAAtCA,aAAsC;IAAA,KACtCC,iBAA8C,GAA9CA,iBAA8C;IAAA,KAC9CC,UAAgC,GAAhCA,UAAgC;IAAA,KAChCC,qBAAsD,GAAtDA,qBAAsD;EACxE;EAEH,MAAMC,OAAOA,CACTC,KAAe,EACfC,QAAkB,EACgC;IAClD,IAAI;MACA;MACA,IAAI;QACAd,qBAAqB,CAAC;UAAEa;QAAM,CAAC,CAAC;MACpC,CAAC,CAAC,OAAOE,KAAK,EAAE;QACZ,OAAOzB,MAAM,CAAC0B,IAAI,CACd,IAAInB,oBAAoB,CAAC;UAAEoB,OAAO,EAAEF,KAAK,CAACE,OAAO;UAAEC,IAAI,EAAEH,KAAK,CAACG;QAAK,CAAC,CACzE,CAAC;MACL;;MAEA;MACA,MAAMC,YAAY,GAAG,MAAM,IAAI,CAACT,UAAU,CAACU,QAAQ,CAACC,oBAAoB,CAAC,YAAY;QACjF,OAAO,MAAM,IAAI,CAACb,aAAa,CAACc,QAAQ,CAAC,CAAC;MAC9C,CAAC,CAAC;MAEF,IAAIH,YAAY,CAACI,MAAM,CAAC,CAAC,EAAE;QACvB,OAAOjC,MAAM,CAAC0B,IAAI,CAAC,IAAIpB,qBAAqB,CAACuB,YAAY,CAACJ,KAAK,CAAC,CAAC;MACrE;MAEA,MAAMS,SAAS,GAAGL,YAAY,CAACM,KAAK;MACpC,MAAMC,MAAM,GAAGF,SAAS,CAACG,MAAM,CAACC,CAAC,IAAIA,CAAC,CAACC,OAAO,KAAKhB,KAAK,CAACgB,OAAO,CAAC;;MAEjE;MACA,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACtB,aAAa,CAACuB,SAAS,CAAClB,KAAK,CAACgB,OAAO,CAAC;MAC7E,IAAIC,mBAAmB,CAACP,MAAM,CAAC,CAAC,EAAE;QAC9B,OAAOjC,MAAM,CAAC0B,IAAI,CAAC,IAAIpB,qBAAqB,CAACkC,mBAAmB,CAACf,KAAK,CAAC,CAAC;MAC5E;MAEA,IAAIe,mBAAmB,CAACL,KAAK,CAACO,QAAQ,EAAE;QACpC,OAAO1C,MAAM,CAAC0B,IAAI,CAAC,IAAIrB,+BAA+B,CAACkB,KAAK,CAACgB,OAAO,CAAC,CAAC;MAC1E;;MAEA;MACA,IAAI;QACA,KAAK,MAAMI,aAAa,IAAIP,MAAM,EAAE;UAChCzB,uBAAuB,CAAC;YACpBgC,aAAa;YACbpB;UACJ,CAAC,CAAC;UACFX,qBAAqB,CAAC;YAClB+B,aAAa;YACbpB;UACJ,CAAC,CAAC;QACN;;QAEA;QACA,MAAMV,mBAAmB,CAAC;UACtBuB,MAAM;UACNb,KAAK;UACLC,QAAQ;UACRoB,OAAO,EAAE,IAAI,CAACxB;QAClB,CAAC,CAAC;MACN,CAAC,CAAC,OAAOK,KAAK,EAAE;QACZ,OAAOzB,MAAM,CAAC0B,IAAI,CACd,IAAInB,oBAAoB,CAAC;UAAEoB,OAAO,EAAEF,KAAK,CAACE,OAAO;UAAEC,IAAI,EAAEH,KAAK,CAACG;QAAK,CAAC,CACzE,CAAC;MACL;MAEA,MAAMiB,MAAM,GAAG,MAAM,IAAI,CAACxB,qBAAqB,CAACyB,QAAQ,CAACvB,KAAK,CAACsB,MAAM,CAAC;;MAEtE;MACA,MAAM,IAAI,CAAC1B,iBAAiB,CAACiB,MAAM,CAACW,MAAM,CAAC;QACvCxB,KAAK,EAAE;UACH,GAAGA,KAAK;UACRsB;QACJ;MACJ,CAAC,CAAC;;MAEF;MACA,IAAI,CAAC5B,UAAU,CAAC+B,KAAK,CAAC,CAAC;MAEvB,OAAOhD,MAAM,CAACiD,EAAE,CAAC,CAAC;IACtB,CAAC,CAAC,OAAOxB,KAAK,EAAE;MACZ,OAAOzB,MAAM,CAAC0B,IAAI,CAAC,IAAIpB,qBAAqB,CAACmB,KAAc,CAAC,CAAC;IACjE;EACJ;AACJ;AAEA,OAAO,MAAMxB,qBAAqB,GAAGC,qBAAqB,CAACgD,oBAAoB,CAAC;EAC5EC,cAAc,EAAEpC,yBAAyB;EACzCqC,YAAY,EAAE,CAACjD,UAAU,EAAEC,aAAa,EAAEK,iBAAiB,EAAED,UAAU,EAAEM,qBAAqB;AAClG,CAAC,CAAC","ignoreList":[]}

package/features/contentModel/UpdateModel/UpdateModelUseCase.d.ts

@@ -1,9 +1,9 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateModelUseCase as UseCaseAbstraction } from "./abstractions.js";
 import { UpdateModelRepository } from "./abstractions.js";
-import { EventPublisher } from "@webiny/api-core/features/EventPublisher";
+import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { AccessControl } from "../../../features/shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import type { CmsModel } from "../../../types/index.js";
 import type { CmsModelUpdateInput } from "../../../types/index.js";
 import { GetModelUseCase } from "../../../features/contentModel/GetModel/index.js";

package/features/contentModel/UpdateModel/UpdateModelUseCase.js

@@ -1,12 +1,12 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateModelUseCase as UseCaseAbstraction } from "./abstractions.js";
 import { UpdateModelRepository } from "./abstractions.js";
-import { EventPublisher } from "@webiny/api-core/features/EventPublisher";
+import { EventPublisher } from "@webiny/api-core/features/eventPublisher/index.js";
 import { ModelBeforeUpdateEvent } from "./events.js";
 import { ModelAfterUpdateEvent } from "./events.js";
 import { ModelUpdateErrorEvent } from "./events.js";
 import { AccessControl } from "../../shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { ModelNotAuthorizedError, ModelValidationError } from "../../../domain/contentModel/errors.js";
 import { createZodError } from "@webiny/utils";
 import { removeUndefinedValues } from "@webiny/utils";
@@ -58,7 +58,10 @@ class UpdateModelUseCaseImpl {
     const validationResult = await createModelUpdateValidation().safeParseAsync(input);
     if (!validationResult.success) {
       const zodError = createZodError(validationResult.error);
-      return Result.fail(new ModelValidationError(zodError.message));
+      return Result.fail(new ModelValidationError({
+        message: zodError.message,
+        data: zodError.data
+      }));
     }
     const data = removeUndefinedValues(validationResult.data);
 

package/features/contentModel/UpdateModel/UpdateModelUseCase.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","UpdateModelUseCase","UseCaseAbstraction","UpdateModelRepository","EventPublisher","ModelBeforeUpdateEvent","ModelAfterUpdateEvent","ModelUpdateErrorEvent","AccessControl","TenantContext","ModelNotAuthorizedError","ModelValidationError","createZodError","removeUndefinedValues","createModelUpdateValidation","ensureTypeTag","GetModelUseCase","UpdateModelUseCaseImpl","constructor","getModelUseCase","eventPublisher","repository","accessControl","tenantContext","execute","modelId","input","canAccess","canAccessModel","rwd","fail","getResult","isFail","original","structuredClone","value","validationResult","safeParseAsync","success","zodError","error","message","data","Object","keys","length","ok","tenant","getTenant","model","icon","titleFieldId","undefined","descriptionFieldId","imageFieldId","description","id","savedOn","Date","toISOString","fromModel","tags","publish","result","createImplementation","implementation","dependencies"],"sources":["UpdateModelUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { UpdateModelUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { UpdateModelRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/EventPublisher\";\nimport { ModelBeforeUpdateEvent } from \"./events.js\";\nimport { ModelAfterUpdateEvent } from \"./events.js\";\nimport { ModelUpdateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/TenantContext\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelUpdateValidation } from \"~/domain/contentModel/schemas.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelUpdateInput } from \"~/types/index.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\n\n/**\n * UpdateModelUseCase - Core model update orchestration.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Fetch original model\n * - Create updated domain model object\n * - Handle group changes\n * - Handle field ID changes (title, description, image)\n * - Access control checks\n * - Publish before event\n * - Delegate to repository for validation and persistence\n * - Publish after event or error event\n *\n * Note: Repository handles domain validations (API name uniqueness, field validation, etc.)\n */\nclass UpdateModelUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private eventPublisher: EventPublisher.Interface,\n        private repository: UpdateModelRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(\n        modelId: string,\n        input: CmsModelUpdateInput\n    ): Promise<Result<CmsModel, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessModel({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new ModelNotAuthorizedError());\n        }\n\n        // Get the original model (with access control check)\n        const getResult = await this.getModelUseCase.execute(modelId);\n        if (getResult.isFail()) {\n            return getResult;\n        }\n\n        const original = structuredClone(getResult.value);\n\n        // Validate input\n        const validationResult = await createModelUpdateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(new ModelValidationError(zodError.message));\n        }\n\n        const data = removeUndefinedValues(validationResult.data);\n\n        // If no changes, return original\n        if (Object.keys(data).length === 0) {\n            return Result.ok(original);\n        }\n\n        // Create updated model\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...original,\n            ...data,\n            icon: data.icon ?? original.icon,\n            // Handle optional field IDs explicitly\n            titleFieldId:\n                data.titleFieldId === undefined\n                    ? original.titleFieldId\n                    : (data.titleFieldId as string),\n            descriptionFieldId:\n                data.descriptionFieldId === undefined\n                    ? original.descriptionFieldId\n                    : data.descriptionFieldId,\n            imageFieldId:\n                data.imageFieldId === undefined ? original.imageFieldId : data.imageFieldId,\n            description: data.description || original.description,\n            tenant: original.tenant || tenant.id,\n            savedOn: new Date().toISOString()\n        };\n\n        // Access control check on the updated model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Ensure type tags\n        model.tags = ensureTypeTag(model);\n\n        // Publish before event\n        await this.eventPublisher.publish(\n            new ModelBeforeUpdateEvent({ model, original, input: data })\n        );\n\n        // Persist via repository (repository will validate)\n        const result = await this.repository.execute(model, original);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelUpdateErrorEvent({\n                    input: data,\n                    model,\n                    original,\n                    error: result.error\n                })\n            );\n            return Result.fail(result.error);\n        }\n\n        // Publish after event\n        await this.eventPublisher.publish(new ModelAfterUpdateEvent({ model, original }));\n\n        return Result.ok(model);\n    }\n}\n\nexport const UpdateModelUseCase = UseCaseAbstraction.createImplementation({\n    implementation: UpdateModelUseCaseImpl,\n    dependencies: [\n        GetModelUseCase,\n        EventPublisher,\n        UpdateModelRepository,\n        AccessControl,\n        TenantContext\n    ]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Result","UpdateModelUseCase","UseCaseAbstraction","UpdateModelRepository","EventPublisher","ModelBeforeUpdateEvent","ModelAfterUpdateEvent","ModelUpdateErrorEvent","AccessControl","TenantContext","ModelNotAuthorizedError","ModelValidationError","createZodError","removeUndefinedValues","createModelUpdateValidation","ensureTypeTag","GetModelUseCase","UpdateModelUseCaseImpl","constructor","getModelUseCase","eventPublisher","repository","accessControl","tenantContext","execute","modelId","input","canAccess","canAccessModel","rwd","fail","getResult","isFail","original","structuredClone","value","validationResult","safeParseAsync","success","zodError","error","message","data","Object","keys","length","ok","tenant","getTenant","model","icon","titleFieldId","undefined","descriptionFieldId","imageFieldId","description","id","savedOn","Date","toISOString","fromModel","tags","publish","result","createImplementation","implementation","dependencies"],"sources":["UpdateModelUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { UpdateModelUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { UpdateModelRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { ModelBeforeUpdateEvent } from \"./events.js\";\nimport { ModelAfterUpdateEvent } from \"./events.js\";\nimport { ModelUpdateErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelUpdateValidation } from \"~/domain/contentModel/schemas.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelUpdateInput } from \"~/types/index.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\n\n/**\n * UpdateModelUseCase - Core model update orchestration.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Fetch original model\n * - Create updated domain model object\n * - Handle group changes\n * - Handle field ID changes (title, description, image)\n * - Access control checks\n * - Publish before event\n * - Delegate to repository for validation and persistence\n * - Publish after event or error event\n *\n * Note: Repository handles domain validations (API name uniqueness, field validation, etc.)\n */\nclass UpdateModelUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private eventPublisher: EventPublisher.Interface,\n        private repository: UpdateModelRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(\n        modelId: string,\n        input: CmsModelUpdateInput\n    ): Promise<Result<CmsModel, UseCaseAbstraction.Error>> {\n        // Initial access control check\n        const canAccess = await this.accessControl.canAccessModel({ rwd: \"w\" });\n        if (!canAccess) {\n            return Result.fail(new ModelNotAuthorizedError());\n        }\n\n        // Get the original model (with access control check)\n        const getResult = await this.getModelUseCase.execute(modelId);\n        if (getResult.isFail()) {\n            return getResult;\n        }\n\n        const original = structuredClone(getResult.value);\n\n        // Validate input\n        const validationResult = await createModelUpdateValidation().safeParseAsync(input);\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(\n                new ModelValidationError({\n                    message: zodError.message,\n                    data: zodError.data\n                })\n            );\n        }\n\n        const data = removeUndefinedValues(validationResult.data);\n\n        // If no changes, return original\n        if (Object.keys(data).length === 0) {\n            return Result.ok(original);\n        }\n\n        // Create updated model\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...original,\n            ...data,\n            icon: data.icon ?? original.icon,\n            // Handle optional field IDs explicitly\n            titleFieldId:\n                data.titleFieldId === undefined\n                    ? original.titleFieldId\n                    : (data.titleFieldId as string),\n            descriptionFieldId:\n                data.descriptionFieldId === undefined\n                    ? original.descriptionFieldId\n                    : data.descriptionFieldId,\n            imageFieldId:\n                data.imageFieldId === undefined ? original.imageFieldId : data.imageFieldId,\n            description: data.description || original.description,\n            tenant: original.tenant || tenant.id,\n            savedOn: new Date().toISOString()\n        };\n\n        // Access control check on the updated model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Ensure type tags\n        model.tags = ensureTypeTag(model);\n\n        // Publish before event\n        await this.eventPublisher.publish(\n            new ModelBeforeUpdateEvent({ model, original, input: data })\n        );\n\n        // Persist via repository (repository will validate)\n        const result = await this.repository.execute(model, original);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelUpdateErrorEvent({\n                    input: data,\n                    model,\n                    original,\n                    error: result.error\n                })\n            );\n            return Result.fail(result.error);\n        }\n\n        // Publish after event\n        await this.eventPublisher.publish(new ModelAfterUpdateEvent({ model, original }));\n\n        return Result.ok(model);\n    }\n}\n\nexport const UpdateModelUseCase = UseCaseAbstraction.createImplementation({\n    implementation: UpdateModelUseCaseImpl,\n    dependencies: [\n        GetModelUseCase,\n        EventPublisher,\n        UpdateModelRepository,\n        AccessControl,\n        TenantContext\n    ]\n});\n"],"mappings":"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","ignoreList":[]}

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

@@ -20,6 +20,7 @@ export interface IUpdateModelUseCaseErrors {
     groupNotAccessible: GroupNotAuthorizedError;
 }
 type UseCaseError = IUpdateModelUseCaseErrors[keyof IUpdateModelUseCaseErrors];
+/** Update a content model. */
 export declare const UpdateModelUseCase: import("@webiny/di").Abstraction<IUpdateModelUseCase>;
 export declare namespace UpdateModelUseCase {
     type Interface = IUpdateModelUseCase;

package/features/contentModel/UpdateModel/abstractions.js

@@ -4,6 +4,7 @@ import { createAbstraction } from "@webiny/feature/api";
  * UpdateModel Use Case
  */
 
+/** Update a content model. */
 export const UpdateModelUseCase = createAbstraction("UpdateModelUseCase");
 
 /**

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

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","UpdateModelUseCase","UpdateModelRepository"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelUpdateInput } from \"~/types/index.js\";\nimport {\n    type ModelSlugTakenError,\n    ModelNotAuthorizedError,\n    type ModelNotFoundError,\n    type ModelValidationError,\n    type ModelPersistenceError,\n    ModelCannotUpdateCodeModelError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotFoundError,\n    type GroupNotAuthorizedError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * UpdateModel Use Case\n */\nexport interface IUpdateModelUseCase {\n    execute(modelId: string, input: CmsModelUpdateInput): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface IUpdateModelUseCaseErrors {\n    notFound: ModelNotFoundError;\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    alreadyExists: ModelSlugTakenError;\n    persistence: ModelPersistenceError;\n    updateCodeModel: ModelCannotUpdateCodeModelError;\n    groupNotFound: GroupNotFoundError;\n    groupNotAccessible: GroupNotAuthorizedError;\n}\n\ntype UseCaseError = IUpdateModelUseCaseErrors[keyof IUpdateModelUseCaseErrors];\n\nexport const UpdateModelUseCase = createAbstraction<IUpdateModelUseCase>(\"UpdateModelUseCase\");\n\nexport namespace UpdateModelUseCase {\n    export type Interface = IUpdateModelUseCase;\n    export type Input = CmsModelUpdateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * UpdateModelRepository - Validates domain rules and persists model updates.\n */\nexport interface IUpdateModelRepository {\n    execute(model: CmsModel, original: CmsModel): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface IUpdateModelRepositoryErrors {\n    alreadyExists: ModelSlugTakenError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n    updateCodeModel: ModelCannotUpdateCodeModelError;\n}\n\ntype RepositoryError = IUpdateModelRepositoryErrors[keyof IUpdateModelRepositoryErrors];\n\nexport const UpdateModelRepository =\n    createAbstraction<IUpdateModelRepository>(\"UpdateModelRepository\");\n\nexport namespace UpdateModelRepository {\n    export type Interface = IUpdateModelRepository;\n    export type Error = RepositoryError;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;;AAiBvD;AACA;AACA;;AAkBA,OAAO,MAAMC,kBAAkB,GAAGD,iBAAiB,CAAsB,oBAAoB,CAAC;;AAU9F;AACA;AACA;;AAcA,OAAO,MAAME,qBAAqB,GAC9BF,iBAAiB,CAAyB,uBAAuB,CAAC","ignoreList":[]}
+{"version":3,"names":["createAbstraction","UpdateModelUseCase","UpdateModelRepository"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelUpdateInput } from \"~/types/index.js\";\nimport {\n    type ModelSlugTakenError,\n    ModelNotAuthorizedError,\n    type ModelNotFoundError,\n    type ModelValidationError,\n    type ModelPersistenceError,\n    ModelCannotUpdateCodeModelError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotFoundError,\n    type GroupNotAuthorizedError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * UpdateModel Use Case\n */\nexport interface IUpdateModelUseCase {\n    execute(modelId: string, input: CmsModelUpdateInput): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface IUpdateModelUseCaseErrors {\n    notFound: ModelNotFoundError;\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    alreadyExists: ModelSlugTakenError;\n    persistence: ModelPersistenceError;\n    updateCodeModel: ModelCannotUpdateCodeModelError;\n    groupNotFound: GroupNotFoundError;\n    groupNotAccessible: GroupNotAuthorizedError;\n}\n\ntype UseCaseError = IUpdateModelUseCaseErrors[keyof IUpdateModelUseCaseErrors];\n\n/** Update a content model. */\nexport const UpdateModelUseCase = createAbstraction<IUpdateModelUseCase>(\"UpdateModelUseCase\");\n\nexport namespace UpdateModelUseCase {\n    export type Interface = IUpdateModelUseCase;\n    export type Input = CmsModelUpdateInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * UpdateModelRepository - Validates domain rules and persists model updates.\n */\nexport interface IUpdateModelRepository {\n    execute(model: CmsModel, original: CmsModel): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface IUpdateModelRepositoryErrors {\n    alreadyExists: ModelSlugTakenError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n    updateCodeModel: ModelCannotUpdateCodeModelError;\n}\n\ntype RepositoryError = IUpdateModelRepositoryErrors[keyof IUpdateModelRepositoryErrors];\n\nexport const UpdateModelRepository =\n    createAbstraction<IUpdateModelRepository>(\"UpdateModelRepository\");\n\nexport namespace UpdateModelRepository {\n    export type Interface = IUpdateModelRepository;\n    export type Error = RepositoryError;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;;AAiBvD;AACA;AACA;;AAkBA;AACA,OAAO,MAAMC,kBAAkB,GAAGD,iBAAiB,CAAsB,oBAAoB,CAAC;;AAU9F;AACA;AACA;;AAcA,OAAO,MAAME,qBAAqB,GAC9BF,iBAAiB,CAAyB,uBAAuB,CAAC","ignoreList":[]}

package/features/contentModel/UpdateModel/events.d.ts

@@ -1,5 +1,5 @@
-import type { IEventHandler } from "@webiny/api-core/features/EventPublisher";
-import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
+import type { IEventHandler } from "@webiny/api-core/features/eventPublisher/index.js";
+import { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
 import type { CmsModel, CmsModelUpdateInput } from "../../../types/index.js";
 /**
  * Event payloads
@@ -26,6 +26,7 @@ export declare class ModelBeforeUpdateEvent extends DomainEvent<ModelBeforeUpdat
     eventType: "Cms/Model/BeforeUpdate";
     getHandlerAbstraction(): import("@webiny/di").Abstraction<IEventHandler<ModelBeforeUpdateEvent>>;
 }
+/** Hook into model lifecycle before a model is updated. */
 export declare const ModelBeforeUpdateEventHandler: import("@webiny/di").Abstraction<IEventHandler<ModelBeforeUpdateEvent>>;
 export declare namespace ModelBeforeUpdateEventHandler {
     type Interface = IEventHandler<ModelBeforeUpdateEvent>;
@@ -38,6 +39,7 @@ export declare class ModelAfterUpdateEvent extends DomainEvent<ModelAfterUpdateE
     eventType: "Cms/Model/AfterUpdate";
     getHandlerAbstraction(): import("@webiny/di").Abstraction<IEventHandler<ModelAfterUpdateEvent>>;
 }
+/** Hook into model lifecycle after a model is updated. */
 export declare const ModelAfterUpdateEventHandler: import("@webiny/di").Abstraction<IEventHandler<ModelAfterUpdateEvent>>;
 export declare namespace ModelAfterUpdateEventHandler {
     type Interface = IEventHandler<ModelAfterUpdateEvent>;

package/features/contentModel/UpdateModel/events.js

@@ -1,5 +1,5 @@
 import { createAbstraction } from "@webiny/feature/api";
-import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
+import { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
 
 /**
  * Event payloads
@@ -14,6 +14,8 @@ export class ModelBeforeUpdateEvent extends DomainEvent {
     return ModelBeforeUpdateEventHandler;
   }
 }
+
+/** Hook into model lifecycle before a model is updated. */
 export const ModelBeforeUpdateEventHandler = createAbstraction("ModelBeforeUpdateEventHandler");
 /**
  * ModelAfterUpdateEvent - Published after updating a model
@@ -24,6 +26,8 @@ export class ModelAfterUpdateEvent extends DomainEvent {
     return ModelAfterUpdateEventHandler;
   }
 }
+
+/** Hook into model lifecycle after a model is updated. */
 export const ModelAfterUpdateEventHandler = createAbstraction("ModelAfterUpdateEventHandler");
 /**
  * ModelUpdateErrorEvent - Published when update fails

package/features/contentModel/UpdateModel/events.js.map

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","DomainEvent","ModelBeforeUpdateEvent","eventType","getHandlerAbstraction","ModelBeforeUpdateEventHandler","ModelAfterUpdateEvent","ModelAfterUpdateEventHandler","ModelUpdateErrorEvent","ModelUpdateErrorEventHandler"],"sources":["events.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { IEventHandler } from \"@webiny/api-core/features/EventPublisher\";\nimport { DomainEvent } from \"@webiny/api-core/features/EventPublisher\";\nimport type { CmsModel, CmsModelUpdateInput } from \"~/types/index.js\";\n\n/**\n * Event payloads\n */\nexport interface ModelBeforeUpdateEventPayload {\n    model: CmsModel;\n    original: CmsModel;\n    input: CmsModelUpdateInput;\n}\n\nexport interface ModelAfterUpdateEventPayload {\n    model: CmsModel;\n    original: CmsModel;\n}\n\nexport interface ModelUpdateErrorEventPayload {\n    input: CmsModelUpdateInput;\n    model: CmsModel;\n    original: CmsModel;\n    error: Error;\n}\n\n/**\n * ModelBeforeUpdateEvent - Published before updating a model\n */\nexport class ModelBeforeUpdateEvent extends DomainEvent<ModelBeforeUpdateEventPayload> {\n    eventType = \"Cms/Model/BeforeUpdate\" as const;\n\n    getHandlerAbstraction() {\n        return ModelBeforeUpdateEventHandler;\n    }\n}\n\nexport const ModelBeforeUpdateEventHandler = createAbstraction<\n    IEventHandler<ModelBeforeUpdateEvent>\n>(\"ModelBeforeUpdateEventHandler\");\n\nexport namespace ModelBeforeUpdateEventHandler {\n    export type Interface = IEventHandler<ModelBeforeUpdateEvent>;\n    export type Event = ModelBeforeUpdateEvent;\n}\n\n/**\n * ModelAfterUpdateEvent - Published after updating a model\n */\nexport class ModelAfterUpdateEvent extends DomainEvent<ModelAfterUpdateEventPayload> {\n    eventType = \"Cms/Model/AfterUpdate\" as const;\n\n    getHandlerAbstraction() {\n        return ModelAfterUpdateEventHandler;\n    }\n}\n\nexport const ModelAfterUpdateEventHandler = createAbstraction<IEventHandler<ModelAfterUpdateEvent>>(\n    \"ModelAfterUpdateEventHandler\"\n);\n\nexport namespace ModelAfterUpdateEventHandler {\n    export type Interface = IEventHandler<ModelAfterUpdateEvent>;\n    export type Event = ModelAfterUpdateEvent;\n}\n\n/**\n * ModelUpdateErrorEvent - Published when update fails\n */\nexport class ModelUpdateErrorEvent extends DomainEvent<ModelUpdateErrorEventPayload> {\n    eventType = \"Cms/Model/UpdateError\" as const;\n\n    getHandlerAbstraction() {\n        return ModelUpdateErrorEventHandler;\n    }\n}\n\nexport const ModelUpdateErrorEventHandler = createAbstraction<IEventHandler<ModelUpdateErrorEvent>>(\n    \"ModelUpdateErrorEventHandler\"\n);\n\nexport namespace ModelUpdateErrorEventHandler {\n    export type Interface = IEventHandler<ModelUpdateErrorEvent>;\n    export type Event = ModelUpdateErrorEvent;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAEvD,SAASC,WAAW,QAAQ,0CAA0C;;AAGtE;AACA;AACA;;AAmBA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,SAASD,WAAW,CAAgC;EACnFE,SAAS,GAAG,wBAAwB;EAEpCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOC,6BAA6B;EACxC;AACJ;AAEA,OAAO,MAAMA,6BAA6B,GAAGL,iBAAiB,CAE5D,+BAA+B,CAAC;AAOlC;AACA;AACA;AACA,OAAO,MAAMM,qBAAqB,SAASL,WAAW,CAA+B;EACjFE,SAAS,GAAG,uBAAuB;EAEnCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOG,4BAA4B;EACvC;AACJ;AAEA,OAAO,MAAMA,4BAA4B,GAAGP,iBAAiB,CACzD,8BACJ,CAAC;AAOD;AACA;AACA;AACA,OAAO,MAAMQ,qBAAqB,SAASP,WAAW,CAA+B;EACjFE,SAAS,GAAG,uBAAuB;EAEnCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOK,4BAA4B;EACvC;AACJ;AAEA,OAAO,MAAMA,4BAA4B,GAAGT,iBAAiB,CACzD,8BACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["createAbstraction","DomainEvent","ModelBeforeUpdateEvent","eventType","getHandlerAbstraction","ModelBeforeUpdateEventHandler","ModelAfterUpdateEvent","ModelAfterUpdateEventHandler","ModelUpdateErrorEvent","ModelUpdateErrorEventHandler"],"sources":["events.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { IEventHandler } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { DomainEvent } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport type { CmsModel, CmsModelUpdateInput } from \"~/types/index.js\";\n\n/**\n * Event payloads\n */\nexport interface ModelBeforeUpdateEventPayload {\n    model: CmsModel;\n    original: CmsModel;\n    input: CmsModelUpdateInput;\n}\n\nexport interface ModelAfterUpdateEventPayload {\n    model: CmsModel;\n    original: CmsModel;\n}\n\nexport interface ModelUpdateErrorEventPayload {\n    input: CmsModelUpdateInput;\n    model: CmsModel;\n    original: CmsModel;\n    error: Error;\n}\n\n/**\n * ModelBeforeUpdateEvent - Published before updating a model\n */\nexport class ModelBeforeUpdateEvent extends DomainEvent<ModelBeforeUpdateEventPayload> {\n    eventType = \"Cms/Model/BeforeUpdate\" as const;\n\n    getHandlerAbstraction() {\n        return ModelBeforeUpdateEventHandler;\n    }\n}\n\n/** Hook into model lifecycle before a model is updated. */\nexport const ModelBeforeUpdateEventHandler = createAbstraction<\n    IEventHandler<ModelBeforeUpdateEvent>\n>(\"ModelBeforeUpdateEventHandler\");\n\nexport namespace ModelBeforeUpdateEventHandler {\n    export type Interface = IEventHandler<ModelBeforeUpdateEvent>;\n    export type Event = ModelBeforeUpdateEvent;\n}\n\n/**\n * ModelAfterUpdateEvent - Published after updating a model\n */\nexport class ModelAfterUpdateEvent extends DomainEvent<ModelAfterUpdateEventPayload> {\n    eventType = \"Cms/Model/AfterUpdate\" as const;\n\n    getHandlerAbstraction() {\n        return ModelAfterUpdateEventHandler;\n    }\n}\n\n/** Hook into model lifecycle after a model is updated. */\nexport const ModelAfterUpdateEventHandler = createAbstraction<IEventHandler<ModelAfterUpdateEvent>>(\n    \"ModelAfterUpdateEventHandler\"\n);\n\nexport namespace ModelAfterUpdateEventHandler {\n    export type Interface = IEventHandler<ModelAfterUpdateEvent>;\n    export type Event = ModelAfterUpdateEvent;\n}\n\n/**\n * ModelUpdateErrorEvent - Published when update fails\n */\nexport class ModelUpdateErrorEvent extends DomainEvent<ModelUpdateErrorEventPayload> {\n    eventType = \"Cms/Model/UpdateError\" as const;\n\n    getHandlerAbstraction() {\n        return ModelUpdateErrorEventHandler;\n    }\n}\n\nexport const ModelUpdateErrorEventHandler = createAbstraction<IEventHandler<ModelUpdateErrorEvent>>(\n    \"ModelUpdateErrorEventHandler\"\n);\n\nexport namespace ModelUpdateErrorEventHandler {\n    export type Interface = IEventHandler<ModelUpdateErrorEvent>;\n    export type Event = ModelUpdateErrorEvent;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAEvD,SAASC,WAAW,QAAQ,mDAAmD;;AAG/E;AACA;AACA;;AAmBA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,SAASD,WAAW,CAAgC;EACnFE,SAAS,GAAG,wBAAwB;EAEpCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOC,6BAA6B;EACxC;AACJ;;AAEA;AACA,OAAO,MAAMA,6BAA6B,GAAGL,iBAAiB,CAE5D,+BAA+B,CAAC;AAOlC;AACA;AACA;AACA,OAAO,MAAMM,qBAAqB,SAASL,WAAW,CAA+B;EACjFE,SAAS,GAAG,uBAAuB;EAEnCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOG,4BAA4B;EACvC;AACJ;;AAEA;AACA,OAAO,MAAMA,4BAA4B,GAAGP,iBAAiB,CACzD,8BACJ,CAAC;AAOD;AACA;AACA;AACA,OAAO,MAAMQ,qBAAqB,SAASP,WAAW,CAA+B;EACjFE,SAAS,GAAG,uBAAuB;EAEnCC,qBAAqBA,CAAA,EAAG;IACpB,OAAOK,4BAA4B;EACvC;AACJ;AAEA,OAAO,MAAMA,4BAA4B,GAAGT,iBAAiB,CACzD,8BACJ,CAAC","ignoreList":[]}

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

@@ -4,4 +4,7 @@
  * Provides functionality for updating existing content models.
  * All validation (API name uniqueness, field validation) is handled by the repository.
  */
-export declare const UpdateModelFeature: import("@webiny/feature/api/createFeature.js").FeatureDefinition<unknown>;
+export declare const UpdateModelFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/contentModel/shared/ModelsFetcher.d.ts

@@ -2,8 +2,9 @@ import { Result } from "@webiny/feature/api";
 import { ModelCache, ModelsFetcher as FetcherAbstraction } from "../../../features/contentModel/shared/abstractions.js";
 import { PluginModelsProvider } from "../../../features/contentModel/shared/abstractions.js";
 import { StorageOperations } from "../../../features/shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+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";
 /**
  * ModelsFetcherImpl - Implementation with multi-level caching.
  *
@@ -14,11 +15,12 @@ import type { CmsModel } from "../../../types/index.js";
  * 4. Final merged list is cached per tenant + identity
  */
 declare class ModelsFetcherImpl implements FetcherAbstraction.Interface {
-    private modelCache;
-    private pluginModelsProvider;
-    private storageOperations;
-    private tenantContext;
-    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface);
+    private readonly modelCache;
+    private readonly pluginModelsProvider;
+    private readonly storageOperations;
+    private readonly tenantContext;
+    private readonly modelFieldCompression;
+    constructor(modelCache: ModelCache.Interface, pluginModelsProvider: PluginModelsProvider.Interface, storageOperations: StorageOperations.Interface, tenantContext: TenantContext.Interface, modelFieldCompression: ModelFieldCompression.Interface);
     fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>>;
     fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>>;
     private fetchAndMergeModels;

package/features/contentModel/shared/ModelsFetcher.js

@@ -2,10 +2,12 @@ import { Result } from "@webiny/feature/api";
 import { ModelCache, ModelsFetcher as FetcherAbstraction } from "./abstractions.js";
 import { PluginModelsProvider } from "./abstractions.js";
 import { StorageOperations } from "../../shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { ModelNotFoundError, ModelPersistenceError } from "../../../domain/contentModel/errors.js";
 import { createCacheKey } from "../../../utils/index.js";
 import { ensureTypeTag } from "../../../domain/contentModel/ensureTypeTag.js";
+import { ModelFieldCompression } from "../ModelFieldCompression/index.js";
+
 /**
  * ModelsFetcherImpl - Implementation with multi-level caching.
  *
@@ -16,11 +18,12 @@ import { ensureTypeTag } from "../../../domain/contentModel/ensureTypeTag.js";
  * 4. Final merged list is cached per tenant + identity
  */
 class ModelsFetcherImpl {
-  constructor(modelCache, pluginModelsProvider, storageOperations, tenantContext) {
+  constructor(modelCache, pluginModelsProvider, storageOperations, tenantContext, modelFieldCompression) {
     this.modelCache = modelCache;
     this.pluginModelsProvider = pluginModelsProvider;
     this.storageOperations = storageOperations;
     this.tenantContext = tenantContext;
+    this.modelFieldCompression = modelFieldCompression;
   }
   async fetchAll() {
     try {
@@ -61,11 +64,18 @@ class ModelsFetcherImpl {
       id: "storage"
     });
     const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {
-      return this.storageOperations.models.list({
+      const models = await this.storageOperations.models.list({
         where: {
           tenant
         }
       });
+      return Promise.all(models.map(async model => {
+        const fields = await this.modelFieldCompression.decompress(model.fields);
+        return {
+          ...model,
+          fields
+        };
+      }));
     });
 
     // 2. Ensure type tags on database models
@@ -80,7 +90,7 @@ class ModelsFetcherImpl {
 }
 export const ModelsFetcher = FetcherAbstraction.createImplementation({
   implementation: ModelsFetcherImpl,
-  dependencies: [ModelCache, PluginModelsProvider, StorageOperations, TenantContext]
+  dependencies: [ModelCache, PluginModelsProvider, StorageOperations, TenantContext, ModelFieldCompression]
 });
 
 //# sourceMappingURL=ModelsFetcher.js.map

package/features/contentModel/shared/ModelsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","ModelCache","ModelsFetcher","FetcherAbstraction","PluginModelsProvider","StorageOperations","TenantContext","ModelNotFoundError","ModelPersistenceError","createCacheKey","ensureTypeTag","ModelsFetcherImpl","constructor","modelCache","pluginModelsProvider","storageOperations","tenantContext","fetchAll","tenant","getTenant","cacheKey","id","pluginModels","list","cached","getOrSet","fetchAndMergeModels","ok","error","fail","fetchById","modelId","result","isFail","model","value","find","m","dbCacheKey","databaseModels","models","where","taggedDatabaseModels","map","tags","createImplementation","implementation","dependencies"],"sources":["ModelsFetcher.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    ModelCache,\n    ModelsFetcher as FetcherAbstraction\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport { PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/TenantContext\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\n\n/**\n * ModelsFetcherImpl - Implementation with multi-level caching.\n *\n * Caching strategy:\n * 1. Plugin models are cached per tenant (with access control applied by PluginModelsProvider)\n * 2. Database models are cached per tenant (raw from DB)\n * 3. Filtered database models are cached per tenant + identity (with access control applied)\n * 4. Final merged list is cached per tenant + identity\n */\nclass ModelsFetcherImpl implements FetcherAbstraction.Interface {\n    public constructor(\n        private modelCache: ModelCache.Interface,\n        private pluginModelsProvider: PluginModelsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Create a cache key based on tenant + identity\n            const cacheKey = createCacheKey({\n                tenant: tenant.id\n            });\n\n            // Fetch plugin models (with caching and access control)\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n\n            // Try to get from cache first\n            const cached = await this.modelCache.getOrSet(cacheKey, async () => {\n                return this.fetchAndMergeModels(tenant.id);\n            });\n\n            return Result.ok([...cached, ...pluginModels]);\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n\n    async fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>> {\n        const result = await this.fetchAll();\n        if (result.isFail()) {\n            return Result.fail(new ModelPersistenceError(result.error));\n        }\n\n        const model = result.value.find(m => m.modelId === modelId);\n        if (!model) {\n            return Result.fail(new ModelNotFoundError(modelId));\n        }\n\n        return Result.ok(model);\n    }\n\n    private async fetchAndMergeModels(tenant: string): Promise<CmsModel[]> {\n        // 1. Fetch database models (with caching)\n        const dbCacheKey = createCacheKey({ tenant, id: \"storage\" });\n        const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {\n            return this.storageOperations.models.list({ where: { tenant } });\n        });\n\n        // 2. Ensure type tags on database models\n        const taggedDatabaseModels = databaseModels.map(model => {\n            model.tags = ensureTypeTag(model);\n            return model;\n        });\n\n        // 3. Return merged models.\n        return taggedDatabaseModels;\n    }\n}\n\nexport const ModelsFetcher = FetcherAbstraction.createImplementation({\n    implementation: ModelsFetcherImpl,\n    dependencies: [ModelCache, PluginModelsProvider, StorageOperations, TenantContext]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Result","ModelCache","ModelsFetcher","FetcherAbstraction","PluginModelsProvider","StorageOperations","TenantContext","ModelNotFoundError","ModelPersistenceError","createCacheKey","ensureTypeTag","ModelFieldCompression","ModelsFetcherImpl","constructor","modelCache","pluginModelsProvider","storageOperations","tenantContext","modelFieldCompression","fetchAll","tenant","getTenant","cacheKey","id","pluginModels","list","cached","getOrSet","fetchAndMergeModels","ok","error","fail","fetchById","modelId","result","isFail","model","value","find","m","dbCacheKey","databaseModels","models","where","Promise","all","map","fields","decompress","taggedDatabaseModels","tags","createImplementation","implementation","dependencies"],"sources":["ModelsFetcher.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    ModelCache,\n    ModelsFetcher as FetcherAbstraction\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport { PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\n\n/**\n * ModelsFetcherImpl - Implementation with multi-level caching.\n *\n * Caching strategy:\n * 1. Plugin models are cached per tenant (with access control applied by PluginModelsProvider)\n * 2. Database models are cached per tenant (raw from DB)\n * 3. Filtered database models are cached per tenant + identity (with access control applied)\n * 4. Final merged list is cached per tenant + identity\n */\nclass ModelsFetcherImpl implements FetcherAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Create a cache key based on tenant + identity\n            const cacheKey = createCacheKey({\n                tenant: tenant.id\n            });\n\n            // Fetch plugin models (with caching and access control)\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n\n            // Try to get from cache first\n            const cached = await this.modelCache.getOrSet(cacheKey, async () => {\n                return this.fetchAndMergeModels(tenant.id);\n            });\n\n            return Result.ok([...cached, ...pluginModels]);\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n\n    async fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>> {\n        const result = await this.fetchAll();\n        if (result.isFail()) {\n            return Result.fail(new ModelPersistenceError(result.error));\n        }\n\n        const model = result.value.find(m => m.modelId === modelId);\n        if (!model) {\n            return Result.fail(new ModelNotFoundError(modelId));\n        }\n\n        return Result.ok(model);\n    }\n\n    private async fetchAndMergeModels(tenant: string): Promise<CmsModel[]> {\n        // 1. Fetch database models (with caching)\n        const dbCacheKey = createCacheKey({ tenant, id: \"storage\" });\n        const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {\n            const models = await this.storageOperations.models.list({ where: { tenant } });\n\n            return Promise.all(\n                models.map(async model => {\n                    const fields = await this.modelFieldCompression.decompress(model.fields);\n\n                    return {\n                        ...model,\n                        fields\n                    };\n                })\n            );\n        });\n\n        // 2. Ensure type tags on database models\n        const taggedDatabaseModels = databaseModels.map(model => {\n            model.tags = ensureTypeTag(model);\n            return model;\n        });\n\n        // 3. Return merged models.\n        return taggedDatabaseModels;\n    }\n}\n\nexport const ModelsFetcher = FetcherAbstraction.createImplementation({\n    implementation: ModelsFetcherImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        StorageOperations,\n        TenantContext,\n        ModelFieldCompression\n    ]\n});\n"],"mappings":"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","ignoreList":[]}

package/features/contentModelGroup/ContentModelGroupFeature.d.ts

@@ -1 +1,4 @@
-export declare const ContentModelGroupFeature: import("@webiny/feature/api/createFeature").FeatureDefinition<unknown>;
+export declare const ContentModelGroupFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.d.ts

@@ -3,7 +3,7 @@ import { CreateGroupRepository as RepositoryAbstraction } from "./abstractions.j
 import { GroupCache } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { PluginGroupsProvider } from "../../../features/contentModelGroup/shared/abstractions.js";
 import { StorageOperations } from "../../../features/shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import type { CmsGroup } from "../../../types/index.js";
 /**
  * CreateGroupRepository - Validates and persists a new group.

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js

@@ -6,7 +6,7 @@ import { PluginGroupsProvider } from "../shared/abstractions.js";
 import { GroupSlugTakenError } from "../../../domain/contentModelGroup/errors.js";
 import { GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
 import { StorageOperations } from "../../shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/TenantContext";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { toSlug } from "../../../utils/toSlug.js";
 import { generateAlphaNumericId } from "@webiny/utils";
 /**