@naturalcycles/js-lib 14.112.0 → 14.113.1

package/dist/types.d.ts

@@ -48,8 +48,8 @@ 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>> = 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 Saved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & SavedDBEntity<NonNullable<T['id']>> : T;
+export declare type Unsaved<T extends Partial<ObjectWithId>> = T extends AnyObject ? Omit<T, 'id' | 'created' | 'updated'> & BaseDBEntity<NonNullable<T['id']>> : T;
 export declare type UnsavedId<T extends Partial<ObjectWithId>> = Omit<T, 'id'> & {
     id?: T['id'];
 };
@@ -196,3 +196,7 @@ export declare type FalsyValue = false | '' | 0 | null | undefined;
  * }
  */
 export declare function _typeCast<T>(v: any): asserts v is T;
+/**
+ * Type-safe Object.assign that checks that part is indeed a Partial<T>
+ */
+export declare const _objectAssign: <T extends AnyObject>(target: T, part: Partial<T>) => T;

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._typeCast = exports._objectKeys = exports._stringMapEntries = exports._stringMapValues = exports._passNothingPredicate = exports._passthroughPredicate = exports._noop = exports._passUndefinedMapper = exports._passthroughMapper = exports.SKIP = exports.END = void 0;
+exports._objectAssign = exports._typeCast = exports._objectKeys = exports._stringMapEntries = exports._stringMapValues = exports._passNothingPredicate = exports._passthroughPredicate = exports._noop = exports._passUndefinedMapper = exports._passthroughMapper = exports.SKIP = exports.END = void 0;
 /**
  * Symbol to indicate END of Sequence.
  */
@@ -50,3 +50,7 @@ exports._objectKeys = Object.keys;
  */
 function _typeCast(v) { }
 exports._typeCast = _typeCast;
+/**
+ * Type-safe Object.assign that checks that part is indeed a Partial<T>
+ */
+exports._objectAssign = Object.assign;

package/dist-esm/types.js

@@ -41,3 +41,7 @@ export const _objectKeys = Object.keys;
  * }
  */
 export function _typeCast(v) { }
+/**
+ * Type-safe Object.assign that checks that part is indeed a Partial<T>
+ */
+export const _objectAssign = Object.assign;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.112.0",
+  "version": "14.113.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -16,7 +16,6 @@
     "@naturalcycles/nodejs-lib": "^12.33.4",
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/node": "^18.0.0",
-    "expect-type": "^0.14.2",
     "jest": "^29.0.0",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",

package/src/types.ts

@@ -62,12 +62,13 @@ 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>> = 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 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>> = Omit<T, 'id' | 'created' | 'updated'> &
-  BaseDBEntity<NonNullable<T['id']>>
+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'> & {
   id?: T['id']
@@ -260,3 +261,11 @@ export type FalsyValue = false | '' | 0 | null | undefined
  * }
  */
 export function _typeCast<T>(v: any): asserts v is T {}
+
+/**
+ * Type-safe Object.assign that checks that part is indeed a Partial<T>
+ */
+export const _objectAssign = Object.assign as <T extends AnyObject>(
+  target: T,
+  part: Partial<T>,
+) => T