@webiny/api-headless-cms-ddb-es 0.0.0-unstable.d7f521b032 → 0.0.0-unstable.de38392959

package/configurations.d.ts

@@ -3,7 +3,7 @@ interface ElasticsearchConfig {
     index: string;
 }
 interface CmsElasticsearchParams {
-    model: CmsModel;
+    model: Pick<CmsModel, "tenant" | "locale" | "modelId">;
 }
 interface Configurations {
     es: (params: CmsElasticsearchParams) => ElasticsearchConfig;

package/configurations.js

@@ -32,4 +32,6 @@ const configurations = {
     };
   }
 };
-exports.configurations = configurations;
+exports.configurations = configurations;
+
+//# sourceMappingURL=configurations.js.map

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"names":["configurations","es","model","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"sources":["configurations.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: CmsModel;\n}\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        } else if (!locale) {\n            throw new WebinyError(\n                `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                \"LOCALE_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"],"mappings":";;;;;;;AACA;AAaO,MAAMA,cAA8B,GAAG;EAC1CC,EAAE,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC,MAAM;MAAEC;IAAO,CAAC,GAAGF,KAAK;IAEhC,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIE,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL,CAAC,MAAM,IAAI,CAACD,MAAM,EAAE;MAChB,MAAM,IAAIC,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL;IAEA,MAAMC,WAAW,GAAGC,OAAO,CAACC,GAAG,CAACC,4BAA4B,KAAK,MAAM;IACvE,MAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAM,GAAGH,MAAM,EAAE,cAAc,EAAEC,MAAM,EAAEF,KAAK,CAACS,OAAO,CAAC,CAC/EC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,EAAE;IAElB,MAAMC,MAAM,GAAGP,OAAO,CAACC,GAAG,CAACO,2BAA2B,IAAI,EAAE;IAC5D,IAAI,CAACD,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL;AACJ,CAAC;AAAC"}
+{"version":3,"names":["_error","_interopRequireDefault","require","configurations","es","model","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX","exports"],"sources":["configurations.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: Pick<CmsModel, \"tenant\" | \"locale\" | \"modelId\">;\n}\n\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        } else if (!locale) {\n            throw new WebinyError(\n                `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                \"LOCALE_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAcO,MAAMC,cAA8B,GAAG;EAC1CC,EAAEA,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC,MAAM;MAAEC;IAAO,CAAC,GAAGF,KAAK;IAEhC,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIE,cAAW,CAChB,4EAA2E,EAC5E,cACJ,CAAC;IACL,CAAC,MAAM,IAAI,CAACD,MAAM,EAAE;MAChB,MAAM,IAAIC,cAAW,CAChB,4EAA2E,EAC5E,cACJ,CAAC;IACL;IAEA,MAAMC,WAAW,GAAGC,OAAO,CAACC,GAAG,CAACC,4BAA4B,KAAK,MAAM;IACvE,MAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAM,GAAGH,MAAM,EAAE,cAAc,EAAEC,MAAM,EAAEF,KAAK,CAACS,OAAO,CAAC,CAC/EC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,CAAC,CAAC;IAElB,MAAMC,MAAM,GAAGP,OAAO,CAACC,GAAG,CAACO,2BAA2B,IAAI,EAAE;IAC5D,IAAI,CAACD,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL;AACJ,CAAC;AAACM,OAAA,CAAAhB,cAAA,GAAAA,cAAA"}

package/definitions/entry.d.ts

@@ -1,7 +1,7 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Attributes } from "../types";
 export interface CreateEntryEntityParams {
-    table: Table;
+    table: Table<string, string, string>;
     entityName: string;
     attributes: Attributes;
 }

package/definitions/entry.js

@@ -1,22 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEntryEntity = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createEntryEntity = params => {
   const {
     table,
     entityName,
     attributes
   } = params;
-  return new _dynamodbToolbox.Entity({
+  return new _toolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         type: "string",
         partitionKey: true
@@ -43,25 +41,76 @@ const createEntryEntity = params => {
       id: {
         type: "string"
       },
-      createdBy: {
+      /**
+       * Revision-level meta fields. 👇
+       */
+      revisionCreatedOn: {
+        type: "string"
+      },
+      revisionSavedOn: {
+        type: "string"
+      },
+      revisionModifiedOn: {
+        type: "string"
+      },
+      revisionFirstPublishedOn: {
+        type: "string"
+      },
+      revisionLastPublishedOn: {
+        type: "string"
+      },
+      revisionCreatedBy: {
+        type: "map"
+      },
+      revisionSavedBy: {
+        type: "map"
+      },
+      revisionModifiedBy: {
         type: "map"
       },
-      ownedBy: {
+      revisionFirstPublishedBy: {
         type: "map"
       },
+      revisionLastPublishedBy: {
+        type: "map"
+      },
+      /**
+       * Entry-level meta fields. 👇
+       */
       createdOn: {
         type: "string"
       },
       savedOn: {
         type: "string"
       },
-      modelId: {
+      modifiedOn: {
         type: "string"
       },
-      locale: {
+      firstPublishedOn: {
+        type: "string"
+      },
+      lastPublishedOn: {
+        type: "string"
+      },
+      createdBy: {
+        type: "map"
+      },
+      savedBy: {
+        type: "map"
+      },
+      modifiedBy: {
+        type: "map"
+      },
+      firstPublishedBy: {
+        type: "map"
+      },
+      lastPublishedBy: {
+        type: "map"
+      },
+      modelId: {
         type: "string"
       },
-      publishedOn: {
+      locale: {
         type: "string"
       },
       version: {
@@ -73,13 +122,19 @@ const createEntryEntity = params => {
       status: {
         type: "string"
       },
+      location: {
+        type: "map"
+      },
       values: {
         type: "map"
       },
       meta: {
         type: "map"
-      }
-    }, attributes || {})
+      },
+      ...(attributes || {})
+    }
   });
 };
-exports.createEntryEntity = createEntryEntity;
+exports.createEntryEntity = createEntryEntity;
+
+//# sourceMappingURL=entry.js.map

package/definitions/entry.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEntryEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","TYPE","__type","webinyVersion","tenant","entryId","id","createdBy","ownedBy","createdOn","savedOn","modelId","locale","publishedOn","version","locked","status","values","meta"],"sources":["entry.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryEntity = (params: CreateEntryEntityParams): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            __type: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            entryId: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n            createdBy: {\n                type: \"map\"\n            },\n            ownedBy: {\n                type: \"map\"\n            },\n            createdOn: {\n                type: \"string\"\n            },\n            savedOn: {\n                type: \"string\"\n            },\n            modelId: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            publishedOn: {\n                type: \"string\"\n            },\n            version: {\n                type: \"number\"\n            },\n            locked: {\n                type: \"boolean\"\n            },\n            status: {\n                type: \"string\"\n            },\n            values: {\n                type: \"map\"\n            },\n            meta: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAQO,MAAMA,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU;MACNG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFJ,IAAI,EAAE;MACV,CAAC;MACDK,MAAM,EAAE;QACJL,IAAI,EAAE;MACV,CAAC;MACDM,aAAa,EAAE;QACXN,IAAI,EAAE;MACV,CAAC;MACDO,MAAM,EAAE;QACJP,IAAI,EAAE;MACV,CAAC;MACDQ,OAAO,EAAE;QACLR,IAAI,EAAE;MACV,CAAC;MACDS,EAAE,EAAE;QACAT,IAAI,EAAE;MACV,CAAC;MACDU,SAAS,EAAE;QACPV,IAAI,EAAE;MACV,CAAC;MACDW,OAAO,EAAE;QACLX,IAAI,EAAE;MACV,CAAC;MACDY,SAAS,EAAE;QACPZ,IAAI,EAAE;MACV,CAAC;MACDa,OAAO,EAAE;QACLb,IAAI,EAAE;MACV,CAAC;MACDc,OAAO,EAAE;QACLd,IAAI,EAAE;MACV,CAAC;MACDe,MAAM,EAAE;QACJf,IAAI,EAAE;MACV,CAAC;MACDgB,WAAW,EAAE;QACThB,IAAI,EAAE;MACV,CAAC;MACDiB,OAAO,EAAE;QACLjB,IAAI,EAAE;MACV,CAAC;MACDkB,MAAM,EAAE;QACJlB,IAAI,EAAE;MACV,CAAC;MACDmB,MAAM,EAAE;QACJnB,IAAI,EAAE;MACV,CAAC;MACDoB,MAAM,EAAE;QACJpB,IAAI,EAAE;MACV,CAAC;MACDqB,IAAI,EAAE;QACFrB,IAAI,EAAE;MACV;IAAC,GACGJ,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createEntryEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","TYPE","__type","webinyVersion","tenant","entryId","id","revisionCreatedOn","revisionSavedOn","revisionModifiedOn","revisionFirstPublishedOn","revisionLastPublishedOn","revisionCreatedBy","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedBy","revisionLastPublishedBy","createdOn","savedOn","modifiedOn","firstPublishedOn","lastPublishedOn","createdBy","savedBy","modifiedBy","firstPublishedBy","lastPublishedBy","modelId","locale","version","locked","status","location","values","meta","exports"],"sources":["entry.ts"],"sourcesContent":["import { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryEntityParams {\n    table: Table<string, string, string>;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryEntity = (params: CreateEntryEntityParams): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            __type: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            entryId: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n\n            /**\n             * Revision-level meta fields. 👇\n             */\n            revisionCreatedOn: { type: \"string\" },\n            revisionSavedOn: { type: \"string\" },\n            revisionModifiedOn: { type: \"string\" },\n            revisionFirstPublishedOn: { type: \"string\" },\n            revisionLastPublishedOn: { type: \"string\" },\n            revisionCreatedBy: { type: \"map\" },\n            revisionSavedBy: { type: \"map\" },\n            revisionModifiedBy: { type: \"map\" },\n            revisionFirstPublishedBy: { type: \"map\" },\n            revisionLastPublishedBy: { type: \"map\" },\n\n            /**\n             * Entry-level meta fields. 👇\n             */\n            createdOn: { type: \"string\" },\n            savedOn: { type: \"string\" },\n            modifiedOn: { type: \"string\" },\n            firstPublishedOn: { type: \"string\" },\n            lastPublishedOn: { type: \"string\" },\n            createdBy: { type: \"map\" },\n            savedBy: { type: \"map\" },\n            modifiedBy: { type: \"map\" },\n            firstPublishedBy: { type: \"map\" },\n            lastPublishedBy: { type: \"map\" },\n\n            modelId: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            version: {\n                type: \"number\"\n            },\n            locked: {\n                type: \"boolean\"\n            },\n            status: {\n                type: \"string\"\n            },\n            location: {\n                type: \"map\"\n            },\n            values: {\n                type: \"map\"\n            },\n            meta: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,eAAM,CAAC;IACdC,IAAI,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU,EAAE;MACRG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFJ,IAAI,EAAE;MACV,CAAC;MACDK,MAAM,EAAE;QACJL,IAAI,EAAE;MACV,CAAC;MACDM,aAAa,EAAE;QACXN,IAAI,EAAE;MACV,CAAC;MACDO,MAAM,EAAE;QACJP,IAAI,EAAE;MACV,CAAC;MACDQ,OAAO,EAAE;QACLR,IAAI,EAAE;MACV,CAAC;MACDS,EAAE,EAAE;QACAT,IAAI,EAAE;MACV,CAAC;MAED;AACZ;AACA;MACYU,iBAAiB,EAAE;QAAEV,IAAI,EAAE;MAAS,CAAC;MACrCW,eAAe,EAAE;QAAEX,IAAI,EAAE;MAAS,CAAC;MACnCY,kBAAkB,EAAE;QAAEZ,IAAI,EAAE;MAAS,CAAC;MACtCa,wBAAwB,EAAE;QAAEb,IAAI,EAAE;MAAS,CAAC;MAC5Cc,uBAAuB,EAAE;QAAEd,IAAI,EAAE;MAAS,CAAC;MAC3Ce,iBAAiB,EAAE;QAAEf,IAAI,EAAE;MAAM,CAAC;MAClCgB,eAAe,EAAE;QAAEhB,IAAI,EAAE;MAAM,CAAC;MAChCiB,kBAAkB,EAAE;QAAEjB,IAAI,EAAE;MAAM,CAAC;MACnCkB,wBAAwB,EAAE;QAAElB,IAAI,EAAE;MAAM,CAAC;MACzCmB,uBAAuB,EAAE;QAAEnB,IAAI,EAAE;MAAM,CAAC;MAExC;AACZ;AACA;MACYoB,SAAS,EAAE;QAAEpB,IAAI,EAAE;MAAS,CAAC;MAC7BqB,OAAO,EAAE;QAAErB,IAAI,EAAE;MAAS,CAAC;MAC3BsB,UAAU,EAAE;QAAEtB,IAAI,EAAE;MAAS,CAAC;MAC9BuB,gBAAgB,EAAE;QAAEvB,IAAI,EAAE;MAAS,CAAC;MACpCwB,eAAe,EAAE;QAAExB,IAAI,EAAE;MAAS,CAAC;MACnCyB,SAAS,EAAE;QAAEzB,IAAI,EAAE;MAAM,CAAC;MAC1B0B,OAAO,EAAE;QAAE1B,IAAI,EAAE;MAAM,CAAC;MACxB2B,UAAU,EAAE;QAAE3B,IAAI,EAAE;MAAM,CAAC;MAC3B4B,gBAAgB,EAAE;QAAE5B,IAAI,EAAE;MAAM,CAAC;MACjC6B,eAAe,EAAE;QAAE7B,IAAI,EAAE;MAAM,CAAC;MAEhC8B,OAAO,EAAE;QACL9B,IAAI,EAAE;MACV,CAAC;MACD+B,MAAM,EAAE;QACJ/B,IAAI,EAAE;MACV,CAAC;MACDgC,OAAO,EAAE;QACLhC,IAAI,EAAE;MACV,CAAC;MACDiC,MAAM,EAAE;QACJjC,IAAI,EAAE;MACV,CAAC;MACDkC,MAAM,EAAE;QACJlC,IAAI,EAAE;MACV,CAAC;MACDmC,QAAQ,EAAE;QACNnC,IAAI,EAAE;MACV,CAAC;MACDoC,MAAM,EAAE;QACJpC,IAAI,EAAE;MACV,CAAC;MACDqC,IAAI,EAAE;QACFrC,IAAI,EAAE;MACV,CAAC;MACD,IAAIJ,UAAU,IAAI,CAAC,CAAC;IACxB;EACJ,CAAC,CAAC;AACN,CAAC;AAAC0C,OAAA,CAAA9C,iBAAA,GAAAA,iBAAA"}

package/definitions/entryElasticsearch.d.ts

@@ -1,7 +1,7 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Attributes } from "../types";
 export interface CreateEntryElasticsearchEntityParams {
-    table: Table;
+    table: Table<string, string, string>;
     entityName: string;
     attributes: Attributes;
 }

package/definitions/entryElasticsearch.js

@@ -1,22 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEntryElasticsearchEntity = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createEntryElasticsearchEntity = params => {
   const {
     table,
     entityName,
     attributes
   } = params;
-  return new _dynamodbToolbox.Entity({
+  return new _toolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         type: "string",
         partitionKey: true
@@ -30,8 +28,11 @@ const createEntryElasticsearchEntity = params => {
       },
       data: {
         type: "map"
-      }
-    }, attributes || {})
+      },
+      ...(attributes || {})
+    }
   });
 };
-exports.createEntryElasticsearchEntity = createEntryElasticsearchEntity;
+exports.createEntryElasticsearchEntity = createEntryElasticsearchEntity;
+
+//# sourceMappingURL=entryElasticsearch.js.map

package/definitions/entryElasticsearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEntryElasticsearchEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","index","data"],"sources":["entryElasticsearch.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryElasticsearchEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryElasticsearchEntity = (\n    params: CreateEntryElasticsearchEntityParams\n): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            index: {\n                type: \"string\"\n            },\n            data: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAQO,MAAMA,8BAA8B,GACvCC,MAA4C,IAC9B;EACd,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU;MACNG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,KAAK,EAAE;QACHJ,IAAI,EAAE;MACV,CAAC;MACDK,IAAI,EAAE;QACFL,IAAI,EAAE;MACV;IAAC,GACGJ,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createEntryElasticsearchEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","index","data","exports"],"sources":["entryElasticsearch.ts"],"sourcesContent":["import { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryElasticsearchEntityParams {\n    table: Table<string, string, string>;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryElasticsearchEntity = (\n    params: CreateEntryElasticsearchEntityParams\n): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            index: {\n                type: \"string\"\n            },\n            data: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,8BAA8B,GACvCC,MAA4C,IAC9B;EACd,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,eAAM,CAAC;IACdC,IAAI,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU,EAAE;MACRG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,KAAK,EAAE;QACHJ,IAAI,EAAE;MACV,CAAC;MACDK,IAAI,EAAE;QACFL,IAAI,EAAE;MACV,CAAC;MACD,IAAIJ,UAAU,IAAI,CAAC,CAAC;IACxB;EACJ,CAAC,CAAC;AACN,CAAC;AAACU,OAAA,CAAAd,8BAAA,GAAAA,8BAAA"}

package/definitions/group.d.ts

@@ -1,7 +1,7 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Attributes } from "../types";
 export interface CreateGroupEntityParams {
-    table: Table;
+    table: Table<string, string, string>;
     entityName: string;
     attributes: Attributes;
 }

package/definitions/group.js

@@ -1,22 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGroupEntity = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createGroupEntity = params => {
   const {
     table,
     attributes,
     entityName
   } = params;
-  return new _dynamodbToolbox.Entity({
+  return new _toolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         partitionKey: true
       },
@@ -58,8 +56,11 @@ const createGroupEntity = params => {
       },
       tenant: {
         type: "string"
-      }
-    }, attributes || {})
+      },
+      ...(attributes || {})
+    }
   });
 };
-exports.createGroupEntity = createGroupEntity;
+exports.createGroupEntity = createGroupEntity;
+
+//# sourceMappingURL=group.js.map

package/definitions/group.js.map

@@ -1 +1 @@
-{"version":3,"names":["createGroupEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","webinyVersion","id","slug","locale","description","icon","createdBy","createdOn","savedOn","tenant"],"sources":["group.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateGroupEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createGroupEntity = (params: CreateGroupEntityParams): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n            name: {\n                type: \"string\"\n            },\n            slug: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            description: {\n                type: \"string\"\n            },\n            icon: {\n                type: \"string\"\n            },\n\n            createdBy: {\n                type: \"map\"\n            },\n            createdOn: {\n                type: \"string\"\n            },\n            savedOn: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAQO,MAAMA,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE;MACV,CAAC;MACDC,aAAa,EAAE;QACXD,IAAI,EAAE;MACV,CAAC;MACDE,EAAE,EAAE;QACAF,IAAI,EAAE;MACV,CAAC;MACDN,IAAI,EAAE;QACFM,IAAI,EAAE;MACV,CAAC;MACDG,IAAI,EAAE;QACFH,IAAI,EAAE;MACV,CAAC;MACDI,MAAM,EAAE;QACJJ,IAAI,EAAE;MACV,CAAC;MACDK,WAAW,EAAE;QACTL,IAAI,EAAE;MACV,CAAC;MACDM,IAAI,EAAE;QACFN,IAAI,EAAE;MACV,CAAC;MAEDO,SAAS,EAAE;QACPP,IAAI,EAAE;MACV,CAAC;MACDQ,SAAS,EAAE;QACPR,IAAI,EAAE;MACV,CAAC;MACDS,OAAO,EAAE;QACLT,IAAI,EAAE;MACV,CAAC;MACDU,MAAM,EAAE;QACJV,IAAI,EAAE;MACV;IAAC,GACGT,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createGroupEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","webinyVersion","id","slug","locale","description","icon","createdBy","createdOn","savedOn","tenant","exports"],"sources":["group.ts"],"sourcesContent":["import { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateGroupEntityParams {\n    table: Table<string, string, string>;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createGroupEntity = (params: CreateGroupEntityParams): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n            name: {\n                type: \"string\"\n            },\n            slug: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            description: {\n                type: \"string\"\n            },\n            icon: {\n                type: \"string\"\n            },\n\n            createdBy: {\n                type: \"map\"\n            },\n            createdOn: {\n                type: \"string\"\n            },\n            savedOn: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,eAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU,EAAE;MACRI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE;MACV,CAAC;MACDC,aAAa,EAAE;QACXD,IAAI,EAAE;MACV,CAAC;MACDE,EAAE,EAAE;QACAF,IAAI,EAAE;MACV,CAAC;MACDN,IAAI,EAAE;QACFM,IAAI,EAAE;MACV,CAAC;MACDG,IAAI,EAAE;QACFH,IAAI,EAAE;MACV,CAAC;MACDI,MAAM,EAAE;QACJJ,IAAI,EAAE;MACV,CAAC;MACDK,WAAW,EAAE;QACTL,IAAI,EAAE;MACV,CAAC;MACDM,IAAI,EAAE;QACFN,IAAI,EAAE;MACV,CAAC;MAEDO,SAAS,EAAE;QACPP,IAAI,EAAE;MACV,CAAC;MACDQ,SAAS,EAAE;QACPR,IAAI,EAAE;MACV,CAAC;MACDS,OAAO,EAAE;QACLT,IAAI,EAAE;MACV,CAAC;MACDU,MAAM,EAAE;QACJV,IAAI,EAAE;MACV,CAAC;MACD,IAAIT,UAAU,IAAI,CAAC,CAAC;IACxB;EACJ,CAAC,CAAC;AACN,CAAC;AAACoB,OAAA,CAAAvB,iBAAA,GAAAA,iBAAA"}

package/definitions/model.d.ts

@@ -1,7 +1,7 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Attributes } from "../types";
 export interface CreateModelEntityParams {
-    table: Table;
+    table: Table<string, string, string>;
     entityName: string;
     attributes: Attributes;
 }

package/definitions/model.js

@@ -1,22 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createModelEntity = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createModelEntity = params => {
   const {
     table,
     attributes,
     entityName
   } = params;
-  return new _dynamodbToolbox.Entity({
+  return new _toolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         partitionKey: true
       },
@@ -39,6 +37,14 @@ const createModelEntity = params => {
         type: "string",
         required: true
       },
+      singularApiName: {
+        type: "string",
+        required: true
+      },
+      pluralApiName: {
+        type: "string",
+        required: true
+      },
       locale: {
         type: "string",
         required: true
@@ -47,6 +53,9 @@ const createModelEntity = params => {
         type: "map",
         required: true
       },
+      icon: {
+        type: "string"
+      },
       description: {
         type: "string"
       },
@@ -82,11 +91,20 @@ const createModelEntity = params => {
       titleFieldId: {
         type: "string"
       },
+      descriptionFieldId: {
+        type: "string"
+      },
+      imageFieldId: {
+        type: "string"
+      },
       tenant: {
         type: "string",
         required: true
-      }
-    }, attributes || {})
+      },
+      ...(attributes || {})
+    }
   });
 };
-exports.createModelEntity = createModelEntity;
+exports.createModelEntity = createModelEntity;
+
+//# sourceMappingURL=model.js.map

package/definitions/model.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","required","webinyVersion","modelId","locale","group","description","createdOn","savedOn","createdBy","fields","layout","tags","default","lockedFields","titleFieldId","tenant"],"sources":["model.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateModelEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: CreateModelEntityParams): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\",\n                required: true\n            },\n            webinyVersion: {\n                type: \"string\",\n                required: true\n            },\n            name: {\n                type: \"string\",\n                required: true\n            },\n            modelId: {\n                type: \"string\",\n                required: true\n            },\n            locale: {\n                type: \"string\",\n                required: true\n            },\n            group: {\n                type: \"map\",\n                required: true\n            },\n            description: {\n                type: \"string\"\n            },\n            createdOn: {\n                type: \"string\",\n                required: true\n            },\n            savedOn: {\n                type: \"string\",\n                required: true\n            },\n            createdBy: {\n                type: \"map\",\n                required: true\n            },\n            fields: {\n                type: \"list\",\n                required: true\n            },\n            layout: {\n                type: \"list\",\n                required: true\n            },\n            tags: {\n                type: \"list\",\n                required: false,\n                default: []\n            },\n            lockedFields: {\n                type: \"list\",\n                required: true\n            },\n            titleFieldId: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\",\n                required: true\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AASO,MAAMA,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDC,aAAa,EAAE;QACXF,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDP,IAAI,EAAE;QACFM,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDE,OAAO,EAAE;QACLH,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDG,MAAM,EAAE;QACJJ,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDI,KAAK,EAAE;QACHL,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDK,WAAW,EAAE;QACTN,IAAI,EAAE;MACV,CAAC;MACDO,SAAS,EAAE;QACPP,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDO,OAAO,EAAE;QACLR,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDQ,SAAS,EAAE;QACPT,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDS,MAAM,EAAE;QACJV,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDU,MAAM,EAAE;QACJX,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDW,IAAI,EAAE;QACFZ,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE,KAAK;QACfY,OAAO,EAAE;MACb,CAAC;MACDC,YAAY,EAAE;QACVd,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDc,YAAY,EAAE;QACVf,IAAI,EAAE;MACV,CAAC;MACDgB,MAAM,EAAE;QACJhB,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd;IAAC,GACGV,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createModelEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","required","webinyVersion","modelId","singularApiName","pluralApiName","locale","group","icon","description","createdOn","savedOn","createdBy","fields","layout","tags","default","lockedFields","titleFieldId","descriptionFieldId","imageFieldId","tenant","exports"],"sources":["model.ts"],"sourcesContent":["import { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateModelEntityParams {\n    table: Table<string, string, string>;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: CreateModelEntityParams): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\",\n                required: true\n            },\n            webinyVersion: {\n                type: \"string\",\n                required: true\n            },\n            name: {\n                type: \"string\",\n                required: true\n            },\n            modelId: {\n                type: \"string\",\n                required: true\n            },\n            singularApiName: {\n                type: \"string\",\n                required: true\n            },\n            pluralApiName: {\n                type: \"string\",\n                required: true\n            },\n            locale: {\n                type: \"string\",\n                required: true\n            },\n            group: {\n                type: \"map\",\n                required: true\n            },\n            icon: {\n                type: \"string\"\n            },\n            description: {\n                type: \"string\"\n            },\n            createdOn: {\n                type: \"string\",\n                required: true\n            },\n            savedOn: {\n                type: \"string\",\n                required: true\n            },\n            createdBy: {\n                type: \"map\",\n                required: true\n            },\n            fields: {\n                type: \"list\",\n                required: true\n            },\n            layout: {\n                type: \"list\",\n                required: true\n            },\n            tags: {\n                type: \"list\",\n                required: false,\n                default: []\n            },\n            lockedFields: {\n                type: \"list\",\n                required: true\n            },\n            titleFieldId: {\n                type: \"string\"\n            },\n            descriptionFieldId: {\n                type: \"string\"\n            },\n            imageFieldId: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\",\n                required: true\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AASO,MAAMC,iBAAiB,GAAIC,MAA+B,IAAkB;EAC/E,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,eAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU,EAAE;MACRI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDC,aAAa,EAAE;QACXF,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDP,IAAI,EAAE;QACFM,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDE,OAAO,EAAE;QACLH,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDG,eAAe,EAAE;QACbJ,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDI,aAAa,EAAE;QACXL,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDK,MAAM,EAAE;QACJN,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDM,KAAK,EAAE;QACHP,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDO,IAAI,EAAE;QACFR,IAAI,EAAE;MACV,CAAC;MACDS,WAAW,EAAE;QACTT,IAAI,EAAE;MACV,CAAC;MACDU,SAAS,EAAE;QACPV,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDU,OAAO,EAAE;QACLX,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDW,SAAS,EAAE;QACPZ,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDY,MAAM,EAAE;QACJb,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDa,MAAM,EAAE;QACJd,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDc,IAAI,EAAE;QACFf,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE,KAAK;QACfe,OAAO,EAAE;MACb,CAAC;MACDC,YAAY,EAAE;QACVjB,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDiB,YAAY,EAAE;QACVlB,IAAI,EAAE;MACV,CAAC;MACDmB,kBAAkB,EAAE;QAChBnB,IAAI,EAAE;MACV,CAAC;MACDoB,YAAY,EAAE;QACVpB,IAAI,EAAE;MACV,CAAC;MACDqB,MAAM,EAAE;QACJrB,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACD,IAAIV,UAAU,IAAI,CAAC,CAAC;IACxB;EACJ,CAAC,CAAC;AACN,CAAC;AAAC+B,OAAA,CAAAlC,iBAAA,GAAAA,iBAAA"}

package/definitions/system.d.ts

@@ -1,7 +1,7 @@
-import { Entity, Table } from "dynamodb-toolbox";
+import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Attributes } from "../types";
 export interface CreateSystemEntityParams {
-    table: Table;
+    table: Table<string, string, string>;
     entityName: string;
     attributes: Attributes;
 }

package/definitions/system.js

@@ -1,22 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSystemEntity = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createSystemEntity = params => {
   const {
     entityName,
     attributes,
     table
   } = params;
-  return new _dynamodbToolbox.Entity({
+  return new _toolbox.Entity({
     name: entityName,
     table,
-    attributes: (0, _objectSpread2.default)({
+    attributes: {
       PK: {
         partitionKey: true
       },
@@ -34,8 +32,11 @@ const createSystemEntity = params => {
       },
       readAPIKey: {
         type: "string"
-      }
-    }, attributes || {})
+      },
+      ...(attributes || {})
+    }
   });
 };
-exports.createSystemEntity = createSystemEntity;
+exports.createSystemEntity = createSystemEntity;
+
+//# sourceMappingURL=system.js.map

package/definitions/system.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSystemEntity","params","entityName","attributes","table","Entity","name","PK","partitionKey","SK","sortKey","version","type","locale","tenant","readAPIKey"],"sources":["system.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateSystemEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createSystemEntity = (params: CreateSystemEntityParams): Entity<any> => {\n    const { entityName, attributes, table } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            version: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            readAPIKey: {\n                type: \"string\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AASO,MAAMA,kBAAkB,GAAIC,MAAgC,IAAkB;EACjF,MAAM;IAAEC,UAAU;IAAEC,UAAU;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEJ,UAAU;IAChBE,KAAK;IACLD,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,OAAO,EAAE;QACLC,IAAI,EAAE;MACV,CAAC;MACDC,MAAM,EAAE;QACJD,IAAI,EAAE;MACV,CAAC;MACDE,MAAM,EAAE;QACJF,IAAI,EAAE;MACV,CAAC;MACDG,UAAU,EAAE;QACRH,IAAI,EAAE;MACV;IAAC,GACGT,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createSystemEntity","params","entityName","attributes","table","Entity","name","PK","partitionKey","SK","sortKey","version","type","locale","tenant","readAPIKey","exports"],"sources":["system.ts"],"sourcesContent":["import { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateSystemEntityParams {\n    table: Table<string, string, string>;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createSystemEntity = (params: CreateSystemEntityParams): Entity<any> => {\n    const { entityName, attributes, table } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            version: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            readAPIKey: {\n                type: \"string\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AASO,MAAMC,kBAAkB,GAAIC,MAAgC,IAAkB;EACjF,MAAM;IAAEC,UAAU;IAAEC,UAAU;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,eAAM,CAAC;IACdC,IAAI,EAAEJ,UAAU;IAChBE,KAAK;IACLD,UAAU,EAAE;MACRI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,OAAO,EAAE;QACLC,IAAI,EAAE;MACV,CAAC;MACDC,MAAM,EAAE;QACJD,IAAI,EAAE;MACV,CAAC;MACDE,MAAM,EAAE;QACJF,IAAI,EAAE;MACV,CAAC;MACDG,UAAU,EAAE;QACRH,IAAI,EAAE;MACV,CAAC;MACD,IAAIT,UAAU,IAAI,CAAC,CAAC;IACxB;EACJ,CAAC,CAAC;AACN,CAAC;AAACa,OAAA,CAAAhB,kBAAA,GAAAA,kBAAA"}

package/definitions/table.d.ts

@@ -1,8 +1,8 @@
 import { TableModifier } from "../types";
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
-import { Table } from "dynamodb-toolbox";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
+import { Table } from "@webiny/db-dynamodb/toolbox";
 export interface CreateTableParams {
     table?: TableModifier;
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
-export declare const createTable: ({ table, documentClient }: CreateTableParams) => Table;
+export declare const createTable: ({ table, documentClient }: CreateTableParams) => Table<string, string, string>;

package/definitions/table.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTable = void 0;
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createTable = ({
   table,
   documentClient
@@ -13,9 +13,13 @@ const createTable = ({
     name: process.env.DB_TABLE_HEADLESS_CMS || process.env.DB_TABLE,
     partitionKey: "PK",
     sortKey: "SK",
-    DocumentClient: documentClient
+    DocumentClient: documentClient,
+    autoExecute: true,
+    autoParse: true
   };
   const config = typeof table === "function" ? table(tableConfig) : tableConfig;
-  return new _dynamodbToolbox.Table(config);
+  return new _toolbox.Table(config);
 };
-exports.createTable = createTable;
+exports.createTable = createTable;
+
+//# sourceMappingURL=table.js.map

package/definitions/table.js.map

@@ -1 +1 @@
-{"version":3,"names":["createTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_HEADLESS_CMS","DB_TABLE","partitionKey","sortKey","DocumentClient","config","Table"],"sources":["table.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { Table } from \"dynamodb-toolbox\";\nimport { TableConstructor } from \"dynamodb-toolbox/dist/classes/Table\";\n\nexport interface CreateTableParams {\n    table?: TableModifier;\n    documentClient: DocumentClient;\n}\nexport const createTable = ({ table, documentClient }: CreateTableParams): Table => {\n    const tableConfig: TableConstructor = {\n        name: process.env.DB_TABLE_HEADLESS_CMS || (process.env.DB_TABLE as string),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA;AAOO,MAAMA,WAAW,GAAG,CAAC;EAAEC,KAAK;EAAEC;AAAkC,CAAC,KAAY;EAChF,MAAMC,WAA6B,GAAG;IAClCC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,qBAAqB,IAAKF,OAAO,CAACC,GAAG,CAACE,QAAmB;IAC3EC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAET;EACpB,CAAC;EAED,MAAMU,MAAM,GAAG,OAAOX,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIU,sBAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_HEADLESS_CMS","DB_TABLE","partitionKey","sortKey","DocumentClient","autoExecute","autoParse","config","Table","exports"],"sources":["table.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { Table, TableConstructor } from \"@webiny/db-dynamodb/toolbox\";\n\nexport interface CreateTableParams {\n    table?: TableModifier;\n    documentClient: DynamoDBClient;\n}\nexport const createTable = ({\n    table,\n    documentClient\n}: CreateTableParams): Table<string, string, string> => {\n    const tableConfig: TableConstructor<string, string, string> = {\n        name: process.env.DB_TABLE_HEADLESS_CMS || (process.env.DB_TABLE as string),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient,\n        autoExecute: true,\n        autoParse: true\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AAMO,MAAMC,WAAW,GAAGA,CAAC;EACxBC,KAAK;EACLC;AACe,CAAC,KAAoC;EACpD,MAAMC,WAAqD,GAAG;IAC1DC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,qBAAqB,IAAKF,OAAO,CAACC,GAAG,CAACE,QAAmB;IAC3EC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAET,cAAc;IAC9BU,WAAW,EAAE,IAAI;IACjBC,SAAS,EAAE;EACf,CAAC;EAED,MAAMC,MAAM,GAAG,OAAOb,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIY,cAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAhB,WAAA,GAAAA,WAAA"}

package/definitions/tableElasticsearch.d.ts

@@ -1,8 +1,8 @@
 import { TableModifier } from "../types";
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
-import { Table } from "dynamodb-toolbox";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
+import { Table } from "@webiny/db-dynamodb/toolbox";
 export interface CreateElasticsearchTableParams {
     table?: TableModifier;
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
-export declare const createElasticsearchTable: ({ table, documentClient }: CreateElasticsearchTableParams) => Table;
+export declare const createElasticsearchTable: ({ table, documentClient }: CreateElasticsearchTableParams) => Table<string, string, string>;

package/definitions/tableElasticsearch.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createElasticsearchTable = void 0;
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createElasticsearchTable = ({
   table,
   documentClient
@@ -13,9 +13,13 @@ const createElasticsearchTable = ({
     name: process.env.DB_TABLE_ELASTICSEARCH,
     partitionKey: "PK",
     sortKey: "SK",
-    DocumentClient: documentClient
+    DocumentClient: documentClient,
+    autoExecute: true,
+    autoParse: true
   };
   const config = typeof table === "function" ? table(tableConfig) : tableConfig;
-  return new _dynamodbToolbox.Table(config);
+  return new _toolbox.Table(config);
 };
-exports.createElasticsearchTable = createElasticsearchTable;
+exports.createElasticsearchTable = createElasticsearchTable;
+
+//# sourceMappingURL=tableElasticsearch.js.map

package/definitions/tableElasticsearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["createElasticsearchTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_ELASTICSEARCH","partitionKey","sortKey","DocumentClient","config","Table"],"sources":["tableElasticsearch.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { Table } from \"dynamodb-toolbox\";\nimport { TableConstructor } from \"dynamodb-toolbox/dist/classes/Table\";\n\nexport interface CreateElasticsearchTableParams {\n    table?: TableModifier;\n    documentClient: DocumentClient;\n}\nexport const createElasticsearchTable = ({\n    table,\n    documentClient\n}: CreateElasticsearchTableParams): Table => {\n    const tableConfig: TableConstructor = {\n        name: process.env.DB_TABLE_ELASTICSEARCH as string,\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA;AAOO,MAAMA,wBAAwB,GAAG,CAAC;EACrCC,KAAK;EACLC;AAC4B,CAAC,KAAY;EACzC,MAAMC,WAA6B,GAAG;IAClCC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,sBAAgC;IAClDC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAER;EACpB,CAAC;EAED,MAAMS,MAAM,GAAG,OAAOV,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIS,sBAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAAC"}
+{"version":3,"names":["_toolbox","require","createElasticsearchTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_ELASTICSEARCH","partitionKey","sortKey","DocumentClient","autoExecute","autoParse","config","Table","exports"],"sources":["tableElasticsearch.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { TableConstructor } from \"@webiny/db-dynamodb/toolbox\";\n\nexport interface CreateElasticsearchTableParams {\n    table?: TableModifier;\n    documentClient: DynamoDBClient;\n}\nexport const createElasticsearchTable = ({\n    table,\n    documentClient\n}: CreateElasticsearchTableParams): Table<string, string, string> => {\n    const tableConfig: TableConstructor<string, string, string> = {\n        name: process.env.DB_TABLE_ELASTICSEARCH as string,\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient,\n        autoExecute: true,\n        autoParse: true\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AAOO,MAAMC,wBAAwB,GAAGA,CAAC;EACrCC,KAAK;EACLC;AAC4B,CAAC,KAAoC;EACjE,MAAMC,WAAqD,GAAG;IAC1DC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,sBAAgC;IAClDC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAER,cAAc;IAC9BS,WAAW,EAAE,IAAI;IACjBC,SAAS,EAAE;EACf,CAAC;EAED,MAAMC,MAAM,GAAG,OAAOZ,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIW,cAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAf,wBAAA,GAAAA,wBAAA"}

package/dynamoDb/index.d.ts

@@ -1,2 +1,3 @@
 declare const _default: () => import("@webiny/api-headless-cms").StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types").CmsModelField>[];
 export default _default;
+export declare const createDynamoDbPlugins: () => import("@webiny/api-headless-cms").StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types").CmsModelField>[];