@opra/common 1.27.4 → 1.28.1

package/document/data-type/api-field.d.ts

@@ -1,5 +1,5 @@
 import type { Combine, StrictOmit, Type, TypeThunkAsync } from 'ts-gems';
-import type { Validator } from 'valgen';
+import { type Validator } from 'valgen';
 import { OpraSchema } from '../../schema/index.js';
 import type { ApiDocument } from '../api-document.js';
 import { DocumentElement } from '../common/document-element.js';

package/document/data-type/api-field.js

@@ -1,5 +1,6 @@
 import { omitUndefined } from '@jsopen/objects';
 import { asMutable } from 'ts-gems';
+import { vg } from 'valgen';
 import { OpraSchema } from '../../schema/index.js';
 import { DocumentElement } from '../common/document-element.js';
 import { DECORATOR } from '../constants.js';
@@ -11,7 +12,7 @@ import { ComplexTypeBase } from './complex-type-base.js';
  */
 export const ApiField = function (...args) {
     // Decorator
-    if (!this) {
+    if (!(this instanceof ApiField)) {
         const [options] = args;
         return ApiField[DECORATOR](options);
     }
@@ -112,10 +113,20 @@ class ApiFieldClass extends DocumentElement {
         });
     }
     generateCodec(codec, options, properties) {
-        return this.type.generateCodec(codec, options, {
+        if (this.fixed)
+            return vg.isEqual(this.fixed);
+        let fn = this.type?.generateCodec(codec, options, {
             ...properties,
             designType: this.designType,
-        });
+        }) || vg.isAny();
+        if (this.default !== undefined) {
+            fn = vg.required(fn, {
+                default: this.default,
+            });
+        }
+        if (this.isArray && !(this.type.kind === OpraSchema.ArrayType.Kind))
+            fn = vg.isArray(fn);
+        return fn;
     }
 }
 ApiField.prototype = ApiFieldClass.prototype;

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

@@ -74,7 +74,6 @@ declare abstract class ComplexTypeBaseClass extends DataType {
      */
     generateCodec(codec: 'encode' | 'decode', options?: DataType.GenerateCodecOptions): Validator;
     protected _generateSchema(codec: 'encode' | 'decode', context: GenerateCodecContext): vg.isObject.Schema;
-    protected _generateFieldCodec(codec: 'encode' | 'decode', field: ApiField, context: GenerateCodecContext): Validator;
 }
 type GenerateCodecContext = StrictOmit<DataType.GenerateCodecOptions, 'projection'> & {
     currentPath: string;

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

@@ -4,7 +4,6 @@ import { validator, vg } from 'valgen';
 import { FieldsProjection, parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { DocumentInitContext } from '../common/document-init-context.js';
-import { ArrayType } from './array-type.js';
 import { DataType } from './data-type.js';
 export const FIELD_PATH_PATTERN = /^([+-])?([a-z$_][\w.]*)$/i;
 /**
@@ -305,11 +304,12 @@ class ComplexTypeBaseClass extends DataType {
             else if (!fn) {
                 const defaultGenerator = () => {
                     cacheItem[cacheKey] = null;
-                    const xfn = this._generateFieldCodec(codec, field, {
+                    const xfn = field.generateCodec(codec, {
                         ...context,
                         partial: context.partial === 'deep' ? context.partial : undefined,
                         projection: subProjection,
                         currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
+                        level: context.level + 1,
                     });
                     cacheItem[cacheKey] = xfn;
                     return xfn;
@@ -332,16 +332,5 @@ class ComplexTypeBaseClass extends DataType {
         }
         return schema;
     }
-    _generateFieldCodec(codec, field, context) {
-        let fn = field.generateCodec(codec, {
-            ...context,
-            level: context.level + 1,
-        });
-        if (field.fixed)
-            fn = vg.isEqual(field.fixed);
-        if (field.isArray && !(field.type instanceof ArrayType))
-            fn = vg.isArray(fn);
-        return fn;
-    }
 }
 ComplexTypeBase.prototype = ComplexTypeBaseClass.prototype;

package/document/http/http-parameter.d.ts

@@ -50,6 +50,7 @@ declare class HttpParameterClass extends Value {
     keyParam?: boolean;
     deprecated?: boolean | string;
     required?: boolean;
+    readonly default?: any;
     arraySeparator?: string;
     parser?: (v: any) => any;
     designType?: Type;

package/document/http/http-parameter.js

@@ -26,6 +26,7 @@ export const HttpParameter = function (owner, initArgs) {
     _this.required = initArgs.required;
     if (_this.required == null && initArgs.location === 'path')
         _this.required = true;
+    _this.default = initArgs.default;
     _this.arraySeparator = initArgs.arraySeparator;
     _this.keyParam = initArgs.keyParam;
     _this.parser = initArgs.parser;
@@ -43,14 +44,19 @@ class HttpParameterClass extends Value {
             arraySeparator: this.arraySeparator,
             keyParam: this.keyParam,
             required: this.required,
+            default: this.default,
             deprecated: this.deprecated,
         });
     }
     generateCodec(codec, options, properties) {
-        return (this.type?.generateCodec(codec, options, {
+        const fn = this.type?.generateCodec(codec, options, {
             ...properties,
             designType: this.designType,
-        }) || vg.isAny());
+        }) || vg.isAny();
+        if (this.default !== undefined) {
+            return vg.optional(fn, this.default);
+        }
+        return fn;
     }
 }
 HttpParameter.prototype = HttpParameterClass.prototype;

package/index.d.ts

@@ -1,3 +1,4 @@
+import 'reflect-metadata';
 export * from './document/index.js';
 export * from './enums/index.js';
 export * from './exception/index.js';

package/index.js

@@ -1,3 +1,4 @@
+import 'reflect-metadata';
 export * from './document/index.js';
 export * from './enums/index.js';
 export * from './exception/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.27.4",
+  "version": "1.28.1",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "super-fast-md5": "^1.0.3",
     "tslib": "^2.8.1",
     "uid": "^2.0.2",
-    "valgen": "^6.0.3"
+    "valgen": "^6.1.0"
   },
   "type": "module",
   "module": "./index.js",

package/schema/http/http-parameter.interface.d.ts

@@ -17,6 +17,10 @@ export interface HttpParameter extends Value {
      * Determines if parameter is key
      */
     keyParam?: boolean;
+    /**
+     * Default value
+     */
+    default?: any;
     /**
      * Defines array separator
      */