@omegup/msync 0.0.85 → 0.0.87

package/index.d.ts

@@ -497,9 +497,9 @@ type ND = {
 };
 type SafeE<E> = Omit<E, `$${string}` | keyof ID>;
 type Merge<T extends doc, E> = Omit<SafeE<E>, keyof (ND & TS)> & ((T & ND & TS) | Del);
-declare const $insertX: <T extends doc, D extends O, EEE extends RORec<string, rawItem>>(out: RWCollection<Merge<T, EEE>>, expr: Expr<T, D>, map: (x: Expr<T & ND & TS & Omit<SafeE<EEE>, keyof (ND & TS)>, D>) => Expr<Merge<T, EEE>, D>, ext: Exact<Omit<SafeE<EEE>, keyof (ND & TS)>, IdHKT>) => StreamRunnerParam<D, "out">;
+declare const $insertX: <T extends doc, D extends O, EEE extends RORec<string, rawItem>>(out: RWCollection<Merge<T, EEE>>, expr: Expr<T, D>, map: (x: Expr<T & ND & TS & Omit<SafeE<EEE>, keyof (ND & TS)>, D>) => Expr<Merge<T, EEE>, D>, ext: Exact<Omit<SafeE<EEE>, keyof (ND & TS)>, IdHKT>, extExpr: ExprsExact<Omit<SafeE<EEE>, keyof (ND & TS)>, unknown>) => StreamRunnerParam<D, "out">;
 declare const $simpleInsert: <T extends doc>(out: RWCollection<Merge<T, {}>>) => StreamRunnerParam<T, "out">;
-declare const $insertPart: <T extends doc, EEE extends RORec<string, rawItem>>(out: RWCollection<Merge<T, EEE>>, ext: ExprsExact<Omit<SafeE<EEE>, keyof (ND & TS)>, unknown>) => StreamRunnerParam<Delta<T>, "out">;
+declare const $insertPart: <T extends doc, EEE extends RORec<string, rawItem>>(out: RWCollection<Merge<T, EEE>>, ext: Exact<Omit<SafeE<EEE>, keyof (ND & TS)>, IdHKT>) => StreamRunnerParam<Delta<T>, "out">;
 declare const $insert: <T extends doc>(out: RWCollection<Merge<T, {}>>) => StreamRunnerParam<Delta<T>, "out">;
 
 declare const $group_: <V extends O>() => <ID, T extends O, C = unknown>(id: Expr<ID, T, C>, args: Accumulators<T, V, C>) => RawStages<O, T, Rec<"_id", ID> & V, C, 1>;

package/index.esm.js

@@ -1,5 +1,6 @@
-import { SynchronousPromise } from 'synchronous-promise';
 import crypto$1 from 'crypto';
+import { canonicalize } from 'json-canonicalize';
+import { SynchronousPromise } from 'synchronous-promise';
 import { UUID, MongoClient } from 'mongodb';
 import { writeFile } from 'fs/promises';
 
@@ -1093,14 +1094,17 @@ const $unwind = (k, dict, middle) => {
 
 const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull1, includeNull2) => {
     const omit = omitRORec();
+    const hash = crypto$1.createHash('md5').update(canonicalize(input)).digest('base64url');
+    const ss = (f) => to($ifNull(root().of(f).of(k1).with(field1).expr(), val(hash)));
     return link()
         .with($replaceWithDelta(field(map1(k1, root().expr()))))
+        .with($set_(set()({ bId: ['bId', ss('before')], aId: ['aId', ss('after')] })))
         .with($simpleLookup_({
         coll,
         k: 'a',
         fields: {
             foreign: root().of('before').with(field2),
-            local: root().of('after').of(k1).with(field1),
+            local: root().of('aId'),
         },
         vars: {},
         pipeline: link().with(input).with(exec).stages,
@@ -1110,7 +1114,7 @@ const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, incl
         k: 'b',
         fields: {
             foreign: root().of('before').with(field2),
-            local: root().of('before').of(k1).with(field1),
+            local: root().of('bId'),
         },
         vars: {},
         pipeline: link().with(input).with(exec).stages,
@@ -1403,8 +1407,7 @@ const $simpleMerge = () => (out, keys) => $mergeX(out, keys, root(), id$1);
 const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()));
 const assertNotNull$1 = (expr) => expr;
 
-const $insertX = (out, expr, map, ext) => {
-    const extExpr = mapExact(ext, (v) => val(v));
+const $insertX = (out, expr, map, ext, extExpr) => {
     const filter = mapExactToObject(ext, v => ({ $eq: v }));
     return {
         teardown: c => c({
@@ -1431,12 +1434,15 @@ const $insertX = (out, expr, map, ext) => {
         },
     };
 };
-const $simpleInsert = (out) => $insertX(out, root().expr(), id$1, {});
-const $insertPart = (out, ext) => $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(ext), {
-    deletedAt: ['deletedAt', current],
-    _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-    touchedAt: ['touchedAt', current],
-})), x), ext);
+const $simpleInsert = (out) => $insertX(out, root().expr(), id$1, {}, {});
+const $insertPart = (out, ext) => {
+    const extExpr = mapExact(ext, (v) => val(v));
+    return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
+        deletedAt: ['deletedAt', current],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
+        touchedAt: ['touchedAt', current],
+    })), x), ext, extExpr);
+};
 const $insert = (out) => $insertPart(out, {});
 const assertNotNull = (expr) => expr;
 

package/index.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var synchronousPromise = require('synchronous-promise');
 var crypto$1 = require('crypto');
+var jsonCanonicalize = require('json-canonicalize');
+var synchronousPromise = require('synchronous-promise');
 var mongodb = require('mongodb');
 var promises = require('fs/promises');
 
@@ -1095,14 +1096,17 @@ const $unwind = (k, dict, middle) => {
 
 const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull1, includeNull2) => {
     const omit = omitRORec();
+    const hash = crypto$1.createHash('md5').update(jsonCanonicalize.canonicalize(input)).digest('base64url');
+    const ss = (f) => to($ifNull(root().of(f).of(k1).with(field1).expr(), val(hash)));
     return link()
         .with($replaceWithDelta(field(map1(k1, root().expr()))))
+        .with($set_(set()({ bId: ['bId', ss('before')], aId: ['aId', ss('after')] })))
         .with($simpleLookup_({
         coll,
         k: 'a',
         fields: {
             foreign: root().of('before').with(field2),
-            local: root().of('after').of(k1).with(field1),
+            local: root().of('aId'),
         },
         vars: {},
         pipeline: link().with(input).with(exec).stages,
@@ -1112,7 +1116,7 @@ const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, incl
         k: 'b',
         fields: {
             foreign: root().of('before').with(field2),
-            local: root().of('before').of(k1).with(field1),
+            local: root().of('bId'),
         },
         vars: {},
         pipeline: link().with(input).with(exec).stages,
@@ -1405,8 +1409,7 @@ const $simpleMerge = () => (out, keys) => $mergeX(out, keys, root(), id$1);
 const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()));
 const assertNotNull$1 = (expr) => expr;
 
-const $insertX = (out, expr, map, ext) => {
-    const extExpr = mapExact(ext, (v) => val(v));
+const $insertX = (out, expr, map, ext, extExpr) => {
     const filter = mapExactToObject(ext, v => ({ $eq: v }));
     return {
         teardown: c => c({
@@ -1433,12 +1436,15 @@ const $insertX = (out, expr, map, ext) => {
         },
     };
 };
-const $simpleInsert = (out) => $insertX(out, root().expr(), id$1, {});
-const $insertPart = (out, ext) => $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(ext), {
-    deletedAt: ['deletedAt', current],
-    _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-    touchedAt: ['touchedAt', current],
-})), x), ext);
+const $simpleInsert = (out) => $insertX(out, root().expr(), id$1, {}, {});
+const $insertPart = (out, ext) => {
+    const extExpr = mapExact(ext, (v) => val(v));
+    return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
+        deletedAt: ['deletedAt', current],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
+        touchedAt: ['touchedAt', current],
+    })), x), ext, extExpr);
+};
 const $insert = (out) => $insertPart(out, {});
 const assertNotNull = (expr) => expr;
 

package/package.json

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