@naturalcycles/nodejs-lib 15.90.0 → 15.90.2

package/dist/exec2/exec2.d.ts

@@ -1,4 +1,4 @@
-import { type StdioOptions } from 'node:child_process';
+import type { StdioOptions } from 'node:child_process';
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import type { AnyObject, NumberOfMilliseconds } from '@naturalcycles/js-lib/types';
 /**

package/dist/security/crypto.util.d.ts

@@ -1,4 +1,4 @@
-import { type Base64String, type StringMap } from '@naturalcycles/js-lib/types';
+import type { Base64String, StringMap } from '@naturalcycles/js-lib/types';
 /**
  * Using aes-256-cbc.
  */

package/dist/slack/slack.service.d.ts

@@ -1,4 +1,4 @@
-import { type CommonLogger, type CommonLogLevel } from '@naturalcycles/js-lib/log';
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log';
 import type { AnyObject } from '@naturalcycles/js-lib/types';
 import type { SlackAttachmentField, SlackMessage, SlackServiceCfg } from './slack.service.model.js';
 /**

package/dist/slack/slack.service.js

@@ -1,6 +1,6 @@
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { getFetcher } from '@naturalcycles/js-lib/http';
-import { createCommonLoggerAtLevel, } from '@naturalcycles/js-lib/log';
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { _omit } from '@naturalcycles/js-lib/object/object.util.js';
 import { PQueue } from '@naturalcycles/js-lib/promise/pQueue.js';
 import { _inspect } from '../index.js';

package/dist/stream/pipeline.d.ts

@@ -1,15 +1,15 @@
-import { type Transform } from 'node:stream';
+import type { Transform } from 'node:stream';
 import type { ReadableStream as WebReadableStream } from 'node:stream/web';
-import { type ZlibOptions, type ZstdOptions } from 'node:zlib';
-import { type AbortableAsyncMapper, type AsyncIndexedMapper, type AsyncPredicate, type END, type IndexedMapper, type Integer, type NonNegativeInteger, type PositiveInteger, type Predicate, type SKIP } from '@naturalcycles/js-lib/types';
+import type { ZlibOptions, ZstdOptions } from 'node:zlib';
+import type { AbortableAsyncMapper, AsyncIndexedMapper, AsyncPredicate, END, IndexedMapper, Integer, NonNegativeInteger, PositiveInteger, Predicate, SKIP } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped, TransformOptions, TransformTyped, WritableTyped } from './stream.model.js';
-import { type TransformLogProgressOptions } from './transform/transformLogProgress.js';
-import { type TransformMapOptions } from './transform/transformMap.js';
-import { type TransformMapSimpleOptions } from './transform/transformMapSimple.js';
-import { type TransformMapSyncOptions } from './transform/transformMapSync.js';
-import { type TransformOffsetOptions } from './transform/transformOffset.js';
-import { type TransformThrottleOptions } from './transform/transformThrottle.js';
-import { type TransformWarmupOptions } from './transform/transformWarmup.js';
+import type { TransformLogProgressOptions } from './transform/transformLogProgress.js';
+import type { TransformMapOptions } from './transform/transformMap.js';
+import type { TransformMapSimpleOptions } from './transform/transformMapSimple.js';
+import type { TransformMapSyncOptions } from './transform/transformMapSync.js';
+import type { TransformOffsetOptions } from './transform/transformOffset.js';
+import type { TransformThrottleOptions } from './transform/transformThrottle.js';
+import type { TransformWarmupOptions } from './transform/transformWarmup.js';
 export declare class Pipeline<T = unknown> {
     private readonly source;
     private transforms;

package/dist/stream/pipeline.js

@@ -1,8 +1,8 @@
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { createGzip, createUnzip, createZstdCompress, createZstdDecompress, } from 'node:zlib';
+import { createGzip, createUnzip, createZstdCompress, createZstdDecompress } from 'node:zlib';
 import { createAbortableSignal } from '@naturalcycles/js-lib';
-import { _passthroughPredicate, } from '@naturalcycles/js-lib/types';
+import { _passthroughPredicate } from '@naturalcycles/js-lib/types';
 import { fs2 } from '../fs/fs2.js';
 import { zstdLevelToOptions } from '../zip/zip.util.js';
 import { createReadStreamAsNDJson } from './ndjson/createReadStreamAsNDJson.js';
@@ -16,9 +16,9 @@ import { transformFlatten, transformFlattenIfNeeded } from './transform/transfor
 // oxlint-disable-next-line import/no-cycle -- intentional cycle
 import { transformFork } from './transform/transformFork.js';
 import { transformLimit } from './transform/transformLimit.js';
-import { transformLogProgress, } from './transform/transformLogProgress.js';
+import { transformLogProgress } from './transform/transformLogProgress.js';
 import { transformMap } from './transform/transformMap.js';
-import { transformMapSimple, } from './transform/transformMapSimple.js';
+import { transformMapSimple } from './transform/transformMapSimple.js';
 import { transformMapSync } from './transform/transformMapSync.js';
 import { transformOffset } from './transform/transformOffset.js';
 import { transformSplitOnNewline } from './transform/transformSplit.js';

package/dist/stream/readable/createReadable.d.ts

@@ -1,4 +1,4 @@
-import { type ReadableOptions } from 'node:stream';
+import type { ReadableOptions } from 'node:stream';
 import type { ReadableTyped } from '../stream.model.js';
 /**
  * Convenience function to create a Readable that can be pushed into (similar to RxJS Subject).

package/dist/stream/transform/transformMap.d.ts

@@ -1,6 +1,7 @@
-import { type AbortableSignal } from '@naturalcycles/js-lib';
+import type { AbortableSignal } from '@naturalcycles/js-lib';
 import { ErrorMode } from '@naturalcycles/js-lib/error';
-import { type AbortableAsyncMapper, type AsyncPredicate, END, type NumberOfSeconds, type PositiveInteger, type Predicate, type Promisable, SKIP, type StringMap, type UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import { END, SKIP } from '@naturalcycles/js-lib/types';
+import type { AbortableAsyncMapper, AsyncPredicate, NumberOfSeconds, PositiveInteger, Predicate, Promisable, StringMap, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { TransformOptions, TransformTyped } from '../stream.model.js';
 export interface TransformMapOptions<IN = any, OUT = IN> extends TransformOptions {
     /**

package/dist/stream/transform/transformMap.js

@@ -5,7 +5,7 @@ import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js';
 import { _stringify } from '@naturalcycles/js-lib/string';
-import { END, SKIP, } from '@naturalcycles/js-lib/types';
+import { END, SKIP } from '@naturalcycles/js-lib/types';
 import { yellow } from '../../colors/colors.js';
 import { PIPELINE_GRACEFUL_ABORT } from '../stream.util.js';
 const WARMUP_CHECK_INTERVAL_MS = 1000;

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

@@ -1,9 +1,9 @@
-import { type ValidationFunction, type ValidationFunctionResult } from '@naturalcycles/js-lib';
-import { type AnyObject } from '@naturalcycles/js-lib/types';
-import type { ZodType } from '@naturalcycles/js-lib/zod';
+import type { ValidationFunction, ValidationFunctionResult } from '@naturalcycles/js-lib';
+import type { AnyObject } from '@naturalcycles/js-lib/types';
 import type { Ajv } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
-import { type JsonSchema, JsonSchemaTerminal } from './jsonSchemaBuilder.js';
+import { JsonSchemaTerminal } from './jsonSchemaBuilder.js';
+import type { JsonSchema } from './jsonSchemaBuilder.js';
 /**
  * On creation - compiles ajv validation function.
  * Provides convenient methods, error reporting, etc.
@@ -25,10 +25,6 @@ export declare class AjvSchema<IN = unknown, OUT = IN> {
      * correctly for some reason.
      */
     static create<IN, OUT = IN>(schema: SchemaHandledByAjv<IN, OUT>, cfg?: Partial<AjvSchemaCfg>): AjvSchema<IN, OUT>;
-    /**
-     * @deprecated Use `j` to build schemas, not `z` or `zod`.
-     */
-    static createFromZod<T extends ZodType<any, any, any>>(schema: T): AjvSchema<T['_input'], T['_output']>;
     static isJsonSchemaBuilder<IN, OUT>(schema: unknown): schema is JsonSchemaTerminal<IN, OUT, any>;
     readonly cfg: AjvSchemaCfg;
     /**

package/dist/validation/ajv/ajvSchema.js

@@ -1,9 +1,8 @@
-import { _isObject, _lazyValue, } from '@naturalcycles/js-lib';
+import { _isObject, _lazyValue } from '@naturalcycles/js-lib';
 import { _assert } from '@naturalcycles/js-lib/error';
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { _substringBefore } from '@naturalcycles/js-lib/string';
 import { _typeCast } from '@naturalcycles/js-lib/types';
-import { z } from '@naturalcycles/js-lib/zod';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
@@ -70,15 +69,6 @@ export class AjvSchema {
         AjvSchema.cacheAjvSchema(schema, ajvSchema);
         return ajvSchema;
     }
-    /**
-     * @deprecated Use `j` to build schemas, not `z` or `zod`.
-     */
-    static createFromZod(schema) {
-        const jsonSchema = z.toJSONSchema(schema, {
-            target: 'draft-2020-12',
-        });
-        return AjvSchema.create(jsonSchema);
-    }
     static isJsonSchemaBuilder(schema) {
         return schema instanceof JsonSchemaTerminal;
     }

package/dist/validation/ajv/from-data/generateJsonSchemaFromData.d.ts

@@ -1,4 +1,4 @@
-import { type AnyObject } from '@naturalcycles/js-lib/types';
+import type { AnyObject } from '@naturalcycles/js-lib/types';
 import type { JsonSchema } from '../jsonSchemaBuilder.js';
 /**
  * Each row must be an object (current limitation).

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

@@ -1,4 +1,5 @@
-import { Ajv2020, type Options } from 'ajv/dist/2020.js';
+import { Ajv2020 } from 'ajv/dist/2020.js';
+import type { Options } from 'ajv/dist/2020.js';
 /**
  * Return cached instance of Ajv with default (recommended) options.
  *

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

@@ -1,5 +1,5 @@
 import type { Set2 } from '@naturalcycles/js-lib/object';
-import { type AnyObject, type BaseDBEntity, type IANATimezone, type Inclusiveness, type IsoDate, type IsoDateTime, type IsoMonth, type NumberEnum, type StringEnum, type StringMap, type UnixTimestamp, type UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import type { AnyObject, BaseDBEntity, IANATimezone, Inclusiveness, IsoDate, IsoDateTime, IsoMonth, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 export declare const j: {
     /**
      * Matches literally any value - equivalent to TypeScript's `any` type.
@@ -244,17 +244,15 @@ export interface JsonSchemaStringEmailOptions {
 export declare class JsonSchemaIsoDateBuilder<Opt extends boolean = false> extends JsonSchemaAnyBuilder<string | IsoDate, IsoDate, Opt> {
     constructor();
     /**
-     * @param optionalValues List of values that should be considered/converted as `undefined`.
+     * @param nullValue Pass `null` to have `null` values be considered/converted as `undefined`.
      *
-     * This `optionalValues` feature only works when the current schema is nested in an object or array schema,
+     * This `null` feature only works when the current schema is nested in an object or array schema,
      * due to how mutability works in Ajv.
      *
-     * Make sure this `optional()` call is at the end of your call chain.
-     *
-     * When `null` is included in optionalValues, the return type becomes `JsonSchemaTerminal`
+     * When `null` is passed, the return type becomes `JsonSchemaTerminal`
      * (no further chaining allowed) because the schema is wrapped in an anyOf structure.
      */
-    optional<T extends readonly null[] | undefined = undefined>(optionalValues?: T): T extends readonly null[] ? JsonSchemaTerminal<string | IsoDate | undefined, IsoDate | undefined, true> : JsonSchemaAnyBuilder<string | IsoDate | undefined, IsoDate | undefined, true>;
+    optional<N extends null | undefined = undefined>(nullValue?: N): N extends null ? JsonSchemaTerminal<string | IsoDate | null | undefined, IsoDate | undefined, true> : JsonSchemaAnyBuilder<string | IsoDate | undefined, IsoDate | undefined, true>;
     before(date: string): this;
     sameOrBefore(date: string): this;
     after(date: string): this;
@@ -338,7 +336,7 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
      * When `null` is passed, the return type becomes `JsonSchemaTerminal`
      * (no further chaining allowed) because the schema is wrapped in an anyOf structure.
      */
-    optional<N extends null | undefined = undefined>(nullValue?: N): N extends null ? JsonSchemaTerminal<IN | undefined, OUT | undefined, true> : JsonSchemaAnyBuilder<IN | undefined, OUT | undefined, true>;
+    optional<N extends null | undefined = undefined>(nullValue?: N): N extends null ? JsonSchemaTerminal<IN | null | undefined, OUT | undefined, true> : JsonSchemaAnyBuilder<IN | undefined, OUT | undefined, true>;
     /**
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -4,7 +4,7 @@ import { _isUndefined, _numberEnumValues, _stringEnumValues, getEnumType, } from
 import { _uniq } from '@naturalcycles/js-lib/array';
 import { _assert } from '@naturalcycles/js-lib/error';
 import { _sortObject } from '@naturalcycles/js-lib/object';
-import { _objectAssign, _typeCast, JWT_REGEX, } from '@naturalcycles/js-lib/types';
+import { _objectAssign, _typeCast, JWT_REGEX } from '@naturalcycles/js-lib/types';
 import { BASE64URL_REGEX, COUNTRY_CODE_REGEX, CURRENCY_REGEX, IPV4_REGEX, IPV6_REGEX, LANGUAGE_TAG_REGEX, SEMVER_REGEX, SLUG_REGEX, URL_REGEX, UUID_REGEX, } from '../regexes.js';
 import { TIMEZONES } from '../timezones.js';
 import { isEveryItemNumber, isEveryItemPrimitive, isEveryItemString, JSON_SCHEMA_ORDER, mergeJsonSchemaObjects, } from './jsonSchemaBuilder.util.js';
@@ -509,27 +509,26 @@ export class JsonSchemaIsoDateBuilder extends JsonSchemaAnyBuilder {
         });
     }
     /**
-     * @param optionalValues List of values that should be considered/converted as `undefined`.
+     * @param nullValue Pass `null` to have `null` values be considered/converted as `undefined`.
      *
-     * This `optionalValues` feature only works when the current schema is nested in an object or array schema,
+     * This `null` feature only works when the current schema is nested in an object or array schema,
      * due to how mutability works in Ajv.
      *
-     * Make sure this `optional()` call is at the end of your call chain.
-     *
-     * When `null` is included in optionalValues, the return type becomes `JsonSchemaTerminal`
+     * When `null` is passed, the return type becomes `JsonSchemaTerminal`
      * (no further chaining allowed) because the schema is wrapped in an anyOf structure.
      */
-    optional(optionalValues) {
-        if (!optionalValues) {
+    optional(nullValue) {
+        if (nullValue === undefined) {
             return super.optional();
         }
-        _typeCast(optionalValues);
-        const optionalBuilder = this.cloneAndUpdateSchema({ optionalField: true });
-        const newBuilder = new JsonSchemaTerminal({
-            anyOf: [{ type: 'null', optionalValues }, optionalBuilder.build()],
+        // When `null` is specified, we want `null` to be stripped and the value to become `undefined`,
+        // so we must allow `null` values to be parsed by Ajv,
+        // but the typing should not reflect that.
+        // We also cannot accept more rules attached, since we're not building an ObjectSchema anymore.
+        return new JsonSchemaTerminal({
+            anyOf: [{ type: 'null', optionalValues: [null] }, this.build()],
             optionalField: true,
         });
-        return newBuilder;
     }
     before(date) {
         return this.cloneAndUpdateSchema({ IsoDate: { before: date } });
@@ -760,7 +759,7 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
      * (no further chaining allowed) because the schema is wrapped in an anyOf structure.
      */
     optional(nullValue) {
-        if (typeof nullValue === 'undefined') {
+        if (nullValue === undefined) {
             return super.optional();
         }
         // When `null` is specified, we want `null` to be stripped and the value to become `undefined`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.90.0",
+  "version": "15.90.2",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -18,6 +18,7 @@
     "yargs": "^18"
   },
   "devDependencies": {
+    "@typescript/native-preview": "^7.0.0-0",
     "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {

package/src/exec2/exec2.ts

@@ -1,4 +1,5 @@
-import { execSync, spawn, spawnSync, type StdioOptions } from 'node:child_process'
+import { execSync, spawn, spawnSync } from 'node:child_process'
+import type { StdioOptions } from 'node:child_process'
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string/string.util.js'

package/src/security/crypto.util.ts

@@ -1,5 +1,6 @@
 import crypto from 'node:crypto'
-import { _stringMapEntries, type Base64String, type StringMap } from '@naturalcycles/js-lib/types'
+import { _stringMapEntries } from '@naturalcycles/js-lib/types'
+import type { Base64String, StringMap } from '@naturalcycles/js-lib/types'
 import { md5AsBuffer, sha256AsBuffer } from './hash.util.js'
 
 const algorithm = 'aes-256-cbc'

package/src/slack/slack.service.ts

@@ -1,14 +1,13 @@
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
-import { type Fetcher, getFetcher } from '@naturalcycles/js-lib/http'
-import {
-  type CommonLogger,
-  type CommonLogLevel,
-  createCommonLoggerAtLevel,
-} from '@naturalcycles/js-lib/log'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import type { Fetcher } from '@naturalcycles/js-lib/http'
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
 import { _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import { PQueue } from '@naturalcycles/js-lib/promise/pQueue.js'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import { _inspect, type InspectAnyOptions } from '../index.js'
+import { _inspect } from '../index.js'
+import type { InspectAnyOptions } from '../index.js'
 import type {
   SlackApiBody,
   SlackAttachmentField,

package/src/stream/pipeline.ts

@@ -1,27 +1,22 @@
-import { Readable, type Transform } from 'node:stream'
+import { Readable } from 'node:stream'
+import type { Transform } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import type { ReadableStream as WebReadableStream } from 'node:stream/web'
-import {
-  createGzip,
-  createUnzip,
-  createZstdCompress,
-  createZstdDecompress,
-  type ZlibOptions,
-  type ZstdOptions,
-} from 'node:zlib'
+import { createGzip, createUnzip, createZstdCompress, createZstdDecompress } from 'node:zlib'
+import type { ZlibOptions, ZstdOptions } from 'node:zlib'
 import { createAbortableSignal } from '@naturalcycles/js-lib'
-import {
-  _passthroughPredicate,
-  type AbortableAsyncMapper,
-  type AsyncIndexedMapper,
-  type AsyncPredicate,
-  type END,
-  type IndexedMapper,
-  type Integer,
-  type NonNegativeInteger,
-  type PositiveInteger,
-  type Predicate,
-  type SKIP,
+import { _passthroughPredicate } from '@naturalcycles/js-lib/types'
+import type {
+  AbortableAsyncMapper,
+  AsyncIndexedMapper,
+  AsyncPredicate,
+  END,
+  IndexedMapper,
+  Integer,
+  NonNegativeInteger,
+  PositiveInteger,
+  Predicate,
+  SKIP,
 } from '@naturalcycles/js-lib/types'
 import { fs2 } from '../fs/fs2.js'
 import { zstdLevelToOptions } from '../zip/zip.util.js'
@@ -42,21 +37,22 @@ import { transformFlatten, transformFlattenIfNeeded } from './transform/transfor
 // oxlint-disable-next-line import/no-cycle -- intentional cycle
 import { transformFork } from './transform/transformFork.js'
 import { transformLimit } from './transform/transformLimit.js'
-import {
-  transformLogProgress,
-  type TransformLogProgressOptions,
-} from './transform/transformLogProgress.js'
-import { transformMap, type TransformMapOptions } from './transform/transformMap.js'
-import {
-  transformMapSimple,
-  type TransformMapSimpleOptions,
-} from './transform/transformMapSimple.js'
-import { transformMapSync, type TransformMapSyncOptions } from './transform/transformMapSync.js'
-import { transformOffset, type TransformOffsetOptions } from './transform/transformOffset.js'
+import { transformLogProgress } from './transform/transformLogProgress.js'
+import type { TransformLogProgressOptions } from './transform/transformLogProgress.js'
+import { transformMap } from './transform/transformMap.js'
+import type { TransformMapOptions } from './transform/transformMap.js'
+import { transformMapSimple } from './transform/transformMapSimple.js'
+import type { TransformMapSimpleOptions } from './transform/transformMapSimple.js'
+import { transformMapSync } from './transform/transformMapSync.js'
+import type { TransformMapSyncOptions } from './transform/transformMapSync.js'
+import { transformOffset } from './transform/transformOffset.js'
+import type { TransformOffsetOptions } from './transform/transformOffset.js'
 import { transformSplitOnNewline } from './transform/transformSplit.js'
 import { transformTap, transformTapSync } from './transform/transformTap.js'
-import { transformThrottle, type TransformThrottleOptions } from './transform/transformThrottle.js'
-import { transformWarmup, type TransformWarmupOptions } from './transform/transformWarmup.js'
+import { transformThrottle } from './transform/transformThrottle.js'
+import type { TransformThrottleOptions } from './transform/transformThrottle.js'
+import { transformWarmup } from './transform/transformWarmup.js'
+import type { TransformWarmupOptions } from './transform/transformWarmup.js'
 import { writablePushToArray } from './writable/writablePushToArray.js'
 import { writableVoid } from './writable/writableVoid.js'
 

package/src/stream/readable/createReadable.ts

@@ -1,4 +1,5 @@
-import { Readable, type ReadableOptions, Transform } from 'node:stream'
+import { Readable, Transform } from 'node:stream'
+import type { ReadableOptions } from 'node:stream'
 import type { ReadableTyped } from '../stream.model.js'
 
 /**

package/src/stream/readable/readableCombined.ts

@@ -1,6 +1,8 @@
 import { Readable } from 'node:stream'
-import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
-import { type DeferredPromise, pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise/pDefer.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { TransformOptions } from '../stream.model.js'

package/src/stream/transform/transformFork.ts

@@ -1,6 +1,7 @@
 import { Transform } from 'node:stream'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
-import { type DeferredPromise, pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise/pDefer.js'
 // oxlint-disable-next-line import/no-cycle -- intentional cycle
 import { Pipeline } from '../pipeline.js'
 import { createReadable } from '../readable/createReadable.js'

package/src/stream/transform/transformMap.ts

@@ -1,22 +1,22 @@
 import { Transform } from 'node:stream'
-import { _hc, type AbortableSignal } from '@naturalcycles/js-lib'
+import { _hc } from '@naturalcycles/js-lib'
+import type { AbortableSignal } from '@naturalcycles/js-lib'
 import { _since } from '@naturalcycles/js-lib/datetime'
 import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
 import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
 import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
 import { _stringify } from '@naturalcycles/js-lib/string'
-import {
-  type AbortableAsyncMapper,
-  type AsyncPredicate,
-  END,
-  type NumberOfSeconds,
-  type PositiveInteger,
-  type Predicate,
-  type Promisable,
-  SKIP,
-  type StringMap,
-  type UnixTimestampMillis,
+import { END, SKIP } from '@naturalcycles/js-lib/types'
+import type {
+  AbortableAsyncMapper,
+  AsyncPredicate,
+  NumberOfSeconds,
+  PositiveInteger,
+  Predicate,
+  Promisable,
+  StringMap,
+  UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
 import { yellow } from '../../colors/colors.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'

package/src/stream/transform/worker/workerClassProxy.js

@@ -1,6 +1,6 @@
 const started = Date.now()
-import { workerData, parentPort } from 'node:worker_threads'
 import { inspect } from 'node:util'
+import { workerData, parentPort } from 'node:worker_threads'
 const { workerFile, workerIndex, logEvery = 1000, metric = 'worker', silent } = workerData || {}
 
 if (!workerFile) {

package/src/stream/writable/writableChunk.ts

@@ -1,6 +1,7 @@
 import { Writable } from 'node:stream'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
-import { type DeferredPromise, pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise/pDefer.js'
 import type { NonNegativeInteger, Predicate } from '@naturalcycles/js-lib/types'
 import { Pipeline } from '../pipeline.js'
 import { createReadable } from '../readable/createReadable.js'

package/src/validation/ajv/ajvSchema.ts

@@ -1,20 +1,16 @@
-import {
-  _isObject,
-  _lazyValue,
-  type ValidationFunction,
-  type ValidationFunctionResult,
-} from '@naturalcycles/js-lib'
+import { _isObject, _lazyValue } from '@naturalcycles/js-lib'
+import type { ValidationFunction, ValidationFunctionResult } from '@naturalcycles/js-lib'
 import { _assert } from '@naturalcycles/js-lib/error'
 import { _deepCopy, _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { _substringBefore } from '@naturalcycles/js-lib/string'
-import { _typeCast, type AnyObject } from '@naturalcycles/js-lib/types'
-import type { ZodType } from '@naturalcycles/js-lib/zod'
-import { z } from '@naturalcycles/js-lib/zod'
+import { _typeCast } from '@naturalcycles/js-lib/types'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import type { Ajv, ErrorObject } from 'ajv'
 import { _inspect } from '../../string/inspect.js'
 import { AjvValidationError } from './ajvValidationError.js'
 import { getAjv } from './getAjv.js'
-import { type JsonSchema, JsonSchemaTerminal } from './jsonSchemaBuilder.js'
+import { JsonSchemaTerminal } from './jsonSchemaBuilder.js'
+import type { JsonSchema } from './jsonSchemaBuilder.js'
 
 /**
  * On creation - compiles ajv validation function.
@@ -93,19 +89,6 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     return ajvSchema
   }
 
-  /**
-   * @deprecated Use `j` to build schemas, not `z` or `zod`.
-   */
-  static createFromZod<T extends ZodType<any, any, any>>(
-    schema: T,
-  ): AjvSchema<T['_input'], T['_output']> {
-    const jsonSchema = z.toJSONSchema(schema, {
-      target: 'draft-2020-12',
-    }) as unknown as JsonSchema<T['_input'], T['_output']>
-
-    return AjvSchema.create(jsonSchema)
-  }
-
   static isJsonSchemaBuilder<IN, OUT>(schema: unknown): schema is JsonSchemaTerminal<IN, OUT, any> {
     return schema instanceof JsonSchemaTerminal
   }

package/src/validation/ajv/from-data/generateJsonSchemaFromData.ts

@@ -1,5 +1,6 @@
 import { _uniq } from '@naturalcycles/js-lib/array'
-import { _stringMapEntries, type AnyObject, type StringMap } from '@naturalcycles/js-lib/types'
+import { _stringMapEntries } from '@naturalcycles/js-lib/types'
+import type { AnyObject, StringMap } from '@naturalcycles/js-lib/types'
 import type { JsonSchema } from '../jsonSchemaBuilder.js'
 
 type PrimitiveType = 'undefined' | 'null' | 'boolean' | 'string' | 'number'

package/src/validation/ajv/getAjv.ts

@@ -3,7 +3,8 @@ import { _assert } from '@naturalcycles/js-lib/error'
 import { _deepCopy, _mapObject, Set2 } from '@naturalcycles/js-lib/object'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
 import type { AnyObject } from '@naturalcycles/js-lib/types'
-import { Ajv2020, type Options, type ValidateFunction } from 'ajv/dist/2020.js'
+import { Ajv2020 } from 'ajv/dist/2020.js'
+import type { Options, ValidateFunction } from 'ajv/dist/2020.js'
 import { validTLDs } from '../tlds.js'
 import type {
   CustomConverterFn,

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -11,22 +11,20 @@ import { _uniq } from '@naturalcycles/js-lib/array'
 import { _assert } from '@naturalcycles/js-lib/error'
 import type { Set2 } from '@naturalcycles/js-lib/object'
 import { _sortObject } from '@naturalcycles/js-lib/object'
-import {
-  _objectAssign,
-  _typeCast,
-  type AnyObject,
-  type BaseDBEntity,
-  type IANATimezone,
-  type Inclusiveness,
-  type IsoDate,
-  type IsoDateTime,
-  type IsoMonth,
-  JWT_REGEX,
-  type NumberEnum,
-  type StringEnum,
-  type StringMap,
-  type UnixTimestamp,
-  type UnixTimestampMillis,
+import { _objectAssign, _typeCast, JWT_REGEX } from '@naturalcycles/js-lib/types'
+import type {
+  AnyObject,
+  BaseDBEntity,
+  IANATimezone,
+  Inclusiveness,
+  IsoDate,
+  IsoDateTime,
+  IsoMonth,
+  NumberEnum,
+  StringEnum,
+  StringMap,
+  UnixTimestamp,
+  UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
 import {
   BASE64URL_REGEX,
@@ -704,39 +702,31 @@ export class JsonSchemaIsoDateBuilder<Opt extends boolean = false> extends JsonS
   }
 
   /**
-   * @param optionalValues List of values that should be considered/converted as `undefined`.
+   * @param nullValue Pass `null` to have `null` values be considered/converted as `undefined`.
    *
-   * This `optionalValues` feature only works when the current schema is nested in an object or array schema,
+   * This `null` feature only works when the current schema is nested in an object or array schema,
    * due to how mutability works in Ajv.
    *
-   * Make sure this `optional()` call is at the end of your call chain.
-   *
-   * When `null` is included in optionalValues, the return type becomes `JsonSchemaTerminal`
+   * When `null` is passed, the return type becomes `JsonSchemaTerminal`
    * (no further chaining allowed) because the schema is wrapped in an anyOf structure.
    */
-  override optional<T extends readonly null[] | undefined = undefined>(
-    optionalValues?: T,
-  ): T extends readonly null[]
-    ? JsonSchemaTerminal<string | IsoDate | undefined, IsoDate | undefined, true>
+  override optional<N extends null | undefined = undefined>(
+    nullValue?: N,
+  ): N extends null
+    ? JsonSchemaTerminal<string | IsoDate | null | undefined, IsoDate | undefined, true>
     : JsonSchemaAnyBuilder<string | IsoDate | undefined, IsoDate | undefined, true> {
-    if (!optionalValues) {
-      return super.optional() as any
+    if (nullValue === undefined) {
+      return super.optional()
     }
 
-    _typeCast<null[]>(optionalValues)
-
-    const optionalBuilder = this.cloneAndUpdateSchema({ optionalField: true })
-
-    const newBuilder = new JsonSchemaTerminal<
-      string | IsoDate | undefined,
-      IsoDate | undefined,
-      true
-    >({
-      anyOf: [{ type: 'null', optionalValues }, optionalBuilder.build()],
+    // When `null` is specified, we want `null` to be stripped and the value to become `undefined`,
+    // so we must allow `null` values to be parsed by Ajv,
+    // but the typing should not reflect that.
+    // We also cannot accept more rules attached, since we're not building an ObjectSchema anymore.
+    return new JsonSchemaTerminal({
+      anyOf: [{ type: 'null', optionalValues: [null] }, this.build()],
       optionalField: true,
-    })
-
-    return newBuilder as any
+    }) as any
   }
 
   before(date: string): this {
@@ -1059,9 +1049,9 @@ export class JsonSchemaObjectBuilder<
   override optional<N extends null | undefined = undefined>(
     nullValue?: N,
   ): N extends null
-    ? JsonSchemaTerminal<IN | undefined, OUT | undefined, true>
+    ? JsonSchemaTerminal<IN | null | undefined, OUT | undefined, true>
     : JsonSchemaAnyBuilder<IN | undefined, OUT | undefined, true> {
-    if (typeof nullValue === 'undefined') {
+    if (nullValue === undefined) {
       return super.optional()
     }