@naturalcycles/js-lib 15.38.0 → 15.40.0

package/dist/enum.util.d.ts

@@ -1,4 +1,5 @@
-import type { NumberEnum, StringEnum } from './types.js';
+import type { AnyObject, NumberEnum, StringEnum } from './types.js';
+export declare function getEnumType(en: AnyObject): 'StringEnum' | 'NumberEnum' | undefined;
 /**
  * Returns all String keys of a number-enum.
  */

package/dist/enum.util.js

@@ -1,3 +1,32 @@
+export function getEnumType(en) {
+    /*
+     * enum Foo { A = 1, B = 2 }
+     * becomes
+     * { "1": "A", "2": "B", "A": 1, "B": 2}
+     *
+     * enum Foo { A = "V1", B = "V2" }
+     * becomes
+     * { "V1": "A", "V2": "B", "A": "V1", "B": "V2"}
+     */
+    const entries = Object.entries(en);
+    if (!entries.length)
+        return;
+    const [, value] = entries.pop();
+    let isNumberEnum = typeof value === 'number';
+    let isStringEnum = typeof value === 'string';
+    for (const [key, value] of entries) {
+        const isValueNumber = typeof value === 'number';
+        const isValueString = typeof value === 'string';
+        isStringEnum &&= isValueString;
+        isNumberEnum &&= isValueNumber || String(en[value]) === key;
+        if (!isStringEnum && !isNumberEnum)
+            break;
+    }
+    if (isNumberEnum)
+        return 'NumberEnum';
+    if (isStringEnum)
+        return 'StringEnum';
+}
 /**
  * Returns all String keys of a number-enum.
  */

package/dist/http/fetcher.d.ts

@@ -16,8 +16,12 @@ export declare class Fetcher {
      *
      * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
      */
-    static readonly VERSION = 2;
-    static readonly userAgent: string | undefined;
+    private static readonly VERSION;
+    /**
+     * userAgent is statically exposed as Fetcher.userAgent.
+     * It can be modified globally, and will be used (read) at the start of every request.
+     */
+    static userAgent: string | undefined;
     private constructor();
     /**
      * Add BeforeRequest hook at the end of the hooks list.

package/dist/http/fetcher.js

@@ -12,20 +12,6 @@ import { pTimeout } from '../promise/pTimeout.js';
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util.js';
 import { _stringify } from '../string/stringify.js';
 import { HTTP_METHODS } from './http.model.js';
-const acceptByResponseType = {
-    text: 'text/plain',
-    json: 'application/json',
-    void: '*/*',
-    readableStream: 'application/octet-stream',
-    arrayBuffer: 'application/octet-stream',
-    blob: 'application/octet-stream',
-};
-const defRetryOptions = {
-    count: 2,
-    timeout: 1000,
-    timeoutMax: 30_000,
-    timeoutMultiplier: 2,
-};
 /**
  * Experimental wrapper around Fetch.
  * Works in both Browser and Node, using `globalThis.fetch`.
@@ -37,7 +23,11 @@ export class Fetcher {
      *
      * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
      */
-    static VERSION = 2;
+    static VERSION = 3;
+    /**
+     * userAgent is statically exposed as Fetcher.userAgent.
+     * It can be modified globally, and will be used (read) at the start of every request.
+     */
     static userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined;
     constructor(cfg = {}) {
         if (typeof globalThis.fetch !== 'function') {
@@ -614,7 +604,7 @@ export class Fetcher {
             logResponseBody: debug,
             logWithBaseUrl: isServerSide(),
             logWithSearchParams: true,
-            retry: { ...defRetryOptions },
+            retry: { ...defaultRetryOptions },
             init: {
                 method: cfg.method || 'GET',
                 headers: _filterNullishValues({
@@ -659,7 +649,10 @@ export class Fetcher {
             },
             init: _merge({
                 ...this.cfg.init,
-                headers: { ...this.cfg.init.headers }, // this avoids mutation
+                headers: {
+                    ...this.cfg.init.headers, // this avoids mutation
+                    'user-agent': Fetcher.userAgent, // re-load it here, to support setting it globally post-fetcher-creation
+                },
                 method: opt.method || this.cfg.init.method,
                 credentials: opt.credentials || this.cfg.init.credentials,
                 redirect: opt.redirect || this.cfg.init.redirect || 'follow',
@@ -716,3 +709,17 @@ export class Fetcher {
 export function getFetcher(cfg = {}) {
     return Fetcher.create(cfg);
 }
+const acceptByResponseType = {
+    text: 'text/plain',
+    json: 'application/json',
+    void: '*/*',
+    readableStream: 'application/octet-stream',
+    arrayBuffer: 'application/octet-stream',
+    blob: 'application/octet-stream',
+};
+const defaultRetryOptions = {
+    count: 2,
+    timeout: 1000,
+    timeoutMax: 30_000,
+    timeoutMultiplier: 2,
+};

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -1,4 +1,4 @@
-import { type AnyObject, type BaseDBEntity, type IsoDate, type IsoDateTime, type UnixTimestamp } from '../types.js';
+import { type AnyObject, type BaseDBEntity, type IsoDate, type IsoDateTime, type NumberEnum, type StringEnum, type UnixTimestamp, type UnixTimestampMillis } from '../types.js';
 import type { JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaConst, JsonSchemaEnum, JsonSchemaNull, JsonSchemaNumber, JsonSchemaObject, JsonSchemaOneOf, JsonSchemaRef, JsonSchemaString, JsonSchemaTuple } from './jsonSchema.model.js';
 export interface JsonSchemaBuilder<T = unknown> {
     build: () => JsonSchema<T>;
@@ -12,24 +12,12 @@ export declare const j: {
     const<T extends string | number | boolean | null>(value: T): JsonSchemaAnyBuilder<T, JsonSchemaConst<T>, false>;
     null(): JsonSchemaAnyBuilder<null, JsonSchemaNull, false>;
     ref<T = unknown>($ref: string): JsonSchemaAnyBuilder<T, JsonSchemaRef<T>, false>;
-    enum<T = unknown>(enumValues: T[]): JsonSchemaAnyBuilder<T, JsonSchemaEnum<T>, false>;
+    enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum>(input: T): JsonSchemaAnyBuilder<T extends readonly (infer U)[] ? U : T extends StringEnum ? T[keyof T] : T extends NumberEnum ? T[keyof T] : never, JsonSchemaEnum<any>, false>;
     boolean(): JsonSchemaAnyBuilder<boolean, JsonSchemaBoolean, false>;
     buffer(): JsonSchemaAnyBuilder<Buffer<ArrayBufferLike>, JsonSchemaAny<Buffer<ArrayBufferLike>>, false>;
     number<T extends number = number>(): JsonSchemaNumberBuilder<T, false>;
     integer<T extends number = number>(): JsonSchemaNumberBuilder<T, false>;
-    unixTimestamp(): JsonSchemaNumberBuilder<UnixTimestamp, false>;
-    unixTimestamp2000(): JsonSchemaNumberBuilder<UnixTimestamp, false>;
     string<T extends string = string>(): JsonSchemaStringBuilder<T, false>;
-    jwt(): JsonSchemaStringBuilder<string, false>;
-    /**
-     * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
-     */
-    isoDate(): JsonSchemaStringBuilder<IsoDate, false>;
-    /**
-     * Accepts strings that start with the `YYYY-MM-DDTHH:MM:SS` shape
-     * and optionally end with either a `Z` or a `+/-hh:mm` timezone part.
-     */
-    isoDateTime(): JsonSchemaStringBuilder<IsoDateTime, false>;
     object: typeof object;
     dbEntity<T extends AnyObject>(props: T): JsonSchemaObjectBuilder<BaseDBEntity & ({ [K in keyof T as T[K] extends JsonSchemaAnyBuilder<any, any, infer Opt extends boolean> ? Opt extends true ? never : K : never]: T[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never; } & { [K_1 in keyof T as T[K_1] extends JsonSchemaAnyBuilder<any, any, infer Opt extends boolean> ? Opt extends true ? K_1 : never : never]?: (T[K_1] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never) | undefined; } extends infer O ? { [K_2 in keyof O]: O[K_2]; } : never) extends infer O_1 ? { [K_3 in keyof O_1]: O_1[K_3]; } : never, false>;
     rootObject<T extends AnyObject>(props: { [K in keyof T]: JsonSchemaAnyBuilder<T[K]>; }): JsonSchemaObjectBuilder<T, false>;
@@ -86,10 +74,10 @@ export declare class JsonSchemaNumberBuilder<T extends number = number, Opt exte
     int64: () => this;
     float: () => this;
     double: () => this;
-    unixTimestamp: () => this;
-    unixTimestamp2000: () => this;
-    unixTimestampMillis: () => this;
-    unixTimestampMillis2000: () => this;
+    unixTimestamp: () => JsonSchemaNumberBuilder<UnixTimestamp>;
+    unixTimestamp2000: () => JsonSchemaNumberBuilder<UnixTimestamp>;
+    unixTimestampMillis: () => JsonSchemaNumberBuilder<UnixTimestampMillis>;
+    unixTimestampMillis2000: () => JsonSchemaNumberBuilder<UnixTimestampMillis>;
     utcOffset: () => this;
     utcOffsetHours: () => this;
     branded<B extends number>(): JsonSchemaNumberBuilder<B>;

package/dist/json-schema/jsonSchemaBuilder.js

@@ -1,4 +1,6 @@
 import { _uniq } from '../array/array.util.js';
+import { _numberEnumValues, _stringEnumValues, getEnumType } from '../enum.util.js';
+import { _assert } from '../error/assert.js';
 import { _deepCopy } from '../object/object.util.js';
 import { _sortObject } from '../object/sortObject.js';
 import { JWT_REGEX, } from '../types.js';
@@ -27,8 +29,24 @@ export const j = {
             $ref,
         });
     },
-    enum(enumValues) {
-        return new JsonSchemaAnyBuilder({ enum: enumValues });
+    enum(input) {
+        let enumValues;
+        if (Array.isArray(input)) {
+            enumValues = input;
+        }
+        else if (typeof input === 'object') {
+            const enumType = getEnumType(input);
+            if (enumType === 'NumberEnum') {
+                enumValues = _numberEnumValues(input);
+            }
+            else if (enumType === 'StringEnum') {
+                enumValues = _stringEnumValues(input);
+            }
+        }
+        _assert(enumValues, 'Unsupported enum input');
+        return new JsonSchemaAnyBuilder({
+            enum: enumValues,
+        });
     },
     boolean() {
         return new JsonSchemaAnyBuilder({
@@ -47,41 +65,18 @@ export const j = {
     integer() {
         return new JsonSchemaNumberBuilder().integer();
     },
-    unixTimestamp() {
-        return new JsonSchemaNumberBuilder().unixTimestamp();
-    },
-    unixTimestamp2000() {
-        return new JsonSchemaNumberBuilder().unixTimestamp2000();
-    },
     // string types
     string() {
         return new JsonSchemaStringBuilder();
     },
-    jwt() {
-        return new JsonSchemaStringBuilder().jwt();
-    },
-    /**
-     * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
-     */
-    isoDate() {
-        return new JsonSchemaStringBuilder().isoDate();
-    },
-    /**
-     * Accepts strings that start with the `YYYY-MM-DDTHH:MM:SS` shape
-     * and optionally end with either a `Z` or a `+/-hh:mm` timezone part.
-     */
-    isoDateTime() {
-        return new JsonSchemaStringBuilder().isoDateTime();
-    },
-    // email: () => new JsonSchemaStringBuilder().email(),
     // complex types
     object,
     dbEntity(props) {
         return j
             .object({
             id: j.string(),
-            created: j.unixTimestamp2000(),
-            updated: j.unixTimestamp2000(),
+            created: j.integer().unixTimestamp2000(),
+            updated: j.integer().unixTimestamp2000(),
         })
             .extend(j.object(props));
     },
@@ -226,10 +221,19 @@ export class JsonSchemaNumberBuilder extends JsonSchemaAnyBuilder {
     int64 = () => this.format('int64');
     float = () => this.format('float');
     double = () => this.format('double');
-    unixTimestamp = () => this.format('unixTimestamp').description('UnixTimestamp');
-    unixTimestamp2000 = () => this.format('unixTimestamp2000').description('UnixTimestamp2000');
-    unixTimestampMillis = () => this.format('unixTimestampMillis').description('UnixTimestampMillis');
-    unixTimestampMillis2000 = () => this.format('unixTimestampMillis2000').description('UnixTimestampMillis2000');
+    unixTimestamp = () => this.integer().branded().format('unixTimestamp').description('UnixTimestamp');
+    unixTimestamp2000 = () => this.integer()
+        .branded()
+        .format('unixTimestamp2000')
+        .description('UnixTimestamp2000');
+    unixTimestampMillis = () => this.integer()
+        .branded()
+        .format('unixTimestampMillis')
+        .description('UnixTimestampMillis');
+    unixTimestampMillis2000 = () => this.integer()
+        .branded()
+        .format('unixTimestampMillis2000')
+        .description('UnixTimestampMillis2000');
     utcOffset = () => this.format('utcOffset');
     utcOffsetHours = () => this.format('utcOffsetHours');
     branded() {

package/dist/json-schema/jsonSchemas.js

@@ -1,6 +1,6 @@
 import { j } from './jsonSchemaBuilder.js';
 export const baseDBEntityJsonSchema = j.object({
     id: j.string(),
-    created: j.unixTimestamp2000(),
-    updated: j.unixTimestamp2000(),
+    created: j.integer().unixTimestamp2000(),
+    updated: j.integer().unixTimestamp2000(),
 });

package/dist/nanoid.js

@@ -2,9 +2,9 @@
 // All credit to nanoid authors: https://github.com/ai/nanoid
 // Reason for vendoring: (still) cannot import esm, and Nanoid went ESM-only since 4.0
 /// <reference lib="dom" preserve="true" />
-/* eslint-disable no-bitwise */
 // "0-9a-zA-Z-_", same as base64url alphabet
 const urlAlphabet = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
+// oxlint-disable no-bitwise -- NanoID uses bit operations to build compact IDs
 export function nanoidBrowser(length = 21) {
     let id = '';
     const bytes = globalThis.crypto.getRandomValues(new Uint8Array(length));

package/dist/number/createDeterministicRandom.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-bitwise */
 /**
  * Returns a "deterministic Math.random() function"
  *
@@ -6,6 +5,7 @@
  */
 export function _createDeterministicRandom(seed = 0x2f6e2b1) {
     return () => {
+        // oxlint-disable no-bitwise
         // Robert Jenkins’ 32 bit integer hash function
         seed = (seed + 0x7ed55d16 + (seed << 12)) & 0xffffffff;
         seed = (seed ^ 0xc761c23c ^ (seed >>> 19)) & 0xffffffff;

package/dist/object/map2.d.ts

@@ -10,6 +10,10 @@ export declare class Map2<K = any, V = any> extends Map<K, V> {
      * Convenience way to create Map2 from object.
      */
     static of<V>(obj: Record<any, V>): Map2<string, V>;
+    /**
+     * Allows to set multiple key-value pairs at once.
+     */
+    setMany(obj: Record<any, V>): this;
     toObject(): Record<string, V>;
     toJSON(): Record<string, V>;
 }

package/dist/object/map2.js

@@ -12,6 +12,15 @@ export class Map2 extends Map {
     static of(obj) {
         return new Map2(Object.entries(obj));
     }
+    /**
+     * Allows to set multiple key-value pairs at once.
+     */
+    setMany(obj) {
+        for (const [k, v] of Object.entries(obj)) {
+            this.set(k, v);
+        }
+        return this;
+    }
     toObject() {
         return Object.fromEntries(this);
     }

package/dist/object/set2.d.ts

@@ -6,6 +6,11 @@
  * @experimental
  */
 export declare class Set2<T = any> extends Set<T> {
+    /**
+     * Like .add(), but allows to add multiple items at once.
+     * Mutates the Set, but also returns it conveniently.
+     */
+    addMany(items: Iterable<T>): this;
     toArray(): T[];
     toJSON(): T[];
 }

package/dist/object/set2.js

@@ -6,6 +6,16 @@
  * @experimental
  */
 export class Set2 extends Set {
+    /**
+     * Like .add(), but allows to add multiple items at once.
+     * Mutates the Set, but also returns it conveniently.
+     */
+    addMany(items) {
+        for (const item of items) {
+            this.add(item);
+        }
+        return this;
+    }
     toArray() {
         return [...this];
     }

package/dist/string/hash.util.js

@@ -1,3 +1,4 @@
+// oxlint-disable no-bitwise -- hash implementations use bit-level operations for speed
 const BASE62 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 // const BASE64 = BASE62 + '+/'
 const BASE64URL = BASE62 + '-_';
@@ -48,7 +49,7 @@ export function hashCode(s) {
     let i = 0;
     const len = s.length;
     while (i < len) {
-        // eslint-disable-next-line no-bitwise, unicorn/prefer-math-trunc, unicorn/prefer-code-point
+        // eslint-disable-next-line unicorn/prefer-math-trunc, unicorn/prefer-code-point
         hash = ((hash << 5) - hash + s.charCodeAt(i++)) << 0;
     }
     return hash + 2147483647 + 1;

package/dist/string/leven.js

@@ -1,6 +1,7 @@
 const array = [];
 const characterCodeCache = [];
-/* eslint-disable unicorn/prefer-code-point, no-bitwise */
+/* eslint-disable unicorn/prefer-code-point */
+// oxlint-disable no-bitwise
 /**
  * Modified version of: https://github.com/sindresorhus/leven/
  *

package/dist/string/safeJsonStringify.js

@@ -13,7 +13,6 @@ export function _safeJsonStringify(obj, replacer, spaces, cycleReplacer) {
         return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces);
     }
 }
-/* eslint-disable no-bitwise, no-implicit-coercion */
 // oxlint-disable no-unused-expressions
 function serializer(replacer, cycleReplacer) {
     const stack = [];
@@ -26,9 +25,15 @@ function serializer(replacer, cycleReplacer) {
     return function (key, value) {
         if (stack.length > 0) {
             const thisPos = stack.indexOf(this);
-            ~thisPos ? stack.splice(thisPos + 1) : stack.push(this);
-            ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key);
-            if (~stack.indexOf(value)) {
+            if (thisPos !== -1) {
+                stack.splice(thisPos + 1);
+                keys.splice(thisPos, Infinity, key);
+            }
+            else {
+                stack.push(this);
+                keys.push(key);
+            }
+            if (stack.includes(value)) {
                 value = cycleReplacer.call(this, key, value);
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.38.0",
+  "version": "15.40.0",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",

package/src/enum.util.ts

@@ -1,4 +1,36 @@
-import type { NumberEnum, StringEnum } from './types.js'
+import type { AnyObject, NumberEnum, StringEnum } from './types.js'
+
+export function getEnumType(en: AnyObject): 'StringEnum' | 'NumberEnum' | undefined {
+  /*
+   * enum Foo { A = 1, B = 2 }
+   * becomes
+   * { "1": "A", "2": "B", "A": 1, "B": 2}
+   *
+   * enum Foo { A = "V1", B = "V2" }
+   * becomes
+   * { "V1": "A", "V2": "B", "A": "V1", "B": "V2"}
+   */
+
+  const entries = Object.entries(en)
+  if (!entries.length) return
+
+  const [, value] = entries.pop()!
+
+  let isNumberEnum = typeof value === 'number'
+  let isStringEnum = typeof value === 'string'
+
+  for (const [key, value] of entries) {
+    const isValueNumber = typeof value === 'number'
+    const isValueString = typeof value === 'string'
+
+    isStringEnum &&= isValueString
+    isNumberEnum &&= isValueNumber || String(en[value]) === key
+    if (!isStringEnum && !isNumberEnum) break
+  }
+
+  if (isNumberEnum) return 'NumberEnum'
+  if (isStringEnum) return 'StringEnum'
+}
 
 /**
  * Returns all String keys of a number-enum.

package/src/http/fetcher.ts

@@ -56,22 +56,6 @@ import type {
 import type { HttpStatusFamily } from './http.model.js'
 import { HTTP_METHODS } from './http.model.js'
 
-const acceptByResponseType: Record<FetcherResponseType, string> = {
-  text: 'text/plain',
-  json: 'application/json',
-  void: '*/*',
-  readableStream: 'application/octet-stream',
-  arrayBuffer: 'application/octet-stream',
-  blob: 'application/octet-stream',
-}
-
-const defRetryOptions: FetcherRetryOptions = {
-  count: 2,
-  timeout: 1000,
-  timeoutMax: 30_000,
-  timeoutMultiplier: 2,
-}
-
 /**
  * Experimental wrapper around Fetch.
  * Works in both Browser and Node, using `globalThis.fetch`.
@@ -83,8 +67,12 @@ export class Fetcher {
    *
    * Version is to be incremented every time a difference in behaviour (or a bugfix) is done.
    */
-  static readonly VERSION = 2
-  static readonly userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined
+  private static readonly VERSION = 3
+  /**
+   * userAgent is statically exposed as Fetcher.userAgent.
+   * It can be modified globally, and will be used (read) at the start of every request.
+   */
+  static userAgent = isServerSide() ? `fetcher/${this.VERSION}` : undefined
 
   private constructor(cfg: FetcherCfg & FetcherOptions = {}) {
     if (typeof globalThis.fetch !== 'function') {
@@ -750,7 +738,7 @@ export class Fetcher {
         logResponseBody: debug,
         logWithBaseUrl: isServerSide(),
         logWithSearchParams: true,
-        retry: { ...defRetryOptions },
+        retry: { ...defaultRetryOptions },
         init: {
           method: cfg.method || 'GET',
           headers: _filterNullishValues({
@@ -801,7 +789,10 @@ export class Fetcher {
       init: _merge(
         {
           ...this.cfg.init,
-          headers: { ...this.cfg.init.headers }, // this avoids mutation
+          headers: {
+            ...this.cfg.init.headers, // this avoids mutation
+            'user-agent': Fetcher.userAgent, // re-load it here, to support setting it globally post-fetcher-creation
+          },
           method: opt.method || this.cfg.init.method,
           credentials: opt.credentials || this.cfg.init.credentials,
           redirect: opt.redirect || this.cfg.init.redirect || 'follow',
@@ -864,3 +855,19 @@ export class Fetcher {
 export function getFetcher(cfg: FetcherCfg & FetcherOptions = {}): Fetcher {
   return Fetcher.create(cfg)
 }
+
+const acceptByResponseType: Record<FetcherResponseType, string> = {
+  text: 'text/plain',
+  json: 'application/json',
+  void: '*/*',
+  readableStream: 'application/octet-stream',
+  arrayBuffer: 'application/octet-stream',
+  blob: 'application/octet-stream',
+}
+
+const defaultRetryOptions: FetcherRetryOptions = {
+  count: 2,
+  timeout: 1000,
+  timeoutMax: 30_000,
+  timeoutMultiplier: 2,
+}

package/src/json-schema/jsonSchemaBuilder.ts

@@ -1,4 +1,6 @@
 import { _uniq } from '../array/array.util.js'
+import { _numberEnumValues, _stringEnumValues, getEnumType } from '../enum.util.js'
+import { _assert } from '../error/assert.js'
 import { _deepCopy } from '../object/object.util.js'
 import { _sortObject } from '../object/sortObject.js'
 import {
@@ -7,8 +9,10 @@ import {
   type IsoDate,
   type IsoDateTime,
   JWT_REGEX,
-  type JWTString,
+  type NumberEnum,
+  type StringEnum,
   type UnixTimestamp,
+  type UnixTimestampMillis,
 } from '../types.js'
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst.js'
 import type {
@@ -58,9 +62,39 @@ export const j = {
       $ref,
     })
   },
-  enum<T = unknown>(enumValues: T[]) {
-    return new JsonSchemaAnyBuilder<T, JsonSchemaEnum<T>>({ enum: enumValues })
+
+  enum<const T extends readonly (string | number | boolean | null)[] | StringEnum | NumberEnum>(
+    input: T,
+  ) {
+    let enumValues: readonly (string | number | boolean | null)[] | undefined
+
+    if (Array.isArray(input)) {
+      enumValues = input
+    } else if (typeof input === 'object') {
+      const enumType = getEnumType(input)
+      if (enumType === 'NumberEnum') {
+        enumValues = _numberEnumValues(input as NumberEnum)
+      } else if (enumType === 'StringEnum') {
+        enumValues = _stringEnumValues(input as StringEnum)
+      }
+    }
+
+    _assert(enumValues, 'Unsupported enum input')
+
+    return new JsonSchemaAnyBuilder<
+      T extends readonly (infer U)[]
+        ? U
+        : T extends StringEnum
+          ? T[keyof T]
+          : T extends NumberEnum
+            ? T[keyof T]
+            : never,
+      JsonSchemaEnum<any>
+    >({
+      enum: enumValues as any[],
+    })
   },
+
   boolean() {
     return new JsonSchemaAnyBuilder<boolean, JsonSchemaBoolean>({
       type: 'boolean',
@@ -79,45 +113,20 @@ export const j = {
   integer<T extends number = number>() {
     return new JsonSchemaNumberBuilder<T>().integer()
   },
-  unixTimestamp() {
-    return new JsonSchemaNumberBuilder<UnixTimestamp>().unixTimestamp()
-  },
-  unixTimestamp2000() {
-    return new JsonSchemaNumberBuilder<UnixTimestamp>().unixTimestamp2000()
-  },
 
   // string types
   string<T extends string = string>() {
     return new JsonSchemaStringBuilder<T>()
   },
-  jwt() {
-    return new JsonSchemaStringBuilder<JWTString>().jwt()
-  },
-
-  /**
-   * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
-   */
-  isoDate() {
-    return new JsonSchemaStringBuilder<IsoDate>().isoDate()
-  },
-
-  /**
-   * Accepts strings that start with the `YYYY-MM-DDTHH:MM:SS` shape
-   * and optionally end with either a `Z` or a `+/-hh:mm` timezone part.
-   */
-  isoDateTime() {
-    return new JsonSchemaStringBuilder<IsoDateTime>().isoDateTime()
-  },
 
-  // email: () => new JsonSchemaStringBuilder().email(),
   // complex types
   object,
   dbEntity<T extends AnyObject>(props: T) {
     return j
       .object<BaseDBEntity>({
         id: j.string(),
-        created: j.unixTimestamp2000(),
-        updated: j.unixTimestamp2000(),
+        created: j.integer().unixTimestamp2000(),
+        updated: j.integer().unixTimestamp2000(),
       })
       .extend(j.object(props))
   },
@@ -305,13 +314,27 @@ export class JsonSchemaNumberBuilder<
   int64 = (): this => this.format('int64')
   float = (): this => this.format('float')
   double = (): this => this.format('double')
-  unixTimestamp = (): this => this.format('unixTimestamp').description('UnixTimestamp')
-  unixTimestamp2000 = (): this => this.format('unixTimestamp2000').description('UnixTimestamp2000')
-  unixTimestampMillis = (): this =>
-    this.format('unixTimestampMillis').description('UnixTimestampMillis')
 
-  unixTimestampMillis2000 = (): this =>
-    this.format('unixTimestampMillis2000').description('UnixTimestampMillis2000')
+  unixTimestamp = (): JsonSchemaNumberBuilder<UnixTimestamp> =>
+    this.integer().branded<UnixTimestamp>().format('unixTimestamp').description('UnixTimestamp')
+
+  unixTimestamp2000 = (): JsonSchemaNumberBuilder<UnixTimestamp> =>
+    this.integer()
+      .branded<UnixTimestamp>()
+      .format('unixTimestamp2000')
+      .description('UnixTimestamp2000')
+
+  unixTimestampMillis = (): JsonSchemaNumberBuilder<UnixTimestampMillis> =>
+    this.integer()
+      .branded<UnixTimestampMillis>()
+      .format('unixTimestampMillis')
+      .description('UnixTimestampMillis')
+
+  unixTimestampMillis2000 = (): JsonSchemaNumberBuilder<UnixTimestampMillis> =>
+    this.integer()
+      .branded<UnixTimestampMillis>()
+      .format('unixTimestampMillis2000')
+      .description('UnixTimestampMillis2000')
 
   utcOffset = (): this => this.format('utcOffset')
   utcOffsetHours = (): this => this.format('utcOffsetHours')

package/src/json-schema/jsonSchemas.ts

@@ -3,6 +3,6 @@ import { j } from './jsonSchemaBuilder.js'
 
 export const baseDBEntityJsonSchema = j.object<BaseDBEntity>({
   id: j.string(),
-  created: j.unixTimestamp2000(),
-  updated: j.unixTimestamp2000(),
+  created: j.integer().unixTimestamp2000(),
+  updated: j.integer().unixTimestamp2000(),
 })

package/src/nanoid.ts

@@ -4,8 +4,6 @@
 
 /// <reference lib="dom" preserve="true" />
 
-/* eslint-disable no-bitwise */
-
 // "0-9a-zA-Z-_", same as base64url alphabet
 const urlAlphabet = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
 
@@ -16,6 +14,7 @@ export type NanoidFunction = (length?: number) => string
 
 type NanoidRandomFunction = (bytes: number) => Uint8Array
 
+// oxlint-disable no-bitwise -- NanoID uses bit operations to build compact IDs
 export function nanoidBrowser(length = 21): string {
   let id = ''
   const bytes = globalThis.crypto.getRandomValues(new Uint8Array(length))

package/src/number/createDeterministicRandom.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-bitwise */
-
 /**
  * Function that returns a random number between 0 and 1.
  * Exactly same signature as Math.random function.
@@ -13,6 +11,7 @@ export type RandomFunction = () => number
  */
 export function _createDeterministicRandom(seed = 0x2f6e2b1): RandomFunction {
   return () => {
+    // oxlint-disable no-bitwise
     // Robert Jenkins’ 32 bit integer hash function
     seed = (seed + 0x7ed55d16 + (seed << 12)) & 0xffffffff
     seed = (seed ^ 0xc761c23c ^ (seed >>> 19)) & 0xffffffff

package/src/object/map2.ts

@@ -13,6 +13,16 @@ export class Map2<K = any, V = any> extends Map<K, V> {
     return new Map2(Object.entries(obj))
   }
 
+  /**
+   * Allows to set multiple key-value pairs at once.
+   */
+  setMany(obj: Record<any, V>): this {
+    for (const [k, v] of Object.entries(obj)) {
+      this.set(k as K, v)
+    }
+    return this
+  }
+
   toObject(): Record<string, V> {
     return Object.fromEntries(this)
   }

package/src/object/set2.ts

@@ -6,6 +6,17 @@
  * @experimental
  */
 export class Set2<T = any> extends Set<T> {
+  /**
+   * Like .add(), but allows to add multiple items at once.
+   * Mutates the Set, but also returns it conveniently.
+   */
+  addMany(items: Iterable<T>): this {
+    for (const item of items) {
+      this.add(item)
+    }
+    return this
+  }
+
   toArray(): T[] {
     return [...this]
   }

package/src/string/hash.util.ts

@@ -1,5 +1,7 @@
 import type { Integer } from '../types.js'
 
+// oxlint-disable no-bitwise -- hash implementations use bit-level operations for speed
+
 const BASE62 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
 // const BASE64 = BASE62 + '+/'
 const BASE64URL = BASE62 + '-_'
@@ -54,7 +56,7 @@ export function hashCode(s: string): Integer {
   let i = 0
   const len = s.length
   while (i < len) {
-    // eslint-disable-next-line no-bitwise, unicorn/prefer-math-trunc, unicorn/prefer-code-point
+    // eslint-disable-next-line unicorn/prefer-math-trunc, unicorn/prefer-code-point
     hash = ((hash << 5) - hash + s.charCodeAt(i++)) << 0
   }
   return hash + 2147483647 + 1

package/src/string/leven.ts

@@ -1,7 +1,8 @@
 const array: number[] = []
 const characterCodeCache: number[] = []
 
-/* eslint-disable unicorn/prefer-code-point, no-bitwise */
+/* eslint-disable unicorn/prefer-code-point */
+// oxlint-disable no-bitwise
 
 /**
  * Modified version of: https://github.com/sindresorhus/leven/

package/src/string/safeJsonStringify.ts

@@ -20,7 +20,6 @@ export function _safeJsonStringify(
   }
 }
 
-/* eslint-disable no-bitwise, no-implicit-coercion */
 // oxlint-disable no-unused-expressions
 function serializer(replacer?: Reviver, cycleReplacer?: Reviver): Reviver {
   const stack: any[] = []
@@ -34,9 +33,15 @@ function serializer(replacer?: Reviver, cycleReplacer?: Reviver): Reviver {
   return function (key, value) {
     if (stack.length > 0) {
       const thisPos = stack.indexOf(this)
-      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
-      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
-      if (~stack.indexOf(value)) {
+      if (thisPos !== -1) {
+        stack.splice(thisPos + 1)
+        keys.splice(thisPos, Infinity, key)
+      } else {
+        stack.push(this)
+        keys.push(key)
+      }
+
+      if (stack.includes(value)) {
         value = cycleReplacer.call(this, key, value)
       }
     } else {