@webiny/api-headless-cms-ddb 5.32.0 → 5.33.0-beta.0

package/dynamoDb/transformValue/datetime.js

@@ -3,12 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createDatetimeTransformValuePlugin = void 0;
 
 var _TimeTransformPlugin = require("@webiny/db-dynamodb/plugins/definitions/TimeTransformPlugin");
 
 var _DateTimeTransformPlugin = require("@webiny/db-dynamodb/plugins/definitions/DateTimeTransformPlugin");
 
+/**
+ * File is @internal
+ */
 const timeTransformer = new _TimeTransformPlugin.TimeTransformPlugin({
   fields: ["*"]
 });
@@ -16,32 +19,34 @@ const dateTimeTransformer = new _DateTimeTransformPlugin.DateTimeTransformPlugin
   fields: ["*"]
 });
 
-var _default = () => ({
-  type: "cms-field-filter-value-transform",
-  name: "cms-field-value-filter-transform-datetime",
-  fieldType: "datetime",
-
-  /**
-   * Always transform into the milliseconds.
-   */
-  transform: ({
-    field,
-    value
-  }) => {
-    const {
-      type
-    } = field.settings || {};
-
-    if (type === "time") {
-      return timeTransformer.transform({
+const createDatetimeTransformValuePlugin = () => {
+  return {
+    type: "cms-field-filter-value-transform",
+    name: "cms-field-value-filter-transform-datetime",
+    fieldType: "datetime",
+
+    /**
+     * Always transform into the milliseconds.
+     */
+    transform: ({
+      field,
+      value
+    }) => {
+      const {
+        type
+      } = field.settings || {};
+
+      if (type === "time") {
+        return timeTransformer.transform({
+          value
+        });
+      }
+
+      return dateTimeTransformer.transform({
         value
       });
     }
+  };
+};
 
-    return dateTimeTransformer.transform({
-      value
-    });
-  }
-});
-
-exports.default = _default;
+exports.createDatetimeTransformValuePlugin = createDatetimeTransformValuePlugin;

package/dynamoDb/transformValue/datetime.js.map

@@ -1 +1 @@
-{"version":3,"names":["timeTransformer","TimeTransformPlugin","fields","dateTimeTransformer","DateTimeTransformPlugin","type","name","fieldType","transform","field","value","settings"],"sources":["datetime.ts"],"sourcesContent":["import { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { TimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/TimeTransformPlugin\";\nimport { DateTimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/DateTimeTransformPlugin\";\n\nconst timeTransformer = new TimeTransformPlugin({\n    fields: [\"*\"]\n});\nconst dateTimeTransformer = new DateTimeTransformPlugin({\n    fields: [\"*\"]\n});\n\nexport default (): CmsFieldFilterValueTransformPlugin => ({\n    type: \"cms-field-filter-value-transform\",\n    name: \"cms-field-value-filter-transform-datetime\",\n    fieldType: \"datetime\",\n    /**\n     * Always transform into the milliseconds.\n     */\n    transform: ({ field, value }) => {\n        const { type } = field.settings || {};\n        if (type === \"time\") {\n            return timeTransformer.transform({\n                value\n            });\n        }\n        return dateTimeTransformer.transform({\n            value\n        });\n    }\n});\n"],"mappings":";;;;;;;AACA;;AACA;;AAEA,MAAMA,eAAe,GAAG,IAAIC,wCAAJ,CAAwB;EAC5CC,MAAM,EAAE,CAAC,GAAD;AADoC,CAAxB,CAAxB;AAGA,MAAMC,mBAAmB,GAAG,IAAIC,gDAAJ,CAA4B;EACpDF,MAAM,EAAE,CAAC,GAAD;AAD4C,CAA5B,CAA5B;;eAIe,OAA2C;EACtDG,IAAI,EAAE,kCADgD;EAEtDC,IAAI,EAAE,2CAFgD;EAGtDC,SAAS,EAAE,UAH2C;;EAItD;AACJ;AACA;EACIC,SAAS,EAAE,CAAC;IAAEC,KAAF;IAASC;EAAT,CAAD,KAAsB;IAC7B,MAAM;MAAEL;IAAF,IAAWI,KAAK,CAACE,QAAN,IAAkB,EAAnC;;IACA,IAAIN,IAAI,KAAK,MAAb,EAAqB;MACjB,OAAOL,eAAe,CAACQ,SAAhB,CAA0B;QAC7BE;MAD6B,CAA1B,CAAP;IAGH;;IACD,OAAOP,mBAAmB,CAACK,SAApB,CAA8B;MACjCE;IADiC,CAA9B,CAAP;EAGH;AAjBqD,CAA3C,C"}
+{"version":3,"names":["timeTransformer","TimeTransformPlugin","fields","dateTimeTransformer","DateTimeTransformPlugin","createDatetimeTransformValuePlugin","type","name","fieldType","transform","field","value","settings"],"sources":["datetime.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { TimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/TimeTransformPlugin\";\nimport { DateTimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/DateTimeTransformPlugin\";\n\nconst timeTransformer = new TimeTransformPlugin({\n    fields: [\"*\"]\n});\nconst dateTimeTransformer = new DateTimeTransformPlugin({\n    fields: [\"*\"]\n});\n\nexport const createDatetimeTransformValuePlugin = (): CmsFieldFilterValueTransformPlugin => {\n    return {\n        type: \"cms-field-filter-value-transform\",\n        name: \"cms-field-value-filter-transform-datetime\",\n        fieldType: \"datetime\",\n        /**\n         * Always transform into the milliseconds.\n         */\n        transform: ({ field, value }) => {\n            const { type } = field.settings || {};\n            if (type === \"time\") {\n                return timeTransformer.transform({\n                    value\n                });\n            }\n            return dateTimeTransformer.transform({\n                value\n            });\n        }\n    };\n};\n"],"mappings":";;;;;;;AAIA;;AACA;;AALA;AACA;AACA;AAKA,MAAMA,eAAe,GAAG,IAAIC,wCAAJ,CAAwB;EAC5CC,MAAM,EAAE,CAAC,GAAD;AADoC,CAAxB,CAAxB;AAGA,MAAMC,mBAAmB,GAAG,IAAIC,gDAAJ,CAA4B;EACpDF,MAAM,EAAE,CAAC,GAAD;AAD4C,CAA5B,CAA5B;;AAIO,MAAMG,kCAAkC,GAAG,MAA0C;EACxF,OAAO;IACHC,IAAI,EAAE,kCADH;IAEHC,IAAI,EAAE,2CAFH;IAGHC,SAAS,EAAE,UAHR;;IAIH;AACR;AACA;IACQC,SAAS,EAAE,CAAC;MAAEC,KAAF;MAASC;IAAT,CAAD,KAAsB;MAC7B,MAAM;QAAEL;MAAF,IAAWI,KAAK,CAACE,QAAN,IAAkB,EAAnC;;MACA,IAAIN,IAAI,KAAK,MAAb,EAAqB;QACjB,OAAON,eAAe,CAACS,SAAhB,CAA0B;UAC7BE;QAD6B,CAA1B,CAAP;MAGH;;MACD,OAAOR,mBAAmB,CAACM,SAApB,CAA8B;QACjCE;MADiC,CAA9B,CAAP;IAGH;EAjBE,CAAP;AAmBH,CApBM"}

package/operations/entry/index.js

@@ -47,6 +47,34 @@ const createPublishedType = () => {
   return `${createType()}.p`;
 };
 
+const convertToStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyToStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+    values
+  });
+};
+
+const convertFromStorageEntry = params => {
+  const {
+    model,
+    storageEntry
+  } = params;
+  const values = model.convertValueKeyFromStorage({
+    fields: model.fields,
+    values: storageEntry.values
+  });
+  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+    values
+  });
+};
+
 const createEntriesStorageOperations = params => {
   const {
     entity,
@@ -82,11 +110,11 @@ const createEntriesStorageOperations = params => {
     };
   };
 
-  const create = async (model, args) => {
+  const create = async (model, params) => {
     const {
       entry,
-      storageEntry
-    } = args;
+      storageEntry: initialStorageEntry
+    } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
@@ -94,6 +122,10 @@ const createEntriesStorageOperations = params => {
     });
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
+    const storageEntry = convertToStorageEntry({
+      model,
+      storageEntry: initialStorageEntry
+    });
     /**
      * We need to:
      *  - create new main entry item
@@ -145,19 +177,23 @@ const createEntriesStorageOperations = params => {
       });
     }
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const createRevisionFrom = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
       tenant: model.tenant
     });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - create the main entry item
@@ -198,13 +234,13 @@ const createEntriesStorageOperations = params => {
      */
 
 
-    return storageEntry;
+    return initialStorageEntry;
   };
 
   const update = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
@@ -214,6 +250,10 @@ const createEntriesStorageOperations = params => {
     const isPublished = entry.status === "published";
     const locked = isPublished ? true : entry.locked;
     const items = [];
+    const storageEntry = convertToStorageEntry({
+      model,
+      storageEntry: initialStorageEntry
+    });
     /**
      * We need to:
      *  - update the current entry
@@ -265,7 +305,7 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return storageEntry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update entry.", ex.code || "UPDATE_ERROR", {
         error: ex,
@@ -329,7 +369,7 @@ const createEntriesStorageOperations = params => {
     const {
       entry,
       latestEntry,
-      latestStorageEntry
+      latestStorageEntry: initialLatestStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
@@ -352,7 +392,11 @@ const createEntriesStorageOperations = params => {
       }));
     }
 
-    if (latestStorageEntry) {
+    if (initialLatestStorageEntry) {
+      const latestStorageEntry = convertToStorageEntry({
+        storageEntry: initialLatestStorageEntry,
+        model
+      });
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, latestStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -380,55 +424,106 @@ const createEntriesStorageOperations = params => {
   };
 
   const getLatestRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getLatestRevisionByEntryId({
+    const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+    const item = items.shift() || null;
+
+    if (!item) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getPublishedRevisionByEntryId = async (model, params) => {
-    const result = await dataLoaders.getPublishedRevisionByEntryId({
+    const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+    const item = items.shift() || null;
+
+    if (!item) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getRevisionById = async (model, params) => {
-    const result = await dataLoaders.getRevisionById({
+    const items = await dataLoaders.getRevisionById({
       model,
       ids: [params.id]
     });
-    return result.shift() || null;
+    const item = items.shift() || null;
+
+    if (!item) {
+      return null;
+    }
+
+    return convertFromStorageEntry({
+      storageEntry: item,
+      model
+    });
   };
 
   const getRevisions = async (model, params) => {
-    return await dataLoaders.getAllEntryRevisions({
+    const items = await dataLoaders.getAllEntryRevisions({
       model,
       ids: [params.id]
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getByIds = async (model, params) => {
-    return dataLoaders.getRevisionById({
+    const items = await dataLoaders.getRevisionById({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getLatestByIds = async (model, params) => {
-    return dataLoaders.getLatestRevisionByEntryId({
+    const items = await dataLoaders.getLatestRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getPublishedByIds = async (model, params) => {
-    return dataLoaders.getPublishedRevisionByEntryId({
+    const items = await dataLoaders.getPublishedRevisionByEntryId({
       model,
       ids: params.ids
     });
+    return items.map(item => {
+      return convertFromStorageEntry({
+        storageEntry: item,
+        model
+      });
+    });
   };
 
   const getPreviousRevision = async (model, params) => {
@@ -462,7 +557,16 @@ const createEntriesStorageOperations = params => {
 
     try {
       const result = await (0, _query.queryOne)(queryParams);
-      return (0, _cleanup.cleanupItem)(entity, result);
+      const storageEntry = (0, _cleanup.cleanupItem)(entity, result);
+
+      if (!storageEntry) {
+        return null;
+      }
+
+      return convertFromStorageEntry({
+        storageEntry,
+        model
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get previous version of given entry.", ex.code || "GET_PREVIOUS_VERSION_ERROR", _objectSpread(_objectSpread({}, params), {}, {
         error: ex,
@@ -532,7 +636,12 @@ const createEntriesStorageOperations = params => {
      */
 
     const filteredItems = await (0, _utils.filterItems)({
-      items: records,
+      items: records.map(record => {
+        return convertFromStorageEntry({
+          storageEntry: record,
+          model
+        });
+      }),
       where,
       plugins,
       fields: modelFields,
@@ -583,13 +692,17 @@ const createEntriesStorageOperations = params => {
   const requestChanges = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
       tenant: model.tenant
     });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - update the existing entry
@@ -639,13 +752,17 @@ const createEntriesStorageOperations = params => {
   const requestReview = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
       tenant: model.tenant
     });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - update existing entry
@@ -683,7 +800,7 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return entry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute request review batch.", ex.code || "REQUEST_REVIEW_ERROR", {
         entry,
@@ -695,7 +812,7 @@ const createEntriesStorageOperations = params => {
   const publish = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
@@ -706,8 +823,12 @@ const createEntriesStorageOperations = params => {
      * We need the latest and published entries to see if something needs to be updated along side the publishing one.
      */
 
-    const latestStorageEntry = await getLatestRevisionByEntryId(model, entry);
-    const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
+    const initialLatestStorageEntry = await getLatestRevisionByEntryId(model, entry);
+    const initialPublishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
+    const storageEntry = convertToStorageEntry({
+      model,
+      storageEntry: initialStorageEntry
+    });
     /**
      * We need to update:
      *  - current entry revision sort key
@@ -730,7 +851,7 @@ const createEntriesStorageOperations = params => {
       GSI1_SK: (0, _keys.createGSISortKey)(entry)
     }))];
 
-    if (latestStorageEntry && entry.id === latestStorageEntry.id) {
+    if (initialLatestStorageEntry && entry.id === initialLatestStorageEntry.id) {
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, storageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createLatestSortKey)(),
@@ -740,7 +861,11 @@ const createEntriesStorageOperations = params => {
       })));
     }
 
-    if (publishedStorageEntry && publishedStorageEntry.id !== entry.id) {
+    if (initialPublishedStorageEntry && initialPublishedStorageEntry.id !== entry.id) {
+      const publishedStorageEntry = convertToStorageEntry({
+        storageEntry: initialPublishedStorageEntry,
+        model
+      });
       items.push(entity.putBatch(_objectSpread(_objectSpread({}, publishedStorageEntry), {}, {
         PK: partitionKey,
         SK: (0, _keys.createRevisionSortKey)(publishedStorageEntry),
@@ -759,12 +884,12 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return entry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute the publishing batch.", ex.code || "PUBLISH_ERROR", {
         entry,
-        latestStorageEntry,
-        publishedStorageEntry
+        latestStorageEntry: initialLatestStorageEntry,
+        publishedStorageEntry: initialPublishedStorageEntry
       });
     }
   };
@@ -772,13 +897,17 @@ const createEntriesStorageOperations = params => {
   const unpublish = async (model, params) => {
     const {
       entry,
-      storageEntry
+      storageEntry: initialStorageEntry
     } = params;
     const partitionKey = (0, _keys.createPartitionKey)({
       id: entry.id,
       locale: model.locale,
       tenant: model.tenant
     });
+    const storageEntry = convertToStorageEntry({
+      storageEntry: initialStorageEntry,
+      model
+    });
     /**
      * We need to:
      *  - delete currently published entry
@@ -820,7 +949,7 @@ const createEntriesStorageOperations = params => {
       dataLoaders.clearAll({
         model
       });
-      return storageEntry;
+      return initialStorageEntry;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not execute unpublish batch.", ex.code || "UNPUBLISH_ERROR", {
         entry,