@webiny/api-aco 0.0.0-unstable.99666aeb00 → 0.0.0-unstable.a9593f74dd

package/utils/decorators/CmsEntriesCrudDecorators.js

@@ -0,0 +1,232 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CmsEntriesCrudDecorators = void 0;
+var _handlerGraphql = require("@webiny/handler-graphql");
+var _where = require("./where");
+var _constants = require("./constants");
+/**
+ * Keep this until we figure out how to fetch the folders.
+ */
+const isPageModel = model => {
+  if (model.modelId === "pbPage") {
+    return true;
+  } else if (model.modelId === "acoSearchRecord-pbpage") {
+    return true;
+  }
+  return false;
+};
+const createFolderType = model => {
+  if (model.modelId === "fmFile") {
+    return "FmFile";
+  } else if (isPageModel(model)) {
+    return "PbPage";
+  }
+  return `cms:${model.modelId}`;
+};
+const filterEntriesByFolderFactory = (context, permissions) => {
+  return async (model, entries) => {
+    const [folders] = await context.aco.folder.listAll({
+      where: {
+        type: createFolderType(model)
+      }
+    });
+    const results = await Promise.all(entries.map(async entry => {
+      const folderId = entry.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return entry;
+      }
+      const folder = folders.find(folder => folder.id === folderId);
+      if (!folder) {
+        throw new _handlerGraphql.NotFoundError(`Folder "${folderId}" not found.`);
+      }
+      const result = await permissions.canAccessFolderContent({
+        folder,
+        rwd: "r"
+      });
+      return result ? entry : null;
+    }));
+    return results.filter(entry => !!entry);
+  };
+};
+class CmsEntriesCrudDecorators {
+  constructor({
+    context
+  }) {
+    this.context = context;
+  }
+  decorate() {
+    const context = this.context;
+    const folderLevelPermissions = context.aco.folderLevelPermissions;
+    const filterEntriesByFolder = filterEntriesByFolderFactory(context, folderLevelPermissions);
+    const originalCmsListEntries = context.cms.listEntries.bind(context.cms);
+    context.cms.listEntries = async (model, params) => {
+      const folderType = createFolderType(model);
+      const folders = await folderLevelPermissions.listAllFoldersWithPermissions(folderType);
+      const where = (0, _where.createWhere)({
+        where: params.where,
+        folders
+      });
+      return originalCmsListEntries(model, {
+        ...params,
+        where
+      });
+    };
+    const originalCmsGetEntry = context.cms.getEntry.bind(context.cms);
+    context.cms.getEntry = async (model, params) => {
+      const entry = await originalCmsGetEntry(model, params);
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return entry;
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "r"
+      });
+      return entry;
+    };
+    const originalCmsGetEntryById = context.cms.getEntryById.bind(context.cms);
+    context.cms.getEntryById = async (model, params) => {
+      const entry = await originalCmsGetEntryById(model, params);
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return entry;
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "r"
+      });
+      return entry;
+    };
+    const originalGetLatestEntriesByIds = context.cms.getLatestEntriesByIds.bind(context.cms);
+    context.cms.getLatestEntriesByIds = async (model, ids) => {
+      const entries = await originalGetLatestEntriesByIds(model, ids);
+      return filterEntriesByFolder(model, entries);
+    };
+    const originalGetPublishedEntriesByIds = context.cms.getPublishedEntriesByIds.bind(context.cms);
+    context.cms.getPublishedEntriesByIds = async (model, ids) => {
+      const entries = await originalGetPublishedEntriesByIds(model, ids);
+      return filterEntriesByFolder(model, entries);
+    };
+    const originalCmsCreateEntry = context.cms.createEntry.bind(context.cms);
+    context.cms.createEntry = async (model, params, options) => {
+      const folderId = params.wbyAco_location?.folderId || params.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return originalCmsCreateEntry(model, params, options);
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "w"
+      });
+      return originalCmsCreateEntry(model, params, options);
+    };
+    const originalCmsCreateFromEntry = context.cms.createEntryRevisionFrom.bind(context.cms);
+    context.cms.createEntryRevisionFrom = async (model, id, input, options) => {
+      const entry = await context.cms.storageOperations.entries.getRevisionById(model, {
+        id
+      });
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return originalCmsCreateFromEntry(model, id, input, options);
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "w"
+      });
+      return originalCmsCreateFromEntry(model, id, input, options);
+    };
+    const originalCmsUpdateEntry = context.cms.updateEntry.bind(context.cms);
+    context.cms.updateEntry = async (model, id, input, meta, options) => {
+      const entry = await context.cms.storageOperations.entries.getRevisionById(model, {
+        id
+      });
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return originalCmsUpdateEntry(model, id, input, meta, options);
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "w"
+      });
+      return originalCmsUpdateEntry(model, id, input, meta, options);
+    };
+    const originalCmsDeleteEntry = context.cms.deleteEntry.bind(context.cms);
+    context.cms.deleteEntry = async (model, id, options) => {
+      const entry = await context.cms.storageOperations.entries.getLatestRevisionByEntryId(model, {
+        id
+      });
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return originalCmsDeleteEntry(model, id, options);
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "d"
+      });
+      return originalCmsDeleteEntry(model, id, options);
+    };
+    const originalCmsDeleteEntryRevision = context.cms.deleteEntryRevision.bind(context.cms);
+    context.cms.deleteEntryRevision = async (model, id) => {
+      const entry = await context.cms.storageOperations.entries.getRevisionById(model, {
+        id
+      });
+      const folderId = entry?.location?.folderId;
+      if (!folderId || folderId === _constants.ROOT_FOLDER) {
+        return originalCmsDeleteEntryRevision(model, id);
+      }
+      const folder = await context.aco.folder.get(folderId);
+      await folderLevelPermissions.ensureCanAccessFolderContent({
+        folder,
+        rwd: "d"
+      });
+      return originalCmsDeleteEntryRevision(model, id);
+    };
+    const originalCmsMoveEntry = context.cms.moveEntry.bind(context.cms);
+    context.cms.moveEntry = async (model, id, targetFolderId) => {
+      /**
+       * First we need to check if user has access to the entries existing folder.
+       */
+      const entry = await context.cms.storageOperations.entries.getRevisionById(model, {
+        id
+      });
+      const folderId = entry?.location?.folderId || _constants.ROOT_FOLDER;
+      /**
+       * If the entry is in the same folder we are trying to move it to, just continue.
+       */
+      if (folderId === targetFolderId) {
+        return originalCmsMoveEntry(model, id, targetFolderId);
+      } else if (folderId !== _constants.ROOT_FOLDER) {
+        /**
+         * If entry current folder is not a root, check for access
+         */
+        const folder = await context.aco.folder.get(folderId);
+        await folderLevelPermissions.ensureCanAccessFolderContent({
+          folder,
+          rwd: "w"
+        });
+      }
+      /**
+       * If target folder is not a ROOT_FOLDER, check for access.
+       */
+      if (targetFolderId !== _constants.ROOT_FOLDER) {
+        const folder = await context.aco.folder.get(targetFolderId);
+        await folderLevelPermissions.ensureCanAccessFolderContent({
+          folder,
+          rwd: "w"
+        });
+      }
+      return originalCmsMoveEntry(model, id, targetFolderId);
+    };
+  }
+}
+exports.CmsEntriesCrudDecorators = CmsEntriesCrudDecorators;
+
+//# sourceMappingURL=CmsEntriesCrudDecorators.js.map

package/utils/decorators/CmsEntriesCrudDecorators.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_handlerGraphql","require","_where","_constants","isPageModel","model","modelId","createFolderType","filterEntriesByFolderFactory","context","permissions","entries","folders","aco","folder","listAll","where","type","results","Promise","all","map","entry","folderId","location","ROOT_FOLDER","find","id","NotFoundError","result","canAccessFolderContent","rwd","filter","CmsEntriesCrudDecorators","constructor","decorate","folderLevelPermissions","filterEntriesByFolder","originalCmsListEntries","cms","listEntries","bind","params","folderType","listAllFoldersWithPermissions","createWhere","originalCmsGetEntry","getEntry","get","ensureCanAccessFolderContent","originalCmsGetEntryById","getEntryById","originalGetLatestEntriesByIds","getLatestEntriesByIds","ids","originalGetPublishedEntriesByIds","getPublishedEntriesByIds","originalCmsCreateEntry","createEntry","options","wbyAco_location","originalCmsCreateFromEntry","createEntryRevisionFrom","input","storageOperations","getRevisionById","originalCmsUpdateEntry","updateEntry","meta","originalCmsDeleteEntry","deleteEntry","getLatestRevisionByEntryId","originalCmsDeleteEntryRevision","deleteEntryRevision","originalCmsMoveEntry","moveEntry","targetFolderId","exports"],"sources":["CmsEntriesCrudDecorators.ts"],"sourcesContent":["import { AcoContext } from \"~/types\";\nimport { CmsEntry, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { NotFoundError } from \"@webiny/handler-graphql\";\nimport { FolderLevelPermissions } from \"~/utils/FolderLevelPermissions\";\nimport { createWhere } from \"./where\";\nimport { ROOT_FOLDER } from \"./constants\";\n\ntype Context = Pick<AcoContext, \"aco\" | \"cms\">;\n/**\n * Keep this until we figure out how to fetch the folders.\n */\nconst isPageModel = (model: CmsModel): boolean => {\n    if (model.modelId === \"pbPage\") {\n        return true;\n    } else if (model.modelId === \"acoSearchRecord-pbpage\") {\n        return true;\n    }\n    return false;\n};\n\nconst createFolderType = (model: CmsModel): \"FmFile\" | \"PbPage\" | `cms:${string}` => {\n    if (model.modelId === \"fmFile\") {\n        return \"FmFile\";\n    } else if (isPageModel(model)) {\n        return \"PbPage\";\n    }\n    return `cms:${model.modelId}`;\n};\n\nconst filterEntriesByFolderFactory = (context: Context, permissions: FolderLevelPermissions) => {\n    return async (model: CmsModel, entries: CmsEntry[]) => {\n        const [folders] = await context.aco.folder.listAll({\n            where: {\n                type: createFolderType(model)\n            }\n        });\n\n        const results = await Promise.all(\n            entries.map(async entry => {\n                const folderId = entry.location?.folderId;\n                if (!folderId || folderId === ROOT_FOLDER) {\n                    return entry;\n                }\n\n                const folder = folders.find(folder => folder.id === folderId);\n                if (!folder) {\n                    throw new NotFoundError(`Folder \"${folderId}\" not found.`);\n                }\n                const result = await permissions.canAccessFolderContent({\n                    folder,\n                    rwd: \"r\"\n                });\n                return result ? entry : null;\n            })\n        );\n\n        return results.filter((entry): entry is CmsEntry => !!entry);\n    };\n};\n\ninterface EntryManagerCrudDecoratorsParams {\n    context: Context;\n}\n\nexport class CmsEntriesCrudDecorators {\n    private readonly context: Context;\n\n    public constructor({ context }: EntryManagerCrudDecoratorsParams) {\n        this.context = context;\n    }\n\n    public decorate() {\n        const context = this.context;\n        const folderLevelPermissions = context.aco.folderLevelPermissions;\n\n        const filterEntriesByFolder = filterEntriesByFolderFactory(context, folderLevelPermissions);\n\n        const originalCmsListEntries = context.cms.listEntries.bind(context.cms);\n        context.cms.listEntries = async (model, params) => {\n            const folderType = createFolderType(model);\n            const folders = await folderLevelPermissions.listAllFoldersWithPermissions(folderType);\n\n            const where = createWhere({\n                where: params.where,\n                folders\n            });\n            return originalCmsListEntries(model, {\n                ...params,\n                where\n            });\n        };\n\n        const originalCmsGetEntry = context.cms.getEntry.bind(context.cms);\n        context.cms.getEntry = async (model, params) => {\n            const entry = await originalCmsGetEntry(model, params);\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return entry;\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"r\"\n            });\n\n            return entry;\n        };\n\n        const originalCmsGetEntryById = context.cms.getEntryById.bind(context.cms);\n        context.cms.getEntryById = async (model, params) => {\n            const entry = await originalCmsGetEntryById(model, params);\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return entry;\n            }\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"r\"\n            });\n            return entry;\n        };\n\n        const originalGetLatestEntriesByIds = context.cms.getLatestEntriesByIds.bind(context.cms);\n        context.cms.getLatestEntriesByIds = async (model, ids) => {\n            const entries = await originalGetLatestEntriesByIds(model, ids);\n\n            return filterEntriesByFolder(model, entries);\n        };\n\n        const originalGetPublishedEntriesByIds = context.cms.getPublishedEntriesByIds.bind(\n            context.cms\n        );\n        context.cms.getPublishedEntriesByIds = async (model, ids) => {\n            const entries = await originalGetPublishedEntriesByIds(model, ids);\n            return filterEntriesByFolder(model, entries);\n        };\n\n        const originalCmsCreateEntry = context.cms.createEntry.bind(context.cms);\n        context.cms.createEntry = async (model, params, options) => {\n            const folderId = params.wbyAco_location?.folderId || params.location?.folderId;\n\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return originalCmsCreateEntry(model, params, options);\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"w\"\n            });\n\n            return originalCmsCreateEntry(model, params, options);\n        };\n\n        const originalCmsCreateFromEntry = context.cms.createEntryRevisionFrom.bind(context.cms);\n        context.cms.createEntryRevisionFrom = async (model, id, input, options) => {\n            const entry = await context.cms.storageOperations.entries.getRevisionById(model, {\n                id\n            });\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return originalCmsCreateFromEntry(model, id, input, options);\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"w\"\n            });\n\n            return originalCmsCreateFromEntry(model, id, input, options);\n        };\n\n        const originalCmsUpdateEntry = context.cms.updateEntry.bind(context.cms);\n        context.cms.updateEntry = async (model, id, input, meta, options) => {\n            const entry = await context.cms.storageOperations.entries.getRevisionById(model, {\n                id\n            });\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return originalCmsUpdateEntry(model, id, input, meta, options);\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"w\"\n            });\n\n            return originalCmsUpdateEntry(model, id, input, meta, options);\n        };\n\n        const originalCmsDeleteEntry = context.cms.deleteEntry.bind(context.cms);\n        context.cms.deleteEntry = async (model, id, options) => {\n            const entry = await context.cms.storageOperations.entries.getLatestRevisionByEntryId(\n                model,\n                {\n                    id\n                }\n            );\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return originalCmsDeleteEntry(model, id, options);\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"d\"\n            });\n\n            return originalCmsDeleteEntry(model, id, options);\n        };\n\n        const originalCmsDeleteEntryRevision = context.cms.deleteEntryRevision.bind(context.cms);\n        context.cms.deleteEntryRevision = async (model, id) => {\n            const entry = await context.cms.storageOperations.entries.getRevisionById(model, {\n                id\n            });\n\n            const folderId = entry?.location?.folderId;\n            if (!folderId || folderId === ROOT_FOLDER) {\n                return originalCmsDeleteEntryRevision(model, id);\n            }\n\n            const folder = await context.aco.folder.get(folderId);\n            await folderLevelPermissions.ensureCanAccessFolderContent({\n                folder,\n                rwd: \"d\"\n            });\n\n            return originalCmsDeleteEntryRevision(model, id);\n        };\n\n        const originalCmsMoveEntry = context.cms.moveEntry.bind(context.cms);\n        context.cms.moveEntry = async (model, id, targetFolderId) => {\n            /**\n             * First we need to check if user has access to the entries existing folder.\n             */\n            const entry = await context.cms.storageOperations.entries.getRevisionById(model, {\n                id\n            });\n            const folderId = entry?.location?.folderId || ROOT_FOLDER;\n            /**\n             * If the entry is in the same folder we are trying to move it to, just continue.\n             */\n            if (folderId === targetFolderId) {\n                return originalCmsMoveEntry(model, id, targetFolderId);\n            } else if (folderId !== ROOT_FOLDER) {\n                /**\n                 * If entry current folder is not a root, check for access\n                 */\n                const folder = await context.aco.folder.get(folderId);\n                await folderLevelPermissions.ensureCanAccessFolderContent({\n                    folder,\n                    rwd: \"w\"\n                });\n            }\n            /**\n             * If target folder is not a ROOT_FOLDER, check for access.\n             */\n            if (targetFolderId !== ROOT_FOLDER) {\n                const folder = await context.aco.folder.get(targetFolderId);\n                await folderLevelPermissions.ensureCanAccessFolderContent({\n                    folder,\n                    rwd: \"w\"\n                });\n            }\n\n            return originalCmsMoveEntry(model, id, targetFolderId);\n        };\n    }\n}\n"],"mappings":"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"}

package/utils/decorators/constants.d.ts

@@ -0,0 +1 @@
+export declare const ROOT_FOLDER = "root";

package/utils/decorators/constants.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ROOT_FOLDER = void 0;
+const ROOT_FOLDER = "root";
+exports.ROOT_FOLDER = ROOT_FOLDER;
+
+//# sourceMappingURL=constants.js.map

package/utils/decorators/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ROOT_FOLDER","exports"],"sources":["constants.ts"],"sourcesContent":["export const ROOT_FOLDER = \"root\";\n"],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAG,MAAM;AAACC,OAAA,CAAAD,WAAA,GAAAA,WAAA"}

package/utils/decorators/where.d.ts

@@ -0,0 +1,14 @@
+import { CmsEntryListWhere } from "@webiny/api-headless-cms/types";
+import { Folder } from "../../folder/folder.types";
+interface Params {
+    where: CmsEntryListWhere | undefined;
+    folders: Folder[];
+}
+/**
+ * There are multiple cases that we need to handle:
+ * * existing location with no AND conditional
+ * * existing location with AND conditional
+ * * no existing location with no AND conditional + with AND conditional
+ */
+export declare const createWhere: (params: Params) => CmsEntryListWhere | undefined;
+export {};

package/utils/decorators/where.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createWhere = void 0;
+var _constants = require("./constants");
+/**
+ * There are multiple cases that we need to handle:
+ * * existing location with no AND conditional
+ * * existing location with AND conditional
+ * * no existing location with no AND conditional + with AND conditional
+ */
+const createWhere = params => {
+  const {
+    where,
+    folders
+  } = params;
+  if (!where) {
+    return undefined;
+  }
+  const whereLocation = {
+    wbyAco_location: {
+      // At the moment, all users can access entries in the root folder.
+      // Root folder level permissions cannot be set yet.
+      folderId_in: [_constants.ROOT_FOLDER, ...folders.map(folder => folder.id)]
+    }
+  };
+  const whereAnd = where.AND;
+  if (where.wbyAco_location && !whereAnd) {
+    return {
+      ...where,
+      AND: [{
+        ...whereLocation
+      }]
+    };
+  } else if (where.wbyAco_location && whereAnd) {
+    return {
+      ...where,
+      AND: [{
+        ...whereLocation
+      }, ...whereAnd]
+    };
+  }
+  return {
+    ...where,
+    ...whereLocation
+  };
+};
+exports.createWhere = createWhere;
+
+//# sourceMappingURL=where.js.map

package/utils/decorators/where.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_constants","require","createWhere","params","where","folders","undefined","whereLocation","wbyAco_location","folderId_in","ROOT_FOLDER","map","folder","id","whereAnd","AND","exports"],"sources":["where.ts"],"sourcesContent":["import { CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { Folder } from \"~/folder/folder.types\";\nimport { ROOT_FOLDER } from \"./constants\";\n\ninterface Params {\n    where: CmsEntryListWhere | undefined;\n    folders: Folder[];\n}\n\n/**\n * There are multiple cases that we need to handle:\n * * existing location with no AND conditional\n * * existing location with AND conditional\n * * no existing location with no AND conditional + with AND conditional\n */\nexport const createWhere = (params: Params): CmsEntryListWhere | undefined => {\n    const { where, folders } = params;\n    if (!where) {\n        return undefined;\n    }\n    const whereLocation = {\n        wbyAco_location: {\n            // At the moment, all users can access entries in the root folder.\n            // Root folder level permissions cannot be set yet.\n            folderId_in: [ROOT_FOLDER, ...folders.map(folder => folder.id)]\n        }\n    };\n    const whereAnd = where.AND;\n    if (where.wbyAco_location && !whereAnd) {\n        return {\n            ...where,\n            AND: [\n                {\n                    ...whereLocation\n                }\n            ]\n        };\n    } else if (where.wbyAco_location && whereAnd) {\n        return {\n            ...where,\n            AND: [\n                {\n                    ...whereLocation\n                },\n                ...whereAnd\n            ]\n        };\n    }\n    return {\n        ...where,\n        ...whereLocation\n    };\n};\n"],"mappings":";;;;;;AAEA,IAAAA,UAAA,GAAAC,OAAA;AAOA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,WAAW,GAAIC,MAAc,IAAoC;EAC1E,MAAM;IAAEC,KAAK;IAAEC;EAAQ,CAAC,GAAGF,MAAM;EACjC,IAAI,CAACC,KAAK,EAAE;IACR,OAAOE,SAAS;EACpB;EACA,MAAMC,aAAa,GAAG;IAClBC,eAAe,EAAE;MACb;MACA;MACAC,WAAW,EAAE,CAACC,sBAAW,EAAE,GAAGL,OAAO,CAACM,GAAG,CAACC,MAAM,IAAIA,MAAM,CAACC,EAAE,CAAC;IAClE;EACJ,CAAC;EACD,MAAMC,QAAQ,GAAGV,KAAK,CAACW,GAAG;EAC1B,IAAIX,KAAK,CAACI,eAAe,IAAI,CAACM,QAAQ,EAAE;IACpC,OAAO;MACH,GAAGV,KAAK;MACRW,GAAG,EAAE,CACD;QACI,GAAGR;MACP,CAAC;IAET,CAAC;EACL,CAAC,MAAM,IAAIH,KAAK,CAACI,eAAe,IAAIM,QAAQ,EAAE;IAC1C,OAAO;MACH,GAAGV,KAAK;MACRW,GAAG,EAAE,CACD;QACI,GAAGR;MACP,CAAC,EACD,GAAGO,QAAQ;IAEnB,CAAC;EACL;EACA,OAAO;IACH,GAAGV,KAAK;IACR,GAAGG;EACP,CAAC;AACL,CAAC;AAACS,OAAA,CAAAd,WAAA,GAAAA,WAAA"}

package/utils/ensureAuthentication.d.ts

@@ -0,0 +1,2 @@
+import { AcoContext } from "../types";
+export declare const ensureAuthentication: (context: AcoContext) => void;

package/utils/{checkPermissions.js → ensureAuthentication.js}

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkPermissions = void 0;
+exports.ensureAuthentication = void 0;
 var _apiSecurity = require("@webiny/api-security");
-const checkPermissions = context => {
+const ensureAuthentication = context => {
   const identity = context.security.getIdentity();
   if (!identity) {
     throw new _apiSecurity.NotAuthorizedError();
   }
 };
-exports.checkPermissions = checkPermissions;
+exports.ensureAuthentication = ensureAuthentication;
+
+//# sourceMappingURL=ensureAuthentication.js.map

package/utils/ensureAuthentication.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiSecurity","require","ensureAuthentication","context","identity","security","getIdentity","NotAuthorizedError","exports"],"sources":["ensureAuthentication.ts"],"sourcesContent":["import { NotAuthorizedError } from \"@webiny/api-security\";\nimport { AcoContext } from \"~/types\";\n\nexport const ensureAuthentication = (context: AcoContext) => {\n    const identity = context.security.getIdentity();\n    if (!identity) {\n        throw new NotAuthorizedError();\n    }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGO,MAAMC,oBAAoB,GAAIC,OAAmB,IAAK;EACzD,MAAMC,QAAQ,GAAGD,OAAO,CAACE,QAAQ,CAACC,WAAW,CAAC,CAAC;EAC/C,IAAI,CAACF,QAAQ,EAAE;IACX,MAAM,IAAIG,+BAAkB,CAAC,CAAC;EAClC;AACJ,CAAC;AAACC,OAAA,CAAAN,oBAAA,GAAAA,oBAAA"}

package/utils/getFolderAndItsAncestors.d.ts

@@ -1,7 +1,7 @@
 import { Folder } from "../folder/folder.types";
 interface GetFolderAndItsAncestorsParams {
-    id: string;
+    folder: Folder;
     folders: Folder[];
 }
-export declare const getFolderAndItsAncestors: ({ id, folders }: GetFolderAndItsAncestorsParams) => Folder[];
+export declare const getFolderAndItsAncestors: ({ folder, folders }: GetFolderAndItsAncestorsParams) => Folder[];
 export {};

package/utils/getFolderAndItsAncestors.js

@@ -5,32 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getFolderAndItsAncestors = void 0;
 const getFolderAndItsAncestors = ({
-  id,
+  folder,
   folders
 }) => {
   // Create a Map with folders, using folder.id as key
   const folderMap = new Map();
   folders.forEach(folder => folderMap.set(folder.id, folder));
-  const findParents = (next, id) => {
-    const folder = folderMap.get(id);
-
+  const findParents = (next, current) => {
     // No folder found: return the result
-    if (!folder) {
+    if (!current) {
       return next;
     }
 
     // Push the current folder into the accumulator array
-    next.push(folder);
+    next.push(current);
 
     // No parentId found: return the result
-    if (!folder.parentId) {
+    if (!current.parentId) {
+      return next;
+    }
+    const parent = folderMap.get(current.parentId);
+
+    // No parent found: return the result
+    if (!parent) {
       return next;
     }
 
     // Go ahead and find parent for the current parent
-    return findParents(next, folder.parentId);
+    return findParents(next, parent);
   };
-  const folder = folderMap.get(id);
 
   // No folder found: return an empty array
   if (!folder) {
@@ -43,6 +46,8 @@ const getFolderAndItsAncestors = ({
   }
 
   // Recursively find parents for a given folder id
-  return findParents([], id);
+  return findParents([], folder);
 };
-exports.getFolderAndItsAncestors = getFolderAndItsAncestors;
+exports.getFolderAndItsAncestors = getFolderAndItsAncestors;
+
+//# sourceMappingURL=getFolderAndItsAncestors.js.map

package/utils/getFolderAndItsAncestors.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFolderAndItsAncestors","id","folders","folderMap","Map","forEach","folder","set","findParents","next","get","push","parentId"],"sources":["getFolderAndItsAncestors.ts"],"sourcesContent":["import { Folder } from \"~/folder/folder.types\";\n\ninterface GetFolderAndItsAncestorsParams {\n    id: string;\n    folders: Folder[];\n}\n\nexport const getFolderAndItsAncestors = ({\n    id,\n    folders\n}: GetFolderAndItsAncestorsParams): Folder[] => {\n    // Create a Map with folders, using folder.id as key\n    const folderMap = new Map<string, Folder>();\n    folders.forEach(folder => folderMap.set(folder.id, folder));\n\n    const findParents = (next: Folder[], id: string): Folder[] => {\n        const folder = folderMap.get(id);\n\n        // No folder found: return the result\n        if (!folder) {\n            return next;\n        }\n\n        // Push the current folder into the accumulator array\n        next.push(folder);\n\n        // No parentId found: return the result\n        if (!folder.parentId) {\n            return next;\n        }\n\n        // Go ahead and find parent for the current parent\n        return findParents(next, folder.parentId);\n    };\n\n    const folder = folderMap.get(id);\n\n    // No folder found: return an empty array\n    if (!folder) {\n        return [];\n    }\n\n    // The folder has no parent (it's at root level): return an array with the folder\n    if (!folder.parentId) {\n        return [folder];\n    }\n\n    // Recursively find parents for a given folder id\n    return findParents([], id);\n};\n"],"mappings":";;;;;;AAOO,MAAMA,wBAAwB,GAAG,CAAC;EACrCC,EAAE;EACFC;AAC4B,CAAC,KAAe;EAC5C;EACA,MAAMC,SAAS,GAAG,IAAIC,GAAG,EAAkB;EAC3CF,OAAO,CAACG,OAAO,CAACC,MAAM,IAAIH,SAAS,CAACI,GAAG,CAACD,MAAM,CAACL,EAAE,EAAEK,MAAM,CAAC,CAAC;EAE3D,MAAME,WAAW,GAAG,CAACC,IAAc,EAAER,EAAU,KAAe;IAC1D,MAAMK,MAAM,GAAGH,SAAS,CAACO,GAAG,CAACT,EAAE,CAAC;;IAEhC;IACA,IAAI,CAACK,MAAM,EAAE;MACT,OAAOG,IAAI;IACf;;IAEA;IACAA,IAAI,CAACE,IAAI,CAACL,MAAM,CAAC;;IAEjB;IACA,IAAI,CAACA,MAAM,CAACM,QAAQ,EAAE;MAClB,OAAOH,IAAI;IACf;;IAEA;IACA,OAAOD,WAAW,CAACC,IAAI,EAAEH,MAAM,CAACM,QAAQ,CAAC;EAC7C,CAAC;EAED,MAAMN,MAAM,GAAGH,SAAS,CAACO,GAAG,CAACT,EAAE,CAAC;;EAEhC;EACA,IAAI,CAACK,MAAM,EAAE;IACT,OAAO,EAAE;EACb;;EAEA;EACA,IAAI,CAACA,MAAM,CAACM,QAAQ,EAAE;IAClB,OAAO,CAACN,MAAM,CAAC;EACnB;;EAEA;EACA,OAAOE,WAAW,CAAC,EAAE,EAAEP,EAAE,CAAC;AAC9B,CAAC;AAAC"}
+{"version":3,"names":["getFolderAndItsAncestors","folder","folders","folderMap","Map","forEach","set","id","findParents","next","current","push","parentId","parent","get","exports"],"sources":["getFolderAndItsAncestors.ts"],"sourcesContent":["import { Folder } from \"~/folder/folder.types\";\n\ninterface GetFolderAndItsAncestorsParams {\n    folder: Folder;\n    folders: Folder[];\n}\n\nexport const getFolderAndItsAncestors = ({\n    folder,\n    folders\n}: GetFolderAndItsAncestorsParams): Folder[] => {\n    // Create a Map with folders, using folder.id as key\n    const folderMap = new Map<string, Folder>();\n    folders.forEach(folder => folderMap.set(folder.id, folder));\n\n    const findParents = (next: Folder[], current: Folder): Folder[] => {\n        // No folder found: return the result\n        if (!current) {\n            return next;\n        }\n\n        // Push the current folder into the accumulator array\n        next.push(current);\n\n        // No parentId found: return the result\n        if (!current.parentId) {\n            return next;\n        }\n\n        const parent = folderMap.get(current.parentId);\n\n        // No parent found: return the result\n        if (!parent) {\n            return next;\n        }\n\n        // Go ahead and find parent for the current parent\n        return findParents(next, parent);\n    };\n\n    // No folder found: return an empty array\n    if (!folder) {\n        return [];\n    }\n\n    // The folder has no parent (it's at root level): return an array with the folder\n    if (!folder.parentId) {\n        return [folder];\n    }\n\n    // Recursively find parents for a given folder id\n    return findParents([], folder);\n};\n"],"mappings":";;;;;;AAOO,MAAMA,wBAAwB,GAAGA,CAAC;EACrCC,MAAM;EACNC;AAC4B,CAAC,KAAe;EAC5C;EACA,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAiB,CAAC;EAC3CF,OAAO,CAACG,OAAO,CAACJ,MAAM,IAAIE,SAAS,CAACG,GAAG,CAACL,MAAM,CAACM,EAAE,EAAEN,MAAM,CAAC,CAAC;EAE3D,MAAMO,WAAW,GAAGA,CAACC,IAAc,EAAEC,OAAe,KAAe;IAC/D;IACA,IAAI,CAACA,OAAO,EAAE;MACV,OAAOD,IAAI;IACf;;IAEA;IACAA,IAAI,CAACE,IAAI,CAACD,OAAO,CAAC;;IAElB;IACA,IAAI,CAACA,OAAO,CAACE,QAAQ,EAAE;MACnB,OAAOH,IAAI;IACf;IAEA,MAAMI,MAAM,GAAGV,SAAS,CAACW,GAAG,CAACJ,OAAO,CAACE,QAAQ,CAAC;;IAE9C;IACA,IAAI,CAACC,MAAM,EAAE;MACT,OAAOJ,IAAI;IACf;;IAEA;IACA,OAAOD,WAAW,CAACC,IAAI,EAAEI,MAAM,CAAC;EACpC,CAAC;;EAED;EACA,IAAI,CAACZ,MAAM,EAAE;IACT,OAAO,EAAE;EACb;;EAEA;EACA,IAAI,CAACA,MAAM,CAACW,QAAQ,EAAE;IAClB,OAAO,CAACX,MAAM,CAAC;EACnB;;EAEA;EACA,OAAOO,WAAW,CAAC,EAAE,EAAEP,MAAM,CAAC;AAClC,CAAC;AAACc,OAAA,CAAAf,wBAAA,GAAAA,wBAAA"}

package/utils/isInstallationPending.js

@@ -18,4 +18,6 @@ const isInstallationPending = ({
   }
   return !i18n.getContentLocale();
 };
-exports.isInstallationPending = isInstallationPending;
+exports.isInstallationPending = isInstallationPending;
+
+//# sourceMappingURL=isInstallationPending.js.map

package/utils/isInstallationPending.js.map

@@ -1 +1 @@
-{"version":3,"names":["isInstallationPending","tenancy","i18n","tenant","getCurrentTenant","getContentLocale"],"sources":["isInstallationPending.ts"],"sourcesContent":["import { AcoContext } from \"~/types\";\n\ntype CheckInstallationParams = Pick<AcoContext, \"tenancy\" | \"i18n\">;\nexport const isInstallationPending = ({ tenancy, i18n }: CheckInstallationParams): boolean => {\n    /**\n     * In case of a fresh webiny project \"tenant\" and \"locale\" won't be there until\n     * installation is completed. So, we need to skip \"ACO\" creation till then.\n     */\n    const tenant = tenancy.getCurrentTenant();\n    if (!tenant) {\n        return true;\n    }\n\n    return !i18n.getContentLocale();\n};\n"],"mappings":";;;;;;AAGO,MAAMA,qBAAqB,GAAG,CAAC;EAAEC,OAAO;EAAEC;AAA8B,CAAC,KAAc;EAC1F;AACJ;AACA;AACA;EACI,MAAMC,MAAM,GAAGF,OAAO,CAACG,gBAAgB,EAAE;EACzC,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EAEA,OAAO,CAACD,IAAI,CAACG,gBAAgB,EAAE;AACnC,CAAC;AAAC"}
+{"version":3,"names":["isInstallationPending","tenancy","i18n","tenant","getCurrentTenant","getContentLocale","exports"],"sources":["isInstallationPending.ts"],"sourcesContent":["import { AcoContext } from \"~/types\";\n\ntype CheckInstallationParams = Pick<AcoContext, \"tenancy\" | \"i18n\">;\nexport const isInstallationPending = ({ tenancy, i18n }: CheckInstallationParams): boolean => {\n    /**\n     * In case of a fresh webiny project \"tenant\" and \"locale\" won't be there until\n     * installation is completed. So, we need to skip \"ACO\" creation till then.\n     */\n    const tenant = tenancy.getCurrentTenant();\n    if (!tenant) {\n        return true;\n    }\n\n    return !i18n.getContentLocale();\n};\n"],"mappings":";;;;;;AAGO,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAA8B,CAAC,KAAc;EAC1F;AACJ;AACA;AACA;EACI,MAAMC,MAAM,GAAGF,OAAO,CAACG,gBAAgB,CAAC,CAAC;EACzC,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EAEA,OAAO,CAACD,IAAI,CAACG,gBAAgB,CAAC,CAAC;AACnC,CAAC;AAACC,OAAA,CAAAN,qBAAA,GAAAA,qBAAA"}

package/utils/modelFactory.d.ts

@@ -1,7 +1,5 @@
 import { CmsModelPlugin, CmsPrivateModelFull } from "@webiny/api-headless-cms";
-import { CmsGroup } from "@webiny/api-headless-cms/types";
 interface Params {
-    group: Pick<CmsGroup, "id" | "name">;
     /**
      * Locale and tenant do not need to be defined.
      * In that case model is not bound to any locale or tenant.
@@ -9,7 +7,7 @@ interface Params {
      */
     locale?: string;
     tenant?: string;
-    modelDefinition: Omit<CmsPrivateModelFull, "noValidate" | "group">;
+    modelDefinition: CmsPrivateModelFull;
 }
 export declare const modelFactory: (params: Params) => CmsModelPlugin;
 export {};

package/utils/modelFactory.js

@@ -1,25 +1,22 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.modelFactory = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _apiHeadlessCms = require("@webiny/api-headless-cms");
 const modelFactory = params => {
   const {
-    group,
     locale,
     tenant,
     modelDefinition
   } = params;
-  return (0, _apiHeadlessCms.createCmsModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    group,
+  return (0, _apiHeadlessCms.createCmsModel)({
     locale,
-    tenant
-  }, modelDefinition), {}, {
-    noValidate: true
-  }));
+    tenant,
+    ...modelDefinition
+  });
 };
-exports.modelFactory = modelFactory;
+exports.modelFactory = modelFactory;
+
+//# sourceMappingURL=modelFactory.js.map

package/utils/modelFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["modelFactory","params","group","locale","tenant","modelDefinition","createCmsModel","noValidate"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, CmsPrivateModelFull, createCmsModel } from \"@webiny/api-headless-cms\";\nimport { CmsGroup } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    group: Pick<CmsGroup, \"id\" | \"name\">;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: Omit<CmsPrivateModelFull, \"noValidate\" | \"group\">;\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition,\n        noValidate: true\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAeO,MAAMA,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM;EAEzD,OAAO,IAAAK,8BAAc;IACjBJ,KAAK;IACLC,MAAM;IACNC;EAAM,GACHC,eAAe;IAClBE,UAAU,EAAE;EAAI,GAClB;AACN,CAAC;AAAC"}
+{"version":3,"names":["_apiHeadlessCms","require","modelFactory","params","locale","tenant","modelDefinition","createCmsModel","exports"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, CmsPrivateModelFull, createCmsModel } from \"@webiny/api-headless-cms\";\n\ninterface Params {\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: CmsPrivateModelFull;\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAaO,MAAMC,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGH,MAAM;EAElD,OAAO,IAAAI,8BAAc,EAAC;IAClBH,MAAM;IACNC,MAAM;IACN,GAAGC;EACP,CAAC,CAAC;AACN,CAAC;AAACE,OAAA,CAAAN,YAAA,GAAAA,YAAA"}

package/utils/pickEntryFieldValues.d.ts

@@ -0,0 +1,3 @@
+import { CmsEntry } from "@webiny/api-headless-cms/types";
+export declare const baseFields: string[];
+export declare function pickEntryFieldValues<T>(entry: CmsEntry): T;

package/utils/pickEntryFieldValues.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.baseFields = void 0;
+exports.pickEntryFieldValues = pickEntryFieldValues;
+const baseFields = [
+// Entry ID is mapped to "id" (we don't use revisions with ACO entities).
+"id", "createdOn", "modifiedOn", "savedOn", "createdBy", "modifiedBy", "savedBy"];
+exports.baseFields = baseFields;
+const pickBaseEntryFieldValues = entry => {
+  const pickedValues = {};
+  for (const fieldName of baseFields) {
+    const [srcFieldName, targetFieldName = srcFieldName] = fieldName.split(":");
+    if (srcFieldName in entry) {
+      Object.assign(pickedValues, {
+        [targetFieldName]: entry[srcFieldName]
+      });
+    }
+  }
+  return pickedValues;
+};
+function pickEntryFieldValues(entry) {
+  return {
+    ...pickBaseEntryFieldValues(entry),
+    ...entry.values
+  };
+}
+
+//# sourceMappingURL=pickEntryFieldValues.js.map

package/utils/pickEntryFieldValues.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["baseFields","exports","pickBaseEntryFieldValues","entry","pickedValues","fieldName","srcFieldName","targetFieldName","split","Object","assign","pickEntryFieldValues","values"],"sources":["pickEntryFieldValues.ts"],"sourcesContent":["import { CmsEntry } from \"@webiny/api-headless-cms/types\";\n\nexport const baseFields = [\n    // Entry ID is mapped to \"id\" (we don't use revisions with ACO entities).\n    \"id\",\n\n    \"createdOn\",\n    \"modifiedOn\",\n    \"savedOn\",\n    \"createdBy\",\n    \"modifiedBy\",\n    \"savedBy\"\n];\n\nconst pickBaseEntryFieldValues = (entry: CmsEntry) => {\n    const pickedValues: Partial<CmsEntry> = {};\n    for (const fieldName of baseFields) {\n        const [srcFieldName, targetFieldName = srcFieldName] = fieldName.split(\":\");\n        if (srcFieldName in entry) {\n            Object.assign(pickedValues, {\n                [targetFieldName]: entry[srcFieldName as keyof CmsEntry]\n            });\n        }\n    }\n\n    return pickedValues;\n};\n\nexport function pickEntryFieldValues<T>(entry: CmsEntry): T {\n    return {\n        ...pickBaseEntryFieldValues(entry),\n        ...entry.values\n    } as T;\n}\n"],"mappings":";;;;;;;AAEO,MAAMA,UAAU,GAAG;AACtB;AACA,IAAI,EAEJ,WAAW,EACX,YAAY,EACZ,SAAS,EACT,WAAW,EACX,YAAY,EACZ,SAAS,CACZ;AAACC,OAAA,CAAAD,UAAA,GAAAA,UAAA;AAEF,MAAME,wBAAwB,GAAIC,KAAe,IAAK;EAClD,MAAMC,YAA+B,GAAG,CAAC,CAAC;EAC1C,KAAK,MAAMC,SAAS,IAAIL,UAAU,EAAE;IAChC,MAAM,CAACM,YAAY,EAAEC,eAAe,GAAGD,YAAY,CAAC,GAAGD,SAAS,CAACG,KAAK,CAAC,GAAG,CAAC;IAC3E,IAAIF,YAAY,IAAIH,KAAK,EAAE;MACvBM,MAAM,CAACC,MAAM,CAACN,YAAY,EAAE;QACxB,CAACG,eAAe,GAAGJ,KAAK,CAACG,YAAY;MACzC,CAAC,CAAC;IACN;EACJ;EAEA,OAAOF,YAAY;AACvB,CAAC;AAEM,SAASO,oBAAoBA,CAAIR,KAAe,EAAK;EACxD,OAAO;IACH,GAAGD,wBAAwB,CAACC,KAAK,CAAC;IAClC,GAAGA,KAAK,CAACS;EACb,CAAC;AACL"}

package/utils/resolve.js

@@ -21,4 +21,6 @@ const resolveList = async fn => {
     return new _handlerGraphql.ErrorResponse(e);
   }
 };
-exports.resolveList = resolveList;
+exports.resolveList = resolveList;
+
+//# sourceMappingURL=resolve.js.map

package/utils/resolve.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolve","fn","Response","e","ErrorResponse","resolveList","items","meta","ListResponse"],"sources":["resolve.ts"],"sourcesContent":["import { ErrorResponse, ListResponse, Response } from \"@webiny/handler-graphql\";\n\nexport const resolve = async (fn: () => Promise<any>) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\nexport const resolveList = async (fn: () => Promise<any>) => {\n    try {\n        const [items, meta] = await fn();\n        return new ListResponse(items, meta);\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n"],"mappings":";;;;;;AAAA;AAEO,MAAMA,OAAO,GAAG,MAAOC,EAAsB,IAAK;EACrD,IAAI;IACA,OAAO,IAAIC,wBAAQ,CAAC,MAAMD,EAAE,EAAE,CAAC;EACnC,CAAC,CAAC,OAAOE,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAAC;AACK,MAAME,WAAW,GAAG,MAAOJ,EAAsB,IAAK;EACzD,IAAI;IACA,MAAM,CAACK,KAAK,EAAEC,IAAI,CAAC,GAAG,MAAMN,EAAE,EAAE;IAChC,OAAO,IAAIO,4BAAY,CAACF,KAAK,EAAEC,IAAI,CAAC;EACxC,CAAC,CAAC,OAAOJ,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAAC"}
+{"version":3,"names":["_handlerGraphql","require","resolve","fn","Response","e","ErrorResponse","exports","resolveList","items","meta","ListResponse"],"sources":["resolve.ts"],"sourcesContent":["import { ErrorResponse, ListResponse, Response } from \"@webiny/handler-graphql\";\n\nexport const resolve = async (fn: () => Promise<any>) => {\n    try {\n        return new Response(await fn());\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\nexport const resolveList = async (fn: () => Promise<any>) => {\n    try {\n        const [items, meta] = await fn();\n        return new ListResponse(items, meta);\n    } catch (e) {\n        return new ErrorResponse(e);\n    }\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAEO,MAAMC,OAAO,GAAG,MAAOC,EAAsB,IAAK;EACrD,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;AAACE,OAAA,CAAAL,OAAA,GAAAA,OAAA;AACK,MAAMM,WAAW,GAAG,MAAOL,EAAsB,IAAK;EACzD,IAAI;IACA,MAAM,CAACM,KAAK,EAAEC,IAAI,CAAC,GAAG,MAAMP,EAAE,CAAC,CAAC;IAChC,OAAO,IAAIQ,4BAAY,CAACF,KAAK,EAAEC,IAAI,CAAC;EACxC,CAAC,CAAC,OAAOL,CAAC,EAAE;IACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;EAC/B;AACJ,CAAC;AAACE,OAAA,CAAAC,WAAA,GAAAA,WAAA"}

package/folder/onFolderBeforeDelete.hook.d.ts

@@ -1,2 +0,0 @@
-import { AcoContext } from "../types";
-export declare const onFolderBeforeDeleteHook: ({ aco }: AcoContext) => void;