@webiny/api-headless-cms-ddb-es 6.3.0 → 6.4.0-beta.1

package/operations/entry/dataLoaders.js

@@ -1,108 +1,90 @@
-import WebinyError from "@webiny/error";
+import error from "@webiny/error";
 import { DataLoaderCache } from "./dataLoader/DataLoaderCache.js";
 import { getDataLoaderFactory } from "./dataLoader/index.js";
 import { parseIdentifier } from "@webiny/utils";
-export class DataLoadersHandler {
-  cache = new DataLoaderCache();
-  constructor(params) {
-    this.entity = params.entity;
-  }
-  async getAllEntryRevisions(params) {
-    const ids = params.ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return entryId;
-    });
-    return await this.loadMany("getAllEntryRevisions", params, ids);
-  }
-  async getRevisionById(params) {
-    return await this.loadMany("getRevisionById", params, params.ids);
-  }
-  async getPublishedRevisionByEntryId(params) {
-    const ids = params.ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return entryId;
-    });
-    return await this.loadMany("getPublishedRevisionByEntryId", params, ids);
-  }
-  async getLatestRevisionByEntryId(params) {
-    const ids = params.ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return entryId;
-    });
-    return await this.loadMany("getLatestRevisionByEntryId", params, ids);
-  }
-
-  /**
-   * TODO @ts-refactor
-   * Maybe pass on the generics to DataLoader definition?
-   */
-  getLoader(name, params) {
-    const {
-      model
-    } = params;
-    const cacheParams = {
-      tenant: model.tenant,
-      modelId: model.modelId,
-      name
-    };
-    let loader = this.cache.getDataLoader(cacheParams);
-    if (loader) {
-      return loader;
+class DataLoadersHandler {
+    constructor(params){
+        this.cache = new DataLoaderCache();
+        this.entity = params.entity;
+    }
+    async getAllEntryRevisions(params) {
+        const ids = params.ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return entryId;
+        });
+        return await this.loadMany("getAllEntryRevisions", params, ids);
+    }
+    async getRevisionById(params) {
+        return await this.loadMany("getRevisionById", params, params.ids);
+    }
+    async getPublishedRevisionByEntryId(params) {
+        const ids = params.ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return entryId;
+        });
+        return await this.loadMany("getPublishedRevisionByEntryId", params, ids);
     }
-    const factory = getDataLoaderFactory(name);
-    loader = factory({
-      entity: this.entity,
-      tenant: model.tenant,
-      modelId: model.modelId
-    });
-    this.cache.setDataLoader(cacheParams, loader);
-    return loader;
-  }
-  async loadMany(loader, params, ids) {
-    let results = [];
-    try {
-      results = await this.getLoader(loader, params).loadMany(ids);
-      if (Array.isArray(results) === true) {
-        return results.reduce((acc, res) => {
-          if (Array.isArray(res) === false) {
-            if (res && res.message) {
-              throw new WebinyError(res.message, res.code, {
-                ...res,
-                data: JSON.stringify(res.data || {})
-              });
-            }
-            throw new WebinyError("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", {
-              ...params,
-              loader
+    async getLatestRevisionByEntryId(params) {
+        const ids = params.ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return entryId;
+        });
+        return await this.loadMany("getLatestRevisionByEntryId", params, ids);
+    }
+    getLoader(name, params) {
+        const { model } = params;
+        const cacheParams = {
+            tenant: model.tenant,
+            modelId: model.modelId,
+            name
+        };
+        let loader = this.cache.getDataLoader(cacheParams);
+        if (loader) return loader;
+        const factory = getDataLoaderFactory(name);
+        loader = factory({
+            entity: this.entity,
+            tenant: model.tenant,
+            modelId: model.modelId
+        });
+        this.cache.setDataLoader(cacheParams, loader);
+        return loader;
+    }
+    async loadMany(loader, params, ids) {
+        let results = [];
+        try {
+            results = await this.getLoader(loader, params).loadMany(ids);
+            if (true === Array.isArray(results)) return results.reduce((acc, res)=>{
+                if (false === Array.isArray(res)) {
+                    if (res && res.message) throw new error(res.message, res.code, {
+                        ...res,
+                        data: JSON.stringify(res.data || {})
+                    });
+                    throw new error("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", {
+                        ...params,
+                        loader
+                    });
+                }
+                acc.push(...res);
+                return acc;
+            }, []);
+        } catch (ex) {
+            throw new error(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
+                error: ex,
+                ...params,
+                loader,
+                ids
             });
-          }
-          acc.push(...res);
-          return acc;
-        }, []);
-      }
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
-        error: ex,
-        ...params,
-        loader,
-        ids
-      });
+        }
+        throw new error("Data loader did not return array of items or empty array.", "INVALID_DATA_LOADER_RESULT", {
+            loader,
+            ids,
+            results
+        });
+    }
+    clearAll(params) {
+        this.cache.clearAll(params?.model);
     }
-    throw new WebinyError(`Data loader did not return array of items or empty array.`, "INVALID_DATA_LOADER_RESULT", {
-      loader,
-      ids,
-      results
-    });
-  }
-  clearAll(params) {
-    this.cache.clearAll(params?.model);
-  }
 }
+export { DataLoadersHandler };
 
 //# sourceMappingURL=dataLoaders.js.map

package/operations/entry/dataLoaders.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","DataLoaderCache","getDataLoaderFactory","parseIdentifier","DataLoadersHandler","cache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","modelId","loader","getDataLoader","factory","setDataLoader","results","Array","isArray","reduce","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntryValues,\n    CmsModel,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader/index.js\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader/index.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler } from \"~/types.js\";\nimport type { IEntryEntity } from \"~/definitions/types.js\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\ninterface IDataLoadersHandlerParams {\n    entity: IEntryEntity;\n}\n\nexport interface ClearAllParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport class DataLoadersHandler implements IDataLoadersHandler {\n    private readonly entity;\n    private readonly cache = new DataLoaderCache();\n\n    public constructor(params: IDataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        return await this.loadMany<T>(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getLatestRevisionByEntryId\", params, ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: DataLoaders, params: GetLoaderParams): DataLoader<any, any> {\n        const { model } = params;\n        const cacheParams: CacheKeyParams = {\n            tenant: model.tenant,\n            modelId: model.modelId,\n            name\n        };\n        let loader = this.cache.getDataLoader(cacheParams);\n        if (loader) {\n            return loader;\n        }\n        const factory = getDataLoaderFactory(name);\n        loader = factory({\n            entity: this.entity,\n            tenant: model.tenant,\n            modelId: model.modelId\n        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany<T extends CmsEntryValues = CmsEntryValues>(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry<T>[]> {\n        let results: CmsStorageEntry<T>[] = [];\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce<CmsStorageEntry<T>[]>((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void {\n        this.cache.clearAll(params?.model);\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoaders.js","sources":["../../../src/operations/entry/dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntryValues,\n    CmsModel,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader/index.js\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader/index.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler } from \"~/types.js\";\nimport type { IEntryEntity } from \"~/definitions/types.js\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\ninterface IDataLoadersHandlerParams {\n    entity: IEntryEntity;\n}\n\nexport interface ClearAllParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport class DataLoadersHandler implements IDataLoadersHandler {\n    private readonly entity;\n    private readonly cache = new DataLoaderCache();\n\n    public constructor(params: IDataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        return await this.loadMany<T>(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getLatestRevisionByEntryId\", params, ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: DataLoaders, params: GetLoaderParams): DataLoader<any, any> {\n        const { model } = params;\n        const cacheParams: CacheKeyParams = {\n            tenant: model.tenant,\n            modelId: model.modelId,\n            name\n        };\n        let loader = this.cache.getDataLoader(cacheParams);\n        if (loader) {\n            return loader;\n        }\n        const factory = getDataLoaderFactory(name);\n        loader = factory({\n            entity: this.entity,\n            tenant: model.tenant,\n            modelId: model.modelId\n        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany<T extends CmsEntryValues = CmsEntryValues>(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry<T>[]> {\n        let results: CmsStorageEntry<T>[] = [];\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce<CmsStorageEntry<T>[]>((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void {\n        this.cache.clearAll(params?.model);\n    }\n}\n"],"names":["DataLoadersHandler","params","DataLoaderCache","ids","id","entryId","parseIdentifier","name","model","cacheParams","loader","factory","getDataLoaderFactory","results","Array","acc","res","WebinyError","JSON","ex"],"mappings":"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"}

package/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js

@@ -1,27 +1,9 @@
-/**
- * This function will assign a minimum_should_match for the query if conditions are met:
- * * should is an array
- * * it is not empty
- * * minimum_should_match is not already set
- *
- *
- * By the default we set it to 1 as we want at least one OR condition to produce results.
- *
- * Users can modify minimum_should_match value via the body or query modification plugins.
- */
-
-export const assignMinimumShouldMatchToQuery = ({
-  query,
-  value = 1
-}) => {
-  if (!Array.isArray(query.should)) {
-    return;
-  } else if (query.should.length === 0) {
-    return;
-  } else if (query.minimum_should_match) {
-    return;
-  }
-  query.minimum_should_match = value > 0 ? value : 1;
+const assignMinimumShouldMatchToQuery = ({ query, value = 1 })=>{
+    if (!Array.isArray(query.should)) return;
+    if (0 === query.should.length) return;
+    if (query.minimum_should_match) return;
+    query.minimum_should_match = value > 0 ? value : 1;
 };
+export { assignMinimumShouldMatchToQuery };
 
 //# sourceMappingURL=assignMinimumShouldMatchToQuery.js.map

package/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js.map

@@ -1 +1 @@
-{"version":3,"names":["assignMinimumShouldMatchToQuery","query","value","Array","isArray","should","length","minimum_should_match"],"sources":["assignMinimumShouldMatchToQuery.ts"],"sourcesContent":["import type { QueryDslBoolQuery as BoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\n\n/**\n * This function will assign a minimum_should_match for the query if conditions are met:\n * * should is an array\n * * it is not empty\n * * minimum_should_match is not already set\n *\n *\n * By the default we set it to 1 as we want at least one OR condition to produce results.\n *\n * Users can modify minimum_should_match value via the body or query modification plugins.\n */\ninterface Params {\n    query: BoolQueryConfig;\n    value?: number;\n}\nexport const assignMinimumShouldMatchToQuery = ({ query, value = 1 }: Params): void => {\n    if (!Array.isArray(query.should)) {\n        return;\n    } else if (query.should.length === 0) {\n        return;\n    } else if (query.minimum_should_match) {\n        return;\n    }\n    query.minimum_should_match = value > 0 ? value : 1;\n};\n"],"mappings":"AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA,OAAO,MAAMA,+BAA+B,GAAGA,CAAC;EAAEC,KAAK;EAAEC,KAAK,GAAG;AAAU,CAAC,KAAW;EACnF,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,KAAK,CAACI,MAAM,CAAC,EAAE;IAC9B;EACJ,CAAC,MAAM,IAAIJ,KAAK,CAACI,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAClC;EACJ,CAAC,MAAM,IAAIL,KAAK,CAACM,oBAAoB,EAAE;IACnC;EACJ;EACAN,KAAK,CAACM,oBAAoB,GAAGL,KAAK,GAAG,CAAC,GAAGA,KAAK,GAAG,CAAC;AACtD,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js","sources":["../../../../src/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.ts"],"sourcesContent":["import type { QueryDslBoolQuery as BoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\n\n/**\n * This function will assign a minimum_should_match for the query if conditions are met:\n * * should is an array\n * * it is not empty\n * * minimum_should_match is not already set\n *\n *\n * By the default we set it to 1 as we want at least one OR condition to produce results.\n *\n * Users can modify minimum_should_match value via the body or query modification plugins.\n */\ninterface Params {\n    query: BoolQueryConfig;\n    value?: number;\n}\nexport const assignMinimumShouldMatchToQuery = ({ query, value = 1 }: Params): void => {\n    if (!Array.isArray(query.should)) {\n        return;\n    } else if (query.should.length === 0) {\n        return;\n    } else if (query.minimum_should_match) {\n        return;\n    }\n    query.minimum_should_match = value > 0 ? value : 1;\n};\n"],"names":["assignMinimumShouldMatchToQuery","query","value","Array"],"mappings":"AAiBO,MAAMA,kCAAkC,CAAC,EAAEC,KAAK,EAAEC,QAAQ,CAAC,EAAU;IACxE,IAAI,CAACC,MAAM,OAAO,CAACF,MAAM,MAAM,GAC3B;IACG,IAAIA,AAAwB,MAAxBA,MAAM,MAAM,CAAC,MAAM,EAC1B;IACG,IAAIA,MAAM,oBAAoB,EACjC;IAEJA,MAAM,oBAAoB,GAAGC,QAAQ,IAAIA,QAAQ;AACrD"}

package/operations/entry/elasticsearch/body.js

@@ -5,134 +5,83 @@ import { applyFullTextSearch } from "./fullTextSearch.js";
 import { createElasticsearchSort } from "./sort.js";
 import { createExecFiltering } from "./filtering/index.js";
 import { assignMinimumShouldMatchToQuery } from "./assignMinimumShouldMatchToQuery.js";
-export const createElasticsearchBody = ({
-  plugins,
-  model,
-  params,
-  fieldRegistry,
-  fieldIndexRegistry,
-  bodyModifiers,
-  sortModifiers,
-  queryModifiers,
-  valueSearchRegistry,
-  fullTextSearches,
-  filterRegistry
-}) => {
-  const {
-    fields,
-    search: term,
-    where,
-    sort: initialSort,
-    after,
-    limit
-  } = params;
-  /**
-   * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.
-   */
-  const modelFields = createModelFields({
-    model,
-    fieldRegistry,
-    fieldIndexRegistry
-  });
-
-  /**
-   * Filter query modifiers applicable to this model.
-   */
-  const applicableQueryModifiers = queryModifiers.filter(m => {
-    return !m.modelId || m.modelId === model.modelId;
-  });
-  /**
-   * Filter sort modifiers applicable to this model.
-   */
-  const applicableSortModifiers = sortModifiers.filter(m => !m.modelId || m.modelId === model.modelId);
-  /**
-   * Filter body modifiers applicable to this model.
-   */
-  const applicableBodyModifiers = bodyModifiers.filter(m => {
-    return !m.modelId || m.modelId === model.modelId;
-  });
-  /**
-   * We need the fields which we can search through via the full text search.
-   *
-   */
-  const fullTextSearchFields = createFullTextSearchFields({
-    fields: modelFields,
-    term,
-    targets: fields
-  });
-  /**
-   * The initial elasticsearch query where we attach some default conditions we always need.
-   */
-  const query = createInitialQuery({
-    where,
-    model
-  });
-  /**
-   * Apply the full text search, if term is set.
-   */
-  applyFullTextSearch({
-    model,
-    fullTextSearches,
-    query,
-    term,
-    fields: fullTextSearchFields
-  });
-  const execFiltering = createExecFiltering({
-    model,
-    fields: modelFields,
-    plugins,
-    valueSearchRegistry,
-    filterRegistry
-  });
-  execFiltering({
-    where,
-    query
-  });
-  for (const modifier of applicableQueryModifiers) {
-    modifier.modifyQuery({
-      query,
-      model,
-      where
+const createElasticsearchBody = ({ plugins, model, params, fieldRegistry, fieldIndexRegistry, bodyModifiers, sortModifiers, queryModifiers, valueSearchRegistry, fullTextSearches, filterRegistry })=>{
+    const { fields, search: term, where, sort: initialSort, after, limit } = params;
+    const modelFields = createModelFields({
+        model,
+        fieldRegistry,
+        fieldIndexRegistry
+    });
+    const applicableQueryModifiers = queryModifiers.filter((m)=>!m.modelId || m.modelId === model.modelId);
+    const applicableSortModifiers = sortModifiers.filter((m)=>!m.modelId || m.modelId === model.modelId);
+    const applicableBodyModifiers = bodyModifiers.filter((m)=>!m.modelId || m.modelId === model.modelId);
+    const fullTextSearchFields = createFullTextSearchFields({
+        fields: modelFields,
+        term,
+        targets: fields
+    });
+    const query = createInitialQuery({
+        where,
+        model
+    });
+    applyFullTextSearch({
+        model,
+        fullTextSearches,
+        query,
+        term,
+        fields: fullTextSearchFields
+    });
+    const execFiltering = createExecFiltering({
+        model,
+        fields: modelFields,
+        plugins,
+        valueSearchRegistry,
+        filterRegistry
+    });
+    execFiltering({
+        where,
+        query
+    });
+    for (const modifier of applicableQueryModifiers)modifier.modifyQuery({
+        query,
+        model,
+        where
+    });
+    const sort = createElasticsearchSort({
+        sort: initialSort,
+        modelFields,
+        model,
+        valueSearchRegistry
+    });
+    for (const modifier of applicableSortModifiers)modifier.modifySort({
+        sort,
+        model
     });
-  }
-  const sort = createElasticsearchSort({
-    sort: initialSort,
-    modelFields,
-    model,
-    valueSearchRegistry
-  });
-  for (const modifier of applicableSortModifiers) {
-    modifier.modifySort({
-      sort,
-      model
+    const boolQuery = {
+        must: query.must.length > 0 ? query.must : void 0,
+        must_not: query.must_not.length > 0 ? query.must_not : void 0,
+        should: query.should.length > 0 ? query.should : void 0,
+        filter: query.filter.length > 0 ? query.filter : void 0
+    };
+    assignMinimumShouldMatchToQuery({
+        query: boolQuery
     });
-  }
-  const boolQuery = {
-    must: query.must.length > 0 ? query.must : undefined,
-    must_not: query.must_not.length > 0 ? query.must_not : undefined,
-    should: query.should.length > 0 ? query.should : undefined,
-    filter: query.filter.length > 0 ? query.filter : undefined
-  };
-  assignMinimumShouldMatchToQuery({
-    query: boolQuery
-  });
-  const body = {
-    query: {
-      bool: boolQuery
-    },
-    sort,
-    size: (limit || 0) + 1,
-    search_after: after,
-    track_total_hits: true
-  };
-  for (const modifier of applicableBodyModifiers) {
-    modifier.modifyBody({
-      body,
-      model,
-      where
+    const body = {
+        query: {
+            bool: boolQuery
+        },
+        sort,
+        size: (limit || 0) + 1,
+        search_after: after,
+        track_total_hits: true
+    };
+    for (const modifier of applicableBodyModifiers)modifier.modifyBody({
+        body,
+        model,
+        where
     });
-  }
-  return body;
+    return body;
 };
+export { createElasticsearchBody };
 
 //# sourceMappingURL=body.js.map

package/operations/entry/elasticsearch/body.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelFields","createFullTextSearchFields","createInitialQuery","applyFullTextSearch","createElasticsearchSort","createExecFiltering","assignMinimumShouldMatchToQuery","createElasticsearchBody","plugins","model","params","fieldRegistry","fieldIndexRegistry","bodyModifiers","sortModifiers","queryModifiers","valueSearchRegistry","fullTextSearches","filterRegistry","fields","search","term","where","sort","initialSort","after","limit","modelFields","applicableQueryModifiers","filter","m","modelId","applicableSortModifiers","applicableBodyModifiers","fullTextSearchFields","targets","query","execFiltering","modifier","modifyQuery","modifySort","boolQuery","must","length","undefined","must_not","should","body","bool","size","search_after","track_total_hits","modifyBody"],"sources":["body.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelFields } from \"./fields.js\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields.js\";\nimport { createInitialQuery } from \"./initialQuery.js\";\nimport { applyFullTextSearch } from \"./fullTextSearch.js\";\nimport type { CmsEntryOpenSearchBodyModifier } from \"~/features/CmsEntryOpenSearchBodyModifier/index.js\";\nimport type { CmsEntryOpenSearchSortModifier } from \"~/features/CmsEntryOpenSearchSortModifier/index.js\";\nimport type { CmsEntryOpenSearchQueryModifier } from \"~/features/CmsEntryOpenSearchQueryModifier/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport type {\n    PrimitiveValue,\n    QueryDslBoolQuery as BoolQueryConfig,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { createExecFiltering } from \"./filtering/index.js\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\ninterface ICreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];\n    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];\n    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({\n    plugins,\n    model,\n    params,\n    fieldRegistry,\n    fieldIndexRegistry,\n    bodyModifiers,\n    sortModifiers,\n    queryModifiers,\n    valueSearchRegistry,\n    fullTextSearches,\n    filterRegistry\n}: ICreateElasticsearchBodyParams): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        model,\n        fieldRegistry,\n        fieldIndexRegistry\n    });\n\n    /**\n     * Filter query modifiers applicable to this model.\n     */\n    const applicableQueryModifiers = queryModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * Filter sort modifiers applicable to this model.\n     */\n    const applicableSortModifiers = sortModifiers.filter(\n        m => !m.modelId || m.modelId === model.modelId\n    );\n    /**\n     * Filter body modifiers applicable to this model.\n     */\n    const applicableBodyModifiers = bodyModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        fields: modelFields,\n        term,\n        targets: fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        model,\n        fullTextSearches,\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins,\n        valueSearchRegistry,\n        filterRegistry\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const modifier of applicableQueryModifiers) {\n        modifier.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        sort: initialSort,\n        modelFields,\n        model,\n        valueSearchRegistry\n    });\n\n    for (const modifier of applicableSortModifiers) {\n        modifier.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const modifier of applicableBodyModifiers) {\n        modifier.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/body.js","sources":["../../../../src/operations/entry/elasticsearch/body.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelFields } from \"./fields.js\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields.js\";\nimport { createInitialQuery } from \"./initialQuery.js\";\nimport { applyFullTextSearch } from \"./fullTextSearch.js\";\nimport type { CmsEntryOpenSearchBodyModifier } from \"~/features/CmsEntryOpenSearchBodyModifier/index.js\";\nimport type { CmsEntryOpenSearchSortModifier } from \"~/features/CmsEntryOpenSearchSortModifier/index.js\";\nimport type { CmsEntryOpenSearchQueryModifier } from \"~/features/CmsEntryOpenSearchQueryModifier/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport type {\n    PrimitiveValue,\n    QueryDslBoolQuery as BoolQueryConfig,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { createExecFiltering } from \"./filtering/index.js\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\ninterface ICreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];\n    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];\n    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({\n    plugins,\n    model,\n    params,\n    fieldRegistry,\n    fieldIndexRegistry,\n    bodyModifiers,\n    sortModifiers,\n    queryModifiers,\n    valueSearchRegistry,\n    fullTextSearches,\n    filterRegistry\n}: ICreateElasticsearchBodyParams): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        model,\n        fieldRegistry,\n        fieldIndexRegistry\n    });\n\n    /**\n     * Filter query modifiers applicable to this model.\n     */\n    const applicableQueryModifiers = queryModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * Filter sort modifiers applicable to this model.\n     */\n    const applicableSortModifiers = sortModifiers.filter(\n        m => !m.modelId || m.modelId === model.modelId\n    );\n    /**\n     * Filter body modifiers applicable to this model.\n     */\n    const applicableBodyModifiers = bodyModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        fields: modelFields,\n        term,\n        targets: fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        model,\n        fullTextSearches,\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins,\n        valueSearchRegistry,\n        filterRegistry\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const modifier of applicableQueryModifiers) {\n        modifier.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        sort: initialSort,\n        modelFields,\n        model,\n        valueSearchRegistry\n    });\n\n    for (const modifier of applicableSortModifiers) {\n        modifier.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const modifier of applicableBodyModifiers) {\n        modifier.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"names":["createElasticsearchBody","plugins","model","params","fieldRegistry","fieldIndexRegistry","bodyModifiers","sortModifiers","queryModifiers","valueSearchRegistry","fullTextSearches","filterRegistry","fields","term","where","initialSort","after","limit","modelFields","createModelFields","applicableQueryModifiers","m","applicableSortModifiers","applicableBodyModifiers","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","execFiltering","createExecFiltering","modifier","sort","createElasticsearchSort","boolQuery","undefined","assignMinimumShouldMatchToQuery","body"],"mappings":";;;;;;;AA2CO,MAAMA,0BAA0B,CAAC,EACpCC,OAAO,EACPC,KAAK,EACLC,MAAM,EACNC,aAAa,EACbC,kBAAkB,EAClBC,aAAa,EACbC,aAAa,EACbC,cAAc,EACdC,mBAAmB,EACnBC,gBAAgB,EAChBC,cAAc,EACe;IAC7B,MAAM,EAAEC,MAAM,EAAE,QAAQC,IAAI,EAAEC,KAAK,EAAE,MAAMC,WAAW,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGd;IAIzE,MAAMe,cAAcC,kBAAkB;QAClCjB;QACAE;QACAC;IACJ;IAKA,MAAMe,2BAA2BZ,eAAe,MAAM,CAACa,CAAAA,IAC5C,CAACA,EAAE,OAAO,IAAIA,EAAE,OAAO,KAAKnB,MAAM,OAAO;IAKpD,MAAMoB,0BAA0Bf,cAAc,MAAM,CAChDc,CAAAA,IAAK,CAACA,EAAE,OAAO,IAAIA,EAAE,OAAO,KAAKnB,MAAM,OAAO;IAKlD,MAAMqB,0BAA0BjB,cAAc,MAAM,CAACe,CAAAA,IAC1C,CAACA,EAAE,OAAO,IAAIA,EAAE,OAAO,KAAKnB,MAAM,OAAO;IAMpD,MAAMsB,uBAAuBC,2BAA2B;QACpD,QAAQP;QACRL;QACA,SAASD;IACb;IAIA,MAAMc,QAAQC,mBAAmB;QAC7Bb;QACAZ;IACJ;IAIA0B,oBAAoB;QAChB1B;QACAQ;QACAgB;QACAb;QACA,QAAQW;IACZ;IAEA,MAAMK,gBAAgBC,oBAAoB;QACtC5B;QACA,QAAQgB;QACRjB;QACAQ;QACAE;IACJ;IAEAkB,cAAc;QACVf;QACAY;IACJ;IAEA,KAAK,MAAMK,YAAYX,yBACnBW,SAAS,WAAW,CAAC;QAAEL;QAAOxB;QAAOY;IAAM;IAG/C,MAAMkB,OAAOC,wBAAwB;QACjC,MAAMlB;QACNG;QACAhB;QACAO;IACJ;IAEA,KAAK,MAAMsB,YAAYT,wBACnBS,SAAS,UAAU,CAAC;QAChBC;QACA9B;IACJ;IAGJ,MAAMgC,YAA6B;QAC/B,MAAMR,MAAM,IAAI,CAAC,MAAM,GAAG,IAAIA,MAAM,IAAI,GAAGS;QAC3C,UAAUT,MAAM,QAAQ,CAAC,MAAM,GAAG,IAAIA,MAAM,QAAQ,GAAGS;QACvD,QAAQT,MAAM,MAAM,CAAC,MAAM,GAAG,IAAIA,MAAM,MAAM,GAAGS;QACjD,QAAQT,MAAM,MAAM,CAAC,MAAM,GAAG,IAAIA,MAAM,MAAM,GAAGS;IACrD;IAEAC,gCAAgC;QAC5B,OAAOF;IACX;IAEA,MAAMG,OAAmB;QACrB,OAAO;YACH,MAAMH;QACV;QACAF;QACA,MAAOf,AAAAA,CAAAA,SAAS,KAAK;QACrB,cAAcD;QACd,kBAAkB;IACtB;IAEA,KAAK,MAAMe,YAAYR,wBACnBQ,SAAS,UAAU,CAAC;QAChBM;QACAnC;QACAY;IACJ;IAGJ,OAAOuB;AACX"}

package/operations/entry/elasticsearch/fields/createSystemField.js

@@ -1,10 +1,9 @@
 import { createModelField } from "@webiny/api-headless-cms";
-export const createSystemField = field => {
-  return createModelField({
-    ...field,
-    id: field.fieldId,
-    label: field.fieldId
-  });
-};
+const createSystemField = (field)=>createModelField({
+        ...field,
+        id: field.fieldId,
+        label: field.fieldId
+    });
+export { createSystemField };
 
 //# sourceMappingURL=createSystemField.js.map

package/operations/entry/elasticsearch/fields/createSystemField.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelField","createSystemField","field","id","fieldId","label"],"sources":["createSystemField.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelField } from \"@webiny/api-headless-cms\";\n\ntype PartialCmsModelField = Partial<CmsModelField> &\n    Pick<CmsModelField, \"storageId\" | \"fieldId\" | \"type\">;\nexport const createSystemField = (field: PartialCmsModelField): CmsModelField => {\n    return createModelField({\n        ...field,\n        id: field.fieldId,\n        label: field.fieldId\n    });\n};\n"],"mappings":"AACA,SAASA,gBAAgB,QAAQ,0BAA0B;AAI3D,OAAO,MAAMC,iBAAiB,GAAIC,KAA2B,IAAoB;EAC7E,OAAOF,gBAAgB,CAAC;IACpB,GAAGE,KAAK;IACRC,EAAE,EAAED,KAAK,CAACE,OAAO;IACjBC,KAAK,EAAEH,KAAK,CAACE;EACjB,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/fields/createSystemField.js","sources":["../../../../../src/operations/entry/elasticsearch/fields/createSystemField.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelField } from \"@webiny/api-headless-cms\";\n\ntype PartialCmsModelField = Partial<CmsModelField> &\n    Pick<CmsModelField, \"storageId\" | \"fieldId\" | \"type\">;\nexport const createSystemField = (field: PartialCmsModelField): CmsModelField => {\n    return createModelField({\n        ...field,\n        id: field.fieldId,\n        label: field.fieldId\n    });\n};\n"],"names":["createSystemField","field","createModelField"],"mappings":";AAKO,MAAMA,oBAAoB,CAACC,QACvBC,iBAAiB;QACpB,GAAGD,KAAK;QACR,IAAIA,MAAM,OAAO;QACjB,OAAOA,MAAM,OAAO;IACxB"}