@naturalcycles/js-lib 14.161.2 → 14.161.4

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

@@ -1,3 +1,3 @@
 import type { BaseDBEntity, SavedDBEntity } from '../types';
-export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<BaseDBEntity<string>>;
-export declare const savedDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<SavedDBEntity<string>>;
+export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<BaseDBEntity>;
+export declare const savedDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<SavedDBEntity>;

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

@@ -50,7 +50,7 @@ export declare function _filterObject<T extends AnyObject>(obj: T, predicate: Ob
  *
  * To skip some key-value pairs - use _mapObject instead.
  */
-export declare function _mapValues<T extends AnyObject>(obj: T, mapper: ObjectMapper<T, any>, mutate?: boolean): unknown;
+export declare function _mapValues<OUT = unknown, IN extends AnyObject = AnyObject>(obj: IN, mapper: ObjectMapper<IN, any>, mutate?: boolean): OUT;
 /**
  * _.mapKeys({ 'a': 1, 'b': 2 }, (key, value) => key + value)
  * // => { 'a1': 1, 'b2': 2 }
@@ -59,7 +59,7 @@ export declare function _mapValues<T extends AnyObject>(obj: T, mapper: ObjectMa
  *
  * To skip some key-value pairs - use _mapObject instead.
  */
-export declare function _mapKeys<T extends AnyObject>(obj: T, mapper: ObjectMapper<T, string>): Record<string, T[keyof T]>;
+export declare function _mapKeys<T extends AnyObject>(obj: T, mapper: ObjectMapper<T, string>): T;
 /**
  * Maps object through predicate - a function that receives (k, v, obj)
  * k - key
@@ -76,7 +76,7 @@ export declare function _mapKeys<T extends AnyObject>(obj: T, mapper: ObjectMapp
  *
  * Non-string keys are passed via String(...)
  */
-export declare function _mapObject<T extends AnyObject>(obj: T, mapper: ObjectMapper<T, KeyValueTuple<string, any> | typeof SKIP>): unknown;
+export declare function _mapObject<OUT = unknown, IN extends AnyObject = AnyObject>(obj: IN, mapper: ObjectMapper<IN, KeyValueTuple<string, any> | typeof SKIP>): OUT;
 export declare function _findKeyByValue<T extends AnyObject>(obj: T, v: ValueOf<T>): keyof T | undefined;
 export declare function _objectNullValuesToUndefined<T extends AnyObject>(obj: T, mutate?: boolean): T;
 /**

package/dist/types.d.ts

@@ -15,22 +15,22 @@ export type AnyObject = Record<string, any>;
 export type AnyEnum = NumberEnum;
 export type NumberEnum = Record<string, number | string>;
 export type StringEnum = Record<string, string>;
-export interface CreatedUpdated {
+export type CreatedUpdated = {
     created: number;
     updated: number;
-}
+};
 export interface CreatedUpdatedId<ID extends string | number = string | number> extends CreatedUpdated {
     id: ID;
 }
-export interface ObjectWithId<ID extends string | number = string | number> {
+export type ObjectWithId<ID extends string | number = string | number> = {
     id: ID;
-}
+};
 export interface AnyObjectWithId<ID extends string | number = string | number> extends AnyObject, ObjectWithId<ID> {
 }
 /**
  * Base interface for any Entity that was saved to DB.
  */
-export interface SavedDBEntity<ID extends string | number = string> {
+export type SavedDBEntity<ID extends string | number = string> = {
     id: ID;
     /**
      * unixTimestamp of when the entity was first created (in the DB).
@@ -40,14 +40,14 @@ export interface SavedDBEntity<ID extends string | number = string> {
      * unixTimestamp of when the entity was last updated (in the DB).
      */
     updated: UnixTimestampNumber;
-}
+};
 /**
  * Base interface for any Entity that can be saved to DB.
  * This interface fits when entity was NOT YET saved to DB,
  * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
  * When it's known to be saved - `SavedDBEntity` interface can be used instead.
  */
-export interface BaseDBEntity<ID extends string | number = string> {
+export type BaseDBEntity<ID extends string | number = string> = {
     id?: ID;
     /**
      * unixTimestamp of when the entity was first created (in the DB).
@@ -57,7 +57,7 @@ export interface BaseDBEntity<ID extends string | number = string> {
      * unixTimestamp of when the entity was last updated (in the DB).
      */
     updated?: UnixTimestampNumber;
-}
+};
 export type Saved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity<NonNullable<T['id']>> : T;
 export type Unsaved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity<NonNullable<T['id']>> : T;
 export type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.161.2",
+  "version": "14.161.4",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/define.ts

@@ -121,7 +121,7 @@ export function _defineProps<T extends AnyObject>(
       enumerable: true,
       // value: obj[k], // existing value is already kept by default
       ...pd,
-    })) as PropertyDescriptorMap,
+    })),
   )
 }
 
@@ -137,6 +137,6 @@ export function _defineNonNullishProps<T extends AnyObject>(
     _mapObject(props, (k, pd) => {
       if (pd.value === null || pd.value === undefined) return SKIP
       return [k as string, pd]
-    }) as any,
+    }),
   )
 }

package/src/object/object.util.ts

@@ -117,18 +117,18 @@ export function _filterObject<T extends AnyObject>(
  *
  * To skip some key-value pairs - use _mapObject instead.
  */
-export function _mapValues<T extends AnyObject>(
-  obj: T,
-  mapper: ObjectMapper<T, any>,
+export function _mapValues<OUT = unknown, IN extends AnyObject = AnyObject>(
+  obj: IN,
+  mapper: ObjectMapper<IN, any>,
   mutate = false,
-): unknown {
+): OUT {
   return _objectEntries(obj).reduce(
     (map, [k, v]) => {
       map[k] = mapper(k, v, obj)
       return map
     },
-    mutate ? obj : ({} as T),
-  )
+    mutate ? obj : ({} as IN),
+  ) as any
 }
 
 /**
@@ -139,17 +139,11 @@ export function _mapValues<T extends AnyObject>(
  *
  * To skip some key-value pairs - use _mapObject instead.
  */
-export function _mapKeys<T extends AnyObject>(
-  obj: T,
-  mapper: ObjectMapper<T, string>,
-): Record<string, T[keyof T]> {
-  return _objectEntries(obj).reduce(
-    (map, [k, v]) => {
-      map[mapper(k, v, obj)] = v
-      return map
-    },
-    {} as Record<string, T[keyof T]>,
-  )
+export function _mapKeys<T extends AnyObject>(obj: T, mapper: ObjectMapper<T, string>): T {
+  return _objectEntries(obj).reduce((map, [k, v]) => {
+    map[mapper(k, v, obj)] = v
+    return map
+  }, {} as AnyObject) as T
 }
 
 /**
@@ -168,17 +162,17 @@ export function _mapKeys<T extends AnyObject>(
  *
  * Non-string keys are passed via String(...)
  */
-export function _mapObject<T extends AnyObject>(
-  obj: T,
-  mapper: ObjectMapper<T, KeyValueTuple<string, any> | typeof SKIP>,
-): unknown {
+export function _mapObject<OUT = unknown, IN extends AnyObject = AnyObject>(
+  obj: IN,
+  mapper: ObjectMapper<IN, KeyValueTuple<string, any> | typeof SKIP>,
+): OUT {
   return Object.entries(obj).reduce((map, [k, v]) => {
     const r = mapper(k, v, obj)
     if (r !== SKIP) {
       map[r[0]] = r[1]
     }
     return map
-  }, {} as AnyObject)
+  }, {} as AnyObject) as OUT
 }
 
 export function _findKeyByValue<T extends AnyObject>(obj: T, v: ValueOf<T>): keyof T | undefined {
@@ -186,7 +180,7 @@ export function _findKeyByValue<T extends AnyObject>(obj: T, v: ValueOf<T>): key
 }
 
 export function _objectNullValuesToUndefined<T extends AnyObject>(obj: T, mutate = false): T {
-  return _mapValues(obj, (_k, v) => (v === null ? undefined : v), mutate) as T
+  return _mapValues(obj, (_k, v) => (v === null ? undefined : v), mutate)
 }
 
 /**

package/src/types.ts

@@ -19,7 +19,8 @@ export type AnyEnum = NumberEnum
 export type NumberEnum = Record<string, number | string>
 export type StringEnum = Record<string, string>
 
-export interface CreatedUpdated {
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type CreatedUpdated = {
   created: number
   updated: number
 }
@@ -29,7 +30,8 @@ export interface CreatedUpdatedId<ID extends string | number = string | number>
   id: ID
 }
 
-export interface ObjectWithId<ID extends string | number = string | number> {
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type ObjectWithId<ID extends string | number = string | number> = {
   id: ID
 }
 
@@ -40,7 +42,8 @@ export interface AnyObjectWithId<ID extends string | number = string | number>
 /**
  * Base interface for any Entity that was saved to DB.
  */
-export interface SavedDBEntity<ID extends string | number = string> {
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type SavedDBEntity<ID extends string | number = string> = {
   id: ID
 
   /**
@@ -60,7 +63,8 @@ export interface SavedDBEntity<ID extends string | number = string> {
  * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
  * When it's known to be saved - `SavedDBEntity` interface can be used instead.
  */
-export interface BaseDBEntity<ID extends string | number = string> {
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type BaseDBEntity<ID extends string | number = string> = {
   id?: ID
 
   /**