interaqt 0.8.13 → 0.8.14

package/dist/index.js

@@ -3971,19 +3971,26 @@ class De {
    */
   async preprocessSameRowData(t, e = !1, i, r) {
     const s = t.getData();
-    !e && !s.id ? s.id = await this.database.getAutoId(t.recordName) : e && !s.id && (s.id = r.id), e ? t.valueAttributes.length && i?.push({
-      type: "update",
-      recordName: t.recordName,
-      record: { ...t.getData(), id: r.id },
-      oldRecord: r
-    }) : i?.push({
-      type: "create",
-      recordName: t.recordName,
-      record: {
-        ...t.defaultValues,
-        ...s
-      }
-    });
+    if (!e && !s.id ? s.id = await this.database.getAutoId(t.recordName) : e && !s.id && (s.id = r.id), !e)
+      i?.push({
+        type: "create",
+        recordName: t.recordName,
+        record: {
+          ...t.defaultValues,
+          ...s
+        }
+      });
+    else if (t.valueAttributes.length) {
+      const n = t.getSameRowFieldAndValue(r), c = this.map.getRecordInfo(t.recordName), l = new Set(c.valueAttributes.map((h) => h.attributeName)), d = { ...t.getData() };
+      n.forEach((h) => {
+        l.has(h.name) && (d[h.name] = h.value);
+      }), i?.push({
+        type: "update",
+        recordName: t.recordName,
+        record: { ...d, id: r.id },
+        oldRecord: r
+      });
+    }
     for (let n of t.combinedNewRecords)
       s[n.info.attributeName] = {
         ...s[n.info.attributeName],
@@ -5223,12 +5230,17 @@ class Je {
     if (!e)
       return this.creationExecutor.preprocessSameRowData(t, e, i, r);
     const s = t.getData();
-    e && !s.id && (s.id = r.id), t.valueAttributes.length && i?.push({
-      type: "update",
-      recordName: t.recordName,
-      record: { ...t.getData(), id: r.id },
-      oldRecord: r
-    });
+    if (e && !s.id && (s.id = r.id), t.valueAttributes.length) {
+      const n = t.getSameRowFieldAndValue(r), c = this.map.getRecordInfo(t.recordName), l = new Set(c.valueAttributes.map((h) => h.attributeName)), d = { ...t.getData() };
+      n.forEach((h) => {
+        l.has(h.name) && (d[h.name] = h.value);
+      }), i?.push({
+        type: "update",
+        recordName: t.recordName,
+        record: { ...d, id: r.id },
+        oldRecord: r
+      });
+    }
     for (let n of t.combinedNewRecords)
       s[n.info.attributeName] = {
         ...s[n.info.attributeName],
@@ -7649,7 +7661,9 @@ class Ai {
           void 0,
           this.relationAttributeQuery
         ))[this.isSource ? "target" : "source"];
-        c["&"] = o, !!this.callback.call(this.controller, c, r) ? (await this.state.isItemMatchCount.set(o, !0), a = a + 1) : await this.state.isItemMatchCount.set(o, !1);
+        c["&"] = o;
+        const l = !!this.callback.call(this.controller, c, r), d = await this.state.isItemMatchCount.get(o);
+        l && !d && (a = a + 1), await this.state.isItemMatchCount.set(o, l);
       } else
         a = a + 1;
     else if (s.type === "delete" && s.recordName === this.relation.name)