@webiny/api-headless-cms-ddb-es 5.17.4-beta.1 → 5.18.0-beta.2

package/configurations.d.ts

@@ -1,24 +1,12 @@
-import { CmsContentModel, CmsContext } from "@webiny/api-headless-cms/types";
-interface DatabaseConfigKeyFields {
-    name: string;
-}
-interface DatabaseConfigKeys {
-    primary: boolean;
-    unique: boolean;
-    name: string;
-    fields: DatabaseConfigKeyFields[];
-}
-export interface CmsDatabaseConfig {
-    table: string;
-    keys: DatabaseConfigKeys[];
-}
+import { CmsModel } from "@webiny/api-headless-cms/types";
 interface ElasticsearchConfig {
     index: string;
 }
+interface CmsElasticsearchParams {
+    model: CmsModel;
+}
 interface Configurations {
-    db: () => CmsDatabaseConfig;
-    esDb: () => CmsDatabaseConfig;
-    es: (context: CmsContext, model: CmsContentModel) => ElasticsearchConfig;
+    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;
 }
 declare const configurations: Configurations;
 export default configurations;

package/configurations.js

@@ -5,43 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const configurations = {
-  db: () => ({
-    table: process.env.DB_TABLE,
-    keys: [{
-      primary: true,
-      unique: true,
-      name: "primary",
-      fields: [{
-        name: "PK"
-      }, {
-        name: "SK"
-      }]
-    }]
-  }),
-  esDb: () => ({
-    table: process.env.DB_TABLE_ELASTICSEARCH,
-    keys: [{
-      primary: true,
-      unique: true,
-      name: "primary",
-      fields: [{
-        name: "PK"
-      }, {
-        name: "SK"
-      }]
-    }]
-  }),
-
-  es(context, model) {
-    const tenant = context.tenancy.getCurrentTenant();
-
-    if (!tenant) {
-      throw new Error(`There is no tenant on "context.security".`);
-    }
-
+  es({
+    model
+  }) {
+    const {
+      tenant,
+      locale
+    } = model;
     const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
-    const locale = context.cms.getLocale().code;
-    const index = [sharedIndex ? "root" : tenant.id, "headless-cms", locale, model.modelId].join("-").toLowerCase();
+    const index = [sharedIndex ? "root" : tenant, "headless-cms", locale, model.modelId].join("-").toLowerCase();
     const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;
 
     if (prefix) {
@@ -57,5 +29,4 @@ const configurations = {
 
 };
 var _default = configurations;
-exports.default = _default;
-//# sourceMappingURL=configurations.js.map
+exports.default = _default;

package/definitions/entry.d.ts

@@ -1,13 +1,8 @@
 import { Entity, Table } from "dynamodb-toolbox";
-import { CmsContext } from "@webiny/api-headless-cms/types";
-declare const _default: (params: {
+import { Attributes } from "../types";
+export interface Params {
     table: Table;
-    context: CmsContext;
-}) => Entity<any>;
-/**
- * TODO when saving this entity remove fields:
- * - ignore
- * - version
- * - savedOn
- */
-export default _default;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createEntryEntity: (params: Params) => Entity<any>;

package/definitions/entry.js

@@ -1,26 +1,30 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createEntryEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _dynamodbToolbox = require("dynamodb-toolbox");
 
-/**
- * TODO when saving this entity remove fields:
- * - ignore
- * - version
- * - savedOn
- */
-var _default = params => {
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createEntryEntity = params => {
   const {
-    table
+    table,
+    entityName,
+    attributes
   } = params;
   return new _dynamodbToolbox.Entity({
-    name: "ContentEntry",
+    name: entityName,
     table,
-    attributes: {
+    attributes: _objectSpread({
       PK: {
         type: "string",
         partitionKey: true
@@ -80,9 +84,8 @@ var _default = params => {
       values: {
         type: "map"
       }
-    }
+    }, attributes || {})
   });
 };
 
-exports.default = _default;
-//# sourceMappingURL=entry.js.map
+exports.createEntryEntity = createEntryEntity;

package/definitions/entryElasticsearch.d.ts

@@ -0,0 +1,8 @@
+import { Entity, Table } from "dynamodb-toolbox";
+import { Attributes } from "../types";
+export interface Params {
+    table: Table;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createEntryElasticsearchEntity: (params: Params) => Entity<any>;

package/definitions/entryElasticsearch.js

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createEntryElasticsearchEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _dynamodbToolbox = require("dynamodb-toolbox");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createEntryElasticsearchEntity = params => {
+  const {
+    table,
+    entityName,
+    attributes
+  } = params;
+  return new _dynamodbToolbox.Entity({
+    name: entityName,
+    table,
+    attributes: _objectSpread({
+      PK: {
+        type: "string",
+        partitionKey: true
+      },
+      SK: {
+        type: "string",
+        sortKey: true
+      },
+      index: {
+        type: "string"
+      },
+      data: {
+        type: "map"
+      }
+    }, attributes || {})
+  });
+};
+
+exports.createEntryElasticsearchEntity = createEntryElasticsearchEntity;

package/definitions/group.d.ts

@@ -0,0 +1,8 @@
+import { Entity, Table } from "dynamodb-toolbox";
+import { Attributes } from "../types";
+export interface Params {
+    table: Table;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createGroupEntity: (params: Params) => Entity<any>;

package/definitions/group.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createGroupEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _dynamodbToolbox = require("dynamodb-toolbox");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createGroupEntity = params => {
+  const {
+    table,
+    attributes,
+    entityName
+  } = params;
+  return new _dynamodbToolbox.Entity({
+    name: entityName,
+    table,
+    attributes: _objectSpread({
+      PK: {
+        partitionKey: true
+      },
+      SK: {
+        sortKey: true
+      },
+      TYPE: {
+        type: "string"
+      },
+      webinyVersion: {
+        type: "string"
+      },
+      id: {
+        type: "string"
+      },
+      name: {
+        type: "string"
+      },
+      slug: {
+        type: "string"
+      },
+      locale: {
+        type: "string"
+      },
+      description: {
+        type: "string"
+      },
+      icon: {
+        type: "string"
+      },
+      createdBy: {
+        type: "map"
+      },
+      createdOn: {
+        type: "string"
+      },
+      savedOn: {
+        type: "string"
+      },
+      tenant: {
+        type: "string"
+      }
+    }, attributes || {})
+  });
+};
+
+exports.createGroupEntity = createGroupEntity;

package/definitions/model.d.ts

@@ -1,7 +1,8 @@
-import { Table, Entity } from "dynamodb-toolbox";
-import { CmsContext } from "@webiny/api-headless-cms/types";
-declare const _default: (params: {
+import { Entity, Table } from "dynamodb-toolbox";
+import { Attributes } from "../types";
+export interface Params {
     table: Table;
-    context: CmsContext;
-}) => Entity<any>;
-export default _default;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createModelEntity: (params: Params) => Entity<any>;

package/definitions/model.js

@@ -1,20 +1,30 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createModelEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _dynamodbToolbox = require("dynamodb-toolbox");
 
-var _default = params => {
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createModelEntity = params => {
   const {
-    table
+    table,
+    attributes,
+    entityName
   } = params;
   return new _dynamodbToolbox.Entity({
-    name: "ContentModel",
+    name: entityName,
     table,
-    attributes: {
+    attributes: _objectSpread({
       PK: {
         partitionKey: true
       },
@@ -22,50 +32,65 @@ var _default = params => {
         sortKey: true
       },
       TYPE: {
-        type: "string"
+        type: "string",
+        required: true
       },
       webinyVersion: {
-        type: "string"
+        type: "string",
+        required: true
       },
       name: {
-        type: "string"
+        type: "string",
+        required: true
       },
       modelId: {
-        type: "string"
+        type: "string",
+        required: true
       },
       locale: {
-        type: "string"
+        type: "string",
+        required: true
       },
       group: {
-        type: "map"
+        type: "map",
+        required: true
       },
       description: {
         type: "string"
       },
       createdOn: {
-        type: "string"
+        type: "string",
+        required: true
       },
       savedOn: {
-        type: "string"
+        type: "string",
+        required: true
       },
       createdBy: {
-        type: "map"
+        type: "map",
+        required: true
       },
       fields: {
-        type: "list"
+        type: "list",
+        required: true
       },
       layout: {
-        type: "list"
+        type: "list",
+        required: true
       },
       lockedFields: {
-        type: "list"
+        type: "list",
+        required: true
       },
       titleFieldId: {
         type: "string"
+      },
+      tenant: {
+        type: "string",
+        required: true
       }
-    }
+    }, attributes || {})
   });
 };
 
-exports.default = _default;
-//# sourceMappingURL=model.js.map
+exports.createModelEntity = createModelEntity;

package/definitions/settings.d.ts

@@ -0,0 +1,8 @@
+import { Entity, Table } from "dynamodb-toolbox";
+import { Attributes } from "../types";
+export interface Params {
+    table: Table;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createSettingsEntity: (params: Params) => Entity<any>;

package/definitions/settings.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSettingsEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _dynamodbToolbox = require("dynamodb-toolbox");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createSettingsEntity = params => {
+  const {
+    entityName,
+    table,
+    attributes
+  } = params;
+  return new _dynamodbToolbox.Entity({
+    name: entityName,
+    table,
+    attributes: _objectSpread({
+      PK: {
+        partitionKey: true
+      },
+      SK: {
+        sortKey: true
+      },
+      TYPE: {
+        type: "string"
+      },
+      key: {
+        type: "string"
+      },
+      uploadMinFileSize: {
+        type: "number"
+      },
+      uploadMaxFileSize: {
+        type: "number"
+      },
+      srcPrefix: {
+        type: "string"
+      },
+      contentModelLastChange: {
+        type: "string"
+      },
+      tenant: {
+        type: "string"
+      },
+      locale: {
+        type: "string"
+      }
+    }, attributes || {})
+  });
+};
+
+exports.createSettingsEntity = createSettingsEntity;

package/definitions/system.d.ts

@@ -0,0 +1,8 @@
+import { Entity, Table } from "dynamodb-toolbox";
+import { Attributes } from "../types";
+export interface Params {
+    table: Table;
+    entityName: string;
+    attributes: Attributes;
+}
+export declare const createSystemEntity: (params: Params) => Entity<any>;

package/definitions/system.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSystemEntity = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _dynamodbToolbox = require("dynamodb-toolbox");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+const createSystemEntity = params => {
+  const {
+    entityName,
+    attributes,
+    table
+  } = params;
+  return new _dynamodbToolbox.Entity({
+    name: entityName,
+    table,
+    attributes: _objectSpread({
+      PK: {
+        partitionKey: true
+      },
+      SK: {
+        sortKey: true
+      },
+      version: {
+        type: "string"
+      },
+      locale: {
+        type: "string"
+      },
+      tenant: {
+        type: "string"
+      },
+      readAPIKey: {
+        type: "string"
+      }
+    }, attributes || {})
+  });
+};
+
+exports.createSystemEntity = createSystemEntity;

package/definitions/table.d.ts

@@ -1,4 +1,8 @@
-import { CmsContext } from "@webiny/api-headless-cms/types";
+import { TableModifier } from "../types";
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
 import { Table } from "dynamodb-toolbox";
-declare const _default: (context: CmsContext) => Table;
-export default _default;
+export interface Params {
+    table?: TableModifier;
+    documentClient: DocumentClient;
+}
+export declare const createTable: ({ table, documentClient }: Params) => Table;

package/definitions/table.js

@@ -1,41 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
-var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _configurations = _interopRequireDefault(require("../configurations"));
+exports.createTable = void 0;
 
 var _dynamodbToolbox = require("dynamodb-toolbox");
 
-var _default = context => {
-  const {
-    db
-  } = context;
-  const driver = db.driver;
-
-  if (!driver || !driver.documentClient) {
-    throw new _error.default(`Missing documentDriver on the context.db.driver property.`, "DOCUMENT_CLIENT_ERROR");
-  }
-
-  const tableName = _configurations.default.db().table;
-
-  if (!tableName && !db.table) {
-    throw new _error.default(`Missing table on the context.db property.`, "TABLE_NAME_ERROR");
-  }
-
-  return new _dynamodbToolbox.Table({
-    name: tableName || db.table,
+const createTable = ({
+  table,
+  documentClient
+}) => {
+  const tableConfig = {
+    name: process.env.DB_TABLE_HEADLESS_CMS || process.env.DB_TABLE,
     partitionKey: "PK",
     sortKey: "SK",
-    DocumentClient: driver.documentClient
-  });
+    DocumentClient: documentClient
+  };
+  const config = typeof table === "function" ? table(tableConfig) : tableConfig;
+  return new _dynamodbToolbox.Table(config);
 };
 
-exports.default = _default;
-//# sourceMappingURL=table.js.map
+exports.createTable = createTable;

package/definitions/tableElasticsearch.d.ts

@@ -1,4 +1,8 @@
-import { CmsContext } from "@webiny/api-headless-cms/types";
+import { TableModifier } from "../types";
+import { DocumentClient } from "aws-sdk/clients/dynamodb";
 import { Table } from "dynamodb-toolbox";
-declare const _default: (context: CmsContext) => Table;
-export default _default;
+export interface Params {
+    table?: TableModifier;
+    documentClient: DocumentClient;
+}
+export declare const createElasticsearchTable: ({ table, documentClient }: Params) => Table;