@opra/common 1.17.4 → 1.17.6

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 object_hash_1 = tslib_1.__importDefault(require("object-hash"));
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
@@ -199,14 +201,18 @@ 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: '',
+            };
+        let schema = this._generateSchema(codec, context);
+        if (context.generateSchemaHook)
+            schema = context.generateSchemaHook(schema, this, context.currentPath);
         let additionalFields;
         if (this.additionalFields instanceof data_type_js_1.DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -218,10 +224,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 +235,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.fieldCache = context.fieldCache || 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 +278,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.fieldCache.get(field);
+            const cacheKey = typeof subProjection === 'string'
+                ? subProjection
+                : (0, object_hash_1.default)(subProjection || {});
+            if (!cacheItem) {
+                cacheItem = {};
+                context.fieldCache.set(field, 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 +322,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/esm/document/data-type/complex-type-base.js

@@ -1,3 +1,4 @@
+import hashObject from 'object-hash';
 import { asMutable } from 'ts-gems';
 import { validator, vg } from 'valgen';
 import { parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
@@ -196,14 +197,18 @@ 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: '',
+            };
+        let schema = this._generateSchema(codec, context);
+        if (context.generateSchemaHook)
+            schema = context.generateSchemaHook(schema, this, context.currentPath);
         let additionalFields;
         if (this.additionalFields instanceof DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -215,10 +220,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 +231,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.fieldCache = context.fieldCache || 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 +274,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.fieldCache.get(field);
+            const cacheKey = typeof subProjection === 'string'
+                ? subProjection
+                : hashObject(subProjection || {});
+            if (!cacheItem) {
+                cacheItem = {};
+                context.fieldCache.set(field, 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 +318,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.17.4",
+  "version": "1.17.6",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -12,6 +12,7 @@
     "@browsery/type-is": "^1.6.18-r8",
     "@jsopen/objects": "^1.6.2",
     "fast-tokenizer": "^1.7.0",
+    "object-hash": "^3.0.0",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.2.2",

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;
+    fieldCache?: Map<ApiField, Record<string, Validator | null>>;
+    forwardCallbacks?: Set<Function>;
+};
 export {};

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

@@ -1,5 +1,5 @@
 import { type StrictOmit, type Type } from 'ts-gems';
-import type { ValidationOptions, Validator } from 'valgen';
+import type { IsObject, ValidationOptions, Validator } from 'valgen';
 import { FieldsProjection } from '../../helpers/index.js';
 import type { DataTypeBase } from '../../schema/data-type/data-type.interface.js';
 import { OpraSchema } from '../../schema/index.js';
@@ -7,6 +7,7 @@ import type { ApiDocument } from '../api-document.js';
 import { DocumentElement } from '../common/document-element.js';
 import { DocumentInitContext } from '../common/document-init-context.js';
 import { nodeInspectCustom } from '../utils/inspect.util.js';
+import type { ComplexType } from './complex-type.js';
 /**
  * @namespace DataType
  */
@@ -30,6 +31,7 @@ export declare namespace DataType {
         ignoreReadonlyFields?: boolean;
         ignoreWriteonlyFields?: boolean;
         allowPatchOperators?: boolean;
+        generateSchemaHook?: (schema: IsObject.Schema, dataType: ComplexType, path: string) => IsObject.Schema;
     }
 }
 interface DataTypeStatic {