@opra/common 0.31.13 → 0.32.0

package/browser.js

@@ -2180,11 +2180,14 @@ var FieldClass = class {
       return vg3.isUndefined();
     if (options?.operation === "write" && this.readonly)
       return vg3.isUndefined();
-    let fn = this.type.generateCodec(codec, { ...options, designType: this.designType });
+    let fn = this.type.generateCodec(codec, {
+      ...options,
+      designType: this.designType,
+      partial: options?.partial && (this.partialUpdate || !this.isArray)
+    });
     if (this.isArray)
       fn = vg3.isArray(fn);
-    const partial = options?.partial && (this.partialUpdate || !this.isArray);
-    return !partial && this.required ? vg3.required(fn) : vg3.optional(fn);
+    return !options?.partial && this.required ? vg3.required(fn) : vg3.optional(fn);
   }
 };
 
@@ -2381,7 +2384,8 @@ var ComplexTypeClass = class extends DataType {
       ctor: this.ctor,
       additionalFields,
       name: this.name,
-      caseInSensitive: !options?.caseSensitive
+      caseInSensitive: !options?.caseSensitive,
+      onFail: options?.onFail
     });
   }
   generateCodecSchema(codec, options) {
@@ -2698,20 +2702,20 @@ var TypeDocument = class extends DocumentBase {
   getComplexType(nameOrCtor, silent) {
     if (nameOrCtor === Object)
       nameOrCtor = "object";
-    const t = this.getDataType(nameOrCtor);
-    if (!t && silent)
-      return;
-    if (t && t.kind === opra_schema_ns_exports.ComplexType.Kind)
-      return t;
-    throw new NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+    const t = this.getDataType(nameOrCtor, silent);
+    if (t) {
+      if (t && t.kind === opra_schema_ns_exports.ComplexType.Kind)
+        return t;
+      throw new NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+    }
   }
   getSimpleType(nameOrCtor, silent) {
-    const t = this.getDataType(nameOrCtor);
-    if (!t && silent)
-      return;
-    if (t && t.kind === opra_schema_ns_exports.SimpleType.Kind)
-      return t;
-    throw new NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+    const t = this.getDataType(nameOrCtor, silent);
+    if (t) {
+      if (t && t.kind === opra_schema_ns_exports.SimpleType.Kind)
+        return t;
+      throw new NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+    }
   }
   getEnumType(nameOrCtor, silent) {
     const t = this.getDataType(nameOrCtor);
@@ -2732,7 +2736,7 @@ var TypeDocument = class extends DocumentBase {
       for (const [ns, r] of this.references.entries()) {
         if (ns.toLowerCase() === "opra")
           continue;
-        references[ns] = r.url ? r.url : r.exportSchema(options);
+        references[ns] = r.exportSchema(options);
         i++;
       }
       if (i)
@@ -3453,7 +3457,10 @@ var TypeDocumentFactory = class _TypeDocumentFactory {
   }
   async addReferences(references) {
     const { document } = this;
-    for (const [ns, r] of Object.entries(references)) {
+    let ns;
+    let r;
+    for ([ns, r] of Object.entries(references)) {
+      r = await r;
       if (typeof r === "string") {
         document.references.set(ns, await this.initDocumentFromUrl(r));
       } else if (r instanceof TypeDocument)
@@ -11178,8 +11185,8 @@ var CrudOperation = class extends Endpoint {
     this.encodeReturning = vg7.isAny();
     this.returnType = init.returnType instanceof DataType ? init.returnType : this.resource.document.getDataType(init.returnType || "any");
     this.encodeReturning = this.returnType.generateCodec("encode", { operation: "read" });
-    this.inputOverwriteFields = init.options.inputOverwriteFields;
-    this.outputOverwriteFields = init.options.outputOverwriteFields;
+    this.inputOverwriteFields = init.options?.inputOverwriteFields;
+    this.outputOverwriteFields = init.options?.outputOverwriteFields;
   }
   exportSchema(options) {
     const schema = super.exportSchema(options);

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

@@ -175,7 +175,8 @@ class ComplexTypeClass extends data_type_js_1.DataType {
             ctor: this.ctor,
             additionalFields,
             name: this.name,
-            caseInSensitive: !options?.caseSensitive
+            caseInSensitive: !options?.caseSensitive,
+            onFail: options?.onFail
         });
     }
     generateCodecSchema(codec, options) {

package/cjs/document/data-type/field-class.js

@@ -52,11 +52,14 @@ class FieldClass {
             return vg.isUndefined();
         if (options?.operation === 'write' && this.readonly)
             return vg.isUndefined();
-        let fn = this.type.generateCodec(codec, { ...options, designType: this.designType });
+        let fn = this.type.generateCodec(codec, {
+            ...options,
+            designType: this.designType,
+            partial: options?.partial && (this.partialUpdate || !this.isArray)
+        });
         if (this.isArray)
             fn = vg.isArray(fn);
-        const partial = options?.partial && (this.partialUpdate || !this.isArray);
-        return !partial && this.required ? vg.required(fn) : vg.optional(fn);
+        return !options?.partial && this.required ? vg.required(fn) : vg.optional(fn);
     }
 }
 exports.FieldClass = FieldClass;

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

@@ -108,7 +108,10 @@ class TypeDocumentFactory {
     }
     async addReferences(references) {
         const { document } = this;
-        for (const [ns, r] of Object.entries(references)) {
+        let ns;
+        let r;
+        for ([ns, r] of Object.entries(references)) {
+            r = await r;
             if (typeof r === 'string') {
                 document.references.set(ns, await this.initDocumentFromUrl(r));
             }

package/cjs/document/resource/crud-operation.js

@@ -21,8 +21,8 @@ class CrudOperation extends endpoint_js_1.Endpoint {
         this.returnType = init.returnType instanceof data_type_js_1.DataType
             ? init.returnType : this.resource.document.getDataType(init.returnType || 'any');
         this.encodeReturning = this.returnType.generateCodec('encode', { operation: 'read' });
-        this.inputOverwriteFields = init.options.inputOverwriteFields;
-        this.outputOverwriteFields = init.options.outputOverwriteFields;
+        this.inputOverwriteFields = init.options?.inputOverwriteFields;
+        this.outputOverwriteFields = init.options?.outputOverwriteFields;
     }
     exportSchema(options) {
         const schema = super.exportSchema(options);

package/cjs/document/type-document.js

@@ -148,20 +148,20 @@ class TypeDocument extends document_base_js_1.DocumentBase {
     getComplexType(nameOrCtor, silent) {
         if (nameOrCtor === Object)
             nameOrCtor = 'object';
-        const t = this.getDataType(nameOrCtor);
-        if (!t && silent)
-            return;
-        if (t && t.kind === index_js_3.OpraSchema.ComplexType.Kind)
-            return t;
-        throw new index_js_1.NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+        const t = this.getDataType(nameOrCtor, silent);
+        if (t) {
+            if (t && t.kind === index_js_3.OpraSchema.ComplexType.Kind)
+                return t;
+            throw new index_js_1.NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+        }
     }
     getSimpleType(nameOrCtor, silent) {
-        const t = this.getDataType(nameOrCtor);
-        if (!t && silent)
-            return;
-        if (t && t.kind === index_js_3.OpraSchema.SimpleType.Kind)
-            return t;
-        throw new index_js_1.NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+        const t = this.getDataType(nameOrCtor, silent);
+        if (t) {
+            if (t && t.kind === index_js_3.OpraSchema.SimpleType.Kind)
+                return t;
+            throw new index_js_1.NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+        }
     }
     getEnumType(nameOrCtor, silent) {
         const t = this.getDataType(nameOrCtor);
@@ -182,7 +182,7 @@ class TypeDocument extends document_base_js_1.DocumentBase {
             for (const [ns, r] of this.references.entries()) {
                 if (ns.toLowerCase() === 'opra')
                     continue;
-                references[ns] = r.url ? r.url : r.exportSchema(options);
+                references[ns] = r.exportSchema(options);
                 i++;
             }
             if (i)

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

@@ -171,7 +171,8 @@ export class ComplexTypeClass extends DataType {
             ctor: this.ctor,
             additionalFields,
             name: this.name,
-            caseInSensitive: !options?.caseSensitive
+            caseInSensitive: !options?.caseSensitive,
+            onFail: options?.onFail
         });
     }
     generateCodecSchema(codec, options) {

package/esm/document/data-type/field-class.js

@@ -48,10 +48,13 @@ export class FieldClass {
             return vg.isUndefined();
         if (options?.operation === 'write' && this.readonly)
             return vg.isUndefined();
-        let fn = this.type.generateCodec(codec, { ...options, designType: this.designType });
+        let fn = this.type.generateCodec(codec, {
+            ...options,
+            designType: this.designType,
+            partial: options?.partial && (this.partialUpdate || !this.isArray)
+        });
         if (this.isArray)
             fn = vg.isArray(fn);
-        const partial = options?.partial && (this.partialUpdate || !this.isArray);
-        return !partial && this.required ? vg.required(fn) : vg.optional(fn);
+        return !options?.partial && this.required ? vg.required(fn) : vg.optional(fn);
     }
 }

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

@@ -105,7 +105,10 @@ export class TypeDocumentFactory {
     }
     async addReferences(references) {
         const { document } = this;
-        for (const [ns, r] of Object.entries(references)) {
+        let ns;
+        let r;
+        for ([ns, r] of Object.entries(references)) {
+            r = await r;
             if (typeof r === 'string') {
                 document.references.set(ns, await this.initDocumentFromUrl(r));
             }

package/esm/document/resource/crud-operation.js

@@ -17,8 +17,8 @@ export class CrudOperation extends Endpoint {
         this.returnType = init.returnType instanceof DataType
             ? init.returnType : this.resource.document.getDataType(init.returnType || 'any');
         this.encodeReturning = this.returnType.generateCodec('encode', { operation: 'read' });
-        this.inputOverwriteFields = init.options.inputOverwriteFields;
-        this.outputOverwriteFields = init.options.outputOverwriteFields;
+        this.inputOverwriteFields = init.options?.inputOverwriteFields;
+        this.outputOverwriteFields = init.options?.outputOverwriteFields;
     }
     exportSchema(options) {
         const schema = super.exportSchema(options);

package/esm/document/type-document.js

@@ -145,20 +145,20 @@ export class TypeDocument extends DocumentBase {
     getComplexType(nameOrCtor, silent) {
         if (nameOrCtor === Object)
             nameOrCtor = 'object';
-        const t = this.getDataType(nameOrCtor);
-        if (!t && silent)
-            return;
-        if (t && t.kind === OpraSchema.ComplexType.Kind)
-            return t;
-        throw new NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+        const t = this.getDataType(nameOrCtor, silent);
+        if (t) {
+            if (t && t.kind === OpraSchema.ComplexType.Kind)
+                return t;
+            throw new NotAcceptableError(`Data type "${t.name}" is not a ComplexType`);
+        }
     }
     getSimpleType(nameOrCtor, silent) {
-        const t = this.getDataType(nameOrCtor);
-        if (!t && silent)
-            return;
-        if (t && t.kind === OpraSchema.SimpleType.Kind)
-            return t;
-        throw new NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+        const t = this.getDataType(nameOrCtor, silent);
+        if (t) {
+            if (t && t.kind === OpraSchema.SimpleType.Kind)
+                return t;
+            throw new NotAcceptableError(`Data type "${t.name || t}" is not a SimpleType`);
+        }
     }
     getEnumType(nameOrCtor, silent) {
         const t = this.getDataType(nameOrCtor);
@@ -179,7 +179,7 @@ export class TypeDocument extends DocumentBase {
             for (const [ns, r] of this.references.entries()) {
                 if (ns.toLowerCase() === 'opra')
                     continue;
-                references[ns] = r.url ? r.url : r.exportSchema(options);
+                references[ns] = r.exportSchema(options);
                 i++;
             }
             if (i)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.31.13",
+  "version": "0.32.0",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
     "uid": "^2.0.1",
-    "valgen": "^4.2.5"
+    "valgen": "^4.3.1"
   },
   "devDependencies": {
     "@browsery/fs": "^0.4.0",
@@ -56,7 +56,7 @@
     "@types/lodash.omit": "^4.5.9",
     "@types/validator": "^13.11.7",
     "path-browserify": "^1.0.1",
-    "ts-gems": "^2.5.0"
+    "ts-gems": "^2.7.1"
   },
   "engines": {
     "node": ">=16.0",

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

@@ -46,11 +46,12 @@ export declare namespace DataType {
     };
     interface GenerateCodecOptions {
         caseSensitive?: boolean;
-        pick?: string[];
-        omit?: string[];
+        pick?: string[] | readonly string[];
+        omit?: string[] | readonly string[];
         partial?: boolean;
         operation?: 'read' | 'write';
         overwriteFields?: Record<string, OverrideFieldsConfig>;
         designType?: Type;
+        onFail?: vg.OnFailFunction;
     }
 }

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

@@ -2,7 +2,6 @@ import { PartialSome, StrictOmit, Type } from 'ts-gems';
 import { ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { ThunkAsync } from '../../types.js';
-import type { ApiDocument } from '../api-document.js';
 import { ComplexType } from '../data-type/complex-type.js';
 import { DataType } from '../data-type/data-type.js';
 import { EnumType } from '../data-type/enum-type.js';
@@ -10,9 +9,10 @@ import { MappedType } from '../data-type/mapped-type.js';
 import { MixinType } from '../data-type/mixin-type.js';
 import { SimpleType } from '../data-type/simple-type.js';
 import { TypeDocument } from '../type-document.js';
+type ReferenceUnion = string | OpraSchema.TypeDocument | TypeDocument;
 export declare namespace TypeDocumentFactory {
     interface InitArguments extends PartialSome<StrictOmit<OpraSchema.TypeDocument, 'references' | 'types'>, 'version'> {
-        references?: Record<string, string | OpraSchema.ApiDocument | ApiDocument>;
+        references?: Record<string, ReferenceUnion | Promise<ReferenceUnion>>;
         types?: ThunkAsync<Type | EnumType.EnumObject | EnumType.EnumArray>[] | Record<string, OpraSchema.DataType>;
         noBuiltinTypes?: boolean;
     }
@@ -49,8 +49,9 @@ export declare class TypeDocumentFactory {
     protected initDocument(init: TypeDocumentFactory.InitArguments): Promise<TypeDocument>;
     initDocumentFromUrl(url: string): Promise<TypeDocument>;
     protected createBuiltinTypeDocument(): Promise<TypeDocument>;
-    protected addReferences(references: Record<string, string | OpraSchema.TypeDocument | TypeDocument>): Promise<void>;
+    protected addReferences(references: Record<string, ReferenceUnion | Promise<ReferenceUnion>>): Promise<void>;
     protected importDataType(thunk: ThunkAsync<string | Type | EnumType.EnumObject | EnumType.EnumArray | OpraSchema.DataType>): Promise<DataType>;
     protected prepareDataTypeInitArguments(schema: TypeDocumentFactory.DataTypeInitializer | OpraSchema.DataType, ctor?: Type): Promise<TypeDocumentFactory.DataTypeInitializer | undefined>;
     protected createDataTypeInstance(kind: OpraSchema.DataType.Kind, name?: string): DataType;
 }
+export {};

package/types/types.d.ts

@@ -1,11 +1,7 @@
-import { Builtin, DeepPickWritable, Type } from 'ts-gems';
-export type PartialInput<T> = DeepNullablePartial<DeepPickWritable<T>>;
-export type PartialOutput<T> = DeepNullablePartial<T>;
-type DeepNullablePartial<T> = T extends Builtin ? T : T extends Promise<infer U> ? Promise<DeepNullablePartial<U>> : T extends (infer U)[] ? DeepNullablePartial<U>[] : {
-    [P in keyof T]?: DeepNullablePartial<Exclude<T[P], undefined>> | null;
-};
+import { DeepPickWritable, HighDeepNullish, Type } from 'ts-gems';
+export type PartialInput<T> = HighDeepNullish<DeepPickWritable<T>>;
+export type PartialOutput<T> = HighDeepNullish<T>;
 export type Thunk<T> = T | (() => T);
-export type ThunkAsync<T> = T | Promise<T> | (() => T) | (() => Promise<T>);
+export type ThunkAsync<T> = Thunk<T> | Thunk<Promise<T>>;
 export type TypeThunk<T = any> = Thunk<Type<T>>;
 export type TypeThunkAsync<T = any> = ThunkAsync<Type<T>>;
-export {};