@naturalcycles/js-lib 15.40.1 → 15.41.0

package/dist/browser/bot.js

@@ -99,12 +99,10 @@ export class BotDetectionService {
         let cdpCheck1 = false;
         try {
             /* eslint-disable */
-            // biome-ignore lint/suspicious/useErrorMessage: ok
             const e = new window.Error();
             window.Object.defineProperty(e, 'stack', {
                 configurable: false,
                 enumerable: false,
-                // biome-ignore lint/complexity/useArrowFunction: ok
                 get: function () {
                     cdpCheck1 = true;
                     return '';

package/dist/env.js

@@ -14,6 +14,6 @@ export function isServerSide() {
  * Will return `false` in Node.js.
  */
 export function isClientSide() {
-    // eslint-disable-next-line unicorn/prefer-global-this
+    // oxlint-disable-next-line unicorn/prefer-global-this
     return typeof window !== 'undefined' && !!window?.document;
 }

package/dist/error/error.util.d.ts

@@ -55,7 +55,7 @@ export declare function _isErrorLike(o: any): o is ErrorLike;
  *   })
  * }
  */
-export declare function _errorDataAppend<ERR>(err: ERR, data?: ErrorData): ERR;
+export declare function _errorDataAppend<ERR, OUT extends Error = ERR extends Error ? ERR : Error>(err: ERR, data?: ErrorData): OUT;
 export interface AppErrorComponents<DATA_TYPE extends ErrorData = ErrorData> {
     message: string;
     name?: string;

package/dist/error/error.util.js

@@ -22,10 +22,9 @@ export function _anyToError(o, errorClass = Error, errorData) {
     }
     if (errorData) {
         ;
-        e.data = {
-            ...e.data,
-            ...errorData,
-        };
+        e.data ||= {};
+        // Using Object.assign instead of ...data to not override err.data's non-enumerable properties
+        Object.assign(e.data, errorData);
     }
     return e;
 }
@@ -209,10 +208,7 @@ export function _isErrorLike(o) {
 export function _errorDataAppend(err, data) {
     if (!data)
         return err;
-    err.data ||= {}; // create err.data if it doesn't exist
-    // Using Object.assign instead of ...data to not override err.data's non-enumerable properties
-    Object.assign(err.data, data);
-    return err;
+    return _anyToError(err, undefined, data);
 }
 /**
  * Base class for all our (not system) errors.

package/dist/iter/iterable2.js

@@ -32,7 +32,7 @@ export class Iterable2 {
         }
     }
     some(cb) {
-        // eslint-disable-next-line unicorn/prefer-array-some
+        // oxlint-disable-next-line unicorn/prefer-array-some
         return !!this.find(cb);
     }
     every(cb) {

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

@@ -101,9 +101,10 @@ export declare class JsonSchemaStringBuilder<T extends string = string, Opt exte
     languageTag: () => this;
     countryCode: () => this;
     currency: () => this;
-    trim: (trim?: boolean) => this;
-    toLowerCase: (toLowerCase?: boolean) => this;
-    toUpperCase: (toUpperCase?: boolean) => this;
+    trim(trim?: boolean): this;
+    toLowerCase(toLowerCase?: boolean): this;
+    toUpperCase(toUpperCase?: boolean): this;
+    truncate(toLength: number): this;
     branded<B extends string>(): JsonSchemaStringBuilder<B>;
     /**
      * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
@@ -115,11 +116,10 @@ export declare class JsonSchemaStringBuilder<T extends string = string, Opt exte
      */
     isoDateTime(): JsonSchemaStringBuilder<IsoDateTime>;
     jwt(): this;
-    private transformModify;
 }
 export declare class JsonSchemaObjectBuilder<T extends AnyObject, Opt extends boolean = false> extends JsonSchemaAnyBuilder<T, JsonSchemaObject<T>, Opt> {
     constructor();
-    addProperties(props: {
+    addProperties(props?: {
         [k in keyof T]: JsonSchemaBuilder<T[k]>;
     }): this;
     /**
@@ -144,14 +144,14 @@ export declare class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> e
 export declare class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilder<T, JsonSchemaTuple<T>> {
     constructor(items: JsonSchemaBuilder[]);
 }
-declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<{
+declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props?: P): JsonSchemaObjectBuilder<{
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
 } & {
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
 } extends infer O ? {
     [K in keyof O]: O[K];
 } : never>;
-declare function object<T extends AnyObject>(props: {
+declare function object<T extends AnyObject>(props?: {
     [K in keyof T]: JsonSchemaAnyBuilder<T[K]>;
 }): JsonSchemaObjectBuilder<T>;
 export {};

package/dist/json-schema/jsonSchemaBuilder.js

@@ -54,9 +54,7 @@ export const j = {
         });
     },
     buffer() {
-        return new JsonSchemaAnyBuilder({
-            instanceof: 'Buffer',
-        });
+        return new JsonSchemaAnyBuilder({ instanceof: 'Buffer' });
     },
     // number types
     number() {
@@ -144,7 +142,7 @@ export class JsonSchemaAnyBuilder {
         return this;
     }
     instanceof(of) {
-        this.schema.instanceof = of;
+        Object.assign(this.schema, { type: 'object', instanceof: of });
         return this;
     }
     optional(optional = true) {
@@ -280,9 +278,22 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     languageTag = () => this.format('languageTag');
     countryCode = () => this.format('countryCode');
     currency = () => this.format('currency');
-    trim = (trim = true) => this.transformModify('trim', trim);
-    toLowerCase = (toLowerCase = true) => this.transformModify('toLowerCase', toLowerCase);
-    toUpperCase = (toUpperCase = true) => this.transformModify('toUpperCase', toUpperCase);
+    trim(trim = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, trim } });
+        return this;
+    }
+    toLowerCase(toLowerCase = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase } });
+        return this;
+    }
+    toUpperCase(toUpperCase = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase } });
+        return this;
+    }
+    truncate(toLength) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } });
+        return this;
+    }
     branded() {
         return this;
     }
@@ -302,15 +313,6 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     jwt() {
         return this.regex(JWT_REGEX);
     }
-    transformModify(t, add) {
-        if (add) {
-            this.schema.transform = _uniq([...(this.schema.transform || []), t]);
-        }
-        else {
-            this.schema.transform = this.schema.transform?.filter(s => s !== t);
-        }
-        return this;
-    }
 }
 export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
     constructor() {
@@ -322,6 +324,8 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         });
     }
     addProperties(props) {
+        if (!props)
+            return this;
         Object.entries(props).forEach(([k, builder]) => {
             const schema = builder.build();
             if (!schema.optionalField) {

package/dist/number/number.util.js

@@ -40,7 +40,7 @@ export function _isBetween(x, min, max, incl) {
     return true;
 }
 export function _clamp(x, minIncl, maxIncl) {
-    // eslint-disable-next-line unicorn/prefer-math-min-max
+    // oxlint-disable-next-line unicorn/prefer-math-min-max
     return x <= minIncl ? minIncl : x >= maxIncl ? maxIncl : x;
 }
 /**

package/dist/promise/pTimeout.js

@@ -44,6 +44,7 @@ export async function pTimeout(fn, opt) {
                     _typeCast(err);
                     // keep original stack
                     err.stack = fakeError.stack.replace('Error: TimeoutError', err.name + ': ' + err.message);
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                     reject(_errorDataAppend(err, opt.errorData));
                 }
                 return;

package/dist/string/hash.util.js

@@ -49,7 +49,7 @@ export function hashCode(s) {
     let i = 0;
     const len = s.length;
     while (i < len) {
-        // eslint-disable-next-line unicorn/prefer-math-trunc, unicorn/prefer-code-point
+        // oxlint-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,7 +1,6 @@
 const array = [];
 const characterCodeCache = [];
-/* eslint-disable unicorn/prefer-code-point */
-// oxlint-disable no-bitwise
+// oxlint-disable no-bitwise, unicorn/prefer-code-point
 /**
  * Modified version of: https://github.com/sindresorhus/leven/
  *

package/dist/string/lodash/words.js

@@ -1,9 +1,8 @@
 // from: https://github.com/lodash/lodash/blob/master/words.js
-/* eslint-disable */
 import { unicodeWords } from './unicodeWords.js';
+// oxlint-disable
 const hasUnicodeWord = RegExp.prototype.test.bind(/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/);
 /** Used to match words composed of alphanumeric characters. */
-// biome-ignore lint/suspicious/noControlCharactersInRegex: ok
 const reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
 function asciiWords(s) {
     return s.match(reAsciiWord);

package/dist/string/slugify.js

@@ -61,5 +61,6 @@ function decamelize(s) {
 function escapeStringRegexp(s) {
     // Escape characters with special meaning either inside or outside character sets.
     // Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
+    // oxlint-disable-next-line unicorn/escape-case, unicorn/no-hex-escape
     return s.replaceAll(/[|\\{}()[\]^$+*?.]/g, String.raw `\$&`).replaceAll('-', String.raw `\x2d`);
 }

package/package.json

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

package/src/browser/bot.ts

@@ -132,12 +132,10 @@ export class BotDetectionService {
     let cdpCheck1 = false
     try {
       /* eslint-disable */
-      // biome-ignore lint/suspicious/useErrorMessage: ok
       const e = new window.Error()
       window.Object.defineProperty(e, 'stack', {
         configurable: false,
         enumerable: false,
-        // biome-ignore lint/complexity/useArrowFunction: ok
         get: function () {
           cdpCheck1 = true
           return ''

package/src/env.ts

@@ -15,6 +15,6 @@ export function isServerSide(): boolean {
  * Will return `false` in Node.js.
  */
 export function isClientSide(): boolean {
-  // eslint-disable-next-line unicorn/prefer-global-this
+  // oxlint-disable-next-line unicorn/prefer-global-this
   return typeof window !== 'undefined' && !!window?.document
 }

package/src/error/error.util.ts

@@ -36,10 +36,9 @@ export function _anyToError<ERROR_TYPE extends Error = Error>(
   }
 
   if (errorData) {
-    ;(e as any).data = {
-      ...(e as any).data,
-      ...errorData,
-    }
+    ;(e as any).data ||= {}
+    // Using Object.assign instead of ...data to not override err.data's non-enumerable properties
+    Object.assign((e as any).data, errorData)
   }
 
   return e
@@ -266,12 +265,12 @@ export function _isErrorLike(o: any): o is ErrorLike {
  *   })
  * }
  */
-export function _errorDataAppend<ERR>(err: ERR, data?: ErrorData): ERR {
-  if (!data) return err
-  ;(err as any).data ||= {} // create err.data if it doesn't exist
-  // Using Object.assign instead of ...data to not override err.data's non-enumerable properties
-  Object.assign((err as any).data, data)
-  return err
+export function _errorDataAppend<ERR, OUT extends Error = ERR extends Error ? ERR : Error>(
+  err: ERR,
+  data?: ErrorData,
+): OUT {
+  if (!data) return err as any
+  return _anyToError<OUT>(err, undefined, data)
 }
 
 export interface AppErrorComponents<DATA_TYPE extends ErrorData = ErrorData> {

package/src/iter/iterable2.ts

@@ -36,7 +36,7 @@ export class Iterable2<T> implements Iterable<T> {
   }
 
   some(cb: AbortablePredicate<T>): boolean {
-    // eslint-disable-next-line unicorn/prefer-array-some
+    // oxlint-disable-next-line unicorn/prefer-array-some
     return !!this.find(cb)
   }
 

package/src/json-schema/jsonSchemaBuilder.ts

@@ -33,7 +33,7 @@ import type {
 } from './jsonSchema.model.js'
 import { mergeJsonSchemaObjects } from './jsonSchema.util.js'
 
-/* eslint-disable id-blacklist, @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable id-denylist, @typescript-eslint/explicit-module-boundary-types */
 
 export interface JsonSchemaBuilder<T = unknown> {
   build: () => JsonSchema<T>
@@ -101,9 +101,7 @@ export const j = {
     })
   },
   buffer() {
-    return new JsonSchemaAnyBuilder<Buffer, JsonSchemaAny<Buffer>>({
-      instanceof: 'Buffer',
-    })
+    return new JsonSchemaAnyBuilder<Buffer, JsonSchemaAny<Buffer>>({ instanceof: 'Buffer' })
   },
 
   // number types
@@ -215,7 +213,7 @@ export class JsonSchemaAnyBuilder<
   }
 
   instanceof(of: string): this {
-    this.schema.instanceof = of
+    Object.assign(this.schema, { type: 'object', instanceof: of })
     return this
   }
 
@@ -395,9 +393,25 @@ export class JsonSchemaStringBuilder<
   countryCode = (): this => this.format('countryCode')
   currency = (): this => this.format('currency')
 
-  trim = (trim = true): this => this.transformModify('trim', trim)
-  toLowerCase = (toLowerCase = true): this => this.transformModify('toLowerCase', toLowerCase)
-  toUpperCase = (toUpperCase = true): this => this.transformModify('toUpperCase', toUpperCase)
+  trim(trim = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, trim } })
+    return this
+  }
+
+  toLowerCase(toLowerCase = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase } })
+    return this
+  }
+
+  toUpperCase(toUpperCase = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase } })
+    return this
+  }
+
+  truncate(toLength: number): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } })
+    return this
+  }
 
   branded<B extends string>(): JsonSchemaStringBuilder<B> {
     return this as unknown as JsonSchemaStringBuilder<B>
@@ -422,15 +436,6 @@ export class JsonSchemaStringBuilder<
     return this.regex(JWT_REGEX)
   }
 
-  private transformModify(t: 'trim' | 'toLowerCase' | 'toUpperCase', add: boolean): this {
-    if (add) {
-      this.schema.transform = _uniq([...(this.schema.transform || []), t])
-    } else {
-      this.schema.transform = this.schema.transform?.filter(s => s !== t)
-    }
-    return this
-  }
-
   // contentMediaType?: string
   // contentEncoding?: string
 }
@@ -448,7 +453,9 @@ export class JsonSchemaObjectBuilder<
     })
   }
 
-  addProperties(props: { [k in keyof T]: JsonSchemaBuilder<T[k]> }): this {
+  addProperties(props?: { [k in keyof T]: JsonSchemaBuilder<T[k]> }): this {
+    if (!props) return this
+
     Object.entries(props).forEach(([k, builder]: [keyof T, JsonSchemaBuilder]) => {
       const schema = builder.build()
       if (!schema.optionalField) {
@@ -555,7 +562,7 @@ export class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilde
 }
 
 function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
-  props: P,
+  props?: P,
 ): JsonSchemaObjectBuilder<
   {
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt>
@@ -573,10 +580,10 @@ function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
     ? { [K in keyof O]: O[K] }
     : never
 >
-function object<T extends AnyObject>(props: {
+function object<T extends AnyObject>(props?: {
   [K in keyof T]: JsonSchemaAnyBuilder<T[K]>
 }): JsonSchemaObjectBuilder<T>
 
-function object(props: any): any {
+function object(props?: any): any {
   return new JsonSchemaObjectBuilder<any>().addProperties(props)
 }

package/src/number/number.util.ts

@@ -51,7 +51,7 @@ export function _isBetween<T extends number | string>(
 }
 
 export function _clamp(x: number, minIncl: number, maxIncl: number): number {
-  // eslint-disable-next-line unicorn/prefer-math-min-max
+  // oxlint-disable-next-line unicorn/prefer-math-min-max
   return x <= minIncl ? minIncl : x >= maxIncl ? maxIncl : x
 }
 

package/src/promise/pTimeout.ts

@@ -88,6 +88,7 @@ export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions)
           _typeCast<Error>(err)
           // keep original stack
           err.stack = fakeError.stack!.replace('Error: TimeoutError', err.name + ': ' + err.message)
+          // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
           reject(_errorDataAppend(err, opt.errorData))
         }
         return

package/src/string/hash.util.ts

@@ -56,7 +56,7 @@ export function hashCode(s: string): Integer {
   let i = 0
   const len = s.length
   while (i < len) {
-    // eslint-disable-next-line unicorn/prefer-math-trunc, unicorn/prefer-code-point
+    // oxlint-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,8 +1,7 @@
 const array: number[] = []
 const characterCodeCache: number[] = []
 
-/* eslint-disable unicorn/prefer-code-point */
-// oxlint-disable no-bitwise
+// oxlint-disable no-bitwise, unicorn/prefer-code-point
 
 /**
  * Modified version of: https://github.com/sindresorhus/leven/

package/src/string/lodash/words.ts

@@ -1,15 +1,14 @@
 // from: https://github.com/lodash/lodash/blob/master/words.js
 
-/* eslint-disable */
-
 import { unicodeWords } from './unicodeWords.js'
 
+// oxlint-disable
+
 const hasUnicodeWord = RegExp.prototype.test.bind(
   /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,
 )
 
 /** Used to match words composed of alphanumeric characters. */
-// biome-ignore lint/suspicious/noControlCharactersInRegex: ok
 const reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g
 
 function asciiWords(s: string): RegExpMatchArray | null {

package/src/string/slugify.ts

@@ -102,5 +102,6 @@ function decamelize(s: string): string {
 function escapeStringRegexp(s: string): string {
   // Escape characters with special meaning either inside or outside character sets.
   // Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
+  // oxlint-disable-next-line unicorn/escape-case, unicorn/no-hex-escape
   return s.replaceAll(/[|\\{}()[\]^$+*?.]/g, String.raw`\$&`).replaceAll('-', String.raw`\x2d`)
 }