@rocicorp/zero 0.17.2025031100 → 0.17.2025031200

package/out/chunk-2Y24MEEQ.js

@@ -0,0 +1,45 @@
+// ../zql/src/query/ttl.ts
+var DEFAULT_TTL = "none";
+var multiplier = {
+  s: 1e3,
+  m: 60 * 1e3,
+  h: 60 * 60 * 1e3,
+  d: 24 * 60 * 60 * 1e3,
+  y: 365 * 24 * 60 * 60 * 1e3
+};
+function parseTTL(ttl) {
+  if (typeof ttl === "number") {
+    return Number.isNaN(ttl) ? 0 : !Number.isFinite(ttl) || ttl < 0 ? -1 : ttl;
+  }
+  if (ttl === "none") {
+    return 0;
+  }
+  if (ttl === "forever") {
+    return -1;
+  }
+  const multi = multiplier[ttl[ttl.length - 1]];
+  return Number(ttl.slice(0, -1)) * multi;
+}
+function compareTTL(a, b) {
+  const ap = parseTTL(a);
+  const bp = parseTTL(b);
+  if (ap === -1 && bp !== -1) {
+    return 1;
+  }
+  if (ap !== -1 && bp === -1) {
+    return -1;
+  }
+  return ap - bp;
+}
+
+// ../shared/src/has-own.ts
+var objectPrototypeHasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwn = Object.hasOwn || ((object, key) => objectPrototypeHasOwnProperty.call(object, key));
+
+export {
+  hasOwn,
+  DEFAULT_TTL,
+  parseTTL,
+  compareTTL
+};
+//# sourceMappingURL=chunk-2Y24MEEQ.js.map

package/out/chunk-2Y24MEEQ.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../zql/src/query/ttl.ts", "../../shared/src/has-own.ts"],
+  "sourcesContent": ["export type TimeUnit = 's' | 'm' | 'h' | 'd' | 'y';\n\n/**\n * Time To Live. This is used for query expiration.\n * - `forever` means the query will never expire.\n * - `none` means the query will expire immediately.\n * - A number means the query will expire after that many milliseconds.\n * - A negative number means the query will never expire, this is same as 'forever'.\n * - A string like `1s` means the query will expire after that many seconds.\n * - A string like `1m` means the query will expire after that many minutes.\n * - A string like `1h` means the query will expire after that many hours.\n * - A string like `1d` means the query will expire after that many days.\n * - A string like `1y` means the query will expire after that many years.\n */\nexport type TTL = `${number}${TimeUnit}` | 'forever' | 'none' | number;\n\nexport const DEFAULT_TTL: TTL = 'none';\n\nconst multiplier = {\n  s: 1000,\n  m: 60 * 1000,\n  h: 60 * 60 * 1000,\n  d: 24 * 60 * 60 * 1000,\n  y: 365 * 24 * 60 * 60 * 1000,\n} as const;\n\nexport function parseTTL(ttl: TTL): number {\n  if (typeof ttl === 'number') {\n    return Number.isNaN(ttl) ? 0 : !Number.isFinite(ttl) || ttl < 0 ? -1 : ttl;\n  }\n  if (ttl === 'none') {\n    return 0;\n  }\n  if (ttl === 'forever') {\n    return -1;\n  }\n  const multi = multiplier[ttl[ttl.length - 1] as TimeUnit];\n  return Number(ttl.slice(0, -1)) * multi;\n}\n\nexport function compareTTL(a: TTL, b: TTL): number {\n  const ap = parseTTL(a);\n  const bp = parseTTL(b);\n  if (ap === -1 && bp !== -1) {\n    return 1;\n  }\n  if (ap !== -1 && bp === -1) {\n    return -1;\n  }\n  return ap - bp;\n}\n", "/* eslint-disable @typescript-eslint/no-explicit-any */\nconst objectPrototypeHasOwnProperty = Object.prototype.hasOwnProperty;\n\n/**\n * Object.hasOwn polyfill\n */\nexport const hasOwn: (object: any, key: PropertyKey) => boolean =\n  (Object as any).hasOwn ||\n  ((object, key) => objectPrototypeHasOwnProperty.call(object, key));\n"],
+  "mappings": ";AAgBO,IAAM,cAAmB;AAEhC,IAAM,aAAa;AAAA,EACjB,GAAG;AAAA,EACH,GAAG,KAAK;AAAA,EACR,GAAG,KAAK,KAAK;AAAA,EACb,GAAG,KAAK,KAAK,KAAK;AAAA,EAClB,GAAG,MAAM,KAAK,KAAK,KAAK;AAC1B;AAEO,SAAS,SAAS,KAAkB;AACzC,MAAI,OAAO,QAAQ,UAAU;AAC3B,WAAO,OAAO,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,SAAS,GAAG,KAAK,MAAM,IAAI,KAAK;AAAA,EACzE;AACA,MAAI,QAAQ,QAAQ;AAClB,WAAO;AAAA,EACT;AACA,MAAI,QAAQ,WAAW;AACrB,WAAO;AAAA,EACT;AACA,QAAM,QAAQ,WAAW,IAAI,IAAI,SAAS,CAAC,CAAa;AACxD,SAAO,OAAO,IAAI,MAAM,GAAG,EAAE,CAAC,IAAI;AACpC;AAEO,SAAS,WAAW,GAAQ,GAAgB;AACjD,QAAM,KAAK,SAAS,CAAC;AACrB,QAAM,KAAK,SAAS,CAAC;AACrB,MAAI,OAAO,MAAM,OAAO,IAAI;AAC1B,WAAO;AAAA,EACT;AACA,MAAI,OAAO,MAAM,OAAO,IAAI;AAC1B,WAAO;AAAA,EACT;AACA,SAAO,KAAK;AACd;;;ACjDA,IAAM,gCAAgC,OAAO,UAAU;AAKhD,IAAM,SACV,OAAe,WACf,CAAC,QAAQ,QAAQ,8BAA8B,KAAK,QAAQ,GAAG;",
+  "names": []
+}

package/out/{chunk-2TJNN7K4.js → chunk-VNV6U5BQ.js}

@@ -1,7 +1,9 @@
 import {
   DEFAULT_TTL,
-  hasOwn
-} from "./chunk-HLTH2AYN.js";
+  compareTTL,
+  hasOwn,
+  parseTTL
+} from "./chunk-2Y24MEEQ.js";
 import {
   applyChange,
   assert,
@@ -9219,9 +9221,7 @@ var Exists = class {
             case "remove": {
               let size = this.#getSize(change.node);
               if (size !== void 0) {
-                if (size === 0) {
-                  return;
-                }
+                assert(size > 0);
                 size--;
                 this.#setSize(change.node, size);
               } else {
@@ -9617,6 +9617,7 @@ var Join = class {
   #relationshipName;
   #schema;
   #output = throwOutput;
+  #inprogressChildChange;
   constructor({
     parent,
     child,
@@ -9749,25 +9750,34 @@ var Join = class {
   }
   #pushChild(change) {
     const pushChildChange = (childRow, change2) => {
-      const parentNodes = this.#parent.fetch({
-        constraint: Object.fromEntries(
-          this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]])
-        )
-      });
-      for (const parentNode of parentNodes) {
-        const childChange = {
-          type: "child",
-          node: this.#processParentNode(
-            parentNode.row,
-            parentNode.relationships,
-            "fetch"
-          ),
-          child: {
-            relationshipName: this.#relationshipName,
-            change: change2
-          }
-        };
-        this.#output.push(childChange);
+      this.#inprogressChildChange = {
+        change: change2,
+        position: void 0
+      };
+      try {
+        const parentNodes = this.#parent.fetch({
+          constraint: Object.fromEntries(
+            this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]])
+          )
+        });
+        for (const parentNode of parentNodes) {
+          this.#inprogressChildChange.position = parentNode.row;
+          const childChange = {
+            type: "child",
+            node: this.#processParentNode(
+              parentNode.row,
+              parentNode.relationships,
+              "fetch"
+            ),
+            child: {
+              relationshipName: this.#relationshipName,
+              change: change2
+            }
+          };
+          this.#output.push(childChange);
+        }
+      } finally {
+        this.#inprogressChildChange = void 0;
       }
     };
     switch (change.type) {
@@ -9792,6 +9802,81 @@ var Join = class {
         unreachable(change);
     }
   }
+  *#generateChildStreamWithOverlay(stream, overlay) {
+    let applied = false;
+    let editOldApplied = false;
+    let editNewApplied = false;
+    for (const child of stream) {
+      let yieldChild = true;
+      if (!applied) {
+        switch (overlay.type) {
+          case "add": {
+            if (this.#child.getSchema().compareRows(overlay.node.row, child.row) === 0) {
+              applied = true;
+              yieldChild = false;
+            }
+            break;
+          }
+          case "remove": {
+            if (this.#child.getSchema().compareRows(overlay.node.row, child.row) < 0) {
+              applied = true;
+              yield overlay.node;
+            }
+            break;
+          }
+          case "edit": {
+            if (this.#child.getSchema().compareRows(overlay.oldNode.row, child.row) < 0) {
+              editOldApplied = true;
+              if (editNewApplied) {
+                applied = true;
+              }
+              yield overlay.oldNode;
+            }
+            if (this.#child.getSchema().compareRows(overlay.node.row, child.row) === 0) {
+              editNewApplied = true;
+              if (editOldApplied) {
+                applied = true;
+              }
+              yieldChild = false;
+            }
+            break;
+          }
+          case "child": {
+            if (this.#child.getSchema().compareRows(overlay.node.row, child.row) === 0) {
+              applied = true;
+              yield {
+                row: child.row,
+                relationships: {
+                  ...child.relationships,
+                  [overlay.child.relationshipName]: () => this.#generateChildStreamWithOverlay(
+                    child.relationships[overlay.child.relationshipName](),
+                    overlay.child.change
+                  )
+                }
+              };
+              yieldChild = false;
+            }
+            break;
+          }
+        }
+      }
+      if (yieldChild) {
+        yield child;
+      }
+    }
+    if (!applied) {
+      if (overlay.type === "remove") {
+        applied = true;
+        yield overlay.node;
+      } else if (overlay.type === "edit") {
+        assert(editNewApplied);
+        editOldApplied = true;
+        applied = true;
+        yield overlay.oldNode;
+      }
+    }
+    assert(applied);
+  }
   #processParentNode(parentNodeRow, parentNodeRelations, mode) {
     let method = mode;
     let storageUpdated = false;
@@ -9827,7 +9912,7 @@ var Join = class {
           );
         }
       }
-      return this.#child[method]({
+      const stream = this.#child[method]({
         constraint: Object.fromEntries(
           this.#childKey.map((key, i) => [
             key,
@@ -9835,6 +9920,19 @@ var Join = class {
           ])
         )
       });
+      if (this.#inprogressChildChange && this.#isJoinMatch(
+        parentNodeRow,
+        this.#inprogressChildChange.change.node.row
+      ) && this.#inprogressChildChange.position && this.#schema.compareRows(
+        parentNodeRow,
+        this.#inprogressChildChange.position
+      ) > 0) {
+        return this.#generateChildStreamWithOverlay(
+          stream,
+          this.#inprogressChildChange.change
+        );
+      }
+      return stream;
     };
     return {
       row: parentNodeRow,
@@ -9844,6 +9942,14 @@ var Join = class {
       }
     };
   }
+  #isJoinMatch(parent, child) {
+    for (let i = 0; i < this.#parentKey.length; i++) {
+      if (!valuesEqual(parent[this.#parentKey[i]], child[this.#childKey[i]])) {
+        return false;
+      }
+    }
+    return true;
+  }
 };
 function makeStorageKeyForValues(values) {
   const json2 = JSON.stringify(["pKeySet", ...values]);
@@ -10153,6 +10259,7 @@ var Take = class {
         type: "remove",
         node: boundNode
       };
+      this.#output.push(change);
       this.#setTakeState(
         takeStateKey,
         takeState.size,
@@ -10160,7 +10267,6 @@ var Take = class {
         maxBound
       );
       this.#output.push(removeChange);
-      this.#output.push(change);
     } else if (change.type === "remove") {
       if (takeState.bound === void 0) {
         return;
@@ -10207,13 +10313,13 @@ var Take = class {
         }
       }
       if (newBound?.push) {
+        this.#output.push(change);
         this.#setTakeState(
           takeStateKey,
           takeState.size,
           newBound.node.row,
           maxBound
         );
-        this.#output.push(change);
         this.#output.push({
           type: "add",
           node: newBound.node
@@ -10308,10 +10414,6 @@ var Take = class {
         newBoundNode.row,
         maxBound
       );
-      this.#output.push({
-        type: "remove",
-        node: change.oldNode
-      });
       this.#output.push({
         type: "add",
         node: newBoundNode
@@ -10335,6 +10437,10 @@ var Take = class {
         }),
         2
       );
+      this.#output.push({
+        type: "add",
+        node: change.node
+      });
       this.#setTakeState(
         takeStateKey,
         takeState.size,
@@ -10345,10 +10451,6 @@ var Take = class {
         type: "remove",
         node: oldBoundNode
       });
-      this.#output.push({
-        type: "add",
-        node: change.node
-      });
       return;
     }
     if (oldCmp < 0) {
@@ -10373,16 +10475,16 @@ var Take = class {
         replaceBoundAndForwardChange();
         return;
       }
+      this.#output.push({
+        type: "remove",
+        node: change.oldNode
+      });
       this.#setTakeState(
         takeStateKey,
         takeState.size,
         afterBoundNode.row,
         maxBound
       );
-      this.#output.push({
-        type: "remove",
-        node: change.oldNode
-      });
       this.#output.push({
         type: "add",
         node: afterBoundNode
@@ -11992,40 +12094,6 @@ function escapeLike(val) {
   return val.replace(/[%_]/g, "\\$&");
 }
 
-// ../zql/src/query/ttl.ts
-var DEFAULT_TTL2 = "none";
-var multiplier = {
-  s: 1e3,
-  m: 60 * 1e3,
-  h: 60 * 60 * 1e3,
-  d: 24 * 60 * 60 * 1e3,
-  y: 365 * 24 * 60 * 60 * 1e3
-};
-function parseTTL(ttl) {
-  if (typeof ttl === "number") {
-    return Number.isNaN(ttl) ? 0 : !Number.isFinite(ttl) || ttl < 0 ? -1 : ttl;
-  }
-  if (ttl === "none") {
-    return 0;
-  }
-  if (ttl === "forever") {
-    return -1;
-  }
-  const multi = multiplier[ttl[ttl.length - 1]];
-  return Number(ttl.slice(0, -1)) * multi;
-}
-function compareTTL(a, b) {
-  const ap = parseTTL(a);
-  const bp = parseTTL(b);
-  if (ap === -1 && bp !== -1) {
-    return 1;
-  }
-  if (ap !== -1 && bp === -1) {
-    return -1;
-  }
-  return ap - bp;
-}
-
 // ../zero-client/src/client/zero.ts
 import { LogContext as LogContext4 } from "@rocicorp/logger";
 import { resolver as resolver8 } from "@rocicorp/resolver";
@@ -14340,7 +14408,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.17.2025031100";
+var version2 = "0.17.2025031200";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -16559,7 +16627,6 @@ export {
   NOBODY_CAN,
   definePermissions,
   escapeLike,
-  DEFAULT_TTL2 as DEFAULT_TTL,
   Zero
 };
-//# sourceMappingURL=chunk-2TJNN7K4.js.map
+//# sourceMappingURL=chunk-VNV6U5BQ.js.map