@opra/common 1.17.3 → 1.17.5

package/cjs/document/data-type/complex-type-base.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComplexTypeBase = exports.FIELD_PATH_PATTERN = void 0;
+const tslib_1 = require("tslib");
+const hash_object_1 = tslib_1.__importDefault(require("hash-object"));
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
@@ -199,14 +201,16 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
      *
      */
     generateCodec(codec, options) {
-        const projection = Array.isArray(options?.projection)
-            ? (0, index_js_1.parseFieldsProjection)(options.projection)
-            : options?.projection;
-        const schema = this._generateSchema(codec, {
-            ...options,
-            projection,
-            currentPath: '',
-        });
+        const context = options?.cache
+            ? options
+            : {
+                ...options,
+                projection: Array.isArray(options?.projection)
+                    ? (0, index_js_1.parseFieldsProjection)(options.projection)
+                    : options?.projection,
+                currentPath: '',
+            };
+        const schema = this._generateSchema(codec, context);
         let additionalFields;
         if (this.additionalFields instanceof data_type_js_1.DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -218,10 +222,10 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
                 additionalFields = 'error';
             else {
                 const message = additionalFields[1];
-                additionalFields = (0, valgen_1.validator)((input, context, _this) => context.fail(_this, message, input));
+                additionalFields = (0, valgen_1.validator)((input, ctx, _this) => ctx.fail(_this, message, input));
             }
         }
-        return valgen_1.vg.isObject(schema, {
+        const fn = valgen_1.vg.isObject(schema, {
             ctor: this.name === 'object' ? Object : this.ctor,
             additionalFields,
             name: this.name,
@@ -229,8 +233,17 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             caseInSensitive: options?.caseInSensitive,
             onFail: options?.onFail,
         });
+        if (context.level === 0 && context.forwardCallbacks?.size) {
+            for (const cb of context.forwardCallbacks) {
+                cb();
+            }
+        }
+        return fn;
     }
     _generateSchema(codec, context) {
+        context.cache = context.cache || new Map();
+        context.level = context.level || 0;
+        context.forwardCallbacks = context.forwardCallbacks || new Set();
         const schema = {};
         const { currentPath, projection } = context;
         const pickList = !!(projection && Object.values(projection).find(p => !p.sign));
@@ -263,14 +276,40 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
                     continue;
                 }
             }
-            const fn = this._generateFieldCodec(codec, field, {
-                ...context,
-                partial: context.partial === 'deep' ? context.partial : undefined,
-                projection: typeof projection === 'object'
-                    ? projection[fieldName]?.projection || '*'
-                    : projection,
-                currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
-            });
+            const subProjection = typeof projection === 'object'
+                ? projection[fieldName]?.projection || '*'
+                : projection;
+            let cacheItem = context.cache.get(field.type);
+            const cacheKey = typeof subProjection === 'string'
+                ? subProjection
+                : (0, hash_object_1.default)(subProjection || {});
+            if (!cacheItem) {
+                cacheItem = {};
+                context.cache.set(field.type, cacheItem);
+            }
+            let fn = cacheItem[cacheKey];
+            /** If in progress (circular) */
+            if (fn === null) {
+                // Temporary set any
+                fn = valgen_1.vg.isAny();
+                context.forwardCallbacks.add(() => {
+                    fn = cacheItem[cacheKey];
+                    schema[fieldName] =
+                        context.partial || !field.required
+                            ? valgen_1.vg.optional(fn)
+                            : valgen_1.vg.required(fn);
+                });
+            }
+            else if (!fn) {
+                cacheItem[cacheKey] = null;
+                fn = this._generateFieldCodec(codec, field, {
+                    ...context,
+                    partial: context.partial === 'deep' ? context.partial : undefined,
+                    projection: subProjection,
+                    currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
+                });
+                cacheItem[cacheKey] = fn;
+            }
             schema[fieldName] =
                 context.partial || !field.required ? valgen_1.vg.optional(fn) : valgen_1.vg.required(fn);
         }
@@ -281,7 +320,10 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
         return schema;
     }
     _generateFieldCodec(codec, field, context) {
-        let fn = field.type.generateCodec(codec, context);
+        let fn = field.type.generateCodec(codec, {
+            ...context,
+            level: context.level + 1,
+        });
         if (field.fixed)
             fn = valgen_1.vg.isEqual(field.fixed);
         if (field.isArray)

package/cjs/document/factory/data-type.factory.js

@@ -152,7 +152,7 @@ class DataTypeFactory {
      * @param thunk
      * @protected
      */
-    static async _importDataTypeArgs(context, owner, thunk) {
+    static async _importDataTypeArgs(context, owner, thunk, checkCircularDeps) {
         thunk = await (0, index_js_1.resolveThunk)(thunk);
         const { importQueue, initArgsMap } = context;
         // Check if data type already exist (maybe a builtin type or already imported)
@@ -226,7 +226,7 @@ class DataTypeFactory {
             if (metadata.name) {
                 const curr = initArgsMap?.get(metadata.name);
                 if (curr) {
-                    if (curr[initializingSymbol])
+                    if (checkCircularDeps && curr[initializingSymbol])
                         return context.addError('Circular reference detected');
                     return metadata.name;
                 }
@@ -297,7 +297,7 @@ class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
@@ -362,7 +362,7 @@ class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
@@ -395,7 +395,7 @@ class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;

package/esm/document/data-type/complex-type-base.js

@@ -1,3 +1,4 @@
+import hashObject from 'hash-object';
 import { asMutable } from 'ts-gems';
 import { validator, vg } from 'valgen';
 import { parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
@@ -196,14 +197,16 @@ class ComplexTypeBaseClass extends DataType {
      *
      */
     generateCodec(codec, options) {
-        const projection = Array.isArray(options?.projection)
-            ? parseFieldsProjection(options.projection)
-            : options?.projection;
-        const schema = this._generateSchema(codec, {
-            ...options,
-            projection,
-            currentPath: '',
-        });
+        const context = options?.cache
+            ? options
+            : {
+                ...options,
+                projection: Array.isArray(options?.projection)
+                    ? parseFieldsProjection(options.projection)
+                    : options?.projection,
+                currentPath: '',
+            };
+        const schema = this._generateSchema(codec, context);
         let additionalFields;
         if (this.additionalFields instanceof DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -215,10 +218,10 @@ class ComplexTypeBaseClass extends DataType {
                 additionalFields = 'error';
             else {
                 const message = additionalFields[1];
-                additionalFields = validator((input, context, _this) => context.fail(_this, message, input));
+                additionalFields = validator((input, ctx, _this) => ctx.fail(_this, message, input));
             }
         }
-        return vg.isObject(schema, {
+        const fn = vg.isObject(schema, {
             ctor: this.name === 'object' ? Object : this.ctor,
             additionalFields,
             name: this.name,
@@ -226,8 +229,17 @@ class ComplexTypeBaseClass extends DataType {
             caseInSensitive: options?.caseInSensitive,
             onFail: options?.onFail,
         });
+        if (context.level === 0 && context.forwardCallbacks?.size) {
+            for (const cb of context.forwardCallbacks) {
+                cb();
+            }
+        }
+        return fn;
     }
     _generateSchema(codec, context) {
+        context.cache = context.cache || new Map();
+        context.level = context.level || 0;
+        context.forwardCallbacks = context.forwardCallbacks || new Set();
         const schema = {};
         const { currentPath, projection } = context;
         const pickList = !!(projection && Object.values(projection).find(p => !p.sign));
@@ -260,14 +272,40 @@ class ComplexTypeBaseClass extends DataType {
                     continue;
                 }
             }
-            const fn = this._generateFieldCodec(codec, field, {
-                ...context,
-                partial: context.partial === 'deep' ? context.partial : undefined,
-                projection: typeof projection === 'object'
-                    ? projection[fieldName]?.projection || '*'
-                    : projection,
-                currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
-            });
+            const subProjection = typeof projection === 'object'
+                ? projection[fieldName]?.projection || '*'
+                : projection;
+            let cacheItem = context.cache.get(field.type);
+            const cacheKey = typeof subProjection === 'string'
+                ? subProjection
+                : hashObject(subProjection || {});
+            if (!cacheItem) {
+                cacheItem = {};
+                context.cache.set(field.type, cacheItem);
+            }
+            let fn = cacheItem[cacheKey];
+            /** If in progress (circular) */
+            if (fn === null) {
+                // Temporary set any
+                fn = vg.isAny();
+                context.forwardCallbacks.add(() => {
+                    fn = cacheItem[cacheKey];
+                    schema[fieldName] =
+                        context.partial || !field.required
+                            ? vg.optional(fn)
+                            : vg.required(fn);
+                });
+            }
+            else if (!fn) {
+                cacheItem[cacheKey] = null;
+                fn = this._generateFieldCodec(codec, field, {
+                    ...context,
+                    partial: context.partial === 'deep' ? context.partial : undefined,
+                    projection: subProjection,
+                    currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
+                });
+                cacheItem[cacheKey] = fn;
+            }
             schema[fieldName] =
                 context.partial || !field.required ? vg.optional(fn) : vg.required(fn);
         }
@@ -278,7 +316,10 @@ class ComplexTypeBaseClass extends DataType {
         return schema;
     }
     _generateFieldCodec(codec, field, context) {
-        let fn = field.type.generateCodec(codec, context);
+        let fn = field.type.generateCodec(codec, {
+            ...context,
+            level: context.level + 1,
+        });
         if (field.fixed)
             fn = vg.isEqual(field.fixed);
         if (field.isArray)

package/esm/document/factory/data-type.factory.js

@@ -149,7 +149,7 @@ export class DataTypeFactory {
      * @param thunk
      * @protected
      */
-    static async _importDataTypeArgs(context, owner, thunk) {
+    static async _importDataTypeArgs(context, owner, thunk, checkCircularDeps) {
         thunk = await resolveThunk(thunk);
         const { importQueue, initArgsMap } = context;
         // Check if data type already exist (maybe a builtin type or already imported)
@@ -223,7 +223,7 @@ export class DataTypeFactory {
             if (metadata.name) {
                 const curr = initArgsMap?.get(metadata.name);
                 if (curr) {
-                    if (curr[initializingSymbol])
+                    if (checkCircularDeps && curr[initializingSymbol])
                         return context.addError('Circular reference detected');
                     return metadata.name;
                 }
@@ -294,7 +294,7 @@ export class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
@@ -359,7 +359,7 @@ export class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
@@ -392,7 +392,7 @@ export class DataTypeFactory {
         await context.enterAsync('.base', async () => {
             let baseArgs;
             if (metadata.base) {
-                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base);
+                baseArgs = await this._importDataTypeArgs(context, owner, metadata.base, true);
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.17.3",
+  "version": "1.17.5",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -10,15 +10,16 @@
     "@browsery/http-parser": "^0.5.9-r4",
     "@browsery/i18next": "^24.2.2",
     "@browsery/type-is": "^1.6.18-r8",
-    "@jsopen/objects": "^1.6.0",
+    "@jsopen/objects": "^1.6.2",
     "fast-tokenizer": "^1.7.0",
+    "hash-object": "^5.0.1",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.2.2",
     "super-fast-md5": "^1.0.3",
     "tslib": "^2.8.1",
     "uid": "^2.0.2",
-    "valgen": "^5.15.0"
+    "valgen": "^5.15.2"
   },
   "type": "module",
   "exports": {

package/types/document/common/data-type-map.d.ts

@@ -10,7 +10,7 @@ export declare class DataTypeMap {
     protected [kMap]: ResponsiveMap<DataType>;
     protected [kCtorMap]: WeakMap<object | Function | Type<any>, string>;
     get size(): number;
-    forEach(callbackFn: (value: DataType, key: string, map: ReadonlyMap<string, DataType>) => void, thisArg?: any): void;
+    forEach(callbackFn: (value: DataType, key: string, map: ResponsiveMap<DataType>) => void, thisArg?: any): void;
     get(nameOrCtor: string | Type | Function | object): DataType | undefined;
     set(name: string, dataType: DataType): void;
     has(nameOrCtor: string | Type | Function | object | DataType): boolean;

package/types/document/data-type/complex-type-base.d.ts

@@ -73,13 +73,14 @@ declare abstract class ComplexTypeBaseClass extends DataType {
      *
      */
     generateCodec(codec: 'encode' | 'decode', options?: DataType.GenerateCodecOptions): Validator;
-    protected _generateSchema(codec: 'encode' | 'decode', context: StrictOmit<DataType.GenerateCodecOptions, 'projection'> & {
-        currentPath: string;
-        projection?: FieldsProjection | '*';
-    }): IsObject.Schema;
-    protected _generateFieldCodec(codec: 'encode' | 'decode', field: ApiField, context: StrictOmit<DataType.GenerateCodecOptions, 'projection'> & {
-        currentPath: string;
-        projection?: FieldsProjection | '*';
-    }): Validator;
+    protected _generateSchema(codec: 'encode' | 'decode', context: GenerateCodecContext): IsObject.Schema;
+    protected _generateFieldCodec(codec: 'encode' | 'decode', field: ApiField, context: GenerateCodecContext): Validator;
 }
+type GenerateCodecContext = StrictOmit<DataType.GenerateCodecOptions, 'projection'> & {
+    currentPath: string;
+    projection?: FieldsProjection | '*';
+    level?: number;
+    cache?: Map<DataType, Record<string, Validator | null>>;
+    forwardCallbacks?: Set<Function>;
+};
 export {};

package/types/document/factory/data-type.factory.d.ts

@@ -95,7 +95,7 @@ export declare class DataTypeFactory {
      * @param thunk
      * @protected
      */
-    protected static _importDataTypeArgs(context: DataTypeFactory.Context, owner: DocumentElement, thunk: string | Type | OpraSchema.DataType | object): Promise<DataTypeFactory.DataTypeInitArguments | string | void>;
+    protected static _importDataTypeArgs(context: DataTypeFactory.Context, owner: DocumentElement, thunk: string | Type | OpraSchema.DataType | object, checkCircularDeps?: boolean): Promise<DataTypeFactory.DataTypeInitArguments | string | void>;
     protected static _prepareDataTypeArgs(context: DataTypeFactory.Context, initArgs: DataTypeFactory.DataTypeInitArguments, metadata: OpraSchema.DataTypeBase | DataType.Metadata): Promise<void>;
     protected static _prepareComplexTypeArgs(context: DataTypeFactory.Context, owner: DocumentElement, initArgs: DataTypeFactory.ComplexTypeInit, metadata: ComplexType.Metadata | OpraSchema.ComplexType): Promise<void>;
     protected static _prepareEnumTypeArgs(context: DataTypeFactory.Context, owner: DocumentElement, initArgs: DataTypeFactory.EnumTypeInit, metadata: EnumType.Metadata | OpraSchema.EnumType): Promise<void>;

package/types/helpers/responsive-map.d.ts

@@ -11,7 +11,7 @@ declare const kSize: unique symbol;
 /**
  * A Map implementation that supports case-insensitivity and ordered keys
  */
-export declare class ResponsiveMap<V> implements Map<string, V> {
+export declare class ResponsiveMap<V> {
     private [kSize];
     private [kEntries];
     private [kKeyMap];
@@ -20,7 +20,7 @@ export declare class ResponsiveMap<V> implements Map<string, V> {
     constructor(init?: ResponsiveMapInit<V> | null, options?: ResponsiveMapOptions);
     get size(): number;
     clear(): void;
-    forEach(callbackfn: (value: V, key: string, map: Map<string, V>) => void, thisArg?: any): void;
+    forEach(callbackfn: (value: V, key: string, map: ResponsiveMap<V>) => void, thisArg?: any): void;
     get(key: string): V | undefined;
     has(key: string): boolean;
     set(key: string, value: V): this;