@nu-art/ts-common 0.202.1 → 0.202.3

package/db/types.d.ts

@@ -33,7 +33,7 @@ export type Proto_DB_Object<T extends DB_Object, GeneratedKeys extends keyof T |
 export type DBProto<P extends Proto_DB_Object<any, any, any, any, any>, ModifiableSubType = Omit<P['type'], P['generatedKeys'] | keyof DB_Object>, GeneratedSubType = SubsetObjectByKeys<P['type'], P['generatedKeys']>> = {
     uiType: ModifiableSubType & Partial<GeneratedSubType> & Partial<DB_Object>;
     dbType: P['type'];
-    generatedPropsValidator: ValidatorTypeResolver<GeneratedSubType>;
+    generatedPropsValidator: ValidatorTypeResolver<Omit<GeneratedSubType, keyof DB_Object>>;
     modifiablePropsValidator: ValidatorTypeResolver<ModifiableSubType>;
     uniqueKeys: P['uniqueKeys'][];
     generatedProps: P['generatedKeys'][];

package/mem-storage/MemStorage.d.ts

@@ -2,6 +2,7 @@ export declare class MemStorage {
     private readonly cache;
     constructor();
     init<R>(makeItContext: () => Promise<R>): Promise<R>;
+    initSync<R>(makeItContext: () => R): R;
     private set;
     private get;
 }
@@ -14,4 +15,5 @@ export declare class MemKey<T> {
     resolve: (storage: MemStorage) => Promise<void>;
     get: (value?: T) => T;
     set: (value: T) => T;
+    merge: (value: T) => any;
 }

package/mem-storage/MemStorage.js

@@ -41,6 +41,9 @@ class MemStorage {
             return asyncLocalStorage.run(this, makeItContext);
         });
     }
+    initSync(makeItContext) {
+        return asyncLocalStorage.run(this, makeItContext);
+    }
 }
 exports.MemStorage = MemStorage;
 class MemKey {
@@ -70,6 +73,11 @@ class MemKey {
             // @ts-ignore
             return asyncLocalStorage.getStore().set(this, value);
         };
+        this.merge = (value) => {
+            const currentValue = this.get();
+            // @ts-ignore
+            return asyncLocalStorage.getStore().set(this, merge(currentValue, value));
+        };
         this.key = key;
         this.unique = unique;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/ts-common",
-  "version": "0.202.1",
+  "version": "0.202.3",
   "description": "js and ts infra",
   "keywords": [
     "TacB0sS",

package/utils/date-time-tools.js

@@ -135,7 +135,7 @@ const DateTimeFormat = (format) => {
 };
 exports.DateTimeFormat = DateTimeFormat;
 function isSameDay(date1, date2) {
-    return moment(date1).isSame(date2);
+    return moment(date1).isSame(date2, 'day');
 }
 exports.isSameDay = isSameDay;
 function deltaDays(d1, d2) {
@@ -146,8 +146,8 @@ function deltaDays(d1, d2) {
         return 0;
     const millis1 = typeof d1 === 'number' ? d1 : d1.getTime();
     const millis2 = typeof d2 === 'number' ? d2 : d2.getTime();
-    const days = (millis1 - millis2) / exports.Day;
-    //If date2 + the amount of days calculated actually lands on the same day as day1, return days
+    const days = Math.floor((millis1 - millis2) / exports.Day);
+    //If date2 + the amount of days calculated actually lands on the same day as date1, return days
     //Else, an extra day needs to be given
     const date2Offset = new Date(date2.getTime() + (days * exports.Day));
     return isSameDay(date1, date2Offset) ? days : days + 1;