@naturalcycles/nodejs-lib 15.105.0 → 15.106.1

package/dist/validation/ajv/jSchema.d.ts

@@ -52,6 +52,15 @@ export declare const j: {
          */
         withEnumKeys: typeof withEnumKeys;
         withRegexKeys: typeof withRegexKeys;
+        /**
+         * Validates that the value is an instance of the given class/constructor.
+         *
+         * ```ts
+         * j.object.instanceOf(Date) // typed as Date
+         * j.object.instanceOf(Date).optional() // typed as Date | undefined
+         * ```
+         */
+        instanceOf<T>(ctor: new (...args: any[]) => T): JBuilder<T, false>;
     };
     array<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JArray<OUT, Opt>;
     tuple<const S extends JSchema<any, any>[]>(items: S): JTuple<S>;
@@ -69,7 +78,7 @@ export declare const j: {
      * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
      * Use `oneOf` when schemas are mutually exclusive.
      */
-    oneOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    oneOf<B extends readonly JSchema<any, boolean>[]>(items: [...B]): JBuilder<BuilderOutUnion<B>, false>;
     /**
      * Use only with primitive values, otherwise this function will throw to avoid bugs.
      * To validate objects, use `anyOfBy` or `anyOfThese`.
@@ -81,7 +90,7 @@ export declare const j: {
      * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
      * Use `oneOf` when schemas are mutually exclusive.
      */
-    anyOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    anyOf<B extends readonly JSchema<any, boolean>[]>(items: [...B]): JBuilder<BuilderOutUnion<B>, false>;
     /**
      * Pick validation schema for an object based on the value of a specific property.
      *
@@ -94,7 +103,7 @@ export declare const j: {
      * const schema = j.anyOfBy('success', schemaMap)
      * ```
      */
-    anyOfBy<D extends Record<PropertyKey, JSchema<any, any>>, OUT = AnyOfByOut<D>>(propertyName: string, schemaDictionary: D): JBuilder<OUT, false>;
+    anyOfBy<D extends Record<PropertyKey, JSchema<any, any>>>(propertyName: string, schemaDictionary: D): JBuilder<AnyOfByOut<D>, false>;
     /**
      * Custom version of `anyOf` which - in contrast to the original function - does not mutate the input.
      * This comes with a performance penalty, so do not use it where performance matters.
@@ -103,7 +112,7 @@ export declare const j: {
      * const schema = j.anyOfThese([successSchema, errorSchema])
      * ```
      */
-    anyOfThese<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(items: [...B]): JBuilder<OUT, false>;
+    anyOfThese<B extends readonly JSchema<any, boolean>[]>(items: [...B]): JBuilder<BuilderOutUnion<B>, false>;
     and(): {
         silentBob: () => never;
     };
@@ -410,9 +419,9 @@ export declare class JTuple<ITEMS extends JSchema<any, any>[]> extends JBuilder<
     constructor(items: ITEMS);
 }
 declare function object(props: AnyObject): never;
-declare function object<OUT extends AnyObject>(props: {
+declare function object<OUT extends AnyObject>(props: [keyof OUT] extends [never] ? Record<string, never> : {
     [K in keyof Required<OUT>]-?: JSchema<OUT[K], any>;
-}): JObject<OUT, false>;
+}): [keyof OUT] extends [never] ? never : JObject<OUT, false>;
 declare function objectInfer<P extends Record<string, JSchema<any, any>>>(props: P): JObjectInfer<P, false>;
 declare function objectDbEntity(props: AnyObject): never;
 declare function objectDbEntity<OUT extends BaseDBEntity, EXTRA_KEYS extends Exclude<keyof OUT, keyof BaseDBEntity> = Exclude<keyof OUT, keyof BaseDBEntity>>(props: {

package/dist/validation/ajv/jSchema.js

@@ -81,6 +81,21 @@ export const j = {
          */
         withEnumKeys,
         withRegexKeys,
+        /**
+         * Validates that the value is an instance of the given class/constructor.
+         *
+         * ```ts
+         * j.object.instanceOf(Date) // typed as Date
+         * j.object.instanceOf(Date).optional() // typed as Date | undefined
+         * ```
+         */
+        instanceOf(ctor) {
+            return new JBuilder({
+                type: 'object',
+                instanceof: ctor.name,
+                hasIsOfTypeCheck: true,
+            });
+        },
     }),
     array(itemSchema) {
         return new JArray(itemSchema);
@@ -1061,7 +1076,6 @@ export class AjvSchema {
         }
         let jsonSchema;
         if (schema instanceof JSchema) {
-            // oxlint-disable typescript-eslint(no-unnecessary-type-assertion)
             jsonSchema = schema.build();
             AjvSchema.requireValidJsonSchema(jsonSchema);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.105.0",
+  "version": "15.106.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/validation/ajv/jSchema.ts

@@ -135,6 +135,22 @@ export const j = {
      */
     withEnumKeys,
     withRegexKeys,
+
+    /**
+     * Validates that the value is an instance of the given class/constructor.
+     *
+     * ```ts
+     * j.object.instanceOf(Date) // typed as Date
+     * j.object.instanceOf(Date).optional() // typed as Date | undefined
+     * ```
+     */
+    instanceOf<T>(ctor: new (...args: any[]) => T): JBuilder<T, false> {
+      return new JBuilder<T, false>({
+        type: 'object',
+        instanceof: ctor.name,
+        hasIsOfTypeCheck: true,
+      })
+    },
   }),
 
   array<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JArray<OUT, Opt> {
@@ -203,16 +219,16 @@ export const j = {
    * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
    * Use `oneOf` when schemas are mutually exclusive.
    */
-  oneOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  oneOf<B extends readonly JSchema<any, boolean>[]>(
     items: [...B],
-  ): JBuilder<OUT, false> {
+  ): JBuilder<BuilderOutUnion<B>, false> {
     const schemas = items.map(b => b.build())
     _assert(
       schemas.every(hasNoObjectSchemas),
       'Do not use `oneOf` validation with non-primitive types!',
     )
 
-    return new JBuilder<OUT, false>({
+    return new JBuilder<BuilderOutUnion<B>, false>({
       oneOf: schemas,
     })
   },
@@ -228,16 +244,16 @@ export const j = {
    * Use `anyOf` when schemas may overlap (e.g., AccountId | PartnerId with same format).
    * Use `oneOf` when schemas are mutually exclusive.
    */
-  anyOf<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  anyOf<B extends readonly JSchema<any, boolean>[]>(
     items: [...B],
-  ): JBuilder<OUT, false> {
+  ): JBuilder<BuilderOutUnion<B>, false> {
     const schemas = items.map(b => b.build())
     _assert(
       schemas.every(hasNoObjectSchemas),
       'Do not use `anyOf` validation with non-primitive types!',
     )
 
-    return new JBuilder<OUT, false>({
+    return new JBuilder<BuilderOutUnion<B>, false>({
       anyOf: schemas,
     })
   },
@@ -254,16 +270,16 @@ export const j = {
    * const schema = j.anyOfBy('success', schemaMap)
    * ```
    */
-  anyOfBy<D extends Record<PropertyKey, JSchema<any, any>>, OUT = AnyOfByOut<D>>(
+  anyOfBy<D extends Record<PropertyKey, JSchema<any, any>>>(
     propertyName: string,
     schemaDictionary: D,
-  ): JBuilder<OUT, false> {
+  ): JBuilder<AnyOfByOut<D>, false> {
     const builtSchemaDictionary: Record<string, JsonSchema> = {}
     for (const [key, schema] of Object.entries(schemaDictionary)) {
       builtSchemaDictionary[key] = schema.build()
     }
 
-    return new JBuilder<OUT, false>({
+    return new JBuilder<AnyOfByOut<D>, false>({
       type: 'object',
       hasIsOfTypeCheck: true,
       anyOfBy: {
@@ -281,10 +297,10 @@ export const j = {
    * const schema = j.anyOfThese([successSchema, errorSchema])
    * ```
    */
-  anyOfThese<B extends readonly JSchema<any, boolean>[], OUT = BuilderOutUnion<B>>(
+  anyOfThese<B extends readonly JSchema<any, boolean>[]>(
     items: [...B],
-  ): JBuilder<OUT, false> {
-    return new JBuilder<OUT, false>({
+  ): JBuilder<BuilderOutUnion<B>, false> {
+    return new JBuilder<BuilderOutUnion<B>, false>({
       anyOfThese: items.map(b => b.build()),
     })
   },
@@ -1323,9 +1339,11 @@ export class JTuple<ITEMS extends JSchema<any, any>[]> extends JBuilder<TupleOut
 // ==== Standalone functions for j.object ====
 
 function object(props: AnyObject): never
-function object<OUT extends AnyObject>(props: {
-  [K in keyof Required<OUT>]-?: JSchema<OUT[K], any>
-}): JObject<OUT, false>
+function object<OUT extends AnyObject>(
+  props: [keyof OUT] extends [never]
+    ? Record<string, never>
+    : { [K in keyof Required<OUT>]-?: JSchema<OUT[K], any> },
+): [keyof OUT] extends [never] ? never : JObject<OUT, false>
 
 function object<OUT extends AnyObject>(props: {
   [key in keyof OUT]: JSchema<OUT[key], any>
@@ -1531,8 +1549,7 @@ export class AjvSchema<OUT> {
     let jsonSchema: JsonSchema<OUT>
 
     if (schema instanceof JSchema) {
-      // oxlint-disable typescript-eslint(no-unnecessary-type-assertion)
-      jsonSchema = (schema as JSchema<OUT, any>).build()
+      jsonSchema = schema.build()
       AjvSchema.requireValidJsonSchema(jsonSchema)
     } else {
       jsonSchema = schema
@@ -1654,7 +1671,7 @@ function executeValidation<OUT>(
     const [err, result] = _try(() => builtSchema.postValidation!(output))
     if (err) {
       valid = false
-      ;(fn as any).errors = [
+      fn.errors = [
         {
           instancePath: '',
           message: err.message,