@omegup/msync 0.1.65 → 0.1.67

package/lib/aggregate/$merge.d.ts

@@ -1,4 +1,4 @@
-import type { IdHKT, Omit, Exclude, OPick, RWCollection, Timestamp } from '../../types';
+import type { IdHKT, Omit, Exclude, OPick, RWCollection } from '../../types';
 import type { doc, ID, N, O, rawItem, Rec, Replace, RORec, StrKey } from '../../types/json';
 import { type ExprsExact } from '../expression/concat';
 import type { Delta, Expr, IsDeleted, Model, RawStages, StreamRunnerParam, TS } from '../types';
@@ -18,9 +18,9 @@ type Result<P> = Expr<P, unknown, {
     new: P;
 }>;
 type Update<P, Out> = (...args: Args<P, Out>) => Result<P>;
-type UpdateF<P, Out> = <K extends keyof IsDeleted>(...args: Args<Replace<P, RORec<K, Timestamp>>, Out>) => Result<Replace<P, RORec<K, Timestamp>>>;
+type UpdateF<P, Out> = <K extends keyof IsDeleted>(...args: Args<Replace<P, RORec<K, Date>>, Out>) => Result<Replace<P, RORec<K, Date>>>;
 export declare const getSubsetMatchForExt: <Out extends Model, P extends O & ID & TS, E extends Record<keyof E, rawItem>>(ext: Exact<E, IdHKT>) => null | Expr<boolean, Rec<'old' | 'merged', Out | Replace<Out, P>>>;
-export declare const getWhenMatchedForMerge: <Out extends Model, P extends O & ID & TS, K extends keyof IsDeleted>(whenNotMatched: 'discard' | 'fail' | 'insert', update: Update<Replace<P, RORec<K, Timestamp>>, Out>, canWrite: Expr<boolean, Rec<'old' | 'merged', Out | Replace<Out, P>>> | null) => RawStages<O, Out, Out | Replace<Out, P>, RORec<'new', Replace<P, RORec<K, Timestamp>>>>;
+export declare const getWhenMatchedForMerge: <Out extends Model, P extends O & ID & TS, K extends keyof IsDeleted>(whenNotMatched: 'discard' | 'fail' | 'insert', update: Update<Replace<P, RORec<K, Date>>, Out>, canWrite: Expr<boolean, Rec<'old' | 'merged', Out | Replace<Out, P>>> | null) => RawStages<O, Out, Out | Replace<Out, P>, RORec<'new', Replace<P, RORec<K, Date>>>>;
 export declare const getWhenMatched: <Out extends Model, P extends O & ID & TS>(whenNotMatched: 'discard' | 'fail' | 'insert', canWrite: Expr<boolean, Rec<'old' | 'merged', Out | Replace<Out, P>>> | null) => RawStages<O, Rec<'old' | 'merged', Out | Replace<Out, P>>, Out | Replace<Out, P>>;
 type MergeCollection<V extends O, Out extends Model> = {
     coll: RWCollection<Out | Replace<Out, Patch<V>> | Replace<Patch<V>, IsDeleted>, Out>;

package/lib/expression/val.d.ts

@@ -7,8 +7,8 @@ export declare const current: Expr<Timestamp, unknown>;
 export declare const $let: <T, D, C, V extends object>(vars: ExprsExact<V, D, C>, inExpr: Expr<T, D, C & V>) => Expr<T, D, C>;
 export declare const nil: Expr<null, unknown>;
 export declare const $getField: {
-    <T, K extends StrKey<T>, D, C = unknown>(expr: Expr<T, D, C>, field: K): Expr<T[K], D, C>;
-    <T, K extends StrKey<T>, D, C = unknown>(expr: Expr<T | N, D, C>, field: K): Expr<T[K] | null, D, C>;
+    <T, K extends StrKey<T>, D, C = unknown>(expr: Expr<T, D, C>, field: K | Expr<K, D, C>): Expr<T[K], D, C>;
+    <T, K extends StrKey<T>, D, C = unknown>(expr: Expr<T | N, D, C>, field: K | Expr<K, D, C>): Expr<T[K] | null, D, C>;
 };
 export type AddO<T> = T extends notObj ? T : T extends Array<infer U> ? Arr<AddO<U>> : O<{
     [K in keyof T]: AddO<T[K]>;

package/lib/types/stream.d.ts

@@ -46,12 +46,12 @@ export type TS = {
     readonly touchedAt: Timestamp;
 };
 export type IsDeleted = {
-    readonly deletedAt: Timestamp;
+    readonly deletedAt: Date;
 };
 export type DDel = IsDeleted & ID & TS;
 export type Del = O<DDel>;
 export type DeletedAt = {
-    readonly deletedAt?: Timestamp | null | undefined;
+    readonly deletedAt?: Date | null | undefined;
 };
 export type D = O<DeletedAt & ID>;
 export type Model = D & TS;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@omegup/msync",
-    "version": "0.1.65",
+    "version": "0.1.67",
     "description": "Keeps derived MongoDB data in sync with the documents it comes from.",
     "repository": {
         "type": "git",