@webiny/api-aco 6.0.0-beta.0 → 6.0.0-rc.0

package/filter/filter.model.js

@@ -1,124 +1,41 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFilterModel = exports.FILTER_MODEL_ID = void 0;
-var _createModelField = require("../utils/createModelField");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
-const name = () => (0, _createModelField.createModelField)({
-  label: "Name",
-  fieldId: "name",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const description = () => (0, _createModelField.createModelField)({
-  label: "Description",
-  fieldId: "description",
-  type: "text"
-});
-const namespace = () => (0, _createModelField.createModelField)({
-  label: "Model Id",
-  fieldId: "namespace",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const operation = () => (0, _createModelField.createModelField)({
-  label: "Operation",
-  fieldId: "operation",
-  type: "text",
-  predefinedValues: {
-    enabled: true,
-    values: [{
-      label: "AND",
-      value: "AND"
-    }, {
-      label: "OR",
-      value: "OR"
-    }]
-  },
-  multipleValues: false,
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const groups = fields => (0, _createModelField.createModelField)({
-  label: "Groups",
-  fieldId: "groups",
-  type: "object",
-  multipleValues: true,
-  settings: {
-    fields,
-    layout: fields.map(field => [field.storageId])
-  },
-  listValidation: [{
-    name: "minLength",
-    message: "At least one group is required.",
-    settings: {
-      value: "1"
-    }
-  }]
-});
-const filters = fields => (0, _createModelField.createModelField)({
-  label: "Filters",
-  fieldId: "filters",
-  type: "object",
-  multipleValues: true,
-  settings: {
-    fields,
-    layout: fields.map(field => [field.storageId])
-  },
-  listValidation: [{
-    name: "minLength",
-    message: "At least one filter is required.",
-    settings: {
-      value: "1"
-    }
-  }]
-});
-const field = () => (0, _createModelField.createModelField)({
-  label: "Field",
-  fieldId: "field",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const condition = () => (0, _createModelField.createModelField)({
-  label: "Condition",
-  fieldId: "condition",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
-});
-const value = () => (0, _createModelField.createModelField)({
-  label: "Value",
-  fieldId: "value",
-  type: "text",
-  validation: [{
-    name: "required",
-    message: "Value is required."
-  }]
+import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
+export const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? "acoFilter" : "wbyAcoFilter";
+class FilterPrivateModelImpl {
+  async execute(builder) {
+    return [builder.private({
+      modelId: FILTER_MODEL_ID,
+      name: "ACO - Filter"
+    }).fields(fields => ({
+      name: fields.text().label("Name").required(),
+      description: fields.text().label("Description"),
+      namespace: fields.text().label("Model Id").required(),
+      operation: fields.text().label("Operation").required().predefinedValues([{
+        label: "AND",
+        value: "AND"
+      }, {
+        label: "OR",
+        value: "OR"
+      }]),
+      groups: fields.object().label("Groups").list().listMinLength(1, "At least one group is required.").fields(fields => ({
+        operation: fields.text().label("Operation").required().predefinedValues([{
+          label: "AND",
+          value: "AND"
+        }, {
+          label: "OR",
+          value: "OR"
+        }]),
+        filters: fields.object().label("Filters").list().listMinLength(1, "At least one filter is required.").fields(filterFields => ({
+          field: filterFields.text().label("Field").required(),
+          condition: filterFields.text().label("Condition").required(),
+          value: filterFields.text().label("Value").required()
+        }))
+      }))
+    }))];
+  }
+}
+export const FilterPrivateModel = ModelFactory.createImplementation({
+  implementation: FilterPrivateModelImpl,
+  dependencies: []
 });
-const FILTER_MODEL_ID = exports.FILTER_MODEL_ID = "acoFilter";
-const createFilterModel = () => {
-  return (0, _apiHeadlessCms.createPrivateModel)({
-    name: "ACO - Filter",
-    modelId: FILTER_MODEL_ID,
-    titleFieldId: "name",
-    fields: [name(), description(), namespace(), operation(), groups([operation(), filters([field(), condition(), value()])])]
-  });
-};
-exports.createFilterModel = createFilterModel;
 
 //# sourceMappingURL=filter.model.js.map

package/filter/filter.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["_createModelField","require","_apiHeadlessCms","name","createModelField","label","fieldId","type","validation","message","description","namespace","operation","predefinedValues","enabled","values","value","multipleValues","groups","fields","settings","layout","map","field","storageId","listValidation","filters","condition","FILTER_MODEL_ID","exports","createFilterModel","createPrivateModel","modelId","titleFieldId"],"sources":["filter.model.ts"],"sourcesContent":["import { createModelField } from \"~/utils/createModelField\";\nimport { createPrivateModel } from \"@webiny/api-headless-cms\";\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst name = () =>\n    createModelField({\n        label: \"Name\",\n        fieldId: \"name\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst description = () =>\n    createModelField({\n        label: \"Description\",\n        fieldId: \"description\",\n        type: \"text\"\n    });\n\nconst namespace = () =>\n    createModelField({\n        label: \"Model Id\",\n        fieldId: \"namespace\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst operation = () =>\n    createModelField({\n        label: \"Operation\",\n        fieldId: \"operation\",\n        type: \"text\",\n        predefinedValues: {\n            enabled: true,\n            values: [\n                {\n                    label: \"AND\",\n                    value: \"AND\"\n                },\n                {\n                    label: \"OR\",\n                    value: \"OR\"\n                }\n            ]\n        },\n        multipleValues: false,\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst groups = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Groups\",\n        fieldId: \"groups\",\n        type: \"object\",\n        multipleValues: true,\n        settings: {\n            fields,\n            layout: fields.map(field => [field.storageId])\n        },\n        listValidation: [\n            {\n                name: \"minLength\",\n                message: \"At least one group is required.\",\n                settings: {\n                    value: \"1\"\n                }\n            }\n        ]\n    });\n\nconst filters = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Filters\",\n        fieldId: \"filters\",\n        type: \"object\",\n        multipleValues: true,\n        settings: {\n            fields,\n            layout: fields.map(field => [field.storageId])\n        },\n        listValidation: [\n            {\n                name: \"minLength\",\n                message: \"At least one filter is required.\",\n                settings: {\n                    value: \"1\"\n                }\n            }\n        ]\n    });\n\nconst field = () =>\n    createModelField({\n        label: \"Field\",\n        fieldId: \"field\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst condition = () =>\n    createModelField({\n        label: \"Condition\",\n        fieldId: \"condition\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst value = () =>\n    createModelField({\n        label: \"Value\",\n        fieldId: \"value\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nexport const FILTER_MODEL_ID = \"acoFilter\";\n\nexport const createFilterModel = () => {\n    return createPrivateModel({\n        name: \"ACO - Filter\",\n        modelId: FILTER_MODEL_ID,\n        titleFieldId: \"name\",\n        fields: [\n            name(),\n            description(),\n            namespace(),\n            operation(),\n            groups([operation(), filters([field(), condition(), value()])])\n        ]\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAGA,MAAME,IAAI,GAAGA,CAAA,KACT,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,OAAO,EAAE,MAAM;EACfC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMC,WAAW,GAAGA,CAAA,KAChB,IAAAN,kCAAgB,EAAC;EACbC,KAAK,EAAE,aAAa;EACpBC,OAAO,EAAE,aAAa;EACtBC,IAAI,EAAE;AACV,CAAC,CAAC;AAEN,MAAMI,SAAS,GAAGA,CAAA,KACd,IAAAP,kCAAgB,EAAC;EACbC,KAAK,EAAE,UAAU;EACjBC,OAAO,EAAE,WAAW;EACpBC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMG,SAAS,GAAGA,CAAA,KACd,IAAAR,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,OAAO,EAAE,WAAW;EACpBC,IAAI,EAAE,MAAM;EACZM,gBAAgB,EAAE;IACdC,OAAO,EAAE,IAAI;IACbC,MAAM,EAAE,CACJ;MACIV,KAAK,EAAE,KAAK;MACZW,KAAK,EAAE;IACX,CAAC,EACD;MACIX,KAAK,EAAE,IAAI;MACXW,KAAK,EAAE;IACX,CAAC;EAET,CAAC;EACDC,cAAc,EAAE,KAAK;EACrBT,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMS,MAAM,GAAIC,MAAuB,IACnC,IAAAf,kCAAgB,EAAC;EACbC,KAAK,EAAE,QAAQ;EACfC,OAAO,EAAE,QAAQ;EACjBC,IAAI,EAAE,QAAQ;EACdU,cAAc,EAAE,IAAI;EACpBG,QAAQ,EAAE;IACND,MAAM;IACNE,MAAM,EAAEF,MAAM,CAACG,GAAG,CAACC,KAAK,IAAI,CAACA,KAAK,CAACC,SAAS,CAAC;EACjD,CAAC;EACDC,cAAc,EAAE,CACZ;IACItB,IAAI,EAAE,WAAW;IACjBM,OAAO,EAAE,iCAAiC;IAC1CW,QAAQ,EAAE;MACNJ,KAAK,EAAE;IACX;EACJ,CAAC;AAET,CAAC,CAAC;AAEN,MAAMU,OAAO,GAAIP,MAAuB,IACpC,IAAAf,kCAAgB,EAAC;EACbC,KAAK,EAAE,SAAS;EAChBC,OAAO,EAAE,SAAS;EAClBC,IAAI,EAAE,QAAQ;EACdU,cAAc,EAAE,IAAI;EACpBG,QAAQ,EAAE;IACND,MAAM;IACNE,MAAM,EAAEF,MAAM,CAACG,GAAG,CAACC,KAAK,IAAI,CAACA,KAAK,CAACC,SAAS,CAAC;EACjD,CAAC;EACDC,cAAc,EAAE,CACZ;IACItB,IAAI,EAAE,WAAW;IACjBM,OAAO,EAAE,kCAAkC;IAC3CW,QAAQ,EAAE;MACNJ,KAAK,EAAE;IACX;EACJ,CAAC;AAET,CAAC,CAAC;AAEN,MAAMO,KAAK,GAAGA,CAAA,KACV,IAAAnB,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,OAAO,EAAE,OAAO;EAChBC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMkB,SAAS,GAAGA,CAAA,KACd,IAAAvB,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,OAAO,EAAE,WAAW;EACpBC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMO,KAAK,GAAGA,CAAA,KACV,IAAAZ,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,OAAO,EAAE,OAAO;EAChBC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIL,IAAI,EAAE,UAAU;IAChBM,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEC,MAAMmB,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG,WAAW;AAEnC,MAAME,iBAAiB,GAAGA,CAAA,KAAM;EACnC,OAAO,IAAAC,kCAAkB,EAAC;IACtB5B,IAAI,EAAE,cAAc;IACpB6B,OAAO,EAAEJ,eAAe;IACxBK,YAAY,EAAE,MAAM;IACpBd,MAAM,EAAE,CACJhB,IAAI,CAAC,CAAC,EACNO,WAAW,CAAC,CAAC,EACbC,SAAS,CAAC,CAAC,EACXC,SAAS,CAAC,CAAC,EACXM,MAAM,CAAC,CAACN,SAAS,CAAC,CAAC,EAAEc,OAAO,CAAC,CAACH,KAAK,CAAC,CAAC,EAAEI,SAAS,CAAC,CAAC,EAAEX,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;EAEvE,CAAC,CAAC;AACN,CAAC;AAACa,OAAA,CAAAC,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["ModelFactory","FILTER_MODEL_ID","process","env","WEBINY_API_LEGACY_MODELS","FilterPrivateModelImpl","execute","builder","private","modelId","name","fields","text","label","required","description","namespace","operation","predefinedValues","value","groups","object","list","listMinLength","filters","filterFields","field","condition","FilterPrivateModel","createImplementation","implementation","dependencies"],"sources":["filter.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\n\nexport const FILTER_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"acoFilter\" : \"wbyAcoFilter\";\n\nclass FilterPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: FILTER_MODEL_ID,\n                    name: \"ACO - Filter\"\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(),\n                    description: fields.text().label(\"Description\"),\n                    namespace: fields.text().label(\"Model Id\").required(),\n                    operation: fields\n                        .text()\n                        .label(\"Operation\")\n                        .required()\n                        .predefinedValues([\n                            {\n                                label: \"AND\",\n                                value: \"AND\"\n                            },\n                            {\n                                label: \"OR\",\n                                value: \"OR\"\n                            }\n                        ]),\n                    groups: fields\n                        .object()\n                        .label(\"Groups\")\n                        .list()\n                        .listMinLength(1, \"At least one group is required.\")\n                        .fields(fields => ({\n                            operation: fields\n                                .text()\n                                .label(\"Operation\")\n                                .required()\n                                .predefinedValues([\n                                    {\n                                        label: \"AND\",\n                                        value: \"AND\"\n                                    },\n                                    {\n                                        label: \"OR\",\n                                        value: \"OR\"\n                                    }\n                                ]),\n                            filters: fields\n                                .object()\n                                .label(\"Filters\")\n                                .list()\n                                .listMinLength(1, \"At least one filter is required.\")\n                                .fields(filterFields => ({\n                                    field: filterFields.text().label(\"Field\").required(),\n                                    condition: filterFields.text().label(\"Condition\").required(),\n                                    value: filterFields.text().label(\"Value\").required()\n                                }))\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const FilterPrivateModel = ModelFactory.createImplementation({\n    implementation: FilterPrivateModelImpl,\n    dependencies: []\n});\n"],"mappings":"AAAA,SAASA,YAAY,QAAQ,yDAAyD;AAEtF,OAAO,MAAMC,eAAe,GAAGC,OAAO,CAACC,GAAG,CAACC,wBAAwB,GAAG,WAAW,GAAG,cAAc;AAElG,MAAMC,sBAAsB,CAAmC;EAC3D,MAAaC,OAAOA,CAACC,OAA6B,EAAE;IAChD,OAAO,CACHA,OAAO,CACFC,OAAO,CAAC;MACLC,OAAO,EAAER,eAAe;MACxBS,IAAI,EAAE;IACV,CAAC,CAAC,CACDC,MAAM,CAACA,MAAM,KAAK;MACfD,IAAI,EAAEC,MAAM,CAACC,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,MAAM,CAAC,CAACC,QAAQ,CAAC,CAAC;MAC5CC,WAAW,EAAEJ,MAAM,CAACC,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,aAAa,CAAC;MAC/CG,SAAS,EAAEL,MAAM,CAACC,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,UAAU,CAAC,CAACC,QAAQ,CAAC,CAAC;MACrDG,SAAS,EAAEN,MAAM,CACZC,IAAI,CAAC,CAAC,CACNC,KAAK,CAAC,WAAW,CAAC,CAClBC,QAAQ,CAAC,CAAC,CACVI,gBAAgB,CAAC,CACd;QACIL,KAAK,EAAE,KAAK;QACZM,KAAK,EAAE;MACX,CAAC,EACD;QACIN,KAAK,EAAE,IAAI;QACXM,KAAK,EAAE;MACX,CAAC,CACJ,CAAC;MACNC,MAAM,EAAET,MAAM,CACTU,MAAM,CAAC,CAAC,CACRR,KAAK,CAAC,QAAQ,CAAC,CACfS,IAAI,CAAC,CAAC,CACNC,aAAa,CAAC,CAAC,EAAE,iCAAiC,CAAC,CACnDZ,MAAM,CAACA,MAAM,KAAK;QACfM,SAAS,EAAEN,MAAM,CACZC,IAAI,CAAC,CAAC,CACNC,KAAK,CAAC,WAAW,CAAC,CAClBC,QAAQ,CAAC,CAAC,CACVI,gBAAgB,CAAC,CACd;UACIL,KAAK,EAAE,KAAK;UACZM,KAAK,EAAE;QACX,CAAC,EACD;UACIN,KAAK,EAAE,IAAI;UACXM,KAAK,EAAE;QACX,CAAC,CACJ,CAAC;QACNK,OAAO,EAAEb,MAAM,CACVU,MAAM,CAAC,CAAC,CACRR,KAAK,CAAC,SAAS,CAAC,CAChBS,IAAI,CAAC,CAAC,CACNC,aAAa,CAAC,CAAC,EAAE,kCAAkC,CAAC,CACpDZ,MAAM,CAACc,YAAY,KAAK;UACrBC,KAAK,EAAED,YAAY,CAACb,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,OAAO,CAAC,CAACC,QAAQ,CAAC,CAAC;UACpDa,SAAS,EAAEF,YAAY,CAACb,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,WAAW,CAAC,CAACC,QAAQ,CAAC,CAAC;UAC5DK,KAAK,EAAEM,YAAY,CAACb,IAAI,CAAC,CAAC,CAACC,KAAK,CAAC,OAAO,CAAC,CAACC,QAAQ,CAAC;QACvD,CAAC,CAAC;MACV,CAAC,CAAC;IACV,CAAC,CAAC,CAAC,CACV;EACL;AACJ;AAEA,OAAO,MAAMc,kBAAkB,GAAG5B,YAAY,CAAC6B,oBAAoB,CAAC;EAChEC,cAAc,EAAEzB,sBAAsB;EACtC0B,YAAY,EAAE;AAClB,CAAC,CAAC","ignoreList":[]}

package/filter/filter.so.d.ts

@@ -1,3 +1,3 @@
-import { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
-import { AcoFilterStorageOperations } from "./filter.types";
+import type { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations.js";
+import type { AcoFilterStorageOperations } from "./filter.types.js";
 export declare const createFilterOperations: (params: CreateAcoStorageOperationsParams) => AcoFilterStorageOperations;

package/filter/filter.so.js

@@ -1,28 +1,25 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createFilterOperations = void 0;
-var _omit = _interopRequireDefault(require("lodash/omit"));
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _filter = require("./filter.model");
-var _createListSort = require("../utils/createListSort");
-var _createOperationsWrapper = require("../utils/createOperationsWrapper");
-var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
-var _constants = require("@webiny/api-headless-cms/constants");
-const createFilterOperations = params => {
+import omit from "lodash/omit.js";
+import WebinyError from "@webiny/error";
+import { FILTER_MODEL_ID } from "./filter.model.js";
+import { createListSort } from "../utils/createListSort.js";
+import { createOperationsWrapper } from "../utils/createOperationsWrapper.js";
+import { pickEntryFieldValues } from "../utils/pickEntryFieldValues.js";
+import { ENTRY_META_FIELDS } from "@webiny/api-headless-cms/constants.js";
+import { CmsSortMapper, CmsWhereMapper } from "@webiny/api-headless-cms";
+export const createFilterOperations = params => {
   const {
     cms,
-    security
+    security,
+    container
   } = params;
   const {
     withModel
-  } = (0, _createOperationsWrapper.createOperationsWrapper)({
+  } = createOperationsWrapper({
     ...params,
-    modelName: _filter.FILTER_MODEL_ID
+    modelName: FILTER_MODEL_ID
   });
+  const cmsWhereMapper = container.resolve(CmsWhereMapper);
+  const cmsSortMapper = container.resolve(CmsSortMapper);
   return {
     getFilter({
       id
@@ -30,11 +27,11 @@ const createFilterOperations = params => {
       return withModel(async model => {
         const entry = await cms.getEntryById(model, id);
         if (!entry) {
-          throw new _error.default("Could not load filter.", "GET_FILTER_ERROR", {
+          throw new WebinyError("Could not load filter.", "GET_FILTER_ERROR", {
             id
           });
         }
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
+        return pickEntryFieldValues(entry);
       });
     },
     listFilters(params) {
@@ -46,23 +43,30 @@ const createFilterOperations = params => {
         const createdBy = security.getIdentity().id;
         const [entries, meta] = await cms.listLatestEntries(model, {
           ...params,
-          sort: (0, _createListSort.createListSort)(sort),
-          where: {
-            ...({
+          sort: cmsSortMapper.map({
+            input: createListSort(sort),
+            fields: model.fields
+          }),
+          where: cmsWhereMapper.map({
+            input: {
               ...where,
               createdBy
-            } || {})
-          }
+            },
+            fields: model.fields
+          })
         });
-        return [entries.map(_pickEntryFieldValues.pickEntryFieldValues), meta];
+        return [entries.map(pickEntryFieldValues), meta];
       });
     },
     createFilter({
       data
     }) {
       return withModel(async model => {
-        const entry = await cms.createEntry(model, data);
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
+        const entry = await cms.createEntry(model, {
+          id: data.id,
+          values: data
+        });
+        return pickEntryFieldValues(entry);
       });
     },
     updateFilter({
@@ -76,11 +80,14 @@ const createFilterOperations = params => {
            *  We are omitting the standard entry meta fields:
            *  we don't want to override them with the ones coming from the `original` entry.
            */
-          ...(0, _omit.default)(original, _constants.ENTRY_META_FIELDS),
-          ...data
+          ...omit(original, ENTRY_META_FIELDS),
+          values: {
+            ...original.values,
+            ...data
+          }
         };
         const entry = await cms.updateEntry(model, original.id, input);
-        return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
+        return pickEntryFieldValues(entry);
       });
     },
     deleteFilter({
@@ -93,6 +100,5 @@ const createFilterOperations = params => {
     }
   };
 };
-exports.createFilterOperations = createFilterOperations;
 
 //# sourceMappingURL=filter.so.js.map

package/filter/filter.so.js.map

@@ -1 +1 @@
-{"version":3,"names":["_omit","_interopRequireDefault","require","_error","_filter","_createListSort","_createOperationsWrapper","_pickEntryFieldValues","_constants","createFilterOperations","params","cms","security","withModel","createOperationsWrapper","modelName","FILTER_MODEL_ID","getFilter","id","model","entry","getEntryById","WebinyError","pickEntryFieldValues","listFilters","sort","where","createdBy","getIdentity","entries","meta","listLatestEntries","createListSort","map","createFilter","data","createEntry","updateFilter","original","input","omit","ENTRY_META_FIELDS","updateEntry","deleteFilter","deleteEntry","exports"],"sources":["filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model\";\nimport { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { createListSort } from \"~/utils/createListSort\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues\";\nimport { AcoFilterStorageOperations, Filter } from \"./filter.types\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants\";\n\nexport const createFilterOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoFilterStorageOperations => {\n    const { cms, security } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: FILTER_MODEL_ID\n    });\n\n    return {\n        getFilter({ id }) {\n            return withModel(async model => {\n                const entry = await cms.getEntryById(model, id);\n\n                if (!entry) {\n                    throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n                        id\n                    });\n                }\n\n                return pickEntryFieldValues(entry);\n            });\n        },\n        listFilters(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n                const createdBy = security.getIdentity().id;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: createListSort(sort),\n                    where: {\n                        ...({ ...where, createdBy } || {})\n                    }\n                });\n\n                return [entries.map(pickEntryFieldValues<Filter>), meta];\n            });\n        },\n        createFilter({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, data);\n                return pickEntryFieldValues(entry);\n            });\n        },\n        updateFilter({ id, data }) {\n            return withModel(async model => {\n                const original = await cms.getEntryById(model, id);\n\n                const input = {\n                    /**\n                     *  We are omitting the standard entry meta fields:\n                     *  we don't want to override them with the ones coming from the `original` entry.\n                     */\n                    ...omit(original, ENTRY_META_FIELDS),\n                    ...data\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n                return pickEntryFieldValues(entry);\n            });\n        },\n        deleteFilter({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["omit","WebinyError","FILTER_MODEL_ID","createListSort","createOperationsWrapper","pickEntryFieldValues","ENTRY_META_FIELDS","CmsSortMapper","CmsWhereMapper","createFilterOperations","params","cms","security","container","withModel","modelName","cmsWhereMapper","resolve","cmsSortMapper","getFilter","id","model","entry","getEntryById","listFilters","sort","where","createdBy","getIdentity","entries","meta","listLatestEntries","map","input","fields","createFilter","data","createEntry","values","updateFilter","original","updateEntry","deleteFilter","deleteEntry"],"sources":["filter.so.ts"],"sourcesContent":["import omit from \"lodash/omit.js\";\nimport WebinyError from \"@webiny/error\";\nimport { FILTER_MODEL_ID } from \"./filter.model.js\";\nimport type { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations.js\";\nimport { createListSort } from \"~/utils/createListSort.js\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper.js\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues.js\";\nimport type { AcoFilterStorageOperations, Filter } from \"./filter.types.js\";\nimport { ENTRY_META_FIELDS } from \"@webiny/api-headless-cms/constants.js\";\nimport { CmsSortMapper, CmsWhereMapper } from \"@webiny/api-headless-cms\";\n\nexport const createFilterOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoFilterStorageOperations => {\n    const { cms, security, container } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: FILTER_MODEL_ID\n    });\n\n    const cmsWhereMapper = container.resolve(CmsWhereMapper);\n    const cmsSortMapper = container.resolve(CmsSortMapper);\n\n    return {\n        getFilter({ id }) {\n            return withModel(async model => {\n                const entry = await cms.getEntryById(model, id);\n\n                if (!entry) {\n                    throw new WebinyError(\"Could not load filter.\", \"GET_FILTER_ERROR\", {\n                        id\n                    });\n                }\n\n                return pickEntryFieldValues(entry);\n            });\n        },\n        listFilters(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n                const createdBy = security.getIdentity().id;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: cmsSortMapper.map({\n                        input: createListSort(sort),\n                        fields: model.fields\n                    }),\n                    where: cmsWhereMapper.map({\n                        input: {\n                            ...where,\n                            createdBy\n                        },\n                        fields: model.fields\n                    })\n                });\n\n                return [entries.map(pickEntryFieldValues<Filter>), meta];\n            });\n        },\n        createFilter({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, {\n                    id: data.id,\n                    values: data\n                });\n                return pickEntryFieldValues(entry);\n            });\n        },\n        updateFilter({ id, data }) {\n            return withModel(async model => {\n                const original = await cms.getEntryById(model, id);\n\n                const input = {\n                    /**\n                     *  We are omitting the standard entry meta fields:\n                     *  we don't want to override them with the ones coming from the `original` entry.\n                     */\n                    ...omit(original, ENTRY_META_FIELDS),\n                    values: {\n                        ...original.values,\n                        ...data\n                    }\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n                return pickEntryFieldValues(entry);\n            });\n        },\n        deleteFilter({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/filter/filter.types.d.ts

@@ -1,5 +1,4 @@
-import { AcoBaseFields, ListMeta, ListSort } from "../types";
-import { Topic } from "@webiny/pubsub/types";
+import type { AcoBaseFields, ListMeta, ListSort } from "../types.js";
 export declare enum Operation {
     AND = "AND",
     OR = "OR"
@@ -29,7 +28,7 @@ export interface ListFiltersParams {
     limit?: number;
     after?: string | null;
 }
-export declare type CreateFilterParams = Pick<Filter, "id" | "name" | "description" | "namespace" | "operation" | "groups">;
+export type CreateFilterParams = Pick<Filter, "id" | "name" | "description" | "namespace" | "operation" | "groups">;
 export interface UpdateFilterParams {
     name?: string;
     description?: string;
@@ -43,7 +42,7 @@ export interface DeleteFilterParams {
 export interface StorageOperationsGetFilterParams {
     id: string;
 }
-export declare type StorageOperationsListFiltersParams = ListFiltersParams;
+export type StorageOperationsListFiltersParams = ListFiltersParams;
 export interface StorageOperationsCreateFilterParams {
     data: CreateFilterParams;
 }
@@ -51,40 +50,13 @@ export interface StorageOperationsUpdateFilterParams {
     id: string;
     data: UpdateFilterParams;
 }
-export declare type StorageOperationsDeleteFilterParams = DeleteFilterParams;
-export interface OnFilterBeforeCreateTopicParams {
-    input: CreateFilterParams;
-}
-export interface OnFilterAfterCreateTopicParams {
-    filter: Filter;
-}
-export interface OnFilterBeforeUpdateTopicParams {
-    original: Filter;
-    input: Record<string, any>;
-}
-export interface OnFilterAfterUpdateTopicParams {
-    original: Filter;
-    filter: Filter;
-    input: Record<string, any>;
-}
-export interface OnFilterBeforeDeleteTopicParams {
-    filter: Filter;
-}
-export interface OnFilterAfterDeleteTopicParams {
-    filter: Filter;
-}
+export type StorageOperationsDeleteFilterParams = DeleteFilterParams;
 export interface AcoFilterCrud {
     get(id: string): Promise<Filter>;
     list(params: ListFiltersParams): Promise<[Filter[], ListMeta]>;
     create(data: CreateFilterParams): Promise<Filter>;
     update(id: string, data: UpdateFilterParams): Promise<Filter>;
     delete(id: string): Promise<boolean>;
-    onFilterBeforeCreate: Topic<OnFilterBeforeCreateTopicParams>;
-    onFilterAfterCreate: Topic<OnFilterAfterCreateTopicParams>;
-    onFilterBeforeUpdate: Topic<OnFilterBeforeUpdateTopicParams>;
-    onFilterAfterUpdate: Topic<OnFilterAfterUpdateTopicParams>;
-    onFilterBeforeDelete: Topic<OnFilterBeforeDeleteTopicParams>;
-    onFilterAfterDelete: Topic<OnFilterAfterDeleteTopicParams>;
 }
 export interface AcoFilterStorageOperations {
     getFilter(params: StorageOperationsGetFilterParams): Promise<Filter>;

package/filter/filter.types.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Operation = void 0;
-let Operation = exports.Operation = /*#__PURE__*/function (Operation) {
+export let Operation = /*#__PURE__*/function (Operation) {
   Operation["AND"] = "AND";
   Operation["OR"] = "OR";
   return Operation;

package/filter/filter.types.js.map

@@ -1 +1 @@
-{"version":3,"names":["Operation","exports"],"sources":["filter.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta, ListSort } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport enum Operation {\n    AND = \"AND\",\n    OR = \"OR\"\n}\n\nexport interface GroupFilter {\n    field: string;\n    condition: string;\n    value: string;\n}\n\nexport interface Group {\n    operation: Operation;\n    filters: GroupFilter[];\n}\n\nexport interface Filter extends AcoBaseFields {\n    name: string;\n    description?: string;\n    namespace: string;\n    operation: Operation;\n    groups: Group[];\n}\n\nexport interface ListFiltersWhere {\n    namespace: string;\n}\n\nexport interface ListFiltersParams {\n    where: ListFiltersWhere;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateFilterParams = Pick<\n    Filter,\n    \"id\" | \"name\" | \"description\" | \"namespace\" | \"operation\" | \"groups\"\n>;\n\nexport interface UpdateFilterParams {\n    name?: string;\n    description?: string;\n    namespace?: string;\n    operation?: Operation;\n    groups?: Group[];\n}\n\nexport interface DeleteFilterParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetFilterParams {\n    id: string;\n}\n\nexport type StorageOperationsListFiltersParams = ListFiltersParams;\n\nexport interface StorageOperationsCreateFilterParams {\n    data: CreateFilterParams;\n}\n\nexport interface StorageOperationsUpdateFilterParams {\n    id: string;\n    data: UpdateFilterParams;\n}\n\nexport type StorageOperationsDeleteFilterParams = DeleteFilterParams;\n\nexport interface OnFilterBeforeCreateTopicParams {\n    input: CreateFilterParams;\n}\n\nexport interface OnFilterAfterCreateTopicParams {\n    filter: Filter;\n}\n\nexport interface OnFilterBeforeUpdateTopicParams {\n    original: Filter;\n    input: Record<string, any>;\n}\n\nexport interface OnFilterAfterUpdateTopicParams {\n    original: Filter;\n    filter: Filter;\n    input: Record<string, any>;\n}\n\nexport interface OnFilterBeforeDeleteTopicParams {\n    filter: Filter;\n}\n\nexport interface OnFilterAfterDeleteTopicParams {\n    filter: Filter;\n}\n\nexport interface AcoFilterCrud {\n    get(id: string): Promise<Filter>;\n    list(params: ListFiltersParams): Promise<[Filter[], ListMeta]>;\n    create(data: CreateFilterParams): Promise<Filter>;\n    update(id: string, data: UpdateFilterParams): Promise<Filter>;\n    delete(id: string): Promise<boolean>;\n    onFilterBeforeCreate: Topic<OnFilterBeforeCreateTopicParams>;\n    onFilterAfterCreate: Topic<OnFilterAfterCreateTopicParams>;\n    onFilterBeforeUpdate: Topic<OnFilterBeforeUpdateTopicParams>;\n    onFilterAfterUpdate: Topic<OnFilterAfterUpdateTopicParams>;\n    onFilterBeforeDelete: Topic<OnFilterBeforeDeleteTopicParams>;\n    onFilterAfterDelete: Topic<OnFilterAfterDeleteTopicParams>;\n}\n\nexport interface AcoFilterStorageOperations {\n    getFilter(params: StorageOperationsGetFilterParams): Promise<Filter>;\n    listFilters(params: StorageOperationsListFiltersParams): Promise<[Filter[], ListMeta]>;\n    createFilter(params: StorageOperationsCreateFilterParams): Promise<Filter>;\n    updateFilter(params: StorageOperationsUpdateFilterParams): Promise<Filter>;\n    deleteFilter(params: StorageOperationsDeleteFilterParams): Promise<boolean>;\n}\n"],"mappings":";;;;;;IAGYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}
+{"version":3,"names":["Operation"],"sources":["filter.types.ts"],"sourcesContent":["import type { AcoBaseFields, ListMeta, ListSort } from \"~/types.js\";\n\nexport enum Operation {\n    AND = \"AND\",\n    OR = \"OR\"\n}\n\nexport interface GroupFilter {\n    field: string;\n    condition: string;\n    value: string;\n}\n\nexport interface Group {\n    operation: Operation;\n    filters: GroupFilter[];\n}\n\nexport interface Filter extends AcoBaseFields {\n    name: string;\n    description?: string;\n    namespace: string;\n    operation: Operation;\n    groups: Group[];\n}\n\nexport interface ListFiltersWhere {\n    namespace: string;\n}\n\nexport interface ListFiltersParams {\n    where: ListFiltersWhere;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateFilterParams = Pick<\n    Filter,\n    \"id\" | \"name\" | \"description\" | \"namespace\" | \"operation\" | \"groups\"\n>;\n\nexport interface UpdateFilterParams {\n    name?: string;\n    description?: string;\n    namespace?: string;\n    operation?: Operation;\n    groups?: Group[];\n}\n\nexport interface DeleteFilterParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetFilterParams {\n    id: string;\n}\n\nexport type StorageOperationsListFiltersParams = ListFiltersParams;\n\nexport interface StorageOperationsCreateFilterParams {\n    data: CreateFilterParams;\n}\n\nexport interface StorageOperationsUpdateFilterParams {\n    id: string;\n    data: UpdateFilterParams;\n}\n\nexport type StorageOperationsDeleteFilterParams = DeleteFilterParams;\n\nexport interface AcoFilterCrud {\n    get(id: string): Promise<Filter>;\n    list(params: ListFiltersParams): Promise<[Filter[], ListMeta]>;\n    create(data: CreateFilterParams): Promise<Filter>;\n    update(id: string, data: UpdateFilterParams): Promise<Filter>;\n    delete(id: string): Promise<boolean>;\n}\n\nexport interface AcoFilterStorageOperations {\n    getFilter(params: StorageOperationsGetFilterParams): Promise<Filter>;\n    listFilters(params: StorageOperationsListFiltersParams): Promise<[Filter[], ListMeta]>;\n    createFilter(params: StorageOperationsCreateFilterParams): Promise<Filter>;\n    updateFilter(params: StorageOperationsUpdateFilterParams): Promise<Filter>;\n    deleteFilter(params: StorageOperationsDeleteFilterParams): Promise<boolean>;\n}\n"],"mappings":"AAEA,WAAYA,SAAS,0BAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}

package/flp/flp.crud.d.ts

@@ -0,0 +1,7 @@
+import { type AcoFolderLevelPermissionsCrud, type AcoStorageOperations } from "../types.js";
+import type { Tenant } from "@webiny/api-core/types/tenancy.js";
+export interface CreateFlpCrudMethodsParams {
+    getTenant: () => Tenant;
+    storageOperations: AcoStorageOperations;
+}
+export declare const createFlpCrudMethods: ({ storageOperations, getTenant }: CreateFlpCrudMethodsParams) => AcoFolderLevelPermissionsCrud;

package/flp/flp.crud.js

@@ -0,0 +1,91 @@
+import { WebinyError } from "@webiny/error";
+import { EntryId } from "@webiny/api-headless-cms/exports/api/cms/entry.js";
+export const createFlpCrudMethods = ({
+  storageOperations,
+  getTenant
+}) => {
+  return {
+    async create(params) {
+      return await storageOperations.flp.create({
+        data: {
+          ...params,
+          tenant: getTenant().id
+        }
+      });
+    },
+    async update(id, data) {
+      const original = await this.get(id);
+      if (!original) {
+        throw new WebinyError(`Folder level permission with id "${id}" not found.`, "GET_ITEM_UPDATE_FLP_ERROR", {
+          id,
+          data
+        });
+      }
+      return await storageOperations.flp.update({
+        original,
+        data: {
+          ...data,
+          tenant: getTenant().id
+        }
+      });
+    },
+    async batchUpdate(items) {
+      const batchItems = (await Promise.all(items.map(async ({
+        id,
+        data
+      }) => {
+        const original = await this.get(id);
+        if (!original) {
+          return null;
+        }
+        return {
+          original,
+          data: {
+            ...data,
+            tenant: getTenant().id
+          }
+        };
+      }))).filter(item => item !== null);
+      if (batchItems.length === 0) {
+        return [];
+      }
+      return await storageOperations.flp.batchUpdate({
+        items: batchItems
+      });
+    },
+    async delete(id) {
+      const flp = await this.get(id);
+      if (!flp) {
+        throw new WebinyError(`Folder level permission with id "${id}" not found.`, "GET_ITEM_DELETE_FLP_ERROR", {
+          id
+        });
+      }
+      await storageOperations.flp.delete({
+        flp: {
+          ...flp,
+          tenant: getTenant().id
+        }
+      });
+      return true;
+    },
+    async get(id) {
+      const entryId = EntryId.from(id);
+      return await storageOperations.flp.get({
+        id: entryId.id,
+        tenant: getTenant().id
+      });
+    },
+    async list({
+      where
+    }) {
+      return await storageOperations.flp.list({
+        where: {
+          ...where,
+          tenant: getTenant().id
+        }
+      });
+    }
+  };
+};
+
+//# sourceMappingURL=flp.crud.js.map

package/flp/flp.crud.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["WebinyError","EntryId","createFlpCrudMethods","storageOperations","getTenant","create","params","flp","data","tenant","id","update","original","get","batchUpdate","items","batchItems","Promise","all","map","filter","item","length","delete","entryId","from","list","where"],"sources":["flp.crud.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport {\n    type AcoFolderLevelPermissionsCrud,\n    type AcoStorageOperations,\n    type CreateFlpParams,\n    type UpdateFlpParams\n} from \"~/types.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { EntryId } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\n\nexport interface CreateFlpCrudMethodsParams {\n    getTenant: () => Tenant;\n    storageOperations: AcoStorageOperations;\n}\n\nexport const createFlpCrudMethods = ({\n    storageOperations,\n    getTenant\n}: CreateFlpCrudMethodsParams): AcoFolderLevelPermissionsCrud => {\n    return {\n        async create(params: CreateFlpParams) {\n            return await storageOperations.flp.create({\n                data: { ...params, tenant: getTenant().id }\n            });\n        },\n        async update(id: string, data: UpdateFlpParams) {\n            const original = await this.get(id);\n            if (!original) {\n                throw new WebinyError(\n                    `Folder level permission with id \"${id}\" not found.`,\n                    \"GET_ITEM_UPDATE_FLP_ERROR\",\n                    {\n                        id,\n                        data\n                    }\n                );\n            }\n\n            return await storageOperations.flp.update({\n                original,\n                data: {\n                    ...data,\n                    tenant: getTenant().id\n                }\n            });\n        },\n        async batchUpdate(items: Array<{ id: string; data: UpdateFlpParams }>) {\n            const batchItems = (\n                await Promise.all(\n                    items.map(async ({ id, data }) => {\n                        const original = await this.get(id);\n                        if (!original) {\n                            return null;\n                        }\n                        return {\n                            original,\n                            data: {\n                                ...data,\n                                tenant: getTenant().id\n                            }\n                        };\n                    })\n                )\n            ).filter((item): item is NonNullable<typeof item> => item !== null);\n\n            if (batchItems.length === 0) {\n                return [];\n            }\n\n            return await storageOperations.flp.batchUpdate({\n                items: batchItems\n            });\n        },\n        async delete(id: string) {\n            const flp = await this.get(id);\n            if (!flp) {\n                throw new WebinyError(\n                    `Folder level permission with id \"${id}\" not found.`,\n                    \"GET_ITEM_DELETE_FLP_ERROR\",\n                    {\n                        id\n                    }\n                );\n            }\n\n            await storageOperations.flp.delete({\n                flp: {\n                    ...flp,\n                    tenant: getTenant().id\n                }\n            });\n\n            return true;\n        },\n        async get(id: string) {\n            const entryId = EntryId.from(id);\n            return await storageOperations.flp.get({\n                id: entryId.id,\n                tenant: getTenant().id\n            });\n        },\n        async list({ where }) {\n            return await storageOperations.flp.list({\n                where: {\n                    ...where,\n                    tenant: getTenant().id\n                }\n            });\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/flp/flp.so.d.ts

@@ -0,0 +1,20 @@
+import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb/index.js";
+import type { AcoFolderLevelPermissionsStorageOperations as IAcoFolderLevelPermissionsStorageOperations, FolderLevelPermission, StorageOperationsBatchUpdateFlpParams, StorageOperationsCreateFlpParams, StorageOperationsDeleteFlpParams, StorageOperationsGetFlpParams, StorageOperationsListFlpsParams, StorageOperationsUpdateFlpParams } from "../flp/flp.types.js";
+interface StorageOperationsConfig {
+    documentClient: DynamoDBDocument;
+}
+declare class FolderLevelPermissionsStorageOperations implements IAcoFolderLevelPermissionsStorageOperations {
+    private readonly entity;
+    private readonly table;
+    constructor({ documentClient }: StorageOperationsConfig);
+    list({ where: { tenant, type, path_startsWith, parentId } }: StorageOperationsListFlpsParams): Promise<FolderLevelPermission[]>;
+    get({ tenant, id }: StorageOperationsGetFlpParams): Promise<FolderLevelPermission | null>;
+    create({ data }: StorageOperationsCreateFlpParams): Promise<FolderLevelPermission>;
+    update({ data: inputData, original }: StorageOperationsUpdateFlpParams): Promise<FolderLevelPermission>;
+    delete({ flp }: StorageOperationsDeleteFlpParams): Promise<void>;
+    batchUpdate({ items }: StorageOperationsBatchUpdateFlpParams): Promise<FolderLevelPermission[]>;
+    private createKeys;
+    private createGsiKeys;
+}
+export declare const createFlpOperations: (params: StorageOperationsConfig) => FolderLevelPermissionsStorageOperations;
+export {};