@opra/common 1.17.3 → 1.17.4

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/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.4",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -10,7 +10,7 @@
     "@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",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
@@ -18,7 +18,7 @@
     "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/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;