@webiny/api-headless-cms 0.0.0-unstable.bca7b3e350 → 0.0.0-unstable.c27f4d8a31

package/features/contentModel/UpdateModel/UpdateModelUseCase.js

@@ -0,0 +1,133 @@
+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 { 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 { ModelNotAuthorizedError, ModelValidationError } from "../../../domain/contentModel/errors.js";
+import { createZodError } from "@webiny/utils";
+import { 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);
+    }
+
+    // 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));
+    }
+
+    // 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]
+});
+
+//# sourceMappingURL=UpdateModelUseCase.js.map

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

@@ -0,0 +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(\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":"AAAA,SAASA,MAAM,QAAQ,qBAAqB;AAC5C,SAASC,kBAAkB,IAAIC,kBAAkB;AACjD,SAASC,qBAAqB;AAC9B,SAASC,cAAc,QAAQ,0CAA0C;AACzE,SAASC,sBAAsB;AAC/B,SAASC,qBAAqB;AAC9B,SAASC,qBAAqB;AAC9B,SAASC,aAAa;AACtB,SAASC,aAAa,QAAQ,yCAAyC;AACvE,SAASC,uBAAuB,EAAEC,oBAAoB;AACtD,SAASC,cAAc,QAAQ,eAAe;AAC9C,SAASC,qBAAqB,QAAQ,eAAe;AACrD,SAASC,2BAA2B;AACpC,SAASC,aAAa;AAGtB,SAASC,eAAe;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,sBAAsB,CAAyC;EAC1DC,WAAWA,CACNC,eAA0C,EAC1CC,cAAwC,EACxCC,UAA2C,EAC3CC,aAAsC,EACtCC,aAAsC,EAChD;IAAA,KALUJ,eAA0C,GAA1CA,eAA0C;IAAA,KAC1CC,cAAwC,GAAxCA,cAAwC;IAAA,KACxCC,UAA2C,GAA3CA,UAA2C;IAAA,KAC3CC,aAAsC,GAAtCA,aAAsC;IAAA,KACtCC,aAAsC,GAAtCA,aAAsC;EAC/C;EAEH,MAAMC,OAAOA,CACTC,OAAe,EACfC,KAA0B,EACyB;IACnD;IACA,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACL,aAAa,CAACM,cAAc,CAAC;MAAEC,GAAG,EAAE;IAAI,CAAC,CAAC;IACvE,IAAI,CAACF,SAAS,EAAE;MACZ,OAAO3B,MAAM,CAAC8B,IAAI,CAAC,IAAIpB,uBAAuB,CAAC,CAAC,CAAC;IACrD;;IAEA;IACA,MAAMqB,SAAS,GAAG,MAAM,IAAI,CAACZ,eAAe,CAACK,OAAO,CAACC,OAAO,CAAC;IAC7D,IAAIM,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;MACpB,OAAOD,SAAS;IACpB;IAEA,MAAME,QAAQ,GAAGC,eAAe,CAACH,SAAS,CAACI,KAAK,CAAC;;IAEjD;IACA,MAAMC,gBAAgB,GAAG,MAAMtB,2BAA2B,CAAC,CAAC,CAACuB,cAAc,CAACX,KAAK,CAAC;IAClF,IAAI,CAACU,gBAAgB,CAACE,OAAO,EAAE;MAC3B,MAAMC,QAAQ,GAAG3B,cAAc,CAACwB,gBAAgB,CAACI,KAAK,CAAC;MACvD,OAAOxC,MAAM,CAAC8B,IAAI,CACd,IAAInB,oBAAoB,CAAC;QACrB8B,OAAO,EAAEF,QAAQ,CAACE,OAAO;QACzBC,IAAI,EAAEH,QAAQ,CAACG;MACnB,CAAC,CACL,CAAC;IACL;IAEA,MAAMA,IAAI,GAAG7B,qBAAqB,CAACuB,gBAAgB,CAACM,IAAI,CAAC;;IAEzD;IACA,IAAIC,MAAM,CAACC,IAAI,CAACF,IAAI,CAAC,CAACG,MAAM,KAAK,CAAC,EAAE;MAChC,OAAO7C,MAAM,CAAC8C,EAAE,CAACb,QAAQ,CAAC;IAC9B;;IAEA;IACA,MAAMc,MAAM,GAAG,IAAI,CAACxB,aAAa,CAACyB,SAAS,CAAC,CAAC;IAE7C,MAAMC,KAAe,GAAG;MACpB,GAAGhB,QAAQ;MACX,GAAGS,IAAI;MACPQ,IAAI,EAAER,IAAI,CAACQ,IAAI,IAAIjB,QAAQ,CAACiB,IAAI;MAChC;MACAC,YAAY,EACRT,IAAI,CAACS,YAAY,KAAKC,SAAS,GACzBnB,QAAQ,CAACkB,YAAY,GACpBT,IAAI,CAACS,YAAuB;MACvCE,kBAAkB,EACdX,IAAI,CAACW,kBAAkB,KAAKD,SAAS,GAC/BnB,QAAQ,CAACoB,kBAAkB,GAC3BX,IAAI,CAACW,kBAAkB;MACjCC,YAAY,EACRZ,IAAI,CAACY,YAAY,KAAKF,SAAS,GAAGnB,QAAQ,CAACqB,YAAY,GAAGZ,IAAI,CAACY,YAAY;MAC/EC,WAAW,EAAEb,IAAI,CAACa,WAAW,IAAItB,QAAQ,CAACsB,WAAW;MACrDR,MAAM,EAAEd,QAAQ,CAACc,MAAM,IAAIA,MAAM,CAACS,EAAE;MACpCC,OAAO,EAAE,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC;IACpC,CAAC;;IAED;IACA,MAAM/B,cAAc,GAAG,MAAM,IAAI,CAACN,aAAa,CAACM,cAAc,CAAC;MAAEqB,KAAK;MAAEpB,GAAG,EAAE;IAAI,CAAC,CAAC;IACnF,IAAI,CAACD,cAAc,EAAE;MACjB,OAAO5B,MAAM,CAAC8B,IAAI,CAACpB,uBAAuB,CAACkD,SAAS,CAACX,KAAK,CAAC,CAAC;IAChE;;IAEA;IACAA,KAAK,CAACY,IAAI,GAAG9C,aAAa,CAACkC,KAAK,CAAC;;IAEjC;IACA,MAAM,IAAI,CAAC7B,cAAc,CAAC0C,OAAO,CAC7B,IAAIzD,sBAAsB,CAAC;MAAE4C,KAAK;MAAEhB,QAAQ;MAAEP,KAAK,EAAEgB;IAAK,CAAC,CAC/D,CAAC;;IAED;IACA,MAAMqB,MAAM,GAAG,MAAM,IAAI,CAAC1C,UAAU,CAACG,OAAO,CAACyB,KAAK,EAAEhB,QAAQ,CAAC;IAC7D,IAAI8B,MAAM,CAAC/B,MAAM,CAAC,CAAC,EAAE;MACjB;MACA,MAAM,IAAI,CAACZ,cAAc,CAAC0C,OAAO,CAC7B,IAAIvD,qBAAqB,CAAC;QACtBmB,KAAK,EAAEgB,IAAI;QACXO,KAAK;QACLhB,QAAQ;QACRO,KAAK,EAAEuB,MAAM,CAACvB;MAClB,CAAC,CACL,CAAC;MACD,OAAOxC,MAAM,CAAC8B,IAAI,CAACiC,MAAM,CAACvB,KAAK,CAAC;IACpC;;IAEA;IACA,MAAM,IAAI,CAACpB,cAAc,CAAC0C,OAAO,CAAC,IAAIxD,qBAAqB,CAAC;MAAE2C,KAAK;MAAEhB;IAAS,CAAC,CAAC,CAAC;IAEjF,OAAOjC,MAAM,CAAC8C,EAAE,CAACG,KAAK,CAAC;EAC3B;AACJ;AAEA,OAAO,MAAMhD,kBAAkB,GAAGC,kBAAkB,CAAC8D,oBAAoB,CAAC;EACtEC,cAAc,EAAEhD,sBAAsB;EACtCiD,YAAY,EAAE,CACVlD,eAAe,EACfZ,cAAc,EACdD,qBAAqB,EACrBK,aAAa,EACbC,aAAa;AAErB,CAAC,CAAC","ignoreList":[]}

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

@@ -0,0 +1,48 @@
+import { Result } from "@webiny/feature/api";
+import type { CmsModel } from "../../../types/index.js";
+import type { CmsModelUpdateInput } from "../../../types/index.js";
+import { type ModelSlugTakenError, ModelNotAuthorizedError, type ModelNotFoundError, type ModelValidationError, type ModelPersistenceError, ModelCannotUpdateCodeModelError } from "../../../domain/contentModel/errors.js";
+import { type GroupNotFoundError, type GroupNotAuthorizedError } from "../../../domain/contentModelGroup/errors.js";
+/**
+ * UpdateModel Use Case
+ */
+export interface IUpdateModelUseCase {
+    execute(modelId: string, input: CmsModelUpdateInput): Promise<Result<CmsModel, UseCaseError>>;
+}
+export interface IUpdateModelUseCaseErrors {
+    notFound: ModelNotFoundError;
+    notAuthorized: ModelNotAuthorizedError;
+    validation: ModelValidationError;
+    alreadyExists: ModelSlugTakenError;
+    persistence: ModelPersistenceError;
+    updateCodeModel: ModelCannotUpdateCodeModelError;
+    groupNotFound: GroupNotFoundError;
+    groupNotAccessible: GroupNotAuthorizedError;
+}
+type UseCaseError = IUpdateModelUseCaseErrors[keyof IUpdateModelUseCaseErrors];
+export declare const UpdateModelUseCase: import("@webiny/di").Abstraction<IUpdateModelUseCase>;
+export declare namespace UpdateModelUseCase {
+    type Interface = IUpdateModelUseCase;
+    type Input = CmsModelUpdateInput;
+    type Error = UseCaseError;
+    type Return = Promise<Result<CmsModel, UseCaseError>>;
+}
+/**
+ * UpdateModelRepository - Validates domain rules and persists model updates.
+ */
+export interface IUpdateModelRepository {
+    execute(model: CmsModel, original: CmsModel): Promise<Result<void, RepositoryError>>;
+}
+export interface IUpdateModelRepositoryErrors {
+    alreadyExists: ModelSlugTakenError;
+    validation: ModelValidationError;
+    persistence: ModelPersistenceError;
+    updateCodeModel: ModelCannotUpdateCodeModelError;
+}
+type RepositoryError = IUpdateModelRepositoryErrors[keyof IUpdateModelRepositoryErrors];
+export declare const UpdateModelRepository: import("@webiny/di").Abstraction<IUpdateModelRepository>;
+export declare namespace UpdateModelRepository {
+    type Interface = IUpdateModelRepository;
+    type Error = RepositoryError;
+}
+export {};

package/features/contentModel/UpdateModel/abstractions.js

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

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

@@ -0,0 +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":[]}

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

@@ -0,0 +1,57 @@
+import type { IEventHandler } from "@webiny/api-core/features/EventPublisher";
+import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
+import type { CmsModel, CmsModelUpdateInput } from "../../../types/index.js";
+/**
+ * Event payloads
+ */
+export interface ModelBeforeUpdateEventPayload {
+    model: CmsModel;
+    original: CmsModel;
+    input: CmsModelUpdateInput;
+}
+export interface ModelAfterUpdateEventPayload {
+    model: CmsModel;
+    original: CmsModel;
+}
+export interface ModelUpdateErrorEventPayload {
+    input: CmsModelUpdateInput;
+    model: CmsModel;
+    original: CmsModel;
+    error: Error;
+}
+/**
+ * ModelBeforeUpdateEvent - Published before updating a model
+ */
+export declare class ModelBeforeUpdateEvent extends DomainEvent<ModelBeforeUpdateEventPayload> {
+    eventType: "Cms/Model/BeforeUpdate";
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<IEventHandler<ModelBeforeUpdateEvent>>;
+}
+export declare const ModelBeforeUpdateEventHandler: import("@webiny/di").Abstraction<IEventHandler<ModelBeforeUpdateEvent>>;
+export declare namespace ModelBeforeUpdateEventHandler {
+    type Interface = IEventHandler<ModelBeforeUpdateEvent>;
+    type Event = ModelBeforeUpdateEvent;
+}
+/**
+ * ModelAfterUpdateEvent - Published after updating a model
+ */
+export declare class ModelAfterUpdateEvent extends DomainEvent<ModelAfterUpdateEventPayload> {
+    eventType: "Cms/Model/AfterUpdate";
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<IEventHandler<ModelAfterUpdateEvent>>;
+}
+export declare const ModelAfterUpdateEventHandler: import("@webiny/di").Abstraction<IEventHandler<ModelAfterUpdateEvent>>;
+export declare namespace ModelAfterUpdateEventHandler {
+    type Interface = IEventHandler<ModelAfterUpdateEvent>;
+    type Event = ModelAfterUpdateEvent;
+}
+/**
+ * ModelUpdateErrorEvent - Published when update fails
+ */
+export declare class ModelUpdateErrorEvent extends DomainEvent<ModelUpdateErrorEventPayload> {
+    eventType: "Cms/Model/UpdateError";
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<IEventHandler<ModelUpdateErrorEvent>>;
+}
+export declare const ModelUpdateErrorEventHandler: import("@webiny/di").Abstraction<IEventHandler<ModelUpdateErrorEvent>>;
+export declare namespace ModelUpdateErrorEventHandler {
+    type Interface = IEventHandler<ModelUpdateErrorEvent>;
+    type Event = ModelUpdateErrorEvent;
+}

package/features/contentModel/UpdateModel/events.js

@@ -0,0 +1,39 @@
+import { createAbstraction } from "@webiny/feature/api";
+import { DomainEvent } from "@webiny/api-core/features/EventPublisher";
+
+/**
+ * Event payloads
+ */
+
+/**
+ * ModelBeforeUpdateEvent - Published before updating a model
+ */
+export class ModelBeforeUpdateEvent extends DomainEvent {
+  eventType = "Cms/Model/BeforeUpdate";
+  getHandlerAbstraction() {
+    return ModelBeforeUpdateEventHandler;
+  }
+}
+export const ModelBeforeUpdateEventHandler = createAbstraction("ModelBeforeUpdateEventHandler");
+/**
+ * ModelAfterUpdateEvent - Published after updating a model
+ */
+export class ModelAfterUpdateEvent extends DomainEvent {
+  eventType = "Cms/Model/AfterUpdate";
+  getHandlerAbstraction() {
+    return ModelAfterUpdateEventHandler;
+  }
+}
+export const ModelAfterUpdateEventHandler = createAbstraction("ModelAfterUpdateEventHandler");
+/**
+ * ModelUpdateErrorEvent - Published when update fails
+ */
+export class ModelUpdateErrorEvent extends DomainEvent {
+  eventType = "Cms/Model/UpdateError";
+  getHandlerAbstraction() {
+    return ModelUpdateErrorEventHandler;
+  }
+}
+export const ModelUpdateErrorEventHandler = createAbstraction("ModelUpdateErrorEventHandler");
+
+//# sourceMappingURL=events.js.map

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

@@ -0,0 +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":[]}

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

@@ -0,0 +1,7 @@
+/**
+ * UpdateModel Feature
+ *
+ * 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>;

package/features/contentModel/UpdateModel/feature.js

@@ -0,0 +1,22 @@
+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();
+  }
+});
+
+//# sourceMappingURL=feature.js.map

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

@@ -0,0 +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":[]}

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

@@ -0,0 +1,2 @@
+export { UpdateModelUseCase, UpdateModelRepository } from "./abstractions.js";
+export { ModelAfterUpdateEventHandler, ModelBeforeUpdateEventHandler } from "./events.js";

package/features/contentModel/UpdateModel/index.js

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

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

@@ -0,0 +1 @@
+{"version":3,"names":["UpdateModelUseCase","UpdateModelRepository","ModelAfterUpdateEventHandler","ModelBeforeUpdateEventHandler"],"sources":["index.ts"],"sourcesContent":["export { UpdateModelUseCase, UpdateModelRepository } from \"./abstractions.js\";\nexport { ModelAfterUpdateEventHandler, ModelBeforeUpdateEventHandler } from \"./events.js\";\n"],"mappings":"AAAA,SAASA,kBAAkB,EAAEC,qBAAqB;AAClD,SAASC,4BAA4B,EAAEC,6BAA6B","ignoreList":[]}

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

@@ -0,0 +1,29 @@
+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 type { CmsModel } from "../../../types/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
+ */
+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);
+    fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>>;
+    fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>>;
+    private fetchAndMergeModels;
+}
+export declare const ModelsFetcher: typeof ModelsFetcherImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("~/features/contentModel/shared/abstractions.js").IModelsFetcher>;
+};
+export {};

package/features/contentModel/shared/ModelsFetcher.js

@@ -0,0 +1,86 @@
+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 { ModelNotFoundError, ModelPersistenceError } from "../../../domain/contentModel/errors.js";
+import { createCacheKey } from "../../../utils/index.js";
+import { ensureTypeTag } from "../../../domain/contentModel/ensureTypeTag.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) {
+    this.modelCache = modelCache;
+    this.pluginModelsProvider = pluginModelsProvider;
+    this.storageOperations = storageOperations;
+    this.tenantContext = tenantContext;
+  }
+  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));
+    }
+  }
+  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) {
+    // 1. Fetch database models (with caching)
+    const dbCacheKey = createCacheKey({
+      tenant,
+      id: "storage"
+    });
+    const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {
+      return this.storageOperations.models.list({
+        where: {
+          tenant
+        }
+      });
+    });
+
+    // 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]
+});
+
+//# sourceMappingURL=ModelsFetcher.js.map

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

@@ -0,0 +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":[]}

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

@@ -0,0 +1,21 @@
+import { AccessControl, CmsContext } from "../../../features/shared/abstractions.js";
+import { PluginModelsProvider as ProviderAbstraction } from "./abstractions.js";
+import type { CmsModel } from "../../../types/index.js";
+import { type IModelsProvider } from "../../../features/modelBuilder/models/abstractions.js";
+/**
+ * PluginModelsProvider implementation that fetches models from:
+ * 1. Legacy CmsModelPlugin instances
+ * 2. New ModelBuilder providers (public and private)
+ */
+declare class PluginModelsProviderImpl implements ProviderAbstraction.Interface {
+    private cmsContext;
+    private accessControl;
+    private modelsProvider;
+    constructor(cmsContext: CmsContext.Interface, accessControl: AccessControl.Interface, modelsProvider: IModelsProvider);
+    list(tenant: string): Promise<CmsModel[]>;
+    private ensureTypeTag;
+}
+export declare const PluginModelsProvider: typeof PluginModelsProviderImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IPluginModelsProvider>;
+};
+export {};

package/features/contentModel/shared/PluginModelsProvider.js

@@ -0,0 +1,64 @@
+import { AccessControl, CmsContext } from "../../shared/abstractions.js";
+import { PluginModelsProvider as ProviderAbstraction } from "./abstractions.js";
+import { CmsModelPlugin } from "../../../plugins/CmsModelPlugin.js";
+import { filterAsync } from "../../../utils/filterAsync.js";
+import { ModelsProvider } from "../../modelBuilder/models/abstractions.js";
+
+/**
+ * PluginModelsProvider implementation that fetches models from:
+ * 1. Legacy CmsModelPlugin instances
+ * 2. New ModelBuilder providers (public and private)
+ */
+class PluginModelsProviderImpl {
+  constructor(cmsContext, accessControl, modelsProvider) {
+    this.cmsContext = cmsContext;
+    this.accessControl = accessControl;
+    this.modelsProvider = modelsProvider;
+  }
+  async list(tenant) {
+    // Get models from legacy plugins
+    const modelPlugins = this.cmsContext.plugins.byType(CmsModelPlugin.type);
+    const legacyModels = modelPlugins.filter(plugin => {
+      const {
+        tenant: modelTenant
+      } = plugin.contentModel;
+      // Filter by tenant if specified in plugin
+      if (modelTenant && modelTenant !== tenant) {
+        return false;
+      }
+      return true;
+    }).map(plugin => {
+      return {
+        ...plugin.contentModel,
+        tags: this.ensureTypeTag(plugin.contentModel),
+        tenant
+      };
+    });
+    const allowedLegacyModels = await filterAsync(legacyModels, model => {
+      return this.accessControl.canAccessModel({
+        model
+      });
+    });
+
+    // Get models from new builder providers. These already have access control applied.
+    const builderModels = await this.modelsProvider.list(tenant);
+
+    // Combine both sources
+    return [...allowedLegacyModels, ...builderModels];
+  }
+  ensureTypeTag(model) {
+    // Let's make sure we have a `type` tag assigned.
+    // If `type` tag is not set, set it to a default one (`model`).
+    const tags = model.tags || [];
+    if (!tags.some(tag => tag.startsWith("type:"))) {
+      tags.push("type:model");
+    }
+    return tags;
+  }
+}
+export const PluginModelsProvider = ProviderAbstraction.createImplementation({
+  implementation: PluginModelsProviderImpl,
+  dependencies: [CmsContext, AccessControl, ModelsProvider]
+});
+
+//# sourceMappingURL=PluginModelsProvider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["AccessControl","CmsContext","PluginModelsProvider","ProviderAbstraction","CmsModelPlugin","filterAsync","ModelsProvider","PluginModelsProviderImpl","constructor","cmsContext","accessControl","modelsProvider","list","tenant","modelPlugins","plugins","byType","type","legacyModels","filter","plugin","modelTenant","contentModel","map","tags","ensureTypeTag","allowedLegacyModels","model","canAccessModel","builderModels","some","tag","startsWith","push","createImplementation","implementation","dependencies"],"sources":["PluginModelsProvider.ts"],"sourcesContent":["import { AccessControl, CmsContext } from \"~/features/shared/abstractions.js\";\nimport { PluginModelsProvider as ProviderAbstraction } from \"./abstractions.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin.js\";\nimport { filterAsync } from \"~/utils/filterAsync.js\";\nimport {\n    ModelsProvider,\n    type IModelsProvider\n} from \"~/features/modelBuilder/models/abstractions.js\";\n\n/**\n * PluginModelsProvider implementation that fetches models from:\n * 1. Legacy CmsModelPlugin instances\n * 2. New ModelBuilder providers (public and private)\n */\nclass PluginModelsProviderImpl implements ProviderAbstraction.Interface {\n    public constructor(\n        private cmsContext: CmsContext.Interface,\n        private accessControl: AccessControl.Interface,\n        private modelsProvider: IModelsProvider\n    ) {}\n\n    async list(tenant: string): Promise<CmsModel[]> {\n        // Get models from legacy plugins\n        const modelPlugins = this.cmsContext.plugins.byType<CmsModelPlugin>(CmsModelPlugin.type);\n\n        const legacyModels = modelPlugins\n            .filter(plugin => {\n                const { tenant: modelTenant } = plugin.contentModel;\n                // Filter by tenant if specified in plugin\n                if (modelTenant && modelTenant !== tenant) {\n                    return false;\n                }\n\n                return true;\n            })\n            .map(plugin => {\n                return {\n                    ...plugin.contentModel,\n                    tags: this.ensureTypeTag(plugin.contentModel),\n                    tenant\n                };\n            }) as unknown as CmsModel[];\n\n        const allowedLegacyModels = await filterAsync(legacyModels, model => {\n            return this.accessControl.canAccessModel({ model });\n        });\n\n        // Get models from new builder providers. These already have access control applied.\n        const builderModels = await this.modelsProvider.list(tenant);\n\n        // Combine both sources\n        return [...allowedLegacyModels, ...builderModels];\n    }\n\n    private ensureTypeTag(model: Pick<CmsModel, \"tags\">) {\n        // Let's make sure we have a `type` tag assigned.\n        // If `type` tag is not set, set it to a default one (`model`).\n        const tags = model.tags || [];\n        if (!tags.some(tag => tag.startsWith(\"type:\"))) {\n            tags.push(\"type:model\");\n        }\n\n        return tags;\n    }\n}\n\nexport const PluginModelsProvider = ProviderAbstraction.createImplementation({\n    implementation: PluginModelsProviderImpl,\n    dependencies: [CmsContext, AccessControl, ModelsProvider]\n});\n"],"mappings":"AAAA,SAASA,aAAa,EAAEC,UAAU;AAClC,SAASC,oBAAoB,IAAIC,mBAAmB;AAEpD,SAASC,cAAc;AACvB,SAASC,WAAW;AACpB,SACIC,cAAc;;AAIlB;AACA;AACA;AACA;AACA;AACA,MAAMC,wBAAwB,CAA0C;EAC7DC,WAAWA,CACNC,UAAgC,EAChCC,aAAsC,EACtCC,cAA+B,EACzC;IAAA,KAHUF,UAAgC,GAAhCA,UAAgC;IAAA,KAChCC,aAAsC,GAAtCA,aAAsC;IAAA,KACtCC,cAA+B,GAA/BA,cAA+B;EACxC;EAEH,MAAMC,IAAIA,CAACC,MAAc,EAAuB;IAC5C;IACA,MAAMC,YAAY,GAAG,IAAI,CAACL,UAAU,CAACM,OAAO,CAACC,MAAM,CAAiBZ,cAAc,CAACa,IAAI,CAAC;IAExF,MAAMC,YAAY,GAAGJ,YAAY,CAC5BK,MAAM,CAACC,MAAM,IAAI;MACd,MAAM;QAAEP,MAAM,EAAEQ;MAAY,CAAC,GAAGD,MAAM,CAACE,YAAY;MACnD;MACA,IAAID,WAAW,IAAIA,WAAW,KAAKR,MAAM,EAAE;QACvC,OAAO,KAAK;MAChB;MAEA,OAAO,IAAI;IACf,CAAC,CAAC,CACDU,GAAG,CAACH,MAAM,IAAI;MACX,OAAO;QACH,GAAGA,MAAM,CAACE,YAAY;QACtBE,IAAI,EAAE,IAAI,CAACC,aAAa,CAACL,MAAM,CAACE,YAAY,CAAC;QAC7CT;MACJ,CAAC;IACL,CAAC,CAA0B;IAE/B,MAAMa,mBAAmB,GAAG,MAAMrB,WAAW,CAACa,YAAY,EAAES,KAAK,IAAI;MACjE,OAAO,IAAI,CAACjB,aAAa,CAACkB,cAAc,CAAC;QAAED;MAAM,CAAC,CAAC;IACvD,CAAC,CAAC;;IAEF;IACA,MAAME,aAAa,GAAG,MAAM,IAAI,CAAClB,cAAc,CAACC,IAAI,CAACC,MAAM,CAAC;;IAE5D;IACA,OAAO,CAAC,GAAGa,mBAAmB,EAAE,GAAGG,aAAa,CAAC;EACrD;EAEQJ,aAAaA,CAACE,KAA6B,EAAE;IACjD;IACA;IACA,MAAMH,IAAI,GAAGG,KAAK,CAACH,IAAI,IAAI,EAAE;IAC7B,IAAI,CAACA,IAAI,CAACM,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE;MAC5CR,IAAI,CAACS,IAAI,CAAC,YAAY,CAAC;IAC3B;IAEA,OAAOT,IAAI;EACf;AACJ;AAEA,OAAO,MAAMtB,oBAAoB,GAAGC,mBAAmB,CAAC+B,oBAAoB,CAAC;EACzEC,cAAc,EAAE5B,wBAAwB;EACxC6B,YAAY,EAAE,CAACnC,UAAU,EAAED,aAAa,EAAEM,cAAc;AAC5D,CAAC,CAAC","ignoreList":[]}