@webiny/api-headless-cms-ddb-es 6.0.0-alpha.5 → 6.0.0-rc.0

package/operations/entry/transformations/transformEntryToIndex.js

@@ -1,18 +1,12 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.transformEntryToIndex = void 0;
-var _helpers = require("../../../helpers");
-const transformEntryToIndex = params => {
+import { prepareEntryToIndex } from "../../../helpers/index.js";
+export const transformEntryToIndex = params => {
   const {
     plugins,
     model,
     entry,
     storageEntry
   } = params;
-  const result = (0, _helpers.prepareEntryToIndex)({
+  const result = prepareEntryToIndex({
     plugins,
     model,
     entry: structuredClone(entry),
@@ -26,6 +20,5 @@ const transformEntryToIndex = params => {
   delete result["latest"];
   return result;
 };
-exports.transformEntryToIndex = transformEntryToIndex;
 
 //# sourceMappingURL=transformEntryToIndex.js.map

package/operations/entry/transformations/transformEntryToIndex.js.map

@@ -1 +1 @@
-{"version":3,"names":["_helpers","require","transformEntryToIndex","params","plugins","model","entry","storageEntry","result","prepareEntryToIndex","structuredClone","exports"],"sources":["transformEntryToIndex.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntry,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types\";\nimport { prepareEntryToIndex } from \"~/helpers\";\n\ninterface TransformEntryToIndexParams {\n    plugins: PluginsContainer;\n    model: StorageOperationsCmsModel;\n    entry: CmsEntry;\n    storageEntry: CmsStorageEntry;\n}\n\nexport const transformEntryToIndex = (params: TransformEntryToIndexParams) => {\n    const { plugins, model, entry, storageEntry } = params;\n    const result = prepareEntryToIndex({\n        plugins,\n        model,\n        entry: structuredClone(entry),\n        storageEntry: structuredClone(storageEntry)\n    });\n\n    delete result[\"PK\"];\n    delete result[\"SK\"];\n    delete result[\"GSI1_PK\"];\n    delete result[\"GSI1_SK\"];\n    delete result[\"published\"];\n    delete result[\"latest\"];\n\n    return result;\n};\n"],"mappings":";;;;;;AAMA,IAAAA,QAAA,GAAAC,OAAA;AASO,MAAMC,qBAAqB,GAAIC,MAAmC,IAAK;EAC1E,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,KAAK;IAAEC;EAAa,CAAC,GAAGJ,MAAM;EACtD,MAAMK,MAAM,GAAG,IAAAC,4BAAmB,EAAC;IAC/BL,OAAO;IACPC,KAAK;IACLC,KAAK,EAAEI,eAAe,CAACJ,KAAK,CAAC;IAC7BC,YAAY,EAAEG,eAAe,CAACH,YAAY;EAC9C,CAAC,CAAC;EAEF,OAAOC,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,WAAW,CAAC;EAC1B,OAAOA,MAAM,CAAC,QAAQ,CAAC;EAEvB,OAAOA,MAAM;AACjB,CAAC;AAACG,OAAA,CAAAT,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["prepareEntryToIndex","transformEntryToIndex","params","plugins","model","entry","storageEntry","result","structuredClone"],"sources":["transformEntryToIndex.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { prepareEntryToIndex } from \"~/helpers/index.js\";\n\ninterface TransformEntryToIndexParams<T extends CmsEntryValues = CmsEntryValues> {\n    plugins: PluginsContainer;\n    model: StorageOperationsCmsModel<T>;\n    entry: CmsEntry<T>;\n    storageEntry: CmsStorageEntry<T>;\n}\n\nexport const transformEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: TransformEntryToIndexParams<T>\n) => {\n    const { plugins, model, entry, storageEntry } = params;\n    const result = prepareEntryToIndex<T>({\n        plugins,\n        model,\n        entry: structuredClone(entry),\n        storageEntry: structuredClone(storageEntry)\n    });\n\n    delete result[\"PK\"];\n    delete result[\"SK\"];\n    delete result[\"GSI1_PK\"];\n    delete result[\"GSI1_SK\"];\n    delete result[\"published\"];\n    delete result[\"latest\"];\n\n    return result;\n};\n"],"mappings":"AAOA,SAASA,mBAAmB;AAS5B,OAAO,MAAMC,qBAAqB,GAC9BC,MAAsC,IACrC;EACD,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,KAAK;IAAEC;EAAa,CAAC,GAAGJ,MAAM;EACtD,MAAMK,MAAM,GAAGP,mBAAmB,CAAI;IAClCG,OAAO;IACPC,KAAK;IACLC,KAAK,EAAEG,eAAe,CAACH,KAAK,CAAC;IAC7BC,YAAY,EAAEE,eAAe,CAACF,YAAY;EAC9C,CAAC,CAAC;EAEF,OAAOC,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,WAAW,CAAC;EAC1B,OAAOA,MAAM,CAAC,QAAQ,CAAC;EAEvB,OAAOA,MAAM;AACjB,CAAC","ignoreList":[]}

package/operations/group/index.d.ts

@@ -1,8 +1,9 @@
-import type { CmsGroupStorageOperations } from "@webiny/api-headless-cms/types";
-import type { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { CmsGroupStorageOperations } from "@webiny/api-headless-cms/types/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
-export interface CreateGroupsStorageOperationsParams {
-    entity: Entity<any>;
+import { IGroupEntity } from "../../definitions/types.js";
+interface CreateGroupsStorageOperationsParams {
+    entity: IGroupEntity;
     plugins: PluginsContainer;
 }
 export declare const createGroupsStorageOperations: (params: CreateGroupsStorageOperationsParams) => CmsGroupStorageOperations;
+export {};

package/operations/group/index.js

@@ -1,23 +1,10 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGroupsStorageOperations = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _get = require("@webiny/db-dynamodb/utils/get");
-var _query = require("@webiny/db-dynamodb/utils/query");
-var _filter = require("@webiny/db-dynamodb/utils/filter");
-var _ValueFilterPlugin = require("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin");
-var _sort = require("@webiny/db-dynamodb/utils/sort");
-var _dbDynamodb = require("@webiny/db-dynamodb");
+import WebinyError from "@webiny/error";
+import { filterItems, sortItems, ValueFilterPlugin } from "@webiny/db-dynamodb";
 const createPartitionKey = params => {
   const {
-    tenant,
-    locale
+    tenant
   } = params;
-  return `T#${tenant}#L#${locale}#CMS#CMG`;
+  return `T#${tenant}#CMS#CMG`;
 };
 const createSortKeys = params => {
   const {
@@ -28,20 +15,21 @@ const createSortKeys = params => {
 const createKeys = params => {
   return {
     PK: createPartitionKey(params),
-    SK: createSortKeys(params)
+    SK: createSortKeys(params),
+    GSI_TENANT: params.tenant
   };
 };
 const createType = () => {
   return "cms.group";
 };
-const createGroupsStorageOperations = params => {
+export const createGroupsStorageOperations = params => {
   const {
     entity,
     plugins
   } = params;
-  const filteringPlugins = plugins.byType(_ValueFilterPlugin.ValueFilterPlugin.type);
+  const filteringPlugins = plugins.byType(ValueFilterPlugin.type);
   if (filteringPlugins.length === 0) {
-    throw new _error.default("DynamoDB filtering plugins not loaded.", "MISSING_DYNAMODB_FILTERING_PLUGINS");
+    throw new WebinyError("DynamoDB filtering plugins not loaded.", "MISSING_DYNAMODB_FILTERING_PLUGINS");
   }
   const create = async params => {
     const {
@@ -49,17 +37,13 @@ const createGroupsStorageOperations = params => {
     } = params;
     const keys = createKeys(group);
     try {
-      await (0, _dbDynamodb.put)({
-        entity,
-        item: {
-          ...group,
-          TYPE: createType(),
-          ...keys
-        }
+      await entity.put({
+        data: group,
+        TYPE: createType(),
+        ...keys
       });
-      return group;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not create group.", ex.code || "CREATE_GROUP_ERROR", {
+      throw new WebinyError(ex.message || "Could not create group.", ex.code || "CREATE_GROUP_ERROR", {
         error: ex,
         group,
         keys
@@ -72,17 +56,13 @@ const createGroupsStorageOperations = params => {
     } = params;
     const keys = createKeys(group);
     try {
-      await (0, _dbDynamodb.put)({
-        entity,
-        item: {
-          ...group,
-          TYPE: createType(),
-          ...keys
-        }
+      await entity.put({
+        data: group,
+        TYPE: createType(),
+        ...keys
       });
-      return group;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not update group.", ex.code || "UPDATE_GROUP_ERROR", {
+      throw new WebinyError(ex.message || "Could not update group.", ex.code || "UPDATE_GROUP_ERROR", {
         error: ex,
         group,
         keys
@@ -95,13 +75,9 @@ const createGroupsStorageOperations = params => {
     } = params;
     const keys = createKeys(group);
     try {
-      await (0, _dbDynamodb.deleteItem)({
-        entity,
-        keys
-      });
-      return group;
+      await entity.delete(keys);
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not delete group.", ex.code || "DELETE_GROUP_ERROR", {
+      throw new WebinyError(ex.message || "Could not delete group.", ex.code || "DELETE_GROUP_ERROR", {
         error: ex,
         group,
         keys
@@ -111,12 +87,10 @@ const createGroupsStorageOperations = params => {
   const get = async params => {
     const keys = createKeys(params);
     try {
-      return await (0, _get.getClean)({
-        entity,
-        keys
-      });
+      const result = await entity.get(keys);
+      return result ? result.data : null;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not get group.", ex.code || "GET_GROUP_ERROR", {
+      throw new WebinyError(ex.message || "Could not get group.", ex.code || "GET_GROUP_ERROR", {
         error: ex,
         ...params,
         keys
@@ -126,44 +100,37 @@ const createGroupsStorageOperations = params => {
   const list = async params => {
     const {
       sort,
-      where: initialWhere
+      where
     } = params;
-    const queryAllParams = {
-      entity,
-      partitionKey: createPartitionKey(initialWhere),
-      options: {
-        gte: " "
-      }
-    };
     let records = [];
     try {
-      records = await (0, _query.queryAll)(queryAllParams);
+      const ddbRecords = await entity.queryAll({
+        partitionKey: createPartitionKey(where),
+        options: {
+          gte: " "
+        }
+      });
+      records = ddbRecords.map(item => item.data);
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not list groups.", ex.code || "LIST_GROUP_ERROR", {
+      throw new WebinyError(ex.message || "Could not list groups.", ex.code || "LIST_GROUP_ERROR", {
         error: ex,
         ...params,
         sort,
-        where: initialWhere
+        where
       });
     }
-    const where = {
-      ...initialWhere
-    };
-    delete where["tenant"];
-    delete where["locale"];
-    const filteredItems = (0, _dbDynamodb.cleanupItems)(entity, (0, _filter.filterItems)({
+    const filteredItems = filterItems({
       items: records,
       where,
       fields: [],
       plugins
-    }));
-    if (!sort || sort.length === 0 || filteredItems.length === 0) {
+    });
+    if (!sort || sort.length === 0) {
       return filteredItems;
     }
-    return (0, _sort.sortItems)({
+    return sortItems({
       items: filteredItems,
-      sort,
-      fields: []
+      sort
     });
   };
   return {
@@ -174,6 +141,5 @@ const createGroupsStorageOperations = params => {
     list
   };
 };
-exports.createGroupsStorageOperations = createGroupsStorageOperations;
 
 //# sourceMappingURL=index.js.map

package/operations/group/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_get","_query","_filter","_ValueFilterPlugin","_sort","_dbDynamodb","createPartitionKey","params","tenant","locale","createSortKeys","id","createKeys","PK","SK","createType","createGroupsStorageOperations","entity","plugins","filteringPlugins","byType","ValueFilterPlugin","type","length","WebinyError","create","group","keys","put","item","TYPE","ex","message","code","error","update","deleteGroup","deleteItem","get","getClean","list","sort","where","initialWhere","queryAllParams","partitionKey","options","gte","records","queryAll","filteredItems","cleanupItems","filterItems","items","fields","sortItems","delete","exports"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport WebinyError from \"@webiny/error\";\nimport { getClean } from \"@webiny/db-dynamodb/utils/get\";\nimport type { QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { queryAll } from \"@webiny/db-dynamodb/utils/query\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { deleteItem, put, cleanupItems } from \"@webiny/db-dynamodb\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n    locale: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant, locale } = params;\n    return `T#${tenant}#L#${locale}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params)\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\nexport interface CreateGroupsStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, plugins } = params;\n\n    const filteringPlugins = plugins.byType<ValueFilterPlugin>(ValueFilterPlugin.type);\n    if (filteringPlugins.length === 0) {\n        throw new WebinyError(\n            \"DynamoDB filtering plugins not loaded.\",\n            \"MISSING_DYNAMODB_FILTERING_PLUGINS\"\n        );\n    }\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await put({\n                entity,\n                item: {\n                    ...group,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await put({\n                entity,\n                item: {\n                    ...group,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n        try {\n            return await getClean<CmsGroup>({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where: initialWhere } = params;\n\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey(initialWhere),\n            options: {\n                gte: \" \"\n            }\n        };\n\n        let records: CmsGroup[] = [];\n        try {\n            records = await queryAll(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where: initialWhere\n                }\n            );\n        }\n\n        const where: Partial<CmsGroupStorageOperationsListParams[\"where\"]> = {\n            ...initialWhere\n        };\n        delete where[\"tenant\"];\n        delete where[\"locale\"];\n\n        const filteredItems = cleanupItems(\n            entity,\n            filterItems({\n                items: records,\n                where,\n                fields: [],\n                plugins\n            })\n        );\n\n        if (!sort || sort.length === 0 || filteredItems.length === 0) {\n            return filteredItems;\n        }\n        return sortItems({\n            items: filteredItems,\n            sort,\n            fields: []\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","filterItems","sortItems","ValueFilterPlugin","createPartitionKey","params","tenant","createSortKeys","id","createKeys","PK","SK","GSI_TENANT","createType","createGroupsStorageOperations","entity","plugins","filteringPlugins","byType","type","length","create","group","keys","put","data","TYPE","ex","message","code","error","update","deleteGroup","delete","get","result","list","sort","where","records","ddbRecords","queryAll","partitionKey","options","gte","map","item","filteredItems","items","fields"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport { filterItems, sortItems, ValueFilterPlugin } from \"@webiny/db-dynamodb\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { IGroupEntity } from \"~/definitions/types.js\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant } = params;\n    return `T#${tenant}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface IDynamoDbTableKeys {\n    PK: string;\n    SK: string;\n    GSI_TENANT: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): IDynamoDbTableKeys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params),\n        GSI_TENANT: params.tenant\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\ninterface CreateGroupsStorageOperationsParams {\n    entity: IGroupEntity;\n    plugins: PluginsContainer;\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, plugins } = params;\n\n    const filteringPlugins = plugins.byType<ValueFilterPlugin>(ValueFilterPlugin.type);\n    if (filteringPlugins.length === 0) {\n        throw new WebinyError(\n            \"DynamoDB filtering plugins not loaded.\",\n            \"MISSING_DYNAMODB_FILTERING_PLUGINS\"\n        );\n    }\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.delete(keys);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const result = await entity.get(keys);\n\n            return result ? result.data : null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where } = params;\n\n        let records: CmsGroup[] = [];\n        try {\n            const ddbRecords = await entity.queryAll({\n                partitionKey: createPartitionKey(where),\n                options: {\n                    gte: \" \"\n                }\n            });\n            records = ddbRecords.map(item => item.data);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where\n                }\n            );\n        }\n\n        const filteredItems = filterItems({\n            items: records,\n            where,\n            fields: [],\n            plugins\n        });\n        if (!sort || sort.length === 0) {\n            return filteredItems;\n        }\n\n        return sortItems({\n            items: filteredItems,\n            sort\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/model/index.d.ts

@@ -1,8 +1,8 @@
-import type { CmsModelStorageOperations } from "@webiny/api-headless-cms/types";
-import type { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { CmsModelStorageOperations } from "@webiny/api-headless-cms/types/index.js";
 import type { Client } from "@elastic/elasticsearch";
+import type { IModelEntity } from "../../definitions/types.js";
 export interface CreateModelsStorageOperationsParams {
-    entity: Entity<any>;
+    entity: IModelEntity;
     elasticsearch: Client;
 }
 export declare const createModelsStorageOperations: (params: CreateModelsStorageOperationsParams) => CmsModelStorageOperations;

package/operations/model/index.js

@@ -1,35 +1,28 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createModelsStorageOperations = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _configurations = require("../../configurations");
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-var _query = require("@webiny/db-dynamodb/utils/query");
-var _dbDynamodb = require("@webiny/db-dynamodb");
+import WebinyError from "@webiny/error";
+import { configurations } from "../../configurations.js";
 const createPartitionKey = params => {
   const {
-    tenant,
-    locale
+    tenant
   } = params;
-  return `T#${tenant}#L#${locale}#CMS#CM`;
+  return `T#${tenant}#CMS#CM`;
 };
 const createSortKey = params => {
   return params.modelId;
 };
 const createKeys = params => {
+  if (!params.tenant) {
+    throw new Error("Missing tenant when creating model keys!");
+  }
   return {
     PK: createPartitionKey(params),
-    SK: createSortKey(params)
+    SK: createSortKey(params),
+    GSI_TENANT: params.tenant
   };
 };
 const createType = () => {
   return "cms.model";
 };
-const createModelsStorageOperations = params => {
+export const createModelsStorageOperations = params => {
   const {
     entity,
     elasticsearch
@@ -40,19 +33,16 @@ const createModelsStorageOperations = params => {
     } = params;
     const {
       index
-    } = _configurations.configurations.es({
+    } = configurations.es({
       model
     });
     const keys = createKeys(model);
     let error;
     try {
-      await (0, _dbDynamodb.put)({
-        entity,
-        item: {
-          ...(0, _cleanup.cleanupItem)(entity, model),
-          ...keys,
-          TYPE: createType()
-        }
+      await entity.put({
+        data: model,
+        ...keys,
+        TYPE: createType()
       });
       return model;
     } catch (ex) {
@@ -67,7 +57,7 @@ const createModelsStorageOperations = params => {
         ignore_unavailable: true
       });
     } catch (ex) {
-      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record failed to be created.`, "DELETE_MODEL_INDEX_ERROR", {
+      throw new WebinyError(`Could not delete elasticsearch index "${index}" after model record failed to be created.`, "DELETE_MODEL_INDEX_ERROR", {
         dynamodbError: error,
         elasticsearchError: ex
       });
@@ -80,17 +70,14 @@ const createModelsStorageOperations = params => {
     } = params;
     const keys = createKeys(model);
     try {
-      await (0, _dbDynamodb.put)({
-        entity,
-        item: {
-          ...(0, _cleanup.cleanupItem)(entity, model),
-          ...keys,
-          TYPE: createType()
-        }
+      await entity.put({
+        data: model,
+        ...keys,
+        TYPE: createType()
       });
       return model;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
+      throw new WebinyError(ex.message || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
         error: ex,
         model,
         keys
@@ -104,16 +91,13 @@ const createModelsStorageOperations = params => {
     const keys = createKeys(model);
     const {
       index
-    } = _configurations.configurations.es({
+    } = configurations.es({
       model
     });
     try {
-      await (0, _dbDynamodb.deleteItem)({
-        entity,
-        keys
-      });
+      await entity.delete(keys);
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
+      throw new WebinyError(ex.message || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
         error: ex,
         model,
         keys
@@ -128,7 +112,7 @@ const createModelsStorageOperations = params => {
         ignore_unavailable: true
       });
     } catch (ex) {
-      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record delete.`, "DELETE_MODEL_INDEX_ERROR", {
+      throw new WebinyError(`Could not delete elasticsearch index "${index}" after model record delete.`, "DELETE_MODEL_INDEX_ERROR", {
         error: ex,
         index,
         model
@@ -139,12 +123,10 @@ const createModelsStorageOperations = params => {
   const get = async params => {
     const keys = createKeys(params);
     try {
-      return await (0, _dbDynamodb.getClean)({
-        entity,
-        keys
-      });
+      const result = await entity.get(keys);
+      return result ? result.data : null;
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
+      throw new WebinyError(ex.message || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
         error: ex,
         keys
       });
@@ -154,19 +136,19 @@ const createModelsStorageOperations = params => {
     const {
       where
     } = params;
-    const queryAllParams = {
-      entity,
-      partitionKey: createPartitionKey(where),
-      options: {
-        gte: " "
-      }
-    };
+    const partitionKey = createPartitionKey(where);
     try {
-      return await (0, _query.queryAllClean)(queryAllParams);
+      const result = await entity.queryAll({
+        partitionKey,
+        options: {
+          gte: " "
+        }
+      });
+      return result ? result.map(item => item.data) : [];
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
+      throw new WebinyError(ex.message || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
         error: ex,
-        partitionKey: queryAllParams.partitionKey
+        partitionKey
       });
     }
   };
@@ -178,6 +160,5 @@ const createModelsStorageOperations = params => {
     list
   };
 };
-exports.createModelsStorageOperations = createModelsStorageOperations;
 
 //# sourceMappingURL=index.js.map

package/operations/model/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_configurations","_cleanup","_query","_dbDynamodb","createPartitionKey","params","tenant","locale","createSortKey","modelId","createKeys","PK","SK","createType","createModelsStorageOperations","entity","elasticsearch","create","model","index","configurations","es","keys","error","put","item","cleanupItem","TYPE","ex","indices","delete","ignore_unavailable","WebinyError","dynamodbError","elasticsearchError","update","message","code","deleteModel","deleteItem","get","getClean","list","where","queryAllParams","partitionKey","options","gte","queryAllClean","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsModelStorageOperations,\n    CmsModelStorageOperationsCreateParams,\n    CmsModelStorageOperationsDeleteParams,\n    CmsModelStorageOperationsGetParams,\n    CmsModelStorageOperationsListParams,\n    CmsModelStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { configurations } from \"~/configurations\";\nimport type { Client } from \"@elastic/elasticsearch\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport type { QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { queryAllClean } from \"@webiny/db-dynamodb/utils/query\";\nimport { deleteItem, getClean, put } from \"@webiny/db-dynamodb\";\n\ninterface PartitionKeysParams {\n    tenant: string;\n    locale: string;\n}\n\nconst createPartitionKey = (params: PartitionKeysParams): string => {\n    const { tenant, locale } = params;\n    return `T#${tenant}#L#${locale}#CMS#CM`;\n};\n\ninterface SortKeyParams {\n    modelId: string;\n}\n\nconst createSortKey = (params: SortKeyParams): string => {\n    return params.modelId;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\n\nconst createKeys = (params: PartitionKeysParams & SortKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKey(params)\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.model\";\n};\n\nexport interface CreateModelsStorageOperationsParams {\n    entity: Entity<any>;\n    elasticsearch: Client;\n}\n\nexport const createModelsStorageOperations = (\n    params: CreateModelsStorageOperationsParams\n): CmsModelStorageOperations => {\n    const { entity, elasticsearch } = params;\n\n    const create = async (params: CmsModelStorageOperationsCreateParams) => {\n        const { model } = params;\n\n        const { index } = configurations.es({\n            model\n        });\n\n        const keys = createKeys(model);\n\n        let error;\n        try {\n            await put({\n                entity,\n                item: {\n                    ...cleanupItem(entity, model),\n                    ...keys,\n                    TYPE: createType()\n                }\n            });\n            return model;\n        } catch (ex) {\n            error = ex;\n        }\n        /**\n         * In case of DynamoDB error we need to remove the index we created.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record failed to be created.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    dynamodbError: error,\n                    elasticsearchError: ex\n                }\n            );\n        }\n        throw error;\n    };\n\n    const update = async (params: CmsModelStorageOperationsUpdateParams) => {\n        const { model } = params;\n\n        const keys = createKeys(model);\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...cleanupItem(entity, model),\n                    ...keys,\n                    TYPE: createType()\n                }\n            });\n            return model;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update model.\",\n                ex.code || \"MODEL_UPDATE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n    };\n\n    const deleteModel = async (params: CmsModelStorageOperationsDeleteParams) => {\n        const { model } = params;\n        const keys = createKeys(model);\n\n        const { index } = configurations.es({\n            model\n        });\n\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete model.\",\n                ex.code || \"MODEL_DELETE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n        /**\n         * Always delete the model index after deleting the model.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record delete.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    error: ex,\n                    index,\n                    model\n                }\n            );\n        }\n\n        return model;\n    };\n\n    const get = async (params: CmsModelStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            return await getClean<CmsModel>({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get model.\",\n                ex.code || \"MODEL_GET_ERROR\",\n                {\n                    error: ex,\n                    keys\n                }\n            );\n        }\n    };\n\n    const list = async (params: CmsModelStorageOperationsListParams) => {\n        const { where } = params;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey(where),\n            options: {\n                gte: \" \"\n            }\n        };\n        try {\n            return await queryAllClean<CmsModel>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list models.\",\n                ex.code || \"MODEL_LIST_ERROR\",\n                {\n                    error: ex,\n                    partitionKey: queryAllParams.partitionKey\n                }\n            );\n        }\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteModel,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","configurations","createPartitionKey","params","tenant","createSortKey","modelId","createKeys","Error","PK","SK","GSI_TENANT","createType","createModelsStorageOperations","entity","elasticsearch","create","model","index","es","keys","error","put","data","TYPE","ex","indices","delete","ignore_unavailable","dynamodbError","elasticsearchError","update","message","code","deleteModel","get","result","list","where","partitionKey","queryAll","options","gte","map","item"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModelStorageOperations,\n    CmsModelStorageOperationsCreateParams,\n    CmsModelStorageOperationsDeleteParams,\n    CmsModelStorageOperationsGetParams,\n    CmsModelStorageOperationsListParams,\n    CmsModelStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { configurations } from \"~/configurations.js\";\nimport type { Client } from \"@elastic/elasticsearch\";\nimport type { IModelEntity } from \"~/definitions/types.js\";\n\ninterface PartitionKeysParams {\n    tenant: string;\n}\n\nconst createPartitionKey = (params: PartitionKeysParams): string => {\n    const { tenant } = params;\n    return `T#${tenant}#CMS#CM`;\n};\n\ninterface SortKeyParams {\n    modelId: string;\n}\n\nconst createSortKey = (params: SortKeyParams): string => {\n    return params.modelId;\n};\n\ninterface IDynamoDbTableKeys {\n    PK: string;\n    SK: string;\n    GSI_TENANT: string;\n}\n\nconst createKeys = (params: PartitionKeysParams & SortKeyParams): IDynamoDbTableKeys => {\n    if (!params.tenant) {\n        throw new Error(\"Missing tenant when creating model keys!\");\n    }\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKey(params),\n        GSI_TENANT: params.tenant\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.model\";\n};\n\nexport interface CreateModelsStorageOperationsParams {\n    entity: IModelEntity;\n    elasticsearch: Client;\n}\n\nexport const createModelsStorageOperations = (\n    params: CreateModelsStorageOperationsParams\n): CmsModelStorageOperations => {\n    const { entity, elasticsearch } = params;\n\n    const create = async (params: CmsModelStorageOperationsCreateParams) => {\n        const { model } = params;\n\n        const { index } = configurations.es({\n            model\n        });\n\n        const keys = createKeys(model);\n\n        let error;\n        try {\n            await entity.put({\n                data: model,\n                ...keys,\n                TYPE: createType()\n            });\n            return model;\n        } catch (ex) {\n            error = ex;\n        }\n        /**\n         * In case of DynamoDB error we need to remove the index we created.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record failed to be created.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    dynamodbError: error,\n                    elasticsearchError: ex\n                }\n            );\n        }\n        throw error;\n    };\n\n    const update = async (params: CmsModelStorageOperationsUpdateParams) => {\n        const { model } = params;\n\n        const keys = createKeys(model);\n\n        try {\n            await entity.put({\n                data: model,\n                ...keys,\n                TYPE: createType()\n            });\n            return model;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update model.\",\n                ex.code || \"MODEL_UPDATE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n    };\n\n    const deleteModel = async (params: CmsModelStorageOperationsDeleteParams) => {\n        const { model } = params;\n        const keys = createKeys(model);\n\n        const { index } = configurations.es({\n            model\n        });\n\n        try {\n            await entity.delete(keys);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete model.\",\n                ex.code || \"MODEL_DELETE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n        /**\n         * Always delete the model index after deleting the model.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record delete.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    error: ex,\n                    index,\n                    model\n                }\n            );\n        }\n\n        return model;\n    };\n\n    const get = async (params: CmsModelStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const result = await entity.get(keys);\n\n            return result ? result.data : null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get model.\",\n                ex.code || \"MODEL_GET_ERROR\",\n                {\n                    error: ex,\n                    keys\n                }\n            );\n        }\n    };\n\n    const list = async (params: CmsModelStorageOperationsListParams) => {\n        const { where } = params;\n        const partitionKey = createPartitionKey(where);\n        try {\n            const result = await entity.queryAll({\n                partitionKey,\n                options: {\n                    gte: \" \"\n                }\n            });\n            return result ? result.map(item => item.data) : [];\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list models.\",\n                ex.code || \"MODEL_LIST_ERROR\",\n                {\n                    error: ex,\n                    partitionKey\n                }\n            );\n        }\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteModel,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "6.0.0-alpha.5",
+	"version": "6.0.0-rc.0",
+	"type": "module",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-headless-cms",
@@ -26,46 +27,40 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.0.0-alpha.5",
-		"@webiny/api-elasticsearch": "6.0.0-alpha.5",
-		"@webiny/api-elasticsearch-tasks": "6.0.0-alpha.5",
-		"@webiny/api-headless-cms": "6.0.0-alpha.5",
-		"@webiny/aws-sdk": "6.0.0-alpha.5",
-		"@webiny/db-dynamodb": "6.0.0-alpha.5",
-		"@webiny/error": "6.0.0-alpha.5",
-		"@webiny/handler-db": "6.0.0-alpha.5",
-		"@webiny/plugins": "6.0.0-alpha.5",
-		"@webiny/utils": "6.0.0-alpha.5",
+		"@webiny/api": "6.0.0-rc.0",
+		"@webiny/api-elasticsearch": "6.0.0-rc.0",
+		"@webiny/api-elasticsearch-tasks": "6.0.0-rc.0",
+		"@webiny/api-headless-cms": "6.0.0-rc.0",
+		"@webiny/aws-sdk": "6.0.0-rc.0",
+		"@webiny/db-dynamodb": "6.0.0-rc.0",
+		"@webiny/error": "6.0.0-rc.0",
+		"@webiny/handler-db": "6.0.0-rc.0",
+		"@webiny/plugins": "6.0.0-rc.0",
+		"@webiny/utils": "6.0.0-rc.0",
 		"dataloader": "2.2.3",
-		"lodash": "4.17.21"
+		"lodash": "4.17.23"
 	},
 	"devDependencies": {
 		"@elastic/elasticsearch": "7.12.0",
 		"@types/jsonpack": "1.1.6",
-		"@webiny/api-dynamodb-to-elasticsearch": "6.0.0-alpha.5",
-		"@webiny/api-i18n": "6.0.0-alpha.5",
-		"@webiny/api-log": "6.0.0-alpha.5",
-		"@webiny/api-security": "6.0.0-alpha.5",
-		"@webiny/api-tenancy": "6.0.0-alpha.5",
-		"@webiny/api-wcp": "6.0.0-alpha.5",
-		"@webiny/handler": "6.0.0-alpha.5",
-		"@webiny/handler-aws": "6.0.0-alpha.5",
-		"@webiny/handler-graphql": "6.0.0-alpha.5",
-		"@webiny/project-utils": "6.0.0-alpha.5",
-		"@webiny/tasks": "6.0.0-alpha.5",
-		"jest": "29.7.0",
+		"@webiny/api-core": "6.0.0-rc.0",
+		"@webiny/api-dynamodb-to-elasticsearch": "6.0.0-rc.0",
+		"@webiny/build-tools": "6.0.0-rc.0",
+		"@webiny/handler": "6.0.0-rc.0",
+		"@webiny/handler-aws": "6.0.0-rc.0",
+		"@webiny/handler-graphql": "6.0.0-rc.0",
+		"@webiny/project-utils": "6.0.0-rc.0",
+		"@webiny/tasks": "6.0.0-rc.0",
+		"@webiny/wcp": "6.0.0-rc.0",
 		"jest-dynalite": "3.6.1",
-		"prettier": "2.8.8",
-		"rimraf": "6.0.1",
-		"typescript": "5.3.3"
+		"prettier": "3.6.2",
+		"rimraf": "6.1.3",
+		"typescript": "5.9.3",
+		"vitest": "4.0.18"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
-	"scripts": {
-		"build": "node ../cli/bin.js run build",
-		"watch": "node ../cli/bin.js run watch"
-	},
-	"gitHead": "b7e120541b093e91f214904a9f13e4c2c4640978"
+	"gitHead": "0f2aa699f4642e550ab62c96fcd050e8d02345c9"
 }

package/plugins/CmsElasticsearchModelFieldPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@webiny/plugins";
-import type { CmsModelFieldType } from "@webiny/api-headless-cms/types";
+import type { CmsModelFieldType } from "@webiny/api-headless-cms/types/index.js";
 /**
  * A plugin which allows you to map a custom GraphQL field to an Elasticsearch field.
  *