@naturalcycles/nodejs-lib 15.94.0 → 15.96.0

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

@@ -1,6 +1,7 @@
 import type { ValidationFunction, ValidationFunctionResult } from '@naturalcycles/js-lib';
 import type { Set2 } from '@naturalcycles/js-lib/object';
 import type { AnyObject, BaseDBEntity, IANATimezone, Inclusiveness, IsoDate, IsoDateTime, IsoMonth, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import type { StandardJSONSchemaV1, StandardSchemaV1 } from '@standard-schema/spec';
 import type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
 export declare const j: {
@@ -122,7 +123,7 @@ export declare const HIDDEN_AJV_SCHEMA: unique symbol;
 export type WithCachedAjvSchema<Base, OUT> = Base & {
     [HIDDEN_AJV_SCHEMA]: AjvSchema<OUT>;
 };
-export declare class JSchema<OUT, Opt> {
+export declare class JSchema<OUT, Opt> implements StandardSchemaV1<unknown, OUT>, StandardJSONSchemaV1<unknown, OUT> {
     protected [HIDDEN_AJV_SCHEMA]: AjvSchema<any> | undefined;
     protected schema: JsonSchema;
     private _cfg?;
@@ -142,10 +143,11 @@ export declare class JSchema<OUT, Opt> {
     build(): JsonSchema<OUT>;
     clone(): this;
     cloneAndUpdateSchema(schema: Partial<JsonSchema>): this;
+    get ['~standard'](): StandardSchemaV1.Props<unknown, OUT> & StandardJSONSchemaV1.Props<unknown, OUT>;
     validate(input: unknown, opt?: AjvValidationOptions): OUT;
     isValid(input: unknown, opt?: AjvValidationOptions): boolean;
     getValidationResult(input: unknown, opt?: AjvValidationOptions): ValidationFunctionResult<OUT, AjvValidationError>;
-    getValidationFunction(): ValidationFunction<OUT, AjvValidationError>;
+    getValidationFunction(opt?: AjvValidationOptions): ValidationFunction<OUT, AjvValidationError>;
     /**
      * Specify a function to be called after the normal validation is finished.
      *

package/dist/validation/ajv/jSchema.js

@@ -295,6 +295,26 @@ export class JSchema {
         _objectAssign(clone.schema, schema);
         return clone;
     }
+    get ['~standard']() {
+        const value = {
+            version: 1,
+            vendor: 'j',
+            validate: v => {
+                const [err, output] = this.getValidationResult(v);
+                if (err) {
+                    // todo: make getValidationResult return issues with path, so we can pass the path here too
+                    return { issues: [{ message: err.message }] };
+                }
+                return { value: output };
+            },
+            jsonSchema: {
+                input: () => this.build(),
+                output: () => this.build(),
+            },
+        };
+        Object.defineProperty(this, '~standard', { value });
+        return value;
+    }
     validate(input, opt) {
         const [err, output] = this.getValidationResult(input, opt);
         if (err)
@@ -310,12 +330,13 @@ export class JSchema {
         const inputName = this._cfg?.inputName || (builtSchema.$id ? _substringBefore(builtSchema.$id, '.') : undefined);
         return executeValidation(fn, builtSchema, input, opt, inputName);
     }
-    getValidationFunction() {
-        return (input, opt) => {
+    getValidationFunction(opt = {}) {
+        return (input, opt2) => {
             return this.getValidationResult(input, {
-                mutateInput: opt?.mutateInput,
-                inputName: opt?.inputName,
-                inputId: opt?.inputId,
+                ajv: opt.ajv,
+                mutateInput: opt2?.mutateInput ?? opt.mutateInput,
+                inputName: opt2?.inputName ?? opt.inputName,
+                inputId: opt2?.inputId ?? opt.inputId,
             });
         };
     }

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.94.0",
+  "version": "15.96.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
+    "@standard-schema/spec": "^1",
     "@types/js-yaml": "^4",
     "@types/jsonwebtoken": "^9",
     "@types/yargs": "^16",
@@ -19,7 +20,7 @@
   },
   "devDependencies": {
     "@typescript/native-preview": "7.0.0-dev.20260201.1",
-    "@naturalcycles/dev-lib": "20.36.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/validation/ajv/jSchema.ts

@@ -29,6 +29,7 @@ import type {
   UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
 import { _objectAssign, _typeCast, JWT_REGEX } from '@naturalcycles/js-lib/types'
+import type { StandardJSONSchemaV1, StandardSchemaV1 } from '@standard-schema/spec'
 import type { Ajv, ErrorObject } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import {
@@ -339,7 +340,9 @@ export type WithCachedAjvSchema<Base, OUT> = Base & {
      With `Opt`, we can infer it as `{ foo?: string | undefined }`.
 */
 
-export class JSchema<OUT, Opt> {
+export class JSchema<OUT, Opt>
+  implements StandardSchemaV1<unknown, OUT>, StandardJSONSchemaV1<unknown, OUT>
+{
   protected [HIDDEN_AJV_SCHEMA]: AjvSchema<any> | undefined
   protected schema: JsonSchema
   private _cfg?: { ajv?: Ajv; inputName?: string }
@@ -426,6 +429,28 @@ export class JSchema<OUT, Opt> {
     return clone
   }
 
+  get ['~standard'](): StandardSchemaV1.Props<unknown, OUT> &
+    StandardJSONSchemaV1.Props<unknown, OUT> {
+    const value: StandardSchemaV1.Props<unknown, OUT> & StandardJSONSchemaV1.Props<unknown, OUT> = {
+      version: 1,
+      vendor: 'j',
+      validate: v => {
+        const [err, output] = this.getValidationResult(v)
+        if (err) {
+          // todo: make getValidationResult return issues with path, so we can pass the path here too
+          return { issues: [{ message: err.message }] }
+        }
+        return { value: output }
+      },
+      jsonSchema: {
+        input: () => this.build() as Record<string, unknown>,
+        output: () => this.build() as Record<string, unknown>,
+      },
+    }
+    Object.defineProperty(this, '~standard', { value })
+    return value
+  }
+
   validate(input: unknown, opt?: AjvValidationOptions): OUT {
     const [err, output] = this.getValidationResult(input, opt)
     if (err) throw err
@@ -447,12 +472,15 @@ export class JSchema<OUT, Opt> {
     return executeValidation<OUT>(fn, builtSchema, input, opt, inputName)
   }
 
-  getValidationFunction(): ValidationFunction<OUT, AjvValidationError> {
-    return (input, opt) => {
+  getValidationFunction(
+    opt: AjvValidationOptions = {},
+  ): ValidationFunction<OUT, AjvValidationError> {
+    return (input, opt2) => {
       return this.getValidationResult(input, {
-        mutateInput: opt?.mutateInput,
-        inputName: opt?.inputName,
-        inputId: opt?.inputId,
+        ajv: opt.ajv,
+        mutateInput: opt2?.mutateInput ?? opt.mutateInput,
+        inputName: opt2?.inputName ?? opt.inputName,
+        inputId: opt2?.inputId ?? opt.inputId,
       })
     }
   }