tutuca 0.9.73 → 0.9.76

package/dist/tutuca-cli.js

@@ -4247,6 +4247,9 @@ class Step {
   toAbstractPathStep() {
     return this;
   }
+  pinKey(_v) {
+    return this;
+  }
 }
 function warnRawDynStep(op, step) {
   console.warn(`Path.${op} reached a DynStep: call toTransactionPath() first`, step);
@@ -4297,6 +4300,20 @@ class Path {
     }
     return new Path(out);
   }
+  pinKeys(root) {
+    let curVal = root;
+    let out = null;
+    for (let i = 0;i < this.steps.length; i++) {
+      const step = this.steps[i];
+      const pinned = step.pinKey(curVal);
+      if (pinned !== step)
+        (out ??= this.steps.slice())[i] = pinned;
+      curVal = step.lookup(curVal, NONE);
+      if (curVal === NONE)
+        break;
+    }
+    return out ? new Path(out) : this;
+  }
   lookup(v, dval = null) {
     let curVal = v;
     for (const step of this.steps) {
@@ -4582,6 +4599,10 @@ var init_path = __esm(() => {
       const key = root?.get(this.keyField, NONE);
       return seq === NONE || key === NONE ? root : root.set(this.seqField, seq.set(key, v));
     }
+    pinKey(v) {
+      const key = v?.get(this.keyField, NONE);
+      return key === NONE ? this : new SeqStep(this.seqField, key);
+    }
   };
   EachBindStep = class EachBindStep extends Step {
     constructor(seqVal, key) {
@@ -13744,12 +13765,14 @@ class Transactor {
   }
   async pushRequest(path, name, args = [], opts = {}, parent = null) {
     const curRoot = this.state.val;
-    const curLeaf = path.toTransactionPath().lookup(curRoot);
+    const txnPath = path.toTransactionPath();
+    const curLeaf = txnPath.lookup(curRoot);
     const handler = this.comps.getRequestFor(curLeaf, name) ?? mkReq404(name);
     const resHandlerName = opts?.onResName ?? name;
+    const resPath = opts?.livePath ? null : txnPath.pinKeys(curRoot);
     const push = (specificName, baseName, singleArg, result, error) => {
       const resArgs = specificName ? [singleArg] : [result, error];
-      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent);
+      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent, resPath);
       this.pushTransaction(t);
     };
     try {
@@ -13824,8 +13847,11 @@ class Transaction {
   getHandlerAndArgs(_root, _instance, _comps) {
     return null;
   }
+  getTransactionPath() {
+    return this.path.toTransactionPath();
+  }
   updateRootValue(curRoot, comps) {
-    const txnPath = this.path.toTransactionPath();
+    const txnPath = this.getTransactionPath();
     const curLeaf = txnPath.lookup(curRoot);
     const newLeaf = this.callHandler(curRoot, curLeaf, comps);
     this._task?.complete?.({ value: newLeaf, old: curLeaf });
@@ -13990,6 +14016,13 @@ var init_transactor = __esm(() => {
   };
   ResponseEvent = class ResponseEvent extends NameArgsTransaction {
     handlerProp = "response";
+    constructor(path, transactor, name, args, parent, txnPath = null) {
+      super(path, transactor, name, args, parent);
+      this._txnPath = txnPath;
+    }
+    getTransactionPath() {
+      return this._txnPath ?? super.getTransactionPath();
+    }
   };
   SendEvent = class SendEvent extends NameArgsTransaction {
     handlerProp = "receive";

package/dist/tutuca-dev.ext.js

@@ -1,5 +1,5 @@
 // dev.js
-import { expect } from "chai";
+import { expect, use } from "chai";
 
 // src/value.js
 import { is } from "immutable";
@@ -20,6 +20,9 @@ class Step {
   toAbstractPathStep() {
     return this;
   }
+  pinKey(_v) {
+    return this;
+  }
 }
 
 class BindStep extends Step {
@@ -101,6 +104,10 @@ class SeqAccessStep extends Step {
     const key = root?.get(this.keyField, NONE);
     return seq === NONE || key === NONE ? root : root.set(this.seqField, seq.set(key, v));
   }
+  pinKey(v) {
+    const key = v?.get(this.keyField, NONE);
+    return key === NONE ? this : new SeqStep(this.seqField, key);
+  }
 }
 
 class EachBindStep extends Step {
@@ -223,6 +230,20 @@ class Path {
     }
     return new Path(out);
   }
+  pinKeys(root) {
+    let curVal = root;
+    let out = null;
+    for (let i = 0;i < this.steps.length; i++) {
+      const step = this.steps[i];
+      const pinned = step.pinKey(curVal);
+      if (pinned !== step)
+        (out ??= this.steps.slice())[i] = pinned;
+      curVal = step.lookup(curVal, NONE);
+      if (curVal === NONE)
+        break;
+    }
+    return out ? new Path(out) : this;
+  }
   lookup(v, dval = null) {
     let curVal = v;
     for (const step of this.steps) {
@@ -2301,6 +2322,87 @@ function compileModifiers(eventName, names) {
   };
 }
 
+// src/chai-jest.js
+function jestMatchers(chai, utils) {
+  const A = chai.Assertion;
+  const m = (name, fn) => A.addMethod(name, fn);
+  m("toBe", function(expected) {
+    this.assert(Object.is(this._obj, expected), "expected #{this} to be #{exp}", "expected #{this} not to be #{exp}", expected, this._obj);
+  });
+  m("toEqual", function(expected) {
+    this.assert(utils.eql(this._obj, expected), "expected #{this} to deeply equal #{exp}", "expected #{this} not to deeply equal #{exp}", expected, this._obj, true);
+  });
+  m("toBeTruthy", function() {
+    this.assert(Boolean(this._obj), "expected #{this} to be truthy", "expected #{this} not to be truthy");
+  });
+  m("toBeFalsy", function() {
+    this.assert(!this._obj, "expected #{this} to be falsy", "expected #{this} not to be falsy");
+  });
+  m("toBeNull", function() {
+    this.assert(this._obj === null, "expected #{this} to be null", "expected #{this} not to be null");
+  });
+  m("toBeUndefined", function() {
+    this.assert(this._obj === undefined, "expected #{this} to be undefined", "expected #{this} not to be undefined");
+  });
+  m("toBeDefined", function() {
+    this.assert(this._obj !== undefined, "expected #{this} to be defined", "expected #{this} to be undefined");
+  });
+  m("toBeNaN", function() {
+    this.assert(Number.isNaN(this._obj), "expected #{this} to be NaN", "expected #{this} not to be NaN");
+  });
+  const compare = (name, op, word) => m(name, function(expected) {
+    this.assert(op(this._obj, expected), `expected #{this} to be ${word} #{exp}`, `expected #{this} not to be ${word} #{exp}`, expected);
+  });
+  compare("toBeGreaterThan", (a, b) => a > b, "greater than");
+  compare("toBeGreaterThanOrEqual", (a, b) => a >= b, "greater than or equal to");
+  compare("toBeLessThan", (a, b) => a < b, "less than");
+  compare("toBeLessThanOrEqual", (a, b) => a <= b, "less than or equal to");
+  m("toBeCloseTo", function(expected, numDigits = 2) {
+    const pass = Math.abs(expected - this._obj) < 10 ** -numDigits / 2;
+    this.assert(pass, `expected #{this} to be close to #{exp} (${numDigits} digits)`, `expected #{this} not to be close to #{exp} (${numDigits} digits)`, expected);
+  });
+  m("toContain", function(item) {
+    const obj = this._obj;
+    const ok = typeof obj === "string" ? obj.includes(item) : Array.from(obj).includes(item);
+    this.assert(ok, "expected #{this} to contain #{exp}", "expected #{this} not to contain #{exp}", item);
+  });
+  m("toHaveLength", function(length) {
+    const actual = this._obj == null ? undefined : this._obj.length;
+    this.assert(actual === length, "expected #{this} to have length #{exp}", "expected #{this} not to have length #{exp}", length, actual);
+  });
+  m("toMatch", function(expected) {
+    const obj = this._obj;
+    const ok = expected instanceof RegExp ? expected.test(obj) : String(obj).includes(expected);
+    this.assert(ok, "expected #{this} to match #{exp}", "expected #{this} not to match #{exp}", expected);
+  });
+  m("toHaveProperty", function(path, ...rest) {
+    const keys = Array.isArray(path) ? path : String(path).split(".");
+    let cur = this._obj;
+    let found = true;
+    for (const k of keys) {
+      if (cur != null && k in Object(cur))
+        cur = cur[k];
+      else {
+        found = false;
+        break;
+      }
+    }
+    const pass = found && (rest.length === 0 || utils.eql(cur, rest[0]));
+    this.assert(pass, "expected #{this} to have property #{exp}", "expected #{this} not to have property #{exp}", path);
+  });
+  m("toBeInstanceOf", function(ctor) {
+    this.assert(this._obj instanceof ctor, "expected #{this} to be an instance of #{exp}", "expected #{this} not to be an instance of #{exp}", ctor.name ?? ctor);
+  });
+  m("toThrow", function(expected) {
+    const a = new chai.Assertion(this._obj);
+    if (utils.flag(this, "negate")) {
+      expected === undefined ? a.to.not.throw() : a.to.not.throw(expected);
+    } else {
+      expected === undefined ? a.to.throw() : a.to.throw(expected);
+    }
+  });
+}
+
 // src/util/parsectx.js
 class ParseCtxClassSetCollector extends ParseContext {
   constructor(...args) {
@@ -6329,12 +6431,14 @@ class Transactor {
   }
   async pushRequest(path, name, args = [], opts = {}, parent = null) {
     const curRoot = this.state.val;
-    const curLeaf = path.toTransactionPath().lookup(curRoot);
+    const txnPath = path.toTransactionPath();
+    const curLeaf = txnPath.lookup(curRoot);
     const handler = this.comps.getRequestFor(curLeaf, name) ?? mkReq404(name);
     const resHandlerName = opts?.onResName ?? name;
+    const resPath = opts?.livePath ? null : txnPath.pinKeys(curRoot);
     const push = (specificName, baseName, singleArg, result, error) => {
       const resArgs = specificName ? [singleArg] : [result, error];
-      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent);
+      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent, resPath);
       this.pushTransaction(t);
     };
     try {
@@ -6409,8 +6513,11 @@ class Transaction {
   getHandlerAndArgs(_root, _instance, _comps) {
     return null;
   }
+  getTransactionPath() {
+    return this.path.toTransactionPath();
+  }
   updateRootValue(curRoot, comps) {
-    const txnPath = this.path.toTransactionPath();
+    const txnPath = this.getTransactionPath();
     const curLeaf = txnPath.lookup(curRoot);
     const newLeaf = this.callHandler(curRoot, curLeaf, comps);
     this._task?.complete?.({ value: newLeaf, old: curLeaf });
@@ -6519,6 +6626,13 @@ class NameArgsTransaction extends Transaction {
 
 class ResponseEvent extends NameArgsTransaction {
   handlerProp = "response";
+  constructor(path, transactor, name, args, parent, txnPath = null) {
+    super(path, transactor, name, args, parent);
+    this._txnPath = txnPath;
+  }
+  getTransactionPath() {
+    return this._txnPath ?? super.getTransactionPath();
+  }
 }
 
 class SendEvent extends NameArgsTransaction {
@@ -7905,6 +8019,7 @@ function collectIterBindings(Comp, compInstance, seq, opts = {}) {
 }
 
 // dev.js
+use(jestMatchers);
 async function test2(opts = {}) {
   const report = await runTests({ expect, ...opts });
   reportTestReportToConsole(report);

package/dist/tutuca-dev.js

@@ -7685,6 +7685,9 @@ class Step {
   toAbstractPathStep() {
     return this;
   }
+  pinKey(_v) {
+    return this;
+  }
 }
 
 class BindStep extends Step {
@@ -7766,6 +7769,10 @@ class SeqAccessStep extends Step {
     const key = root?.get(this.keyField, NONE);
     return seq === NONE || key === NONE ? root : root.set(this.seqField, seq.set(key, v));
   }
+  pinKey(v) {
+    const key = v?.get(this.keyField, NONE);
+    return key === NONE ? this : new SeqStep(this.seqField, key);
+  }
 }
 
 class EachBindStep extends Step {
@@ -7888,6 +7895,20 @@ class Path {
     }
     return new Path(out);
   }
+  pinKeys(root) {
+    let curVal = root;
+    let out = null;
+    for (let i = 0;i < this.steps.length; i++) {
+      const step = this.steps[i];
+      const pinned = step.pinKey(curVal);
+      if (pinned !== step)
+        (out ??= this.steps.slice())[i] = pinned;
+      curVal = step.lookup(curVal, NONE);
+      if (curVal === NONE)
+        break;
+    }
+    return out ? new Path(out) : this;
+  }
   lookup(v, dval = null) {
     let curVal = v;
     for (const step of this.steps) {
@@ -9966,6 +9987,87 @@ function compileModifiers(eventName, names) {
   };
 }
 
+// src/chai-jest.js
+function jestMatchers(chai, utils) {
+  const A = chai.Assertion;
+  const m = (name, fn) => A.addMethod(name, fn);
+  m("toBe", function(expected) {
+    this.assert(Object.is(this._obj, expected), "expected #{this} to be #{exp}", "expected #{this} not to be #{exp}", expected, this._obj);
+  });
+  m("toEqual", function(expected) {
+    this.assert(utils.eql(this._obj, expected), "expected #{this} to deeply equal #{exp}", "expected #{this} not to deeply equal #{exp}", expected, this._obj, true);
+  });
+  m("toBeTruthy", function() {
+    this.assert(Boolean(this._obj), "expected #{this} to be truthy", "expected #{this} not to be truthy");
+  });
+  m("toBeFalsy", function() {
+    this.assert(!this._obj, "expected #{this} to be falsy", "expected #{this} not to be falsy");
+  });
+  m("toBeNull", function() {
+    this.assert(this._obj === null, "expected #{this} to be null", "expected #{this} not to be null");
+  });
+  m("toBeUndefined", function() {
+    this.assert(this._obj === undefined, "expected #{this} to be undefined", "expected #{this} not to be undefined");
+  });
+  m("toBeDefined", function() {
+    this.assert(this._obj !== undefined, "expected #{this} to be defined", "expected #{this} to be undefined");
+  });
+  m("toBeNaN", function() {
+    this.assert(Number.isNaN(this._obj), "expected #{this} to be NaN", "expected #{this} not to be NaN");
+  });
+  const compare = (name, op, word) => m(name, function(expected) {
+    this.assert(op(this._obj, expected), `expected #{this} to be ${word} #{exp}`, `expected #{this} not to be ${word} #{exp}`, expected);
+  });
+  compare("toBeGreaterThan", (a, b) => a > b, "greater than");
+  compare("toBeGreaterThanOrEqual", (a, b) => a >= b, "greater than or equal to");
+  compare("toBeLessThan", (a, b) => a < b, "less than");
+  compare("toBeLessThanOrEqual", (a, b) => a <= b, "less than or equal to");
+  m("toBeCloseTo", function(expected, numDigits = 2) {
+    const pass = Math.abs(expected - this._obj) < 10 ** -numDigits / 2;
+    this.assert(pass, `expected #{this} to be close to #{exp} (${numDigits} digits)`, `expected #{this} not to be close to #{exp} (${numDigits} digits)`, expected);
+  });
+  m("toContain", function(item) {
+    const obj = this._obj;
+    const ok = typeof obj === "string" ? obj.includes(item) : Array.from(obj).includes(item);
+    this.assert(ok, "expected #{this} to contain #{exp}", "expected #{this} not to contain #{exp}", item);
+  });
+  m("toHaveLength", function(length) {
+    const actual = this._obj == null ? undefined : this._obj.length;
+    this.assert(actual === length, "expected #{this} to have length #{exp}", "expected #{this} not to have length #{exp}", length, actual);
+  });
+  m("toMatch", function(expected) {
+    const obj = this._obj;
+    const ok = expected instanceof RegExp ? expected.test(obj) : String(obj).includes(expected);
+    this.assert(ok, "expected #{this} to match #{exp}", "expected #{this} not to match #{exp}", expected);
+  });
+  m("toHaveProperty", function(path, ...rest) {
+    const keys = Array.isArray(path) ? path : String(path).split(".");
+    let cur = this._obj;
+    let found = true;
+    for (const k of keys) {
+      if (cur != null && k in Object(cur))
+        cur = cur[k];
+      else {
+        found = false;
+        break;
+      }
+    }
+    const pass = found && (rest.length === 0 || utils.eql(cur, rest[0]));
+    this.assert(pass, "expected #{this} to have property #{exp}", "expected #{this} not to have property #{exp}", path);
+  });
+  m("toBeInstanceOf", function(ctor) {
+    this.assert(this._obj instanceof ctor, "expected #{this} to be an instance of #{exp}", "expected #{this} not to be an instance of #{exp}", ctor.name ?? ctor);
+  });
+  m("toThrow", function(expected) {
+    const a = new chai.Assertion(this._obj);
+    if (utils.flag(this, "negate")) {
+      expected === undefined ? a.to.not.throw() : a.to.not.throw(expected);
+    } else {
+      expected === undefined ? a.to.throw() : a.to.throw(expected);
+    }
+  });
+}
+
 // src/util/parsectx.js
 class ParseCtxClassSetCollector extends ParseContext {
   constructor(...args) {
@@ -13994,12 +14096,14 @@ class Transactor {
   }
   async pushRequest(path, name, args = [], opts = {}, parent = null) {
     const curRoot = this.state.val;
-    const curLeaf = path.toTransactionPath().lookup(curRoot);
+    const txnPath = path.toTransactionPath();
+    const curLeaf = txnPath.lookup(curRoot);
     const handler = this.comps.getRequestFor(curLeaf, name) ?? mkReq404(name);
     const resHandlerName = opts?.onResName ?? name;
+    const resPath = opts?.livePath ? null : txnPath.pinKeys(curRoot);
     const push = (specificName, baseName, singleArg, result, error) => {
       const resArgs = specificName ? [singleArg] : [result, error];
-      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent);
+      const t = new ResponseEvent(path, this, specificName ?? baseName, resArgs, parent, resPath);
       this.pushTransaction(t);
     };
     try {
@@ -14074,8 +14178,11 @@ class Transaction {
   getHandlerAndArgs(_root, _instance, _comps) {
     return null;
   }
+  getTransactionPath() {
+    return this.path.toTransactionPath();
+  }
   updateRootValue(curRoot, comps) {
-    const txnPath = this.path.toTransactionPath();
+    const txnPath = this.getTransactionPath();
     const curLeaf = txnPath.lookup(curRoot);
     const newLeaf = this.callHandler(curRoot, curLeaf, comps);
     this._task?.complete?.({ value: newLeaf, old: curLeaf });
@@ -14184,6 +14291,13 @@ class NameArgsTransaction extends Transaction {
 
 class ResponseEvent extends NameArgsTransaction {
   handlerProp = "response";
+  constructor(path, transactor, name, args, parent, txnPath = null) {
+    super(path, transactor, name, args, parent);
+    this._txnPath = txnPath;
+  }
+  getTransactionPath() {
+    return this._txnPath ?? super.getTransactionPath();
+  }
 }
 
 class SendEvent extends NameArgsTransaction {
@@ -15510,6 +15624,7 @@ function collectIterBindings(Comp, compInstance, seq, opts = {}) {
 }
 
 // dev.js
+use(jestMatchers);
 async function test3(opts = {}) {
   const report = await runTests({ expect, ...opts });
   reportTestReportToConsole(report);