@webiny/api-headless-cms 6.3.0-beta.4 → 6.4.0-beta.0

package/features/contentModel/UpdateModel/UpdateModelUseCase.js

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

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/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":[]}
+{"version":3,"file":"features/contentModel/UpdateModel/UpdateModelUseCase.js","sources":["../../../../src/features/contentModel/UpdateModel/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"],"names":["UpdateModelUseCaseImpl","getModelUseCase","eventPublisher","repository","accessControl","tenantContext","modelId","input","canAccess","Result","ModelNotAuthorizedError","getResult","original","structuredClone","validationResult","createModelUpdateValidation","zodError","createZodError","ModelValidationError","data","removeUndefinedValues","Object","tenant","model","undefined","Date","canAccessModel","ensureTypeTag","ModelBeforeUpdateEvent","result","ModelUpdateErrorEvent","ModelAfterUpdateEvent","UpdateModelUseCase","UseCaseAbstraction","GetModelUseCase","EventPublisher","UpdateModelRepository","AccessControl","TenantContext"],"mappings":";;;;;;;;;;;AAkCA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,CAChD;aALUJ,eAAe,GAAfA;aACAC,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QACFC,OAAe,EACfC,KAA0B,EACyB;QAEnD,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAE,KAAK;QAAI;QACrE,IAAI,CAACA,WACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAI3B,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACL;QACrD,IAAIK,UAAU,MAAM,IAChB,OAAOA;QAGX,MAAMC,WAAWC,gBAAgBF,UAAU,KAAK;QAGhD,MAAMG,mBAAmB,MAAMC,8BAA8B,cAAc,CAACR;QAC5E,IAAI,CAACO,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOL,OAAO,IAAI,CACd,IAAIS,qBAAqB;gBACrB,SAASF,SAAS,OAAO;gBACzB,MAAMA,SAAS,IAAI;YACvB;QAER;QAEA,MAAMG,OAAOC,sBAAsBN,iBAAiB,IAAI;QAGxD,IAAIO,AAA6B,MAA7BA,OAAO,IAAI,CAACF,MAAM,MAAM,EACxB,OAAOV,OAAO,EAAE,CAACG;QAIrB,MAAMU,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,QAAkB;YACpB,GAAGX,QAAQ;YACX,GAAGO,IAAI;YACP,MAAMA,KAAK,IAAI,IAAIP,SAAS,IAAI;YAEhC,cACIO,AAAsBK,WAAtBL,KAAK,YAAY,GACXP,SAAS,YAAY,GACpBO,KAAK,YAAY;YAC5B,oBACIA,AAA4BK,WAA5BL,KAAK,kBAAkB,GACjBP,SAAS,kBAAkB,GAC3BO,KAAK,kBAAkB;YACjC,cACIA,AAAsBK,WAAtBL,KAAK,YAAY,GAAiBP,SAAS,YAAY,GAAGO,KAAK,YAAY;YAC/E,aAAaA,KAAK,WAAW,IAAIP,SAAS,WAAW;YACrD,QAAQA,SAAS,MAAM,IAAIU,OAAO,EAAE;YACpC,SAAS,IAAIG,OAAO,WAAW;QACnC;QAGA,MAAMC,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEH;YAAO,KAAK;QAAI;QACjF,IAAI,CAACG,gBACD,OAAOjB,OAAO,IAAI,CAACC,wBAAwB,SAAS,CAACa;QAIzDA,MAAM,IAAI,GAAGI,cAAcJ;QAG3B,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIK,uBAAuB;YAAEL;YAAOX;YAAU,OAAOO;QAAK;QAI9D,MAAMU,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACN,OAAOX;QACpD,IAAIiB,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,sBAAsB;gBACtB,OAAOX;gBACPI;gBACAX;gBACA,OAAOiB,OAAO,KAAK;YACvB;YAEJ,OAAOpB,OAAO,IAAI,CAACoB,OAAO,KAAK;QACnC;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIE,sBAAsB;YAAER;YAAOX;QAAS;QAE9E,OAAOH,OAAO,EAAE,CAACc;IACrB;AACJ;AAEO,MAAMS,wCAAqBC,mBAAAA,oBAAuC,CAAC;IACtE,gBAAgBjC;IAChB,cAAc;QACVkC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModel/UpdateModel/abstractions.js

@@ -1,16 +1,6 @@
 import { createAbstraction } from "@webiny/feature/api";
-
-/**
- * UpdateModel Use Case
- */
-
-/** Update a content model. */
-export const UpdateModelUseCase = createAbstraction("UpdateModelUseCase");
-
-/**
- * UpdateModelRepository - Validates domain rules and persists model updates.
- */
-
-export const UpdateModelRepository = createAbstraction("UpdateModelRepository");
+const UpdateModelUseCase = createAbstraction("UpdateModelUseCase");
+const UpdateModelRepository = createAbstraction("UpdateModelRepository");
+export { UpdateModelRepository, UpdateModelUseCase };
 
 //# sourceMappingURL=abstractions.js.map

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\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":[]}
+{"version":3,"file":"features/contentModel/UpdateModel/abstractions.js","sources":["../../../../src/features/contentModel/UpdateModel/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"],"names":["UpdateModelUseCase","createAbstraction","UpdateModelRepository"],"mappings":";AAsCO,MAAMA,qBAAqBC,kBAAuC;AA0BlE,MAAMC,wBACTD,kBAA0C"}

package/features/contentModel/UpdateModel/events.js

@@ -1,43 +1,32 @@
 import { createAbstraction } from "@webiny/feature/api";
 import { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
-
-/**
- * Event payloads
- */
-
-/**
- * ModelBeforeUpdateEvent - Published before updating a model
- */
-export class ModelBeforeUpdateEvent extends DomainEvent {
-  eventType = "Cms/Model/BeforeUpdate";
-  getHandlerAbstraction() {
-    return ModelBeforeUpdateEventHandler;
-  }
+class ModelBeforeUpdateEvent extends DomainEvent {
+    getHandlerAbstraction() {
+        return ModelBeforeUpdateEventHandler;
+    }
+    constructor(...args){
+        super(...args), this.eventType = "Cms/Model/BeforeUpdate";
+    }
 }
-
-/** Hook into model lifecycle before a model is updated. */
-export const ModelBeforeUpdateEventHandler = createAbstraction("ModelBeforeUpdateEventHandler");
-/**
- * ModelAfterUpdateEvent - Published after updating a model
- */
-export class ModelAfterUpdateEvent extends DomainEvent {
-  eventType = "Cms/Model/AfterUpdate";
-  getHandlerAbstraction() {
-    return ModelAfterUpdateEventHandler;
-  }
+const ModelBeforeUpdateEventHandler = createAbstraction("ModelBeforeUpdateEventHandler");
+class ModelAfterUpdateEvent extends DomainEvent {
+    getHandlerAbstraction() {
+        return ModelAfterUpdateEventHandler;
+    }
+    constructor(...args){
+        super(...args), this.eventType = "Cms/Model/AfterUpdate";
+    }
 }
-
-/** Hook into model lifecycle after a model is updated. */
-export const ModelAfterUpdateEventHandler = createAbstraction("ModelAfterUpdateEventHandler");
-/**
- * ModelUpdateErrorEvent - Published when update fails
- */
-export class ModelUpdateErrorEvent extends DomainEvent {
-  eventType = "Cms/Model/UpdateError";
-  getHandlerAbstraction() {
-    return ModelUpdateErrorEventHandler;
-  }
+const ModelAfterUpdateEventHandler = createAbstraction("ModelAfterUpdateEventHandler");
+class ModelUpdateErrorEvent extends DomainEvent {
+    getHandlerAbstraction() {
+        return ModelUpdateErrorEventHandler;
+    }
+    constructor(...args){
+        super(...args), this.eventType = "Cms/Model/UpdateError";
+    }
 }
-export const ModelUpdateErrorEventHandler = createAbstraction("ModelUpdateErrorEventHandler");
+const ModelUpdateErrorEventHandler = createAbstraction("ModelUpdateErrorEventHandler");
+export { ModelAfterUpdateEvent, ModelAfterUpdateEventHandler, ModelBeforeUpdateEvent, ModelBeforeUpdateEventHandler, ModelUpdateErrorEvent, ModelUpdateErrorEventHandler };
 
 //# sourceMappingURL=events.js.map

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/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":[]}
+{"version":3,"file":"features/contentModel/UpdateModel/events.js","sources":["../../../../src/features/contentModel/UpdateModel/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"],"names":["ModelBeforeUpdateEvent","DomainEvent","ModelBeforeUpdateEventHandler","createAbstraction","ModelAfterUpdateEvent","ModelAfterUpdateEventHandler","ModelUpdateErrorEvent","ModelUpdateErrorEventHandler"],"mappings":";;AA6BO,MAAMA,+BAA+BC;IAGxC,wBAAwB;QACpB,OAAOC;IACX;;QALG,qBACH,SAAS,GAAG;;AAKhB;AAGO,MAAMA,gCAAgCC,kBAE3C;AAUK,MAAMC,8BAA8BH;IAGvC,wBAAwB;QACpB,OAAOI;IACX;;QALG,qBACH,SAAS,GAAG;;AAKhB;AAGO,MAAMA,+BAA+BF,kBACxC;AAWG,MAAMG,8BAA8BL;IAGvC,wBAAwB;QACpB,OAAOM;IACX;;QALG,qBACH,SAAS,GAAG;;AAKhB;AAEO,MAAMA,+BAA+BJ,kBACxC"}

package/features/contentModel/UpdateModel/feature.js

@@ -1,22 +1,13 @@
 import { createFeature } from "@webiny/feature/api";
 import { UpdateModelUseCase } from "./UpdateModelUseCase.js";
 import { UpdateModelRepository } from "./UpdateModelRepository.js";
-
-/**
- * UpdateModel Feature
- *
- * Provides functionality for updating existing content models.
- * All validation (API name uniqueness, field validation) is handled by the repository.
- */
-export const UpdateModelFeature = createFeature({
-  name: "UpdateModel",
-  register(container) {
-    // Register core use case
-    container.register(UpdateModelUseCase);
-
-    // Register repository in singleton scope (shared instance)
-    container.register(UpdateModelRepository).inSingletonScope();
-  }
+const UpdateModelFeature = createFeature({
+    name: "UpdateModel",
+    register (container) {
+        container.register(UpdateModelUseCase);
+        container.register(UpdateModelRepository).inSingletonScope();
+    }
 });
+export { UpdateModelFeature };
 
 //# sourceMappingURL=feature.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createFeature","UpdateModelUseCase","UpdateModelRepository","UpdateModelFeature","name","register","container","inSingletonScope"],"sources":["feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UpdateModelUseCase } from \"./UpdateModelUseCase.js\";\nimport { UpdateModelRepository } from \"./UpdateModelRepository.js\";\n\n/**\n * UpdateModel Feature\n *\n * Provides functionality for updating existing content models.\n * All validation (API name uniqueness, field validation) is handled by the repository.\n */\nexport const UpdateModelFeature = createFeature({\n    name: \"UpdateModel\",\n    register(container) {\n        // Register core use case\n        container.register(UpdateModelUseCase);\n\n        // Register repository in singleton scope (shared instance)\n        container.register(UpdateModelRepository).inSingletonScope();\n    }\n});\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AACnD,SAASC,kBAAkB;AAC3B,SAASC,qBAAqB;;AAE9B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAGH,aAAa,CAAC;EAC5CI,IAAI,EAAE,aAAa;EACnBC,QAAQA,CAACC,SAAS,EAAE;IAChB;IACAA,SAAS,CAACD,QAAQ,CAACJ,kBAAkB,CAAC;;IAEtC;IACAK,SAAS,CAACD,QAAQ,CAACH,qBAAqB,CAAC,CAACK,gBAAgB,CAAC,CAAC;EAChE;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/contentModel/UpdateModel/feature.js","sources":["../../../../src/features/contentModel/UpdateModel/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UpdateModelUseCase } from \"./UpdateModelUseCase.js\";\nimport { UpdateModelRepository } from \"./UpdateModelRepository.js\";\n\n/**\n * UpdateModel Feature\n *\n * Provides functionality for updating existing content models.\n * All validation (API name uniqueness, field validation) is handled by the repository.\n */\nexport const UpdateModelFeature = createFeature({\n    name: \"UpdateModel\",\n    register(container) {\n        // Register core use case\n        container.register(UpdateModelUseCase);\n\n        // Register repository in singleton scope (shared instance)\n        container.register(UpdateModelRepository).inSingletonScope();\n    }\n});\n"],"names":["UpdateModelFeature","createFeature","container","UpdateModelUseCase","UpdateModelRepository"],"mappings":";;;AAUO,MAAMA,qBAAqBC,cAAc;IAC5C,MAAM;IACN,UAASC,SAAS;QAEdA,UAAU,QAAQ,CAACC;QAGnBD,UAAU,QAAQ,CAACE,uBAAuB,gBAAgB;IAC9D;AACJ"}

package/features/contentModel/UpdateModel/index.js

@@ -1,4 +1,2 @@
-export { UpdateModelUseCase, UpdateModelRepository } from "./abstractions.js";
+export { UpdateModelRepository, UpdateModelUseCase } from "./abstractions.js";
 export { ModelAfterUpdateEventHandler, ModelBeforeUpdateEventHandler } from "./events.js";
-
-//# sourceMappingURL=index.js.map

package/features/contentModel/shared/ModelsFetcher.js

@@ -1,96 +1,81 @@
 import { Result } from "@webiny/feature/api";
-import { ModelCache, ModelsFetcher as FetcherAbstraction } from "./abstractions.js";
-import { PluginModelsProvider } from "./abstractions.js";
+import { ModelCache, ModelsFetcher, PluginModelsProvider } from "./abstractions.js";
 import { StorageOperations } from "../../shared/abstractions.js";
 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.
- *
- * Caching strategy:
- * 1. Plugin models are cached per tenant (with access control applied by PluginModelsProvider)
- * 2. Database models are cached per tenant (raw from DB)
- * 3. Filtered database models are cached per tenant + identity (with access control applied)
- * 4. Final merged list is cached per tenant + identity
- */
 class ModelsFetcherImpl {
-  constructor(modelCache, pluginModelsProvider, storageOperations, tenantContext, modelFieldCompression) {
-    this.modelCache = modelCache;
-    this.pluginModelsProvider = pluginModelsProvider;
-    this.storageOperations = storageOperations;
-    this.tenantContext = tenantContext;
-    this.modelFieldCompression = modelFieldCompression;
-  }
-  async fetchAll() {
-    try {
-      const tenant = this.tenantContext.getTenant();
-
-      // Create a cache key based on tenant + identity
-      const cacheKey = createCacheKey({
-        tenant: tenant.id
-      });
-
-      // Fetch plugin models (with caching and access control)
-      const pluginModels = await this.pluginModelsProvider.list(tenant.id);
-
-      // Try to get from cache first
-      const cached = await this.modelCache.getOrSet(cacheKey, async () => {
-        return this.fetchAndMergeModels(tenant.id);
-      });
-      return Result.ok([...cached, ...pluginModels]);
-    } catch (error) {
-      return Result.fail(new ModelPersistenceError(error));
+    constructor(modelCache, pluginModelsProvider, storageOperations, tenantContext, modelFieldCompression){
+        this.modelCache = modelCache;
+        this.pluginModelsProvider = pluginModelsProvider;
+        this.storageOperations = storageOperations;
+        this.tenantContext = tenantContext;
+        this.modelFieldCompression = modelFieldCompression;
     }
-  }
-  async fetchById(modelId) {
-    const result = await this.fetchAll();
-    if (result.isFail()) {
-      return Result.fail(new ModelPersistenceError(result.error));
+    async fetchAll() {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            const cacheKey = createCacheKey({
+                tenant: tenant.id
+            });
+            const cached = await this.modelCache.getOrSet(cacheKey, async ()=>{
+                const pluginModels = await this.pluginModelsProvider.list(tenant.id);
+                const databaseModels = await this.fetchAndMergeModels(tenant.id);
+                return [
+                    ...pluginModels,
+                    ...databaseModels
+                ];
+            });
+            return Result.ok(cached);
+        } catch (error) {
+            return Result.fail(new ModelPersistenceError(error));
+        }
     }
-    const model = result.value.find(m => m.modelId === modelId);
-    if (!model) {
-      return Result.fail(new ModelNotFoundError(modelId));
+    async fetchById(modelId) {
+        const result = await this.fetchAll();
+        if (result.isFail()) return Result.fail(new ModelPersistenceError(result.error));
+        const model = result.value.find((m)=>m.modelId === modelId);
+        if (!model) return Result.fail(new ModelNotFoundError(modelId));
+        return Result.ok(model);
+    }
+    async fetchAndMergeModels(tenant) {
+        const dbCacheKey = createCacheKey({
+            tenant,
+            id: "storage"
+        });
+        const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async ()=>{
+            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
+                };
+            }));
+        });
+        const taggedDatabaseModels = databaseModels.map((model)=>{
+            model.tags = ensureTypeTag(model);
+            return model;
+        });
+        return taggedDatabaseModels;
     }
-    return Result.ok(model);
-  }
-  async fetchAndMergeModels(tenant) {
-    // 1. Fetch database models (with caching)
-    const dbCacheKey = createCacheKey({
-      tenant,
-      id: "storage"
-    });
-    const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {
-      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
-    const taggedDatabaseModels = databaseModels.map(model => {
-      model.tags = ensureTypeTag(model);
-      return model;
-    });
-
-    // 3. Return merged models.
-    return taggedDatabaseModels;
-  }
 }
-export const ModelsFetcher = FetcherAbstraction.createImplementation({
-  implementation: ModelsFetcherImpl,
-  dependencies: [ModelCache, PluginModelsProvider, StorageOperations, TenantContext, ModelFieldCompression]
+const ModelsFetcher_ModelsFetcher = ModelsFetcher.createImplementation({
+    implementation: ModelsFetcherImpl,
+    dependencies: [
+        ModelCache,
+        PluginModelsProvider,
+        StorageOperations,
+        TenantContext,
+        ModelFieldCompression
+    ]
 });
+export { ModelsFetcher_ModelsFetcher as ModelsFetcher };
 
 //# sourceMappingURL=ModelsFetcher.js.map