@agoric/vow 0.1.1-dev-0752cec.0 → 0.1.1-dev-940d3f0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-0752cec.0+0752cec",
+  "version": "0.1.1-dev-940d3f0.0+940d3f0",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -20,9 +20,10 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-0752cec.0+0752cec",
-    "@agoric/internal": "0.3.3-dev-0752cec.0+0752cec",
+    "@agoric/base-zone": "0.1.1-dev-940d3f0.0+940d3f0",
+    "@agoric/internal": "0.3.3-dev-940d3f0.0+940d3f0",
     "@endo/env-options": "^1.1.4",
+    "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
     "@endo/pass-style": "^1.4.0",
     "@endo/patterns": "^1.4.0",
@@ -54,5 +55,5 @@
   "typeCoverage": {
     "atLeast": 89.6
   },
-  "gitHead": "0752cecf484c94c1f596dcf7cb8ffd8429a8381c"
+  "gitHead": "940d3f0a993ca45a6bb0893bd59e6df1f22d9143"
 }

package/src/E.js

@@ -15,10 +15,10 @@
  * designed to be a drop-in replacement for the version in
  * `@endo/eventual-send/src/E.js` which contained no concept of "unwrap",
  */
+import { X, q, Fail, makeError } from '@endo/errors';
 import { trackTurns } from './track-turns.js';
 import { makeMessageBreakpointTester } from './message-breakpoints.js';
 
-const { details: X, quote: q, Fail } = assert;
 const { assign, create } = Object;
 
 const onSend = makeMessageBreakpointTester('ENDO_SEND_BREAKPOINTS');
@@ -79,7 +79,7 @@ const makeEProxyHandler = (recipient, HandledPromise, unwrap) =>
             if (this !== receiver) {
               // Reject the async function call
               return HandledPromise.reject(
-                assert.error(
+                makeError(
                   X`Unexpected receiver for "${q(propertyKey)}" method of E(${q(
                     recipient,
                   )})`,

package/src/message-breakpoints.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { getEnvironmentOption } from '@endo/env-options';
 
-const { quote: q, Fail } = assert;
+import { q, Fail } from '@endo/errors';
 
 const { hasOwn, freeze, entries } = Object;
 

package/src/track-turns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"track-turns.d.ts","sourceRoot":"","sources":["track-turns.js"],"names":[],"mappings":"AAyFO,2BAJwB,CAAC,SAAlB,aAAa,EAAG,SACnB,CAAC,GACC,CAAC,CAmBb;;;;;4BAMY,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS"}
+{"version":3,"file":"track-turns.d.ts","sourceRoot":"","sources":["track-turns.js"],"names":[],"mappings":"AA2FO,2BAJwB,CAAC,SAAlB,aAAa,EAAG,SACnB,CAAC,GACC,CAAC,CAkBb;;;;;4BAMY,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS"}

package/src/track-turns.js

@@ -5,8 +5,10 @@ import {
   environmentOptionsListHas,
 } from '@endo/env-options';
 
-// NOTE: We can't import these because they're not in scope before lockdown.
-// import { assert, details as X, Fail } from '@agoric/assert';
+// Note that in the original track-turns.js in @endo/eventual-send we
+// can't simply import these because `assert` is not in scope before lockdown.
+// But this copy in @agoric/vow the import is fine.
+import { annotateError, X } from '@endo/errors';
 
 // WARNING: Global Mutable State!
 // This state is communicated to `assert` that makes it available to the
@@ -34,7 +36,7 @@ const ENABLED =
 
 const addRejectionNote = detailsNote => reason => {
   if (reason instanceof Error) {
-    assert.note(reason, detailsNote);
+    annotateError(reason, detailsNote);
   }
   if (VERBOSE) {
     console.log('REJECTED at top of event loop', reason);
@@ -42,7 +44,7 @@ const addRejectionNote = detailsNote => reason => {
 };
 
 const wrapFunction =
-  (func, sendingError, X) =>
+  (func, sendingError) =>
   (...args) => {
     hiddenPriorError = sendingError;
     hiddenCurrentTurn += 1;
@@ -53,7 +55,7 @@ const wrapFunction =
         result = func(...args);
       } catch (err) {
         if (err instanceof Error) {
-          assert.note(
+          annotateError(
             err,
             X`Thrown from: ${hiddenPriorError}:${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
           );
@@ -91,18 +93,17 @@ export const trackTurns = funcs => {
   if (!ENABLED || typeof globalThis === 'undefined' || !globalThis.assert) {
     return funcs;
   }
-  const { details: X } = assert;
 
   hiddenCurrentEvent += 1;
   const sendingError = Error(
     `Event: ${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
   );
   if (hiddenPriorError !== undefined) {
-    assert.note(sendingError, X`Caused by: ${hiddenPriorError}`);
+    annotateError(sendingError, X`Caused by: ${hiddenPriorError}`);
   }
 
   return /** @type {T} */ (
-    funcs.map(func => func && wrapFunction(func, sendingError, X))
+    funcs.map(func => func && wrapFunction(func, sendingError))
   );
 };