@webiny/api-headless-cms 0.0.0-unstable.1e66d121db → 0.0.0-unstable.2696f9d9e8

package/utils/caching/CacheKey.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createCacheKey = void 0;
+var _crypto = _interopRequireDefault(require("crypto"));
+const getCacheKey = input => {
+  if (typeof input === "string") {
+    return input;
+  } else if (typeof input === "number") {
+    return `${input}`;
+  }
+  return JSON.stringify(input);
+};
+const createHash = input => {
+  const key = getCacheKey(input);
+  const hash = _crypto.default.createHash("sha1");
+  hash.update(key);
+  return hash.digest("hex");
+};
+class CacheKey {
+  constructor(keys) {
+    this.keys = keys;
+    this.key = createHash(keys);
+  }
+  static create(key) {
+    return new CacheKey(key);
+  }
+  get() {
+    return this.key;
+  }
+}
+const createCacheKey = key => {
+  return CacheKey.create(key);
+};
+exports.createCacheKey = createCacheKey;
+
+//# sourceMappingURL=CacheKey.js.map

package/utils/caching/CacheKey.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_crypto","_interopRequireDefault","require","getCacheKey","input","JSON","stringify","createHash","key","hash","crypto","update","digest","CacheKey","constructor","keys","create","get","createCacheKey","exports"],"sources":["CacheKey.ts"],"sourcesContent":["import crypto from \"crypto\";\nimport { ICacheKey, ICacheKeyKeys } from \"./types\";\n\nconst getCacheKey = (input: ICacheKeyKeys): string => {\n    if (typeof input === \"string\") {\n        return input;\n    } else if (typeof input === \"number\") {\n        return `${input}`;\n    }\n    return JSON.stringify(input);\n};\n\nconst createHash = (input: ICacheKeyKeys): string => {\n    const key = getCacheKey(input);\n    const hash = crypto.createHash(\"sha1\");\n    hash.update(key);\n    return hash.digest(\"hex\");\n};\n\nclass CacheKey implements ICacheKey {\n    private readonly key: string;\n    public readonly keys: ICacheKeyKeys;\n\n    private constructor(keys: ICacheKeyKeys) {\n        this.keys = keys;\n        this.key = createHash(keys);\n    }\n\n    public static create(key: ICacheKeyKeys): ICacheKey {\n        return new CacheKey(key);\n    }\n\n    public get(): string {\n        return this.key;\n    }\n}\n\nexport const createCacheKey = (key: ICacheKeyKeys) => {\n    return CacheKey.create(key);\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,MAAMC,WAAW,GAAIC,KAAoB,IAAa;EAClD,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC3B,OAAOA,KAAK;EAChB,CAAC,MAAM,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAClC,OAAQ,GAAEA,KAAM,EAAC;EACrB;EACA,OAAOC,IAAI,CAACC,SAAS,CAACF,KAAK,CAAC;AAChC,CAAC;AAED,MAAMG,UAAU,GAAIH,KAAoB,IAAa;EACjD,MAAMI,GAAG,GAAGL,WAAW,CAACC,KAAK,CAAC;EAC9B,MAAMK,IAAI,GAAGC,eAAM,CAACH,UAAU,CAAC,MAAM,CAAC;EACtCE,IAAI,CAACE,MAAM,CAACH,GAAG,CAAC;EAChB,OAAOC,IAAI,CAACG,MAAM,CAAC,KAAK,CAAC;AAC7B,CAAC;AAED,MAAMC,QAAQ,CAAsB;EAIxBC,WAAWA,CAACC,IAAmB,EAAE;IACrC,IAAI,CAACA,IAAI,GAAGA,IAAI;IAChB,IAAI,CAACP,GAAG,GAAGD,UAAU,CAACQ,IAAI,CAAC;EAC/B;EAEA,OAAcC,MAAMA,CAACR,GAAkB,EAAa;IAChD,OAAO,IAAIK,QAAQ,CAACL,GAAG,CAAC;EAC5B;EAEOS,GAAGA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACT,GAAG;EACnB;AACJ;AAEO,MAAMU,cAAc,GAAIV,GAAkB,IAAK;EAClD,OAAOK,QAAQ,CAACG,MAAM,CAACR,GAAG,CAAC;AAC/B,CAAC;AAACW,OAAA,CAAAD,cAAA,GAAAA,cAAA"}

package/utils/caching/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./Cache";
+export * from "./CacheKey";

package/utils/caching/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _Cache = require("./Cache");
+Object.keys(_Cache).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Cache[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Cache[key];
+    }
+  });
+});
+var _CacheKey = require("./CacheKey");
+Object.keys(_CacheKey).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _CacheKey[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _CacheKey[key];
+    }
+  });
+});
+
+//# sourceMappingURL=index.js.map

package/utils/caching/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_Cache","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_CacheKey"],"sources":["index.ts"],"sourcesContent":["export * from \"./Cache\";\nexport * from \"./CacheKey\";\n"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,MAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,MAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,MAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,SAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,SAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,SAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,SAAA,CAAAL,GAAA;IAAA;EAAA;AAAA"}

package/utils/caching/types.d.ts

@@ -0,0 +1,11 @@
+export declare type ICacheKeyKeys = Record<string, string | undefined> | string | number;
+export interface ICacheKey {
+    get(): string;
+    keys: ICacheKeyKeys;
+}
+export interface ICache<T = any> {
+    get(cacheKey: ICacheKey): T | null;
+    set(cacheKey: ICacheKey, value: T): T;
+    getOrSet(cacheKey: ICacheKey, cb: () => T): T;
+    clear(cacheKey?: ICacheKey | ICacheKey[]): void;
+}

package/utils/caching/types.js

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+//# sourceMappingURL=types.js.map

package/utils/caching/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["export type ICacheKeyKeys = Record<string, string | undefined> | string | number;\n\nexport interface ICacheKey {\n    get(): string;\n    keys: ICacheKeyKeys;\n}\n\nexport interface ICache<T = any> {\n    get(cacheKey: ICacheKey): T | null;\n    set(cacheKey: ICacheKey, value: T): T;\n    getOrSet(cacheKey: ICacheKey, cb: () => T): T;\n    clear(cacheKey?: ICacheKey | ICacheKey[]): void;\n}\n"],"mappings":""}

package/utils/converters/Converter.js

@@ -1,47 +1,34 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Converter = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 class Converter {
+  converters = undefined;
   constructor(config) {
-    (0, _defineProperty2.default)(this, "type", void 0);
-    (0, _defineProperty2.default)(this, "plugin", void 0);
-    (0, _defineProperty2.default)(this, "converters", undefined);
     this.type = config.type;
     this.plugin = config.plugin;
   }
-
   setConverterCollection(converters) {
     if (this.converters) {
       throw new _error.default(`Cannot attach converters collection more than once to Converter with type "${this.type}".`, "CONVERTER_COLLECTION_ERROR", {
         type: this.type
       });
     }
-
     this.converters = converters;
   }
-
   getConverterCollection() {
     if (!this.converters) {
       throw new _error.default(`There is no ConverterCollection defined in the converter with type "${this.type}".`);
     }
-
     return this.converters;
   }
-
   getType() {
     return this.type;
   }
-
   convertToStorage(params) {
     const {
       field,
@@ -53,7 +40,6 @@ class Converter {
       converterCollection: this.getConverterCollection()
     });
   }
-
   convertFromStorage(params) {
     const {
       field,
@@ -65,7 +51,7 @@ class Converter {
       converterCollection: this.getConverterCollection()
     });
   }
-
 }
+exports.Converter = Converter;
 
-exports.Converter = Converter;
+//# sourceMappingURL=Converter.js.map

package/utils/converters/Converter.js.map

@@ -1 +1 @@
-{"version":3,"names":["Converter","constructor","config","undefined","type","plugin","setConverterCollection","converters","WebinyError","getConverterCollection","getType","convertToStorage","params","field","value","converterCollection","convertFromStorage"],"sources":["Converter.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryValues, CmsModelField } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { ConverterCollection } from \"./ConverterCollection\";\n\nexport interface CmsModelFieldWithParent extends CmsModelField {\n    parent?: CmsModelFieldWithParent | null;\n}\n\ninterface ConverterConvertParams {\n    field: CmsModelFieldWithParent;\n    value: any;\n    parent?: CmsModelFieldWithParent | null;\n}\nexport interface ConverterConfig {\n    type: string;\n    plugin: CmsModelFieldConverterPlugin;\n}\nexport class Converter {\n    private readonly type: string;\n    private readonly plugin: CmsModelFieldConverterPlugin;\n\n    private converters: ConverterCollection | undefined = undefined;\n\n    public constructor(config: ConverterConfig) {\n        this.type = config.type;\n        this.plugin = config.plugin;\n    }\n\n    public setConverterCollection(converters: ConverterCollection): void {\n        if (this.converters) {\n            throw new WebinyError(\n                `Cannot attach converters collection more than once to Converter with type \"${this.type}\".`,\n                \"CONVERTER_COLLECTION_ERROR\",\n                {\n                    type: this.type\n                }\n            );\n        }\n        this.converters = converters;\n    }\n\n    public getConverterCollection(): ConverterCollection {\n        if (!this.converters) {\n            throw new WebinyError(\n                `There is no ConverterCollection defined in the converter with type \"${this.type}\".`\n            );\n        }\n        return this.converters;\n    }\n\n    public getType(): string {\n        return this.type;\n    }\n\n    public convertToStorage(params: ConverterConvertParams): CmsEntryValues {\n        const { field, value } = params;\n\n        return this.plugin.convertToStorage({\n            field,\n            value,\n            converterCollection: this.getConverterCollection()\n        });\n    }\n\n    public convertFromStorage(params: ConverterConvertParams): CmsEntryValues {\n        const { field, value } = params;\n\n        return this.plugin.convertFromStorage({\n            field,\n            value,\n            converterCollection: this.getConverterCollection()\n        });\n    }\n}\n"],"mappings":";;;;;;;;;;;AAAA;;AAkBO,MAAMA,SAAN,CAAgB;EAMZC,WAAW,CAACC,MAAD,EAA0B;IAAA;IAAA;IAAA,kDAFUC,SAEV;IACxC,KAAKC,IAAL,GAAYF,MAAM,CAACE,IAAnB;IACA,KAAKC,MAAL,GAAcH,MAAM,CAACG,MAArB;EACH;;EAEMC,sBAAsB,CAACC,UAAD,EAAwC;IACjE,IAAI,KAAKA,UAAT,EAAqB;MACjB,MAAM,IAAIC,cAAJ,CACD,8EAA6E,KAAKJ,IAAK,IADtF,EAEF,4BAFE,EAGF;QACIA,IAAI,EAAE,KAAKA;MADf,CAHE,CAAN;IAOH;;IACD,KAAKG,UAAL,GAAkBA,UAAlB;EACH;;EAEME,sBAAsB,GAAwB;IACjD,IAAI,CAAC,KAAKF,UAAV,EAAsB;MAClB,MAAM,IAAIC,cAAJ,CACD,uEAAsE,KAAKJ,IAAK,IAD/E,CAAN;IAGH;;IACD,OAAO,KAAKG,UAAZ;EACH;;EAEMG,OAAO,GAAW;IACrB,OAAO,KAAKN,IAAZ;EACH;;EAEMO,gBAAgB,CAACC,MAAD,EAAiD;IACpE,MAAM;MAAEC,KAAF;MAASC;IAAT,IAAmBF,MAAzB;IAEA,OAAO,KAAKP,MAAL,CAAYM,gBAAZ,CAA6B;MAChCE,KADgC;MAEhCC,KAFgC;MAGhCC,mBAAmB,EAAE,KAAKN,sBAAL;IAHW,CAA7B,CAAP;EAKH;;EAEMO,kBAAkB,CAACJ,MAAD,EAAiD;IACtE,MAAM;MAAEC,KAAF;MAASC;IAAT,IAAmBF,MAAzB;IAEA,OAAO,KAAKP,MAAL,CAAYW,kBAAZ,CAA+B;MAClCH,KADkC;MAElCC,KAFkC;MAGlCC,mBAAmB,EAAE,KAAKN,sBAAL;IAHa,CAA/B,CAAP;EAKH;;AAvDkB"}
+{"version":3,"names":["_error","_interopRequireDefault","require","Converter","converters","undefined","constructor","config","type","plugin","setConverterCollection","WebinyError","getConverterCollection","getType","convertToStorage","params","field","value","converterCollection","convertFromStorage","exports"],"sources":["Converter.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryValues, CmsModelField } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { ConverterCollection } from \"./ConverterCollection\";\n\nexport interface CmsModelFieldWithParent extends CmsModelField {\n    parent?: CmsModelFieldWithParent | null;\n}\n\ninterface ConverterConvertParams {\n    field: CmsModelFieldWithParent;\n    value: any;\n    parent?: CmsModelFieldWithParent | null;\n}\nexport interface ConverterConfig {\n    type: string;\n    plugin: CmsModelFieldConverterPlugin;\n}\nexport class Converter {\n    private readonly type: string;\n    private readonly plugin: CmsModelFieldConverterPlugin;\n\n    private converters: ConverterCollection | undefined = undefined;\n\n    public constructor(config: ConverterConfig) {\n        this.type = config.type;\n        this.plugin = config.plugin;\n    }\n\n    public setConverterCollection(converters: ConverterCollection): void {\n        if (this.converters) {\n            throw new WebinyError(\n                `Cannot attach converters collection more than once to Converter with type \"${this.type}\".`,\n                \"CONVERTER_COLLECTION_ERROR\",\n                {\n                    type: this.type\n                }\n            );\n        }\n        this.converters = converters;\n    }\n\n    public getConverterCollection(): ConverterCollection {\n        if (!this.converters) {\n            throw new WebinyError(\n                `There is no ConverterCollection defined in the converter with type \"${this.type}\".`\n            );\n        }\n        return this.converters;\n    }\n\n    public getType(): string {\n        return this.type;\n    }\n\n    public convertToStorage(params: ConverterConvertParams): CmsEntryValues {\n        const { field, value } = params;\n\n        return this.plugin.convertToStorage({\n            field,\n            value,\n            converterCollection: this.getConverterCollection()\n        });\n    }\n\n    public convertFromStorage(params: ConverterConvertParams): CmsEntryValues {\n        const { field, value } = params;\n\n        return this.plugin.convertFromStorage({\n            field,\n            value,\n            converterCollection: this.getConverterCollection()\n        });\n    }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAkBO,MAAMC,SAAS,CAAC;EAIXC,UAAU,GAAoCC,SAAS;EAExDC,WAAWA,CAACC,MAAuB,EAAE;IACxC,IAAI,CAACC,IAAI,GAAGD,MAAM,CAACC,IAAI;IACvB,IAAI,CAACC,MAAM,GAAGF,MAAM,CAACE,MAAM;EAC/B;EAEOC,sBAAsBA,CAACN,UAA+B,EAAQ;IACjE,IAAI,IAAI,CAACA,UAAU,EAAE;MACjB,MAAM,IAAIO,cAAW,CAChB,8EAA6E,IAAI,CAACH,IAAK,IAAG,EAC3F,4BAA4B,EAC5B;QACIA,IAAI,EAAE,IAAI,CAACA;MACf,CACJ,CAAC;IACL;IACA,IAAI,CAACJ,UAAU,GAAGA,UAAU;EAChC;EAEOQ,sBAAsBA,CAAA,EAAwB;IACjD,IAAI,CAAC,IAAI,CAACR,UAAU,EAAE;MAClB,MAAM,IAAIO,cAAW,CAChB,uEAAsE,IAAI,CAACH,IAAK,IACrF,CAAC;IACL;IACA,OAAO,IAAI,CAACJ,UAAU;EAC1B;EAEOS,OAAOA,CAAA,EAAW;IACrB,OAAO,IAAI,CAACL,IAAI;EACpB;EAEOM,gBAAgBA,CAACC,MAA8B,EAAkB;IACpE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,MAAM;IAE/B,OAAO,IAAI,CAACN,MAAM,CAACK,gBAAgB,CAAC;MAChCE,KAAK;MACLC,KAAK;MACLC,mBAAmB,EAAE,IAAI,CAACN,sBAAsB,CAAC;IACrD,CAAC,CAAC;EACN;EAEOO,kBAAkBA,CAACJ,MAA8B,EAAkB;IACtE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,MAAM;IAE/B,OAAO,IAAI,CAACN,MAAM,CAACU,kBAAkB,CAAC;MAClCH,KAAK;MACLC,KAAK;MACLC,mBAAmB,EAAE,IAAI,CAACN,sBAAsB,CAAC;IACrD,CAAC,CAAC;EACN;AACJ;AAACQ,OAAA,CAAAjB,SAAA,GAAAA,SAAA"}

package/utils/converters/ConverterCollection.d.ts

@@ -21,4 +21,11 @@ export declare class ConverterCollection {
     getConverter(type: string): Converter;
     convertToStorage(params: ConverterCollectionConvertParams): CmsEntryValues | undefined;
     convertFromStorage(params: ConverterCollectionConvertParams): CmsEntryValues | undefined;
+    /**
+     * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.
+     * At that point, hasOwnProperty does not exist, and we need to add it.
+     *
+     * TODO add more checks if required
+     */
+    private attachHasOwnProperty;
 }

package/utils/converters/ConverterCollection.js

@@ -1,36 +1,26 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConverterCollection = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _Converter = require("./Converter");
-
 var _plugins = require("../../plugins");
-
+var _getBaseFieldType = require("../getBaseFieldType");
 class ConverterCollection {
+  converters = new Map();
   constructor(params) {
-    (0, _defineProperty2.default)(this, "converters", new Map());
     const {
       plugins
     } = params;
     const fieldGraphQLPlugins = plugins.byType("cms-model-field-to-graphql");
     const fieldConverterPlugins = plugins.byType(_plugins.CmsModelFieldConverterPlugin.type);
     const defaultFieldConverterPlugin = fieldConverterPlugins.find(pl => pl.getFieldType() === "*");
-
     if (defaultFieldConverterPlugin === undefined) {
       throw new _error.default(`Missing default field converter plugin.`, "DEFAULT_FIELD_CONVERTER_ERROR");
     }
-
     for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {
       const plugin = fieldConverterPlugins.find(pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType);
       const converter = new _Converter.Converter({
@@ -40,74 +30,96 @@ class ConverterCollection {
       this.addConverter(converter);
     }
   }
-
   addConverter(converter) {
     converter.setConverterCollection(this);
     this.converters.set(converter.getType(), converter);
   }
-
   getConverter(type) {
     const converter = this.converters.get(type);
-
     if (converter === undefined) {
       throw new _error.default(`Missing converter for field type "${type}".`, "CONVERTER_ERROR", {
         type
       });
     }
-
     return converter;
   }
-
   convertToStorage(params) {
     const {
       fields,
       values: inputValues
     } = params;
-
     if (inputValues === undefined) {
       return undefined;
     }
-
+    this.attachHasOwnProperty(inputValues);
     return fields.reduce((output, field) => {
-      const converter = this.getConverter(field.type);
-
+      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+      const converter = this.getConverter(baseType);
       if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {
         return output;
       }
-
       const values = converter.convertToStorage({
         field,
         value: inputValues[field.fieldId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
-
   convertFromStorage(params) {
     const {
       fields,
       values: inputValues
     } = params;
-
     if (inputValues === undefined) {
       return undefined;
     }
-
     return fields.reduce((output, field) => {
-      const converter = this.getConverter(field.type);
-
+      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+      const converter = this.getConverter(baseType);
       if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {
         return output;
       }
-
       const values = converter.convertFromStorage({
         field,
         value: inputValues[field.storageId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
 
+  /**
+   * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.
+   * At that point, hasOwnProperty does not exist, and we need to add it.
+   *
+   * TODO add more checks if required
+   */
+  attachHasOwnProperty(values) {
+    if (
+    // null or undefined?
+    values === null || values === undefined ||
+    // not an object?
+    typeof values !== "object" ||
+    // maybe it's an array?
+    Array.isArray(values) ||
+    // and in the end, check if hasOwnProperty is a function already
+    typeof values?.hasOwnProperty === "function") {
+      return;
+    }
+    Object.defineProperty(values, "hasOwnProperty", {
+      enumerable: false,
+      writable: false,
+      value: function (property) {
+        return this[property] !== undefined;
+      }
+    });
+  }
 }
+exports.ConverterCollection = ConverterCollection;
 
-exports.ConverterCollection = ConverterCollection;
+//# sourceMappingURL=ConverterCollection.js.map

package/utils/converters/ConverterCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConverterCollection","constructor","params","Map","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","CmsModelFieldConverterPlugin","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","WebinyError","fieldGraphQLPlugin","plugin","fieldType","converter","Converter","addConverter","setConverterCollection","converters","set","getType","getConverter","get","convertToStorage","fields","values","inputValues","reduce","output","field","hasOwnProperty","fieldId","value","convertFromStorage","storageId"],"sources":["ConverterCollection.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Converter } from \"./Converter\";\nimport { CmsEntryValues, CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable {\n    (params: ConverterCollectionConvertParams): CmsEntryValues;\n}\n\nexport interface ConverterCollectionConvertParams {\n    fields: CmsModelFieldsWithParent[];\n    values?: CmsEntryValues;\n}\n\nexport interface ConverterCollectionParams {\n    plugins: PluginsContainer;\n}\n\nexport class ConverterCollection {\n    private readonly converters: Map<string, Converter> = new Map();\n\n    public constructor(params: ConverterCollectionParams) {\n        const { plugins } = params;\n        const fieldGraphQLPlugins = plugins.byType<CmsModelFieldToGraphQLPlugin>(\n            \"cms-model-field-to-graphql\"\n        );\n        const fieldConverterPlugins = plugins.byType<CmsModelFieldConverterPlugin>(\n            CmsModelFieldConverterPlugin.type\n        );\n        const defaultFieldConverterPlugin = fieldConverterPlugins.find(\n            pl => pl.getFieldType() === \"*\"\n        );\n        if (defaultFieldConverterPlugin === undefined) {\n            throw new WebinyError(\n                `Missing default field converter plugin.`,\n                \"DEFAULT_FIELD_CONVERTER_ERROR\"\n            );\n        }\n        for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {\n            const plugin = fieldConverterPlugins.find(\n                pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType\n            );\n            const converter = new Converter({\n                type: fieldGraphQLPlugin.fieldType,\n                plugin: plugin || defaultFieldConverterPlugin\n            });\n\n            this.addConverter(converter);\n        }\n    }\n\n    public addConverter(converter: Converter): void {\n        converter.setConverterCollection(this);\n        this.converters.set(converter.getType(), converter);\n    }\n\n    public getConverter(type: string): Converter {\n        const converter = this.converters.get(type);\n        if (converter === undefined) {\n            throw new WebinyError(\n                `Missing converter for field type \"${type}\".`,\n                \"CONVERTER_ERROR\",\n                {\n                    type\n                }\n            );\n        }\n        return converter;\n    }\n\n    public convertToStorage(params: ConverterCollectionConvertParams): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {\n                return output;\n            }\n            const values = converter.convertToStorage({\n                field,\n                value: inputValues[field.fieldId]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n\n    public convertFromStorage(\n        params: ConverterCollectionConvertParams\n    ): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {\n                return output;\n            }\n            const values = converter.convertFromStorage({\n                field,\n                value: inputValues[field.storageId]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_Converter","_plugins","_getBaseFieldType","ConverterCollection","converters","Map","constructor","params","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","CmsModelFieldConverterPlugin","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","WebinyError","fieldGraphQLPlugin","plugin","fieldType","converter","Converter","addConverter","setConverterCollection","set","getType","getConverter","get","convertToStorage","fields","values","inputValues","attachHasOwnProperty","reduce","output","field","baseType","getBaseFieldType","hasOwnProperty","fieldId","value","convertFromStorage","storageId","Array","isArray","Object","defineProperty","enumerable","writable","property","exports"],"sources":["ConverterCollection.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Converter } from \"./Converter\";\nimport { CmsEntryValues, CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable {\n    (params: ConverterCollectionConvertParams): CmsEntryValues;\n}\n\nexport interface ConverterCollectionConvertParams {\n    fields: CmsModelFieldsWithParent[];\n    values?: CmsEntryValues;\n}\n\nexport interface ConverterCollectionParams {\n    plugins: PluginsContainer;\n}\n\nexport class ConverterCollection {\n    private readonly converters: Map<string, Converter> = new Map();\n\n    public constructor(params: ConverterCollectionParams) {\n        const { plugins } = params;\n        const fieldGraphQLPlugins = plugins.byType<CmsModelFieldToGraphQLPlugin>(\n            \"cms-model-field-to-graphql\"\n        );\n        const fieldConverterPlugins = plugins.byType<CmsModelFieldConverterPlugin>(\n            CmsModelFieldConverterPlugin.type\n        );\n        const defaultFieldConverterPlugin = fieldConverterPlugins.find(\n            pl => pl.getFieldType() === \"*\"\n        );\n        if (defaultFieldConverterPlugin === undefined) {\n            throw new WebinyError(\n                `Missing default field converter plugin.`,\n                \"DEFAULT_FIELD_CONVERTER_ERROR\"\n            );\n        }\n        for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {\n            const plugin = fieldConverterPlugins.find(\n                pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType\n            );\n            const converter = new Converter({\n                type: fieldGraphQLPlugin.fieldType,\n                plugin: plugin || defaultFieldConverterPlugin\n            });\n\n            this.addConverter(converter);\n        }\n    }\n\n    public addConverter(converter: Converter): void {\n        converter.setConverterCollection(this);\n        this.converters.set(converter.getType(), converter);\n    }\n\n    public getConverter(type: string): Converter {\n        const converter = this.converters.get(type);\n        if (converter === undefined) {\n            throw new WebinyError(\n                `Missing converter for field type \"${type}\".`,\n                \"CONVERTER_ERROR\",\n                {\n                    type\n                }\n            );\n        }\n        return converter;\n    }\n\n    public convertToStorage(params: ConverterCollectionConvertParams): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        this.attachHasOwnProperty(inputValues);\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            const baseType = getBaseFieldType(field);\n            const converter = this.getConverter(baseType);\n            if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {\n                return output;\n            }\n            const values = converter.convertToStorage({\n                field,\n                value: inputValues[field.fieldId]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n\n    public convertFromStorage(\n        params: ConverterCollectionConvertParams\n    ): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce((output, field) => {\n            const baseType = getBaseFieldType(field);\n            const converter = this.getConverter(baseType);\n            if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {\n                return output;\n            }\n            const values = converter.convertFromStorage({\n                field,\n                value: inputValues[field.storageId]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n\n    /**\n     * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.\n     * At that point, hasOwnProperty does not exist, and we need to add it.\n     *\n     * TODO add more checks if required\n     */\n    private attachHasOwnProperty(values: CmsEntryValues) {\n        if (\n            // null or undefined?\n            values === null ||\n            values === undefined ||\n            // not an object?\n            typeof values !== \"object\" ||\n            // maybe it's an array?\n            Array.isArray(values) ||\n            // and in the end, check if hasOwnProperty is a function already\n            typeof values?.hasOwnProperty === \"function\"\n        ) {\n            return;\n        }\n        Object.defineProperty(values, \"hasOwnProperty\", {\n            enumerable: false,\n            writable: false,\n            value: function (property: string) {\n                return this[property] !== undefined;\n            }\n        });\n    }\n}\n"],"mappings":"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"}

package/utils/converters/valueKeyStorageConverter.d.ts

@@ -10,9 +10,5 @@ interface Params {
 }
 export declare const createValueKeyToStorageConverter: (params: Params) => CmsModelConverterCallable;
 export declare const createValueKeyFromStorageConverter: (params: Params) => CmsModelConverterCallable;
-interface AttachConvertersParams {
-    plugins: PluginsContainer;
-    model: CmsModel;
-}
-export declare const attachCmsModelFieldConverters: (params: AttachConvertersParams) => StorageOperationsCmsModel;
+export declare const createCmsModelFieldConvertersAttachFactory: (plugins: PluginsContainer) => (model: StorageOperationsCmsModel | CmsModel) => StorageOperationsCmsModel;
 export {};

package/utils/converters/valueKeyStorageConverter.js

@@ -1,49 +1,40 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createValueKeyToStorageConverter = exports.createValueKeyFromStorageConverter = exports.attachCmsModelFieldConverters = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
+exports.createValueKeyToStorageConverter = exports.createValueKeyFromStorageConverter = exports.createCmsModelFieldConvertersAttachFactory = void 0;
 var _ConverterCollection = require("./ConverterCollection");
-
 var _semver = _interopRequireDefault(require("semver"));
-
 const featureVersion = _semver.default.coerce("5.33.0");
-
 const isBetaOrNext = model => {
   if (!model.webinyVersion) {
     return false;
+  } else if (model.webinyVersion.startsWith("0.0.0")) {
+    return true;
   }
-
-  return model.webinyVersion.match(/next|beta/) !== null;
+  return model.webinyVersion.match(/next|beta|unstable/) !== null;
 };
-
 const isFeatureEnabled = model => {
   /**
    * In case of disabled webinyVersion value, we disable this feature.
    * This is only for testing...
    */
-  if (model.webinyVersion === "disable") {
+  const disableConversion = !!process.env.WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE;
+  if (model.webinyVersion === "disable" || disableConversion) {
     return false;
   }
   /**
    * If is a test environment, always have this turned on.
    */
-
-
-  if (process.env.NODE_ENV === "test" || isBetaOrNext(model) === true) {
+  const nodeEnv = process.env.NODE_ENV;
+  if (nodeEnv === "test" || nodeEnv === "disable" || isBetaOrNext(model)) {
     return true;
   }
   /**
    * Possibility that the version is not defined, this means it is a quite old system where models did not change.
    */
-
-
   if (!model.webinyVersion) {
     return false;
   }
@@ -52,26 +43,25 @@ const isFeatureEnabled = model => {
    *
    * TODO change if necessary after the update to the system
    */
-
-
   const modelVersion = _semver.default.coerce(model.webinyVersion);
-
   if (!modelVersion) {
     console.log(`Warning: Model "${model.modelId}" does not have valid Webiny version set.`);
     return true;
   } else if (_semver.default.compare(modelVersion, featureVersion) === -1) {
     return false;
   }
-
   return true;
 };
 
+/**
+ * In the first call of the converter we do not need the fields property as it will be taken directly from the model.
+ */
+
 const createValueKeyToStorageConverter = params => {
   const {
     plugins,
     model
   } = params;
-
   if (isFeatureEnabled(model) === false) {
     return ({
       values
@@ -79,7 +69,6 @@ const createValueKeyToStorageConverter = params => {
       return values || {};
     };
   }
-
   const converters = new _ConverterCollection.ConverterCollection({
     plugins
   });
@@ -94,15 +83,12 @@ const createValueKeyToStorageConverter = params => {
     return result || {};
   };
 };
-
 exports.createValueKeyToStorageConverter = createValueKeyToStorageConverter;
-
 const createValueKeyFromStorageConverter = params => {
   const {
     plugins,
     model
   } = params;
-
   if (isFeatureEnabled(model) === false) {
     return ({
       values
@@ -110,7 +96,6 @@ const createValueKeyFromStorageConverter = params => {
       return values || {};
     };
   }
-
   const converters = new _ConverterCollection.ConverterCollection({
     plugins
   });
@@ -125,24 +110,26 @@ const createValueKeyFromStorageConverter = params => {
     return result || {};
   };
 };
-
 exports.createValueKeyFromStorageConverter = createValueKeyFromStorageConverter;
-
-const attachCmsModelFieldConverters = params => {
-  const {
-    model,
-    plugins
-  } = params;
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
-    convertValueKeyToStorage: createValueKeyToStorageConverter({
-      model,
-      plugins
-    }),
-    convertValueKeyFromStorage: createValueKeyFromStorageConverter({
-      model,
-      plugins
-    })
-  });
+const createCmsModelFieldConvertersAttachFactory = plugins => {
+  return model => {
+    const storageModel = model;
+    if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {
+      return storageModel;
+    }
+    return {
+      ...model,
+      convertValueKeyToStorage: createValueKeyToStorageConverter({
+        model,
+        plugins
+      }),
+      convertValueKeyFromStorage: createValueKeyFromStorageConverter({
+        model,
+        plugins
+      })
+    };
+  };
 };
+exports.createCmsModelFieldConvertersAttachFactory = createCmsModelFieldConvertersAttachFactory;
 
-exports.attachCmsModelFieldConverters = attachCmsModelFieldConverters;
+//# sourceMappingURL=valueKeyStorageConverter.js.map