@webiny/api-file-manager 0.0.0-unstable.e53eceafb5 → 0.0.0-unstable.e6f0dc8ca7

package/graphql/filesSchema.js

@@ -1,26 +1,32 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFilesSchema = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
-var _utils = require("./utils");
-var _createFilesTypeDefs = require("./createFilesTypeDefs");
-var _apiSecurity = require("@webiny/api-security");
-const createFilesSchema = params => {
-  const fileManagerGraphQL = new _handlerGraphql.GraphQLSchemaPlugin({
-    typeDefs: (0, _createFilesTypeDefs.createFilesTypeDefs)(params),
+import { ErrorResponse, GraphQLSchemaPlugin, ListResponse, Response } from "@webiny/handler-graphql";
+import { emptyResolver, resolve } from "./utils.js";
+import { createFilesTypeDefs } from "./createFilesTypeDefs.js";
+import NotAuthorizedResponse from "@webiny/api-core/graphql/security/NotAuthorizedResponse.js";
+import { GetFileUseCase } from "../features/file/GetFile/abstractions.js";
+import { ListFilesUseCase } from "../features/file/ListFiles/abstractions.js";
+import { ListTagsUseCase } from "../features/file/ListTags/abstractions.js";
+import { CreateFileUseCase } from "../features/file/CreateFile/abstractions.js";
+import { CreateFilesInBatchUseCase } from "../features/file/CreateFilesInBatch/abstractions.js";
+import { UpdateFileUseCase } from "../features/file/UpdateFile/abstractions.js";
+import { DeleteFileUseCase } from "../features/file/DeleteFile/abstractions.js";
+import { GetSettingsUseCase } from "../features/settings/GetSettings/abstractions.js";
+import { FileModel } from "../domain/file/abstractions.js";
+export const createFilesSchema = params => {
+  const fileManagerGraphQL = new GraphQLSchemaPlugin({
+    typeDefs: createFilesTypeDefs(params),
     resolvers: {
       Query: {
-        fileManager: _utils.emptyResolver
+        fileManager: emptyResolver
       },
       Mutation: {
-        fileManager: _utils.emptyResolver
+        fileManager: emptyResolver
       },
       FmFile: {
         async src(file, _, context) {
-          const settings = await context.fileManager.getSettings();
+          // TODO: create `FileUrlGenerator` service to use here
+          const getSettings = context.container.resolve(GetSettingsUseCase);
+          const result = await getSettings.execute();
+          const settings = result.value;
           return (settings?.srcPrefix || "") + file.key;
         }
       },
@@ -28,55 +34,77 @@ const createFilesSchema = params => {
         getFileModel(_, __, context) {
           const identity = context.security.getIdentity();
           if (!identity) {
-            return new _apiSecurity.NotAuthorizedResponse();
+            return new NotAuthorizedResponse();
           }
-          return (0, _utils.resolve)(() => context.cms.getModel("fmFile"));
+          return resolve(async () => {
+            return context.container.resolve(FileModel);
+          });
         },
-        getFile(_, args, context) {
-          return (0, _utils.resolve)(() => context.fileManager.getFile(args.id));
+        async getFile(_, args, context) {
+          const getFile = context.container.resolve(GetFileUseCase);
+          const result = await getFile.execute(args.id);
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
+          }
+          return new Response(result.value);
         },
         async listFiles(_, args, context) {
-          try {
-            const [data, meta] = await context.fileManager.listFiles(args);
-            return new _handlerGraphql.ListResponse(data, meta);
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
+          const listFiles = context.container.resolve(ListFilesUseCase);
+          const result = await listFiles.execute(args);
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
           }
+          return new ListResponse(result.value.items, result.value.meta);
         },
         async listTags(_, args, context) {
-          try {
-            const tags = await context.fileManager.listTags(args || {});
-            return new _handlerGraphql.Response(tags);
-          } catch (error) {
-            return new _handlerGraphql.ErrorResponse(error);
+          const listTags = context.container.resolve(ListTagsUseCase);
+          const result = await listTags.execute(args || {});
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
           }
+          return new Response(result.value);
         }
       },
       FmMutation: {
         async createFile(_, args, context) {
-          return (0, _utils.resolve)(() => {
-            return context.fileManager.createFile(args.data, args.meta);
-          });
+          const createFile = context.container.resolve(CreateFileUseCase);
+          const result = await createFile.execute(args.data);
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
+          }
+          return new Response(result.value);
         },
         async createFiles(_, args, context) {
-          return (0, _utils.resolve)(() => {
-            return context.fileManager.createFilesInBatch(args.data, args.meta);
+          const createFilesInBatch = context.container.resolve(CreateFilesInBatchUseCase);
+          const result = await createFilesInBatch.execute({
+            files: args.data,
+            meta: args.meta
           });
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
+          }
+          return new Response(result.value);
         },
         async updateFile(_, args, context) {
-          return (0, _utils.resolve)(() => {
-            return context.fileManager.updateFile(args.id, args.data);
+          const updateFile = context.container.resolve(UpdateFileUseCase);
+          const result = await updateFile.execute({
+            id: args.id,
+            ...args.data
           });
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
+          }
+          return new Response(result.value);
         },
         async deleteFile(_, args, context) {
-          return (0, _utils.resolve)(async () => {
-            // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.
-            const file = await context.fileManager.getFile(args.id);
-            return await context.fileManager.storage.delete({
-              id: file.id,
-              key: file.key
-            });
-          });
+          const deleteFile = context.container.resolve(DeleteFileUseCase);
+          const result = await deleteFile.execute(args.id);
+          if (result.isFail()) {
+            return new ErrorResponse(result.error);
+          }
+
+          // TODO: deletion from Cloud storage should be implemented in the `api-file-manager-s3` as an event handler
+          return new Response(true);
         }
       }
     }
@@ -84,6 +112,5 @@ const createFilesSchema = params => {
   fileManagerGraphQL.name = "fm.graphql.files";
   return fileManagerGraphQL;
 };
-exports.createFilesSchema = createFilesSchema;
 
 //# sourceMappingURL=filesSchema.js.map

package/graphql/filesSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","_utils","_createFilesTypeDefs","_apiSecurity","createFilesSchema","params","fileManagerGraphQL","GraphQLSchemaPlugin","typeDefs","createFilesTypeDefs","resolvers","Query","fileManager","emptyResolver","Mutation","FmFile","src","file","_","context","settings","getSettings","srcPrefix","key","FmQuery","getFileModel","__","identity","security","getIdentity","NotAuthorizedResponse","resolve","cms","getModel","getFile","args","id","listFiles","data","meta","ListResponse","e","ErrorResponse","listTags","tags","Response","error","FmMutation","createFile","createFiles","createFilesInBatch","updateFile","deleteFile","storage","delete","name","exports"],"sources":["filesSchema.ts"],"sourcesContent":["import {\n    ErrorResponse,\n    GraphQLSchemaPlugin,\n    ListResponse,\n    Response\n} from \"@webiny/handler-graphql\";\nimport type { FileManagerContext, FilesListOpts } from \"~/types\";\nimport { emptyResolver, resolve } from \"./utils\";\nimport type { CreateFilesTypeDefsParams } from \"~/graphql/createFilesTypeDefs\";\nimport { createFilesTypeDefs } from \"~/graphql/createFilesTypeDefs\";\nimport { NotAuthorizedResponse } from \"@webiny/api-security\";\n\nexport const createFilesSchema = (params: CreateFilesTypeDefsParams) => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<FileManagerContext>({\n        typeDefs: createFilesTypeDefs(params),\n        resolvers: {\n            Query: {\n                fileManager: emptyResolver\n            },\n            Mutation: {\n                fileManager: emptyResolver\n            },\n            FmFile: {\n                async src(file, _, context) {\n                    const settings = await context.fileManager.getSettings();\n                    return (settings?.srcPrefix || \"\") + file.key;\n                }\n            },\n            FmQuery: {\n                getFileModel(_, __, context) {\n                    const identity = context.security.getIdentity();\n                    if (!identity) {\n                        return new NotAuthorizedResponse();\n                    }\n\n                    return resolve(() => context.cms.getModel(\"fmFile\"));\n                },\n                getFile(_, args: any, context) {\n                    return resolve(() => context.fileManager.getFile(args.id));\n                },\n                async listFiles(_, args: FilesListOpts, context) {\n                    try {\n                        const [data, meta] = await context.fileManager.listFiles(args);\n\n                        return new ListResponse(data, meta);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                async listTags(_, args: any, context) {\n                    try {\n                        const tags = await context.fileManager.listTags(args || {});\n\n                        return new Response(tags);\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                }\n            },\n            FmMutation: {\n                async createFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFile(args.data, args.meta);\n                    });\n                },\n                async createFiles(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.createFilesInBatch(args.data, args.meta);\n                    });\n                },\n                async updateFile(_, args: any, context) {\n                    return resolve(() => {\n                        return context.fileManager.updateFile(args.id, args.data);\n                    });\n                },\n                async deleteFile(_, args: any, context) {\n                    return resolve(async () => {\n                        // TODO: Ideally, this should work via a lifecycle hook; first we delete a record from DB, then from cloud storage.\n                        const file = await context.fileManager.getFile(args.id);\n                        return await context.fileManager.storage.delete({\n                            id: file.id,\n                            key: file.key\n                        });\n                    });\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.files\";\n\n    return fileManagerGraphQL;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ErrorResponse","GraphQLSchemaPlugin","ListResponse","Response","emptyResolver","resolve","createFilesTypeDefs","NotAuthorizedResponse","GetFileUseCase","ListFilesUseCase","ListTagsUseCase","CreateFileUseCase","CreateFilesInBatchUseCase","UpdateFileUseCase","DeleteFileUseCase","GetSettingsUseCase","FileModel","createFilesSchema","params","fileManagerGraphQL","typeDefs","resolvers","Query","fileManager","Mutation","FmFile","src","file","_","context","getSettings","container","result","execute","settings","value","srcPrefix","key","FmQuery","getFileModel","__","identity","security","getIdentity","getFile","args","id","isFail","error","listFiles","items","meta","listTags","FmMutation","createFile","data","createFiles","createFilesInBatch","files","updateFile","deleteFile","name"],"sources":["filesSchema.ts"],"sourcesContent":["import {\n    ErrorResponse,\n    GraphQLSchemaPlugin,\n    ListResponse,\n    Response\n} from \"@webiny/handler-graphql\";\nimport { emptyResolver, resolve } from \"./utils.js\";\nimport type { CreateFilesTypeDefsParams } from \"~/graphql/createFilesTypeDefs.js\";\nimport { createFilesTypeDefs } from \"~/graphql/createFilesTypeDefs.js\";\nimport NotAuthorizedResponse from \"@webiny/api-core/graphql/security/NotAuthorizedResponse.js\";\nimport { GetFileUseCase } from \"~/features/file/GetFile/abstractions.js\";\nimport { ListFilesUseCase } from \"~/features/file/ListFiles/abstractions.js\";\nimport { ListTagsUseCase } from \"~/features/file/ListTags/abstractions.js\";\nimport { CreateFileUseCase } from \"~/features/file/CreateFile/abstractions.js\";\nimport { CreateFilesInBatchUseCase } from \"~/features/file/CreateFilesInBatch/abstractions.js\";\nimport { UpdateFileUseCase } from \"~/features/file/UpdateFile/abstractions.js\";\nimport { DeleteFileUseCase } from \"~/features/file/DeleteFile/abstractions.js\";\nimport { GetSettingsUseCase } from \"~/features/settings/GetSettings/abstractions.js\";\nimport type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { FileModel } from \"~/domain/file/abstractions.js\";\n\nexport const createFilesSchema = (params: CreateFilesTypeDefsParams) => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<ApiCoreContext>({\n        typeDefs: createFilesTypeDefs(params),\n        resolvers: {\n            Query: {\n                fileManager: emptyResolver\n            },\n            Mutation: {\n                fileManager: emptyResolver\n            },\n            FmFile: {\n                async src(file, _, context) {\n                    // TODO: create `FileUrlGenerator` service to use here\n                    const getSettings = context.container.resolve(GetSettingsUseCase);\n                    const result = await getSettings.execute();\n                    const settings = result.value;\n                    return (settings?.srcPrefix || \"\") + file.key;\n                }\n            },\n            FmQuery: {\n                getFileModel(_, __, context) {\n                    const identity = context.security.getIdentity();\n                    if (!identity) {\n                        return new NotAuthorizedResponse();\n                    }\n\n                    return resolve(async () => {\n                        return context.container.resolve(FileModel);\n                    });\n                },\n                async getFile(_, args: any, context) {\n                    const getFile = context.container.resolve(GetFileUseCase);\n                    const result = await getFile.execute(args.id);\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new Response(result.value);\n                },\n                async listFiles(_, args, context) {\n                    const listFiles = context.container.resolve(ListFilesUseCase);\n                    const result = await listFiles.execute(args);\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new ListResponse(result.value.items, result.value.meta);\n                },\n                async listTags(_, args: any, context) {\n                    const listTags = context.container.resolve(ListTagsUseCase);\n                    const result = await listTags.execute(args || {});\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new Response(result.value);\n                }\n            },\n            FmMutation: {\n                async createFile(_, args: any, context) {\n                    const createFile = context.container.resolve(CreateFileUseCase);\n                    const result = await createFile.execute(args.data);\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new Response(result.value);\n                },\n                async createFiles(_, args: any, context) {\n                    const createFilesInBatch = context.container.resolve(CreateFilesInBatchUseCase);\n                    const result = await createFilesInBatch.execute({\n                        files: args.data,\n                        meta: args.meta\n                    });\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new Response(result.value);\n                },\n                async updateFile(_, args: any, context) {\n                    const updateFile = context.container.resolve(UpdateFileUseCase);\n                    const result = await updateFile.execute({\n                        id: args.id,\n                        ...args.data\n                    });\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    return new Response(result.value);\n                },\n                async deleteFile(_, args: any, context) {\n                    const deleteFile = context.container.resolve(DeleteFileUseCase);\n                    const result = await deleteFile.execute(args.id);\n\n                    if (result.isFail()) {\n                        return new ErrorResponse(result.error);\n                    }\n\n                    // TODO: deletion from Cloud storage should be implemented in the `api-file-manager-s3` as an event handler\n                    return new Response(true);\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.files\";\n\n    return fileManagerGraphQL;\n};\n"],"mappings":"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","ignoreList":[]}

package/graphql/getFileByUrl.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import type { FileManagerContext } from "../types";
-export declare const getFileByUrl: () => GraphQLSchemaPlugin<FileManagerContext>;
+import type { ApiCoreContext } from "@webiny/api-core/types/core.js";
+export declare const getFileByUrl: () => GraphQLSchemaPlugin<ApiCoreContext>;

package/graphql/getFileByUrl.js

@@ -1,13 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getFileByUrl = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
-var _apiSecurity = require("@webiny/api-security");
-const getFileByUrl = () => {
-  const fileManagerGraphQL = new _handlerGraphql.GraphQLSchemaPlugin({
+import { ErrorResponse, GraphQLSchemaPlugin } from "@webiny/handler-graphql";
+import { Response, NotFoundResponse } from "@webiny/handler-graphql";
+import { NotAuthorizedError } from "@webiny/api-core/features/security/shared/index.js";
+import { ListFilesUseCase } from "../features/file/ListFiles/index.js";
+export const getFileByUrl = () => {
+  const fileManagerGraphQL = new GraphQLSchemaPlugin({
     typeDefs: /* GraphQL */`
             extend type FmQuery {
                 getFileByUrl(url: String!): FmFileResponse
@@ -19,15 +15,15 @@ const getFileByUrl = () => {
           const {
             url
           } = args;
-          const useCase = new SecureGetFileByUrl(context.security, new GetFileByUrlUseCase(context.fileManager));
+          const useCase = new SecureGetFileByUrl(context.security, new GetFileByUrlUseCase(context.container.resolve(ListFilesUseCase)));
           try {
             const file = await useCase.execute(url);
             if (file) {
-              return new _handlerGraphql.Response(file);
+              return new Response(file);
             }
-            return new _handlerGraphql.NotFoundResponse("File not found!");
+            return new NotFoundResponse("File not found!");
           } catch (error) {
-            return new _handlerGraphql.ErrorResponse(error);
+            return new ErrorResponse(error);
           }
         }
       }
@@ -36,27 +32,22 @@ const getFileByUrl = () => {
   fileManagerGraphQL.name = "fm.graphql.getFileByUrl";
   return fileManagerGraphQL;
 };
-exports.getFileByUrl = getFileByUrl;
 class GetFileByUrlUseCase {
-  constructor(fileManager) {
-    this.fileManager = fileManager;
+  constructor(listFiles) {
+    this.listFiles = listFiles;
   }
   async execute(url) {
     const {
       pathname
     } = new URL(url);
-    const isAlias = !pathname.startsWith("/files/") && !pathname.startsWith("/private/");
-    const query = isAlias ? pathname : pathname.replace("/files/", "").replace("/private/", "");
-    const [files] = await this.fileManager.listFiles({
+    const query = pathname.replace("/files/", "").replace("/private/", "");
+    const filesResult = await this.listFiles.execute({
       where: {
-        OR: [{
-          key: query
-        }, {
-          aliases_contains: query
-        }]
+        key: query
       },
       limit: 1
     });
+    const files = filesResult.value.items;
     return files.length ? files[0] : undefined;
   }
 }
@@ -67,7 +58,7 @@ class SecureGetFileByUrl {
   }
   execute(url) {
     if (!this.security.getIdentity()) {
-      throw new _apiSecurity.NotAuthorizedError({
+      throw new NotAuthorizedError({
         message: "You're not authorized to edit this file!"
       });
     }

package/graphql/getFileByUrl.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","_apiSecurity","getFileByUrl","fileManagerGraphQL","GraphQLSchemaPlugin","typeDefs","resolvers","FmQuery","_","args","context","url","useCase","SecureGetFileByUrl","security","GetFileByUrlUseCase","fileManager","file","execute","Response","NotFoundResponse","error","ErrorResponse","name","exports","constructor","pathname","URL","isAlias","startsWith","query","replace","files","listFiles","where","OR","key","aliases_contains","limit","length","undefined","getIdentity","NotAuthorizedError","message"],"sources":["getFileByUrl.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { Response, NotFoundResponse } from \"@webiny/handler-graphql\";\nimport type { FileManagerContext, FileManagerContextObject, File } from \"~/types\";\nimport type { Security } from \"@webiny/api-security/types\";\nimport { NotAuthorizedError } from \"@webiny/api-security\";\n\nexport const getFileByUrl = () => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<FileManagerContext>({\n        typeDefs: /* GraphQL */ `\n            extend type FmQuery {\n                getFileByUrl(url: String!): FmFileResponse\n            }\n        `,\n        resolvers: {\n            FmQuery: {\n                async getFileByUrl(_, args, context) {\n                    const { url } = args as { url: string };\n                    const useCase = new SecureGetFileByUrl(\n                        context.security,\n                        new GetFileByUrlUseCase(context.fileManager)\n                    );\n                    try {\n                        const file = await useCase.execute(url);\n                        if (file) {\n                            return new Response(file);\n                        }\n                        return new NotFoundResponse(\"File not found!\");\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.getFileByUrl\";\n\n    return fileManagerGraphQL;\n};\n\ninterface IGetFileByUrl {\n    execute(url: string): Promise<File | undefined>;\n}\n\nclass GetFileByUrlUseCase implements IGetFileByUrl {\n    private readonly fileManager: FileManagerContextObject;\n\n    constructor(fileManager: FileManagerContextObject) {\n        this.fileManager = fileManager;\n    }\n\n    async execute(url: string): Promise<File | undefined> {\n        const { pathname } = new URL(url);\n        const isAlias = !pathname.startsWith(\"/files/\") && !pathname.startsWith(\"/private/\");\n        const query = isAlias ? pathname : pathname.replace(\"/files/\", \"\").replace(\"/private/\", \"\");\n\n        const [files] = await this.fileManager.listFiles({\n            where: {\n                OR: [{ key: query }, { aliases_contains: query }]\n            },\n            limit: 1\n        });\n\n        return files.length ? files[0] : undefined;\n    }\n}\n\nclass SecureGetFileByUrl implements IGetFileByUrl {\n    private security: Security;\n    private useCase: IGetFileByUrl;\n\n    constructor(security: Security, useCase: IGetFileByUrl) {\n        this.security = security;\n        this.useCase = useCase;\n    }\n\n    execute(url: string): Promise<File | undefined> {\n        if (!this.security.getIdentity()) {\n            throw new NotAuthorizedError({ message: \"You're not authorized to edit this file!\" });\n        }\n\n        return this.useCase.execute(url);\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAIA,IAAAC,YAAA,GAAAD,OAAA;AAEO,MAAME,YAAY,GAAGA,CAAA,KAAM;EAC9B,MAAMC,kBAAkB,GAAG,IAAIC,mCAAmB,CAAqB;IACnEC,QAAQ,EAAE,aAAc;AAChC;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACPC,OAAO,EAAE;QACL,MAAML,YAAYA,CAACM,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE;UACjC,MAAM;YAAEC;UAAI,CAAC,GAAGF,IAAuB;UACvC,MAAMG,OAAO,GAAG,IAAIC,kBAAkB,CAClCH,OAAO,CAACI,QAAQ,EAChB,IAAIC,mBAAmB,CAACL,OAAO,CAACM,WAAW,CAC/C,CAAC;UACD,IAAI;YACA,MAAMC,IAAI,GAAG,MAAML,OAAO,CAACM,OAAO,CAACP,GAAG,CAAC;YACvC,IAAIM,IAAI,EAAE;cACN,OAAO,IAAIE,wBAAQ,CAACF,IAAI,CAAC;YAC7B;YACA,OAAO,IAAIG,gCAAgB,CAAC,iBAAiB,CAAC;UAClD,CAAC,CAAC,OAAOC,KAAK,EAAE;YACZ,OAAO,IAAIC,6BAAa,CAACD,KAAK,CAAC;UACnC;QACJ;MACJ;IACJ;EACJ,CAAC,CAAC;EACFlB,kBAAkB,CAACoB,IAAI,GAAG,yBAAyB;EAEnD,OAAOpB,kBAAkB;AAC7B,CAAC;AAACqB,OAAA,CAAAtB,YAAA,GAAAA,YAAA;AAMF,MAAMa,mBAAmB,CAA0B;EAG/CU,WAAWA,CAACT,WAAqC,EAAE;IAC/C,IAAI,CAACA,WAAW,GAAGA,WAAW;EAClC;EAEA,MAAME,OAAOA,CAACP,GAAW,EAA6B;IAClD,MAAM;MAAEe;IAAS,CAAC,GAAG,IAAIC,GAAG,CAAChB,GAAG,CAAC;IACjC,MAAMiB,OAAO,GAAG,CAACF,QAAQ,CAACG,UAAU,CAAC,SAAS,CAAC,IAAI,CAACH,QAAQ,CAACG,UAAU,CAAC,WAAW,CAAC;IACpF,MAAMC,KAAK,GAAGF,OAAO,GAAGF,QAAQ,GAAGA,QAAQ,CAACK,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAACA,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;IAE3F,MAAM,CAACC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAChB,WAAW,CAACiB,SAAS,CAAC;MAC7CC,KAAK,EAAE;QACHC,EAAE,EAAE,CAAC;UAAEC,GAAG,EAAEN;QAAM,CAAC,EAAE;UAAEO,gBAAgB,EAAEP;QAAM,CAAC;MACpD,CAAC;MACDQ,KAAK,EAAE;IACX,CAAC,CAAC;IAEF,OAAON,KAAK,CAACO,MAAM,GAAGP,KAAK,CAAC,CAAC,CAAC,GAAGQ,SAAS;EAC9C;AACJ;AAEA,MAAM3B,kBAAkB,CAA0B;EAI9CY,WAAWA,CAACX,QAAkB,EAAEF,OAAsB,EAAE;IACpD,IAAI,CAACE,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACF,OAAO,GAAGA,OAAO;EAC1B;EAEAM,OAAOA,CAACP,GAAW,EAA6B;IAC5C,IAAI,CAAC,IAAI,CAACG,QAAQ,CAAC2B,WAAW,CAAC,CAAC,EAAE;MAC9B,MAAM,IAAIC,+BAAkB,CAAC;QAAEC,OAAO,EAAE;MAA2C,CAAC,CAAC;IACzF;IAEA,OAAO,IAAI,CAAC/B,OAAO,CAACM,OAAO,CAACP,GAAG,CAAC;EACpC;AACJ","ignoreList":[]}
+{"version":3,"names":["ErrorResponse","GraphQLSchemaPlugin","Response","NotFoundResponse","NotAuthorizedError","ListFilesUseCase","getFileByUrl","fileManagerGraphQL","typeDefs","resolvers","FmQuery","_","args","context","url","useCase","SecureGetFileByUrl","security","GetFileByUrlUseCase","container","resolve","file","execute","error","name","constructor","listFiles","pathname","URL","query","replace","filesResult","where","key","limit","files","value","items","length","undefined","getIdentity","message"],"sources":["getFileByUrl.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { Response, NotFoundResponse } from \"@webiny/handler-graphql\";\nimport type { File } from \"~/domain/file/types.js\";\nimport type { Security } from \"@webiny/api-core/types/security.js\";\nimport { NotAuthorizedError } from \"@webiny/api-core/features/security/shared/index.js\";\nimport type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { ListFilesUseCase } from \"~/features/file/ListFiles/index.js\";\n\nexport const getFileByUrl = () => {\n    const fileManagerGraphQL = new GraphQLSchemaPlugin<ApiCoreContext>({\n        typeDefs: /* GraphQL */ `\n            extend type FmQuery {\n                getFileByUrl(url: String!): FmFileResponse\n            }\n        `,\n        resolvers: {\n            FmQuery: {\n                async getFileByUrl(_, args, context) {\n                    const { url } = args as { url: string };\n                    const useCase = new SecureGetFileByUrl(\n                        context.security,\n                        new GetFileByUrlUseCase(context.container.resolve(ListFilesUseCase))\n                    );\n                    try {\n                        const file = await useCase.execute(url);\n                        if (file) {\n                            return new Response(file);\n                        }\n                        return new NotFoundResponse(\"File not found!\");\n                    } catch (error) {\n                        return new ErrorResponse(error);\n                    }\n                }\n            }\n        }\n    });\n    fileManagerGraphQL.name = \"fm.graphql.getFileByUrl\";\n\n    return fileManagerGraphQL;\n};\n\ninterface IGetFileByUrl {\n    execute(url: string): Promise<File | undefined>;\n}\n\nclass GetFileByUrlUseCase implements IGetFileByUrl {\n    constructor(private listFiles: ListFilesUseCase.Interface) {}\n\n    async execute(url: string): Promise<File | undefined> {\n        const { pathname } = new URL(url);\n        const query = pathname.replace(\"/files/\", \"\").replace(\"/private/\", \"\");\n\n        const filesResult = await this.listFiles.execute({\n            where: {\n                key: query\n            },\n            limit: 1\n        });\n\n        const files = filesResult.value.items;\n\n        return files.length ? files[0] : undefined;\n    }\n}\n\nclass SecureGetFileByUrl implements IGetFileByUrl {\n    private security: Security;\n    private useCase: IGetFileByUrl;\n\n    constructor(security: Security, useCase: IGetFileByUrl) {\n        this.security = security;\n        this.useCase = useCase;\n    }\n\n    execute(url: string): Promise<File | undefined> {\n        if (!this.security.getIdentity()) {\n            throw new NotAuthorizedError({ message: \"You're not authorized to edit this file!\" });\n        }\n\n        return this.useCase.execute(url);\n    }\n}\n"],"mappings":"AAAA,SAASA,aAAa,EAAEC,mBAAmB,QAAQ,yBAAyB;AAC5E,SAASC,QAAQ,EAAEC,gBAAgB,QAAQ,yBAAyB;AAGpE,SAASC,kBAAkB,QAAQ,oDAAoD;AAEvF,SAASC,gBAAgB;AAEzB,OAAO,MAAMC,YAAY,GAAGA,CAAA,KAAM;EAC9B,MAAMC,kBAAkB,GAAG,IAAIN,mBAAmB,CAAiB;IAC/DO,QAAQ,EAAE,aAAc;AAChC;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACPC,OAAO,EAAE;QACL,MAAMJ,YAAYA,CAACK,CAAC,EAAEC,IAAI,EAAEC,OAAO,EAAE;UACjC,MAAM;YAAEC;UAAI,CAAC,GAAGF,IAAuB;UACvC,MAAMG,OAAO,GAAG,IAAIC,kBAAkB,CAClCH,OAAO,CAACI,QAAQ,EAChB,IAAIC,mBAAmB,CAACL,OAAO,CAACM,SAAS,CAACC,OAAO,CAACf,gBAAgB,CAAC,CACvE,CAAC;UACD,IAAI;YACA,MAAMgB,IAAI,GAAG,MAAMN,OAAO,CAACO,OAAO,CAACR,GAAG,CAAC;YACvC,IAAIO,IAAI,EAAE;cACN,OAAO,IAAInB,QAAQ,CAACmB,IAAI,CAAC;YAC7B;YACA,OAAO,IAAIlB,gBAAgB,CAAC,iBAAiB,CAAC;UAClD,CAAC,CAAC,OAAOoB,KAAK,EAAE;YACZ,OAAO,IAAIvB,aAAa,CAACuB,KAAK,CAAC;UACnC;QACJ;MACJ;IACJ;EACJ,CAAC,CAAC;EACFhB,kBAAkB,CAACiB,IAAI,GAAG,yBAAyB;EAEnD,OAAOjB,kBAAkB;AAC7B,CAAC;AAMD,MAAMW,mBAAmB,CAA0B;EAC/CO,WAAWA,CAASC,SAAqC,EAAE;IAAA,KAAvCA,SAAqC,GAArCA,SAAqC;EAAG;EAE5D,MAAMJ,OAAOA,CAACR,GAAW,EAA6B;IAClD,MAAM;MAAEa;IAAS,CAAC,GAAG,IAAIC,GAAG,CAACd,GAAG,CAAC;IACjC,MAAMe,KAAK,GAAGF,QAAQ,CAACG,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAACA,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;IAEtE,MAAMC,WAAW,GAAG,MAAM,IAAI,CAACL,SAAS,CAACJ,OAAO,CAAC;MAC7CU,KAAK,EAAE;QACHC,GAAG,EAAEJ;MACT,CAAC;MACDK,KAAK,EAAE;IACX,CAAC,CAAC;IAEF,MAAMC,KAAK,GAAGJ,WAAW,CAACK,KAAK,CAACC,KAAK;IAErC,OAAOF,KAAK,CAACG,MAAM,GAAGH,KAAK,CAAC,CAAC,CAAC,GAAGI,SAAS;EAC9C;AACJ;AAEA,MAAMvB,kBAAkB,CAA0B;EAI9CS,WAAWA,CAACR,QAAkB,EAAEF,OAAsB,EAAE;IACpD,IAAI,CAACE,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACF,OAAO,GAAGA,OAAO;EAC1B;EAEAO,OAAOA,CAACR,GAAW,EAA6B;IAC5C,IAAI,CAAC,IAAI,CAACG,QAAQ,CAACuB,WAAW,CAAC,CAAC,EAAE;MAC9B,MAAM,IAAIpC,kBAAkB,CAAC;QAAEqC,OAAO,EAAE;MAA2C,CAAC,CAAC;IACzF;IAEA,OAAO,IAAI,CAAC1B,OAAO,CAACO,OAAO,CAACR,GAAG,CAAC;EACpC;AACJ","ignoreList":[]}

package/graphql/index.d.ts

@@ -1,4 +1,4 @@
 import { ContextPlugin } from "@webiny/api";
+import type { ApiCoreContext } from "@webiny/api-core/types/core.js";
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import type { FileManagerContext } from "../types";
-export declare const createGraphQLSchemaPlugin: () => (GraphQLSchemaPlugin<FileManagerContext> | ContextPlugin<FileManagerContext>)[];
+export declare const createGraphQLSchemaPlugin: () => (GraphQLSchemaPlugin<ApiCoreContext> | ContextPlugin<ApiCoreContext>)[];

package/graphql/index.js

@@ -1,55 +1,54 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGraphQLSchemaPlugin = void 0;
-var _api = require("@webiny/api");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
-var _createFieldTypePluginRecords = require("@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords");
-var _getSchemaFromFieldPlugins = require("@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins");
-var _baseSchema = require("./baseSchema");
-var _handlerGraphql = require("@webiny/handler-graphql");
-var _filesSchema = require("./filesSchema");
-var _getFileByUrl = require("./getFileByUrl");
-const createGraphQLSchemaPlugin = () => {
-  return [(0, _baseSchema.createBaseSchema)(),
+import { ContextPlugin } from "@webiny/api";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
+import { ListModelsUseCase } from "@webiny/api-headless-cms/features/contentModel/ListModels/index.js";
+import { createGraphQLSchemaPluginFromFieldPlugins } from "@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js";
+import { createBaseSchema } from "./baseSchema.js";
+import { createFilesSchema } from "./filesSchema.js";
+import { getFileByUrl } from "./getFileByUrl.js";
+import { FileModel } from "../domain/file/abstractions.js";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+export const createGraphQLSchemaPlugin = () => {
+  return [createBaseSchema(),
   // Files schema is generated dynamically, based on a CMS model, so we need to
   // register it from a ContextPlugin, to perform additional bootstrap.
-  new _api.ContextPlugin(async context => {
-    if (!(await (0, _apiHeadlessCms.isHeadlessCmsReady)(context))) {
+  new ContextPlugin(async context => {
+    const tenantContext = context.container.resolve(TenantContext);
+    if (!tenantContext.getTenant()) {
       return;
     }
+    const fileModel = context.container.resolve(FileModel);
+    const listModels = context.container.resolve(ListModelsUseCase);
+    const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);
     await context.security.withoutAuthorization(async () => {
-      const fileModel = await context.cms.getModel("fmFile");
-      const models = await context.cms.listModels();
-      const fieldPlugins = (0, _createFieldTypePluginRecords.createFieldTypePluginRecords)(context.plugins);
+      const modelsResult = await listModels.execute();
+      const models = modelsResult.value;
+
       /**
        * We need to register all plugins for all the CMS fields.
        */
-      const plugins = (0, _getSchemaFromFieldPlugins.createGraphQLSchemaPluginFromFieldPlugins)({
+      const plugins = createGraphQLSchemaPluginFromFieldPlugins({
         models,
         type: "manage",
-        fieldTypePlugins: fieldPlugins,
+        fieldRegistry,
         createPlugin: ({
           schema,
           type,
           fieldType
         }) => {
-          const plugin = new _handlerGraphql.GraphQLSchemaPlugin(schema);
+          const plugin = new GraphQLSchemaPlugin(schema);
           plugin.name = `fm.graphql.schema.${type}.field.${fieldType}`;
           return plugin;
         }
       });
-      const graphQlPlugin = (0, _filesSchema.createFilesSchema)({
+      const graphQlPlugin = createFilesSchema({
         model: fileModel,
         models,
-        plugins: fieldPlugins
+        fieldRegistry
       });
-      context.plugins.register([...plugins, graphQlPlugin, (0, _getFileByUrl.getFileByUrl)()]);
+      context.plugins.register([...plugins, graphQlPlugin, getFileByUrl()]);
     });
   })];
 };
-exports.createGraphQLSchemaPlugin = createGraphQLSchemaPlugin;
 
 //# sourceMappingURL=index.js.map

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_api","require","_apiHeadlessCms","_createFieldTypePluginRecords","_getSchemaFromFieldPlugins","_baseSchema","_handlerGraphql","_filesSchema","_getFileByUrl","createGraphQLSchemaPlugin","createBaseSchema","ContextPlugin","context","isHeadlessCmsReady","security","withoutAuthorization","fileModel","cms","getModel","models","listModels","fieldPlugins","createFieldTypePluginRecords","plugins","createGraphQLSchemaPluginFromFieldPlugins","type","fieldTypePlugins","createPlugin","schema","fieldType","plugin","GraphQLSchemaPlugin","name","graphQlPlugin","createFilesSchema","model","register","getFileByUrl","exports"],"sources":["index.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createFieldTypePluginRecords } from \"@webiny/api-headless-cms/graphql/schema/createFieldTypePluginRecords\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins\";\nimport { createBaseSchema } from \"~/graphql/baseSchema\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { createFilesSchema } from \"~/graphql/filesSchema\";\nimport { getFileByUrl } from \"~/graphql/getFileByUrl\";\nimport type { FileManagerContext } from \"~/types\";\n\nexport const createGraphQLSchemaPlugin = () => {\n    return [\n        createBaseSchema(),\n        // Files schema is generated dynamically, based on a CMS model, so we need to\n        // register it from a ContextPlugin, to perform additional bootstrap.\n        new ContextPlugin<FileManagerContext>(async context => {\n            if (!(await isHeadlessCmsReady(context))) {\n                return;\n            }\n\n            await context.security.withoutAuthorization(async () => {\n                const fileModel = (await context.cms.getModel(\"fmFile\")) as CmsModel;\n                const models = await context.cms.listModels();\n                const fieldPlugins = createFieldTypePluginRecords(context.plugins);\n                /**\n                 * We need to register all plugins for all the CMS fields.\n                 */\n                const plugins = createGraphQLSchemaPluginFromFieldPlugins({\n                    models,\n                    type: \"manage\",\n                    fieldTypePlugins: fieldPlugins,\n                    createPlugin: ({ schema, type, fieldType }) => {\n                        const plugin = new GraphQLSchemaPlugin(schema);\n                        plugin.name = `fm.graphql.schema.${type}.field.${fieldType}`;\n                        return plugin;\n                    }\n                });\n\n                const graphQlPlugin = createFilesSchema({\n                    model: fileModel,\n                    models,\n                    plugins: fieldPlugins\n                });\n\n                context.plugins.register([...plugins, graphQlPlugin, getFileByUrl()]);\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,6BAAA,GAAAF,OAAA;AACA,IAAAG,0BAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAP,OAAA;AAGO,MAAMQ,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CACH,IAAAC,4BAAgB,EAAC,CAAC;EAClB;EACA;EACA,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IACnD,IAAI,EAAE,MAAM,IAAAC,kCAAkB,EAACD,OAAO,CAAC,CAAC,EAAE;MACtC;IACJ;IAEA,MAAMA,OAAO,CAACE,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACpD,MAAMC,SAAS,GAAI,MAAMJ,OAAO,CAACK,GAAG,CAACC,QAAQ,CAAC,QAAQ,CAAc;MACpE,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACK,GAAG,CAACG,UAAU,CAAC,CAAC;MAC7C,MAAMC,YAAY,GAAG,IAAAC,0DAA4B,EAACV,OAAO,CAACW,OAAO,CAAC;MAClE;AAChB;AACA;MACgB,MAAMA,OAAO,GAAG,IAAAC,oEAAyC,EAAC;QACtDL,MAAM;QACNM,IAAI,EAAE,QAAQ;QACdC,gBAAgB,EAAEL,YAAY;QAC9BM,YAAY,EAAEA,CAAC;UAAEC,MAAM;UAAEH,IAAI;UAAEI;QAAU,CAAC,KAAK;UAC3C,MAAMC,MAAM,GAAG,IAAIC,mCAAmB,CAACH,MAAM,CAAC;UAC9CE,MAAM,CAACE,IAAI,GAAG,qBAAqBP,IAAI,UAAUI,SAAS,EAAE;UAC5D,OAAOC,MAAM;QACjB;MACJ,CAAC,CAAC;MAEF,MAAMG,aAAa,GAAG,IAAAC,8BAAiB,EAAC;QACpCC,KAAK,EAAEnB,SAAS;QAChBG,MAAM;QACNI,OAAO,EAAEF;MACb,CAAC,CAAC;MAEFT,OAAO,CAACW,OAAO,CAACa,QAAQ,CAAC,CAAC,GAAGb,OAAO,EAAEU,aAAa,EAAE,IAAAI,0BAAY,EAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACC,OAAA,CAAA7B,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"names":["ContextPlugin","GraphQLSchemaPlugin","ListModelsUseCase","createGraphQLSchemaPluginFromFieldPlugins","createBaseSchema","createFilesSchema","getFileByUrl","FileModel","TenantContext","CmsModelFieldToGraphQLRegistry","createGraphQLSchemaPlugin","context","tenantContext","container","resolve","getTenant","fileModel","listModels","fieldRegistry","security","withoutAuthorization","modelsResult","execute","models","value","plugins","type","createPlugin","schema","fieldType","plugin","name","graphQlPlugin","model","register"],"sources":["index.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { createGraphQLSchemaPluginFromFieldPlugins } from \"@webiny/api-headless-cms/utils/getSchemaFromFieldPlugins.js\";\nimport { createBaseSchema } from \"~/graphql/baseSchema.js\";\nimport { createFilesSchema } from \"~/graphql/filesSchema.js\";\nimport { getFileByUrl } from \"~/graphql/getFileByUrl.js\";\nimport { FileModel } from \"~/domain/file/abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\n\nexport const createGraphQLSchemaPlugin = () => {\n    return [\n        createBaseSchema(),\n        // Files schema is generated dynamically, based on a CMS model, so we need to\n        // register it from a ContextPlugin, to perform additional bootstrap.\n        new ContextPlugin<ApiCoreContext>(async context => {\n            const tenantContext = context.container.resolve(TenantContext);\n            if (!tenantContext.getTenant()) {\n                return;\n            }\n\n            const fileModel = context.container.resolve(FileModel);\n            const listModels = context.container.resolve(ListModelsUseCase);\n            const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);\n\n            await context.security.withoutAuthorization(async () => {\n                const modelsResult = await listModels.execute();\n                const models = modelsResult.value;\n\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 = `fm.graphql.schema.${type}.field.${fieldType}`;\n                        return plugin;\n                    }\n                });\n\n                const graphQlPlugin = createFilesSchema({\n                    model: fileModel,\n                    models,\n                    fieldRegistry\n                });\n\n                context.plugins.register([...plugins, graphQlPlugin, getFileByUrl()]);\n            });\n        })\n    ];\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAE3C,SAASC,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,iBAAiB,QAAQ,oEAAoE;AACtG,SAASC,yCAAyC,QAAQ,6DAA6D;AACvH,SAASC,gBAAgB;AACzB,SAASC,iBAAiB;AAC1B,SAASC,YAAY;AACrB,SAASC,SAAS;AAClB,SAASC,aAAa,QAAQ,0DAA0D;AACxF,SAASC,8BAA8B,QAAQ,qDAAqD;AAEpG,OAAO,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,CACHN,gBAAgB,CAAC,CAAC;EAClB;EACA;EACA,IAAIJ,aAAa,CAAiB,MAAMW,OAAO,IAAI;IAC/C,MAAMC,aAAa,GAAGD,OAAO,CAACE,SAAS,CAACC,OAAO,CAACN,aAAa,CAAC;IAC9D,IAAI,CAACI,aAAa,CAACG,SAAS,CAAC,CAAC,EAAE;MAC5B;IACJ;IAEA,MAAMC,SAAS,GAAGL,OAAO,CAACE,SAAS,CAACC,OAAO,CAACP,SAAS,CAAC;IACtD,MAAMU,UAAU,GAAGN,OAAO,CAACE,SAAS,CAACC,OAAO,CAACZ,iBAAiB,CAAC;IAC/D,MAAMgB,aAAa,GAAGP,OAAO,CAACE,SAAS,CAACC,OAAO,CAACL,8BAA8B,CAAC;IAE/E,MAAME,OAAO,CAACQ,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACpD,MAAMC,YAAY,GAAG,MAAMJ,UAAU,CAACK,OAAO,CAAC,CAAC;MAC/C,MAAMC,MAAM,GAAGF,YAAY,CAACG,KAAK;;MAEjC;AAChB;AACA;MACgB,MAAMC,OAAO,GAAGtB,yCAAyC,CAAC;QACtDoB,MAAM;QACNG,IAAI,EAAE,QAAQ;QACdR,aAAa;QACbS,YAAY,EAAEA,CAAC;UAAEC,MAAM;UAAEF,IAAI;UAAEG;QAAU,CAAC,KAAK;UAC3C,MAAMC,MAAM,GAAG,IAAI7B,mBAAmB,CAAC2B,MAAM,CAAC;UAC9CE,MAAM,CAACC,IAAI,GAAG,qBAAqBL,IAAI,UAAUG,SAAS,EAAE;UAC5D,OAAOC,MAAM;QACjB;MACJ,CAAC,CAAC;MAEF,MAAME,aAAa,GAAG3B,iBAAiB,CAAC;QACpC4B,KAAK,EAAEjB,SAAS;QAChBO,MAAM;QACNL;MACJ,CAAC,CAAC;MAEFP,OAAO,CAACc,OAAO,CAACS,QAAQ,CAAC,CAAC,GAAGT,OAAO,EAAEO,aAAa,EAAE1B,YAAY,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC","ignoreList":[]}

package/graphql/utils.d.ts

@@ -7,5 +7,5 @@ export declare const emptyResolver: () => {};
 interface ResolveCallable {
     (): Promise<any>;
 }
-export declare const resolve: (fn: ResolveCallable) => Promise<ErrorResponse | Response<any>>;
+export declare const resolve: (fn: ResolveCallable) => Promise<Response<any> | ErrorResponse>;
 export {};

package/graphql/utils.js

@@ -1,24 +1,17 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.resolve = exports.emptyResolver = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
-const emptyResolver = () => ({});
+import { Response, ErrorResponse } from "@webiny/handler-graphql";
+export const emptyResolver = () => ({});
 
 /**
  * Use any because it really can be any.
  * TODO @ts-refactor maybe use generics at some point?
  */
-exports.emptyResolver = emptyResolver;
-const resolve = async fn => {
+
+export const resolve = async fn => {
   try {
-    return new _handlerGraphql.Response(await fn());
+    return new Response(await fn());
   } catch (e) {
-    return new _handlerGraphql.ErrorResponse(e);
+    return new ErrorResponse(e);
   }
 };
-exports.resolve = resolve;
 
 //# sourceMappingURL=utils.js.map

package/graphql/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","emptyResolver","exports","resolve","fn","Response","e","ErrorResponse"],"sources":["utils.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql\";\n\nexport const emptyResolver = () => ({});\n\n/**\n * Use any because it really can be any.\n * TODO @ts-refactor maybe use generics at some point?\n */\ninterface ResolveCallable {\n    (): Promise<any>;\n}\n\nexport const resolve = async (fn: ResolveCallable) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAEO,MAAMC,aAAa,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC;;AAEvC;AACA;AACA;AACA;AAHAC,OAAA,CAAAD,aAAA,GAAAA,aAAA;AAQO,MAAME,OAAO,GAAG,MAAOC,EAAmB,IAAK;EAClD,IAAI;IACA,OAAO,IAAIC,wBAAQ,CAAC,MAAMD,EAAE,CAAC,CAAC,CAAC;EACnC,CAAC,CAAC,OAAOE,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAACJ,OAAA,CAAAC,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"names":["Response","ErrorResponse","emptyResolver","resolve","fn","e"],"sources":["utils.ts"],"sourcesContent":["import { Response, ErrorResponse } from \"@webiny/handler-graphql\";\n\nexport const emptyResolver = () => ({});\n\n/**\n * Use any because it really can be any.\n * TODO @ts-refactor maybe use generics at some point?\n */\ninterface ResolveCallable {\n    (): Promise<any>;\n}\n\nexport const resolve = async (fn: ResolveCallable) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,aAAa,QAAQ,yBAAyB;AAEjE,OAAO,MAAMC,aAAa,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC;;AAEvC;AACA;AACA;AACA;;AAKA,OAAO,MAAMC,OAAO,GAAG,MAAOC,EAAmB,IAAK;EAClD,IAAI;IACA,OAAO,IAAIJ,QAAQ,CAAC,MAAMI,EAAE,CAAC,CAAC,CAAC;EACnC,CAAC,CAAC,OAAOC,CAAC,EAAE;IACR,OAAO,IAAIJ,aAAa,CAACI,CAAC,CAAC;EAC/B;AACJ,CAAC","ignoreList":[]}

package/index.d.ts

@@ -1,10 +1,7 @@
+import type { ApiCoreContext } from "@webiny/api-core/types/core.js";
 import { ContextPlugin } from "@webiny/api";
-import type { FileManagerContext } from "./types";
-import type { AssetDeliveryParams } from "./delivery/setupAssetDelivery";
-import type { FileManagerConfig } from "./createFileManager/types";
-export * from "./modelModifier/CmsModelModifier";
-export * from "./plugins";
-export * from "./delivery";
-export declare const createFileManagerContext: ({ storageOperations }: Pick<FileManagerConfig, "storageOperations">) => ContextPlugin<FileManagerContext>;
-export declare const createFileManagerGraphQL: () => (import("@webiny/handler-graphql").GraphQLSchemaPlugin<FileManagerContext> | ContextPlugin<FileManagerContext>)[];
-export declare const createAssetDelivery: (config: AssetDeliveryParams) => (import("@webiny/handler").ModifyFastifyPlugin | import("./delivery").AssetDeliveryConfigModifierPlugin)[];
+export * from "./modelModifier/CmsModelModifier.js";
+export * from "./delivery/index.js";
+export declare const createFileManagerContext: () => ContextPlugin<ApiCoreContext>;
+export declare const createFileManagerGraphQL: () => (import("@webiny/handler-graphql/index.js").GraphQLSchemaPlugin<ApiCoreContext> | ContextPlugin<ApiCoreContext>)[];
+export declare const createAssetDelivery: () => (import("./index.js").AssetDeliveryConfigModifierPlugin | import("@webiny/handler/index.js").ModifyFastifyPlugin)[];