@opra/common 1.17.6 → 1.17.7

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

@@ -210,9 +210,7 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
                     : options?.projection,
                 currentPath: '',
             };
-        let schema = this._generateSchema(codec, context);
-        if (context.generateSchemaHook)
-            schema = context.generateSchemaHook(schema, this, context.currentPath);
+        const schema = this._generateSchema(codec, context);
         let additionalFields;
         if (this.additionalFields instanceof data_type_js_1.DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -303,17 +301,28 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
                 });
             }
             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;
+                const defaultGenerator = () => {
+                    cacheItem[cacheKey] = null;
+                    const xfn = this._generateFieldCodec(codec, field, {
+                        ...context,
+                        partial: context.partial === 'deep' ? context.partial : undefined,
+                        projection: subProjection,
+                        currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
+                    });
+                    cacheItem[cacheKey] = xfn;
+                    return xfn;
+                };
+                if (context.fieldHook)
+                    fn = context.fieldHook(field, context.currentPath, defaultGenerator);
+                else
+                    fn = defaultGenerator();
             }
             schema[fieldName] =
-                context.partial || !field.required ? valgen_1.vg.optional(fn) : valgen_1.vg.required(fn);
+                context.partial || !(field.required || fn.id === 'required')
+                    ? valgen_1.vg.optional(fn)
+                    : fn.id === 'required'
+                        ? fn
+                        : valgen_1.vg.required(fn);
         }
         if (context.allowPatchOperators) {
             schema._$pull = valgen_1.vg.optional(valgen_1.vg.isAny());

package/cjs/document/data-type/omit-type.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OmitType = OmitType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
-/**
- * Create a new MappedType that omits given fields from base type
- * @param baseType
- * @param keys
- * @param options
- */
 /**
  *
  */

package/cjs/document/data-type/partial-type.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PartialType = PartialType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
-/**
- * Create a new MappedType that marks given or all fields as optional
- * @param baseType
- * @param keys
- * @param options
- */
 /**
  *
  */

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

@@ -206,9 +206,7 @@ class ComplexTypeBaseClass extends DataType {
                     : options?.projection,
                 currentPath: '',
             };
-        let schema = this._generateSchema(codec, context);
-        if (context.generateSchemaHook)
-            schema = context.generateSchemaHook(schema, this, context.currentPath);
+        const schema = this._generateSchema(codec, context);
         let additionalFields;
         if (this.additionalFields instanceof DataType) {
             additionalFields = this.additionalFields.generateCodec(codec, options);
@@ -299,17 +297,28 @@ class ComplexTypeBaseClass extends DataType {
                 });
             }
             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;
+                const defaultGenerator = () => {
+                    cacheItem[cacheKey] = null;
+                    const xfn = this._generateFieldCodec(codec, field, {
+                        ...context,
+                        partial: context.partial === 'deep' ? context.partial : undefined,
+                        projection: subProjection,
+                        currentPath: currentPath + (currentPath ? '.' : '') + fieldName,
+                    });
+                    cacheItem[cacheKey] = xfn;
+                    return xfn;
+                };
+                if (context.fieldHook)
+                    fn = context.fieldHook(field, context.currentPath, defaultGenerator);
+                else
+                    fn = defaultGenerator();
             }
             schema[fieldName] =
-                context.partial || !field.required ? vg.optional(fn) : vg.required(fn);
+                context.partial || !(field.required || fn.id === 'required')
+                    ? vg.optional(fn)
+                    : fn.id === 'required'
+                        ? fn
+                        : vg.required(fn);
         }
         if (context.allowPatchOperators) {
             schema._$pull = vg.optional(vg.isAny());

package/esm/document/data-type/omit-type.js

@@ -1,10 +1,4 @@
 import { createMappedClass } from './utils/create-mapped-class.js';
-/**
- * Create a new MappedType that omits given fields from base type
- * @param baseType
- * @param keys
- * @param options
- */
 /**
  *
  */

package/esm/document/data-type/partial-type.js

@@ -1,10 +1,4 @@
 import { createMappedClass } from './utils/create-mapped-class.js';
-/**
- * Create a new MappedType that marks given or all fields as optional
- * @param baseType
- * @param keys
- * @param options
- */
 /**
  *
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

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

@@ -1,5 +1,5 @@
 import { type StrictOmit, type Type } from 'ts-gems';
-import type { IsObject, ValidationOptions, Validator } from 'valgen';
+import type { 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,7 +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';
+import type { ApiField } from './api-field.js';
 /**
  * @namespace DataType
  */
@@ -31,7 +31,7 @@ export declare namespace DataType {
         ignoreReadonlyFields?: boolean;
         ignoreWriteonlyFields?: boolean;
         allowPatchOperators?: boolean;
-        generateSchemaHook?: (schema: IsObject.Schema, dataType: ComplexType, path: string) => IsObject.Schema;
+        fieldHook?: (field: ApiField, currentPath: string, defaultGenerator: () => Validator) => Validator;
     }
 }
 interface DataTypeStatic {

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

@@ -1,9 +1,16 @@
 import type { Class, Type } from 'ts-gems';
 import type { DataType } from './data-type.js';
-export declare function OmitType(baseType: string | Type, keys: string[], options?: DataType.Options): Type;
 /**
  * Create a new MappedType that omits given fields from base type
  * @param baseType
  * @param keys
  * @param options
- */ export declare function OmitType<Args extends any[], Instance, Static, K extends keyof Instance>(baseType: Class<Args, Instance, Static>, keys: readonly K[], options?: DataType.Options): Class<Args, Omit<Instance, K>> & Omit<Pick<Static, keyof typeof baseType>, 'prototype' | 'constructor'>;
+ */
+export declare function OmitType<Args extends any[], Instance, Static, K extends keyof Instance>(baseType: Class<Args, Instance, Static>, keys: readonly K[], options?: DataType.Options): Class<Args, Omit<Instance, K>> & Omit<Pick<Static, keyof typeof baseType>, 'prototype' | 'constructor'>;
+/**
+ * Create a new MappedType that omits given fields from base type
+ * @param baseType
+ * @param keys
+ * @param options
+ */
+export declare function OmitType(baseType: string | Type, keys: string[], options?: DataType.Options): Type;

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

@@ -1,6 +1,5 @@
 import type { Class, PartialSome, Type } from 'ts-gems';
 import type { DataType } from './data-type.js';
-export declare function PartialType(baseType: string | Type, keys: string[], options?: DataType.Options): Type;
 /**
  * Create a new MappedType that marks given or all fields as optional
  * @param baseType
@@ -20,3 +19,10 @@ export declare function PartialType<Args extends any[], Instance, Static, K exte
  * @param options
  */
 export declare function PartialType<Args extends any[], Instance, Static>(baseType: Class<Args, Instance, Static>, options?: DataType.Options): Class<Args, Partial<Instance>> & Omit<Pick<Static, keyof typeof baseType>, 'prototype' | 'constructor'>;
+/**
+ * Create a new MappedType that marks given or all fields as optional
+ * @param baseType
+ * @param keys
+ * @param options
+ */
+export declare function PartialType(baseType: string | Type, keys: string[], options?: DataType.Options): Type;