@naturalcycles/js-lib 14.109.1 → 14.111.0

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

@@ -17,8 +17,8 @@ export declare function _anyToError<ERROR_TYPE extends Error = Error>(o: any, er
  */
 export declare function _anyToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(o: any, opt?: StringifyAnyOptions): ErrorObject<DATA_TYPE>;
 export declare function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(e: AppError<DATA_TYPE> | Error, includeErrorStack?: boolean): ErrorObject<DATA_TYPE>;
-export declare function _errorObjectToAppError<DATA_TYPE>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE>;
-export declare function _errorObjectToError<DATA_TYPE, ERROR_TYPE extends Error>(o: ErrorObject<DATA_TYPE>, errorClass?: Class<ERROR_TYPE>): ERROR_TYPE;
+export declare function _errorObjectToAppError<DATA_TYPE extends ErrorData>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE>;
+export declare function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(o: ErrorObject<DATA_TYPE>, errorClass?: Class<ERROR_TYPE>): ERROR_TYPE;
 export declare function _isHttpErrorResponse(o: any): o is HttpErrorResponse;
 export declare function _isHttpErrorObject(o: any): o is ErrorObject<HttpErrorData>;
 /**

package/dist/index.d.ts

@@ -2,15 +2,14 @@ export * from './array/array.util';
 export * from './lazy';
 export * from './string/url.util';
 export * from './array/range';
-import type { PromiseDecoratorCfg, PromiseDecoratorResp } from './decorators/createPromiseDecorator';
-import { _createPromiseDecorator } from './decorators/createPromiseDecorator';
+export * from './decorators/createPromiseDecorator';
 export * from './decorators/debounce';
 export * from './decorators/debounce.decorator';
 export * from './decorators/decorator.util';
 export * from './decorators/logMethod.decorator';
 export * from './decorators/memo.decorator';
 export * from './decorators/asyncMemo.decorator';
-import type { MemoCache, AsyncMemoCache } from './decorators/memo.util';
+export * from './decorators/memo.util';
 export * from './decorators/memoFn';
 export * from './decorators/memoFnAsync';
 export * from './decorators/retry.decorator';
@@ -18,19 +17,18 @@ export * from './decorators/timeout.decorator';
 export * from './error/app.error';
 export * from './error/assert';
 export * from './enum.util';
-import type { Admin401ErrorData, Admin403ErrorData, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse } from './error/error.model';
+export * from './error/error.model';
 export * from './error/error.util';
-import { ErrorMode } from './error/errorMode';
+export * from './error/errorMode';
 export * from './error/http.error';
 export * from './error/try';
-import type { TryCatchOptions } from './error/tryCatch';
-import { _TryCatch, _tryCatch } from './error/tryCatch';
+export * from './error/tryCatch';
 export * from './json-schema/from-data/generateJsonSchemaFromData';
 export * from './json-schema/jsonSchema.cnst';
-import type { JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaAnyOf, JsonSchemaArray, JsonSchemaBoolean, JsonSchemaConst, JsonSchemaEnum, JsonSchemaNot, JsonSchemaNull, JsonSchemaNumber, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaOneOf, JsonSchemaRef, JsonSchemaString, JsonSchemaTuple } from './json-schema/jsonSchema.model';
+export * from './json-schema/jsonSchema.model';
 export * from './json-schema/jsonSchema.util';
-import type { JsonSchemaBuilder } from './json-schema/jsonSchemaBuilder';
-import { jsonSchema, JsonSchemaAnyBuilder } from './json-schema/jsonSchemaBuilder';
+export * from './json-schema/jsonSchemaBuilder';
+export * from './json-schema/jsonSchemaBuilder';
 export * from './math/math.util';
 export * from './math/sma';
 export * from './number/createDeterministicRandom';
@@ -39,39 +37,31 @@ export * from './object/deepEquals';
 export * from './object/object.util';
 export * from './object/sortObject';
 export * from './object/sortObjectDeep';
-import { AggregatedError } from './promise/AggregatedError';
-import type { DeferredPromise } from './promise/pDefer';
-import { pDefer } from './promise/pDefer';
+export * from './promise/AggregatedError';
+export * from './promise/pDefer';
 export * from './promise/pDelay';
 export * from './promise/pFilter';
 export * from './promise/pHang';
-import type { PMapOptions } from './promise/pMap';
-import { pMap } from './promise/pMap';
+export * from './promise/pMap';
 export * from './promise/pProps';
-import type { PRetryOptions } from './promise/pRetry';
-import { pRetry, pRetryFn } from './promise/pRetry';
+export * from './promise/pRetry';
 export * from './promise/pState';
-import type { PTimeoutOptions } from './promise/pTimeout';
-import { pTimeout, pTimeoutFn } from './promise/pTimeout';
+export * from './promise/pTimeout';
 export * from './string/case';
 export * from './string/json.util';
 export * from './string/string.util';
 export * from './string/readingTime';
 export * from './string/escape';
 export * from './string/pupa';
-import type { JsonStringifyFunction, StringifyAnyOptions } from './string/stringifyAny';
-import { _stringifyAny } from './string/stringifyAny';
+export * from './string/stringifyAny';
 export * from './time/time.util';
 export * from './is.util';
-import type { Class, ConditionalExcept, ConditionalPick, Merge, Promisable, ReadonlyDeep, Simplify } from './typeFest';
-import type { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, UnsavedId, BatchResult, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyEnum, NumberEnum, StringEnum, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestampNumber, UnixTimestampMillisNumber, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, NullishValue, FalsyValue } from './types';
+export * from './typeFest';
 export * from './types';
 export * from './unit/size.util';
 import { is } from './vendor/is';
-import type { CommonLogLevel, CommonLogFunction, CommonLogger, CommonLogWithLevelFunction } from './log/commonLogger';
 export * from './log/commonLogger';
 export * from './string/safeJsonStringify';
-import type { PQueueCfg } from './promise/pQueue';
 export * from './promise/pQueue';
 export * from './seq/seq';
 export * from './math/stack.util';
@@ -80,9 +70,8 @@ export * from './datetime/localDate';
 export * from './datetime/localTime';
 export * from './datetime/dateInterval';
 export * from './datetime/timeInterval';
-import type { LocalDateConfig, LocalDateFormatter, LocalDateUnit, LocalDateUnitStrict, Inclusiveness } from './datetime/localDate';
-import type { LocalTimeConfig, LocalTimeFormatter, LocalTimeUnit, LocalTimeComponents, ISODayOfWeek } from './datetime/localTime';
-import type { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval';
-import type { TimeIntervalConfig, TimeIntervalString } from './datetime/timeInterval';
-export type { DateIntervalConfig, DateIntervalString, TimeIntervalConfig, TimeIntervalString, LocalDateConfig, LocalDateFormatter, LocalDateUnit, LocalDateUnitStrict, Inclusiveness, LocalTimeConfig, LocalTimeFormatter, LocalTimeUnit, ISODayOfWeek, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyEnum, NumberEnum, StringEnum, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, Reviver, FalsyValue, NullishValue, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestampNumber, UnixTimestampMillisNumber, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, UnsavedId, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
-export { is, _createPromiseDecorator, pMap, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, };
+export * from './datetime/localDate';
+export * from './datetime/localTime';
+export * from './datetime/dateInterval';
+export * from './datetime/timeInterval';
+export { is };

package/dist/index.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonSchemaAnyBuilder = exports.jsonSchema = exports._stringifyAny = exports._TryCatch = exports._tryCatch = exports.pTimeoutFn = exports.pTimeout = exports.pRetryFn = exports.pRetry = exports.AggregatedError = exports.pDefer = exports.ErrorMode = exports.pMap = exports._createPromiseDecorator = exports.is = void 0;
+exports.is = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./array/array.util"), exports);
 tslib_1.__exportStar(require("./lazy"), exports);
 tslib_1.__exportStar(require("./string/url.util"), exports);
 tslib_1.__exportStar(require("./array/range"), exports);
-const createPromiseDecorator_1 = require("./decorators/createPromiseDecorator");
-Object.defineProperty(exports, "_createPromiseDecorator", { enumerable: true, get: function () { return createPromiseDecorator_1._createPromiseDecorator; } });
+tslib_1.__exportStar(require("./decorators/createPromiseDecorator"), exports);
 tslib_1.__exportStar(require("./decorators/debounce"), exports);
 tslib_1.__exportStar(require("./decorators/debounce.decorator"), exports);
 tslib_1.__exportStar(require("./decorators/decorator.util"), exports);
 tslib_1.__exportStar(require("./decorators/logMethod.decorator"), exports);
 tslib_1.__exportStar(require("./decorators/memo.decorator"), exports);
 tslib_1.__exportStar(require("./decorators/asyncMemo.decorator"), exports);
+tslib_1.__exportStar(require("./decorators/memo.util"), exports);
 tslib_1.__exportStar(require("./decorators/memoFn"), exports);
 tslib_1.__exportStar(require("./decorators/memoFnAsync"), exports);
 tslib_1.__exportStar(require("./decorators/retry.decorator"), exports);
@@ -21,20 +21,18 @@ tslib_1.__exportStar(require("./decorators/timeout.decorator"), exports);
 tslib_1.__exportStar(require("./error/app.error"), exports);
 tslib_1.__exportStar(require("./error/assert"), exports);
 tslib_1.__exportStar(require("./enum.util"), exports);
+tslib_1.__exportStar(require("./error/error.model"), exports);
 tslib_1.__exportStar(require("./error/error.util"), exports);
-const errorMode_1 = require("./error/errorMode");
-Object.defineProperty(exports, "ErrorMode", { enumerable: true, get: function () { return errorMode_1.ErrorMode; } });
+tslib_1.__exportStar(require("./error/errorMode"), exports);
 tslib_1.__exportStar(require("./error/http.error"), exports);
 tslib_1.__exportStar(require("./error/try"), exports);
-const tryCatch_1 = require("./error/tryCatch");
-Object.defineProperty(exports, "_TryCatch", { enumerable: true, get: function () { return tryCatch_1._TryCatch; } });
-Object.defineProperty(exports, "_tryCatch", { enumerable: true, get: function () { return tryCatch_1._tryCatch; } });
+tslib_1.__exportStar(require("./error/tryCatch"), exports);
 tslib_1.__exportStar(require("./json-schema/from-data/generateJsonSchemaFromData"), exports);
 tslib_1.__exportStar(require("./json-schema/jsonSchema.cnst"), exports);
+tslib_1.__exportStar(require("./json-schema/jsonSchema.model"), exports);
 tslib_1.__exportStar(require("./json-schema/jsonSchema.util"), exports);
-const jsonSchemaBuilder_1 = require("./json-schema/jsonSchemaBuilder");
-Object.defineProperty(exports, "jsonSchema", { enumerable: true, get: function () { return jsonSchemaBuilder_1.jsonSchema; } });
-Object.defineProperty(exports, "JsonSchemaAnyBuilder", { enumerable: true, get: function () { return jsonSchemaBuilder_1.JsonSchemaAnyBuilder; } });
+tslib_1.__exportStar(require("./json-schema/jsonSchemaBuilder"), exports);
+tslib_1.__exportStar(require("./json-schema/jsonSchemaBuilder"), exports);
 tslib_1.__exportStar(require("./math/math.util"), exports);
 tslib_1.__exportStar(require("./math/sma"), exports);
 tslib_1.__exportStar(require("./number/createDeterministicRandom"), exports);
@@ -43,33 +41,26 @@ tslib_1.__exportStar(require("./object/deepEquals"), exports);
 tslib_1.__exportStar(require("./object/object.util"), exports);
 tslib_1.__exportStar(require("./object/sortObject"), exports);
 tslib_1.__exportStar(require("./object/sortObjectDeep"), exports);
-const AggregatedError_1 = require("./promise/AggregatedError");
-Object.defineProperty(exports, "AggregatedError", { enumerable: true, get: function () { return AggregatedError_1.AggregatedError; } });
-const pDefer_1 = require("./promise/pDefer");
-Object.defineProperty(exports, "pDefer", { enumerable: true, get: function () { return pDefer_1.pDefer; } });
+tslib_1.__exportStar(require("./promise/AggregatedError"), exports);
+tslib_1.__exportStar(require("./promise/pDefer"), exports);
 tslib_1.__exportStar(require("./promise/pDelay"), exports);
 tslib_1.__exportStar(require("./promise/pFilter"), exports);
 tslib_1.__exportStar(require("./promise/pHang"), exports);
-const pMap_1 = require("./promise/pMap");
-Object.defineProperty(exports, "pMap", { enumerable: true, get: function () { return pMap_1.pMap; } });
+tslib_1.__exportStar(require("./promise/pMap"), exports);
 tslib_1.__exportStar(require("./promise/pProps"), exports);
-const pRetry_1 = require("./promise/pRetry");
-Object.defineProperty(exports, "pRetry", { enumerable: true, get: function () { return pRetry_1.pRetry; } });
-Object.defineProperty(exports, "pRetryFn", { enumerable: true, get: function () { return pRetry_1.pRetryFn; } });
+tslib_1.__exportStar(require("./promise/pRetry"), exports);
 tslib_1.__exportStar(require("./promise/pState"), exports);
-const pTimeout_1 = require("./promise/pTimeout");
-Object.defineProperty(exports, "pTimeout", { enumerable: true, get: function () { return pTimeout_1.pTimeout; } });
-Object.defineProperty(exports, "pTimeoutFn", { enumerable: true, get: function () { return pTimeout_1.pTimeoutFn; } });
+tslib_1.__exportStar(require("./promise/pTimeout"), exports);
 tslib_1.__exportStar(require("./string/case"), exports);
 tslib_1.__exportStar(require("./string/json.util"), exports);
 tslib_1.__exportStar(require("./string/string.util"), exports);
 tslib_1.__exportStar(require("./string/readingTime"), exports);
 tslib_1.__exportStar(require("./string/escape"), exports);
 tslib_1.__exportStar(require("./string/pupa"), exports);
-const stringifyAny_1 = require("./string/stringifyAny");
-Object.defineProperty(exports, "_stringifyAny", { enumerable: true, get: function () { return stringifyAny_1._stringifyAny; } });
+tslib_1.__exportStar(require("./string/stringifyAny"), exports);
 tslib_1.__exportStar(require("./time/time.util"), exports);
 tslib_1.__exportStar(require("./is.util"), exports);
+tslib_1.__exportStar(require("./typeFest"), exports);
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./unit/size.util"), exports);
 const is_1 = require("./vendor/is");
@@ -84,3 +75,7 @@ tslib_1.__exportStar(require("./datetime/localDate"), exports);
 tslib_1.__exportStar(require("./datetime/localTime"), exports);
 tslib_1.__exportStar(require("./datetime/dateInterval"), exports);
 tslib_1.__exportStar(require("./datetime/timeInterval"), exports);
+tslib_1.__exportStar(require("./datetime/localDate"), exports);
+tslib_1.__exportStar(require("./datetime/localTime"), exports);
+tslib_1.__exportStar(require("./datetime/dateInterval"), exports);
+tslib_1.__exportStar(require("./datetime/timeInterval"), exports);

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

@@ -4,4 +4,4 @@ import type { JsonSchemaObject, AnyObject } from '../..';
  *
  * `additionalProperties` is set to `true`, cause it's safer.
  */
-export declare function generateJsonSchemaFromData<T = unknown>(rows: AnyObject[]): JsonSchemaObject<T>;
+export declare function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(rows: AnyObject[]): JsonSchemaObject<T>;

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

@@ -1,5 +1,5 @@
 import type { AnyObject, StringMap } from '../types';
-export declare 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> | JsonSchemaArray<T> | JsonSchemaTuple<T>;
+export declare 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 | JsonSchemaArray<T> | JsonSchemaTuple<T>;
 export interface JsonSchemaAny<T = unknown> {
     $schema?: string;
     $id?: string;

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

@@ -1,7 +1,8 @@
+import { AnyObject } from '../index';
 import type { JsonSchemaObject } from './jsonSchema.model';
 /**
  * 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, T2>(s1: JsonSchemaObject<T1>, s2: JsonSchemaObject<T2>): JsonSchemaObject<T1 & T2>;
+export declare function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(s1: JsonSchemaObject<T1>, s2: JsonSchemaObject<T2>): JsonSchemaObject<T1 & T2>;

package/dist/object/object.util.d.ts

@@ -135,19 +135,19 @@ export declare function _invert<T extends AnyObject>(o: T): {
 };
 export declare function _invertMap<K, V>(m: ReadonlyMap<K, V>): Map<V, K>;
 /**
- * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
- * in its place.
+ * Gets the property value at path of object.
  *
- * @param obj The object to query.
- * @param path The path of the property to get.
- * @param def The value returned if the resolved value is undefined.
- * @return Returns the resolved value.
+ * @example
+ * const obj = {a: 'a', b: 'b', c: { cc: 'cc' }}
+ * _get(obj, 'a') // 'a'
+ * _get(obj, 'c.cc') // 'cc'
+ * _get(obj, 'c[cc]') // 'cc'
+ * _get(obj, 'unknown.path') // undefined
  */
-export declare function _get<T extends AnyObject>(obj?: T, path?: string, def?: any): any;
+export declare function _get<T extends AnyObject>(obj?: T, path?: string): unknown;
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
- * missing index properties while objects are created for all other missing properties. Use _.setWith to
- * customize path creation.
+ * missing index properties while objects are created for all other missing properties.
  *
  * @param obj The object to modify.
  * @param path The path of the property to set.
@@ -156,7 +156,7 @@ export declare function _get<T extends AnyObject>(obj?: T, path?: string, def?:
  *
  * Based on: https://stackoverflow.com/a/54733755/4919972
  */
-export declare function _set<IN extends AnyObject, OUT = IN>(obj: IN, path: PropertyPath, value?: any): OUT;
+export declare function _set<T extends AnyObject>(obj: T, path: PropertyPath, value: any): T;
 /**
  * Checks if `path` is a direct property of `object` (not null, not undefined).
  *
@@ -181,4 +181,4 @@ export declare function _set<IN extends AnyObject, OUT = IN>(obj: IN, path: Prop
  * _.has(other, 'a');
  * // => false
  */
-export declare function _has<T extends AnyObject>(obj: T, path?: string): boolean;
+export declare function _has<T extends AnyObject>(obj: T, path: string): boolean;

package/dist/object/object.util.js

@@ -286,26 +286,25 @@ function _invertMap(m) {
 }
 exports._invertMap = _invertMap;
 /**
- * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
- * in its place.
+ * Gets the property value at path of object.
  *
- * @param obj The object to query.
- * @param path The path of the property to get.
- * @param def The value returned if the resolved value is undefined.
- * @return Returns the resolved value.
+ * @example
+ * const obj = {a: 'a', b: 'b', c: { cc: 'cc' }}
+ * _get(obj, 'a') // 'a'
+ * _get(obj, 'c.cc') // 'cc'
+ * _get(obj, 'c[cc]') // 'cc'
+ * _get(obj, 'unknown.path') // undefined
  */
-function _get(obj = {}, path = '', def) {
-    const res = path
+function _get(obj = {}, path = '') {
+    return path
         .replace(/\[([^\]]+)]/g, '.$1')
         .split('.')
-        .reduce((o, p) => o[p], obj);
-    return res === undefined ? def : res;
+        .reduce((o, p) => o?.[p], obj);
 }
 exports._get = _get;
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
- * missing index properties while objects are created for all other missing properties. Use _.setWith to
- * customize path creation.
+ * missing index properties while objects are created for all other missing properties.
  *
  * @param obj The object to modify.
  * @param path The path of the property to set.
@@ -336,7 +335,7 @@ function _set(obj, path, value) {
                     ? [] // Yes: assign a new array object
                     : {}), // No: assign a new plain object
     obj)[path[path.length - 1]] = value; // Finally assign the value to the last key
-    return obj; // Return the top-level object to allow chaining
+    return obj; // allow chaining
 }
 exports._set = _set;
 /**

package/dist/typeFest.d.ts

@@ -10,6 +10,19 @@ export declare type Primitive = null | undefined | string | number | boolean | s
 export declare type Simplify<T> = {
     [KeyType in keyof T]: T[KeyType];
 };
+/**
+ Returns a boolean for whether the two given types are equal.
+ @link https://github.com/microsoft/TypeScript/issues/27024#issuecomment-421529650
+ @link https://stackoverflow.com/questions/68961864/how-does-the-equals-work-in-typescript/68963796#68963796
+ */
+export declare type IsEqual<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? true : false;
+/**
+ * Filter out keys from an object.
+ * Returns `never` if `Exclude` is strictly equal to `Key`.
+ * Returns `never` if `Key` extends `Exclude`.
+ * Returns `Key` otherwise.
+ */
+declare type Filter<KeyType, ExcludeType> = IsEqual<KeyType, ExcludeType> extends true ? never : KeyType extends ExcludeType ? never : KeyType;
 /**
  Create a type from an object type without certain keys.
 
@@ -33,7 +46,9 @@ export declare type Simplify<T> = {
 
  @category Utilities
  */
-export declare type Except<ObjectType, KeysType extends keyof ObjectType> = Pick<ObjectType, Exclude<keyof ObjectType, KeysType>>;
+export declare type Except<ObjectType, KeysType extends keyof ObjectType> = {
+    [KeyType in keyof ObjectType as Filter<KeyType, KeysType>]: ObjectType[KeyType];
+};
 /**
  Convert `object`s, `Map`s, `Set`s, and `Array`s and all of their keys/elements into immutable structures recursively.
 
@@ -82,7 +97,27 @@ interface ReadonlySetDeep<ItemType> extends ReadonlySet<ReadonlyDeep<ItemType>>
 declare type ReadonlyObjectDeep<ObjectType extends object> = {
     readonly [KeyType in keyof ObjectType]: ReadonlyDeep<ObjectType[KeyType]>;
 };
-declare type Merge_<FirstType, SecondType> = Except<FirstType, Extract<keyof FirstType, keyof SecondType>> & SecondType;
+/**
+ * Pick only index signatures from the given object type, leaving out all explicitly defined properties.
+ * This is the counterpart of `OmitIndexSignature`.
+ * When you use a type that will iterate through an object that has indexed keys and explicitly defined keys you end up with a type where only the indexed keys are kept. This is because `keyof` of an indexed type always returns `string | number | symbol`, because every key is possible in that object. With this type, you can save the indexed keys and reinject them later, like in the second example below.
+ */
+export declare type PickIndexSignature<ObjectType> = {
+    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? KeyType : never]: ObjectType[KeyType];
+};
+/**
+ * Omit any index signatures from the given object type, leaving only explicitly defined properties.
+ * This is the counterpart of `PickIndexSignature`.
+ * Use-cases:
+ * - Remove overly permissive signatures from third-party types.
+ *
+ * This type was taken from this [StackOverflow answer](https://stackoverflow.com/a/68261113/420747).
+ * It relies on the fact that an empty object (`{}`) is assignable to an object with just an index signature, like `Record<string, unknown>`, but not to an object with explicitly defined keys, like `Record<'foo' | 'bar', unknown>`.
+ * (The actual value type, `unknown`, is irrelevant and could be any type. Only the key type matters.)
+ */
+export declare type OmitIndexSignature<ObjectType> = {
+    [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
+};
 /**
  Merge two types into a new type. Keys of the second type overrides keys of the first type.
 
@@ -104,7 +139,9 @@ declare type Merge_<FirstType, SecondType> = Except<FirstType, Extract<keyof Fir
 
  @category Utilities
  */
-export declare type Merge<FirstType, SecondType> = Simplify<Merge_<FirstType, SecondType>>;
+export declare type Merge<Destination, Source> = {
+    [Key in keyof OmitIndexSignature<Destination & Source>]: Key extends keyof Source ? Source[Key] : Key extends keyof Destination ? Destination[Key] : never;
+} & PickIndexSignature<Destination & Source>;
 /**
  Create a type that represents either the value or the value wrapped in `PromiseLike`.
 

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { Except, Merge, Promisable } from './typeFest';
+import type { Promisable } from './typeFest';
 /**
  * Map from String to String (or <T>).
  *
@@ -7,14 +7,6 @@ import type { Except, Merge, Promisable } from './typeFest';
 export interface StringMap<T = string> {
     [k: string | number]: T | undefined;
 }
-/**
- * Object to be passed to pProps to resolve all promises into properties.
- *
- * Alternative: Record<String, Promise<any>>
- */
-export interface PromiseMap {
-    [prop: string]: Promise<any> | undefined;
-}
 /**
  * Convenience shorthand for `Record<string, any>`.
  * Because `object` type is not safe/recommended to be used (e.g discouraged by eslint-typescript due to: https://github.com/microsoft/TypeScript/issues/21732)
@@ -56,10 +48,10 @@ export interface SavedDBEntity<ID extends string | number = string> {
  * When it's known to be saved - `SavedDBEntity` interface can be used instead.
  */
 export declare type BaseDBEntity<ID extends string | number = string> = Partial<SavedDBEntity<ID>>;
-export declare type Saved<T extends Partial<ObjectWithId>> = Merge<T, SavedDBEntity<Exclude<T['id'], undefined>>>;
-export declare type Unsaved<T extends Partial<ObjectWithId>> = Merge<T, BaseDBEntity<Exclude<T['id'], undefined>>>;
-export declare type UnsavedId<T extends Partial<ObjectWithId>> = Except<T, 'id'> & {
-    id: Exclude<T['id'], undefined>;
+export declare type Saved<T extends Partial<ObjectWithId>> = Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity<NonNullable<T['id']>>;
+export declare type Unsaved<T extends Partial<ObjectWithId>> = Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity<NonNullable<T['id']>>;
+export declare type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {
+    id?: T['id'];
 };
 /**
  * Convenience type shorthand.

package/dist-esm/index.js

@@ -2,13 +2,14 @@ export * from './array/array.util';
 export * from './lazy';
 export * from './string/url.util';
 export * from './array/range';
-import { _createPromiseDecorator } from './decorators/createPromiseDecorator';
+export * from './decorators/createPromiseDecorator';
 export * from './decorators/debounce';
 export * from './decorators/debounce.decorator';
 export * from './decorators/decorator.util';
 export * from './decorators/logMethod.decorator';
 export * from './decorators/memo.decorator';
 export * from './decorators/asyncMemo.decorator';
+export * from './decorators/memo.util';
 export * from './decorators/memoFn';
 export * from './decorators/memoFnAsync';
 export * from './decorators/retry.decorator';
@@ -16,15 +17,18 @@ export * from './decorators/timeout.decorator';
 export * from './error/app.error';
 export * from './error/assert';
 export * from './enum.util';
+export * from './error/error.model';
 export * from './error/error.util';
-import { ErrorMode } from './error/errorMode';
+export * from './error/errorMode';
 export * from './error/http.error';
 export * from './error/try';
-import { _TryCatch, _tryCatch } from './error/tryCatch';
+export * from './error/tryCatch';
 export * from './json-schema/from-data/generateJsonSchemaFromData';
 export * from './json-schema/jsonSchema.cnst';
+export * from './json-schema/jsonSchema.model';
 export * from './json-schema/jsonSchema.util';
-import { jsonSchema, JsonSchemaAnyBuilder } from './json-schema/jsonSchemaBuilder';
+export * from './json-schema/jsonSchemaBuilder';
+export * from './json-schema/jsonSchemaBuilder';
 export * from './math/math.util';
 export * from './math/sma';
 export * from './number/createDeterministicRandom';
@@ -33,25 +37,26 @@ export * from './object/deepEquals';
 export * from './object/object.util';
 export * from './object/sortObject';
 export * from './object/sortObjectDeep';
-import { AggregatedError } from './promise/AggregatedError';
-import { pDefer } from './promise/pDefer';
+export * from './promise/AggregatedError';
+export * from './promise/pDefer';
 export * from './promise/pDelay';
 export * from './promise/pFilter';
 export * from './promise/pHang';
-import { pMap } from './promise/pMap';
+export * from './promise/pMap';
 export * from './promise/pProps';
-import { pRetry, pRetryFn } from './promise/pRetry';
+export * from './promise/pRetry';
 export * from './promise/pState';
-import { pTimeout, pTimeoutFn } from './promise/pTimeout';
+export * from './promise/pTimeout';
 export * from './string/case';
 export * from './string/json.util';
 export * from './string/string.util';
 export * from './string/readingTime';
 export * from './string/escape';
 export * from './string/pupa';
-import { _stringifyAny } from './string/stringifyAny';
+export * from './string/stringifyAny';
 export * from './time/time.util';
 export * from './is.util';
+export * from './typeFest';
 export * from './types';
 export * from './unit/size.util';
 import { is } from './vendor/is';
@@ -65,4 +70,8 @@ export * from './datetime/localDate';
 export * from './datetime/localTime';
 export * from './datetime/dateInterval';
 export * from './datetime/timeInterval';
-export { is, _createPromiseDecorator, pMap, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, };
+export * from './datetime/localDate';
+export * from './datetime/localTime';
+export * from './datetime/dateInterval';
+export * from './datetime/timeInterval';
+export { is };

package/dist-esm/object/object.util.js

@@ -263,25 +263,24 @@ export function _invertMap(m) {
     return inv;
 }
 /**
- * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
- * in its place.
+ * Gets the property value at path of object.
  *
- * @param obj The object to query.
- * @param path The path of the property to get.
- * @param def The value returned if the resolved value is undefined.
- * @return Returns the resolved value.
+ * @example
+ * const obj = {a: 'a', b: 'b', c: { cc: 'cc' }}
+ * _get(obj, 'a') // 'a'
+ * _get(obj, 'c.cc') // 'cc'
+ * _get(obj, 'c[cc]') // 'cc'
+ * _get(obj, 'unknown.path') // undefined
  */
-export function _get(obj = {}, path = '', def) {
-    const res = path
+export function _get(obj = {}, path = '') {
+    return path
         .replace(/\[([^\]]+)]/g, '.$1')
         .split('.')
-        .reduce((o, p) => o[p], obj);
-    return res === undefined ? def : res;
+        .reduce((o, p) => o === null || o === void 0 ? void 0 : o[p], obj);
 }
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
- * missing index properties while objects are created for all other missing properties. Use _.setWith to
- * customize path creation.
+ * missing index properties while objects are created for all other missing properties.
  *
  * @param obj The object to modify.
  * @param path The path of the property to set.
@@ -312,7 +311,7 @@ export function _set(obj, path, value) {
                     ? [] // Yes: assign a new array object
                     : {}), // No: assign a new plain object
     obj)[path[path.length - 1]] = value; // Finally assign the value to the last key
-    return obj; // Return the top-level object to allow chaining
+    return obj; // allow chaining
 }
 /**
  * Checks if `path` is a direct property of `object` (not null, not undefined).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.109.1",
+  "version": "14.111.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -17,7 +17,7 @@
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/node": "^18.0.0",
     "expect-type": "^0.13.0",
-    "jest": "^28.0.3",
+    "jest": "^29.0.0",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",

package/src/error/error.util.ts

@@ -87,11 +87,13 @@ export function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(
   return obj
 }
 
-export function _errorObjectToAppError<DATA_TYPE>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE> {
+export function _errorObjectToAppError<DATA_TYPE extends ErrorData>(
+  o: ErrorObject<DATA_TYPE>,
+): AppError<DATA_TYPE> {
   return _errorObjectToError(o, AppError)
 }
 
-export function _errorObjectToError<DATA_TYPE, ERROR_TYPE extends Error>(
+export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(
   o: ErrorObject<DATA_TYPE>,
   errorClass: Class<ERROR_TYPE> = Error as any,
 ): ERROR_TYPE {

package/src/index.ts

@@ -2,15 +2,14 @@ export * from './array/array.util'
 export * from './lazy'
 export * from './string/url.util'
 export * from './array/range'
-import type { PromiseDecoratorCfg, PromiseDecoratorResp } from './decorators/createPromiseDecorator'
-import { _createPromiseDecorator } from './decorators/createPromiseDecorator'
+export * from './decorators/createPromiseDecorator'
 export * from './decorators/debounce'
 export * from './decorators/debounce.decorator'
 export * from './decorators/decorator.util'
 export * from './decorators/logMethod.decorator'
 export * from './decorators/memo.decorator'
 export * from './decorators/asyncMemo.decorator'
-import type { MemoCache, AsyncMemoCache } from './decorators/memo.util'
+export * from './decorators/memo.util'
 export * from './decorators/memoFn'
 export * from './decorators/memoFnAsync'
 export * from './decorators/retry.decorator'
@@ -18,44 +17,18 @@ export * from './decorators/timeout.decorator'
 export * from './error/app.error'
 export * from './error/assert'
 export * from './enum.util'
-import type {
-  Admin401ErrorData,
-  Admin403ErrorData,
-  ErrorData,
-  ErrorObject,
-  HttpErrorData,
-  HttpErrorResponse,
-} from './error/error.model'
+export * from './error/error.model'
 export * from './error/error.util'
-import { ErrorMode } from './error/errorMode'
+export * from './error/errorMode'
 export * from './error/http.error'
 export * from './error/try'
-import type { TryCatchOptions } from './error/tryCatch'
-import { _TryCatch, _tryCatch } from './error/tryCatch'
+export * from './error/tryCatch'
 export * from './json-schema/from-data/generateJsonSchemaFromData'
 export * from './json-schema/jsonSchema.cnst'
-import type {
-  JsonSchema,
-  JsonSchemaAllOf,
-  JsonSchemaAny,
-  JsonSchemaAnyOf,
-  JsonSchemaArray,
-  JsonSchemaBoolean,
-  JsonSchemaConst,
-  JsonSchemaEnum,
-  JsonSchemaNot,
-  JsonSchemaNull,
-  JsonSchemaNumber,
-  JsonSchemaRootObject,
-  JsonSchemaObject,
-  JsonSchemaOneOf,
-  JsonSchemaRef,
-  JsonSchemaString,
-  JsonSchemaTuple,
-} from './json-schema/jsonSchema.model'
+export * from './json-schema/jsonSchema.model'
 export * from './json-schema/jsonSchema.util'
-import type { JsonSchemaBuilder } from './json-schema/jsonSchemaBuilder'
-import { jsonSchema, JsonSchemaAnyBuilder } from './json-schema/jsonSchemaBuilder'
+export * from './json-schema/jsonSchemaBuilder'
+export * from './json-schema/jsonSchemaBuilder'
 export * from './math/math.util'
 export * from './math/sma'
 export * from './number/createDeterministicRandom'
@@ -64,95 +37,31 @@ export * from './object/deepEquals'
 export * from './object/object.util'
 export * from './object/sortObject'
 export * from './object/sortObjectDeep'
-import { AggregatedError } from './promise/AggregatedError'
-import type { DeferredPromise } from './promise/pDefer'
-import { pDefer } from './promise/pDefer'
+export * from './promise/AggregatedError'
+export * from './promise/pDefer'
 export * from './promise/pDelay'
 export * from './promise/pFilter'
 export * from './promise/pHang'
-import type { PMapOptions } from './promise/pMap'
-import { pMap } from './promise/pMap'
+export * from './promise/pMap'
 export * from './promise/pProps'
-import type { PRetryOptions } from './promise/pRetry'
-import { pRetry, pRetryFn } from './promise/pRetry'
+export * from './promise/pRetry'
 export * from './promise/pState'
-import type { PTimeoutOptions } from './promise/pTimeout'
-import { pTimeout, pTimeoutFn } from './promise/pTimeout'
+export * from './promise/pTimeout'
 export * from './string/case'
 export * from './string/json.util'
 export * from './string/string.util'
 export * from './string/readingTime'
 export * from './string/escape'
 export * from './string/pupa'
-import type { JsonStringifyFunction, StringifyAnyOptions } from './string/stringifyAny'
-import { _stringifyAny } from './string/stringifyAny'
+export * from './string/stringifyAny'
 export * from './time/time.util'
 export * from './is.util'
-
-import type {
-  Class,
-  ConditionalExcept,
-  ConditionalPick,
-  Merge,
-  Promisable,
-  ReadonlyDeep,
-  Simplify,
-} from './typeFest'
-import type {
-  AsyncMapper,
-  AsyncPredicate,
-  BaseDBEntity,
-  CreatedUpdated,
-  CreatedUpdatedId,
-  ObjectWithId,
-  AnyObjectWithId,
-  Saved,
-  Unsaved,
-  UnsavedId,
-  BatchResult,
-  InstanceId,
-  IsoDate,
-  IsoDateString,
-  IsoDateTimeString,
-  KeyValueTuple,
-  Mapper,
-  ObjectMapper,
-  ObjectPredicate,
-  Predicate,
-  PromiseMap,
-  AnyObject,
-  AnyEnum,
-  NumberEnum,
-  StringEnum,
-  AnyFunction,
-  Reviver,
-  SavedDBEntity,
-  StringMap,
-  UnixTimestampNumber,
-  UnixTimestampMillisNumber,
-  UnixTimestamp,
-  Integer,
-  ValueOf,
-  ValuesOf,
-  AbortableMapper,
-  AbortableAsyncPredicate,
-  AbortableAsyncMapper,
-  AbortablePredicate,
-  NullishValue,
-  FalsyValue,
-} from './types'
+export * from './typeFest'
 export * from './types'
 export * from './unit/size.util'
 import { is } from './vendor/is'
-import type {
-  CommonLogLevel,
-  CommonLogFunction,
-  CommonLogger,
-  CommonLogWithLevelFunction,
-} from './log/commonLogger'
 export * from './log/commonLogger'
 export * from './string/safeJsonStringify'
-import type { PQueueCfg } from './promise/pQueue'
 export * from './promise/pQueue'
 export * from './seq/seq'
 export * from './math/stack.util'
@@ -161,142 +70,9 @@ export * from './datetime/localDate'
 export * from './datetime/localTime'
 export * from './datetime/dateInterval'
 export * from './datetime/timeInterval'
-import type {
-  LocalDateConfig,
-  LocalDateFormatter,
-  LocalDateUnit,
-  LocalDateUnitStrict,
-  Inclusiveness,
-} from './datetime/localDate'
-import type {
-  LocalTimeConfig,
-  LocalTimeFormatter,
-  LocalTimeUnit,
-  LocalTimeComponents,
-  ISODayOfWeek,
-} from './datetime/localTime'
-import type { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval'
-import type { TimeIntervalConfig, TimeIntervalString } from './datetime/timeInterval'
-
-export type {
-  DateIntervalConfig,
-  DateIntervalString,
-  TimeIntervalConfig,
-  TimeIntervalString,
-  LocalDateConfig,
-  LocalDateFormatter,
-  LocalDateUnit,
-  LocalDateUnitStrict,
-  Inclusiveness,
-  LocalTimeConfig,
-  LocalTimeFormatter,
-  LocalTimeUnit,
-  ISODayOfWeek,
-  LocalTimeComponents,
-  AbortableMapper,
-  AbortablePredicate,
-  AbortableAsyncPredicate,
-  AbortableAsyncMapper,
-  PQueueCfg,
-  MemoCache,
-  AsyncMemoCache,
-  PromiseDecoratorCfg,
-  PromiseDecoratorResp,
-  ErrorData,
-  ErrorObject,
-  HttpErrorData,
-  HttpErrorResponse,
-  Admin401ErrorData,
-  Admin403ErrorData,
-  StringMap,
-  PromiseMap,
-  AnyObject,
-  AnyEnum,
-  NumberEnum,
-  StringEnum,
-  AnyFunction,
-  ValuesOf,
-  ValueOf,
-  KeyValueTuple,
-  ObjectMapper,
-  ObjectPredicate,
-  InstanceId,
-  IsoDate,
-  IsoDateString,
-  IsoDateTimeString,
-  Reviver,
-  FalsyValue,
-  NullishValue,
-  PMapOptions,
-  Mapper,
-  AsyncMapper,
-  Predicate,
-  AsyncPredicate,
-  BatchResult,
-  DeferredPromise,
-  PRetryOptions,
-  PTimeoutOptions,
-  TryCatchOptions,
-  StringifyAnyOptions,
-  JsonStringifyFunction,
-  Merge,
-  ReadonlyDeep,
-  Promisable,
-  Simplify,
-  ConditionalPick,
-  ConditionalExcept,
-  Class,
-  UnixTimestampNumber,
-  UnixTimestampMillisNumber,
-  UnixTimestamp,
-  Integer,
-  BaseDBEntity,
-  SavedDBEntity,
-  Saved,
-  Unsaved,
-  UnsavedId,
-  CreatedUpdated,
-  CreatedUpdatedId,
-  ObjectWithId,
-  AnyObjectWithId,
-  JsonSchema,
-  JsonSchemaAny,
-  JsonSchemaOneOf,
-  JsonSchemaAllOf,
-  JsonSchemaAnyOf,
-  JsonSchemaNot,
-  JsonSchemaRef,
-  JsonSchemaConst,
-  JsonSchemaEnum,
-  JsonSchemaString,
-  JsonSchemaNumber,
-  JsonSchemaBoolean,
-  JsonSchemaNull,
-  JsonSchemaRootObject,
-  JsonSchemaObject,
-  JsonSchemaArray,
-  JsonSchemaTuple,
-  JsonSchemaBuilder,
-  CommonLogLevel,
-  CommonLogWithLevelFunction,
-  CommonLogFunction,
-  CommonLogger,
-}
+export * from './datetime/localDate'
+export * from './datetime/localTime'
+export * from './datetime/dateInterval'
+export * from './datetime/timeInterval'
 
-export {
-  is,
-  _createPromiseDecorator,
-  pMap,
-  ErrorMode,
-  pDefer,
-  AggregatedError,
-  pRetry,
-  pRetryFn,
-  pTimeout,
-  pTimeoutFn,
-  _tryCatch,
-  _TryCatch,
-  _stringifyAny,
-  jsonSchema,
-  JsonSchemaAnyBuilder,
-}
+export { is }

package/src/json-schema/from-data/generateJsonSchemaFromData.ts

@@ -20,7 +20,9 @@ type Type = PrimitiveType | 'array' | 'object'
  *
  * `additionalProperties` is set to `true`, cause it's safer.
  */
-export function generateJsonSchemaFromData<T = unknown>(rows: AnyObject[]): JsonSchemaObject<T> {
+export function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(
+  rows: AnyObject[],
+): JsonSchemaObject<T> {
   return objectToJsonSchema(rows as any) as JsonSchemaObject<T>
 }
 

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

@@ -14,7 +14,7 @@ export type JsonSchema<T = unknown> =
   | JsonSchemaNumber
   | JsonSchemaBoolean
   | JsonSchemaNull
-  | JsonSchemaObject<T>
+  | JsonSchemaObject
   | JsonSchemaArray<T>
   | JsonSchemaTuple<T>
 

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

@@ -1,4 +1,4 @@
-import { _uniq } from '../index'
+import { _uniq, AnyObject } from '../index'
 import { _filterNullishValues } from '../object/object.util'
 import type { JsonSchemaObject } from './jsonSchema.model'
 
@@ -7,7 +7,7 @@ import type { JsonSchemaObject } from './jsonSchema.model'
  * Does not mutate s2.
  * API similar to Object.assign(s1, s2)
  */
-export function mergeJsonSchemaObjects<T1, T2>(
+export function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(
   s1: JsonSchemaObject<T1>,
   s2: JsonSchemaObject<T2>,
 ): JsonSchemaObject<T1 & T2> {

package/src/object/object.util.ts

@@ -311,27 +311,25 @@ export function _invertMap<K, V>(m: ReadonlyMap<K, V>): Map<V, K> {
 }
 
 /**
- * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
- * in its place.
+ * Gets the property value at path of object.
  *
- * @param obj The object to query.
- * @param path The path of the property to get.
- * @param def The value returned if the resolved value is undefined.
- * @return Returns the resolved value.
+ * @example
+ * const obj = {a: 'a', b: 'b', c: { cc: 'cc' }}
+ * _get(obj, 'a') // 'a'
+ * _get(obj, 'c.cc') // 'cc'
+ * _get(obj, 'c[cc]') // 'cc'
+ * _get(obj, 'unknown.path') // undefined
  */
-export function _get<T extends AnyObject>(obj = {} as T, path = '', def?: any): any {
-  const res = path
+export function _get<T extends AnyObject>(obj = {} as T, path = ''): unknown {
+  return path
     .replace(/\[([^\]]+)]/g, '.$1')
     .split('.')
-    .reduce((o, p) => o[p], obj)
-
-  return res === undefined ? def : res
+    .reduce((o, p) => o?.[p], obj)
 }
 
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
- * missing index properties while objects are created for all other missing properties. Use _.setWith to
- * customize path creation.
+ * missing index properties while objects are created for all other missing properties.
  *
  * @param obj The object to modify.
  * @param path The path of the property to set.
@@ -340,11 +338,7 @@ export function _get<T extends AnyObject>(obj = {} as T, path = '', def?: any):
  *
  * Based on: https://stackoverflow.com/a/54733755/4919972
  */
-export function _set<IN extends AnyObject, OUT = IN>(
-  obj: IN,
-  path: PropertyPath,
-  value?: any,
-): OUT {
+export function _set<T extends AnyObject>(obj: T, path: PropertyPath, value: any): T {
   if (!obj || Object(obj) !== obj || !path) return obj as any // When obj is not an object
 
   // If not yet an array, get the keys from the string-path
@@ -373,7 +367,7 @@ export function _set<IN extends AnyObject, OUT = IN>(
     obj,
   )[path[path.length - 1]!] = value // Finally assign the value to the last key
 
-  return obj as any // Return the top-level object to allow chaining
+  return obj // allow chaining
 }
 
 /**
@@ -400,7 +394,7 @@ export function _set<IN extends AnyObject, OUT = IN>(
  * _.has(other, 'a');
  * // => false
  */
-export function _has<T extends AnyObject>(obj: T, path?: string): boolean {
+export function _has<T extends AnyObject>(obj: T, path: string): boolean {
   const v = _get(obj, path)
   return v !== undefined && v !== null
 }

package/src/typeFest.ts

@@ -12,6 +12,27 @@ export type Primitive = null | undefined | string | number | boolean | symbol |
  */
 export type Simplify<T> = { [KeyType in keyof T]: T[KeyType] }
 
+/**
+ Returns a boolean for whether the two given types are equal.
+ @link https://github.com/microsoft/TypeScript/issues/27024#issuecomment-421529650
+ @link https://stackoverflow.com/questions/68961864/how-does-the-equals-work-in-typescript/68963796#68963796
+ */
+export type IsEqual<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2
+  ? true
+  : false
+
+/**
+ * Filter out keys from an object.
+ * Returns `never` if `Exclude` is strictly equal to `Key`.
+ * Returns `never` if `Key` extends `Exclude`.
+ * Returns `Key` otherwise.
+ */
+type Filter<KeyType, ExcludeType> = IsEqual<KeyType, ExcludeType> extends true
+  ? never
+  : KeyType extends ExcludeType
+  ? never
+  : KeyType
+
 /**
  Create a type from an object type without certain keys.
 
@@ -35,10 +56,9 @@ export type Simplify<T> = { [KeyType in keyof T]: T[KeyType] }
 
  @category Utilities
  */
-export type Except<ObjectType, KeysType extends keyof ObjectType> = Pick<
-  ObjectType,
-  Exclude<keyof ObjectType, KeysType>
->
+export type Except<ObjectType, KeysType extends keyof ObjectType> = {
+  [KeyType in keyof ObjectType as Filter<KeyType, KeysType>]: ObjectType[KeyType]
+}
 
 /**
  Convert `object`s, `Map`s, `Set`s, and `Array`s and all of their keys/elements into immutable structures recursively.
@@ -99,8 +119,32 @@ type ReadonlyObjectDeep<ObjectType extends object> = {
   readonly [KeyType in keyof ObjectType]: ReadonlyDeep<ObjectType[KeyType]>
 }
 
-type Merge_<FirstType, SecondType> = Except<FirstType, Extract<keyof FirstType, keyof SecondType>> &
-  SecondType
+/**
+ * Pick only index signatures from the given object type, leaving out all explicitly defined properties.
+ * This is the counterpart of `OmitIndexSignature`.
+ * When you use a type that will iterate through an object that has indexed keys and explicitly defined keys you end up with a type where only the indexed keys are kept. This is because `keyof` of an indexed type always returns `string | number | symbol`, because every key is possible in that object. With this type, you can save the indexed keys and reinject them later, like in the second example below.
+ */
+export type PickIndexSignature<ObjectType> = {
+  [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown>
+    ? KeyType
+    : never]: ObjectType[KeyType]
+}
+
+/**
+ * Omit any index signatures from the given object type, leaving only explicitly defined properties.
+ * This is the counterpart of `PickIndexSignature`.
+ * Use-cases:
+ * - Remove overly permissive signatures from third-party types.
+ *
+ * This type was taken from this [StackOverflow answer](https://stackoverflow.com/a/68261113/420747).
+ * It relies on the fact that an empty object (`{}`) is assignable to an object with just an index signature, like `Record<string, unknown>`, but not to an object with explicitly defined keys, like `Record<'foo' | 'bar', unknown>`.
+ * (The actual value type, `unknown`, is irrelevant and could be any type. Only the key type matters.)
+ */
+export type OmitIndexSignature<ObjectType> = {
+  [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown>
+    ? never
+    : KeyType]: ObjectType[KeyType]
+}
 
 /**
  Merge two types into a new type. Keys of the second type overrides keys of the first type.
@@ -123,7 +167,13 @@ type Merge_<FirstType, SecondType> = Except<FirstType, Extract<keyof FirstType,
 
  @category Utilities
  */
-export type Merge<FirstType, SecondType> = Simplify<Merge_<FirstType, SecondType>>
+export type Merge<Destination, Source> = {
+  [Key in keyof OmitIndexSignature<Destination & Source>]: Key extends keyof Source
+    ? Source[Key]
+    : Key extends keyof Destination
+    ? Destination[Key]
+    : never
+} & PickIndexSignature<Destination & Source>
 
 /**
  Create a type that represents either the value or the value wrapped in `PromiseLike`.

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { Except, Merge, Promisable } from './typeFest'
+import type { Promisable } from './typeFest'
 
 /**
  * Map from String to String (or <T>).
@@ -9,15 +9,6 @@ export interface StringMap<T = string> {
   [k: string | number]: T | undefined
 }
 
-/**
- * Object to be passed to pProps to resolve all promises into properties.
- *
- * Alternative: Record<String, Promise<any>>
- */
-export interface PromiseMap {
-  [prop: string]: Promise<any> | undefined
-}
-
 /**
  * Convenience shorthand for `Record<string, any>`.
  * Because `object` type is not safe/recommended to be used (e.g discouraged by eslint-typescript due to: https://github.com/microsoft/TypeScript/issues/21732)
@@ -71,18 +62,15 @@ export interface SavedDBEntity<ID extends string | number = string> {
  */
 export type BaseDBEntity<ID extends string | number = string> = Partial<SavedDBEntity<ID>>
 
-export type Saved<T extends Partial<ObjectWithId>> = Merge<
-  T,
-  SavedDBEntity<Exclude<T['id'], undefined>>
->
+// export type Saved<T extends Partial<ObjectWithId>> = Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity<NonNullable<T['id']>>
+export type Saved<T extends Partial<ObjectWithId>> = Omit<T, 'id' | 'created' | 'updated'> &
+  SavedDBEntity<NonNullable<T['id']>>
 
-export type Unsaved<T extends Partial<ObjectWithId>> = Merge<
-  T,
-  BaseDBEntity<Exclude<T['id'], undefined>>
->
+export type Unsaved<T extends Partial<ObjectWithId>> = Omit<T, 'id' | 'created' | 'updated'> &
+  BaseDBEntity<NonNullable<T['id']>>
 
-export type UnsavedId<T extends Partial<ObjectWithId>> = Except<T, 'id'> & {
-  id: Exclude<T['id'], undefined>
+export type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {
+  id?: T['id']
 }
 
 /**