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

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

@@ -1 +1 @@
-{"version":3,"names":["Result","ModelCache","ModelsFetcher","FetcherAbstraction","PluginModelsProvider","StorageOperations","TenantContext","ModelNotFoundError","ModelPersistenceError","createCacheKey","ensureTypeTag","ModelFieldCompression","ModelsFetcherImpl","constructor","modelCache","pluginModelsProvider","storageOperations","tenantContext","modelFieldCompression","fetchAll","tenant","getTenant","cacheKey","id","pluginModels","list","cached","getOrSet","fetchAndMergeModels","ok","error","fail","fetchById","modelId","result","isFail","model","value","find","m","dbCacheKey","databaseModels","models","where","Promise","all","map","fields","decompress","taggedDatabaseModels","tags","createImplementation","implementation","dependencies"],"sources":["ModelsFetcher.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    ModelCache,\n    ModelsFetcher as FetcherAbstraction\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport { PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\n\n/**\n * ModelsFetcherImpl - Implementation with multi-level caching.\n *\n * Caching strategy:\n * 1. Plugin models are cached per tenant (with access control applied by PluginModelsProvider)\n * 2. Database models are cached per tenant (raw from DB)\n * 3. Filtered database models are cached per tenant + identity (with access control applied)\n * 4. Final merged list is cached per tenant + identity\n */\nclass ModelsFetcherImpl implements FetcherAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Create a cache key based on tenant + identity\n            const cacheKey = createCacheKey({\n                tenant: tenant.id\n            });\n\n            // Fetch plugin models (with caching and access control)\n            const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n\n            // Try to get from cache first\n            const cached = await this.modelCache.getOrSet(cacheKey, async () => {\n                return this.fetchAndMergeModels(tenant.id);\n            });\n\n            return Result.ok([...cached, ...pluginModels]);\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n\n    async fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>> {\n        const result = await this.fetchAll();\n        if (result.isFail()) {\n            return Result.fail(new ModelPersistenceError(result.error));\n        }\n\n        const model = result.value.find(m => m.modelId === modelId);\n        if (!model) {\n            return Result.fail(new ModelNotFoundError(modelId));\n        }\n\n        return Result.ok(model);\n    }\n\n    private async fetchAndMergeModels(tenant: string): Promise<CmsModel[]> {\n        // 1. Fetch database models (with caching)\n        const dbCacheKey = createCacheKey({ tenant, id: \"storage\" });\n        const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {\n            const models = await this.storageOperations.models.list({ where: { tenant } });\n\n            return Promise.all(\n                models.map(async model => {\n                    const fields = await this.modelFieldCompression.decompress(model.fields);\n\n                    return {\n                        ...model,\n                        fields\n                    };\n                })\n            );\n        });\n\n        // 2. Ensure type tags on database models\n        const taggedDatabaseModels = databaseModels.map(model => {\n            model.tags = ensureTypeTag(model);\n            return model;\n        });\n\n        // 3. Return merged models.\n        return taggedDatabaseModels;\n    }\n}\n\nexport const ModelsFetcher = FetcherAbstraction.createImplementation({\n    implementation: ModelsFetcherImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        StorageOperations,\n        TenantContext,\n        ModelFieldCompression\n    ]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"features/contentModel/shared/ModelsFetcher.js","sources":["../../../../src/features/contentModel/shared/ModelsFetcher.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    ModelCache,\n    ModelsFetcher as FetcherAbstraction\n} from \"~/features/contentModel/shared/abstractions.js\";\nimport { PluginModelsProvider } from \"~/features/contentModel/shared/abstractions.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\nimport { createCacheKey } from \"~/utils/index.js\";\nimport { ensureTypeTag } from \"~/domain/contentModel/ensureTypeTag.js\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport { ModelFieldCompression } from \"~/features/contentModel/ModelFieldCompression/index.js\";\n\n/**\n * ModelsFetcherImpl - Implementation with multi-level caching.\n *\n * Caching strategy:\n * 1. Plugin models are cached per tenant (with access control applied by PluginModelsProvider)\n * 2. Database models are cached per tenant (raw from DB)\n * 3. Filtered database models are cached per tenant + identity (with access control applied)\n * 4. Final merged list is cached per tenant + identity\n */\nclass ModelsFetcherImpl implements FetcherAbstraction.Interface {\n    public constructor(\n        private readonly modelCache: ModelCache.Interface,\n        private readonly pluginModelsProvider: PluginModelsProvider.Interface,\n        private readonly storageOperations: StorageOperations.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly modelFieldCompression: ModelFieldCompression.Interface\n    ) {}\n\n    async fetchAll(): Promise<Result<CmsModel[], FetcherAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // Create a cache key based on tenant + identity\n            const cacheKey = createCacheKey({\n                tenant: tenant.id\n            });\n\n            // Try to get from cache first\n            const cached = await this.modelCache.getOrSet(cacheKey, async () => {\n                // Fetch plugin models (with caching and access control)\n                const pluginModels = await this.pluginModelsProvider.list(tenant.id);\n\n                const databaseModels = await this.fetchAndMergeModels(tenant.id);\n\n                return [...pluginModels, ...databaseModels];\n            });\n\n            return Result.ok(cached);\n        } catch (error) {\n            return Result.fail(new ModelPersistenceError(error as Error));\n        }\n    }\n\n    async fetchById(modelId: string): Promise<Result<CmsModel, FetcherAbstraction.Error>> {\n        const result = await this.fetchAll();\n        if (result.isFail()) {\n            return Result.fail(new ModelPersistenceError(result.error));\n        }\n\n        const model = result.value.find(m => m.modelId === modelId);\n        if (!model) {\n            return Result.fail(new ModelNotFoundError(modelId));\n        }\n\n        return Result.ok(model);\n    }\n\n    private async fetchAndMergeModels(tenant: string): Promise<CmsModel[]> {\n        // 1. Fetch database models (with caching)\n        const dbCacheKey = createCacheKey({ tenant, id: \"storage\" });\n        const databaseModels = await this.modelCache.getOrSet(dbCacheKey, async () => {\n            const models = await this.storageOperations.models.list({ where: { tenant } });\n\n            return Promise.all(\n                models.map(async model => {\n                    const fields = await this.modelFieldCompression.decompress(model.fields);\n\n                    return {\n                        ...model,\n                        fields\n                    };\n                })\n            );\n        });\n\n        // 2. Ensure type tags on database models\n        const taggedDatabaseModels = databaseModels.map(model => {\n            model.tags = ensureTypeTag(model);\n            return model;\n        });\n\n        // 3. Return merged models.\n        return taggedDatabaseModels;\n    }\n}\n\nexport const ModelsFetcher = FetcherAbstraction.createImplementation({\n    implementation: ModelsFetcherImpl,\n    dependencies: [\n        ModelCache,\n        PluginModelsProvider,\n        StorageOperations,\n        TenantContext,\n        ModelFieldCompression\n    ]\n});\n"],"names":["ModelsFetcherImpl","modelCache","pluginModelsProvider","storageOperations","tenantContext","modelFieldCompression","tenant","cacheKey","createCacheKey","cached","pluginModels","databaseModels","Result","error","ModelPersistenceError","modelId","result","model","m","ModelNotFoundError","dbCacheKey","models","Promise","fields","taggedDatabaseModels","ensureTypeTag","ModelsFetcher","FetcherAbstraction","ModelCache","PluginModelsProvider","StorageOperations","TenantContext","ModelFieldCompression"],"mappings":";;;;;;;;AAuBA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,EACtCC,qBAAsD,CACzE;aALmBJ,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;aACAC,qBAAqB,GAArBA;IAClB;IAEH,MAAM,WAAkE;QACpE,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,MAAMC,WAAWC,eAAe;gBAC5B,QAAQF,OAAO,EAAE;YACrB;YAGA,MAAMG,SAAS,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAACF,UAAU;gBAEpD,MAAMG,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAACJ,OAAO,EAAE;gBAEnE,MAAMK,iBAAiB,MAAM,IAAI,CAAC,mBAAmB,CAACL,OAAO,EAAE;gBAE/D,OAAO;uBAAII;uBAAiBC;iBAAe;YAC/C;YAEA,OAAOC,OAAO,EAAE,CAACH;QACrB,EAAE,OAAOI,OAAO;YACZ,OAAOD,OAAO,IAAI,CAAC,IAAIE,sBAAsBD;QACjD;IACJ;IAEA,MAAM,UAAUE,OAAe,EAAuD;QAClF,MAAMC,SAAS,MAAM,IAAI,CAAC,QAAQ;QAClC,IAAIA,OAAO,MAAM,IACb,OAAOJ,OAAO,IAAI,CAAC,IAAIE,sBAAsBE,OAAO,KAAK;QAG7D,MAAMC,QAAQD,OAAO,KAAK,CAAC,IAAI,CAACE,CAAAA,IAAKA,EAAE,OAAO,KAAKH;QACnD,IAAI,CAACE,OACD,OAAOL,OAAO,IAAI,CAAC,IAAIO,mBAAmBJ;QAG9C,OAAOH,OAAO,EAAE,CAACK;IACrB;IAEA,MAAc,oBAAoBX,MAAc,EAAuB;QAEnE,MAAMc,aAAaZ,eAAe;YAAEF;YAAQ,IAAI;QAAU;QAC1D,MAAMK,iBAAiB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAACS,YAAY;YAC9D,MAAMC,SAAS,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,OAAO;oBAAEf;gBAAO;YAAE;YAE5E,OAAOgB,QAAQ,GAAG,CACdD,OAAO,GAAG,CAAC,OAAMJ;gBACb,MAAMM,SAAS,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAACN,MAAM,MAAM;gBAEvE,OAAO;oBACH,GAAGA,KAAK;oBACRM;gBACJ;YACJ;QAER;QAGA,MAAMC,uBAAuBb,eAAe,GAAG,CAACM,CAAAA;YAC5CA,MAAM,IAAI,GAAGQ,cAAcR;YAC3B,OAAOA;QACX;QAGA,OAAOO;IACX;AACJ;AAEO,MAAME,8BAAgBC,cAAAA,oBAAuC,CAAC;IACjE,gBAAgB3B;IAChB,cAAc;QACV4B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/contentModel/shared/PluginModelsProvider.js

@@ -1,64 +1,48 @@
 import { AccessControl, CmsContext } from "../../shared/abstractions.js";
-import { PluginModelsProvider as ProviderAbstraction } from "./abstractions.js";
+import { PluginModelsProvider } 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");
+    constructor(cmsContext, accessControl, modelsProvider){
+        this.cmsContext = cmsContext;
+        this.accessControl = accessControl;
+        this.modelsProvider = modelsProvider;
+    }
+    async list(tenant) {
+        const modelPlugins = this.cmsContext.plugins.byType(CmsModelPlugin.type);
+        const legacyModels = modelPlugins.filter((plugin)=>{
+            const { tenant: modelTenant } = plugin.contentModel;
+            if (modelTenant && modelTenant !== tenant) return false;
+            return true;
+        }).map((plugin)=>({
+                ...plugin.contentModel,
+                tags: this.ensureTypeTag(plugin.contentModel),
+                tenant
+            }));
+        const allowedLegacyModels = await filterAsync(legacyModels, (model)=>this.accessControl.canAccessModel({
+                model
+            }));
+        const builderModels = await this.modelsProvider.list(tenant);
+        return [
+            ...allowedLegacyModels,
+            ...builderModels
+        ];
+    }
+    ensureTypeTag(model) {
+        const tags = model.tags || [];
+        if (!tags.some((tag)=>tag.startsWith("type:"))) tags.push("type:model");
+        return tags;
     }
-    return tags;
-  }
 }
-export const PluginModelsProvider = ProviderAbstraction.createImplementation({
-  implementation: PluginModelsProviderImpl,
-  dependencies: [CmsContext, AccessControl, ModelsProvider]
+const PluginModelsProvider_PluginModelsProvider = PluginModelsProvider.createImplementation({
+    implementation: PluginModelsProviderImpl,
+    dependencies: [
+        CmsContext,
+        AccessControl,
+        ModelsProvider
+    ]
 });
+export { PluginModelsProvider_PluginModelsProvider as PluginModelsProvider };
 
 //# sourceMappingURL=PluginModelsProvider.js.map

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

@@ -1 +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":[]}
+{"version":3,"file":"features/contentModel/shared/PluginModelsProvider.js","sources":["../../../../src/features/contentModel/shared/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"],"names":["PluginModelsProviderImpl","cmsContext","accessControl","modelsProvider","tenant","modelPlugins","CmsModelPlugin","legacyModels","plugin","modelTenant","allowedLegacyModels","filterAsync","model","builderModels","tags","tag","PluginModelsProvider","ProviderAbstraction","CmsContext","AccessControl","ModelsProvider"],"mappings":";;;;;AAeA,MAAMA;IACF,YACYC,UAAgC,EAChCC,aAAsC,EACtCC,cAA+B,CACzC;aAHUF,UAAU,GAAVA;aACAC,aAAa,GAAbA;aACAC,cAAc,GAAdA;IACT;IAEH,MAAM,KAAKC,MAAc,EAAuB;QAE5C,MAAMC,eAAe,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAiBC,eAAe,IAAI;QAEvF,MAAMC,eAAeF,aAChB,MAAM,CAACG,CAAAA;YACJ,MAAM,EAAE,QAAQC,WAAW,EAAE,GAAGD,OAAO,YAAY;YAEnD,IAAIC,eAAeA,gBAAgBL,QAC/B,OAAO;YAGX,OAAO;QACX,GACC,GAAG,CAACI,CAAAA,SACM;gBACH,GAAGA,OAAO,YAAY;gBACtB,MAAM,IAAI,CAAC,aAAa,CAACA,OAAO,YAAY;gBAC5CJ;YACJ;QAGR,MAAMM,sBAAsB,MAAMC,YAAYJ,cAAcK,CAAAA,QACjD,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBAAEA;YAAM;QAIrD,MAAMC,gBAAgB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAACT;QAGrD,OAAO;eAAIM;eAAwBG;SAAc;IACrD;IAEQ,cAAcD,KAA6B,EAAE;QAGjD,MAAME,OAAOF,MAAM,IAAI,IAAI,EAAE;QAC7B,IAAI,CAACE,KAAK,IAAI,CAACC,CAAAA,MAAOA,IAAI,UAAU,CAAC,WACjCD,KAAK,IAAI,CAAC;QAGd,OAAOA;IACX;AACJ;AAEO,MAAME,4CAAuBC,qBAAAA,oBAAwC,CAAC;IACzE,gBAAgBjB;IAChB,cAAc;QAACkB;QAAYC;QAAeC;KAAe;AAC7D"}

package/features/contentModel/shared/abstractions.js

@@ -1,19 +1,7 @@
 import { createAbstraction } from "@webiny/feature/api";
-
-/**
- * PluginModelsProvider provides access to plugin-defined (code) models.
- */
-
-export const PluginModelsProvider = createAbstraction("PluginModelsProvider");
-export const ModelCache = createAbstraction("ModelCache");
-
-/**
- * ModelsFetcher - Centralized model fetching with caching.
- *
- * This abstraction handles fetching models from both plugins and database,
- * applies access control filtering, and caches the results for optimal performance.
- */
-
-export const ModelsFetcher = createAbstraction("ModelsFetcher");
+const PluginModelsProvider = createAbstraction("PluginModelsProvider");
+const ModelCache = createAbstraction("ModelCache");
+const ModelsFetcher = createAbstraction("ModelsFetcher");
+export { ModelCache, ModelsFetcher, PluginModelsProvider };
 
 //# sourceMappingURL=abstractions.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","PluginModelsProvider","ModelCache","ModelsFetcher"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { ICache } from \"~/utils/caching/types.js\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\n\n/**\n * PluginModelsProvider provides access to plugin-defined (code) models.\n */\nexport interface IPluginModelsProvider {\n    list(tenant: string): Promise<CmsModel[]>;\n}\n\nexport const PluginModelsProvider =\n    createAbstraction<IPluginModelsProvider>(\"PluginModelsProvider\");\n\nexport namespace PluginModelsProvider {\n    export type Interface = IPluginModelsProvider;\n}\n\nexport const ModelCache = createAbstraction<ICache<Promise<CmsModel[]>>>(\"ModelCache\");\n\nexport namespace ModelCache {\n    export type Interface = ICache<Promise<CmsModel[]>>;\n}\n\n/**\n * ModelsFetcher - Centralized model fetching with caching.\n *\n * This abstraction handles fetching models from both plugins and database,\n * applies access control filtering, and caches the results for optimal performance.\n */\nexport interface IModelsFetcher {\n    /**\n     * Fetch all accessible models for the current tenant and identity.\n     * Results are cached based on tenant + identity.\n     */\n    fetchAll(): Promise<Result<CmsModel[], ModelsFetcherError>>;\n\n    /**\n     * Fetch a single model by modelId.\n     * Uses the cached fetchAll result.\n     */\n    fetchById(modelId: string): Promise<Result<CmsModel, ModelsFetcherError>>;\n}\n\nexport interface IModelsFetcherErrors {\n    notFound: ModelNotFoundError;\n    persistence: ModelPersistenceError;\n}\n\ntype ModelsFetcherError = IModelsFetcherErrors[keyof IModelsFetcherErrors];\n\nexport const ModelsFetcher = createAbstraction<IModelsFetcher>(\"ModelsFetcher\");\n\nexport namespace ModelsFetcher {\n    export type Interface = IModelsFetcher;\n    export type Error = ModelsFetcherError;\n\n    export type FetchAllReturn = Promise<Result<CmsModel[], ModelsFetcherError>>;\n    export type FetchByIdReturn = Promise<Result<CmsModel, ModelsFetcherError>>;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAgB,qBAAqB;;AAK/D;AACA;AACA;;AAKA,OAAO,MAAMC,oBAAoB,GAC7BD,iBAAiB,CAAwB,sBAAsB,CAAC;AAMpE,OAAO,MAAME,UAAU,GAAGF,iBAAiB,CAA8B,YAAY,CAAC;;AAMtF;AACA;AACA;AACA;AACA;AACA;;AAsBA,OAAO,MAAMG,aAAa,GAAGH,iBAAiB,CAAiB,eAAe,CAAC","ignoreList":[]}
+{"version":3,"file":"features/contentModel/shared/abstractions.js","sources":["../../../../src/features/contentModel/shared/abstractions.ts"],"sourcesContent":["import { createAbstraction, Result } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"~/types/index.js\";\nimport type { ICache } from \"~/utils/caching/types.js\";\nimport { ModelNotFoundError, ModelPersistenceError } from \"~/domain/contentModel/errors.js\";\n\n/**\n * PluginModelsProvider provides access to plugin-defined (code) models.\n */\nexport interface IPluginModelsProvider {\n    list(tenant: string): Promise<CmsModel[]>;\n}\n\nexport const PluginModelsProvider =\n    createAbstraction<IPluginModelsProvider>(\"PluginModelsProvider\");\n\nexport namespace PluginModelsProvider {\n    export type Interface = IPluginModelsProvider;\n}\n\nexport const ModelCache = createAbstraction<ICache<Promise<CmsModel[]>>>(\"ModelCache\");\n\nexport namespace ModelCache {\n    export type Interface = ICache<Promise<CmsModel[]>>;\n}\n\n/**\n * ModelsFetcher - Centralized model fetching with caching.\n *\n * This abstraction handles fetching models from both plugins and database,\n * applies access control filtering, and caches the results for optimal performance.\n */\nexport interface IModelsFetcher {\n    /**\n     * Fetch all accessible models for the current tenant and identity.\n     * Results are cached based on tenant + identity.\n     */\n    fetchAll(): Promise<Result<CmsModel[], ModelsFetcherError>>;\n\n    /**\n     * Fetch a single model by modelId.\n     * Uses the cached fetchAll result.\n     */\n    fetchById(modelId: string): Promise<Result<CmsModel, ModelsFetcherError>>;\n}\n\nexport interface IModelsFetcherErrors {\n    notFound: ModelNotFoundError;\n    persistence: ModelPersistenceError;\n}\n\ntype ModelsFetcherError = IModelsFetcherErrors[keyof IModelsFetcherErrors];\n\nexport const ModelsFetcher = createAbstraction<IModelsFetcher>(\"ModelsFetcher\");\n\nexport namespace ModelsFetcher {\n    export type Interface = IModelsFetcher;\n    export type Error = ModelsFetcherError;\n\n    export type FetchAllReturn = Promise<Result<CmsModel[], ModelsFetcherError>>;\n    export type FetchByIdReturn = Promise<Result<CmsModel, ModelsFetcherError>>;\n}\n"],"names":["PluginModelsProvider","createAbstraction","ModelCache","ModelsFetcher"],"mappings":";AAYO,MAAMA,uBACTC,kBAAyC;AAMtC,MAAMC,aAAaD,kBAA+C;AAiClE,MAAME,gBAAgBF,kBAAkC"}

package/features/contentModelGroup/ContentModelGroupFeature.js

@@ -7,22 +7,18 @@ import { DeleteGroupFeature } from "./DeleteGroup/feature.js";
 import { GroupCache } from "./shared/abstractions.js";
 import { PluginGroupsProvider } from "./shared/PluginGroupsProvider.js";
 import { createMemoryCache } from "../../utils/index.js";
-export const ContentModelGroupFeature = createFeature({
-  name: "ContentModelGroup",
-  register(container) {
-    // Shared infrastructure (singletons)
-    container.registerInstance(GroupCache, createMemoryCache());
-    container.register(PluginGroupsProvider).inSingletonScope();
-
-    // Query features
-    GetGroupFeature.register(container);
-    ListGroupsFeature.register(container);
-
-    // Command features
-    CreateGroupFeature.register(container);
-    UpdateGroupFeature.register(container);
-    DeleteGroupFeature.register(container);
-  }
+const ContentModelGroupFeature = createFeature({
+    name: "ContentModelGroup",
+    register (container) {
+        container.registerInstance(GroupCache, createMemoryCache());
+        container.register(PluginGroupsProvider).inSingletonScope();
+        GetGroupFeature.register(container);
+        ListGroupsFeature.register(container);
+        CreateGroupFeature.register(container);
+        UpdateGroupFeature.register(container);
+        DeleteGroupFeature.register(container);
+    }
 });
+export { ContentModelGroupFeature };
 
 //# sourceMappingURL=ContentModelGroupFeature.js.map

package/features/contentModelGroup/ContentModelGroupFeature.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFeature","GetGroupFeature","ListGroupsFeature","CreateGroupFeature","UpdateGroupFeature","DeleteGroupFeature","GroupCache","PluginGroupsProvider","createMemoryCache","ContentModelGroupFeature","name","register","container","registerInstance","inSingletonScope"],"sources":["ContentModelGroupFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetGroupFeature } from \"~/features/contentModelGroup/GetGroup/feature.js\";\nimport { ListGroupsFeature } from \"~/features/contentModelGroup/ListGroups/feature.js\";\nimport { CreateGroupFeature } from \"~/features/contentModelGroup/CreateGroup/feature.js\";\nimport { UpdateGroupFeature } from \"~/features/contentModelGroup/UpdateGroup/feature.js\";\nimport { DeleteGroupFeature } from \"~/features/contentModelGroup/DeleteGroup/feature.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/PluginGroupsProvider.js\";\nimport { createMemoryCache } from \"~/utils/index.js\";\n\nexport const ContentModelGroupFeature = createFeature({\n    name: \"ContentModelGroup\",\n    register(container) {\n        // Shared infrastructure (singletons)\n        container.registerInstance(GroupCache, createMemoryCache());\n        container.register(PluginGroupsProvider).inSingletonScope();\n\n        // Query features\n        GetGroupFeature.register(container);\n        ListGroupsFeature.register(container);\n\n        // Command features\n        CreateGroupFeature.register(container);\n        UpdateGroupFeature.register(container);\n        DeleteGroupFeature.register(container);\n    }\n});\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AACnD,SAASC,eAAe;AACxB,SAASC,iBAAiB;AAC1B,SAASC,kBAAkB;AAC3B,SAASC,kBAAkB;AAC3B,SAASC,kBAAkB;AAC3B,SAASC,UAAU;AACnB,SAASC,oBAAoB;AAC7B,SAASC,iBAAiB;AAE1B,OAAO,MAAMC,wBAAwB,GAAGT,aAAa,CAAC;EAClDU,IAAI,EAAE,mBAAmB;EACzBC,QAAQA,CAACC,SAAS,EAAE;IAChB;IACAA,SAAS,CAACC,gBAAgB,CAACP,UAAU,EAAEE,iBAAiB,CAAC,CAAC,CAAC;IAC3DI,SAAS,CAACD,QAAQ,CAACJ,oBAAoB,CAAC,CAACO,gBAAgB,CAAC,CAAC;;IAE3D;IACAb,eAAe,CAACU,QAAQ,CAACC,SAAS,CAAC;IACnCV,iBAAiB,CAACS,QAAQ,CAACC,SAAS,CAAC;;IAErC;IACAT,kBAAkB,CAACQ,QAAQ,CAACC,SAAS,CAAC;IACtCR,kBAAkB,CAACO,QAAQ,CAACC,SAAS,CAAC;IACtCP,kBAAkB,CAACM,QAAQ,CAACC,SAAS,CAAC;EAC1C;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/contentModelGroup/ContentModelGroupFeature.js","sources":["../../../src/features/contentModelGroup/ContentModelGroupFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetGroupFeature } from \"~/features/contentModelGroup/GetGroup/feature.js\";\nimport { ListGroupsFeature } from \"~/features/contentModelGroup/ListGroups/feature.js\";\nimport { CreateGroupFeature } from \"~/features/contentModelGroup/CreateGroup/feature.js\";\nimport { UpdateGroupFeature } from \"~/features/contentModelGroup/UpdateGroup/feature.js\";\nimport { DeleteGroupFeature } from \"~/features/contentModelGroup/DeleteGroup/feature.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/PluginGroupsProvider.js\";\nimport { createMemoryCache } from \"~/utils/index.js\";\n\nexport const ContentModelGroupFeature = createFeature({\n    name: \"ContentModelGroup\",\n    register(container) {\n        // Shared infrastructure (singletons)\n        container.registerInstance(GroupCache, createMemoryCache());\n        container.register(PluginGroupsProvider).inSingletonScope();\n\n        // Query features\n        GetGroupFeature.register(container);\n        ListGroupsFeature.register(container);\n\n        // Command features\n        CreateGroupFeature.register(container);\n        UpdateGroupFeature.register(container);\n        DeleteGroupFeature.register(container);\n    }\n});\n"],"names":["ContentModelGroupFeature","createFeature","container","GroupCache","createMemoryCache","PluginGroupsProvider","GetGroupFeature","ListGroupsFeature","CreateGroupFeature","UpdateGroupFeature","DeleteGroupFeature"],"mappings":";;;;;;;;;AAUO,MAAMA,2BAA2BC,cAAc;IAClD,MAAM;IACN,UAASC,SAAS;QAEdA,UAAU,gBAAgB,CAACC,YAAYC;QACvCF,UAAU,QAAQ,CAACG,sBAAsB,gBAAgB;QAGzDC,gBAAgB,QAAQ,CAACJ;QACzBK,kBAAkB,QAAQ,CAACL;QAG3BM,mBAAmB,QAAQ,CAACN;QAC5BO,mBAAmB,QAAQ,CAACP;QAC5BQ,mBAAmB,QAAQ,CAACR;IAChC;AACJ"}

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js

@@ -1,107 +1,76 @@
-import { Result } from "@webiny/feature/api";
-import { createImplementation } from "@webiny/feature/api";
-import { CreateGroupRepository as RepositoryAbstraction } from "./abstractions.js";
-import { GroupCache } from "../shared/abstractions.js";
-import { PluginGroupsProvider } from "../shared/abstractions.js";
-import { GroupSlugTakenError } from "../../../domain/contentModelGroup/errors.js";
-import { GroupPersistenceError } from "../../../domain/contentModelGroup/errors.js";
+import { Result, createImplementation } from "@webiny/feature/api";
+import { CreateGroupRepository } from "./abstractions.js";
+import { GroupCache, PluginGroupsProvider } from "../shared/abstractions.js";
+import { GroupPersistenceError, GroupSlugTakenError } from "../../../domain/contentModelGroup/errors.js";
 import { StorageOperations } from "../../shared/abstractions.js";
 import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
 import { toSlug } from "../../../utils/toSlug.js";
 import { generateAlphaNumericId } from "@webiny/utils";
-/**
- * CreateGroupRepository - Validates and persists a new group.
- *
- * Responsibilities:
- * - Validate ID uniqueness (if provided)
- * - Validate slug uniqueness (or generate unique slug)
- * - Check for plugin group conflicts
- * - Persist to storage
- * - Clear GroupCache after successful create
- */
 class CreateGroupRepositoryImpl {
-  constructor(groupCache, pluginGroupsProvider, storageOperations, tenantContext) {
-    this.groupCache = groupCache;
-    this.pluginGroupsProvider = pluginGroupsProvider;
-    this.storageOperations = storageOperations;
-    this.tenantContext = tenantContext;
-  }
-  async execute(group) {
-    try {
-      const tenant = this.tenantContext.getTenant();
-
-      // 1. Validate ID uniqueness (if provided)
-      if (group.id) {
-        const existingById = await this.storageOperations.groups.list({
-          where: {
-            tenant: tenant.id,
-            id: group.id
-          }
-        });
-        if (existingById.length > 0) {
-          return Result.fail(new GroupSlugTakenError(group.slug));
-        }
-      }
-
-      // 2. Generate or validate slug
-      const slugTaken = await this.isSlugTaken(group, tenant.id);
-      if (slugTaken) {
-        return Result.fail(new GroupSlugTakenError(group.slug));
-      }
-
-      // 3. Check for plugin group conflicts
-      const pluginGroups = await this.pluginGroupsProvider.getGroups();
-      const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);
-      if (pluginGroupConflict) {
-        return Result.fail(new GroupSlugTakenError(group.slug));
-      }
-
-      // 4. Persist to storage
-      await this.storageOperations.groups.create({
-        group
-      });
-
-      // 5. Clear cache
-      this.groupCache.clear();
-      return Result.ok();
-    } catch (error) {
-      return Result.fail(new GroupPersistenceError(error));
+    constructor(groupCache, pluginGroupsProvider, storageOperations, tenantContext){
+        this.groupCache = groupCache;
+        this.pluginGroupsProvider = pluginGroupsProvider;
+        this.storageOperations = storageOperations;
+        this.tenantContext = tenantContext;
     }
-  }
-  async isSlugTaken(group, tenant) {
-    // If slug is provided and not empty, validate it
-    if (group.slug && group.slug.trim()) {
-      const existingBySlug = await this.storageOperations.groups.list({
-        where: {
-          tenant,
-          slug: group.slug
+    async execute(group) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            if (group.id) {
+                const existingById = await this.storageOperations.groups.list({
+                    where: {
+                        tenant: tenant.id,
+                        id: group.id
+                    }
+                });
+                if (existingById.length > 0) return Result.fail(new GroupSlugTakenError(group.slug));
+            }
+            const slugTaken = await this.isSlugTaken(group, tenant.id);
+            if (slugTaken) return Result.fail(new GroupSlugTakenError(group.slug));
+            const pluginGroups = await this.pluginGroupsProvider.getGroups();
+            const pluginGroupConflict = pluginGroups.find((pg)=>pg.slug === group.slug);
+            if (pluginGroupConflict) return Result.fail(new GroupSlugTakenError(group.slug));
+            await this.storageOperations.groups.create({
+                group
+            });
+            this.groupCache.clear();
+            return Result.ok();
+        } catch (error) {
+            return Result.fail(new GroupPersistenceError(error));
         }
-      });
-      return existingBySlug.length > 0;
     }
-
-    // Generate slug from name
-    const baseSlug = toSlug(group.name);
-    const existingBySlug = await this.storageOperations.groups.list({
-      where: {
-        tenant,
-        slug: baseSlug
-      }
-    });
-    if (existingBySlug.length === 0) {
-      // No conflict, use base slug
-      group.slug = baseSlug;
-    } else {
-      // Conflict, append random suffix
-      group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;
+    async isSlugTaken(group, tenant) {
+        if (group.slug && group.slug.trim()) {
+            const existingBySlug = await this.storageOperations.groups.list({
+                where: {
+                    tenant,
+                    slug: group.slug
+                }
+            });
+            return existingBySlug.length > 0;
+        }
+        const baseSlug = toSlug(group.name);
+        const existingBySlug = await this.storageOperations.groups.list({
+            where: {
+                tenant,
+                slug: baseSlug
+            }
+        });
+        if (0 === existingBySlug.length) group.slug = baseSlug;
+        else group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;
+        return false;
     }
-    return false;
-  }
 }
-export const CreateGroupRepository = createImplementation({
-  abstraction: RepositoryAbstraction,
-  implementation: CreateGroupRepositoryImpl,
-  dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, TenantContext]
+const CreateGroupRepository_CreateGroupRepository = createImplementation({
+    abstraction: CreateGroupRepository,
+    implementation: CreateGroupRepositoryImpl,
+    dependencies: [
+        GroupCache,
+        PluginGroupsProvider,
+        StorageOperations,
+        TenantContext
+    ]
 });
+export { CreateGroupRepository_CreateGroupRepository as CreateGroupRepository };
 
 //# sourceMappingURL=CreateGroupRepository.js.map

package/features/contentModelGroup/CreateGroup/CreateGroupRepository.js.map

@@ -1 +1 @@
-{"version":3,"names":["Result","createImplementation","CreateGroupRepository","RepositoryAbstraction","GroupCache","PluginGroupsProvider","GroupSlugTakenError","GroupPersistenceError","StorageOperations","TenantContext","toSlug","generateAlphaNumericId","CreateGroupRepositoryImpl","constructor","groupCache","pluginGroupsProvider","storageOperations","tenantContext","execute","group","tenant","getTenant","id","existingById","groups","list","where","length","fail","slug","slugTaken","isSlugTaken","pluginGroups","getGroups","pluginGroupConflict","find","pg","create","clear","ok","error","trim","existingBySlug","baseSlug","name","abstraction","implementation","dependencies"],"sources":["CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { toSlug } from \"~/utils/toSlug.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.storageOperations.groups.list({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.storageOperations.groups.create({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.storageOperations.groups.list({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = toSlug(group.name);\n        const existingBySlug = await this.storageOperations.groups.list({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, TenantContext]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"features/contentModelGroup/CreateGroup/CreateGroupRepository.js","sources":["../../../../src/features/contentModelGroup/CreateGroup/CreateGroupRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createImplementation } from \"@webiny/feature/api\";\nimport { CreateGroupRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { GroupCache } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { PluginGroupsProvider } from \"~/features/contentModelGroup/shared/abstractions.js\";\nimport { GroupSlugTakenError } from \"~/domain/contentModelGroup/errors.js\";\nimport { GroupPersistenceError } from \"~/domain/contentModelGroup/errors.js\";\nimport { StorageOperations } from \"~/features/shared/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { toSlug } from \"~/utils/toSlug.js\";\nimport { generateAlphaNumericId } from \"@webiny/utils\";\nimport type { CmsGroup } from \"~/types/index.js\";\n\n/**\n * CreateGroupRepository - Validates and persists a new group.\n *\n * Responsibilities:\n * - Validate ID uniqueness (if provided)\n * - Validate slug uniqueness (or generate unique slug)\n * - Check for plugin group conflicts\n * - Persist to storage\n * - Clear GroupCache after successful create\n */\nclass CreateGroupRepositoryImpl implements RepositoryAbstraction.Interface {\n    public constructor(\n        private groupCache: GroupCache.Interface,\n        private pluginGroupsProvider: PluginGroupsProvider.Interface,\n        private storageOperations: StorageOperations.Interface,\n        private tenantContext: TenantContext.Interface\n    ) {}\n\n    async execute(group: CmsGroup): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n\n            // 1. Validate ID uniqueness (if provided)\n            if (group.id) {\n                const existingById = await this.storageOperations.groups.list({\n                    where: {\n                        tenant: tenant.id,\n                        id: group.id\n                    }\n                });\n\n                if (existingById.length > 0) {\n                    return Result.fail(new GroupSlugTakenError(group.slug));\n                }\n            }\n\n            // 2. Generate or validate slug\n            const slugTaken = await this.isSlugTaken(group, tenant.id);\n            if (slugTaken) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 3. Check for plugin group conflicts\n            const pluginGroups = await this.pluginGroupsProvider.getGroups();\n            const pluginGroupConflict = pluginGroups.find(pg => pg.slug === group.slug);\n            if (pluginGroupConflict) {\n                return Result.fail(new GroupSlugTakenError(group.slug));\n            }\n\n            // 4. Persist to storage\n            await this.storageOperations.groups.create({ group });\n\n            // 5. Clear cache\n            this.groupCache.clear();\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new GroupPersistenceError(error as Error));\n        }\n    }\n\n    private async isSlugTaken(group: CmsGroup, tenant: string): Promise<boolean> {\n        // If slug is provided and not empty, validate it\n        if (group.slug && group.slug.trim()) {\n            const existingBySlug = await this.storageOperations.groups.list({\n                where: {\n                    tenant,\n                    slug: group.slug\n                }\n            });\n\n            return existingBySlug.length > 0;\n        }\n\n        // Generate slug from name\n        const baseSlug = toSlug(group.name);\n        const existingBySlug = await this.storageOperations.groups.list({\n            where: {\n                tenant,\n                slug: baseSlug\n            }\n        });\n\n        if (existingBySlug.length === 0) {\n            // No conflict, use base slug\n            group.slug = baseSlug;\n        } else {\n            // Conflict, append random suffix\n            group.slug = `${baseSlug}-${generateAlphaNumericId(8)}`;\n        }\n\n        return false;\n    }\n}\n\nexport const CreateGroupRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: CreateGroupRepositoryImpl,\n    dependencies: [GroupCache, PluginGroupsProvider, StorageOperations, TenantContext]\n});\n"],"names":["CreateGroupRepositoryImpl","groupCache","pluginGroupsProvider","storageOperations","tenantContext","group","tenant","existingById","Result","GroupSlugTakenError","slugTaken","pluginGroups","pluginGroupConflict","pg","error","GroupPersistenceError","existingBySlug","baseSlug","toSlug","generateAlphaNumericId","CreateGroupRepository","createImplementation","RepositoryAbstraction","GroupCache","PluginGroupsProvider","StorageOperations","TenantContext"],"mappings":";;;;;;;;AAuBA,MAAMA;IACF,YACYC,UAAgC,EAChCC,oBAAoD,EACpDC,iBAA8C,EAC9CC,aAAsC,CAChD;aAJUH,UAAU,GAAVA;aACAC,oBAAoB,GAApBA;aACAC,iBAAiB,GAAjBA;aACAC,aAAa,GAAbA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAsD;QAC/E,IAAI;YACA,MAAMC,SAAS,IAAI,CAAC,aAAa,CAAC,SAAS;YAG3C,IAAID,MAAM,EAAE,EAAE;gBACV,MAAME,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC1D,OAAO;wBACH,QAAQD,OAAO,EAAE;wBACjB,IAAID,MAAM,EAAE;oBAChB;gBACJ;gBAEA,IAAIE,aAAa,MAAM,GAAG,GACtB,OAAOC,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAE7D;YAGA,MAAMK,YAAY,MAAM,IAAI,CAAC,WAAW,CAACL,OAAOC,OAAO,EAAE;YACzD,IAAII,WACA,OAAOF,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAMM,eAAe,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS;YAC9D,MAAMC,sBAAsBD,aAAa,IAAI,CAACE,CAAAA,KAAMA,GAAG,IAAI,KAAKR,MAAM,IAAI;YAC1E,IAAIO,qBACA,OAAOJ,OAAO,IAAI,CAAC,IAAIC,oBAAoBJ,MAAM,IAAI;YAIzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAEA;YAAM;YAGnD,IAAI,CAAC,UAAU,CAAC,KAAK;YAErB,OAAOG,OAAO,EAAE;QACpB,EAAE,OAAOM,OAAO;YACZ,OAAON,OAAO,IAAI,CAAC,IAAIO,sBAAsBD;QACjD;IACJ;IAEA,MAAc,YAAYT,KAAe,EAAEC,MAAc,EAAoB;QAEzE,IAAID,MAAM,IAAI,IAAIA,MAAM,IAAI,CAAC,IAAI,IAAI;YACjC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,OAAO;oBACHV;oBACA,MAAMD,MAAM,IAAI;gBACpB;YACJ;YAEA,OAAOW,eAAe,MAAM,GAAG;QACnC;QAGA,MAAMC,WAAWC,OAAOb,MAAM,IAAI;QAClC,MAAMW,iBAAiB,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5D,OAAO;gBACHV;gBACA,MAAMW;YACV;QACJ;QAEA,IAAID,AAA0B,MAA1BA,eAAe,MAAM,EAErBX,MAAM,IAAI,GAAGY;aAGbZ,MAAM,IAAI,GAAG,GAAGY,SAAS,CAAC,EAAEE,uBAAuB,IAAI;QAG3D,OAAO;IACX;AACJ;AAEO,MAAMC,8CAAwBC,qBAAqB;IACtD,aAAaC;IACb,gBAAgBtB;IAChB,cAAc;QAACuB;QAAYC;QAAsBC;QAAmBC;KAAc;AACtF"}