@omegup/msync 0.0.10 → 0.0.11

package/index.d.ts

@@ -102,7 +102,6 @@ type D = O<{
     readonly deletedAt?: Timestamp | null | undefined;
 } & ID>;
 type Model = D & TS;
-type OutInput<T, A = T | null> = ID & Rec<'after', A>;
 type BA = 'before' | 'after';
 type PreDelta<T, K extends BA = BA, E = unknown> = Rec<K, T> & E;
 type Delta<T, K extends BA = BA, E = ID> = PreDelta<T | null, K, E>;
@@ -476,7 +475,7 @@ type ND = {
     readonly deletedAt?: null;
 };
 type Merge<T extends ID> = (T & ND & TS) | Del;
-declare const $upsert: <T extends doc>(out: RWCollection<Merge<T>>) => RawStages<unknown, OutInput<T>, "out">;
+declare const $upsert: <T extends doc>(out: RWCollection<Merge<T>>) => RawStages<unknown, Delta<T>, "out">;
 
 type DeltaPipe<Q extends O, T extends Q, F extends HKT<O2>, G extends HKT<O3>> = {
     with: <Q2 extends O, V extends Q2>(map: (a: Stream<Q, T, F, G>) => Stream<Q | Q2, V, F, G>) => DeltaPipe<Q | Q2, V, F, G>;

package/index.esm.js

@@ -1030,18 +1030,18 @@ const $mergeId = () => (out, keys, id) => {
     })).stages;
 };
 const $simpleMerge = () => (out, keys) => $mergeId()(out, keys, root().of('_id').expr());
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull(root()
+const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .of('before')
     .of('_id')
     .expr()));
-const assertNotNull = (expr) => expr;
+const assertNotNull$1 = (expr) => expr;
 
 const $upsert = (out) => {
-    const replacer = ite(eqTyped(root().of('after').expr(), nil), field({
+    const replacer = ite(eq(root().of('after').expr())(nil), field({
         deletedAt: ['deletedAt', current],
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
         touchedAt: ['touchedAt', current],
-    }), mergeObjects(root().of('after').expr(), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+    }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
     return link()
         .with($replaceWith_(replacer))
         .with($merge_({
@@ -1051,6 +1051,7 @@ const $upsert = (out) => {
         whenNotMatched: 'insert',
     })).stages;
 };
+const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
 const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));

package/index.js

@@ -1032,18 +1032,18 @@ const $mergeId = () => (out, keys, id) => {
     })).stages;
 };
 const $simpleMerge = () => (out, keys) => $mergeId()(out, keys, root().of('_id').expr());
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull(root()
+const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .of('before')
     .of('_id')
     .expr()));
-const assertNotNull = (expr) => expr;
+const assertNotNull$1 = (expr) => expr;
 
 const $upsert = (out) => {
-    const replacer = ite(eqTyped(root().of('after').expr(), nil), field({
+    const replacer = ite(eq(root().of('after').expr())(nil), field({
         deletedAt: ['deletedAt', current],
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
         touchedAt: ['touchedAt', current],
-    }), mergeObjects(root().of('after').expr(), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+    }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
     return link()
         .with($replaceWith_(replacer))
         .with($merge_({
@@ -1053,6 +1053,7 @@ const $upsert = (out) => {
         whenNotMatched: 'insert',
     })).stages;
 };
+const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
 const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));

package/package.json

@@ -3,7 +3,7 @@
     "module": "index.esm.js",
     "typings": "index.d.ts",
     "name": "@omegup/msync",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",