@naturalcycles/js-lib 15.16.2 → 15.17.0

package/dist/browser/analytics.util.js

@@ -1,4 +1,4 @@
-import { isServerSide } from '../index.js';
+import { isServerSide } from '../env.js';
 import { loadScript } from './script.util.js';
 /**
  * Pass enabled = false to only init globalThis.gtag, but not load actual gtag script (e.g in dev mode).

package/dist/decorators/logMethod.decorator.d.ts

@@ -1,4 +1,4 @@
-import type { CommonLogger } from '../log/index.js';
+import type { CommonLogger } from '../log/commonLogger.js';
 /**
  * $r - result
  *

package/dist/decorators/logMethod.decorator.js

@@ -1,7 +1,7 @@
 import { _ms } from '../datetime/time.util.js';
-import { _assert } from '../error/index.js';
-import { SimpleMovingAverage } from '../math/index.js';
-import { _stringify } from '../string/index.js';
+import { _assert } from '../error/assert.js';
+import { SimpleMovingAverage } from '../math/sma.js';
+import { _stringify } from '../string/stringify.js';
 import { _getArgsSignature, _getMethodSignature } from './decorator.util.js';
 /**
  * Console-logs when method had started, when it finished, time taken and if error happened.

package/dist/decorators/retry.decorator.d.ts

@@ -1,2 +1,2 @@
-import type { PRetryOptions } from '../promise/index.js';
+import type { PRetryOptions } from '../promise/pRetry.js';
 export declare function _Retry(opt?: PRetryOptions): MethodDecorator;

package/dist/decorators/retry.decorator.js

@@ -1,4 +1,4 @@
-import { pRetryFn } from '../promise/index.js';
+import { pRetryFn } from '../promise/pRetry.js';
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Retry(opt = {}) {
     return (_target, _key, descriptor) => {

package/dist/error/tryCatch.d.ts

@@ -1,4 +1,4 @@
-import type { CommonLogger } from '../log/index.js';
+import type { CommonLogger } from '../log/commonLogger.js';
 import type { AnyFunction } from '../types.js';
 export interface TryCatchOptions {
     /**

package/dist/error/tryCatch.js

@@ -1,4 +1,4 @@
-import { _since } from '../datetime/index.js';
+import { _since } from '../datetime/time.util.js';
 import { _anyToError } from './error.util.js';
 /**
  * Decorates a function with "try/catch", so it'll never reject/throw.

package/dist/index.d.ts

@@ -14,4 +14,5 @@ export * from './number/createDeterministicRandom.js';
 export * from './number/number.util.js';
 export * from './polyfill.js';
 export * from './unit/size.util.js';
+export type * from './validation/validation.js';
 export * from './web.js';

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

@@ -1,4 +1,4 @@
-import { _uniq } from '../index.js';
+import { _uniq } from '../array/array.util.js';
 import { _filterNullishValues } from '../object/object.util.js';
 /**
  * Merges s2 into s1 (mutates s1) and returns s1.

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

@@ -1,6 +1,5 @@
 import type { AnyObject, BaseDBEntity } from '../types.js';
-import { type JsonSchemaAllOf, type JsonSchemaArray, type JsonSchemaOneOf, type JsonSchemaTuple } from './index.js';
-import type { JsonSchema, JsonSchemaAny, JsonSchemaBoolean, JsonSchemaConst, JsonSchemaEnum, JsonSchemaNull, JsonSchemaNumber, JsonSchemaObject, JsonSchemaRef, JsonSchemaString } from './jsonSchema.model.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>;
 }

package/dist/json-schema/jsonSchemaBuilder.js

@@ -1,7 +1,8 @@
 import { _uniq } from '../array/array.util.js';
-import { _deepCopy, _sortObject } from '../object/index.js';
-import { mergeJsonSchemaObjects, } from './index.js';
+import { _deepCopy } from '../object/object.util.js';
+import { _sortObject } from '../object/sortObject.js';
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst.js';
+import { mergeJsonSchemaObjects } from './jsonSchema.util.js';
 /**
  * Fluent (chainable) API to manually create Json Schemas.
  * Inspired by Joi

package/dist/math/stack.util.js

@@ -1,5 +1,5 @@
 import { _range } from '../array/range.js';
-import { _average, _percentile, _percentiles } from '../math/index.js';
+import { _average, _percentile, _percentiles } from './math.util.js';
 /**
  * Implements a "round-robin" Stack ("first-in last-out" aka FILO) with a limited size.
  * Like an array of a fixed size. When it runs out of space - it starts writing on top of itself

package/dist/promise/pMap.d.ts

@@ -1,5 +1,5 @@
-import { ErrorMode } from '../error/index.js';
-import type { CommonLogger } from '../log/index.js';
+import { ErrorMode } from '../error/errorMode.js';
+import type { CommonLogger } from '../log/commonLogger.js';
 import { type AbortableAsyncMapper } from '../types.js';
 export interface PMapOptions {
     /**

package/dist/promise/pMap.js

@@ -1,4 +1,4 @@
-import { ErrorMode } from '../error/index.js';
+import { ErrorMode } from '../error/errorMode.js';
 import { END, SKIP } from '../types.js';
 /**
  * Forked from https://github.com/sindresorhus/p-map

package/dist/promise/pRetry.d.ts

@@ -1,5 +1,5 @@
-import { type ErrorData } from '../error/index.js';
-import type { CommonLogger } from '../log/index.js';
+import type { ErrorData } from '../error/error.model.js';
+import type { CommonLogger } from '../log/commonLogger.js';
 import type { AnyFunction } from '../types.js';
 export interface PRetryOptions {
     /**

package/dist/promise/pRetry.js

@@ -1,5 +1,5 @@
-import { _since } from '../datetime/index.js';
-import { _errorDataAppend } from '../error/index.js';
+import { _since } from '../datetime/time.util.js';
+import { _errorDataAppend } from '../error/error.util.js';
 import { pDelay } from './pDelay.js';
 import { pTimeout } from './pTimeout.js';
 /**

package/dist/validation/validation.d.ts

@@ -0,0 +1,30 @@
+import type { AppError } from '../error/error.util.js';
+import type { ErrorDataTuple } from '../types.js';
+/**
+ * Item to be validated.
+ * Can be null or undefined, which allows validation function to produce an error,
+ * if undefined/null are not accepted. But they might be accepted too, it depends
+ * on the schema (implementation detail of the ValidationFunction).
+ *
+ * Function returns a tuple of [err, item].
+ * In case of error it will be [err, null].
+ * In case of success it is [null, item].
+ *
+ * ValidationFunction may mutate the input item or not,
+ * depending on the implementation.
+ *
+ * @experimental
+ */
+export type ValidationFunction<T, ERR extends AppError> = (item: T | null | undefined, opt?: ValidationFunctionOptions) => ErrorDataTuple<T, ERR>;
+export interface ValidationFunctionOptions {
+    /**
+     * E.g User
+     * Used for error message printing.
+     */
+    itemName?: string;
+    /**
+     * E.g `12345678` (user id).
+     * Used for error message printing.
+     */
+    itemId?: string;
+}

package/dist/validation/validation.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.16.2",
+  "version": "15.17.0",
   "dependencies": {
     "tslib": "^2",
     "zod": "^4"
@@ -18,19 +18,27 @@
     "./cfg/frontend/tsconfig.json": "./cfg/frontend/tsconfig.json",
     ".": "./dist/index.js",
     "./browser": "./dist/browser/index.js",
+    "./browser/*.js": "./dist/browser/*.js",
     "./datetime": "./dist/datetime/index.js",
+    "./datetime/*.js": "./dist/datetime/*.js",
     "./decorators": "./dist/decorators/index.js",
+    "./decorators/*.js": "./dist/decorators/*.js",
     "./deviceIdService": "./dist/deviceIdService.js",
     "./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/index.js",
+    "./log": "./dist/log/commonLogger.js",
     "./math": "./dist/math/index.js",
+    "./math/*.js": "./dist/math/*.js",
     "./object": "./dist/object/index.js",
+    "./object/*.js": "./dist/object/*.js",
     "./promise": "./dist/promise/index.js",
+    "./promise/*.js": "./dist/promise/*.js",
     "./nanoid": "./dist/nanoid.js",
     "./semver": "./dist/semver.js",
     "./string": "./dist/string/index.js",
+    "./string/*.js": "./dist/string/*.js",
     "./types": "./dist/types.js",
     "./zod": "./dist/zod/index.js"
   },
@@ -42,7 +50,6 @@
     "!src/**/*.test.*",
     "!src/**/__snapshots__"
   ],
-  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "engines": {

package/src/browser/analytics.util.ts

@@ -1,4 +1,4 @@
-import { isServerSide } from '../index.js'
+import { isServerSide } from '../env.js'
 import { loadScript } from './script.util.js'
 
 declare global {

package/src/decorators/logMethod.decorator.ts

@@ -1,8 +1,8 @@
 import { _ms } from '../datetime/time.util.js'
-import { _assert } from '../error/index.js'
-import type { CommonLogger } from '../log/index.js'
-import { SimpleMovingAverage } from '../math/index.js'
-import { _stringify } from '../string/index.js'
+import { _assert } from '../error/assert.js'
+import type { CommonLogger } from '../log/commonLogger.js'
+import { SimpleMovingAverage } from '../math/sma.js'
+import { _stringify } from '../string/stringify.js'
 import { _getArgsSignature, _getMethodSignature } from './decorator.util.js'
 
 /**

package/src/decorators/retry.decorator.ts

@@ -1,5 +1,5 @@
-import type { PRetryOptions } from '../promise/index.js'
-import { pRetryFn } from '../promise/index.js'
+import type { PRetryOptions } from '../promise/pRetry.js'
+import { pRetryFn } from '../promise/pRetry.js'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Retry(opt: PRetryOptions = {}): MethodDecorator {

package/src/error/tryCatch.ts

@@ -1,5 +1,5 @@
-import { _since } from '../datetime/index.js'
-import type { CommonLogger } from '../log/index.js'
+import { _since } from '../datetime/time.util.js'
+import type { CommonLogger } from '../log/commonLogger.js'
 import type { AnyFunction, UnixTimestampMillis } from '../types.js'
 import { _anyToError } from './error.util.js'
 

package/src/index.ts

@@ -14,4 +14,5 @@ export * from './number/createDeterministicRandom.js'
 export * from './number/number.util.js'
 export * from './polyfill.js'
 export * from './unit/size.util.js'
+export type * from './validation/validation.js'
 export * from './web.js'

package/src/json-schema/jsonSchema.util.ts

@@ -1,4 +1,4 @@
-import { _uniq } from '../index.js'
+import { _uniq } from '../array/array.util.js'
 import { _filterNullishValues } from '../object/object.util.js'
 import type { AnyObject } from '../types.js'
 import type { JsonSchemaObject } from './jsonSchema.model.js'

package/src/json-schema/jsonSchemaBuilder.ts

@@ -1,26 +1,25 @@
 import { _uniq } from '../array/array.util.js'
-import { _deepCopy, _sortObject } from '../object/index.js'
+import { _deepCopy } from '../object/object.util.js'
+import { _sortObject } from '../object/sortObject.js'
 import type { AnyObject, BaseDBEntity } from '../types.js'
-import {
-  type JsonSchemaAllOf,
-  type JsonSchemaArray,
-  type JsonSchemaOneOf,
-  type JsonSchemaTuple,
-  mergeJsonSchemaObjects,
-} from './index.js'
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst.js'
 import type {
   JsonSchema,
+  JsonSchemaAllOf,
   JsonSchemaAny,
+  JsonSchemaArray,
   JsonSchemaBoolean,
   JsonSchemaConst,
   JsonSchemaEnum,
   JsonSchemaNull,
   JsonSchemaNumber,
   JsonSchemaObject,
+  JsonSchemaOneOf,
   JsonSchemaRef,
   JsonSchemaString,
+  JsonSchemaTuple,
 } from './jsonSchema.model.js'
+import { mergeJsonSchemaObjects } from './jsonSchema.util.js'
 
 /* eslint-disable id-blacklist, @typescript-eslint/explicit-module-boundary-types */
 

package/src/math/stack.util.ts

@@ -1,5 +1,5 @@
 import { _range } from '../array/range.js'
-import { _average, _percentile, _percentiles } from '../math/index.js'
+import { _average, _percentile, _percentiles } from './math.util.js'
 
 /**
  * Implements a "round-robin" Stack ("first-in last-out" aka FILO) with a limited size.

package/src/promise/pMap.ts

@@ -1,5 +1,5 @@
-import { ErrorMode } from '../error/index.js'
-import type { CommonLogger } from '../log/index.js'
+import { ErrorMode } from '../error/errorMode.js'
+import type { CommonLogger } from '../log/commonLogger.js'
 import { type AbortableAsyncMapper, END, SKIP } from '../types.js'
 
 export interface PMapOptions {

package/src/promise/pRetry.ts

@@ -1,6 +1,7 @@
-import { _since } from '../datetime/index.js'
-import { _errorDataAppend, type ErrorData } from '../error/index.js'
-import type { CommonLogger } from '../log/index.js'
+import { _since } from '../datetime/time.util.js'
+import type { ErrorData } from '../error/error.model.js'
+import { _errorDataAppend } from '../error/error.util.js'
+import type { CommonLogger } from '../log/commonLogger.js'
 import type { AnyFunction, UnixTimestampMillis } from '../types.js'
 import { pDelay } from './pDelay.js'
 import { pTimeout } from './pTimeout.js'

package/src/validation/validation.ts

@@ -0,0 +1,35 @@
+import type { AppError } from '../error/error.util.js'
+import type { ErrorDataTuple } from '../types.js'
+
+/**
+ * Item to be validated.
+ * Can be null or undefined, which allows validation function to produce an error,
+ * if undefined/null are not accepted. But they might be accepted too, it depends
+ * on the schema (implementation detail of the ValidationFunction).
+ *
+ * Function returns a tuple of [err, item].
+ * In case of error it will be [err, null].
+ * In case of success it is [null, item].
+ *
+ * ValidationFunction may mutate the input item or not,
+ * depending on the implementation.
+ *
+ * @experimental
+ */
+export type ValidationFunction<T, ERR extends AppError> = (
+  item: T | null | undefined,
+  opt?: ValidationFunctionOptions,
+) => ErrorDataTuple<T, ERR>
+
+export interface ValidationFunctionOptions {
+  /**
+   * E.g User
+   * Used for error message printing.
+   */
+  itemName?: string
+  /**
+   * E.g `12345678` (user id).
+   * Used for error message printing.
+   */
+  itemId?: string
+}

package/dist/log/index.d.ts

@@ -1 +0,0 @@
-export * from './commonLogger.js';

package/dist/log/index.js

@@ -1 +0,0 @@
-export * from './commonLogger.js';

package/src/log/index.ts

@@ -1 +0,0 @@
-export * from './commonLogger.js'