@naturalcycles/js-lib 15.2.0 → 15.4.0

package/dist/browser/analytics.util.js

@@ -10,7 +10,7 @@ export async function loadGTag(gtagId, enabled = true) {
     window.dataLayer ||= [];
     window.gtag ||= function gtag() {
         // biome-ignore lint/complexity/useArrowFunction: ok
-        // biome-ignore lint/style/noArguments: ok
+        // biome-ignore lint/complexity/noArguments: ok
         window.dataLayer.push(arguments);
     };
     window.gtag('js', new Date());
@@ -39,7 +39,7 @@ export function loadHotjar(hjid) {
         h.hj =
             h.hj ||
                 function hj() {
-                    // biome-ignore lint/style/noArguments: ok
+                    // biome-ignore lint/complexity/noArguments: ok
                     ;
                     (h.hj.q = h.hj.q || []).push(arguments);
                 };

package/dist/decorators/logMethod.decorator.js

@@ -16,7 +16,7 @@ import { _getArgsSignature, _getMethodSignature } from './decorator.util.js';
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _LogMethod(opt = {}) {
-    return (target, key, descriptor) => {
+    return (_target, key, descriptor) => {
         _assert(typeof descriptor.value === 'function', '@_LogMethod can be applied only to methods');
         const originalFn = descriptor.value;
         const keyStr = String(key);

package/dist/decorators/timeout.decorator.js

@@ -3,7 +3,7 @@ import { pTimeout } from '../promise/pTimeout.js';
 import { _getMethodSignature } from './decorator.util.js';
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Timeout(opt) {
-    return (target, key, descriptor) => {
+    return (_target, key, descriptor) => {
         _assert(typeof descriptor.value === 'function', '@_Timeout can be applied only to methods');
         if (!opt.timeout)
             return descriptor;

package/dist/error/assert.js

@@ -93,7 +93,6 @@ export function _assertIsNumber(v, message) {
     _assertTypeOf(v, 'number', message);
 }
 export function _assertTypeOf(v, expectedType, message) {
-    // biome-ignore lint/suspicious/useValidTypeof: ok
     if (typeof v !== expectedType) {
         const msg = message || `Expected typeof ${expectedType}, actual typeof: ${typeof v}`;
         throw new AssertionError(msg);

package/dist/string/slugify.js

@@ -17,7 +17,6 @@ export function _slugify(s, opt = {}) {
     // based on https://stackoverflow.com/a/23633850/4919972
     // Combining Diacritical Marks
     // https://www.unicode.org/charts/PDF/U0300.pdf
-    // biome-ignore lint/suspicious/noMisleadingCharacterClass: ok
     s = s.normalize('NFKD').replaceAll(/[\u0300-\u036F]/g, '');
     // Detect contractions/possessives by looking for any word followed by a `'t`
     // or `'s` in isolation and then remove it.

package/dist/zod/index.d.ts

@@ -1,6 +1,4 @@
 export * from './zod.shared.schemas.js';
 export * from './zod.util.js';
-import type { ZodIssue } from 'zod';
-import { z, ZodError, ZodSchema } from 'zod';
-export { z, ZodError, ZodSchema };
-export type { ZodIssue };
+import { z, ZodType } from 'zod/v4';
+export { z, ZodType };

package/dist/zod/index.js

@@ -1,4 +1,4 @@
 export * from './zod.shared.schemas.js';
 export * from './zod.util.js';
-import { z, ZodError, ZodSchema } from 'zod';
-export { z, ZodError, ZodSchema };
+import { z, ZodType } from 'zod/v4';
+export { z, ZodType };

package/dist/zod/zod.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 export declare const TS_2500 = 16725225600;
 export declare const TS_2000 = 946684800;
 export declare const zUnixTimestamp: z.ZodNumber;
@@ -6,8 +6,8 @@ export declare const zUnixTimestamp2000: z.ZodNumber;
 export declare const zUnixTimestampMillis: z.ZodNumber;
 export declare const zUnixTimestampMillis2000: z.ZodNumber;
 export declare const zSemVer: z.ZodString;
-export declare const zIsoDateString: z.ZodEffects<z.ZodString, string, string>;
-export declare const zEmail: z.ZodEffects<z.ZodString, string, string>;
+export declare const zIsoDateString: z.ZodString;
+export declare const zEmail: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
 export declare const BASE62_REGEX: RegExp;
 export declare const BASE64_REGEX: RegExp;
 export declare const BASE64URL_REGEX: RegExp;
@@ -28,12 +28,4 @@ export declare const zBaseDBEntity: z.ZodObject<{
     id: z.ZodString;
     created: z.ZodOptional<z.ZodNumber>;
     updated: z.ZodOptional<z.ZodNumber>;
-}, "strip", z.ZodTypeAny, {
-    id: string;
-    created?: number | undefined;
-    updated?: number | undefined;
-}, {
-    id: string;
-    created?: number | undefined;
-    updated?: number | undefined;
-}>;
+}, z.core.$strip>;

package/dist/zod/zod.shared.schemas.js

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 export const TS_2500 = 16725225600; // 2500-01-01
 export const TS_2000 = 946684800; // 2000-01-01
 export const zUnixTimestamp = z
@@ -38,7 +38,7 @@ export const zIsoDateString = z
 export const zEmail = z
     .string()
     .trim()
-    .email()
+    .email() // keeping as-is, so trim happens before email validation
     .transform(s => s.toLowerCase())
     .describe('Email');
 export const BASE62_REGEX = /^[a-zA-Z0-9]+$/;

package/dist/zod/zod.util.d.ts

@@ -1,21 +1,21 @@
-import { ZodError, type ZodIssue, type ZodSchema } from 'zod';
+import type { ZodError, ZodType } from 'zod/v4';
+import type { ErrorData } from '../error/error.model.js';
+import { AppError } from '../error/error.util.js';
 export interface ZodErrorResult<T> {
     success: false;
     data?: T;
-    error: ZodValidationError<T>;
+    error: ZodValidationError;
 }
 export interface ZodSuccessResult<T> {
     success: true;
     data: T;
-    error?: ZodValidationError<T>;
+    error?: ZodValidationError;
 }
-export declare function zIsValid<T>(value: T, schema: ZodSchema<T>): boolean;
-export declare function zValidate<T>(value: T, schema: ZodSchema<T>): T;
-export declare function zSafeValidate<T>(value: T, schema: ZodSchema<T>): ZodSuccessResult<T> | ZodErrorResult<T>;
-export declare class ZodValidationError<T> extends ZodError<T> {
-    value: T;
-    schema: ZodSchema<T>;
-    constructor(issues: ZodIssue[], value: T, schema: ZodSchema<T>);
-    get message(): string;
-    annotate(): string;
+export declare function zIsValid<T>(value: T, schema: ZodType<T>): boolean;
+export declare function zValidate<T>(value: T, schema: ZodType<T>): T;
+export declare function zSafeValidate<T>(value: T, schema: ZodType<T>): ZodSuccessResult<T> | ZodErrorResult<T>;
+export interface ZodValidationErrorData extends ErrorData {
+}
+export declare class ZodValidationError extends AppError<ZodValidationErrorData> {
+    constructor(zodError: ZodError, value: any, schema: ZodType);
 }

package/dist/zod/zod.util.js

@@ -1,4 +1,4 @@
-import { ZodError } from 'zod';
+import { AppError } from '../error/error.util.js';
 import { _stringify } from '../string/stringify.js';
 export function zIsValid(value, schema) {
     const { success } = schema.safeParse(value);
@@ -18,37 +18,32 @@ export function zSafeValidate(value, schema) {
     }
     return {
         success: false,
-        error: new ZodValidationError(r.error.issues, value, schema),
+        error: new ZodValidationError(r.error, value, schema),
     };
 }
-export class ZodValidationError extends ZodError {
-    value;
-    schema;
-    constructor(issues, value, schema) {
-        super(issues);
-        this.value = value;
-        this.schema = schema;
+export class ZodValidationError extends AppError {
+    constructor(zodError, value, schema) {
+        const message = createZodErrorMessage(zodError, schema, value);
+        // const message = z.prettifyError(zodError) // todo: consider adopting it instead
+        super(message, {}, { name: 'ZodValidationError' });
     }
-    get message() {
-        return this.annotate();
-    }
-    annotate() {
-        let objectTitle = this.schema.description;
-        if (typeof this.value === 'object' && this.value) {
-            const objectName = this.schema.description || this.value.constructor?.name;
-            const objectId = this.value['id'];
-            objectTitle = [objectName, objectId].filter(Boolean).join('.');
-        }
-        objectTitle ||= 'data';
-        return [
-            `Invalid ${objectTitle}`,
-            '',
-            'Input:',
-            _stringify(this.value),
-            this.issues.length > 1 ? `\n${this.issues.length} issues:` : '',
-            ...this.issues.slice(0, 100).map(i => {
-                return [i.path.join('.'), i.message].filter(Boolean).join(': ');
-            }),
-        ].join('\n');
+}
+function createZodErrorMessage(err, schema, value) {
+    let objectTitle = schema.description;
+    if (typeof value === 'object' && value) {
+        const objectName = schema.description || value.constructor?.name;
+        const objectId = value['id'];
+        objectTitle = [objectName, objectId].filter(Boolean).join('.');
     }
+    objectTitle ||= 'data';
+    return [
+        `Invalid ${objectTitle}`,
+        '',
+        'Input:',
+        _stringify(value),
+        err.issues.length > 1 ? `\n${err.issues.length} issues:` : '',
+        ...err.issues.slice(0, 100).map(i => {
+            return [i.path.join('.'), i.message].filter(Boolean).join(': ');
+        }),
+    ].join('\n');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.2.0",
+  "version": "15.4.0",
   "dependencies": {
     "tslib": "^2",
     "zod": "^3"
@@ -9,11 +9,16 @@
   "devDependencies": {
     "@naturalcycles/dev-lib": "*",
     "@types/crypto-js": "^4",
-    "@types/node": "^22",
+    "@types/node": "^24",
     "@types/semver": "^7",
     "crypto-js": "^4",
     "dayjs": "^1"
   },
+  "exports": {
+    "./cfg/frontend/tsconfig.json": "./cfg/frontend/tsconfig.json",
+    ".": "./dist/index.js",
+    "./zod": "./dist/zod/index.js"
+  },
   "files": [
     "dist",
     "cfg",
@@ -51,8 +56,9 @@
     "test": "dev-lib test",
     "lint": "dev-lib lint",
     "bt": "dev-lib bt",
-    "lbt": "dev-lib lbt",
-    "check": "dev-lib lbt",
+    "typecheck": "dev-lib typecheck",
+    "check": "dev-lib check",
+    "clean": "dev-lib clean",
     "test-tz1": "TZ=Europe/Stockholm yarn test local",
     "test-tz2": "TZ=JST-9 yarn test local",
     "test-ny": "TZ=GMT-0500 yarn test localTime"

package/readme.md

@@ -10,7 +10,7 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/c2dc8d53bd79f79b1d8b/test_coverage)](https://codeclimate.com/github/NaturalCycles/js-lib/test_coverage)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 
-# [Documentation](https://naturalcycles.github.io/js-lib/)
+# [Documentation](https://naturalcycles.github.io/js-libs/)
 
 # Packaging
 

package/src/browser/analytics.util.ts

@@ -19,7 +19,7 @@ export async function loadGTag(gtagId: string, enabled = true): Promise<void> {
   window.dataLayer ||= []
   window.gtag ||= function gtag() {
     // biome-ignore lint/complexity/useArrowFunction: ok
-    // biome-ignore lint/style/noArguments: ok
+    // biome-ignore lint/complexity/noArguments: ok
     window.dataLayer.push(arguments)
   }
   window.gtag('js', new Date())
@@ -54,7 +54,7 @@ export function loadHotjar(hjid: number): void {
     h.hj =
       h.hj ||
       function hj() {
-        // biome-ignore lint/style/noArguments: ok
+        // biome-ignore lint/complexity/noArguments: ok
         ;(h.hj.q = h.hj.q || []).push(arguments)
       }
     h._hjSettings = { hjid, hjsv: 6 }

package/src/decorators/logMethod.decorator.ts

@@ -71,7 +71,7 @@ export interface LogMethodOptions {
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
-  return (target, key, descriptor) => {
+  return (_target, key, descriptor) => {
     _assert(typeof descriptor.value === 'function', '@_LogMethod can be applied only to methods')
 
     const originalFn = descriptor.value
@@ -97,7 +97,7 @@ export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
     const sma = avg ? new SimpleMovingAverage(avg) : undefined
     let count = 0
 
-    descriptor.value = function (this: typeof target, ...args: any[]) {
+    descriptor.value = function (this: typeof _target, ...args: any[]) {
       const started = Date.now()
       const ctx = this
 

package/src/decorators/timeout.decorator.ts

@@ -5,7 +5,7 @@ import { _getMethodSignature } from './decorator.util.js'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Timeout(opt: PTimeoutOptions): MethodDecorator {
-  return (target, key, descriptor) => {
+  return (_target, key, descriptor) => {
     _assert(typeof descriptor.value === 'function', '@_Timeout can be applied only to methods')
 
     if (!opt.timeout) return descriptor
@@ -13,7 +13,7 @@ export function _Timeout(opt: PTimeoutOptions): MethodDecorator {
     const originalFn = descriptor.value
     const keyStr = String(key)
 
-    descriptor.value = async function (this: typeof target, ...args: any[]) {
+    descriptor.value = async function (this: typeof _target, ...args: any[]) {
       const ctx = this
       opt.name ||= _getMethodSignature(ctx, keyStr)
       return await pTimeout(() => originalFn.apply(this, args), opt)

package/src/error/assert.ts

@@ -137,7 +137,6 @@ export function _assertIsNumber(v: any, message?: string): asserts v is number {
 }
 
 export function _assertTypeOf<T>(v: any, expectedType: string, message?: string): asserts v is T {
-  // biome-ignore lint/suspicious/useValidTypeof: ok
   if (typeof v !== expectedType) {
     const msg = message || `Expected typeof ${expectedType}, actual typeof: ${typeof v}`
     throw new AssertionError(msg)

package/src/string/slugify.ts

@@ -41,7 +41,6 @@ export function _slugify(s: string, opt: SlugifyOptions = {}): string {
   // based on https://stackoverflow.com/a/23633850/4919972
   // Combining Diacritical Marks
   // https://www.unicode.org/charts/PDF/U0300.pdf
-  // biome-ignore lint/suspicious/noMisleadingCharacterClass: ok
   s = s.normalize('NFKD').replaceAll(/[\u0300-\u036F]/g, '')
 
   // Detect contractions/possessives by looking for any word followed by a `'t`

package/src/zod/index.ts

@@ -1,7 +1,5 @@
 export * from './zod.shared.schemas.js'
 export * from './zod.util.js'
-import type { ZodIssue } from 'zod'
-import { z, ZodError, ZodSchema } from 'zod'
+import { z, ZodType } from 'zod/v4'
 
-export { z, ZodError, ZodSchema }
-export type { ZodIssue }
+export { z, ZodType }

package/src/zod/zod.shared.schemas.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 export const TS_2500 = 16725225600 // 2500-01-01
 export const TS_2000 = 946684800 // 2000-01-01
@@ -43,7 +43,7 @@ export const zIsoDateString = z
 export const zEmail = z
   .string()
   .trim()
-  .email()
+  .email() // keeping as-is, so trim happens before email validation
   .transform(s => s.toLowerCase())
   .describe('Email')
 

package/src/zod/zod.util.ts

@@ -1,24 +1,26 @@
-import { ZodError, type ZodIssue, type ZodSchema } from 'zod'
+import type { ZodError, ZodType } from 'zod/v4'
+import type { ErrorData } from '../error/error.model.js'
+import { AppError } from '../error/error.util.js'
 import { _stringify } from '../string/stringify.js'
 
 export interface ZodErrorResult<T> {
   success: false
   data?: T
-  error: ZodValidationError<T>
+  error: ZodValidationError
 }
 
 export interface ZodSuccessResult<T> {
   success: true
   data: T
-  error?: ZodValidationError<T>
+  error?: ZodValidationError
 }
 
-export function zIsValid<T>(value: T, schema: ZodSchema<T>): boolean {
+export function zIsValid<T>(value: T, schema: ZodType<T>): boolean {
   const { success } = schema.safeParse(value)
   return success
 }
 
-export function zValidate<T>(value: T, schema: ZodSchema<T>): T {
+export function zValidate<T>(value: T, schema: ZodType<T>): T {
   const r = zSafeValidate(value, schema)
   if (r.success) {
     return r.data
@@ -29,7 +31,7 @@ export function zValidate<T>(value: T, schema: ZodSchema<T>): T {
 
 export function zSafeValidate<T>(
   value: T,
-  schema: ZodSchema<T>,
+  schema: ZodType<T>,
   // objectName?: string,
 ): ZodSuccessResult<T> | ZodErrorResult<T> {
   const r = schema.safeParse(value)
@@ -39,43 +41,51 @@ export function zSafeValidate<T>(
 
   return {
     success: false,
-    error: new ZodValidationError<T>(r.error.issues, value, schema),
+    error: new ZodValidationError(r.error, value, schema),
   }
 }
 
-export class ZodValidationError<T> extends ZodError<T> {
-  constructor(
-    issues: ZodIssue[],
-    public value: T,
-    public schema: ZodSchema<T>,
-  ) {
-    super(issues)
-  }
+export interface ZodValidationErrorData extends ErrorData {
+  // issues: $ZodIssue[]
+  // joiValidationObjectName?: string
+  // joiValidationObjectId?: string
+  /**
+   * Error "annotation" is stripped in Error.message.
+   * This field contains the "full" annotation.
+   *
+   * This field is non-enumerable, won't be printed or included in JSON by default,
+   * but still accessible programmatically (via `err.data.annotation`) when needed!
+   */
+  // annotation?: string
+}
 
-  override get message(): string {
-    return this.annotate()
+export class ZodValidationError extends AppError<ZodValidationErrorData> {
+  constructor(zodError: ZodError, value: any, schema: ZodType) {
+    const message = createZodErrorMessage(zodError, schema, value)
+    // const message = z.prettifyError(zodError) // todo: consider adopting it instead
+    super(message, {}, { name: 'ZodValidationError' })
   }
+}
 
-  annotate(): string {
-    let objectTitle = this.schema.description
+function createZodErrorMessage<T>(err: ZodError<T>, schema: ZodType<T>, value: T): string {
+  let objectTitle = schema.description
 
-    if (typeof this.value === 'object' && this.value) {
-      const objectName = this.schema.description || this.value.constructor?.name
-      const objectId = (this.value as any)['id'] as string
-      objectTitle = [objectName, objectId].filter(Boolean).join('.')
-    }
+  if (typeof value === 'object' && value) {
+    const objectName = schema.description || value.constructor?.name
+    const objectId = (value as any)['id'] as string
+    objectTitle = [objectName, objectId].filter(Boolean).join('.')
+  }
 
-    objectTitle ||= 'data'
+  objectTitle ||= 'data'
 
-    return [
-      `Invalid ${objectTitle}`,
-      '',
-      'Input:',
-      _stringify(this.value),
-      this.issues.length > 1 ? `\n${this.issues.length} issues:` : '',
-      ...this.issues.slice(0, 100).map(i => {
-        return [i.path.join('.'), i.message].filter(Boolean).join(': ')
-      }),
-    ].join('\n')
-  }
+  return [
+    `Invalid ${objectTitle}`,
+    '',
+    'Input:',
+    _stringify(value),
+    err.issues.length > 1 ? `\n${err.issues.length} issues:` : '',
+    ...err.issues.slice(0, 100).map(i => {
+      return [i.path.join('.'), i.message].filter(Boolean).join(': ')
+    }),
+  ].join('\n')
 }