@naturalcycles/js-lib 15.46.0 → 15.47.0

package/dist/http/fetcher.d.ts

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 /// <reference lib="dom.iterable" preserve="true" />
 import type { ReadableStream as WebReadableStream } from 'node:stream/web';

package/dist/http/fetcher.js

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 /// <reference lib="dom.iterable" preserve="true" />
 import { _ms, _since } from '../datetime/time.util.js';

package/dist/promise/pProps.js

@@ -15,6 +15,6 @@
 export async function pProps(input) {
     const keys = Object.keys(input);
     // `as any` here is added to make it compile when `noUncheckedIndexedAccess` is false
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    // oxlint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     return Object.fromEntries((await Promise.all(Object.values(input))).map((v, i) => [keys[i], v]));
 }

package/dist/promise/pTimeout.js

@@ -44,7 +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
+                    // oxlint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                     reject(_errorDataAppend(err, opt.errorData));
                 }
                 return;

package/dist/semver.js

@@ -58,6 +58,7 @@ export class Semver {
 class SemverFactory {
     fromInput(input) {
         const s = this.fromInputOrUndefined(input);
+        // oxlint-disable-next-line typescript/restrict-template-expressions
         _assert(s, `Cannot parse "${input}" into Semver`, {
             input,
         });

package/dist/web.d.ts

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 import type { StringMap } from './types.js';
 /**

package/dist/web.js

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 /**
  * Implements WebStorage API by using in-memory storage.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.46.0",
+  "version": "15.47.0",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",
@@ -13,7 +13,7 @@
     "@types/semver": "^7",
     "crypto-js": "^4",
     "dayjs": "^1",
-    "@naturalcycles/dev-lib": "20.8.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",
@@ -29,7 +29,6 @@
     "./error": "./dist/error/index.js",
     "./error/*.js": "./dist/error/*.js",
     "./http": "./dist/http/index.js",
-    "./json-schema": "./dist/json-schema/index.js",
     "./log": "./dist/log/commonLogger.js",
     "./math": "./dist/math/index.js",
     "./math/*.js": "./dist/math/*.js",
@@ -55,7 +54,7 @@
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.10.0"
   },
   "publishConfig": {
     "provenance": true,

package/readme.md

@@ -11,11 +11,3 @@
 [![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-libs/)
-
-# Packaging
-
-- `engines.node >= Node.js LTS`
-- `main: dist/index.js`: commonjs, es2022 - targeting Node.js
-- `module: dist-esm/index.js`: esm, es2017 - targeting Browsers
-- `types: dist/index.d.ts`: typescript types
-- `/src` folder with source `*.ts` files included

package/src/http/fetcher.ts

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 /// <reference lib="dom.iterable" preserve="true" />
 

package/src/promise/pProps.ts

@@ -17,7 +17,7 @@ export async function pProps<T>(input: { [K in keyof T]: T[K] | Promise<T[K]> })
 }> {
   const keys = Object.keys(input)
   // `as any` here is added to make it compile when `noUncheckedIndexedAccess` is false
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+  // oxlint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
   return Object.fromEntries(
     (await Promise.all(Object.values(input))).map((v, i) => [keys[i], v]),
   ) as any

package/src/promise/pTimeout.ts

@@ -88,7 +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
+          // oxlint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
           reject(_errorDataAppend(err, opt.errorData))
         }
         return

package/src/semver.ts

@@ -68,6 +68,7 @@ class SemverFactory {
   fromInput(input: SemverInput): Semver {
     const s = this.fromInputOrUndefined(input)
 
+    // oxlint-disable-next-line typescript/restrict-template-expressions
     _assert(s, `Cannot parse "${input}" into Semver`, {
       input,
     })

package/src/types.ts

@@ -34,7 +34,7 @@ export type AnyEnum = NumberEnum
 export type NumberEnum = Record<string, number | string>
 export type StringEnum = Record<string, string>
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// oxlint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type CreatedUpdated = {
   created: UnixTimestamp
   updated: UnixTimestamp
@@ -44,12 +44,12 @@ export interface CreatedUpdatedId extends CreatedUpdated {
   id: string
 }
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// oxlint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type ObjectWithId = {
   id: string
 }
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// oxlint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type PartialObjectWithId = {
   id?: string
 }
@@ -61,7 +61,7 @@ export interface AnyObjectWithId extends AnyObject, ObjectWithId {}
 /**
  * Base interface for any Entity that was saved to DB.
  */
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// oxlint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type BaseDBEntity = {
   id: string
 

package/src/web.ts

@@ -1,4 +1,4 @@
-/// <reference lib="es2022" preserve="true" />
+/// <reference lib="es2023" preserve="true" />
 /// <reference lib="dom" preserve="true" />
 
 import type { StringMap } from './types.js'

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

@@ -108,7 +108,7 @@ const baseDBEntitySchema = z.object({
   updated: unixTimestamp2000(),
 })
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+// oxlint-disable-next-line @typescript-eslint/consistent-type-definitions
 type BaseDBEntityZodShape = {
   id: ZodString
   created: ZodBrandedInt<UnixTimestamp>

package/dist/json-schema/from-data/generateJsonSchemaFromData.d.ts

@@ -1,8 +0,0 @@
-import { type AnyObject } from '../../types.js';
-import type { JsonSchemaObject } from '../index.js';
-/**
- * Each row must be an object (current limitation).
- *
- * `additionalProperties` is set to `true`, cause it's safer.
- */
-export declare function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(rows: AnyObject[]): JsonSchemaObject<T>;

package/dist/json-schema/from-data/generateJsonSchemaFromData.js

@@ -1,87 +0,0 @@
-import { _uniq } from '../../array/index.js';
-import { _stringMapEntries } from '../../types.js';
-/**
- * Each row must be an object (current limitation).
- *
- * `additionalProperties` is set to `true`, cause it's safer.
- */
-export function generateJsonSchemaFromData(rows) {
-    return objectToJsonSchema(rows);
-}
-function objectToJsonSchema(rows) {
-    const typesByKey = {};
-    rows.forEach(r => {
-        Object.keys(r).forEach(key => {
-            typesByKey[key] ||= new Set();
-            typesByKey[key].add(getTypeOfValue(r[key]));
-        });
-    });
-    const s = {
-        type: 'object',
-        properties: {},
-        required: [],
-        additionalProperties: true,
-    };
-    _stringMapEntries(typesByKey).forEach(([key, types]) => {
-        const schema = mergeTypes([...types], rows.map(r => r[key]));
-        if (!schema)
-            return;
-        s.properties[key] = schema;
-    });
-    // console.log(typesByKey)
-    return s;
-}
-function mergeTypes(types, samples) {
-    // skip "undefined" types
-    types = types.filter(t => t !== 'undefined');
-    if (!types.length)
-        return undefined;
-    if (types.length > 1) {
-        // oneOf
-        const s = {
-            oneOf: types.map(type => mergeTypes([type], samples)),
-        };
-        return s;
-    }
-    const type = types[0];
-    if (type === 'null') {
-        return {
-            type: 'null',
-        };
-    }
-    if (type === 'boolean') {
-        return {
-            type: 'boolean',
-        };
-    }
-    if (type === 'string') {
-        return {
-            type: 'string',
-        };
-    }
-    if (type === 'number') {
-        return {
-            type: 'number',
-        };
-    }
-    if (type === 'object') {
-        return objectToJsonSchema(samples.filter((r) => r && typeof r === 'object'));
-    }
-    if (type === 'array') {
-        // possible feature: detect if it's a tuple
-        // currently assume no-tuple
-        const items = samples.filter(r => Array.isArray(r)).flat();
-        const itemTypes = _uniq(items.map(i => getTypeOfValue(i)));
-        return {
-            type: 'array',
-            items: mergeTypes(itemTypes, items),
-        };
-    }
-}
-function getTypeOfValue(v) {
-    if (v === null)
-        return 'null';
-    if (Array.isArray(v))
-        return 'array';
-    return typeof v;
-}

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

@@ -1,5 +0,0 @@
-export * from './from-data/generateJsonSchemaFromData.js';
-export * from './jsonSchema.cnst.js';
-export * from './jsonSchema.model.js';
-export * from './jsonSchema.util.js';
-export * from './jsonSchemaBuilder.js';

package/dist/json-schema/index.js

@@ -1,5 +0,0 @@
-export * from './from-data/generateJsonSchemaFromData.js';
-export * from './jsonSchema.cnst.js';
-export * from './jsonSchema.model.js';
-export * from './jsonSchema.util.js';
-export * from './jsonSchemaBuilder.js';

package/dist/json-schema/jsonSchema.cnst.d.ts

@@ -1,2 +0,0 @@
-import type { JsonSchema, JsonSchemaAny, JsonSchemaNumber, JsonSchemaObject, JsonSchemaString } from './jsonSchema.model.js';
-export declare const JSON_SCHEMA_ORDER: (keyof JsonSchema | keyof JsonSchemaAny | keyof JsonSchemaObject | keyof JsonSchemaString | keyof JsonSchemaNumber)[];

package/dist/json-schema/jsonSchema.cnst.js

@@ -1,38 +0,0 @@
-export const JSON_SCHEMA_ORDER = [
-    '$schema',
-    '$id',
-    'title',
-    'description',
-    'deprecated',
-    'readOnly',
-    'writeOnly',
-    'type',
-    'default',
-    // Object,
-    'properties',
-    'required',
-    'minProperties',
-    'maxProperties',
-    'patternProperties',
-    'propertyNames',
-    // Array
-    'properties',
-    'required',
-    'minProperties',
-    'maxProperties',
-    'patternProperties',
-    'propertyNames',
-    // String
-    'pattern',
-    'minLength',
-    'maxLength',
-    'format',
-    'transform',
-    // Number
-    'format',
-    'multipleOf',
-    'minimum',
-    'exclusiveMinimum',
-    'maximum',
-    'exclusiveMaximum',
-];

package/dist/json-schema/jsonSchema.model.d.ts

@@ -1,121 +0,0 @@
-import type { AnyObject, StringMap } from '../types.js';
-export type JsonSchema<T = unknown> = JsonSchemaAny<T> | JsonSchemaOneOf<T> | JsonSchemaAllOf<T> | JsonSchemaAnyOf<T> | JsonSchemaNot<T> | JsonSchemaRef<T> | JsonSchemaConst<T> | JsonSchemaEnum<T> | JsonSchemaString | JsonSchemaNumber | JsonSchemaBoolean | JsonSchemaNull | JsonSchemaObject<T extends AnyObject ? T : AnyObject> | JsonSchemaArray<T> | JsonSchemaTuple<T>;
-export interface JsonSchemaAny<T = unknown> {
-    $schema?: string;
-    $id?: string;
-    title?: string;
-    description?: string;
-    deprecated?: boolean;
-    readOnly?: boolean;
-    writeOnly?: boolean;
-    type?: string | string[];
-    default?: T;
-    if?: JsonSchema;
-    then?: JsonSchema;
-    else?: JsonSchema;
-    /**
-     * https://ajv.js.org/packages/ajv-keywords.html#instanceof
-     *
-     * Useful for Node.js Buffer, you can use it like:
-     * `instanceof: 'Buffer'`
-     */
-    instanceof?: string | string[];
-    /**
-     * This is a temporary "intermediate AST" field that is used inside the parser.
-     * In the final schema this field will NOT be present.
-     */
-    optionalField?: true;
-}
-/**
- * Union type
- */
-export interface JsonSchemaOneOf<T = unknown> extends JsonSchemaAny<T> {
-    oneOf: JsonSchema[];
-}
-/**
- * Intersection type
- */
-export interface JsonSchemaAllOf<T = unknown> extends JsonSchemaAny<T> {
-    allOf: JsonSchema[];
-}
-export interface JsonSchemaAnyOf<T = unknown> extends JsonSchemaAny<T> {
-    anyOf: JsonSchema[];
-}
-export interface JsonSchemaNot<T = unknown> extends JsonSchemaAny<T> {
-    not: JsonSchema;
-}
-export interface JsonSchemaConst<T = unknown> extends JsonSchemaAny<T> {
-    const: T;
-}
-export interface JsonSchemaString<T extends string = string> extends JsonSchemaAny<T> {
-    type: 'string';
-    pattern?: string;
-    minLength?: number;
-    maxLength?: number;
-    format?: string;
-    contentMediaType?: string;
-    contentEncoding?: string;
-    /**
-     * https://ajv.js.org/packages/ajv-keywords.html#transform
-     */
-    transform?: ('trim' | 'toLowerCase' | 'toUpperCase')[];
-}
-export interface JsonSchemaNumber<T extends number = number> extends JsonSchemaAny<T> {
-    type: 'number' | 'integer';
-    format?: string;
-    multipleOf?: number;
-    minimum?: number;
-    exclusiveMinimum?: number;
-    maximum?: number;
-    exclusiveMaximum?: number;
-}
-export interface JsonSchemaBoolean extends JsonSchemaAny<boolean> {
-    type: 'boolean';
-}
-export interface JsonSchemaNull extends JsonSchemaAny<null> {
-    type: 'null';
-}
-export interface JsonSchemaEnum<T = unknown> extends JsonSchemaAny<T> {
-    enum: T[];
-}
-export interface JsonSchemaRef<T = unknown> extends JsonSchemaAny<T> {
-    $ref: string;
-}
-export interface JsonSchemaRootObject<T extends AnyObject = AnyObject> extends JsonSchemaObject<T> {
-    $id: string;
-}
-export interface JsonSchemaObject<T extends AnyObject = AnyObject> extends JsonSchemaAny<T> {
-    type: 'object';
-    properties: {
-        [k in keyof T]: JsonSchema;
-    };
-    required: (keyof T)[];
-    additionalProperties: boolean;
-    minProperties?: number;
-    maxProperties?: number;
-    patternProperties?: StringMap<JsonSchema>;
-    propertyNames?: JsonSchema;
-    /**
-     * @example
-     *
-     * dependentRequired: {
-     *   credit_card: ['billing_address']
-     * }
-     */
-    dependentRequired?: StringMap<string[]>;
-    dependentSchemas?: StringMap<JsonSchema>;
-    dependencies?: StringMap<string[]>;
-}
-export interface JsonSchemaArray<ITEM = unknown> extends JsonSchemaAny<ITEM[]> {
-    type: 'array';
-    items: JsonSchema<ITEM>;
-    minItems?: number;
-    maxItems?: number;
-    uniqueItems?: boolean;
-}
-export interface JsonSchemaTuple<T = unknown> extends JsonSchemaAny<T> {
-    type: 'array';
-    items: JsonSchema[];
-    minItems: number;
-    maxItems: number;
-}

package/dist/json-schema/jsonSchema.model.js

@@ -1 +0,0 @@
-export {};

package/dist/json-schema/jsonSchema.util.d.ts

@@ -1,8 +0,0 @@
-import type { AnyObject } from '../types.js';
-import type { JsonSchemaObject } from './jsonSchema.model.js';
-/**
- * Merges s2 into s1 (mutates s1) and returns s1.
- * Does not mutate s2.
- * API similar to Object.assign(s1, s2)
- */
-export declare function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(s1: JsonSchemaObject<T1>, s2: JsonSchemaObject<T2>): JsonSchemaObject<T1 & T2>;

package/dist/json-schema/jsonSchema.util.js

@@ -1,27 +0,0 @@
-import { _uniq } from '../array/array.util.js';
-import { _filterNullishValues } from '../object/object.util.js';
-/**
- * Merges s2 into s1 (mutates s1) and returns s1.
- * Does not mutate s2.
- * API similar to Object.assign(s1, s2)
- */
-export function mergeJsonSchemaObjects(s1, s2) {
-    // Merge `properties`
-    Object.entries(s2.properties).forEach(([k, v]) => {
-        ;
-        s1.properties[k] = v;
-    });
-    // Merge `patternProperties`
-    Object.entries(s2.patternProperties || {}).forEach(([k, v]) => {
-        ;
-        s1.patternProperties[k] = v;
-    });
-    s1.propertyNames = s2.propertyNames || s1.propertyNames;
-    s1.minProperties = s2.minProperties ?? s1.minProperties;
-    s1.maxProperties = s2.maxProperties ?? s1.maxProperties;
-    // Merge `required`
-    s1.required.push(...s2.required);
-    s1.required = _uniq(s1.required).sort();
-    // `additionalProperties` remains the same
-    return _filterNullishValues(s1, { mutate: true });
-}