@opra/common 1.17.5 → 1.17.6

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

@@ -2,7 +2,7 @@
 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 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");
@@ -210,7 +210,9 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
                     : options?.projection,
                 currentPath: '',
             };
-        const schema = this._generateSchema(codec, context);
+        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);
@@ -241,7 +243,7 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
         return fn;
     }
     _generateSchema(codec, context) {
-        context.cache = context.cache || new Map();
+        context.fieldCache = context.fieldCache || new Map();
         context.level = context.level || 0;
         context.forwardCallbacks = context.forwardCallbacks || new Set();
         const schema = {};
@@ -279,13 +281,13 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
             const subProjection = typeof projection === 'object'
                 ? projection[fieldName]?.projection || '*'
                 : projection;
-            let cacheItem = context.cache.get(field.type);
+            let cacheItem = context.fieldCache.get(field);
             const cacheKey = typeof subProjection === 'string'
                 ? subProjection
-                : (0, hash_object_1.default)(subProjection || {});
+                : (0, object_hash_1.default)(subProjection || {});
             if (!cacheItem) {
                 cacheItem = {};
-                context.cache.set(field.type, cacheItem);
+                context.fieldCache.set(field, cacheItem);
             }
             let fn = cacheItem[cacheKey];
             /** If in progress (circular) */

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

@@ -1,4 +1,4 @@
-import hashObject from 'hash-object';
+import hashObject from 'object-hash';
 import { asMutable } from 'ts-gems';
 import { validator, vg } from 'valgen';
 import { parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
@@ -206,7 +206,9 @@ class ComplexTypeBaseClass extends DataType {
                     : options?.projection,
                 currentPath: '',
             };
-        const schema = this._generateSchema(codec, context);
+        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);
@@ -237,7 +239,7 @@ class ComplexTypeBaseClass extends DataType {
         return fn;
     }
     _generateSchema(codec, context) {
-        context.cache = context.cache || new Map();
+        context.fieldCache = context.fieldCache || new Map();
         context.level = context.level || 0;
         context.forwardCallbacks = context.forwardCallbacks || new Set();
         const schema = {};
@@ -275,13 +277,13 @@ class ComplexTypeBaseClass extends DataType {
             const subProjection = typeof projection === 'object'
                 ? projection[fieldName]?.projection || '*'
                 : projection;
-            let cacheItem = context.cache.get(field.type);
+            let cacheItem = context.fieldCache.get(field);
             const cacheKey = typeof subProjection === 'string'
                 ? subProjection
                 : hashObject(subProjection || {});
             if (!cacheItem) {
                 cacheItem = {};
-                context.cache.set(field.type, cacheItem);
+                context.fieldCache.set(field, cacheItem);
             }
             let fn = cacheItem[cacheKey];
             /** If in progress (circular) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.17.5",
+  "version": "1.17.6",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "@browsery/type-is": "^1.6.18-r8",
     "@jsopen/objects": "^1.6.2",
     "fast-tokenizer": "^1.7.0",
-    "hash-object": "^5.0.1",
+    "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

@@ -80,7 +80,7 @@ type GenerateCodecContext = StrictOmit<DataType.GenerateCodecOptions, 'projectio
     currentPath: string;
     projection?: FieldsProjection | '*';
     level?: number;
-    cache?: Map<DataType, Record<string, Validator | null>>;
+    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 {