@naturalcycles/js-lib 14.98.0 → 14.98.3

package/dist/datetime/localDate.d.ts

@@ -1,4 +1,4 @@
-import { IsoDateString, UnixTimestampNumber } from '../types';
+import { IsoDateString, IsoDateTimeString, UnixTimestampNumber } from '../types';
 import { LocalTime } from './localTime';
 export declare type LocalDateUnit = 'year' | 'month' | 'day';
 export declare type Inclusiveness = '()' | '[]' | '[)' | '(]';
@@ -80,6 +80,10 @@ export declare class LocalDate {
     toDate(): Date;
     toLocalTime(): LocalTime;
     toISODate(): IsoDateString;
+    /**
+     * Returns e.g: `1984-06-21T17:56:21`
+     */
+    toISODateTime(): IsoDateTimeString;
     toString(): IsoDateString;
     toStringCompact(): string;
     unix(): UnixTimestampNumber;

package/dist/datetime/localDate.js

@@ -334,6 +334,12 @@ class LocalDate {
     toISODate() {
         return this.toString();
     }
+    /**
+     * Returns e.g: `1984-06-21T17:56:21`
+     */
+    toISODateTime() {
+        return this.toString() + 'T00:00:00';
+    }
     toString() {
         return [
             String(this.$year).padStart(4, '0'),

package/dist/datetime/localTime.d.ts

@@ -83,7 +83,7 @@ export declare class LocalTime {
     toLocalDate(): LocalDate;
     toPretty(seconds?: boolean): IsoDateTimeString;
     /**
-     * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
+     * Returns e.g: `1984-06-21T17:56:21`
      */
     toISODateTime(): IsoDateTimeString;
     /**

package/dist/datetime/localTime.js

@@ -219,8 +219,9 @@ class LocalTime {
         if (unit === 'second')
             return this;
         const d = mutate ? this.$date : new Date(this.$date);
+        d.setMilliseconds(0);
+        d.setSeconds(0);
         /* eslint-disable @typescript-eslint/no-unused-expressions */
-        this.utcMode ? d.setUTCSeconds(0) : d.setSeconds(0);
         if (unit !== 'minute') {
             this.utcMode ? d.setUTCMinutes(0) : d.setMinutes(0);
             if (unit !== 'hour') {
@@ -371,7 +372,7 @@ class LocalTime {
         //   .join(' ')
     }
     /**
-     * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
+     * Returns e.g: `1984-06-21T17:56:21`
      */
     toISODateTime() {
         return this.$date.toISOString().slice(0, 19);

package/dist/index.d.ts

@@ -51,7 +51,7 @@ export * from './string/string.util';
 import { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny';
 export * from './time/time.util';
 import { Class, ConditionalExcept, ConditionalPick, Merge, Promisable, ReadonlyDeep, Simplify } from './typeFest';
-import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, BatchResult, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestampNumber, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
+import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, UnsavedId, BatchResult, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestampNumber, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
 export * from './unit/size.util';
 import { is } from './vendor/is';
 import { CommonLogLevel, CommonLogFunction, CommonLogger, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, CommonLogWithLevelFunction, commonLoggerCreate } from './log/commonLogger';
@@ -68,5 +68,5 @@ import { LocalDateConfig, LocalDateUnit, Inclusiveness } from './datetime/localD
 import { LocalTimeConfig, LocalTimeUnit, LocalTimeComponents } from './datetime/localTime';
 import { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval';
 import { TimeIntervalConfig, TimeIntervalString } from './datetime/timeInterval';
-export type { DateIntervalConfig, DateIntervalString, TimeIntervalConfig, TimeIntervalString, LocalDateConfig, LocalDateUnit, Inclusiveness, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestampNumber, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, 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 type { DateIntervalConfig, DateIntervalString, TimeIntervalConfig, TimeIntervalString, LocalDateConfig, LocalDateUnit, Inclusiveness, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestampNumber, 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, _stringMapValues, _stringMapEntries, _objectKeys, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, PQueue, END, SKIP, };

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Merge, Promisable } from './typeFest';
+import { Except, Merge, Promisable } from './typeFest';
 /**
  * Map from String to String (or <T>).
  *
@@ -24,14 +24,40 @@ export interface CreatedUpdated {
     created: number;
     updated: number;
 }
-export interface CreatedUpdatedId<ID extends string | number = string> extends CreatedUpdated {
+export interface CreatedUpdatedId<ID extends string | number = string | number> extends CreatedUpdated {
     id: ID;
 }
-export interface ObjectWithId<ID extends string | number = string> {
+export interface ObjectWithId<ID extends string | number = string | number> {
     id: ID;
 }
-export interface AnyObjectWithId<ID extends string | number = string> extends AnyObject, ObjectWithId<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> {
+    id: ID;
+    /**
+     * unixTimestamp of when the entity was first created (in the DB).
+     */
+    created: UnixTimestampNumber;
+    /**
+     * 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 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>;
+};
 /**
  * Convenience type shorthand.
  * Because `Function` type is discouraged by eslint.
@@ -136,29 +162,6 @@ export declare type UnixTimestamp = number;
  * Same as `number`, but with semantic meaning that it's an Integer.
  */
 export declare type Integer = number;
-/**
- * Base interface for any Entity that was saved to DB.
- */
-export interface SavedDBEntity<ID extends string | number = string> {
-    id: ID;
-    /**
-     * unixTimestamp of when the entity was first created (in the DB).
-     */
-    created: UnixTimestampNumber;
-    /**
-     * 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 declare type BaseDBEntity<ID extends string | number = string> = Partial<SavedDBEntity<ID>>;
-export declare type Saved<E, ID extends string | number = string> = Merge<E, SavedDBEntity<ID>>;
-export declare type Unsaved<E, ID extends string | number = string> = Merge<E, BaseDBEntity<ID>>;
 /**
  * Named type for JSON.parse / JSON.stringify second argument
  */

package/dist-esm/datetime/localDate.js

@@ -331,6 +331,12 @@ export class LocalDate {
     toISODate() {
         return this.toString();
     }
+    /**
+     * Returns e.g: `1984-06-21T17:56:21`
+     */
+    toISODateTime() {
+        return this.toString() + 'T00:00:00';
+    }
     toString() {
         return [
             String(this.$year).padStart(4, '0'),

package/dist-esm/datetime/localTime.js

@@ -216,8 +216,9 @@ export class LocalTime {
         if (unit === 'second')
             return this;
         const d = mutate ? this.$date : new Date(this.$date);
+        d.setMilliseconds(0);
+        d.setSeconds(0);
         /* eslint-disable @typescript-eslint/no-unused-expressions */
-        this.utcMode ? d.setUTCSeconds(0) : d.setSeconds(0);
         if (unit !== 'minute') {
             this.utcMode ? d.setUTCMinutes(0) : d.setMinutes(0);
             if (unit !== 'hour') {
@@ -368,7 +369,7 @@ export class LocalTime {
         //   .join(' ')
     }
     /**
-     * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
+     * Returns e.g: `1984-06-21T17:56:21`
      */
     toISODateTime() {
         return this.$date.toISOString().slice(0, 19);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.98.0",
+  "version": "14.98.3",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -16,7 +16,7 @@
     "@naturalcycles/nodejs-lib": "^12.33.4",
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/node": "^17.0.4",
-    "jest": "^27.0.1",
+    "jest": "^28.0.3",
     "patch-package": "^6.2.1",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",

package/src/datetime/localDate.ts

@@ -1,5 +1,5 @@
 import { _assert } from '../error/assert'
-import { IsoDateString, UnixTimestampNumber } from '../types'
+import { IsoDateString, IsoDateTimeString, UnixTimestampNumber } from '../types'
 import { LocalTime } from './localTime'
 
 export type LocalDateUnit = 'year' | 'month' | 'day'
@@ -400,6 +400,13 @@ export class LocalDate {
     return this.toString()
   }
 
+  /**
+   * Returns e.g: `1984-06-21T17:56:21`
+   */
+  toISODateTime(): IsoDateTimeString {
+    return this.toString() + 'T00:00:00'
+  }
+
   toString(): IsoDateString {
     return [
       String(this.$year).padStart(4, '0'),

package/src/datetime/localTime.ts

@@ -267,9 +267,10 @@ export class LocalTime {
     if (unit === 'second') return this
 
     const d = mutate ? this.$date : new Date(this.$date)
+    d.setMilliseconds(0)
+    d.setSeconds(0)
 
     /* eslint-disable @typescript-eslint/no-unused-expressions */
-    this.utcMode ? d.setUTCSeconds(0) : d.setSeconds(0)
     if (unit !== 'minute') {
       this.utcMode ? d.setUTCMinutes(0) : d.setMinutes(0)
       if (unit !== 'hour') {
@@ -458,7 +459,7 @@ export class LocalTime {
   }
 
   /**
-   * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
+   * Returns e.g: `1984-06-21T17:56:21`
    */
   toISODateTime(): IsoDateTimeString {
     return this.$date.toISOString().slice(0, 19)

package/src/index.ts

@@ -102,6 +102,7 @@ import {
   AnyObjectWithId,
   Saved,
   Unsaved,
+  UnsavedId,
   BatchResult,
   InstanceId,
   IsoDate,
@@ -232,6 +233,7 @@ export type {
   SavedDBEntity,
   Saved,
   Unsaved,
+  UnsavedId,
   CreatedUpdated,
   CreatedUpdatedId,
   ObjectWithId,

package/src/promise/pRetry.ts

@@ -169,7 +169,7 @@ export async function pRetry<T>(
 
         const r = await fn(attempt)
 
-        clearTimeout(timer!)
+        clearTimeout(timer)
 
         if (logSuccess) {
           logger.log(`${fname} attempt #${attempt} succeeded in ${_since(started)}`)
@@ -177,7 +177,7 @@ export async function pRetry<T>(
 
         resolve(r)
       } catch (err) {
-        clearTimeout(timer!)
+        clearTimeout(timer)
 
         if (logFailures) {
           logger.warn(

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Merge, Promisable } from './typeFest'
+import { Except, Merge, Promisable } from './typeFest'
 
 /**
  * Map from String to String (or <T>).
@@ -29,18 +29,58 @@ export interface CreatedUpdated {
   updated: number
 }
 
-export interface CreatedUpdatedId<ID extends string | number = string> extends CreatedUpdated {
+export interface CreatedUpdatedId<ID extends string | number = string | number>
+  extends CreatedUpdated {
   id: ID
 }
 
-export interface ObjectWithId<ID extends string | number = string> {
+export interface ObjectWithId<ID extends string | number = string | number> {
   id: ID
 }
 
-export interface AnyObjectWithId<ID extends string | number = string>
+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> {
+  id: ID
+
+  /**
+   * unixTimestamp of when the entity was first created (in the DB).
+   */
+  created: UnixTimestampNumber
+
+  /**
+   * 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 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 Unsaved<T extends Partial<ObjectWithId>> = Merge<
+  T,
+  BaseDBEntity<Exclude<T['id'], undefined>>
+>
+
+export type UnsavedId<T extends Partial<ObjectWithId>> = Except<T, 'id'> & {
+  id: Exclude<T['id'], undefined>
+}
+
 /**
  * Convenience type shorthand.
  * Because `Function` type is discouraged by eslint.
@@ -183,34 +223,6 @@ export type UnixTimestamp = number
  */
 export type Integer = number
 
-/**
- * Base interface for any Entity that was saved to DB.
- */
-export interface SavedDBEntity<ID extends string | number = string> {
-  id: ID
-
-  /**
-   * unixTimestamp of when the entity was first created (in the DB).
-   */
-  created: UnixTimestampNumber
-
-  /**
-   * 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 type BaseDBEntity<ID extends string | number = string> = Partial<SavedDBEntity<ID>>
-
-export type Saved<E, ID extends string | number = string> = Merge<E, SavedDBEntity<ID>>
-export type Unsaved<E, ID extends string | number = string> = Merge<E, BaseDBEntity<ID>>
-
 /**
  * Named type for JSON.parse / JSON.stringify second argument
  */