@naturalcycles/nodejs-lib 15.122.4 → 15.123.0

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

@@ -1,6 +1,6 @@
 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 { AnyObject, BaseDBEntity, IANATimezone, Inclusiveness, IsoDate, IsoDateTime, IsoMonth, Enum, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { StandardJSONSchemaV1, StandardSchemaV1 } from '@standard-schema/spec';
 import type { Ajv, ValidateFunction } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
@@ -66,7 +66,9 @@ export declare const j: {
     tuple<const S extends JSchema<any, any>[]>(items: S): JTuple<S>;
     set<OUT, Opt>(itemSchema: JSchema<OUT, Opt>): JSet2Builder<OUT, Opt>;
     buffer(): JBuilder<Buffer, false>;
-    enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum>(input: T, opt?: JsonBuilderRuleOpt): JEnum<T extends readonly (infer U)[] ? U : T extends StringEnum ? T[keyof T] : T extends NumberEnum ? T[keyof T] : never>;
+    enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum | {
+        readonly values: readonly (string | number | boolean | null)[];
+    }>(input: T, opt?: JsonBuilderRuleOpt): JEnum<T extends readonly (infer U)[] ? U : Enum<T>>;
     /**
      * Use only with primitive values, otherwise this function will throw to avoid bugs.
      * To validate objects, use `anyOfBy`.

package/package.json

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

package/src/validation/ajv/jSchema.ts

@@ -19,6 +19,7 @@ import type {
   IsoDate,
   IsoDateTime,
   IsoMonth,
+  Enum,
   NumberEnum,
   StringEnum,
   StringMap,
@@ -172,18 +173,14 @@ export const j = {
     })
   },
 
-  enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum>(
-    input: T,
-    opt?: JsonBuilderRuleOpt,
-  ): JEnum<
-    T extends readonly (infer U)[]
-      ? U
-      : T extends StringEnum
-        ? T[keyof T]
-        : T extends NumberEnum
-          ? T[keyof T]
-          : never
-  > {
+  enum<
+    const T extends
+      | readonly (string | number | boolean | null)[]
+      | StringEnum
+      | NumberEnum
+      // an `_enum()` object, which carries helpers and so satisfies neither of the two above
+      | { readonly values: readonly (string | number | boolean | null)[] },
+  >(input: T, opt?: JsonBuilderRuleOpt): JEnum<T extends readonly (infer U)[] ? U : Enum<T>> {
     let enumValues: readonly (string | number | boolean | null)[] | undefined
     let baseType: EnumBaseType = 'other'