@webiny/api-form-builder-so-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.2af142b57e

package/index.js

@@ -1,99 +1,67 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormBuilderStorageOperations = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _types = require("./types");
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
+var _elasticsearchFields = _interopRequireDefault(require("./operations/form/elasticsearchFields"));
+var _elasticsearchFields2 = _interopRequireDefault(require("./operations/submission/elasticsearchFields"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-
+var _types = require("./types");
 var _table = require("./definitions/table");
-
 var _form = require("./definitions/form");
-
 var _submission = require("./definitions/submission");
-
 var _system = require("./definitions/system");
-
 var _settings = require("./definitions/settings");
-
 var _system2 = require("./operations/system");
-
 var _submission2 = require("./operations/submission");
-
 var _settings2 = require("./operations/settings");
-
 var _form2 = require("./operations/form");
-
-var _createElasticsearchIndex = require("./operations/system/createElasticsearchIndex");
-
 var _tableElasticsearch = require("./definitions/tableElasticsearch");
-
 var _plugins = require("@webiny/plugins");
-
 var _elasticsearch = require("./definitions/elasticsearch");
-
-var _elasticsearchFields = _interopRequireDefault(require("./operations/submission/elasticsearchFields"));
-
-var _elasticsearchFields2 = _interopRequireDefault(require("./operations/form/elasticsearchFields"));
-
-var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
-
-var _operators = require("@webiny/api-elasticsearch/operators");
-
-var _ = _interopRequireDefault(require("./upgrades/5.16.0"));
-
-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; }
-
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+var _indices = require("./elasticsearch/indices");
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
 const reservedFields = ["PK", "SK", "index", "data", "TYPE", "__type", "GSI1_PK", "GSI1_SK"];
-
 const isReserved = name => {
   if (reservedFields.includes(name) === false) {
     return;
   }
-
   throw new _error.default(`Attribute name "${name}" is not allowed.`, "ATTRIBUTE_NOT_ALLOWED", {
     name
   });
 };
-
 const createFormBuilderStorageOperations = params => {
   const {
-    attributes = {},
+    attributes,
     table: tableName,
     esTable: esTableName,
     documentClient,
     elasticsearch,
-    plugins: pluginsInput
+    plugins: userPlugins
   } = params;
-
   if (attributes) {
     Object.values(attributes).forEach(attrs => {
       Object.keys(attrs).forEach(isReserved);
     });
   }
-
   const plugins = new _plugins.PluginsContainer([
   /**
    * User defined plugins.
    */
-  pluginsInput || [],
+  userPlugins || [],
   /**
    * Elasticsearch field definitions for the submission record.
    */
-  (0, _elasticsearchFields.default)(),
+  (0, _elasticsearchFields2.default)(),
   /**
    * Elasticsearch field definitions for the form record.
    */
-  (0, _elasticsearchFields2.default)(),
+  (0, _elasticsearchFields.default)(),
   /**
    * DynamoDB filter plugins for the where conditions.
    */
@@ -101,7 +69,11 @@ const createFormBuilderStorageOperations = params => {
   /**
    * Elasticsearch operators.
    */
-  (0, _operators.getElasticsearchOperators)()]);
+  (0, _apiElasticsearch.getElasticsearchOperators)(),
+  /**
+   * Built-in Elasticsearch index plugins
+   */
+  (0, _indices.elasticsearchIndexPlugins)()]);
   const table = (0, _table.createTable)({
     tableName,
     documentClient
@@ -117,50 +89,52 @@ const createFormBuilderStorageOperations = params => {
     form: (0, _form.createFormEntity)({
       entityName: _types.ENTITIES.FORM,
       table,
-      attributes: attributes[_types.ENTITIES.FORM]
+      attributes: attributes ? attributes[_types.ENTITIES.FORM] : {}
     }),
     submission: (0, _submission.createSubmissionEntity)({
       entityName: _types.ENTITIES.SUBMISSION,
       table,
-      attributes: attributes[_types.ENTITIES.SUBMISSION]
+      attributes: attributes ? attributes[_types.ENTITIES.SUBMISSION] : {}
     }),
     system: (0, _system.createSystemEntity)({
       entityName: _types.ENTITIES.SYSTEM,
       table,
-      attributes: attributes[_types.ENTITIES.SYSTEM]
+      attributes: attributes ? attributes[_types.ENTITIES.SYSTEM] : {}
     }),
     settings: (0, _settings.createSettingsEntity)({
       entityName: _types.ENTITIES.SETTINGS,
       table,
-      attributes: attributes[_types.ENTITIES.SETTINGS]
+      attributes: attributes ? attributes[_types.ENTITIES.SETTINGS] : {}
     }),
-
     /**
      * Elasticsearch entities.
      */
     esForm: (0, _elasticsearch.createElasticsearchEntity)({
       entityName: _types.ENTITIES.ES_FORM,
       table: esTable,
-      attributes: attributes[_types.ENTITIES.ES_FORM]
+      attributes: attributes ? attributes[_types.ENTITIES.ES_FORM] : {}
     }),
     esSubmission: (0, _elasticsearch.createElasticsearchEntity)({
       entityName: _types.ENTITIES.ES_SUBMISSION,
       table: esTable,
-      attributes: attributes[_types.ENTITIES.ES_SUBMISSION]
+      attributes: attributes ? attributes[_types.ENTITIES.ES_SUBMISSION] : {}
     })
   };
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
-    init: async formBuilder => {
-      formBuilder.onAfterInstall.subscribe(async ({
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    init: async context => {
+      context.i18n.locales.onLocaleBeforeCreate.subscribe(async ({
+        locale,
         tenant
       }) => {
         await (0, _createElasticsearchIndex.createElasticsearchIndex)({
           elasticsearch,
-          tenant
+          plugins,
+          tenant,
+          locale: locale.code
         });
       });
     },
-    upgrade: (0, _.default)(),
+    upgrade: null,
     getTable: () => table,
     getEsTable: () => esTable,
     getEntities: () => entities
@@ -184,5 +158,4 @@ const createFormBuilderStorageOperations = params => {
     plugins
   }));
 };
-
 exports.createFormBuilderStorageOperations = createFormBuilderStorageOperations;

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["reservedFields","isReserved","name","includes","WebinyError","createFormBuilderStorageOperations","params","attributes","table","tableName","esTable","esTableName","documentClient","elasticsearch","plugins","userPlugins","Object","values","forEach","attrs","keys","PluginsContainer","submissionElasticsearchFields","formElasticsearchFields","dynamoDbValueFilters","getElasticsearchOperators","elasticsearchIndexPlugins","createTable","createElasticsearchTable","entities","form","createFormEntity","entityName","ENTITIES","FORM","submission","createSubmissionEntity","SUBMISSION","system","createSystemEntity","SYSTEM","settings","createSettingsEntity","SETTINGS","esForm","createElasticsearchEntity","ES_FORM","esSubmission","ES_SUBMISSION","init","context","i18n","locales","onLocaleBeforeCreate","subscribe","locale","tenant","createElasticsearchIndex","code","upgrade","getTable","getEsTable","getEntities","createSystemStorageOperations","entity","createSettingsStorageOperations","createFormStorageOperations","esEntity","createSubmissionStorageOperations"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport formElasticsearchFields from \"./operations/form/elasticsearchFields\";\nimport submissionElasticsearchFields from \"./operations/submission/elasticsearchFields\";\nimport WebinyError from \"@webiny/error\";\nimport { FormBuilderStorageOperationsFactory, ENTITIES } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createFormEntity } from \"~/definitions/form\";\nimport { createSubmissionEntity } from \"~/definitions/submission\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createSystemStorageOperations } from \"~/operations/system\";\nimport { createSubmissionStorageOperations } from \"~/operations/submission\";\nimport { createSettingsStorageOperations } from \"~/operations/settings\";\nimport { createFormStorageOperations } from \"~/operations/form\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createElasticsearchEntity } from \"~/definitions/elasticsearch\";\nimport { getElasticsearchOperators } from \"@webiny/api-elasticsearch\";\nimport { elasticsearchIndexPlugins } from \"~/elasticsearch/indices\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\n\nconst reservedFields = [\"PK\", \"SK\", \"index\", \"data\", \"TYPE\", \"__type\", \"GSI1_PK\", \"GSI1_SK\"];\n\nconst isReserved = (name: string): void => {\n    if (reservedFields.includes(name) === false) {\n        return;\n    }\n    throw new WebinyError(`Attribute name \"${name}\" is not allowed.`, \"ATTRIBUTE_NOT_ALLOWED\", {\n        name\n    });\n};\n\nexport const createFormBuilderStorageOperations: FormBuilderStorageOperationsFactory = params => {\n    const {\n        attributes,\n        table: tableName,\n        esTable: esTableName,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    if (attributes) {\n        Object.values(attributes).forEach(attrs => {\n            Object.keys(attrs).forEach(isReserved);\n        });\n    }\n\n    const plugins = new PluginsContainer([\n        /**\n         * User defined plugins.\n         */\n        userPlugins || [],\n        /**\n         * Elasticsearch field definitions for the submission record.\n         */\n        submissionElasticsearchFields(),\n        /**\n         * Elasticsearch field definitions for the form record.\n         */\n        formElasticsearchFields(),\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Built-in Elasticsearch index plugins\n         */\n        elasticsearchIndexPlugins()\n    ]);\n\n    const table = createTable({\n        tableName,\n        documentClient\n    });\n\n    const esTable = createElasticsearchTable({\n        tableName: esTableName,\n        documentClient\n    });\n\n    const entities = {\n        /**\n         * Regular entities.\n         */\n        form: createFormEntity({\n            entityName: ENTITIES.FORM,\n            table,\n            attributes: attributes ? attributes[ENTITIES.FORM] : {}\n        }),\n        submission: createSubmissionEntity({\n            entityName: ENTITIES.SUBMISSION,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SUBMISSION] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        /**\n         * Elasticsearch entities.\n         */\n        esForm: createElasticsearchEntity({\n            entityName: ENTITIES.ES_FORM,\n            table: esTable,\n            attributes: attributes ? attributes[ENTITIES.ES_FORM] : {}\n        }),\n        esSubmission: createElasticsearchEntity({\n            entityName: ENTITIES.ES_SUBMISSION,\n            table: esTable,\n            attributes: attributes ? attributes[ENTITIES.ES_SUBMISSION] : {}\n        })\n    };\n\n    return {\n        init: async context => {\n            context.i18n.locales.onLocaleBeforeCreate.subscribe(async ({ locale, tenant }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    plugins,\n                    tenant,\n                    locale: locale.code\n                });\n            });\n        },\n        upgrade: null,\n        getTable: () => table,\n        getEsTable: () => esTable,\n        getEntities: () => entities,\n        ...createSystemStorageOperations({\n            table,\n            entity: entities.system\n        }),\n        ...createSettingsStorageOperations({\n            table,\n            entity: entities.settings\n        }),\n        ...createFormStorageOperations({\n            elasticsearch,\n            table,\n            entity: entities.form,\n            esEntity: entities.esForm,\n            plugins\n        }),\n        ...createSubmissionStorageOperations({\n            elasticsearch,\n            table,\n            entity: entities.submission,\n            esEntity: entities.esSubmission,\n            plugins\n        })\n    };\n};\n"],"mappings":"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"}

package/operations/form/elasticsearchBody.js

@@ -1,42 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFormElasticType = exports.createElasticsearchBody = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _cursors = require("@webiny/api-elasticsearch/cursors");
-
-var _sort = require("@webiny/api-elasticsearch/sort");
-
-var _limit = require("@webiny/api-elasticsearch/limit");
-
-var _ElasticsearchQueryBuilderOperatorPlugin = require("@webiny/api-elasticsearch/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin");
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
 var _FormElasticsearchFieldPlugin = require("../../plugins/FormElasticsearchFieldPlugin");
-
 var _FormElasticsearchSortModifierPlugin = require("../../plugins/FormElasticsearchSortModifierPlugin");
-
 var _FormElasticsearchBodyModifierPlugin = require("../../plugins/FormElasticsearchBodyModifierPlugin");
-
 var _FormElasticsearchQueryModifierPlugin = require("../../plugins/FormElasticsearchQueryModifierPlugin");
-
-var _where = require("@webiny/api-elasticsearch/where");
-
-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 createFormElasticType = () => {
   return "fb.form";
 };
-
 exports.createFormElasticType = createFormElasticType;
-
 const createInitialQueryValue = () => {
   return {
     must: [
@@ -53,7 +31,6 @@ const createInitialQueryValue = () => {
     filter: []
   };
 };
-
 const createElasticsearchQuery = params => {
   const {
     plugins,
@@ -64,24 +41,16 @@ const createElasticsearchQuery = params => {
   /**
    * Be aware that, if having more registered operator plugins of same type, the last one will be used.
    */
-
-  const operatorPlugins = plugins.byType(_ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin.type).reduce((acc, plugin) => {
-    acc[plugin.getOperator()] = plugin;
-    return acc;
-  }, {});
-
-  const where = _objectSpread({}, initialWhere);
+  const operatorPlugins = (0, _apiElasticsearch.getElasticsearchOperatorPluginsByLocale)(plugins, initialWhere.locale);
+  const where = (0, _objectSpread2.default)({}, initialWhere);
   /**
    * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.
    *
    * When ES index is shared between tenants, we need to filter records by tenant ID.
    * No need for the tenant filtering otherwise as each index is for single tenant.
    */
-
-
   const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
-
-  if (sharedIndex) {
+  if (sharedIndex && where.tenant) {
     query.must.push({
       term: {
         "tenant.keyword": where.tenant
@@ -92,13 +61,10 @@ const createElasticsearchQuery = params => {
    * Remove tenant so it is not applied again later.
    * Possibly tenant is not defined, but just in case, remove it.
    */
-
-
   delete where.tenant;
   /**
    * Add the locale to filtering.
    */
-
   query.must.push({
     term: {
       "locale.keyword": where.locale
@@ -108,8 +74,7 @@ const createElasticsearchQuery = params => {
   /**
    * We apply other conditions as they are passed via the where value.
    */
-
-  (0, _where.applyWhere)({
+  (0, _apiElasticsearch.applyWhere)({
     query,
     where,
     fields: fieldPlugins,
@@ -117,7 +82,6 @@ const createElasticsearchQuery = params => {
   });
   return query;
 };
-
 const createElasticsearchBody = params => {
   const {
     plugins,
@@ -130,58 +94,50 @@ const createElasticsearchBody = params => {
     acc[plugin.field] = plugin;
     return acc;
   }, {});
-  const limit = (0, _limit.createLimit)(initialLimit, 100);
-  const query = createElasticsearchQuery(_objectSpread(_objectSpread({}, params), {}, {
+  const limit = (0, _apiElasticsearch.createLimit)(initialLimit, 100);
+  const query = createElasticsearchQuery((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
     fieldPlugins
   }));
-  const sort = (0, _sort.createSort)({
+  const sort = (0, _apiElasticsearch.createSort)({
     sort: initialSort,
     fieldPlugins
   });
   const queryModifiers = plugins.byType(_FormElasticsearchQueryModifierPlugin.FormElasticsearchQueryModifierPlugin.type);
-
   for (const plugin of queryModifiers) {
     plugin.modifyQuery({
       query,
       where
     });
   }
-
   const sortModifiers = plugins.byType(_FormElasticsearchSortModifierPlugin.FormElasticsearchSortModifierPlugin.type);
-
   for (const plugin of sortModifiers) {
     plugin.modifySort({
       sort
     });
   }
-
   const body = {
     query: {
       constant_score: {
         filter: {
-          bool: _objectSpread({}, query)
+          bool: (0, _objectSpread2.default)({}, query)
         }
       }
     },
     size: limit + 1,
-
     /**
      * Casting as any is required due to search_after is accepting an array of values.
      * Which is correct in some cases. In our case, it is not.
      * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html
      */
-    search_after: (0, _cursors.decodeCursor)(after),
+    search_after: (0, _apiElasticsearch.decodeCursor)(after),
     sort
   };
   const bodyModifiers = plugins.byType(_FormElasticsearchBodyModifierPlugin.FormElasticsearchBodyModifierPlugin.type);
-
   for (const plugin of bodyModifiers) {
     plugin.modifyBody({
       body
     });
   }
-
   return body;
 };
-
 exports.createElasticsearchBody = createElasticsearchBody;

package/operations/form/elasticsearchBody.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createFormElasticType","createInitialQueryValue","must","term","must_not","should","filter","createElasticsearchQuery","params","plugins","where","initialWhere","fieldPlugins","query","operatorPlugins","getElasticsearchOperatorPluginsByLocale","locale","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","push","applyWhere","fields","operators","createElasticsearchBody","limit","initialLimit","sort","initialSort","after","byType","FormElasticsearchFieldPlugin","type","reduce","acc","plugin","field","createLimit","createSort","queryModifiers","FormElasticsearchQueryModifierPlugin","modifyQuery","sortModifiers","FormElasticsearchSortModifierPlugin","modifySort","body","constant_score","bool","size","search_after","decodeCursor","bodyModifiers","FormElasticsearchBodyModifierPlugin","modifyBody"],"sources":["elasticsearchBody.ts"],"sourcesContent":["import { SearchBody as esSearchBody } from \"elastic-ts\";\nimport {\n    decodeCursor,\n    getElasticsearchOperatorPluginsByLocale,\n    applyWhere,\n    createLimit,\n    createSort\n} from \"@webiny/api-elasticsearch\";\nimport { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\nimport { FormElasticsearchSortModifierPlugin } from \"~/plugins/FormElasticsearchSortModifierPlugin\";\nimport { FormElasticsearchBodyModifierPlugin } from \"~/plugins/FormElasticsearchBodyModifierPlugin\";\nimport { FormBuilderStorageOperationsListFormsParams } from \"@webiny/api-form-builder/types\";\nimport { FormElasticsearchQueryModifierPlugin } from \"~/plugins/FormElasticsearchQueryModifierPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport const createFormElasticType = (): string => {\n    return \"fb.form\";\n};\n\nconst createInitialQueryValue = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [\n            /**\n             * We add the __type filtering in the initial query because it must be applied.\n             */\n            {\n                term: {\n                    \"__type.keyword\": createFormElasticType()\n                }\n            }\n        ],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface CreateElasticsearchQueryParams extends CreateElasticsearchBodyParams {\n    fieldPlugins: Record<string, FormElasticsearchFieldPlugin>;\n}\n\nconst createElasticsearchQuery = (params: CreateElasticsearchQueryParams) => {\n    const { plugins, where: initialWhere, fieldPlugins } = params;\n    const query = createInitialQueryValue();\n    /**\n     * Be aware that, if having more registered operator plugins of same type, the last one will be used.\n     */\n    const operatorPlugins = getElasticsearchOperatorPluginsByLocale(plugins, initialWhere.locale);\n\n    const where: Partial<FormBuilderStorageOperationsListFormsParams[\"where\"]> = {\n        ...initialWhere\n    };\n    /**\n     * !!! IMPORTANT !!! There are few specific cases where we hardcode the query conditions.\n     *\n     * When ES index is shared between tenants, we need to filter records by tenant ID.\n     * No need for the tenant filtering otherwise as each index is for single tenant.\n     */\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex && where.tenant) {\n        query.must.push({\n            term: {\n                \"tenant.keyword\": where.tenant\n            }\n        });\n    }\n    /**\n     * Remove tenant so it is not applied again later.\n     * Possibly tenant is not defined, but just in case, remove it.\n     */\n    delete where.tenant;\n    /**\n     * Add the locale to filtering.\n     */\n    query.must.push({\n        term: {\n            \"locale.keyword\": where.locale as string\n        }\n    });\n    delete where.locale;\n    /**\n     * We apply other conditions as they are passed via the where value.\n     */\n    applyWhere({\n        query,\n        where,\n        fields: fieldPlugins,\n        operators: operatorPlugins\n    });\n\n    return query;\n};\n\ninterface CreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    where: FormBuilderStorageOperationsListFormsParams[\"where\"];\n    limit: number;\n    after?: string;\n    sort: string[];\n}\n\nexport const createElasticsearchBody = (params: CreateElasticsearchBodyParams): esSearchBody => {\n    const { plugins, where, limit: initialLimit, sort: initialSort, after } = params;\n\n    const fieldPlugins = plugins\n        .byType<FormElasticsearchFieldPlugin>(FormElasticsearchFieldPlugin.type)\n        .reduce((acc, plugin) => {\n            acc[plugin.field] = plugin;\n            return acc;\n        }, {} as Record<string, FormElasticsearchFieldPlugin>);\n\n    const limit = createLimit(initialLimit, 100);\n\n    const query = createElasticsearchQuery({\n        ...params,\n        fieldPlugins\n    });\n\n    const sort = createSort({\n        sort: initialSort,\n        fieldPlugins\n    });\n\n    const queryModifiers = plugins.byType<FormElasticsearchQueryModifierPlugin>(\n        FormElasticsearchQueryModifierPlugin.type\n    );\n\n    for (const plugin of queryModifiers) {\n        plugin.modifyQuery({\n            query,\n            where\n        });\n    }\n\n    const sortModifiers = plugins.byType<FormElasticsearchSortModifierPlugin>(\n        FormElasticsearchSortModifierPlugin.type\n    );\n\n    for (const plugin of sortModifiers) {\n        plugin.modifySort({\n            sort\n        });\n    }\n\n    const body = {\n        query: {\n            constant_score: {\n                filter: {\n                    bool: {\n                        ...query\n                    }\n                }\n            }\n        },\n        size: limit + 1,\n        /**\n         * Casting as any is required due to search_after is accepting an array of values.\n         * Which is correct in some cases. In our case, it is not.\n         * https://www.elastic.co/guide/en/elasticsearch/reference/7.13/paginate-search-results.html\n         */\n        search_after: decodeCursor(after) as any,\n        sort\n    };\n\n    const bodyModifiers = plugins.byType<FormElasticsearchBodyModifierPlugin>(\n        FormElasticsearchBodyModifierPlugin.type\n    );\n\n    for (const plugin of bodyModifiers) {\n        plugin.modifyBody({\n            body\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}

package/operations/form/elasticsearchFields.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _FormElasticsearchFieldPlugin = require("../../plugins/FormElasticsearchFieldPlugin");
-
 var _default = () => [new _FormElasticsearchFieldPlugin.FormElasticsearchFieldPlugin({
   field: "createdOn",
   unmappedType: "date"
@@ -29,5 +27,4 @@ var _default = () => [new _FormElasticsearchFieldPlugin.FormElasticsearchFieldPl
 new _FormElasticsearchFieldPlugin.FormElasticsearchFieldPlugin({
   field: _FormElasticsearchFieldPlugin.FormElasticsearchFieldPlugin.ALL
 })];
-
 exports.default = _default;

package/operations/form/elasticsearchFields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FormElasticsearchFieldPlugin","field","unmappedType","path","ALL"],"sources":["elasticsearchFields.ts"],"sourcesContent":["import { FormElasticsearchFieldPlugin } from \"~/plugins/FormElasticsearchFieldPlugin\";\n\nexport default () => [\n    new FormElasticsearchFieldPlugin({\n        field: \"createdOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"savedOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"publishedOn\",\n        unmappedType: \"date\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"ownedBy\",\n        path: \"ownedBy.id\"\n    }),\n    new FormElasticsearchFieldPlugin({\n        field: \"createdBy\",\n        path: \"createdBy.id\"\n    }),\n    /**\n     * Always add the ALL fields plugin because of the keyword/path build.\n     */\n    new FormElasticsearchFieldPlugin({\n        field: FormElasticsearchFieldPlugin.ALL\n    })\n];\n"],"mappings":";;;;;;AAAA;AAAsF,eAEvE,MAAM,CACjB,IAAIA,0DAA4B,CAAC;EAC7BC,KAAK,EAAE,WAAW;EAClBC,YAAY,EAAE;AAClB,CAAC,CAAC,EACF,IAAIF,0DAA4B,CAAC;EAC7BC,KAAK,EAAE,SAAS;EAChBC,YAAY,EAAE;AAClB,CAAC,CAAC,EACF,IAAIF,0DAA4B,CAAC;EAC7BC,KAAK,EAAE,aAAa;EACpBC,YAAY,EAAE;AAClB,CAAC,CAAC,EACF,IAAIF,0DAA4B,CAAC;EAC7BC,KAAK,EAAE,SAAS;EAChBE,IAAI,EAAE;AACV,CAAC,CAAC,EACF,IAAIH,0DAA4B,CAAC;EAC7BC,KAAK,EAAE,WAAW;EAClBE,IAAI,EAAE;AACV,CAAC,CAAC;AACF;AACJ;AACA;AACI,IAAIH,0DAA4B,CAAC;EAC7BC,KAAK,EAAED,0DAA4B,CAACI;AACxC,CAAC,CAAC,CACL;AAAA"}

package/operations/form/fields.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _FormDynamoDbFieldPlugin = require("../../plugins/FormDynamoDbFieldPlugin");
-
 var _default = () => [new _FormDynamoDbFieldPlugin.FormDynamoDbFieldPlugin({
   field: "publishedOn",
   type: "date"
 })];
-
 exports.default = _default;

package/operations/form/fields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FormDynamoDbFieldPlugin","field","type"],"sources":["fields.ts"],"sourcesContent":["import { FormDynamoDbFieldPlugin } from \"~/plugins/FormDynamoDbFieldPlugin\";\n\nexport default () => [\n    new FormDynamoDbFieldPlugin({\n        field: \"publishedOn\",\n        type: \"date\"\n    })\n];\n"],"mappings":";;;;;;AAAA;AAA4E,eAE7D,MAAM,CACjB,IAAIA,gDAAuB,CAAC;EACxBC,KAAK,EAAE,aAAa;EACpBC,IAAI,EAAE;AACV,CAAC,CAAC,CACL;AAAA"}

package/operations/form/index.d.ts

@@ -7,11 +7,11 @@ export declare type DbRecord<T = any> = T & {
     SK: string;
     TYPE: string;
 };
-export interface Params {
+export interface CreateFormStorageOperationsParams {
     entity: Entity<any>;
     esEntity: Entity<any>;
     table: Table;
     elasticsearch: Client;
     plugins: PluginsContainer;
 }
-export declare const createFormStorageOperations: (params: Params) => FormBuilderFormStorageOperations;
+export declare const createFormStorageOperations: (params: CreateFormStorageOperationsParams) => FormBuilderFormStorageOperations;