@naturalcycles/js-lib 14.109.0 → 14.110.0

package/src/index.ts

@@ -2,18 +2,14 @@ export * from './array/array.util'
 export * from './lazy'
 export * from './string/url.util'
 export * from './array/range'
-import {
-  PromiseDecoratorCfg,
-  PromiseDecoratorResp,
-  _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 { MemoCache, AsyncMemoCache } from './decorators/memo.util'
+export * from './decorators/memo.util'
 export * from './decorators/memoFn'
 export * from './decorators/memoFnAsync'
 export * from './decorators/retry.decorator'
@@ -21,46 +17,18 @@ export * from './decorators/timeout.decorator'
 export * from './error/app.error'
 export * from './error/assert'
 export * from './enum.util'
-import {
-  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 { TryCatchOptions, _TryCatch, _tryCatch } from './error/tryCatch'
+export * from './error/tryCatch'
 export * from './json-schema/from-data/generateJsonSchemaFromData'
 export * from './json-schema/jsonSchema.cnst'
-import {
-  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 {
-  jsonSchema,
-  JsonSchemaAnyBuilder,
-  JsonSchemaBuilder,
-} 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'
@@ -69,90 +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 { DeferredPromise, 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, PMapOptions } from './promise/pMap'
+export * from './promise/pMap'
 export * from './promise/pProps'
-import { pRetry, pRetryFn, PRetryOptions } from './promise/pRetry'
+export * from './promise/pRetry'
 export * from './promise/pState'
-import { pTimeout, pTimeoutFn, PTimeoutOptions } 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 { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny'
+export * from './string/stringifyAny'
 export * from './time/time.util'
 export * from './is.util'
-
-import {
-  Class,
-  ConditionalExcept,
-  ConditionalPick,
-  Merge,
-  Promisable,
-  ReadonlyDeep,
-  Simplify,
-} from './typeFest'
-import {
-  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 {
-  CommonLogLevel,
-  CommonLogFunction,
-  CommonLogger,
-  CommonLogWithLevelFunction,
-} from './log/commonLogger'
 export * from './log/commonLogger'
 export * from './string/safeJsonStringify'
-import { 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 {
-  LocalDateConfig,
-  LocalDateFormatter,
-  LocalDateUnit,
-  LocalDateUnitStrict,
-  Inclusiveness,
-} from './datetime/localDate'
-import {
-  LocalTimeConfig,
-  LocalTimeFormatter,
-  LocalTimeUnit,
-  LocalTimeComponents,
-  ISODayOfWeek,
-} from './datetime/localTime'
-import { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval'
-import { 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/is.util.ts

@@ -1,5 +1,5 @@
-import { Primitive } from './typeFest'
-import { AnyObject, FalsyValue, NullishValue } from './types'
+import type { Primitive } from './typeFest'
+import type { AnyObject, FalsyValue, NullishValue } from './types'
 
 type Nullish<T> = T extends NullishValue ? T : never
 type Truthy<T> = T extends FalsyValue ? never : T

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

@@ -1,4 +1,4 @@
-import {
+import type {
   JsonSchema,
   JsonSchemaArray,
   JsonSchemaBoolean,
@@ -8,10 +8,9 @@ import {
   JsonSchemaOneOf,
   JsonSchemaString,
   StringMap,
-  _stringMapEntries,
-  _uniq,
   AnyObject,
 } from '../..'
+import { _stringMapEntries, _uniq } from '../..'
 
 type PrimitiveType = 'undefined' | 'null' | 'boolean' | 'string' | 'number'
 type Type = PrimitiveType | 'array' | 'object'
@@ -21,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.cnst.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   JsonSchema,
   JsonSchemaAny,
   JsonSchemaNumber,

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

@@ -1,4 +1,4 @@
-import { AnyObject, StringMap } from '../types'
+import type { AnyObject, StringMap } from '../types'
 
 // eslint-disable-next-line unused-imports/no-unused-vars
 export type JsonSchema<T = unknown> =
@@ -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,13 +1,13 @@
-import { _uniq } from '../index'
+import { _uniq, AnyObject } from '../index'
 import { _filterNullishValues } from '../object/object.util'
-import { JsonSchemaObject } from './jsonSchema.model'
+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 function mergeJsonSchemaObjects<T1, T2>(
+export function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(
   s1: JsonSchemaObject<T1>,
   s2: JsonSchemaObject<T2>,
 ): JsonSchemaObject<T1 & T2> {

package/src/json-schema/jsonSchemaBuilder.ts

@@ -1,18 +1,16 @@
 import { _uniq } from '../array/array.util'
-import {
+import type {
   BaseDBEntity,
   JsonSchemaAllOf,
   JsonSchemaArray,
   JsonSchemaOneOf,
   JsonSchemaTuple,
-  mergeJsonSchemaObjects,
   SavedDBEntity,
-  _deepCopy,
-  _sortObject,
   AnyObject,
 } from '../index'
+import { mergeJsonSchemaObjects, _deepCopy, _sortObject } from '../index'
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst'
-import {
+import type {
   JsonSchema,
   JsonSchemaAny,
   JsonSchemaBoolean,

package/src/json-schema/jsonSchemas.ts

@@ -1,4 +1,4 @@
-import { BaseDBEntity, SavedDBEntity } from '../types'
+import type { BaseDBEntity, SavedDBEntity } from '../types'
 import { jsonSchema } from './jsonSchemaBuilder'
 
 export const baseDBEntityJsonSchema = jsonSchema.object<BaseDBEntity>({

package/src/lazy.ts

@@ -1,4 +1,4 @@
-import { AnyFunction, AnyObject } from './types'
+import type { AnyFunction, AnyObject } from './types'
 
 /**
  * const value = lazyValue(() => expensiveComputation())

package/src/object/object.util.ts

@@ -1,6 +1,6 @@
 import { _isEmpty, _isObject } from '../is.util'
-import { PropertyPath } from '../lodash.types'
-import { AnyObject, ObjectMapper, ObjectPredicate, StringMap, ValueOf } from '../types'
+import type { PropertyPath } from '../lodash.types'
+import type { AnyObject, ObjectMapper, ObjectPredicate, StringMap, ValueOf } from '../types'
 
 /**
  * Returns clone of `obj` with only `props` preserved.

package/src/object/sortObject.ts

@@ -1,4 +1,5 @@
-import { _omit, AnyObject } from '../index'
+import type { AnyObject } from '../index'
+import { _omit } from '../index'
 
 /**
  * Returns new object with keys sorder in the given order.

package/src/promise/pFilter.ts

@@ -1,4 +1,4 @@
-import { AsyncPredicate } from '../types'
+import type { AsyncPredicate } from '../types'
 
 export async function pFilter<T>(iterable: Iterable<T>, filterFn: AsyncPredicate<T>): Promise<T[]> {
   const items = [...iterable]

package/src/promise/pMap.ts

@@ -7,7 +7,8 @@ Improvements:
 - Compatible with pProps (that had typings issues)
  */
 
-import { AbortableAsyncMapper, END, ErrorMode, SKIP } from '..'
+import type { AbortableAsyncMapper } from '..'
+import { END, ErrorMode, SKIP } from '..'
 import { AggregatedError } from './AggregatedError'
 
 export interface PMapOptions {

package/src/promise/pQueue.ts

@@ -1,6 +1,7 @@
 import { ErrorMode } from '../error/errorMode'
-import { CommonLogger } from '../log/commonLogger'
-import { DeferredPromise, pDefer } from './pDefer'
+import type { CommonLogger } from '../log/commonLogger'
+import type { DeferredPromise } from './pDefer'
+import { pDefer } from './pDefer'
 
 export interface PQueueCfg {
   concurrency: number

package/src/promise/pRetry.ts

@@ -1,4 +1,5 @@
-import { _since, _stringifyAny, AnyFunction, AppError, CommonLogger, ErrorData } from '..'
+import type { AnyFunction, AppError, CommonLogger, ErrorData } from '..'
+import { _since, _stringifyAny } from '..'
 import { TimeoutError } from './pTimeout'
 
 export interface PRetryOptions {

package/src/promise/pTimeout.ts

@@ -1,6 +1,6 @@
 import { AppError } from '../error/app.error'
-import { ErrorData } from '../error/error.model'
-import { AnyFunction } from '../types'
+import type { ErrorData } from '../error/error.model'
+import type { AnyFunction } from '../types'
 
 export class TimeoutError extends AppError {}
 

package/src/seq/seq.ts

@@ -1,11 +1,10 @@
-import {
+import type {
   AbortableAsyncMapper,
   AbortableAsyncPredicate,
   AbortableMapper,
   AbortablePredicate,
-  END,
-  SKIP,
 } from '../types'
+import { END, SKIP } from '../types'
 
 /**
  * Inspired by Kotlin Sequences.

package/src/string/safeJsonStringify.ts

@@ -1,4 +1,4 @@
-import { Reviver } from '../types'
+import type { Reviver } from '../types'
 
 /**
  * JSON.stringify that avoids circular references, prints them as [Circular ~]

package/src/string/stringifyAny.ts

@@ -1,5 +1,5 @@
 import { _isErrorObject, _isHttpErrorObject, _isHttpErrorResponse } from '../error/error.util'
-import { Reviver } from '../types'
+import type { Reviver } from '../types'
 import { _jsonParseIfPossible } from './json.util'
 import { _safeJsonStringify } from './safeJsonStringify'
 

package/src/string/url.util.ts

@@ -1,4 +1,4 @@
-import { StringMap } from '../types'
+import type { StringMap } from '../types'
 
 /**
  * Parses `location.search` string (e.g `?a=1&b=2`) into a StringMap, e.g:

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 { 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']
 }
 
 /**