@webiny/api-aco 6.4.5-beta.0 → 6.6.0-alpha.0

package/AcoFeature.d.ts

@@ -0,0 +1,5 @@
+import type { Container } from "@webiny/di";
+export declare const AcoFeature: {
+    name: string;
+    register(container: Container): void;
+};

package/AcoFeature.js

@@ -0,0 +1,122 @@
+import { createFeature } from "@webiny/feature/api";
+import { GraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
+import { HeadlessCms } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { addAcoBaseSchema } from "./createAcoGraphQL.js";
+import { addFilterSchema } from "./filter/filter.gql.js";
+import { AcoInitializer } from "./AcoInitializer.js";
+import { CreateFlpTask } from "./flp/tasks/createFlp.task.js";
+import { UpdateFlpTask } from "./flp/tasks/updateFlp.task.js";
+import { DeleteFlpTask } from "./flp/tasks/deleteFlp.task.js";
+import { SyncFlpTask } from "./flp/tasks/syncFlp.task.js";
+import { FolderModel } from "./domain/folder/folder.model.js";
+import { FilterPrivateModel } from "./filter/filter.model.js";
+import { createFilterOperations } from "./filter/filter.so.js";
+import { createFilterCrudMethods } from "./filter/filter.crud.js";
+import { createFlpCrudMethods } from "./flp/index.js";
+import { FolderLevelPermissions, FolderLevelPermissionsFeature } from "./features/flp/FolderLevelPermissions/index.js";
+import { UpdateFolderFeature } from "./features/folder/UpdateFolder/index.js";
+import { DeleteFolderFeature } from "./features/folder/DeleteFolder/index.js";
+import { CreateFolderFeature } from "./features/folder/CreateFolder/index.js";
+import { GetFolderFeature } from "./features/folder/GetFolder/index.js";
+import { ListFoldersFeature } from "./features/folder/ListFolders/index.js";
+import { GetFolderHierarchyFeature } from "./features/folder/GetFolderHierarchy/index.js";
+import { GetAncestorsFeature } from "./features/folder/GetAncestors/index.js";
+import { UpdateFlpOnFolderUpdatedFeature } from "./features/flp/UpdateFlpOnFolderUpdated/index.js";
+import { DeleteFlpOnFolderDeletedFeature } from "./features/flp/DeleteFlpOnFolderDeleted/index.js";
+import { EnsureHcmsFolderIsEmptyOnDeleteFeature } from "./features/folder/EnsureHcmsFolderIsEmptyOnDelete/index.js";
+import { CreateFlpFeature } from "./features/flp/CreateFlp/index.js";
+import { DeleteFlpFeature } from "./features/flp/DeleteFlp/index.js";
+import { UpdateFlpFeature } from "./features/flp/UpdateFlp/index.js";
+import { EnsureFolderIsEmptyOnDeleteFeature } from "./features/folder/EnsureFolderIsEmptyOnDelete/index.js";
+import { AcoFilterCrud, AcoFlpCrud, FilterStorageOperations, FlpStorageOperations } from "./features/folder/shared/abstractions.js";
+import { ListFlpsFeature } from "./features/flp/ListFlps/feature.js";
+import { GetFlpFeature } from "./features/flp/GetFlp/feature.js";
+import { ListFolderLevelPermissionsTargetsFeature } from "./features/folder/ListFolderLevelPermissionsTargets/feature.js";
+import { CreateFlpOnFolderCreatedFeature } from "./features/flp/CreateFlpOnFolderCreated/index.js";
+import { EnsureFolderIsEmptyFeature } from "./features/folder/EnsureFolderIsEmpty/feature.js";
+class AcoSchemaFactoryImpl {
+    async execute(builder) {
+        addAcoBaseSchema(builder);
+        addFilterSchema(builder);
+        return builder;
+    }
+}
+const AcoSchemaFactory = GraphQLSchemaFactory.createImplementation({
+    implementation: AcoSchemaFactoryImpl,
+    dependencies: []
+});
+const AcoFeature = createFeature({
+    name: "Aco",
+    register (container) {
+        container.register(FolderModel);
+        container.register(FilterPrivateModel);
+        container.register(CreateFlpTask);
+        container.register(UpdateFlpTask);
+        container.register(DeleteFlpTask);
+        container.register(SyncFlpTask);
+        FolderLevelPermissionsFeature.register(container);
+        CreateFolderFeature.register(container);
+        UpdateFolderFeature.register(container);
+        DeleteFolderFeature.register(container);
+        GetFolderFeature.register(container);
+        ListFoldersFeature.register(container);
+        ListFolderLevelPermissionsTargetsFeature.register(container);
+        GetFolderHierarchyFeature.register(container);
+        GetAncestorsFeature.register(container);
+        EnsureFolderIsEmptyFeature.register(container);
+        CreateFlpFeature.register(container);
+        UpdateFlpFeature.register(container);
+        DeleteFlpFeature.register(container);
+        ListFlpsFeature.register(container);
+        GetFlpFeature.register(container);
+        CreateFlpOnFolderCreatedFeature.register(container);
+        UpdateFlpOnFolderUpdatedFeature.register(container);
+        DeleteFlpOnFolderDeletedFeature.register(container);
+        EnsureFolderIsEmptyOnDeleteFeature.register(container);
+        EnsureHcmsFolderIsEmptyOnDeleteFeature.register(container);
+        const getTenant = ()=>container.resolve(TenantContext).getTenant();
+        let storageOperations;
+        const getStorageOperations = ()=>{
+            if (!storageOperations) {
+                const cms = container.resolve(HeadlessCms);
+                const identityContext = container.resolve(IdentityContext);
+                storageOperations = {
+                    filter: createFilterOperations({
+                        cms,
+                        identityContext,
+                        container
+                    }),
+                    flp: container.resolve(FlpStorageOperations)
+                };
+            }
+            return storageOperations;
+        };
+        let flpCrudMethods;
+        const getFlpCrudMethods = ()=>{
+            if (!flpCrudMethods) flpCrudMethods = createFlpCrudMethods({
+                getTenant,
+                storageOperations: getStorageOperations()
+            });
+            return flpCrudMethods;
+        };
+        container.registerFactory(AcoFlpCrud, ()=>getFlpCrudMethods());
+        container.registerFactory(FilterStorageOperations, ()=>getStorageOperations().filter);
+        let filterCrudMethods;
+        container.registerFactory(AcoFilterCrud, ()=>{
+            if (!filterCrudMethods) filterCrudMethods = createFilterCrudMethods({
+                container,
+                getTenant,
+                storageOperations: getStorageOperations(),
+                folderLevelPermissions: container.resolve(FolderLevelPermissions)
+            });
+            return filterCrudMethods;
+        });
+        container.register(AcoInitializer);
+        container.register(AcoSchemaFactory);
+    }
+});
+export { AcoFeature };
+
+//# sourceMappingURL=AcoFeature.js.map

package/AcoFeature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcoFeature.js","sources":["../src/AcoFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GraphQLSchemaFactory } from \"@webiny/api-graphql/graphql/abstractions.js\";\nimport type { IGraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\nimport type { Container } from \"@webiny/di\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { addAcoBaseSchema } from \"./createAcoGraphQL.js\";\nimport { addFilterSchema } from \"~/filter/filter.gql.js\";\nimport { AcoInitializer } from \"./AcoInitializer.js\";\nimport { CreateFlpTask } from \"~/flp/tasks/createFlp.task.js\";\nimport { UpdateFlpTask } from \"~/flp/tasks/updateFlp.task.js\";\nimport { DeleteFlpTask } from \"~/flp/tasks/deleteFlp.task.js\";\nimport { SyncFlpTask } from \"~/flp/tasks/syncFlp.task.js\";\nimport type { AcoStorageOperations } from \"~/types.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { FolderModel } from \"~/domain/folder/folder.model.js\";\nimport { FilterPrivateModel } from \"~/filter/filter.model.js\";\n// Facade wiring (moved here from createAcoContext so the ACO facade can be a lazy DI factory).\nimport { createFilterOperations } from \"~/filter/filter.so.js\";\nimport { createFilterCrudMethods } from \"~/filter/filter.crud.js\";\nimport { createFlpCrudMethods } from \"~/flp/index.js\";\nimport {\n    FolderLevelPermissions,\n    FolderLevelPermissionsFeature\n} from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { UpdateFolderFeature } from \"~/features/folder/UpdateFolder/index.js\";\nimport { DeleteFolderFeature } from \"~/features/folder/DeleteFolder/index.js\";\nimport { CreateFolderFeature } from \"~/features/folder/CreateFolder/index.js\";\nimport { GetFolderFeature } from \"~/features/folder/GetFolder/index.js\";\nimport { ListFoldersFeature } from \"~/features/folder/ListFolders/index.js\";\nimport { GetFolderHierarchyFeature } from \"~/features/folder/GetFolderHierarchy/index.js\";\nimport { GetAncestorsFeature } from \"~/features/folder/GetAncestors/index.js\";\nimport { UpdateFlpOnFolderUpdatedFeature } from \"~/features/flp/UpdateFlpOnFolderUpdated/index.js\";\nimport { DeleteFlpOnFolderDeletedFeature } from \"~/features/flp/DeleteFlpOnFolderDeleted/index.js\";\nimport { EnsureHcmsFolderIsEmptyOnDeleteFeature } from \"~/features/folder/EnsureHcmsFolderIsEmptyOnDelete/index.js\";\nimport { CreateFlpFeature } from \"~/features/flp/CreateFlp/index.js\";\nimport { DeleteFlpFeature } from \"~/features/flp/DeleteFlp/index.js\";\nimport { UpdateFlpFeature } from \"~/features/flp/UpdateFlp/index.js\";\nimport { EnsureFolderIsEmptyOnDeleteFeature } from \"~/features/folder/EnsureFolderIsEmptyOnDelete/index.js\";\nimport {\n    AcoFilterCrud,\n    AcoFlpCrud,\n    FilterStorageOperations,\n    FlpStorageOperations\n} from \"~/features/folder/shared/abstractions.js\";\nimport { ListFlpsFeature } from \"~/features/flp/ListFlps/feature.js\";\nimport { GetFlpFeature } from \"~/features/flp/GetFlp/feature.js\";\nimport { ListFolderLevelPermissionsTargetsFeature } from \"~/features/folder/ListFolderLevelPermissionsTargets/feature.js\";\nimport { CreateFlpOnFolderCreatedFeature } from \"~/features/flp/CreateFlpOnFolderCreated/index.js\";\nimport { EnsureFolderIsEmptyFeature } from \"~/features/folder/EnsureFolderIsEmpty/feature.js\";\n\nclass AcoSchemaFactoryImpl implements GraphQLSchemaFactory.Interface {\n    async execute(builder: IGraphQLSchemaBuilder): Promise<IGraphQLSchemaBuilder> {\n        // Static ACO base + filter schema (DI-native contributors declaring their deps). The dynamic\n        // folder schema (needs the per-tenant folder model) is still built by AcoInitializer.\n        addAcoBaseSchema(builder);\n        addFilterSchema(builder);\n        return builder;\n    }\n}\n\nconst AcoSchemaFactory = GraphQLSchemaFactory.createImplementation({\n    implementation: AcoSchemaFactoryImpl,\n    dependencies: []\n});\n\nexport const AcoFeature = createFeature({\n    name: \"Aco\",\n    register(container: Container) {\n        container.register(FolderModel);\n        container.register(FilterPrivateModel);\n\n        // Background task definitions — pure wiring, no tenant/identity needed.\n        container.register(CreateFlpTask);\n        container.register(UpdateFlpTask);\n        container.register(DeleteFlpTask);\n        container.register(SyncFlpTask);\n\n        // Folder + FLP use-case features — pure DI wiring (all lazy). Moved out of the per-request\n        // initializer so they're registered for every event, not only GraphQL requests.\n        FolderLevelPermissionsFeature.register(container);\n        CreateFolderFeature.register(container);\n        UpdateFolderFeature.register(container);\n        DeleteFolderFeature.register(container);\n        GetFolderFeature.register(container);\n        ListFoldersFeature.register(container);\n        ListFolderLevelPermissionsTargetsFeature.register(container);\n        GetFolderHierarchyFeature.register(container);\n        GetAncestorsFeature.register(container);\n        EnsureFolderIsEmptyFeature.register(container);\n        CreateFlpFeature.register(container);\n        UpdateFlpFeature.register(container);\n        DeleteFlpFeature.register(container);\n        ListFlpsFeature.register(container);\n        GetFlpFeature.register(container);\n        CreateFlpOnFolderCreatedFeature.register(container);\n        UpdateFlpOnFolderUpdatedFeature.register(container);\n        DeleteFlpOnFolderDeletedFeature.register(container);\n        EnsureFolderIsEmptyOnDeleteFeature.register(container);\n        EnsureHcmsFolderIsEmptyOnDeleteFeature.register(container);\n\n        // ===== Lazy ACO facade =====\n        // Built on first resolve (post-auth) so the HeadlessCms facade (also lazy) is resolved on\n        // demand. Memoised per request container. Consumers resolve AcoFlpCrud / AcoFilterCrud /\n        // FilterStorageOperations via DI.\n        const getTenant = (): Tenant => container.resolve(TenantContext).getTenant();\n\n        let storageOperations: AcoStorageOperations | undefined;\n        const getStorageOperations = (): AcoStorageOperations => {\n            if (!storageOperations) {\n                const cms = container.resolve(HeadlessCms);\n                const identityContext = container.resolve(IdentityContext);\n                storageOperations = {\n                    filter: createFilterOperations({ cms, identityContext, container }),\n                    flp: container.resolve(FlpStorageOperations)\n                };\n            }\n            return storageOperations;\n        };\n\n        let flpCrudMethods: ReturnType<typeof createFlpCrudMethods> | undefined;\n        const getFlpCrudMethods = () => {\n            if (!flpCrudMethods) {\n                flpCrudMethods = createFlpCrudMethods({\n                    getTenant,\n                    storageOperations: getStorageOperations()\n                });\n            }\n            return flpCrudMethods;\n        };\n        container.registerFactory(AcoFlpCrud, () => getFlpCrudMethods());\n        container.registerFactory(FilterStorageOperations, () => getStorageOperations().filter);\n\n        let filterCrudMethods: ReturnType<typeof createFilterCrudMethods> | undefined;\n        container.registerFactory(AcoFilterCrud, () => {\n            if (!filterCrudMethods) {\n                filterCrudMethods = createFilterCrudMethods({\n                    container,\n                    getTenant,\n                    storageOperations: getStorageOperations(),\n                    folderLevelPermissions: container.resolve(FolderLevelPermissions)\n                });\n            }\n            return filterCrudMethods;\n        });\n\n        container.register(AcoInitializer);\n        container.register(AcoSchemaFactory);\n    }\n});\n"],"names":["AcoSchemaFactoryImpl","builder","addAcoBaseSchema","addFilterSchema","AcoSchemaFactory","GraphQLSchemaFactory","AcoFeature","createFeature","container","FolderModel","FilterPrivateModel","CreateFlpTask","UpdateFlpTask","DeleteFlpTask","SyncFlpTask","FolderLevelPermissionsFeature","CreateFolderFeature","UpdateFolderFeature","DeleteFolderFeature","GetFolderFeature","ListFoldersFeature","ListFolderLevelPermissionsTargetsFeature","GetFolderHierarchyFeature","GetAncestorsFeature","EnsureFolderIsEmptyFeature","CreateFlpFeature","UpdateFlpFeature","DeleteFlpFeature","ListFlpsFeature","GetFlpFeature","CreateFlpOnFolderCreatedFeature","UpdateFlpOnFolderUpdatedFeature","DeleteFlpOnFolderDeletedFeature","EnsureFolderIsEmptyOnDeleteFeature","EnsureHcmsFolderIsEmptyOnDeleteFeature","getTenant","TenantContext","storageOperations","getStorageOperations","cms","HeadlessCms","identityContext","IdentityContext","createFilterOperations","FlpStorageOperations","flpCrudMethods","getFlpCrudMethods","createFlpCrudMethods","AcoFlpCrud","FilterStorageOperations","filterCrudMethods","AcoFilterCrud","createFilterCrudMethods","FolderLevelPermissions","AcoInitializer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,MAAMA;IACF,MAAM,QAAQC,OAA8B,EAAkC;QAG1EC,iBAAiBD;QACjBE,gBAAgBF;QAChB,OAAOA;IACX;AACJ;AAEA,MAAMG,mBAAmBC,qBAAqB,oBAAoB,CAAC;IAC/D,gBAAgBL;IAChB,cAAc,EAAE;AACpB;AAEO,MAAMM,aAAaC,cAAc;IACpC,MAAM;IACN,UAASC,SAAoB;QACzBA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QAGnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QAInBC,8BAA8B,QAAQ,CAACP;QACvCQ,oBAAoB,QAAQ,CAACR;QAC7BS,oBAAoB,QAAQ,CAACT;QAC7BU,oBAAoB,QAAQ,CAACV;QAC7BW,iBAAiB,QAAQ,CAACX;QAC1BY,mBAAmB,QAAQ,CAACZ;QAC5Ba,yCAAyC,QAAQ,CAACb;QAClDc,0BAA0B,QAAQ,CAACd;QACnCe,oBAAoB,QAAQ,CAACf;QAC7BgB,2BAA2B,QAAQ,CAAChB;QACpCiB,iBAAiB,QAAQ,CAACjB;QAC1BkB,iBAAiB,QAAQ,CAAClB;QAC1BmB,iBAAiB,QAAQ,CAACnB;QAC1BoB,gBAAgB,QAAQ,CAACpB;QACzBqB,cAAc,QAAQ,CAACrB;QACvBsB,gCAAgC,QAAQ,CAACtB;QACzCuB,gCAAgC,QAAQ,CAACvB;QACzCwB,gCAAgC,QAAQ,CAACxB;QACzCyB,mCAAmC,QAAQ,CAACzB;QAC5C0B,uCAAuC,QAAQ,CAAC1B;QAMhD,MAAM2B,YAAY,IAAc3B,UAAU,OAAO,CAAC4B,eAAe,SAAS;QAE1E,IAAIC;QACJ,MAAMC,uBAAuB;YACzB,IAAI,CAACD,mBAAmB;gBACpB,MAAME,MAAM/B,UAAU,OAAO,CAACgC;gBAC9B,MAAMC,kBAAkBjC,UAAU,OAAO,CAACkC;gBAC1CL,oBAAoB;oBAChB,QAAQM,uBAAuB;wBAAEJ;wBAAKE;wBAAiBjC;oBAAU;oBACjE,KAAKA,UAAU,OAAO,CAACoC;gBAC3B;YACJ;YACA,OAAOP;QACX;QAEA,IAAIQ;QACJ,MAAMC,oBAAoB;YACtB,IAAI,CAACD,gBACDA,iBAAiBE,qBAAqB;gBAClCZ;gBACA,mBAAmBG;YACvB;YAEJ,OAAOO;QACX;QACArC,UAAU,eAAe,CAACwC,YAAY,IAAMF;QAC5CtC,UAAU,eAAe,CAACyC,yBAAyB,IAAMX,uBAAuB,MAAM;QAEtF,IAAIY;QACJ1C,UAAU,eAAe,CAAC2C,eAAe;YACrC,IAAI,CAACD,mBACDA,oBAAoBE,wBAAwB;gBACxC5C;gBACA2B;gBACA,mBAAmBG;gBACnB,wBAAwB9B,UAAU,OAAO,CAAC6C;YAC9C;YAEJ,OAAOH;QACX;QAEA1C,UAAU,QAAQ,CAAC8C;QACnB9C,UAAU,QAAQ,CAACJ;IACvB;AACJ"}

package/AcoInitializer.d.ts

@@ -0,0 +1,25 @@
+import type { Container } from "@webiny/di";
+import type { IRequestContextInitializer } from "@webiny/event-handler-core";
+/**
+ * Per-request setup that cannot be a synchronous DI factory.
+ *
+ * The ACO facade (filter/flp CRUD, AcoFilterCrud / AcoFlpCrud / FilterStorageOperations) is a LAZY
+ * factory now — see AcoFeature.register. The only work that must stay eager, per request, before
+ * resolvers is:
+ *
+ * 1. Resolving the per-tenant folder model (async) and exposing it as FolderModelAbstraction.
+ * 2. Registering the WCP-gated CMS-entry FLP decorators (CmsFlpFeature) — they must be in place
+ *    before any CMS-entry resolver runs, and the WCP license is only known post-RequestInitializer.
+ * 3. Building the dynamic folder GraphQL schema (needs the resolved folder model).
+ */
+declare class AcoInitializerImpl implements IRequestContextInitializer {
+    private container;
+    private initialized;
+    constructor(container: Container);
+    init(ctx: Record<string, any>): Promise<void>;
+    private _initialize;
+}
+export declare const AcoInitializer: typeof AcoInitializerImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IRequestContextInitializer>;
+};
+export {};

package/AcoInitializer.js

@@ -0,0 +1,79 @@
+import { GraphQLSchemaPlugin } from "@webiny/api-graphql";
+import { RequestContainer, RequestContextInitializer } from "@webiny/event-handler-core";
+import { CoreGraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.js";
+import { isHeadlessCmsReady } from "@webiny/api-headless-cms";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
+import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/abstractions.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { ListModelsUseCase } from "@webiny/api-headless-cms/features/contentModel/ListModels/index.js";
+import { createGraphQLSchemaPluginFromFieldPlugins } from "@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js";
+import { createFoldersSchema } from "./folder/folder.gql.js";
+import { FOLDER_MODEL_ID } from "./domain/folder/folder.model.js";
+import { FolderModel } from "./domain/folder/abstractions.js";
+import { CmsFlpFeature } from "./features/cms/index.js";
+class AcoInitializerImpl {
+    constructor(container){
+        this.container = container;
+        this.initialized = false;
+    }
+    async init(ctx) {
+        if (!this.initialized) {
+            this.initialized = true;
+            await this._initialize(ctx);
+        }
+    }
+    async _initialize(ctx) {
+        if (!await isHeadlessCmsReady(ctx)) return;
+        const identityContext = this.container.resolve(IdentityContext);
+        await identityContext.withoutAuthorization(async ()=>{
+            const folderModel = await this.container.resolve(GetModelUseCase).execute(FOLDER_MODEL_ID);
+            this.container.registerInstance(FolderModel, folderModel.value);
+        });
+        if (this.container.resolve(WcpContext).canUseFolderLevelPermissions()) CmsFlpFeature.register(this.container);
+        const fieldRegistry = this.container.resolve(CmsModelFieldToGraphQLRegistry);
+        await identityContext.withoutAuthorization(async ()=>{
+            const modelResult = await this.container.resolve(GetModelUseCase).execute(FOLDER_MODEL_ID);
+            if (modelResult.isFail()) throw modelResult.error;
+            const model = modelResult.value;
+            const modelsResult = await this.container.resolve(ListModelsUseCase).execute();
+            if (modelsResult.isFail()) throw modelsResult.error;
+            const models = modelsResult.value;
+            const fieldPlugins = createGraphQLSchemaPluginFromFieldPlugins({
+                models,
+                type: "manage",
+                fieldRegistry,
+                createPlugin: ({ schema, type, fieldType })=>{
+                    const plugin = new GraphQLSchemaPlugin(schema);
+                    plugin.name = `aco.graphql.folder.schema.${type}.field.${fieldType}`;
+                    return plugin;
+                }
+            });
+            const graphQlPlugin = createFoldersSchema({
+                model,
+                models,
+                fieldRegistry
+            });
+            for (const p of [
+                ...fieldPlugins,
+                graphQlPlugin
+            ])this.container.registerInstance(CoreGraphQLSchemaFactory, {
+                async execute (builder) {
+                    if (p.schema.typeDefs) builder.addTypeDefs(p.schema.typeDefs);
+                    if (p.schema.resolvers) builder.addLegacyResolvers(p.schema.resolvers);
+                    if (p.schema.resolverDecorators) for (const [path, decorators] of Object.entries(p.schema.resolverDecorators))for (const decorator of decorators)builder.addResolverDecorator(path, decorator);
+                    return builder;
+                }
+            });
+        });
+    }
+}
+const AcoInitializer = RequestContextInitializer.createImplementation({
+    implementation: AcoInitializerImpl,
+    dependencies: [
+        RequestContainer
+    ]
+});
+export { AcoInitializer };
+
+//# sourceMappingURL=AcoInitializer.js.map

package/AcoInitializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcoInitializer.js","sources":["../src/AcoInitializer.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport { GraphQLSchemaPlugin } from \"@webiny/api-graphql\";\nimport { RequestContextInitializer } from \"@webiny/event-handler-core\";\nimport { CoreGraphQLSchemaFactory } from \"@webiny/api-graphql/graphql/abstractions.js\";\nimport type { IRequestContextInitializer } from \"@webiny/event-handler-core\";\nimport type { IGraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\nimport type { IGraphQLSchemaPlugin } from \"@webiny/api-graphql/plugins/GraphQLSchemaPlugin.js\";\nimport { RequestContainer } from \"@webiny/event-handler-core\";\nimport { isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport { WcpContext } from \"@webiny/api-core/features/wcp/WcpContext/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createFoldersSchema } from \"~/folder/folder.gql.js\";\nimport { FOLDER_MODEL_ID } from \"~/domain/folder/folder.model.js\";\nimport { FolderModel as FolderModelAbstraction } from \"~/domain/folder/abstractions.js\";\nimport { CmsFlpFeature } from \"~/features/cms/index.js\";\nimport type { AcoContext } from \"~/types.js\";\n\n/**\n * Per-request setup that cannot be a synchronous DI factory.\n *\n * The ACO facade (filter/flp CRUD, AcoFilterCrud / AcoFlpCrud / FilterStorageOperations) is a LAZY\n * factory now — see AcoFeature.register. The only work that must stay eager, per request, before\n * resolvers is:\n *\n * 1. Resolving the per-tenant folder model (async) and exposing it as FolderModelAbstraction.\n * 2. Registering the WCP-gated CMS-entry FLP decorators (CmsFlpFeature) — they must be in place\n *    before any CMS-entry resolver runs, and the WCP license is only known post-RequestInitializer.\n * 3. Building the dynamic folder GraphQL schema (needs the resolved folder model).\n */\nclass AcoInitializerImpl implements IRequestContextInitializer {\n    private initialized = false;\n\n    constructor(private container: Container) {}\n\n    async init(ctx: Record<string, any>): Promise<void> {\n        if (!this.initialized) {\n            this.initialized = true;\n            await this._initialize(ctx);\n        }\n    }\n\n    private async _initialize(ctx: Record<string, any>): Promise<void> {\n        if (!(await isHeadlessCmsReady(ctx as AcoContext))) {\n            return;\n        }\n\n        const identityContext = this.container.resolve(IdentityContext);\n\n        // Expose the per-tenant folder model.\n        await identityContext.withoutAuthorization(async () => {\n            const folderModel = await this.container\n                .resolve(GetModelUseCase)\n                .execute(FOLDER_MODEL_ID);\n            this.container.registerInstance(FolderModelAbstraction, folderModel.value);\n        });\n\n        // CMS-entry folder-level-permission decorators (WCP-gated). Must be registered before any\n        // CMS-entry resolver runs, so this stays in the (pre-resolver) initializer rather than a\n        // lazy factory.\n        if (this.container.resolve(WcpContext).canUseFolderLevelPermissions()) {\n            CmsFlpFeature.register(this.container);\n        }\n\n        // Dynamic folder schema: register each field/folder schema plugin as a CoreGraphQLSchemaFactory.\n        const fieldRegistry = this.container.resolve(CmsModelFieldToGraphQLRegistry);\n        await identityContext.withoutAuthorization(async () => {\n            const modelResult = await this.container\n                .resolve(GetModelUseCase)\n                .execute(FOLDER_MODEL_ID);\n            if (modelResult.isFail()) {\n                throw modelResult.error;\n            }\n            const model = modelResult.value as CmsModel;\n\n            const modelsResult = await this.container.resolve(ListModelsUseCase).execute();\n            if (modelsResult.isFail()) {\n                throw modelsResult.error;\n            }\n            const models = modelsResult.value;\n\n            const fieldPlugins = createGraphQLSchemaPluginFromFieldPlugins({\n                models,\n                type: \"manage\",\n                fieldRegistry,\n                createPlugin: ({ schema, type, fieldType }) => {\n                    const plugin = new GraphQLSchemaPlugin(schema);\n                    plugin.name = `aco.graphql.folder.schema.${type}.field.${fieldType}`;\n                    return plugin;\n                }\n            });\n\n            const graphQlPlugin = createFoldersSchema({ model, models, fieldRegistry });\n\n            for (const p of [...fieldPlugins, graphQlPlugin] as IGraphQLSchemaPlugin[]) {\n                this.container.registerInstance(CoreGraphQLSchemaFactory, {\n                    async execute(builder: IGraphQLSchemaBuilder): Promise<IGraphQLSchemaBuilder> {\n                        if (p.schema.typeDefs) {\n                            builder.addTypeDefs(p.schema.typeDefs);\n                        }\n                        if (p.schema.resolvers) {\n                            builder.addLegacyResolvers(p.schema.resolvers as Record<string, any>);\n                        }\n                        if (p.schema.resolverDecorators) {\n                            for (const [path, decorators] of Object.entries(\n                                p.schema.resolverDecorators\n                            )) {\n                                for (const decorator of decorators as any[]) {\n                                    builder.addResolverDecorator(path, decorator);\n                                }\n                            }\n                        }\n                        return builder;\n                    }\n                });\n            }\n        });\n    }\n}\n\nexport const AcoInitializer = RequestContextInitializer.createImplementation({\n    implementation: AcoInitializerImpl,\n    dependencies: [RequestContainer]\n});\n"],"names":["AcoInitializerImpl","container","ctx","isHeadlessCmsReady","identityContext","IdentityContext","folderModel","GetModelUseCase","FOLDER_MODEL_ID","FolderModelAbstraction","WcpContext","CmsFlpFeature","fieldRegistry","CmsModelFieldToGraphQLRegistry","modelResult","model","modelsResult","ListModelsUseCase","models","fieldPlugins","createGraphQLSchemaPluginFromFieldPlugins","schema","type","fieldType","plugin","GraphQLSchemaPlugin","graphQlPlugin","createFoldersSchema","p","CoreGraphQLSchemaFactory","builder","path","decorators","Object","decorator","AcoInitializer","RequestContextInitializer","RequestContainer"],"mappings":";;;;;;;;;;;;;;AAkCA,MAAMA;IAGF,YAAoBC,SAAoB,CAAE;aAAtBA,SAAS,GAATA;aAFZ,WAAW,GAAG;IAEqB;IAE3C,MAAM,KAAKC,GAAwB,EAAiB;QAChD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG;YACnB,MAAM,IAAI,CAAC,WAAW,CAACA;QAC3B;IACJ;IAEA,MAAc,YAAYA,GAAwB,EAAiB;QAC/D,IAAI,CAAE,MAAMC,mBAAmBD,MAC3B;QAGJ,MAAME,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAG/C,MAAMD,gBAAgB,oBAAoB,CAAC;YACvC,MAAME,cAAc,MAAM,IAAI,CAAC,SAAS,CACnC,OAAO,CAACC,iBACR,OAAO,CAACC;YACb,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAACC,aAAwBH,YAAY,KAAK;QAC7E;QAKA,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAACI,YAAY,4BAA4B,IAC/DC,cAAc,QAAQ,CAAC,IAAI,CAAC,SAAS;QAIzC,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC7C,MAAMT,gBAAgB,oBAAoB,CAAC;YACvC,MAAMU,cAAc,MAAM,IAAI,CAAC,SAAS,CACnC,OAAO,CAACP,iBACR,OAAO,CAACC;YACb,IAAIM,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;YAE3B,MAAMC,QAAQD,YAAY,KAAK;YAE/B,MAAME,eAAe,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC,mBAAmB,OAAO;YAC5E,IAAID,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;YAE5B,MAAME,SAASF,aAAa,KAAK;YAEjC,MAAMG,eAAeC,0CAA0C;gBAC3DF;gBACA,MAAM;gBACNN;gBACA,cAAc,CAAC,EAAES,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE;oBACtC,MAAMC,SAAS,IAAIC,oBAAoBJ;oBACvCG,OAAO,IAAI,GAAG,CAAC,0BAA0B,EAAEF,KAAK,OAAO,EAAEC,WAAW;oBACpE,OAAOC;gBACX;YACJ;YAEA,MAAME,gBAAgBC,oBAAoB;gBAAEZ;gBAAOG;gBAAQN;YAAc;YAEzE,KAAK,MAAMgB,KAAK;mBAAIT;gBAAcO;aAAc,CAC5C,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAACG,0BAA0B;gBACtD,MAAM,SAAQC,OAA8B;oBACxC,IAAIF,EAAE,MAAM,CAAC,QAAQ,EACjBE,QAAQ,WAAW,CAACF,EAAE,MAAM,CAAC,QAAQ;oBAEzC,IAAIA,EAAE,MAAM,CAAC,SAAS,EAClBE,QAAQ,kBAAkB,CAACF,EAAE,MAAM,CAAC,SAAS;oBAEjD,IAAIA,EAAE,MAAM,CAAC,kBAAkB,EAC3B,KAAK,MAAM,CAACG,MAAMC,WAAW,IAAIC,OAAO,OAAO,CAC3CL,EAAE,MAAM,CAAC,kBAAkB,EAE3B,KAAK,MAAMM,aAAaF,WACpBF,QAAQ,oBAAoB,CAACC,MAAMG;oBAI/C,OAAOJ;gBACX;YACJ;QAER;IACJ;AACJ;AAEO,MAAMK,iBAAiBC,0BAA0B,oBAAoB,CAAC;IACzE,gBAAgBpC;IAChB,cAAc;QAACqC;KAAiB;AACpC"}

package/createAcoGraphQL.d.ts

@@ -1,4 +1,7 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import type { AcoContext } from "./types.js";
-import { ContextPlugin } from "@webiny/api";
-export declare const createAcoGraphQL: () => (ContextPlugin<AcoContext> | GraphQLSchemaPlugin<AcoContext>)[];
+import type { IGraphQLSchemaBuilder } from "@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js";
+/**
+ * The static ACO base schema (root Query.aco / Mutation.aco wrappers + shared types). The dynamic
+ * folder schema (field plugins + folders schema) is built per-request by AcoInitializer, which needs
+ * the resolved per-tenant folder model. The filter schema is contributed by addFilterSchema.
+ */
+export declare const addAcoBaseSchema: (builder: IGraphQLSchemaBuilder) => void;

package/createAcoGraphQL.js

@@ -1,110 +1,70 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import { filterSchema } from "./filter/filter.gql.js";
-import { createFoldersSchema } from "./folder/folder.gql.js";
-import { ContextPlugin } from "@webiny/api";
-import { isHeadlessCmsReady } from "@webiny/api-headless-cms";
-import { createGraphQLSchemaPluginFromFieldPlugins } from "@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js";
-import { FOLDER_MODEL_ID } from "./domain/folder/folder.model.js";
-import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
-const emptyResolver = ()=>({});
-const baseSchema = new GraphQLSchemaPlugin({
-    typeDefs: `
-        type AcoQuery {
-            _empty: String
-        }
+const BASE_TYPE_DEFS = `
+    type AcoQuery {
+        _empty: String
+    }
 
-        type AcoMutation {
-            _empty: String
-        }
+    type AcoMutation {
+        _empty: String
+    }
 
-        type AcoMeta {
-            hasMoreItems: Boolean
-            totalCount: Int
-            cursor: String
-        }
+    type AcoMeta {
+        hasMoreItems: Boolean
+        totalCount: Int
+        cursor: String
+    }
 
-        type AcoUser {
-            id: ID
-            displayName: String
-            type: String
-        }
+    type AcoUser {
+        id: ID
+        displayName: String
+        type: String
+    }
 
-        type AcoError {
-            code: String
-            message: String
-            data: JSON
-            stack: String
-        }
+    type AcoError {
+        code: String
+        message: String
+        data: JSON
+        stack: String
+    }
 
-        type AcoBooleanResponse {
-            data: Boolean
-            error: AcoError
-        }
+    type AcoBooleanResponse {
+        data: Boolean
+        error: AcoError
+    }
 
-        enum AcoSortDirection {
-            ASC
-            DESC
-        }
+    enum AcoSortDirection {
+        ASC
+        DESC
+    }
 
-        input AcoSort {
-            id: AcoSortDirection
-            createdOn: AcoSortDirection
-            modifiedOn: AcoSortDirection
-            savedOn: AcoSortDirection
-            title: AcoSortDirection
-        }
+    input AcoSort {
+        id: AcoSortDirection
+        createdOn: AcoSortDirection
+        modifiedOn: AcoSortDirection
+        savedOn: AcoSortDirection
+        title: AcoSortDirection
+    }
 
-        extend type Query {
-            aco: AcoQuery
-        }
+    extend type Query {
+        aco: AcoQuery
+    }
 
-        extend type Mutation {
-            aco: AcoMutation
-        }
-    `,
-    resolvers: {
-        Query: {
-            aco: emptyResolver
-        },
-        Mutation: {
-            aco: emptyResolver
-        }
+    extend type Mutation {
+        aco: AcoMutation
     }
-});
-const createAcoGraphQL = ()=>{
-    const folderSchema = new ContextPlugin(async (context)=>{
-        if (!await isHeadlessCmsReady(context)) return;
-        const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);
-        await context.security.withoutAuthorization(async ()=>{
-            const model = await context.cms.getModel(FOLDER_MODEL_ID);
-            const models = await context.cms.listModels();
-            const plugins = createGraphQLSchemaPluginFromFieldPlugins({
-                models,
-                type: "manage",
-                fieldRegistry,
-                createPlugin: ({ schema, type, fieldType })=>{
-                    const plugin = new GraphQLSchemaPlugin(schema);
-                    plugin.name = `aco.graphql.folder.schema.${type}.field.${fieldType}`;
-                    return plugin;
-                }
-            });
-            const graphQlPlugin = createFoldersSchema({
-                model,
-                models,
-                fieldRegistry
-            });
-            context.plugins.register([
-                ...plugins,
-                graphQlPlugin
-            ]);
-        });
+`;
+const addAcoBaseSchema = (builder)=>{
+    builder.addTypeDefs(BASE_TYPE_DEFS);
+    builder.addResolver({
+        path: "Query.aco",
+        dependencies: [],
+        resolver: ()=>()=>({})
+    });
+    builder.addResolver({
+        path: "Mutation.aco",
+        dependencies: [],
+        resolver: ()=>()=>({})
     });
-    return [
-        baseSchema,
-        folderSchema,
-        filterSchema
-    ];
 };
-export { createAcoGraphQL };
+export { addAcoBaseSchema };
 
 //# sourceMappingURL=createAcoGraphQL.js.map

package/createAcoGraphQL.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAcoGraphQL.js","sources":["../src/createAcoGraphQL.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { filterSchema } from \"~/filter/filter.gql.js\";\nimport { createFoldersSchema } from \"~/folder/folder.gql.js\";\nimport type { AcoContext } from \"~/types.js\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js\";\nimport { FOLDER_MODEL_ID } from \"~/domain/folder/folder.model.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\n\nconst emptyResolver = () => ({});\n\nconst baseSchema = new GraphQLSchemaPlugin({\n    typeDefs: /* GraphQL */ `\n        type AcoQuery {\n            _empty: String\n        }\n\n        type AcoMutation {\n            _empty: String\n        }\n\n        type AcoMeta {\n            hasMoreItems: Boolean\n            totalCount: Int\n            cursor: String\n        }\n\n        type AcoUser {\n            id: ID\n            displayName: String\n            type: String\n        }\n\n        type AcoError {\n            code: String\n            message: String\n            data: JSON\n            stack: String\n        }\n\n        type AcoBooleanResponse {\n            data: Boolean\n            error: AcoError\n        }\n\n        enum AcoSortDirection {\n            ASC\n            DESC\n        }\n\n        input AcoSort {\n            id: AcoSortDirection\n            createdOn: AcoSortDirection\n            modifiedOn: AcoSortDirection\n            savedOn: AcoSortDirection\n            title: AcoSortDirection\n        }\n\n        extend type Query {\n            aco: AcoQuery\n        }\n\n        extend type Mutation {\n            aco: AcoMutation\n        }\n    `,\n    resolvers: {\n        Query: {\n            aco: emptyResolver\n        },\n        Mutation: {\n            aco: emptyResolver\n        }\n    }\n});\n\nexport const createAcoGraphQL = () => {\n    const folderSchema = new ContextPlugin<AcoContext>(async context => {\n        if (!(await isHeadlessCmsReady(context))) {\n            return;\n        }\n\n        const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);\n\n        await context.security.withoutAuthorization(async () => {\n            const model = (await context.cms.getModel(FOLDER_MODEL_ID)) as CmsModel;\n            const models = await context.cms.listModels();\n            /**\n             * We need to register all plugins for all the CMS fields.\n             */\n            const plugins = createGraphQLSchemaPluginFromFieldPlugins({\n                models,\n                type: \"manage\",\n                fieldRegistry,\n                createPlugin: ({ schema, type, fieldType }) => {\n                    const plugin = new GraphQLSchemaPlugin(schema);\n                    plugin.name = `aco.graphql.folder.schema.${type}.field.${fieldType}`;\n                    return plugin;\n                }\n            });\n\n            const graphQlPlugin = createFoldersSchema({\n                model,\n                models,\n                fieldRegistry\n            });\n\n            context.plugins.register([...plugins, graphQlPlugin]);\n        });\n    });\n\n    return [baseSchema, folderSchema, filterSchema];\n};\n"],"names":["emptyResolver","baseSchema","GraphQLSchemaPlugin","createAcoGraphQL","folderSchema","ContextPlugin","context","isHeadlessCmsReady","fieldRegistry","CmsModelFieldToGraphQLRegistry","model","FOLDER_MODEL_ID","models","plugins","createGraphQLSchemaPluginFromFieldPlugins","schema","type","fieldType","plugin","graphQlPlugin","createFoldersSchema","filterSchema"],"mappings":";;;;;;;;AAWA,MAAMA,gBAAgB,IAAO,EAAC;AAE9B,MAAMC,aAAa,IAAIC,oBAAoB;IACvC,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqDzB,CAAC;IACD,WAAW;QACP,OAAO;YACH,KAAKF;QACT;QACA,UAAU;YACN,KAAKA;QACT;IACJ;AACJ;AAEO,MAAMG,mBAAmB;IAC5B,MAAMC,eAAe,IAAIC,cAA0B,OAAMC;QACrD,IAAI,CAAE,MAAMC,mBAAmBD,UAC3B;QAGJ,MAAME,gBAAgBF,QAAQ,SAAS,CAAC,OAAO,CAACG;QAEhD,MAAMH,QAAQ,QAAQ,CAAC,oBAAoB,CAAC;YACxC,MAAMI,QAAS,MAAMJ,QAAQ,GAAG,CAAC,QAAQ,CAACK;YAC1C,MAAMC,SAAS,MAAMN,QAAQ,GAAG,CAAC,UAAU;YAI3C,MAAMO,UAAUC,0CAA0C;gBACtDF;gBACA,MAAM;gBACNJ;gBACA,cAAc,CAAC,EAAEO,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE;oBACtC,MAAMC,SAAS,IAAIhB,oBAAoBa;oBACvCG,OAAO,IAAI,GAAG,CAAC,0BAA0B,EAAEF,KAAK,OAAO,EAAEC,WAAW;oBACpE,OAAOC;gBACX;YACJ;YAEA,MAAMC,gBAAgBC,oBAAoB;gBACtCV;gBACAE;gBACAJ;YACJ;YAEAF,QAAQ,OAAO,CAAC,QAAQ,CAAC;mBAAIO;gBAASM;aAAc;QACxD;IACJ;IAEA,OAAO;QAAClB;QAAYG;QAAciB;KAAa;AACnD"}
+{"version":3,"file":"createAcoGraphQL.js","sources":["../src/createAcoGraphQL.ts"],"sourcesContent":["import type { IGraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\n\nconst BASE_TYPE_DEFS = /* GraphQL */ `\n    type AcoQuery {\n        _empty: String\n    }\n\n    type AcoMutation {\n        _empty: String\n    }\n\n    type AcoMeta {\n        hasMoreItems: Boolean\n        totalCount: Int\n        cursor: String\n    }\n\n    type AcoUser {\n        id: ID\n        displayName: String\n        type: String\n    }\n\n    type AcoError {\n        code: String\n        message: String\n        data: JSON\n        stack: String\n    }\n\n    type AcoBooleanResponse {\n        data: Boolean\n        error: AcoError\n    }\n\n    enum AcoSortDirection {\n        ASC\n        DESC\n    }\n\n    input AcoSort {\n        id: AcoSortDirection\n        createdOn: AcoSortDirection\n        modifiedOn: AcoSortDirection\n        savedOn: AcoSortDirection\n        title: AcoSortDirection\n    }\n\n    extend type Query {\n        aco: AcoQuery\n    }\n\n    extend type Mutation {\n        aco: AcoMutation\n    }\n`;\n\n/**\n * The static ACO base schema (root Query.aco / Mutation.aco wrappers + shared types). The dynamic\n * folder schema (field plugins + folders schema) is built per-request by AcoInitializer, which needs\n * the resolved per-tenant folder model. The filter schema is contributed by addFilterSchema.\n */\nexport const addAcoBaseSchema = (builder: IGraphQLSchemaBuilder): void => {\n    builder.addTypeDefs(BASE_TYPE_DEFS);\n    builder.addResolver({ path: \"Query.aco\", dependencies: [], resolver: () => () => ({}) });\n    builder.addResolver({ path: \"Mutation.aco\", dependencies: [], resolver: () => () => ({}) });\n};\n"],"names":["BASE_TYPE_DEFS","addAcoBaseSchema","builder"],"mappings":"AAEA,MAAMA,iBAA+B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDtC,CAAC;AAOM,MAAMC,mBAAmB,CAACC;IAC7BA,QAAQ,WAAW,CAACF;IACpBE,QAAQ,WAAW,CAAC;QAAE,MAAM;QAAa,cAAc,EAAE;QAAE,UAAU,IAAM,IAAO,EAAC;IAAG;IACtFA,QAAQ,WAAW,CAAC;QAAE,MAAM;QAAgB,cAAc,EAAE;QAAE,UAAU,IAAM,IAAO,EAAC;IAAG;AAC7F"}

package/exports/api/aco/folder.d.ts

@@ -7,5 +7,5 @@ export { FolderAfterDeleteEventHandler, FolderBeforeDeleteEventHandler, DeleteFo
 export { FolderAfterUpdateEventHandler, FolderBeforeUpdateEventHandler, UpdateFolderRepository, UpdateFolderUseCase } from "../../../features/folder/UpdateFolder/abstractions.js";
 export { EnsureFolderIsEmpty } from "../../../features/folder/EnsureFolderIsEmpty/abstractions.js";
 export { ListFoldersUseCase, ListFoldersRepository } from "../../../features/folder/ListFolders/abstractions.js";
-export { FilterStorageOperations } from "../../../features/folder/shared/abstractions.js";
+export { FilterStorageOperations, FlpStorageOperations } from "../../../features/folder/shared/abstractions.js";
 export type { Folder } from "../../../folder/folder.types.js";

package/exports/api/aco/folder.js

@@ -7,4 +7,4 @@ export { DeleteFolderRepository, DeleteFolderUseCase, FolderAfterDeleteEventHand
 export { FolderAfterUpdateEventHandler, FolderBeforeUpdateEventHandler, UpdateFolderRepository, UpdateFolderUseCase } from "../../../features/folder/UpdateFolder/abstractions.js";
 export { EnsureFolderIsEmpty } from "../../../features/folder/EnsureFolderIsEmpty/abstractions.js";
 export { ListFoldersRepository, ListFoldersUseCase } from "../../../features/folder/ListFolders/abstractions.js";
-export { FilterStorageOperations } from "../../../features/folder/shared/abstractions.js";
+export { FilterStorageOperations, FlpStorageOperations } from "../../../features/folder/shared/abstractions.js";

package/features/cms/decorators/ListDeletedEntriesWithFlpDecorator.js

@@ -10,6 +10,7 @@ class ListDeletedEntriesWithFlpDecoratorImpl {
     async execute(model, params) {
         const loader = async (params)=>{
             const result = await this.decoratee.execute(model, params);
+            if (result.isFail()) throw result.error;
             return result.value;
         };
         const { entries, meta } = await this.listEntriesHandler.execute({

package/features/cms/decorators/ListDeletedEntriesWithFlpDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/cms/decorators/ListDeletedEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListDeletedEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListDeletedEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListDeletedEntriesWithFlpDecoratorImpl implements ListDeletedEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListDeletedEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListDeletedEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListDeletedEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListDeletedEntriesUseCase,\n    decorator: ListDeletedEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListDeletedEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListDeletedEntriesWithFlpDecorator","createDecorator","ListDeletedEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAA8C,CACxD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACQ;QACnC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,OAAOE,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,qCAAqCC,gBAAgB;IAC9D,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}
+{"version":3,"file":"features/cms/decorators/ListDeletedEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListDeletedEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListDeletedEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListDeletedEntriesWithFlpDecoratorImpl implements ListDeletedEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListDeletedEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListDeletedEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            if (result.isFail()) {\n                throw result.error;\n            }\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListDeletedEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListDeletedEntriesUseCase,\n    decorator: ListDeletedEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListDeletedEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListDeletedEntriesWithFlpDecorator","createDecorator","ListDeletedEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAA8C,CACxD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACQ;QACnC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,IAAIE,OAAO,MAAM,IACb,MAAMA,OAAO,KAAK;YAEtB,OAAOA,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,qCAAqCC,gBAAgB;IAC9D,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}

package/features/cms/decorators/ListEntriesWithFlpDecorator.js

@@ -10,6 +10,7 @@ class ListEntriesWithFlpDecoratorImpl {
     async execute(model, params) {
         const loader = async (params)=>{
             const result = await this.decoratee.execute(model, params);
+            if (result.isFail()) throw result.error;
             return result.value;
         };
         const { entries, meta } = await this.listEntriesHandler.execute({

package/features/cms/decorators/ListEntriesWithFlpDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/cms/decorators/ListEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport { ListEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryValues,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListEntriesWithFlpDecoratorImpl implements ListEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListEntriesUseCase,\n    decorator: ListEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListEntriesWithFlpDecorator","createDecorator","ListEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAUA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAAuC,CACjD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACC;QAC5B,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,OAAOE,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,8BAA8BC,gBAAgB;IACvD,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}
+{"version":3,"file":"features/cms/decorators/ListEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator, Result } from \"@webiny/feature/api\";\nimport { ListEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryValues,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListEntriesWithFlpDecoratorImpl implements ListEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            if (result.isFail()) {\n                throw result.error;\n            }\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListEntriesUseCase,\n    decorator: ListEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListEntriesWithFlpDecorator","createDecorator","ListEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAUA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAAuC,CACjD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACC;QAC5B,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,IAAIE,OAAO,MAAM,IACb,MAAMA,OAAO,KAAK;YAEtB,OAAOA,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,8BAA8BC,gBAAgB;IACvD,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}

package/features/cms/decorators/ListLatestEntriesWithFlpDecorator.js

@@ -10,6 +10,7 @@ class ListLatestEntriesWithFlpDecoratorImpl {
     async execute(model, params) {
         const loader = async (params)=>{
             const result = await this.decoratee.execute(model, params);
+            if (result.isFail()) throw result.error;
             return result.value;
         };
         const { entries, meta } = await this.listEntriesHandler.execute({

package/features/cms/decorators/ListLatestEntriesWithFlpDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/cms/decorators/ListLatestEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListLatestEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListLatestEntriesWithFlpDecoratorImpl implements ListLatestEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListLatestEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListLatestEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListLatestEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListLatestEntriesUseCase,\n    decorator: ListLatestEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListLatestEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListLatestEntriesWithFlpDecorator","createDecorator","ListLatestEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAA6C,CACvD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACO;QAClC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,OAAOE,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,oCAAoCC,gBAAgB;IAC7D,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}
+{"version":3,"file":"features/cms/decorators/ListLatestEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListLatestEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListLatestEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListLatestEntriesWithFlpDecoratorImpl implements ListLatestEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListLatestEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListLatestEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            if (result.isFail()) {\n                throw result.error;\n            }\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListLatestEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListLatestEntriesUseCase,\n    decorator: ListLatestEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListLatestEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListLatestEntriesWithFlpDecorator","createDecorator","ListLatestEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAA6C,CACvD;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACO;QAClC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,IAAIE,OAAO,MAAM,IACb,MAAMA,OAAO,KAAK;YAEtB,OAAOA,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,oCAAoCC,gBAAgB;IAC7D,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}

package/features/cms/decorators/ListPublishedEntriesWithFlpDecorator.js

@@ -10,6 +10,7 @@ class ListPublishedEntriesWithFlpDecoratorImpl {
     async execute(model, params) {
         const loader = async (params)=>{
             const result = await this.decoratee.execute(model, params);
+            if (result.isFail()) throw result.error;
             return result.value;
         };
         const { entries, meta } = await this.listEntriesHandler.execute({

package/features/cms/decorators/ListPublishedEntriesWithFlpDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/cms/decorators/ListPublishedEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListPublishedEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListPublishedEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListPublishedEntriesWithFlpDecoratorImpl implements ListPublishedEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListPublishedEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListPublishedEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListPublishedEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListPublishedEntriesUseCase,\n    decorator: ListPublishedEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListPublishedEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListPublishedEntriesWithFlpDecorator","createDecorator","ListPublishedEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAAgD,CAC1D;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACU;QACrC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,OAAOE,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,uCAAuCC,gBAAgB;IAChE,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}
+{"version":3,"file":"features/cms/decorators/ListPublishedEntriesWithFlpDecorator.js","sources":["../../../../src/features/cms/decorators/ListPublishedEntriesWithFlpDecorator.ts"],"sourcesContent":["import { createDecorator } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ListPublishedEntriesUseCase } from \"@webiny/api-headless-cms/features/contentEntry/ListEntries/abstractions.js\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryListParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { FolderLevelPermissions } from \"~/features/flp/FolderLevelPermissions/index.js\";\nimport { ListEntriesFactory } from \"~/utils/decorators/ListEntriesFactory.js\";\n\nclass ListPublishedEntriesWithFlpDecoratorImpl implements ListPublishedEntriesUseCase.Interface {\n    private readonly listEntriesHandler: ListEntriesFactory;\n\n    constructor(\n        folderLevelPermissions: FolderLevelPermissions.Interface,\n        private decoratee: ListPublishedEntriesUseCase.Interface\n    ) {\n        this.listEntriesHandler = new ListEntriesFactory(folderLevelPermissions);\n    }\n\n    async execute<T extends CmsEntryValues>(\n        model: CmsModel,\n        params?: CmsEntryListParams\n    ): ListPublishedEntriesUseCase.Return<T> {\n        const loader = async (params?: CmsEntryListParams) => {\n            const result = await this.decoratee.execute<T>(model, params);\n            if (result.isFail()) {\n                throw result.error;\n            }\n            return result.value;\n        };\n\n        const { entries, meta } = await this.listEntriesHandler.execute<T>({\n            model,\n            dataLoader: loader,\n            initialParams: params\n        });\n\n        return Result.ok({ entries, meta });\n    }\n}\n\nexport const ListPublishedEntriesWithFlpDecorator = createDecorator({\n    abstraction: ListPublishedEntriesUseCase,\n    decorator: ListPublishedEntriesWithFlpDecoratorImpl,\n    dependencies: [FolderLevelPermissions]\n});\n"],"names":["ListPublishedEntriesWithFlpDecoratorImpl","folderLevelPermissions","decoratee","ListEntriesFactory","model","params","loader","result","entries","meta","Result","ListPublishedEntriesWithFlpDecorator","createDecorator","ListPublishedEntriesUseCase","FolderLevelPermissions"],"mappings":";;;;AAWA,MAAMA;IAGF,YACIC,sBAAwD,EAChDC,SAAgD,CAC1D;aADUA,SAAS,GAATA;QAER,IAAI,CAAC,kBAAkB,GAAG,IAAIC,mBAAmBF;IACrD;IAEA,MAAM,QACFG,KAAe,EACfC,MAA2B,EACU;QACrC,MAAMC,SAAS,OAAOD;YAClB,MAAME,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAIH,OAAOC;YACtD,IAAIE,OAAO,MAAM,IACb,MAAMA,OAAO,KAAK;YAEtB,OAAOA,OAAO,KAAK;QACvB;QAEA,MAAM,EAAEC,OAAO,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAI;YAC/DL;YACA,YAAYE;YACZ,eAAeD;QACnB;QAEA,OAAOK,OAAO,EAAE,CAAC;YAAEF;YAASC;QAAK;IACrC;AACJ;AAEO,MAAME,uCAAuCC,gBAAgB;IAChE,aAAaC;IACb,WAAWb;IACX,cAAc;QAACc;KAAuB;AAC1C"}