@webiny/api-headless-cms 0.0.0-unstable.d7f521b032 → 0.0.0-unstable.de38392959

package/utils/caching/Cache.d.ts

@@ -0,0 +1,2 @@
+import { ICache } from "./types";
+export declare const createMemoryCache: <T>() => ICache<T>;

package/utils/caching/Cache.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMemoryCache = void 0;
+class Cache {
+  _cache = new Map();
+  constructor() {
+    // Prevent direct instantiation.
+  }
+  static create() {
+    return new this();
+  }
+  get(cacheKey) {
+    const key = cacheKey.get();
+    const value = this._cache.get(key);
+    return value || null;
+  }
+  set(cacheKey, value) {
+    const key = cacheKey.get();
+    this._cache.set(key, value);
+    return value;
+  }
+  getOrSet(cacheKey, cb) {
+    const existing = this.get(cacheKey);
+    if (existing) {
+      return existing;
+    }
+    const value = cb();
+    return this.set(cacheKey, value);
+  }
+  clear(cacheKey) {
+    if (!cacheKey) {
+      this._cache.clear();
+      return;
+    } else if (Array.isArray(cacheKey)) {
+      for (const key of cacheKey) {
+        this._cache.delete(key.get());
+      }
+      return;
+    }
+    this._cache.delete(cacheKey.get());
+  }
+}
+const createMemoryCache = () => {
+  return Cache.create();
+};
+exports.createMemoryCache = createMemoryCache;
+
+//# sourceMappingURL=Cache.js.map

package/utils/caching/Cache.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Cache","_cache","Map","constructor","create","get","cacheKey","key","value","set","getOrSet","cb","existing","clear","Array","isArray","delete","createMemoryCache","exports"],"sources":["Cache.ts"],"sourcesContent":["import { ICache, ICacheKey } from \"./types\";\n\nclass Cache<T> implements ICache {\n    private _cache: Map<string, T> = new Map();\n\n    protected constructor() {\n        // Prevent direct instantiation.\n    }\n\n    public static create<R>() {\n        return new this<R>();\n    }\n\n    public get(cacheKey: ICacheKey): T | null {\n        const key = cacheKey.get();\n        const value = this._cache.get(key);\n        return value || null;\n    }\n\n    public set(cacheKey: ICacheKey, value: T): T {\n        const key = cacheKey.get();\n        this._cache.set(key, value);\n        return value;\n    }\n\n    public getOrSet(cacheKey: ICacheKey, cb: () => T): T {\n        const existing = this.get(cacheKey);\n        if (existing) {\n            return existing;\n        }\n        const value = cb();\n        return this.set(cacheKey, value);\n    }\n\n    public clear(cacheKey?: ICacheKey | ICacheKey[]) {\n        if (!cacheKey) {\n            this._cache.clear();\n            return;\n        } else if (Array.isArray(cacheKey)) {\n            for (const key of cacheKey) {\n                this._cache.delete(key.get());\n            }\n            return;\n        }\n\n        this._cache.delete(cacheKey.get());\n    }\n}\n\nexport const createMemoryCache = <T>(): ICache<T> => {\n    return Cache.create<T>();\n};\n"],"mappings":";;;;;;AAEA,MAAMA,KAAK,CAAsB;EACrBC,MAAM,GAAmB,IAAIC,GAAG,CAAC,CAAC;EAEhCC,WAAWA,CAAA,EAAG;IACpB;EAAA;EAGJ,OAAcC,MAAMA,CAAA,EAAM;IACtB,OAAO,IAAI,IAAI,CAAI,CAAC;EACxB;EAEOC,GAAGA,CAACC,QAAmB,EAAY;IACtC,MAAMC,GAAG,GAAGD,QAAQ,CAACD,GAAG,CAAC,CAAC;IAC1B,MAAMG,KAAK,GAAG,IAAI,CAACP,MAAM,CAACI,GAAG,CAACE,GAAG,CAAC;IAClC,OAAOC,KAAK,IAAI,IAAI;EACxB;EAEOC,GAAGA,CAACH,QAAmB,EAAEE,KAAQ,EAAK;IACzC,MAAMD,GAAG,GAAGD,QAAQ,CAACD,GAAG,CAAC,CAAC;IAC1B,IAAI,CAACJ,MAAM,CAACQ,GAAG,CAACF,GAAG,EAAEC,KAAK,CAAC;IAC3B,OAAOA,KAAK;EAChB;EAEOE,QAAQA,CAACJ,QAAmB,EAAEK,EAAW,EAAK;IACjD,MAAMC,QAAQ,GAAG,IAAI,CAACP,GAAG,CAACC,QAAQ,CAAC;IACnC,IAAIM,QAAQ,EAAE;MACV,OAAOA,QAAQ;IACnB;IACA,MAAMJ,KAAK,GAAGG,EAAE,CAAC,CAAC;IAClB,OAAO,IAAI,CAACF,GAAG,CAACH,QAAQ,EAAEE,KAAK,CAAC;EACpC;EAEOK,KAAKA,CAACP,QAAkC,EAAE;IAC7C,IAAI,CAACA,QAAQ,EAAE;MACX,IAAI,CAACL,MAAM,CAACY,KAAK,CAAC,CAAC;MACnB;IACJ,CAAC,MAAM,IAAIC,KAAK,CAACC,OAAO,CAACT,QAAQ,CAAC,EAAE;MAChC,KAAK,MAAMC,GAAG,IAAID,QAAQ,EAAE;QACxB,IAAI,CAACL,MAAM,CAACe,MAAM,CAACT,GAAG,CAACF,GAAG,CAAC,CAAC,CAAC;MACjC;MACA;IACJ;IAEA,IAAI,CAACJ,MAAM,CAACe,MAAM,CAACV,QAAQ,CAACD,GAAG,CAAC,CAAC,CAAC;EACtC;AACJ;AAEO,MAAMY,iBAAiB,GAAGA,CAAA,KAAoB;EACjD,OAAOjB,KAAK,CAACI,MAAM,CAAI,CAAC;AAC5B,CAAC;AAACc,OAAA,CAAAD,iBAAA,GAAAA,iBAAA"}

package/utils/caching/CacheKey.d.ts

@@ -0,0 +1,2 @@
+import { ICacheKey, ICacheKeyKeys } from "./types";
+export declare const createCacheKey: (key: ICacheKeyKeys) => ICacheKey;

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

@@ -5,13 +5,10 @@ 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;
   }
@@ -55,4 +52,6 @@ class Converter {
     });
   }
 }
-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,SAAS,CAAC;EAMZC,WAAW,CAACC,MAAuB,EAAE;IAAA;IAAA;IAAA,kDAFUC,SAAS;IAG3D,IAAI,CAACC,IAAI,GAAGF,MAAM,CAACE,IAAI;IACvB,IAAI,CAACC,MAAM,GAAGH,MAAM,CAACG,MAAM;EAC/B;EAEOC,sBAAsB,CAACC,UAA+B,EAAQ;IACjE,IAAI,IAAI,CAACA,UAAU,EAAE;MACjB,MAAM,IAAIC,cAAW,CAChB,8EAA6E,IAAI,CAACJ,IAAK,IAAG,EAC3F,4BAA4B,EAC5B;QACIA,IAAI,EAAE,IAAI,CAACA;MACf,CAAC,CACJ;IACL;IACA,IAAI,CAACG,UAAU,GAAGA,UAAU;EAChC;EAEOE,sBAAsB,GAAwB;IACjD,IAAI,CAAC,IAAI,CAACF,UAAU,EAAE;MAClB,MAAM,IAAIC,cAAW,CAChB,uEAAsE,IAAI,CAACJ,IAAK,IAAG,CACvF;IACL;IACA,OAAO,IAAI,CAACG,UAAU;EAC1B;EAEOG,OAAO,GAAW;IACrB,OAAO,IAAI,CAACN,IAAI;EACpB;EAEOO,gBAAgB,CAACC,MAA8B,EAAkB;IACpE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,MAAM;IAE/B,OAAO,IAAI,CAACP,MAAM,CAACM,gBAAgB,CAAC;MAChCE,KAAK;MACLC,KAAK;MACLC,mBAAmB,EAAE,IAAI,CAACN,sBAAsB;IACpD,CAAC,CAAC;EACN;EAEOO,kBAAkB,CAACJ,MAA8B,EAAkB;IACtE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,MAAM;IAE/B,OAAO,IAAI,CAACP,MAAM,CAACW,kBAAkB,CAAC;MAClCH,KAAK;MACLC,KAAK;MACLC,mBAAmB,EAAE,IAAI,CAACN,sBAAsB;IACpD,CAAC,CAAC;EACN;AACJ;AAAC"}
+{"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.js

@@ -5,15 +5,13 @@ 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;
@@ -64,7 +62,10 @@ class ConverterCollection {
         field,
         value: inputValues[field.fieldId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
   convertFromStorage(params) {
@@ -85,7 +86,10 @@ class ConverterCollection {
         field,
         value: inputValues[field.storageId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
 
@@ -104,7 +108,7 @@ class ConverterCollection {
     // maybe it's an array?
     Array.isArray(values) ||
     // and in the end, check if hasOwnProperty is a function already
-    typeof (values === null || values === void 0 ? void 0 : values.hasOwnProperty) === "function") {
+    typeof values?.hasOwnProperty === "function") {
       return;
     }
     Object.defineProperty(values, "hasOwnProperty", {
@@ -116,4 +120,6 @@ class ConverterCollection {
     });
   }
 }
-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","attachHasOwnProperty","reduce","output","field","baseType","getBaseFieldType","hasOwnProperty","fieldId","value","convertFromStorage","storageId","Array","isArray","Object","defineProperty","enumerable","writable","property"],"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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"}
+{"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

@@ -4,29 +4,32 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 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;
   }
   /**
@@ -49,6 +52,11 @@ const isFeatureEnabled = model => {
   }
   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,
@@ -103,20 +111,25 @@ const createValueKeyFromStorageConverter = params => {
   };
 };
 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.attachCmsModelFieldConverters = attachCmsModelFieldConverters;
+exports.createCmsModelFieldConvertersAttachFactory = createCmsModelFieldConvertersAttachFactory;
+
+//# sourceMappingURL=valueKeyStorageConverter.js.map

package/utils/converters/valueKeyStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["featureVersion","semver","coerce","isBetaOrNext","model","webinyVersion","match","isFeatureEnabled","process","env","NODE_ENV","modelVersion","console","log","modelId","compare","createValueKeyToStorageConverter","params","plugins","values","converters","ConverterCollection","fields","result","convertToStorage","createValueKeyFromStorageConverter","convertFromStorage","attachCmsModelFieldConverters","convertValueKeyToStorage","convertValueKeyFromStorage"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsModelConverterCallable,\n    ConverterCollection,\n    ConverterCollectionConvertParams as BaseConverterCollectionConvertParams\n} from \"~/utils/converters/ConverterCollection\";\nimport { CmsModel, StorageOperationsCmsModel } from \"~/types\";\nimport semver, { SemVer } from \"semver\";\n\nconst featureVersion = semver.coerce(\"5.33.0\") as SemVer;\n\nconst isBetaOrNext = (model: CmsModel): boolean => {\n    if (!model.webinyVersion) {\n        return false;\n    }\n    return model.webinyVersion.match(/next|beta/) !== null;\n};\n\nconst isFeatureEnabled = (model: CmsModel): boolean => {\n    /**\n     * In case of disabled webinyVersion value, we disable this feature.\n     * This is only for testing...\n     */\n    if (model.webinyVersion === \"disable\") {\n        return false;\n    }\n    /**\n     * If is a test environment, always have this turned on.\n     */\n    if (process.env.NODE_ENV === \"test\" || isBetaOrNext(model) === true) {\n        return true;\n    }\n    /**\n     * Possibility that the version is not defined, this means it is a quite old system where models did not change.\n     */\n    if (!model.webinyVersion) {\n        return false;\n    }\n    /**\n     * In case feature version value is greater than the model version, feature is not enabled as it is an older model with no storageId.\n     *\n     * TODO change if necessary after the update to the system\n     */\n    const modelVersion = semver.coerce(model.webinyVersion);\n    if (!modelVersion) {\n        console.log(`Warning: Model \"${model.modelId}\" does not have valid Webiny version set.`);\n        return true;\n    } else if (semver.compare(modelVersion, featureVersion) === -1) {\n        return false;\n    }\n    return true;\n};\n\ninterface Params {\n    /**\n     * We need a model to determine if the conversion feature is enabled.\n     */\n    model: CmsModel;\n    plugins: PluginsContainer;\n}\n\n/**\n * In the first call of the converter we do not need the fields property as it will be taken directly from the model.\n */\ninterface ConverterCollectionConvertParams\n    extends Omit<BaseConverterCollectionConvertParams, \"fields\"> {\n    fields?: BaseConverterCollectionConvertParams[\"fields\"];\n}\n\nexport const createValueKeyToStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertToStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\nexport const createValueKeyFromStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertFromStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\ninterface AttachConvertersParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const attachCmsModelFieldConverters = (\n    params: AttachConvertersParams\n): StorageOperationsCmsModel => {\n    const { model, plugins } = params;\n    return {\n        ...model,\n        convertValueKeyToStorage: createValueKeyToStorageConverter({\n            model,\n            plugins\n        }),\n        convertValueKeyFromStorage: createValueKeyFromStorageConverter({\n            model,\n            plugins\n        })\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_ConverterCollection","require","_semver","_interopRequireDefault","featureVersion","semver","coerce","isBetaOrNext","model","webinyVersion","startsWith","match","isFeatureEnabled","disableConversion","process","env","WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE","nodeEnv","NODE_ENV","modelVersion","console","log","modelId","compare","createValueKeyToStorageConverter","params","plugins","values","converters","ConverterCollection","fields","result","convertToStorage","exports","createValueKeyFromStorageConverter","convertFromStorage","createCmsModelFieldConvertersAttachFactory","storageModel","convertValueKeyToStorage","convertValueKeyFromStorage"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsModelConverterCallable,\n    ConverterCollection,\n    ConverterCollectionConvertParams as BaseConverterCollectionConvertParams\n} from \"~/utils/converters/ConverterCollection\";\nimport { CmsModel, StorageOperationsCmsModel } from \"~/types\";\nimport semver, { SemVer } from \"semver\";\n\nconst featureVersion = semver.coerce(\"5.33.0\") as SemVer;\n\nconst isBetaOrNext = (model: CmsModel): boolean => {\n    if (!model.webinyVersion) {\n        return false;\n    } else if (model.webinyVersion.startsWith(\"0.0.0\")) {\n        return true;\n    }\n    return model.webinyVersion.match(/next|beta|unstable/) !== null;\n};\n\nconst isFeatureEnabled = (model: CmsModel): boolean => {\n    /**\n     * In case of disabled webinyVersion value, we disable this feature.\n     * This is only for testing...\n     */\n    const disableConversion = !!process.env.WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE;\n    if (model.webinyVersion === \"disable\" || disableConversion) {\n        return false;\n    }\n    /**\n     * If is a test environment, always have this turned on.\n     */\n    const nodeEnv = process.env.NODE_ENV as string;\n    if (nodeEnv === \"test\" || nodeEnv === \"disable\" || isBetaOrNext(model)) {\n        return true;\n    }\n    /**\n     * Possibility that the version is not defined, this means it is a quite old system where models did not change.\n     */\n    if (!model.webinyVersion) {\n        return false;\n    }\n    /**\n     * In case feature version value is greater than the model version, feature is not enabled as it is an older model with no storageId.\n     *\n     * TODO change if necessary after the update to the system\n     */\n    const modelVersion = semver.coerce(model.webinyVersion);\n    if (!modelVersion) {\n        console.log(`Warning: Model \"${model.modelId}\" does not have valid Webiny version set.`);\n        return true;\n    } else if (semver.compare(modelVersion, featureVersion) === -1) {\n        return false;\n    }\n    return true;\n};\n\ninterface Params {\n    /**\n     * We need a model to determine if the conversion feature is enabled.\n     */\n    model: CmsModel;\n    plugins: PluginsContainer;\n}\n\n/**\n * In the first call of the converter we do not need the fields property as it will be taken directly from the model.\n */\ninterface ConverterCollectionConvertParams\n    extends Omit<BaseConverterCollectionConvertParams, \"fields\"> {\n    fields?: BaseConverterCollectionConvertParams[\"fields\"];\n}\n\nexport const createValueKeyToStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertToStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\nexport const createValueKeyFromStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertFromStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\nexport const createCmsModelFieldConvertersAttachFactory = (plugins: PluginsContainer) => {\n    return (model: StorageOperationsCmsModel | CmsModel): StorageOperationsCmsModel => {\n        const storageModel = model as Partial<StorageOperationsCmsModel>;\n        if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {\n            return storageModel as StorageOperationsCmsModel;\n        }\n        return {\n            ...model,\n            convertValueKeyToStorage: createValueKeyToStorageConverter({\n                model,\n                plugins\n            }),\n            convertValueKeyFromStorage: createValueKeyFromStorageConverter({\n                model,\n                plugins\n            })\n        };\n    };\n};\n"],"mappings":"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"}

package/utils/createTypeFromFields.d.ts

@@ -1,6 +1,7 @@
 import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types";
 interface TypeFromFieldParams {
     typeOfType: "type" | "input";
+    models: CmsModel[];
     model: CmsModel;
     type: ApiEndpoint;
     typeNamePrefix: string;

package/utils/createTypeFromFields.js

@@ -4,20 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTypeFromFields = void 0;
-var _createTypeName = require("./createTypeName");
 var _renderFields = require("./renderFields");
 var _renderInputFields = require("./renderInputFields");
 const createTypeFromFields = params => {
   const {
     typeOfType,
     model,
+    models,
     type,
     typeNamePrefix,
     fields,
     fieldTypePlugins
   } = params;
   const typeSuffix = typeOfType === "input" ? "Input" : "";
-  const mTypeName = (0, _createTypeName.createTypeName)(model.modelId);
+  const mTypeName = model.singularApiName;
   const typeFields = [];
   const nestedTypes = [];
 
@@ -27,14 +27,16 @@ const createTypeFromFields = params => {
   // Every time the types are returned, we need to replace the model name in the generated type name
   // with the actual prefix which includes parent field name type.
   const replace = new RegExp(`${mTypeName}_`, "g");
-  for (const f of fields) {
+  for (const field of fields) {
     const result = typeOfType === "type" ? (0, _renderFields.renderField)({
-      field: f,
+      field,
       type,
+      models,
       model,
       fieldTypePlugins
     }) : (0, _renderInputFields.renderInputField)({
-      field: f,
+      field,
+      models,
       model,
       fieldTypePlugins
     });
@@ -50,6 +52,9 @@ const createTypeFromFields = params => {
       nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));
     }
   }
+  if (!typeFields.length) {
+    typeFields.push("_empty: String");
+  }
   return {
     fieldType: `${typeNamePrefix}${typeSuffix}`,
     typeDefs: /* GraphQL */`
@@ -57,8 +62,10 @@ const createTypeFromFields = params => {
 
             ${typeOfType} ${typeNamePrefix}${typeSuffix} {
                 ${typeFields.join("\n")}
-            }
+            }\n
         `
   };
 };
-exports.createTypeFromFields = createTypeFromFields;
+exports.createTypeFromFields = createTypeFromFields;
+
+//# sourceMappingURL=createTypeFromFields.js.map

package/utils/createTypeFromFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["createTypeFromFields","params","typeOfType","model","type","typeNamePrefix","fields","fieldTypePlugins","typeSuffix","mTypeName","createTypeName","modelId","typeFields","nestedTypes","replace","RegExp","f","result","renderField","field","renderInputField","typeDefs","push","fieldType","join"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { createTypeName } from \"~/utils/createTypeName\";\nimport { renderField } from \"~/utils/renderFields\";\nimport { renderInputField } from \"~/utils/renderInputFields\";\nimport { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types\";\n\ninterface TypeFromFieldParams {\n    typeOfType: \"type\" | \"input\";\n    model: CmsModel;\n    type: ApiEndpoint;\n    typeNamePrefix: string;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface TypeFromFieldResponse {\n    fieldType: string;\n    typeDefs: string;\n}\n\nexport const createTypeFromFields = (params: TypeFromFieldParams): TypeFromFieldResponse | null => {\n    const { typeOfType, model, type, typeNamePrefix, fields, fieldTypePlugins } = params;\n    const typeSuffix = typeOfType === \"input\" ? \"Input\" : \"\";\n    const mTypeName = createTypeName(model.modelId);\n\n    const typeFields = [];\n    const nestedTypes = [];\n\n    // Once the loop below starts, we'll be executing a recursive \"object\" type generation.\n    // The main trick here is that nested objects don't know who the parent is, and will generate\n    // type names using the \"model\", as if they're at the top level:\n    // Every time the types are returned, we need to replace the model name in the generated type name\n    // with the actual prefix which includes parent field name type.\n    const replace = new RegExp(`${mTypeName}_`, \"g\");\n\n    for (const f of fields) {\n        const result =\n            typeOfType === \"type\"\n                ? renderField({ field: f, type, model, fieldTypePlugins })\n                : renderInputField({ field: f, model, fieldTypePlugins });\n\n        if (!result) {\n            continue;\n        }\n\n        const { fields, typeDefs } = result;\n\n        typeFields.push(fields.replace(replace, `${typeNamePrefix}_`));\n        if (typeDefs) {\n            nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));\n        }\n    }\n\n    return {\n        fieldType: `${typeNamePrefix}${typeSuffix}`,\n        typeDefs: /* GraphQL */ `\n            ${nestedTypes.join(\"\\n\")}\n\n            ${typeOfType} ${typeNamePrefix}${typeSuffix} {\n                ${typeFields.join(\"\\n\")}\n            }\n        `\n    };\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAiBO,MAAMA,oBAAoB,GAAIC,MAA2B,IAAmC;EAC/F,MAAM;IAAEC,UAAU;IAAEC,KAAK;IAAEC,IAAI;IAAEC,cAAc;IAAEC,MAAM;IAAEC;EAAiB,CAAC,GAAGN,MAAM;EACpF,MAAMO,UAAU,GAAGN,UAAU,KAAK,OAAO,GAAG,OAAO,GAAG,EAAE;EACxD,MAAMO,SAAS,GAAG,IAAAC,8BAAc,EAACP,KAAK,CAACQ,OAAO,CAAC;EAE/C,MAAMC,UAAU,GAAG,EAAE;EACrB,MAAMC,WAAW,GAAG,EAAE;;EAEtB;EACA;EACA;EACA;EACA;EACA,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAAE,GAAEN,SAAU,GAAE,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMO,CAAC,IAAIV,MAAM,EAAE;IACpB,MAAMW,MAAM,GACRf,UAAU,KAAK,MAAM,GACf,IAAAgB,yBAAW,EAAC;MAAEC,KAAK,EAAEH,CAAC;MAAEZ,IAAI;MAAED,KAAK;MAAEI;IAAiB,CAAC,CAAC,GACxD,IAAAa,mCAAgB,EAAC;MAAED,KAAK,EAAEH,CAAC;MAAEb,KAAK;MAAEI;IAAiB,CAAC,CAAC;IAEjE,IAAI,CAACU,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEX,MAAM;MAAEe;IAAS,CAAC,GAAGJ,MAAM;IAEnCL,UAAU,CAACU,IAAI,CAAChB,MAAM,CAACQ,OAAO,CAACA,OAAO,EAAG,GAAET,cAAe,GAAE,CAAC,CAAC;IAC9D,IAAIgB,QAAQ,EAAE;MACVR,WAAW,CAACS,IAAI,CAACD,QAAQ,CAACP,OAAO,CAACA,OAAO,EAAG,GAAET,cAAe,GAAE,CAAC,CAAC;IACrE;EACJ;EAEA,OAAO;IACHkB,SAAS,EAAG,GAAElB,cAAe,GAAEG,UAAW,EAAC;IAC3Ca,QAAQ,EAAE,aAAe;AACjC,cAAcR,WAAW,CAACW,IAAI,CAAC,IAAI,CAAE;AACrC;AACA,cAActB,UAAW,IAAGG,cAAe,GAAEG,UAAW;AACxD,kBAAkBI,UAAU,CAACY,IAAI,CAAC,IAAI,CAAE;AACxC;AACA;EACI,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_renderFields","require","_renderInputFields","createTypeFromFields","params","typeOfType","model","models","type","typeNamePrefix","fields","fieldTypePlugins","typeSuffix","mTypeName","singularApiName","typeFields","nestedTypes","replace","RegExp","field","result","renderField","renderInputField","typeDefs","push","length","fieldType","join","exports"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { renderField } from \"~/utils/renderFields\";\nimport { renderInputField } from \"~/utils/renderInputFields\";\nimport { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types\";\n\ninterface TypeFromFieldParams {\n    typeOfType: \"type\" | \"input\";\n    models: CmsModel[];\n    model: CmsModel;\n    type: ApiEndpoint;\n    typeNamePrefix: string;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface TypeFromFieldResponse {\n    fieldType: string;\n    typeDefs: string;\n}\n\nexport const createTypeFromFields = (params: TypeFromFieldParams): TypeFromFieldResponse | null => {\n    const { typeOfType, model, models, type, typeNamePrefix, fields, fieldTypePlugins } = params;\n    const typeSuffix = typeOfType === \"input\" ? \"Input\" : \"\";\n    const mTypeName = model.singularApiName;\n\n    const typeFields: string[] = [];\n    const nestedTypes: string[] = [];\n\n    // Once the loop below starts, we'll be executing a recursive \"object\" type generation.\n    // The main trick here is that nested objects don't know who the parent is, and will generate\n    // type names using the \"model\", as if they're at the top level:\n    // Every time the types are returned, we need to replace the model name in the generated type name\n    // with the actual prefix which includes parent field name type.\n    const replace = new RegExp(`${mTypeName}_`, \"g\");\n\n    for (const field of fields) {\n        const result =\n            typeOfType === \"type\"\n                ? renderField({ field, type, models, model, fieldTypePlugins })\n                : renderInputField({ field, models, model, fieldTypePlugins });\n\n        if (!result) {\n            continue;\n        }\n\n        const { fields, typeDefs } = result;\n\n        typeFields.push(fields.replace(replace, `${typeNamePrefix}_`));\n        if (typeDefs) {\n            nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));\n        }\n    }\n\n    if (!typeFields.length) {\n        typeFields.push(\"_empty: String\");\n    }\n\n    return {\n        fieldType: `${typeNamePrefix}${typeSuffix}`,\n        typeDefs: /* GraphQL */ `\n            ${nestedTypes.join(\"\\n\")}\n\n            ${typeOfType} ${typeNamePrefix}${typeSuffix} {\n                ${typeFields.join(\"\\n\")}\n            }\\n\n        `\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAkBO,MAAME,oBAAoB,GAAIC,MAA2B,IAAmC;EAC/F,MAAM;IAAEC,UAAU;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,cAAc;IAAEC,MAAM;IAAEC;EAAiB,CAAC,GAAGP,MAAM;EAC5F,MAAMQ,UAAU,GAAGP,UAAU,KAAK,OAAO,GAAG,OAAO,GAAG,EAAE;EACxD,MAAMQ,SAAS,GAAGP,KAAK,CAACQ,eAAe;EAEvC,MAAMC,UAAoB,GAAG,EAAE;EAC/B,MAAMC,WAAqB,GAAG,EAAE;;EAEhC;EACA;EACA;EACA;EACA;EACA,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAAE,GAAEL,SAAU,GAAE,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMM,KAAK,IAAIT,MAAM,EAAE;IACxB,MAAMU,MAAM,GACRf,UAAU,KAAK,MAAM,GACf,IAAAgB,yBAAW,EAAC;MAAEF,KAAK;MAAEX,IAAI;MAAED,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC,GAC7D,IAAAW,mCAAgB,EAAC;MAAEH,KAAK;MAAEZ,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC;IAEtE,IAAI,CAACS,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEV,MAAM;MAAEa;IAAS,CAAC,GAAGH,MAAM;IAEnCL,UAAU,CAACS,IAAI,CAACd,MAAM,CAACO,OAAO,CAACA,OAAO,EAAG,GAAER,cAAe,GAAE,CAAC,CAAC;IAC9D,IAAIc,QAAQ,EAAE;MACVP,WAAW,CAACQ,IAAI,CAACD,QAAQ,CAACN,OAAO,CAACA,OAAO,EAAG,GAAER,cAAe,GAAE,CAAC,CAAC;IACrE;EACJ;EAEA,IAAI,CAACM,UAAU,CAACU,MAAM,EAAE;IACpBV,UAAU,CAACS,IAAI,CAAC,gBAAgB,CAAC;EACrC;EAEA,OAAO;IACHE,SAAS,EAAG,GAAEjB,cAAe,GAAEG,UAAW,EAAC;IAC3CW,QAAQ,EAAE,aAAe;AACjC,cAAcP,WAAW,CAACW,IAAI,CAAC,IAAI,CAAE;AACrC;AACA,cAActB,UAAW,IAAGI,cAAe,GAAEG,UAAW;AACxD,kBAAkBG,UAAU,CAACY,IAAI,CAAC,IAAI,CAAE;AACxC;AACA;EACI,CAAC;AACL,CAAC;AAACC,OAAA,CAAAzB,oBAAA,GAAAA,oBAAA"}

package/utils/createTypeName.d.ts

@@ -1,3 +1 @@
 export declare const createTypeName: (modelId: string) => string;
-export declare const createReadTypeName: (baseTypeName: string) => string;
-export declare const createManageTypeName: (baseTypeName: string) => string;

package/utils/createTypeName.js

@@ -4,18 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createTypeName = exports.createReadTypeName = exports.createManageTypeName = void 0;
+exports.createTypeName = void 0;
 var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
 const createTypeName = modelId => {
   return (0, _upperFirst.default)((0, _camelCase.default)(modelId));
 };
 exports.createTypeName = createTypeName;
-const createReadTypeName = baseTypeName => {
-  return createTypeName(baseTypeName);
-};
-exports.createReadTypeName = createReadTypeName;
-const createManageTypeName = baseTypeName => {
-  return createTypeName(baseTypeName);
-};
-exports.createManageTypeName = createManageTypeName;
+
+//# sourceMappingURL=createTypeName.js.map

package/utils/createTypeName.js.map

@@ -1 +1 @@
-{"version":3,"names":["createTypeName","modelId","upperFirst","camelCase","createReadTypeName","baseTypeName","createManageTypeName"],"sources":["createTypeName.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport camelCase from \"lodash/camelCase\";\n\nexport const createTypeName = (modelId: string): string => {\n    return upperFirst(camelCase(modelId));\n};\n\nexport const createReadTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n\nexport const createManageTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n"],"mappings":";;;;;;;AAAA;AACA;AAEO,MAAMA,cAAc,GAAIC,OAAe,IAAa;EACvD,OAAO,IAAAC,mBAAU,EAAC,IAAAC,kBAAS,EAACF,OAAO,CAAC,CAAC;AACzC,CAAC;AAAC;AAEK,MAAMG,kBAAkB,GAAIC,YAAoB,IAAa;EAChE,OAAOL,cAAc,CAACK,YAAY,CAAC;AACvC,CAAC;AAAC;AAEK,MAAMC,oBAAoB,GAAID,YAAoB,IAAa;EAClE,OAAOL,cAAc,CAACK,YAAY,CAAC;AACvC,CAAC;AAAC"}
+{"version":3,"names":["_upperFirst","_interopRequireDefault","require","_camelCase","createTypeName","modelId","upperFirst","camelCase","exports"],"sources":["createTypeName.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport camelCase from \"lodash/camelCase\";\n\nexport const createTypeName = (modelId: string): string => {\n    return upperFirst(camelCase(modelId));\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEO,MAAME,cAAc,GAAIC,OAAe,IAAa;EACvD,OAAO,IAAAC,mBAAU,EAAC,IAAAC,kBAAS,EAACF,OAAO,CAAC,CAAC;AACzC,CAAC;AAACG,OAAA,CAAAJ,cAAA,GAAAA,cAAA"}