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

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromRepository.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport {\n    ModelCache,\n    ModelsFetcher,\n    PluginModelsProvider\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsContext, StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    validateExistingModelId,\n    validateModelIdAllowed\n} from \"~/crud/contentModel/validate/modelId.js\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed.js\";\nimport { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\nimport { RuntimeTenant } from \"~/features/runtimeTenant/abstractions.js\";\n\n/**\n * Generate modelId from model following the exact logic from beforeCreate.ts\n */\nconst getModelId = (model: { modelId?: string; name?: string }): string => {\n    const { modelId, name } = model;\n    const value = modelId ? modelId.trim() : null;\n    if (value) {\n        const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();\n        if (isModelIdValid) {\n            return value;\n        }\n        return camelCase(value);\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new ModelValidationError(\n        `There is no \"modelId\" or \"name\" passed into the create model from method.`\n    );\n};\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned model.\n *\n * Responsibilities:\n * - Generate modelId from input\n * - Validate modelId is allowed (not in disallowed list)\n * - Validate API name endings\n * - Validate modelId uniqueness (database + plugins)\n * - Validate API name uniqueness (database + plugins)\n * - Validate plugin conflicts\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful create\n */\nclass CreateModelFromRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly modelsFetcher: ModelsFetcher.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface,\n        private readonly runtimeTenant: RuntimeTenant.Interface\n    ) {}\n\n    async execute(initialModel: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>> {\n        const model = this.runtimeTenant.assign(initialModel);\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Generate modelId using the exact logic from beforeCreate.ts\n            const modelId = getModelId(model);\n            model.modelId = modelId;\n\n            // Validate modelId is allowed (not in disallowed list)\n            try {\n                validateModelIdAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate modelId uniqueness (database)\n            const modelsResult = await this.modelsFetcher.fetchAll();\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const existingModel = modelsResult.value.find(m => m.modelId === modelId);\n            if (existingModel) {\n                return Result.fail(new ModelAlreadyExistsError({ modelId }));\n            }\n\n            // Check for plugin model conflicts\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n            const pluginModelConflict = pluginModels.find(pm => {\n                return (\n                    pm.modelId === model.modelId ||\n                    pm.singularApiName === model.singularApiName ||\n                    pm.pluralApiName === model.pluralApiName\n                );\n            });\n\n            if (pluginModelConflict) {\n                return Result.fail(\n                    new ModelAlreadyExistsError({\n                        modelId,\n                        message: `Model \"${modelId}\" is already registered via a plugin.`\n                    })\n                );\n            }\n\n            const models = modelsResult.value;\n\n            try {\n                // Validate uniqueness\n                for (const existingModel of models) {\n                    validateExistingModelId({\n                        existingModel,\n                        model\n                    });\n                    validateSingularApiName({\n                        existingModel,\n                        model\n                    });\n                    validatePluralApiName({\n                        existingModel,\n                        model\n                    });\n                }\n\n                // Validate model fields\n                await validateModelFields({\n                    models,\n                    model,\n                    context: this.cmsContext\n                });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Ensure type tags\n            model.tags = ensureTypeTag(model);\n\n            const fields = await this.modelFieldCompression.compress(model.fields);\n\n            // Persist to storage\n            await this.storageOperations.models.create({\n                model: {\n                    ...model,\n                    fields\n                }\n            });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok(model);\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelFromRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelFromRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ModelsFetcher,\n        StorageOperations,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression,\n        RuntimeTenant\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelFromRepositoryImpl","modelCache","pluginModelsProvider","modelsFetcher","storageOperations","tenantContext","cmsContext","modelFieldCompression","runtimeTenant","initialModel","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","modelsResult","ModelPersistenceError","existingModel","m","ModelAlreadyExistsError","pluginModels","pluginModelConflict","pm","models","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","CreateModelFromRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ModelsFetcher","StorageOperations","TenantContext","CmsContext","ModelFieldCompression","RuntimeTenant"],"mappings":"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"}
+{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromRepository.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromRepository.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport {\n    ModelCache,\n    ModelsFetcher,\n    PluginModelsProvider\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { CreateModelStorageOperation } from \"~/features/shared/storageOperations/model/CreateModelStorageOperation.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport {\n    validateExistingModelId,\n    validateModelIdAllowed\n} from \"~/crud/contentModel/validate/modelId.js\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed.js\";\nimport { validateSingularApiName } from \"~/domain/contentModel/validation/singularApiName.js\";\nimport { validatePluralApiName } from \"~/domain/contentModel/validation/pluralApiName.js\";\nimport { validateModelFields } from \"~/domain/contentModel/validation/modelFields.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\n\n/**\n * Generate modelId from model following the exact logic from beforeCreate.ts\n */\nconst getModelId = (model: { modelId?: string; name?: string }): string => {\n    const { modelId, name } = model;\n    const value = modelId ? modelId.trim() : null;\n    if (value) {\n        const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();\n        if (isModelIdValid) {\n            return value;\n        }\n        return camelCase(value);\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new ModelValidationError(\n        `There is no \"modelId\" or \"name\" passed into the create model from method.`\n    );\n};\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned model.\n *\n * Responsibilities:\n * - Generate modelId from input\n * - Validate modelId is allowed (not in disallowed list)\n * - Validate API name endings\n * - Validate modelId uniqueness (database + plugins)\n * - Validate API name uniqueness (database + plugins)\n * - Validate plugin conflicts\n * - Validate model fields\n * - Persist to storage\n * - Clear ModelCache after successful create\n */\nclass CreateModelFromRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly modelsFetcher: ModelsFetcher.Interface,\n        private readonly createModel: CreateModelStorageOperation.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async execute(model: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Generate modelId using the exact logic from beforeCreate.ts\n            const modelId = getModelId(model);\n            model.modelId = modelId;\n\n            // Validate modelId is allowed (not in disallowed list)\n            try {\n                validateModelIdAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate API name endings\n            try {\n                validateEndingAllowed({ model });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Validate modelId uniqueness (database)\n            const modelsResult = await this.modelsFetcher.fetchAll();\n            if (modelsResult.isFail()) {\n                return Result.fail(new ModelPersistenceError(modelsResult.error));\n            }\n\n            const existingModel = modelsResult.value.find(m => m.modelId === modelId);\n            if (existingModel) {\n                return Result.fail(new ModelAlreadyExistsError({ modelId }));\n            }\n\n            // Check for plugin model conflicts\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n            const pluginModelConflict = pluginModels.find(pm => {\n                return (\n                    pm.modelId === model.modelId ||\n                    pm.singularApiName === model.singularApiName ||\n                    pm.pluralApiName === model.pluralApiName\n                );\n            });\n\n            if (pluginModelConflict) {\n                return Result.fail(\n                    new ModelAlreadyExistsError({\n                        modelId,\n                        message: `Model \"${modelId}\" is already registered via a plugin.`\n                    })\n                );\n            }\n\n            const models = modelsResult.value;\n\n            try {\n                // Validate uniqueness\n                for (const existingModel of models) {\n                    validateExistingModelId({\n                        existingModel,\n                        model\n                    });\n                    validateSingularApiName({\n                        existingModel,\n                        model\n                    });\n                    validatePluralApiName({\n                        existingModel,\n                        model\n                    });\n                }\n\n                // Validate model fields\n                await validateModelFields({\n                    models,\n                    model,\n                    context: this.cmsContext\n                });\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError({ message: error.message, data: error.data })\n                );\n            }\n\n            // Ensure type tags\n            model.tags = ensureTypeTag(model);\n\n            const fields = await this.modelFieldCompression.compress(model.fields);\n\n            // Persist to storage\n            await this.createModel.execute({\n                model: {\n                    ...model,\n                    fields\n                }\n            });\n\n            // Clear cache\n            this.modelCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n}\n\nexport const CreateModelFromRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateModelFromRepositoryImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        ModelsFetcher,\n        CreateModelStorageOperation,\n        TenantContext,\n        CmsContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["getModelId","model","modelId","name","value","isModelIdValid","camelCase","ModelValidationError","CreateModelFromRepositoryImpl","modelCache","pluginModelsProvider","modelsFetcher","createModel","tenantContext","cmsContext","modelFieldCompression","tenant","validateModelIdAllowed","error","Result","validateEndingAllowed","modelsResult","ModelPersistenceError","existingModel","m","ModelAlreadyExistsError","pluginModels","pluginModelConflict","pm","models","validateExistingModelId","validateSingularApiName","validatePluralApiName","validateModelFields","ensureTypeTag","fields","CreateModelFromRepository","RepositoryAbstraction","ModelCache","PluginModelsProvider","ModelsFetcher","CreateModelStorageOperation","TenantContext","CmsContext","ModelFieldCompression"],"mappings":"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"}

package/features/contentModel/CreateModelFrom/CreateModelFromUseCase.js

@@ -77,10 +77,10 @@ class CreateModelFromUseCaseImpl {
             return Result.fail(result.error);
         }
         await this.eventPublisher.publish(new ModelAfterCreateFromEvent({
-            model: result.value,
+            model,
             original
         }));
-        return Result.ok(result.value);
+        return Result.ok(model);
     }
 }
 const CreateModelFromUseCase_CreateModelFromUseCase = CreateModelFromUseCase.createImplementation({

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromUseCase.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateModelFromRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { ModelBeforeCreateFromEvent } from \"./events.js\";\nimport { ModelAfterCreateFromEvent } from \"./events.js\";\nimport { ModelCreateFromErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelCreateFromValidation } from \"~/domain/contentModel/schemas.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelCreateFromInput } from \"~/types/index.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\n\n/**\n * CreateModelFromUseCase - Clone/copy a model from existing model.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Fetch original model\n * - Create new model preserving fields and layout\n * - Handle group changes\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 (modelId generation, uniqueness, etc.)\n */\nclass CreateModelFromUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateModelFromRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(\n        modelId: string,\n        input: CmsModelCreateFromInput\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 = getResult.value;\n\n        // Validate input (merge with original description if not provided)\n        const validationResult = await createModelCreateFromValidation().safeParseAsync({\n            ...input,\n            description: input.description || original.description\n        });\n\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(new ModelValidationError(zodError.message));\n        }\n\n        const data = removeUndefinedValues(validationResult.data);\n\n        // Create new model from original (preserve fields and layout)\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...original,\n            isPlugin: undefined,\n            group: input.group || original.group,\n            singularApiName: data.singularApiName,\n            pluralApiName: data.pluralApiName,\n            icon: data.icon,\n            name: data.name,\n            modelId: data.modelId || \"\", // Will be set by repository\n            description: data.description || \"\",\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            },\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            tenant: original.tenant || tenant.id\n        };\n\n        // Access control check on the new model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Publish before event\n        await this.eventPublisher.publish(\n            new ModelBeforeCreateFromEvent({ model, original, input: data })\n        );\n\n        // Persist via repository (repository will validate and set modelId)\n        const result = await this.repository.execute(model);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelCreateFromErrorEvent({\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(\n            new ModelAfterCreateFromEvent({\n                model: result.value,\n                original\n            })\n        );\n\n        return Result.ok(result.value);\n    }\n}\n\nexport const CreateModelFromUseCase = UseCaseAbstraction.createImplementation({\n    implementation: CreateModelFromUseCaseImpl,\n    dependencies: [\n        GetModelUseCase,\n        EventPublisher,\n        CreateModelFromRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateModelFromUseCaseImpl","getModelUseCase","eventPublisher","repository","accessControl","tenantContext","identityContext","modelId","input","canAccess","Result","ModelNotAuthorizedError","getResult","original","validationResult","createModelCreateFromValidation","zodError","createZodError","ModelValidationError","data","removeUndefinedValues","identity","tenant","model","undefined","Date","canAccessModel","ModelBeforeCreateFromEvent","result","ModelCreateFromErrorEvent","ModelAfterCreateFromEvent","CreateModelFromUseCase","UseCaseAbstraction","GetModelUseCase","EventPublisher","CreateModelFromRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;;AAiCA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,cAAwC,EACxCC,UAA+C,EAC/CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aANUL,eAAe,GAAfA;aACAC,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QACFC,OAAe,EACfC,KAA8B,EACqB;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,WAAWD,UAAU,KAAK;QAGhC,MAAME,mBAAmB,MAAMC,kCAAkC,cAAc,CAAC;YAC5E,GAAGP,KAAK;YACR,aAAaA,MAAM,WAAW,IAAIK,SAAS,WAAW;QAC1D;QAEA,IAAI,CAACC,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOJ,OAAO,IAAI,CAAC,IAAIQ,qBAAqBF,SAAS,OAAO;QAChE;QAEA,MAAMG,OAAOC,sBAAsBN,iBAAiB,IAAI;QAGxD,MAAMO,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,QAAkB;YACpB,GAAGV,QAAQ;YACX,UAAUW;YACV,OAAOhB,MAAM,KAAK,IAAIK,SAAS,KAAK;YACpC,iBAAiBM,KAAK,eAAe;YACrC,eAAeA,KAAK,aAAa;YACjC,MAAMA,KAAK,IAAI;YACf,MAAMA,KAAK,IAAI;YACf,SAASA,KAAK,OAAO,IAAI;YACzB,aAAaA,KAAK,WAAW,IAAI;YACjC,WAAW;gBACP,IAAIE,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;YACA,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,QAAQZ,SAAS,MAAM,IAAIS,OAAO,EAAE;QACxC;QAGA,MAAMI,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEH;YAAO,KAAK;QAAI;QACjF,IAAI,CAACG,gBACD,OAAOhB,OAAO,IAAI,CAACC,wBAAwB,SAAS,CAACY;QAIzD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAII,2BAA2B;YAAEJ;YAAOV;YAAU,OAAOM;QAAK;QAIlE,MAAMS,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACL;QAC7C,IAAIK,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,0BAA0B;gBAC1B,OAAOV;gBACPI;gBACAV;gBACA,OAAOe,OAAO,KAAK;YACvB;YAEJ,OAAOlB,OAAO,IAAI,CAACkB,OAAO,KAAK;QACnC;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIE,0BAA0B;YAC1B,OAAOF,OAAO,KAAK;YACnBf;QACJ;QAGJ,OAAOH,OAAO,EAAE,CAACkB,OAAO,KAAK;IACjC;AACJ;AAEO,MAAMG,gDAAyBC,uBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBhC;IAChB,cAAc;QACViC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"features/contentModel/CreateModelFrom/CreateModelFromUseCase.js","sources":["../../../../src/features/contentModel/CreateModelFrom/CreateModelFromUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateModelFromUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { CreateModelFromRepository } from \"./abstractions.js\";\nimport { EventPublisher } from \"@webiny/api-core/features/eventPublisher/index.js\";\nimport { ModelBeforeCreateFromEvent } from \"./events.js\";\nimport { ModelAfterCreateFromEvent } from \"./events.js\";\nimport { ModelCreateFromErrorEvent } from \"./events.js\";\nimport { AccessControl } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ModelNotAuthorizedError, ModelValidationError } from \"~/domain/contentModel/errors.js\";\nimport { createZodError } from \"@webiny/utils\";\nimport { removeUndefinedValues } from \"@webiny/utils\";\nimport { createModelCreateFromValidation } from \"~/domain/contentModel/schemas.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { CmsModelCreateFromInput } from \"~/types/index.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\n\n/**\n * CreateModelFromUseCase - Clone/copy a model from existing model.\n *\n * Responsibilities:\n * - Validate input (Zod)\n * - Fetch original model\n * - Create new model preserving fields and layout\n * - Handle group changes\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 (modelId generation, uniqueness, etc.)\n */\nclass CreateModelFromUseCaseImpl implements UseCaseAbstraction.Interface {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private eventPublisher: EventPublisher.Interface,\n        private repository: CreateModelFromRepository.Interface,\n        private accessControl: AccessControl.Interface,\n        private tenantContext: TenantContext.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async execute(\n        modelId: string,\n        input: CmsModelCreateFromInput\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 = getResult.value;\n\n        // Validate input (merge with original description if not provided)\n        const validationResult = await createModelCreateFromValidation().safeParseAsync({\n            ...input,\n            description: input.description || original.description\n        });\n\n        if (!validationResult.success) {\n            const zodError = createZodError(validationResult.error);\n            return Result.fail(new ModelValidationError(zodError.message));\n        }\n\n        const data = removeUndefinedValues(validationResult.data);\n\n        // Create new model from original (preserve fields and layout)\n        const identity = this.identityContext.getIdentity();\n        const tenant = this.tenantContext.getTenant();\n\n        const model: CmsModel = {\n            ...original,\n            isPlugin: undefined,\n            group: input.group || original.group,\n            singularApiName: data.singularApiName,\n            pluralApiName: data.pluralApiName,\n            icon: data.icon,\n            name: data.name,\n            modelId: data.modelId || \"\", // Will be set by repository\n            description: data.description || \"\",\n            createdBy: {\n                id: identity.id,\n                displayName: identity.displayName,\n                type: identity.type\n            },\n            createdOn: new Date().toISOString(),\n            savedOn: new Date().toISOString(),\n            tenant: original.tenant || tenant.id\n        };\n\n        // Access control check on the new model\n        const canAccessModel = await this.accessControl.canAccessModel({ model, rwd: \"w\" });\n        if (!canAccessModel) {\n            return Result.fail(ModelNotAuthorizedError.fromModel(model));\n        }\n\n        // Publish before event\n        await this.eventPublisher.publish(\n            new ModelBeforeCreateFromEvent({ model, original, input: data })\n        );\n\n        // Persist via repository (repository will validate and set modelId)\n        const result = await this.repository.execute(model);\n        if (result.isFail()) {\n            // Publish error event\n            await this.eventPublisher.publish(\n                new ModelCreateFromErrorEvent({\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 ModelAfterCreateFromEvent({ model, original }));\n\n        return Result.ok(model);\n    }\n}\n\nexport const CreateModelFromUseCase = UseCaseAbstraction.createImplementation({\n    implementation: CreateModelFromUseCaseImpl,\n    dependencies: [\n        GetModelUseCase,\n        EventPublisher,\n        CreateModelFromRepository,\n        AccessControl,\n        TenantContext,\n        IdentityContext\n    ]\n});\n"],"names":["CreateModelFromUseCaseImpl","getModelUseCase","eventPublisher","repository","accessControl","tenantContext","identityContext","modelId","input","canAccess","Result","ModelNotAuthorizedError","getResult","original","validationResult","createModelCreateFromValidation","zodError","createZodError","ModelValidationError","data","removeUndefinedValues","identity","tenant","model","undefined","Date","canAccessModel","ModelBeforeCreateFromEvent","result","ModelCreateFromErrorEvent","ModelAfterCreateFromEvent","CreateModelFromUseCase","UseCaseAbstraction","GetModelUseCase","EventPublisher","CreateModelFromRepository","AccessControl","TenantContext","IdentityContext"],"mappings":";;;;;;;;;;;AAiCA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,cAAwC,EACxCC,UAA+C,EAC/CC,aAAsC,EACtCC,aAAsC,EACtCC,eAA0C,CACpD;aANUL,eAAe,GAAfA;aACAC,cAAc,GAAdA;aACAC,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,QACFC,OAAe,EACfC,KAA8B,EACqB;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,WAAWD,UAAU,KAAK;QAGhC,MAAME,mBAAmB,MAAMC,kCAAkC,cAAc,CAAC;YAC5E,GAAGP,KAAK;YACR,aAAaA,MAAM,WAAW,IAAIK,SAAS,WAAW;QAC1D;QAEA,IAAI,CAACC,iBAAiB,OAAO,EAAE;YAC3B,MAAME,WAAWC,eAAeH,iBAAiB,KAAK;YACtD,OAAOJ,OAAO,IAAI,CAAC,IAAIQ,qBAAqBF,SAAS,OAAO;QAChE;QAEA,MAAMG,OAAOC,sBAAsBN,iBAAiB,IAAI;QAGxD,MAAMO,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QACjD,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;QAE3C,MAAMC,QAAkB;YACpB,GAAGV,QAAQ;YACX,UAAUW;YACV,OAAOhB,MAAM,KAAK,IAAIK,SAAS,KAAK;YACpC,iBAAiBM,KAAK,eAAe;YACrC,eAAeA,KAAK,aAAa;YACjC,MAAMA,KAAK,IAAI;YACf,MAAMA,KAAK,IAAI;YACf,SAASA,KAAK,OAAO,IAAI;YACzB,aAAaA,KAAK,WAAW,IAAI;YACjC,WAAW;gBACP,IAAIE,SAAS,EAAE;gBACf,aAAaA,SAAS,WAAW;gBACjC,MAAMA,SAAS,IAAI;YACvB;YACA,WAAW,IAAII,OAAO,WAAW;YACjC,SAAS,IAAIA,OAAO,WAAW;YAC/B,QAAQZ,SAAS,MAAM,IAAIS,OAAO,EAAE;QACxC;QAGA,MAAMI,iBAAiB,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YAAEH;YAAO,KAAK;QAAI;QACjF,IAAI,CAACG,gBACD,OAAOhB,OAAO,IAAI,CAACC,wBAAwB,SAAS,CAACY;QAIzD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAII,2BAA2B;YAAEJ;YAAOV;YAAU,OAAOM;QAAK;QAIlE,MAAMS,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAACL;QAC7C,IAAIK,OAAO,MAAM,IAAI;YAEjB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC7B,IAAIC,0BAA0B;gBAC1B,OAAOV;gBACPI;gBACAV;gBACA,OAAOe,OAAO,KAAK;YACvB;YAEJ,OAAOlB,OAAO,IAAI,CAACkB,OAAO,KAAK;QACnC;QAGA,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAIE,0BAA0B;YAAEP;YAAOV;QAAS;QAElF,OAAOH,OAAO,EAAE,CAACa;IACrB;AACJ;AAEO,MAAMQ,gDAAyBC,uBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBhC;IAChB,cAAc;QACViC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

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

@@ -30,7 +30,7 @@ export declare namespace CreateModelFromUseCase {
  * CreateModelFromRepository - Validates domain rules and persists cloned model.
  */
 export interface ICreateModelFromRepository {
-    execute(model: CmsModel): Promise<Result<CmsModel, RepositoryError>>;
+    execute(model: CmsModel): Promise<Result<void, RepositoryError>>;
 }
 export interface ICreateModelFromRepositoryErrors {
     alreadyExists: ModelAlreadyExistsError;

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/CreateModelFrom/abstractions.js","sources":["../../../../src/features/contentModel/CreateModelFrom/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelCreateFromInput } from \"~/types/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelNotAuthorizedError,\n    type ModelNotFoundError,\n    type ModelPersistenceError,\n    type ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateModelFrom Use Case (Clone/Copy Model)\n */\nexport interface ICreateModelFromUseCase {\n    execute(\n        modelId: string,\n        input: CmsModelCreateFromInput\n    ): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface ICreateModelFromUseCaseErrors {\n    notFound: ModelNotFoundError;\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    alreadyExists: ModelAlreadyExistsError;\n    persistence: ModelPersistenceError;\n    groupNotFound: GroupNotFoundError;\n    groupNotAccessible: GroupNotAuthorizedError;\n}\n\ntype UseCaseError = ICreateModelFromUseCaseErrors[keyof ICreateModelFromUseCaseErrors];\n\n/** Create a content model by cloning an existing one. */\nexport const CreateModelFromUseCase =\n    createAbstraction<ICreateModelFromUseCase>(\"CreateModelFromUseCase\");\n\nexport namespace CreateModelFromUseCase {\n    export type Interface = ICreateModelFromUseCase;\n    export type Input = CmsModelCreateFromInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned model.\n */\nexport interface ICreateModelFromRepository {\n    execute(model: CmsModel): Promise<Result<CmsModel, RepositoryError>>;\n}\n\nexport interface ICreateModelFromRepositoryErrors {\n    alreadyExists: ModelAlreadyExistsError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n}\n\ntype RepositoryError = ICreateModelFromRepositoryErrors[keyof ICreateModelFromRepositoryErrors];\n\nexport const CreateModelFromRepository = createAbstraction<ICreateModelFromRepository>(\n    \"CreateModelFromRepository\"\n);\n\nexport namespace CreateModelFromRepository {\n    export type Interface = ICreateModelFromRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateModelFromUseCase","createAbstraction","CreateModelFromRepository"],"mappings":";AAqCO,MAAMA,yBACTC,kBAA2C;AAyBxC,MAAMC,4BAA4BD,kBACrC"}
+{"version":3,"file":"features/contentModel/CreateModelFrom/abstractions.js","sources":["../../../../src/features/contentModel/CreateModelFrom/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelCreateFromInput } from \"~/types/index.js\";\nimport {\n    ModelAlreadyExistsError,\n    ModelNotAuthorizedError,\n    type ModelNotFoundError,\n    type ModelPersistenceError,\n    type ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport {\n    type GroupNotAuthorizedError,\n    type GroupNotFoundError\n} from \"~/domain/contentModelGroup/errors.js\";\n\n/**\n * CreateModelFrom Use Case (Clone/Copy Model)\n */\nexport interface ICreateModelFromUseCase {\n    execute(\n        modelId: string,\n        input: CmsModelCreateFromInput\n    ): Promise<Result<CmsModel, UseCaseError>>;\n}\n\nexport interface ICreateModelFromUseCaseErrors {\n    notFound: ModelNotFoundError;\n    notAuthorized: ModelNotAuthorizedError;\n    validation: ModelValidationError;\n    alreadyExists: ModelAlreadyExistsError;\n    persistence: ModelPersistenceError;\n    groupNotFound: GroupNotFoundError;\n    groupNotAccessible: GroupNotAuthorizedError;\n}\n\ntype UseCaseError = ICreateModelFromUseCaseErrors[keyof ICreateModelFromUseCaseErrors];\n\n/** Create a content model by cloning an existing one. */\nexport const CreateModelFromUseCase =\n    createAbstraction<ICreateModelFromUseCase>(\"CreateModelFromUseCase\");\n\nexport namespace CreateModelFromUseCase {\n    export type Interface = ICreateModelFromUseCase;\n    export type Input = CmsModelCreateFromInput;\n\n    export type Error = UseCaseError;\n    export type Return = Promise<Result<CmsModel, UseCaseError>>;\n}\n\n/**\n * CreateModelFromRepository - Validates domain rules and persists cloned model.\n */\nexport interface ICreateModelFromRepository {\n    execute(model: CmsModel): Promise<Result<void, RepositoryError>>;\n}\n\nexport interface ICreateModelFromRepositoryErrors {\n    alreadyExists: ModelAlreadyExistsError;\n    validation: ModelValidationError;\n    persistence: ModelPersistenceError;\n}\n\ntype RepositoryError = ICreateModelFromRepositoryErrors[keyof ICreateModelFromRepositoryErrors];\n\nexport const CreateModelFromRepository = createAbstraction<ICreateModelFromRepository>(\n    \"CreateModelFromRepository\"\n);\n\nexport namespace CreateModelFromRepository {\n    export type Interface = ICreateModelFromRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["CreateModelFromUseCase","createAbstraction","CreateModelFromRepository"],"mappings":";AAqCO,MAAMA,yBACTC,kBAA2C;AAyBxC,MAAMC,4BAA4BD,kBACrC"}

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

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

package/features/contentModel/DeleteModel/DeleteModelRepository.js

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

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

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

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

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

package/features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.js

@@ -1,6 +1,6 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteModelUseCase } from "./abstractions.js";
-import { CmsContext } from "../../shared/abstractions.js";
+import { CmsContext, HeadlessCms } from "../../shared/abstractions.js";
 import { CMS_MODEL_SINGLETON_TAG } from "../../../constants.js";
 import { ModelCannotDeleteHasEntriesError, ModelCannotDeleteHasEntriesInTrashError, ModelPersistenceError, ModelValidationError } from "../../../domain/contentModel/errors.js";
 class DeleteModelWithEntryCleanupImpl {
@@ -8,8 +8,11 @@ class DeleteModelWithEntryCleanupImpl {
         this.cmsContext = cmsContext;
         this.decoratee = decoratee;
     }
+    get cms() {
+        return this.cmsContext.container.resolve(HeadlessCms);
+    }
     async execute(modelId) {
-        const model = await this.cmsContext.cms.getModel(modelId);
+        const model = await this.cms.getModel(modelId);
         const tags = Array.isArray(model.tags) ? model.tags : [];
         if (tags.includes(CMS_MODEL_SINGLETON_TAG)) {
             try {
@@ -24,26 +27,26 @@ class DeleteModelWithEntryCleanupImpl {
         return this.decoratee.execute(modelId);
     }
     async deleteSingletonEntries(model) {
-        const [latestEntries] = await this.cmsContext.cms.listLatestEntries(model, {
+        const [latestEntries] = await this.cms.listLatestEntries(model, {
             limit: 10000
         });
-        for (const item of latestEntries)await this.cmsContext.cms.deleteEntry(model, item.id, {
+        for (const item of latestEntries)await this.cms.deleteEntry(model, item.id, {
             permanently: true
         });
-        const [deletedEntries] = await this.cmsContext.cms.listDeletedEntries(model, {
+        const [deletedEntries] = await this.cms.listDeletedEntries(model, {
             limit: 10000
         });
-        for (const item of deletedEntries)await this.cmsContext.cms.deleteEntry(model, item.id, {
+        for (const item of deletedEntries)await this.cms.deleteEntry(model, item.id, {
             permanently: true
         });
     }
     async canDelete(model) {
         try {
-            const [latestEntries] = await this.cmsContext.cms.listLatestEntries(model, {
+            const [latestEntries] = await this.cms.listLatestEntries(model, {
                 limit: 1
             });
             if (latestEntries.length > 0) return Result.fail(new ModelCannotDeleteHasEntriesError(model.modelId));
-            const [deletedEntries] = await this.cmsContext.cms.listDeletedEntries(model, {
+            const [deletedEntries] = await this.cms.listDeletedEntries(model, {
                 limit: 1
             });
             if (deletedEntries.length > 0) return Result.fail(new ModelCannotDeleteHasEntriesInTrashError(model.modelId));

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

@@ -1 +1 @@
-{"version":3,"file":"features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.js","sources":["../../../../src/features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteModelUseCase } from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { CMS_MODEL_SINGLETON_TAG } from \"~/constants.js\";\nimport {\n    ModelCannotDeleteHasEntriesError,\n    ModelCannotDeleteHasEntriesInTrashError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsModel } from \"~/types/model.js\";\n\n/**\n * DeleteModelWithEntryCleanup - Decorator that handles entry cleanup/validation before deletion.\n *\n * Responsibilities:\n * 1. For singleton models: Delete all entries (latest + deleted)\n * 2. For regular models: Check if there are any entries - if yes, throw error\n * 3. Only proceed to the base use case if validations pass\n */\nclass DeleteModelWithEntryCleanupImpl implements DeleteModelUseCase.Interface {\n    public constructor(\n        private cmsContext: CmsContext.Interface,\n        private decoratee: DeleteModelUseCase.Interface\n    ) {}\n\n    async execute(modelId: string): Promise<Result<void, DeleteModelUseCase.Error>> {\n        // First, get the model through the decorated use case's flow (up to before deletion)\n        // We need to perform validation before the actual deletion happens\n\n        // Get the model from context to check entries\n        const model = await this.cmsContext.cms.getModel(modelId);\n\n        const tags = Array.isArray(model.tags) ? model.tags : [];\n\n        // Handle singleton models: delete all entries\n        if (tags.includes(CMS_MODEL_SINGLETON_TAG)) {\n            try {\n                await this.deleteSingletonEntries(model);\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError(\n                        `Failed to delete singleton entries: ${(error as Error).message}`\n                    )\n                );\n            }\n\n            // Proceed with the actual deletion\n            return this.decoratee.execute(modelId);\n        }\n\n        // Regular models\n        const canDelete = await this.canDelete(model);\n        if (canDelete.isFail()) {\n            return Result.fail(canDelete.error);\n        }\n\n        // Proceed with the actual deletion\n        return this.decoratee.execute(modelId);\n    }\n\n    private async deleteSingletonEntries(model: any): Promise<void> {\n        // Delete all latest entries\n        const [latestEntries] = await this.cmsContext.cms.listLatestEntries(model, {\n            limit: 10000\n        });\n\n        for (const item of latestEntries) {\n            await this.cmsContext.cms.deleteEntry(model, item.id, {\n                permanently: true\n            });\n        }\n\n        // Delete all deleted entries (trash)\n        const [deletedEntries] = await this.cmsContext.cms.listDeletedEntries(model, {\n            limit: 10000\n        });\n\n        for (const item of deletedEntries) {\n            await this.cmsContext.cms.deleteEntry(model, item.id, {\n                permanently: true\n            });\n        }\n    }\n\n    private async canDelete(\n        model: CmsModel\n    ): Promise<\n        Result<\n            boolean,\n            | ModelCannotDeleteHasEntriesError\n            | ModelCannotDeleteHasEntriesInTrashError\n            | ModelPersistenceError\n        >\n    > {\n        try {\n            // Check for latest entries\n            const [latestEntries] = await this.cmsContext.cms.listLatestEntries(model, {\n                limit: 1\n            });\n\n            if (latestEntries.length > 0) {\n                return Result.fail(new ModelCannotDeleteHasEntriesError(model.modelId));\n            }\n\n            // Check for deleted entries (trash)\n            const [deletedEntries] = await this.cmsContext.cms.listDeletedEntries(model, {\n                limit: 1\n            });\n\n            if (deletedEntries.length > 0) {\n                return Result.fail(new ModelCannotDeleteHasEntriesInTrashError(model.modelId));\n            }\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error));\n        }\n\n        return Result.ok(true);\n    }\n}\n\nexport const DeleteModelWithEntryCleanup = DeleteModelUseCase.createDecorator({\n    decorator: DeleteModelWithEntryCleanupImpl,\n    dependencies: [CmsContext]\n});\n"],"names":["DeleteModelWithEntryCleanupImpl","cmsContext","decoratee","modelId","model","tags","Array","CMS_MODEL_SINGLETON_TAG","error","Result","ModelValidationError","canDelete","latestEntries","item","deletedEntries","ModelCannotDeleteHasEntriesError","ModelCannotDeleteHasEntriesInTrashError","ModelPersistenceError","DeleteModelWithEntryCleanup","DeleteModelUseCase","CmsContext"],"mappings":";;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,SAAuC,CACjD;aAFUD,UAAU,GAAVA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,OAAe,EAAmD;QAK5E,MAAMC,QAAQ,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAACD;QAEjD,MAAME,OAAOC,MAAM,OAAO,CAACF,MAAM,IAAI,IAAIA,MAAM,IAAI,GAAG,EAAE;QAGxD,IAAIC,KAAK,QAAQ,CAACE,0BAA0B;YACxC,IAAI;gBACA,MAAM,IAAI,CAAC,sBAAsB,CAACH;YACtC,EAAE,OAAOI,OAAO;gBACZ,OAAOC,OAAO,IAAI,CACd,IAAIC,qBACA,CAAC,oCAAoC,EAAGF,MAAgB,OAAO,EAAE;YAG7E;YAGA,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAACL;QAClC;QAGA,MAAMQ,YAAY,MAAM,IAAI,CAAC,SAAS,CAACP;QACvC,IAAIO,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAItC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAACR;IAClC;IAEA,MAAc,uBAAuBC,KAAU,EAAiB;QAE5D,MAAM,CAACQ,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAACR,OAAO;YACvE,OAAO;QACX;QAEA,KAAK,MAAMS,QAAQD,cACf,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAACR,OAAOS,KAAK,EAAE,EAAE;YAClD,aAAa;QACjB;QAIJ,MAAM,CAACC,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAACV,OAAO;YACzE,OAAO;QACX;QAEA,KAAK,MAAMS,QAAQC,eACf,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAACV,OAAOS,KAAK,EAAE,EAAE;YAClD,aAAa;QACjB;IAER;IAEA,MAAc,UACVT,KAAe,EAQjB;QACE,IAAI;YAEA,MAAM,CAACQ,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAACR,OAAO;gBACvE,OAAO;YACX;YAEA,IAAIQ,cAAc,MAAM,GAAG,GACvB,OAAOH,OAAO,IAAI,CAAC,IAAIM,iCAAiCX,MAAM,OAAO;YAIzE,MAAM,CAACU,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAACV,OAAO;gBACzE,OAAO;YACX;YAEA,IAAIU,eAAe,MAAM,GAAG,GACxB,OAAOL,OAAO,IAAI,CAAC,IAAIO,wCAAwCZ,MAAM,OAAO;QAEpF,EAAE,OAAOI,OAAO;YACZ,OAAOC,OAAO,IAAI,CAAC,IAAIQ,sBAAsBT;QACjD;QAEA,OAAOC,OAAO,EAAE,CAAC;IACrB;AACJ;AAEO,MAAMS,8BAA8BC,mBAAmB,eAAe,CAAC;IAC1E,WAAWnB;IACX,cAAc;QAACoB;KAAW;AAC9B"}
+{"version":3,"file":"features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.js","sources":["../../../../src/features/contentModel/DeleteModel/DeleteModelWithEntryCleanup.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteModelUseCase } from \"./abstractions.js\";\nimport { CmsContext, HeadlessCms } from \"~/features/shared/abstractions.js\";\nimport { CMS_MODEL_SINGLETON_TAG } from \"~/constants.js\";\nimport {\n    ModelCannotDeleteHasEntriesError,\n    ModelCannotDeleteHasEntriesInTrashError,\n    ModelPersistenceError,\n    ModelValidationError\n} from \"~/domain/contentModel/errors.js\";\nimport { CmsModel } from \"~/types/model.js\";\n\n/**\n * DeleteModelWithEntryCleanup - Decorator that handles entry cleanup/validation before deletion.\n *\n * Responsibilities:\n * 1. For singleton models: Delete all entries (latest + deleted)\n * 2. For regular models: Check if there are any entries - if yes, throw error\n * 3. Only proceed to the base use case if validations pass\n */\nclass DeleteModelWithEntryCleanupImpl implements DeleteModelUseCase.Interface {\n    public constructor(\n        private cmsContext: CmsContext.Interface,\n        private decoratee: DeleteModelUseCase.Interface\n    ) {}\n\n    private get cms(): HeadlessCms.Interface {\n        return this.cmsContext.container.resolve(HeadlessCms);\n    }\n\n    async execute(modelId: string): Promise<Result<void, DeleteModelUseCase.Error>> {\n        // First, get the model through the decorated use case's flow (up to before deletion)\n        // We need to perform validation before the actual deletion happens\n\n        // Get the model from context to check entries\n        const model = await this.cms.getModel(modelId);\n\n        const tags = Array.isArray(model.tags) ? model.tags : [];\n\n        // Handle singleton models: delete all entries\n        if (tags.includes(CMS_MODEL_SINGLETON_TAG)) {\n            try {\n                await this.deleteSingletonEntries(model);\n            } catch (error) {\n                return Result.fail(\n                    new ModelValidationError(\n                        `Failed to delete singleton entries: ${(error as Error).message}`\n                    )\n                );\n            }\n\n            // Proceed with the actual deletion\n            return this.decoratee.execute(modelId);\n        }\n\n        // Regular models\n        const canDelete = await this.canDelete(model);\n        if (canDelete.isFail()) {\n            return Result.fail(canDelete.error);\n        }\n\n        // Proceed with the actual deletion\n        return this.decoratee.execute(modelId);\n    }\n\n    private async deleteSingletonEntries(model: any): Promise<void> {\n        // Delete all latest entries\n        const [latestEntries] = await this.cms.listLatestEntries(model, {\n            limit: 10000\n        });\n\n        for (const item of latestEntries) {\n            await this.cms.deleteEntry(model, item.id, {\n                permanently: true\n            });\n        }\n\n        // Delete all deleted entries (trash)\n        const [deletedEntries] = await this.cms.listDeletedEntries(model, {\n            limit: 10000\n        });\n\n        for (const item of deletedEntries) {\n            await this.cms.deleteEntry(model, item.id, {\n                permanently: true\n            });\n        }\n    }\n\n    private async canDelete(\n        model: CmsModel\n    ): Promise<\n        Result<\n            boolean,\n            | ModelCannotDeleteHasEntriesError\n            | ModelCannotDeleteHasEntriesInTrashError\n            | ModelPersistenceError\n        >\n    > {\n        try {\n            // Check for latest entries\n            const [latestEntries] = await this.cms.listLatestEntries(model, {\n                limit: 1\n            });\n\n            if (latestEntries.length > 0) {\n                return Result.fail(new ModelCannotDeleteHasEntriesError(model.modelId));\n            }\n\n            // Check for deleted entries (trash)\n            const [deletedEntries] = await this.cms.listDeletedEntries(model, {\n                limit: 1\n            });\n\n            if (deletedEntries.length > 0) {\n                return Result.fail(new ModelCannotDeleteHasEntriesInTrashError(model.modelId));\n            }\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error));\n        }\n\n        return Result.ok(true);\n    }\n}\n\nexport const DeleteModelWithEntryCleanup = DeleteModelUseCase.createDecorator({\n    decorator: DeleteModelWithEntryCleanupImpl,\n    dependencies: [CmsContext]\n});\n"],"names":["DeleteModelWithEntryCleanupImpl","cmsContext","decoratee","HeadlessCms","modelId","model","tags","Array","CMS_MODEL_SINGLETON_TAG","error","Result","ModelValidationError","canDelete","latestEntries","item","deletedEntries","ModelCannotDeleteHasEntriesError","ModelCannotDeleteHasEntriesInTrashError","ModelPersistenceError","DeleteModelWithEntryCleanup","DeleteModelUseCase","CmsContext"],"mappings":";;;;;AAoBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,SAAuC,CACjD;aAFUD,UAAU,GAAVA;aACAC,SAAS,GAATA;IACT;IAEH,IAAY,MAA6B;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAACC;IAC7C;IAEA,MAAM,QAAQC,OAAe,EAAmD;QAK5E,MAAMC,QAAQ,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAACD;QAEtC,MAAME,OAAOC,MAAM,OAAO,CAACF,MAAM,IAAI,IAAIA,MAAM,IAAI,GAAG,EAAE;QAGxD,IAAIC,KAAK,QAAQ,CAACE,0BAA0B;YACxC,IAAI;gBACA,MAAM,IAAI,CAAC,sBAAsB,CAACH;YACtC,EAAE,OAAOI,OAAO;gBACZ,OAAOC,OAAO,IAAI,CACd,IAAIC,qBACA,CAAC,oCAAoC,EAAGF,MAAgB,OAAO,EAAE;YAG7E;YAGA,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAACL;QAClC;QAGA,MAAMQ,YAAY,MAAM,IAAI,CAAC,SAAS,CAACP;QACvC,IAAIO,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAItC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAACR;IAClC;IAEA,MAAc,uBAAuBC,KAAU,EAAiB;QAE5D,MAAM,CAACQ,cAAc,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAACR,OAAO;YAC5D,OAAO;QACX;QAEA,KAAK,MAAMS,QAAQD,cACf,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAACR,OAAOS,KAAK,EAAE,EAAE;YACvC,aAAa;QACjB;QAIJ,MAAM,CAACC,eAAe,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAACV,OAAO;YAC9D,OAAO;QACX;QAEA,KAAK,MAAMS,QAAQC,eACf,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAACV,OAAOS,KAAK,EAAE,EAAE;YACvC,aAAa;QACjB;IAER;IAEA,MAAc,UACVT,KAAe,EAQjB;QACE,IAAI;YAEA,MAAM,CAACQ,cAAc,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAACR,OAAO;gBAC5D,OAAO;YACX;YAEA,IAAIQ,cAAc,MAAM,GAAG,GACvB,OAAOH,OAAO,IAAI,CAAC,IAAIM,iCAAiCX,MAAM,OAAO;YAIzE,MAAM,CAACU,eAAe,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAACV,OAAO;gBAC9D,OAAO;YACX;YAEA,IAAIU,eAAe,MAAM,GAAG,GACxB,OAAOL,OAAO,IAAI,CAAC,IAAIO,wCAAwCZ,MAAM,OAAO;QAEpF,EAAE,OAAOI,OAAO;YACZ,OAAOC,OAAO,IAAI,CAAC,IAAIQ,sBAAsBT;QACjD;QAEA,OAAOC,OAAO,EAAE,CAAC;IACrB;AACJ;AAEO,MAAMS,8BAA8BC,mBAAmB,eAAe,CAAC;IAC1E,WAAWpB;IACX,cAAc;QAACqB;KAAW;AAC9B"}

package/features/contentModel/RefModelsGenerator/RefModelsGenerator.d.ts

@@ -0,0 +1,19 @@
+import { type IRefModelsGenerator, type RefModelMetadata } from "./abstractions.js";
+import { ModelToAstConverter } from "../ModelToAstConverter/abstractions.js";
+import { ValuesSelectionGenerator } from "../ValuesSelectionGenerator/abstractions.js";
+import { ModelsFetcher } from "../shared/abstractions.js";
+import type { CmsModel } from "../../../types/index.js";
+declare class RefModelsGeneratorImpl implements IRefModelsGenerator {
+    private readonly modelToAst;
+    private readonly modelsFetcher;
+    private readonly valuesSelectionGenerator;
+    constructor(modelToAst: ModelToAstConverter.Interface, modelsFetcher: ModelsFetcher.Interface, valuesSelectionGenerator: ValuesSelectionGenerator.Interface);
+    generate(model: CmsModel): Promise<Record<string, RefModelMetadata>>;
+    private collectRefModelIds;
+    private collectFromFieldNode;
+    private collectFromCollectionNode;
+}
+export declare const RefModelsGenerator: typeof RefModelsGeneratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IRefModelsGenerator>;
+};
+export {};

package/features/contentModel/RefModelsGenerator/RefModelsGenerator.js

@@ -0,0 +1,56 @@
+import { RefModelsGenerator } from "./abstractions.js";
+import { ModelToAstConverter } from "../ModelToAstConverter/abstractions.js";
+import { ValuesSelectionGenerator } from "../ValuesSelectionGenerator/abstractions.js";
+import { ModelsFetcher } from "../shared/abstractions.js";
+class RefModelsGeneratorImpl {
+    constructor(modelToAst, modelsFetcher, valuesSelectionGenerator){
+        this.modelToAst = modelToAst;
+        this.modelsFetcher = modelsFetcher;
+        this.valuesSelectionGenerator = valuesSelectionGenerator;
+    }
+    async generate(model) {
+        const ast = this.modelToAst.toAst(model);
+        const refModelIds = new Set();
+        for (const node of ast.children)this.collectRefModelIds(node, refModelIds);
+        const result = {};
+        for (const modelId of refModelIds){
+            const fetchResult = await this.modelsFetcher.fetchById(modelId);
+            if (fetchResult.isFail()) continue;
+            const refModel = fetchResult.value;
+            const valuesSelection = this.valuesSelectionGenerator.generate(refModel);
+            result[modelId] = {
+                valuesSelection
+            };
+        }
+        return result;
+    }
+    collectRefModelIds(node, modelIds) {
+        if ("field" === node.type) this.collectFromFieldNode(node, modelIds);
+        else if ("collection" === node.type) this.collectFromCollectionNode(node, modelIds);
+    }
+    collectFromFieldNode(node, modelIds) {
+        const { field, children } = node;
+        if ("ref" === field.type) {
+            const models = field.settings?.models;
+            if (Array.isArray(models)) {
+                for (const refModel of models)if (refModel.modelId) modelIds.add(refModel.modelId);
+            }
+            return;
+        }
+        for (const child of children)this.collectRefModelIds(child, modelIds);
+    }
+    collectFromCollectionNode(node, modelIds) {
+        for (const child of node.children)this.collectRefModelIds(child, modelIds);
+    }
+}
+const RefModelsGenerator_RefModelsGenerator = RefModelsGenerator.createImplementation({
+    implementation: RefModelsGeneratorImpl,
+    dependencies: [
+        ModelToAstConverter,
+        ModelsFetcher,
+        ValuesSelectionGenerator
+    ]
+});
+export { RefModelsGenerator_RefModelsGenerator as RefModelsGenerator };
+
+//# sourceMappingURL=RefModelsGenerator.js.map

package/features/contentModel/RefModelsGenerator/RefModelsGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/RefModelsGenerator/RefModelsGenerator.js","sources":["../../../../src/features/contentModel/RefModelsGenerator/RefModelsGenerator.ts"],"sourcesContent":["import {\n    RefModelsGenerator as Abstraction,\n    type IRefModelsGenerator,\n    type RefModelMetadata\n} from \"./abstractions.js\";\nimport { ModelToAstConverter } from \"../ModelToAstConverter/abstractions.js\";\nimport { ValuesSelectionGenerator } from \"../ValuesSelectionGenerator/abstractions.js\";\nimport { ModelsFetcher } from \"../shared/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsModelFieldAstNode,\n    CmsModelFieldAstNodeField,\n    CmsModelFieldAstNodeCollection\n} from \"~/types/index.js\";\n\nclass RefModelsGeneratorImpl implements IRefModelsGenerator {\n    constructor(\n        private readonly modelToAst: ModelToAstConverter.Interface,\n        private readonly modelsFetcher: ModelsFetcher.Interface,\n        private readonly valuesSelectionGenerator: ValuesSelectionGenerator.Interface\n    ) {}\n\n    async generate(model: CmsModel): Promise<Record<string, RefModelMetadata>> {\n        const ast = this.modelToAst.toAst(model);\n        const refModelIds = new Set<string>();\n\n        for (const node of ast.children) {\n            this.collectRefModelIds(node, refModelIds);\n        }\n\n        const result: Record<string, RefModelMetadata> = {};\n\n        for (const modelId of refModelIds) {\n            const fetchResult = await this.modelsFetcher.fetchById(modelId);\n            if (fetchResult.isFail()) {\n                continue;\n            }\n\n            const refModel = fetchResult.value;\n            const valuesSelection = this.valuesSelectionGenerator.generate(refModel);\n\n            result[modelId] = { valuesSelection };\n        }\n\n        return result;\n    }\n\n    private collectRefModelIds(node: CmsModelFieldAstNode, modelIds: Set<string>): void {\n        if (node.type === \"field\") {\n            this.collectFromFieldNode(node, modelIds);\n        } else if (node.type === \"collection\") {\n            this.collectFromCollectionNode(node, modelIds);\n        }\n    }\n\n    private collectFromFieldNode(node: CmsModelFieldAstNodeField, modelIds: Set<string>): void {\n        const { field, children } = node;\n\n        if (field.type === \"ref\") {\n            const models = field.settings?.models;\n            if (Array.isArray(models)) {\n                for (const refModel of models) {\n                    if (refModel.modelId) {\n                        modelIds.add(refModel.modelId);\n                    }\n                }\n            }\n            return;\n        }\n\n        for (const child of children) {\n            this.collectRefModelIds(child, modelIds);\n        }\n    }\n\n    private collectFromCollectionNode(\n        node: CmsModelFieldAstNodeCollection,\n        modelIds: Set<string>\n    ): void {\n        for (const child of node.children) {\n            this.collectRefModelIds(child, modelIds);\n        }\n    }\n}\n\nexport const RefModelsGenerator = Abstraction.createImplementation({\n    implementation: RefModelsGeneratorImpl,\n    dependencies: [ModelToAstConverter, ModelsFetcher, ValuesSelectionGenerator]\n});\n"],"names":["RefModelsGeneratorImpl","modelToAst","modelsFetcher","valuesSelectionGenerator","model","ast","refModelIds","Set","node","result","modelId","fetchResult","refModel","valuesSelection","modelIds","field","children","models","Array","child","RefModelsGenerator","Abstraction","ModelToAstConverter","ModelsFetcher","ValuesSelectionGenerator"],"mappings":";;;;AAeA,MAAMA;IACF,YACqBC,UAAyC,EACzCC,aAAsC,EACtCC,wBAA4D,CAC/E;aAHmBF,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,wBAAwB,GAAxBA;IAClB;IAEH,MAAM,SAASC,KAAe,EAA6C;QACvE,MAAMC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAACD;QAClC,MAAME,cAAc,IAAIC;QAExB,KAAK,MAAMC,QAAQH,IAAI,QAAQ,CAC3B,IAAI,CAAC,kBAAkB,CAACG,MAAMF;QAGlC,MAAMG,SAA2C,CAAC;QAElD,KAAK,MAAMC,WAAWJ,YAAa;YAC/B,MAAMK,cAAc,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAACD;YACvD,IAAIC,YAAY,MAAM,IAClB;YAGJ,MAAMC,WAAWD,YAAY,KAAK;YAClC,MAAME,kBAAkB,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAACD;YAE/DH,MAAM,CAACC,QAAQ,GAAG;gBAAEG;YAAgB;QACxC;QAEA,OAAOJ;IACX;IAEQ,mBAAmBD,IAA0B,EAAEM,QAAqB,EAAQ;QAChF,IAAIN,AAAc,YAAdA,KAAK,IAAI,EACT,IAAI,CAAC,oBAAoB,CAACA,MAAMM;aAC7B,IAAIN,AAAc,iBAAdA,KAAK,IAAI,EAChB,IAAI,CAAC,yBAAyB,CAACA,MAAMM;IAE7C;IAEQ,qBAAqBN,IAA+B,EAAEM,QAAqB,EAAQ;QACvF,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAE,GAAGR;QAE5B,IAAIO,AAAe,UAAfA,MAAM,IAAI,EAAY;YACtB,MAAME,SAASF,MAAM,QAAQ,EAAE;YAC/B,IAAIG,MAAM,OAAO,CAACD,SACd;gBAAA,KAAK,MAAML,YAAYK,OACnB,IAAIL,SAAS,OAAO,EAChBE,SAAS,GAAG,CAACF,SAAS,OAAO;YAErC;YAEJ;QACJ;QAEA,KAAK,MAAMO,SAASH,SAChB,IAAI,CAAC,kBAAkB,CAACG,OAAOL;IAEvC;IAEQ,0BACJN,IAAoC,EACpCM,QAAqB,EACjB;QACJ,KAAK,MAAMK,SAASX,KAAK,QAAQ,CAC7B,IAAI,CAAC,kBAAkB,CAACW,OAAOL;IAEvC;AACJ;AAEO,MAAMM,wCAAqBC,mBAAAA,oBAAgC,CAAC;IAC/D,gBAAgBrB;IAChB,cAAc;QAACsB;QAAqBC;QAAeC;KAAyB;AAChF"}

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

@@ -0,0 +1,11 @@
+import type { CmsModel } from "../../../types/index.js";
+export interface RefModelMetadata {
+    valuesSelection: string;
+}
+export interface IRefModelsGenerator {
+    generate(model: CmsModel): Promise<Record<string, RefModelMetadata>>;
+}
+export declare const RefModelsGenerator: import("@webiny/di").Abstraction<IRefModelsGenerator>;
+export declare namespace RefModelsGenerator {
+    type Interface = IRefModelsGenerator;
+}

package/features/contentModel/RefModelsGenerator/abstractions.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const RefModelsGenerator = createAbstraction("RefModelsGenerator");
+export { RefModelsGenerator };
+
+//# sourceMappingURL=abstractions.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/RefModelsGenerator/abstractions.js","sources":["../../../../src/features/contentModel/RefModelsGenerator/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\n\nexport interface RefModelMetadata {\n    valuesSelection: string;\n}\n\nexport interface IRefModelsGenerator {\n    generate(model: CmsModel): Promise<Record<string, RefModelMetadata>>;\n}\n\nexport const RefModelsGenerator = createAbstraction<IRefModelsGenerator>(\"RefModelsGenerator\");\n\nexport namespace RefModelsGenerator {\n    export type Interface = IRefModelsGenerator;\n}\n"],"names":["RefModelsGenerator","createAbstraction"],"mappings":";AAWO,MAAMA,qBAAqBC,kBAAuC"}

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

@@ -0,0 +1,4 @@
+export declare const RefModelsGeneratorFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/contentModel/RefModelsGenerator/feature.js

@@ -0,0 +1,11 @@
+import { createFeature } from "@webiny/feature/api";
+import { RefModelsGenerator } from "./RefModelsGenerator.js";
+const RefModelsGeneratorFeature = createFeature({
+    name: "RefModelsGenerator",
+    register (container) {
+        container.register(RefModelsGenerator);
+    }
+});
+export { RefModelsGeneratorFeature };
+
+//# sourceMappingURL=feature.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/contentModel/RefModelsGenerator/feature.js","sources":["../../../../src/features/contentModel/RefModelsGenerator/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { RefModelsGenerator } from \"./RefModelsGenerator.js\";\n\nexport const RefModelsGeneratorFeature = createFeature({\n    name: \"RefModelsGenerator\",\n    register(container) {\n        container.register(RefModelsGenerator);\n    }\n});\n"],"names":["RefModelsGeneratorFeature","createFeature","container","RefModelsGenerator"],"mappings":";;AAGO,MAAMA,4BAA4BC,cAAc;IACnD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

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

@@ -0,0 +1,2 @@
+export { RefModelsGenerator } from "./abstractions.js";
+export { RefModelsGeneratorFeature } from "./feature.js";

package/features/contentModel/RefModelsGenerator/index.js

@@ -0,0 +1,2 @@
+export { RefModelsGenerator } from "./abstractions.js";
+export { RefModelsGeneratorFeature } from "./feature.js";

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

@@ -1,10 +1,11 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateModelRepository as RepositoryAbstraction } from "./abstractions.js";
 import { ModelCache, ModelsFetcher } from "../../../features/contentModel/shared/abstractions.js";
-import { CmsContext, StorageOperations } from "../../../features/shared/abstractions.js";
+import { CmsContext } from "../../../features/shared/abstractions.js";
+import { UpdateModelStorageOperation } from "../../../features/shared/storageOperations/model/UpdateModelStorageOperation.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 import type { CmsModel } from "../../../types/index.js";
 import { ModelFieldCompression } from "../../../features/contentModel/ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 /**
  * UpdateModelRepository - Validates domain rules and persists model updates.
  *
@@ -19,12 +20,12 @@ import { RuntimeTenant } from "../../../features/runtimeTenant/abstractions.js";
 declare class UpdateModelRepositoryImpl implements RepositoryAbstraction.Interface {
     private readonly modelCache;
     private readonly modelsFetcher;
-    private readonly storageOperations;
+    private readonly updateModel;
     private readonly cmsContext;
     private readonly modelFieldCompression;
-    private readonly runtimeTenant;
-    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, storageOperations: StorageOperations.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface, runtimeTenant: RuntimeTenant.Interface);
-    execute(initialModel: CmsModel, original: CmsModel): Promise<Result<CmsModel, RepositoryAbstraction.Error>>;
+    private readonly identityContext;
+    constructor(modelCache: ModelCache.Interface, modelsFetcher: ModelsFetcher.Interface, updateModel: UpdateModelStorageOperation.Interface, cmsContext: CmsContext.Interface, modelFieldCompression: ModelFieldCompression.Interface, identityContext: IdentityContext.Interface);
+    execute(model: CmsModel, original: CmsModel): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const UpdateModelRepository: typeof UpdateModelRepositoryImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IUpdateModelRepository>;

package/features/contentModel/UpdateModel/UpdateModelRepository.js

@@ -2,24 +2,24 @@ import { Result } from "@webiny/feature/api";
 import { UpdateModelRepository } from "./abstractions.js";
 import { ModelCache, ModelsFetcher } from "../shared/abstractions.js";
 import { ModelCannotUpdateCodeModelError, ModelPersistenceError, ModelValidationError } from "../../../domain/contentModel/errors.js";
-import { CmsContext, StorageOperations } from "../../shared/abstractions.js";
+import { CmsContext } from "../../shared/abstractions.js";
+import { UpdateModelStorageOperation } from "../../shared/storageOperations/model/UpdateModelStorageOperation.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 import { validateEndingAllowed } from "../../../crud/contentModel/validate/endingAllowed.js";
 import { validateSingularApiName } from "../../../domain/contentModel/validation/singularApiName.js";
 import { validatePluralApiName } from "../../../domain/contentModel/validation/pluralApiName.js";
 import { validateModelFields } from "../../../domain/contentModel/validation/modelFields.js";
 import { ModelFieldCompression } from "../ModelFieldCompression/index.js";
-import { RuntimeTenant } from "../../runtimeTenant/abstractions.js";
 class UpdateModelRepositoryImpl {
-    constructor(modelCache, modelsFetcher, storageOperations, cmsContext, modelFieldCompression, runtimeTenant){
+    constructor(modelCache, modelsFetcher, updateModel, cmsContext, modelFieldCompression, identityContext){
         this.modelCache = modelCache;
         this.modelsFetcher = modelsFetcher;
-        this.storageOperations = storageOperations;
+        this.updateModel = updateModel;
         this.cmsContext = cmsContext;
         this.modelFieldCompression = modelFieldCompression;
-        this.runtimeTenant = runtimeTenant;
+        this.identityContext = identityContext;
     }
-    async execute(initialModel, original) {
-        const model = this.runtimeTenant.assign(initialModel);
+    async execute(model, original) {
         try {
             try {
                 validateEndingAllowed({
@@ -31,7 +31,7 @@ class UpdateModelRepositoryImpl {
                     data: error.data
                 }));
             }
-            const modelsResult = await this.cmsContext.security.withoutAuthorization(async ()=>await this.modelsFetcher.fetchAll());
+            const modelsResult = await this.identityContext.withoutAuthorization(async ()=>await this.modelsFetcher.fetchAll());
             if (modelsResult.isFail()) return Result.fail(new ModelPersistenceError(modelsResult.error));
             const allModels = modelsResult.value;
             const models = allModels.filter((m)=>m.modelId !== model.modelId);
@@ -62,14 +62,14 @@ class UpdateModelRepositoryImpl {
                 }));
             }
             const fields = await this.modelFieldCompression.compress(model.fields);
-            await this.storageOperations.models.update({
+            await this.updateModel.execute({
                 model: {
                     ...model,
                     fields
                 }
             });
             this.modelCache.clear();
-            return Result.ok(model);
+            return Result.ok();
         } catch (error) {
             return Result.fail(new ModelPersistenceError(error));
         }
@@ -80,10 +80,10 @@ const UpdateModelRepository_UpdateModelRepository = UpdateModelRepository.create
     dependencies: [
         ModelCache,
         ModelsFetcher,
-        StorageOperations,
+        UpdateModelStorageOperation,
         CmsContext,
         ModelFieldCompression,
-        RuntimeTenant
+        IdentityContext
     ]
 });
 export { UpdateModelRepository_UpdateModelRepository as UpdateModelRepository };