@agoric/vow 0.1.1-dev-5d70529.0 → 0.1.1-dev-c87930e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vow",
-  "version": "0.1.1-dev-5d70529.0+5d70529",
+  "version": "0.1.1-dev-c87930e.0+c87930e",
   "description": "Remote (shortening and disconnection-tolerant) Promise-likes",
   "type": "module",
   "main": "src/index.js",
@@ -20,8 +20,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-5d70529.0+5d70529",
-    "@agoric/internal": "0.3.3-dev-5d70529.0+5d70529",
+    "@agoric/base-zone": "0.1.1-dev-c87930e.0+c87930e",
+    "@agoric/internal": "0.3.3-dev-c87930e.0+c87930e",
     "@endo/env-options": "^1.1.4",
     "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
@@ -56,5 +56,5 @@
   "typeCoverage": {
     "atLeast": 89.93
   },
-  "gitHead": "5d705299d437b90b473274c5eb073185c23f51cb"
+  "gitHead": "c87930eadf94cb146f054d5f31429c5156c7dacd"
 }

package/src/when.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"when.d.ts","sourceRoot":"","sources":["when.js"],"names":[],"mappings":"AAQO,8EA+DQ,CAAC,EACA,QAAQ,eACR,QAAQ,qBACX,CAAC,yBACO,QAAQ,CAAC,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,sCAC9C,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,kBAC/C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAc1C;mBAIa,UAAU,CAAC,OAAO,QAAQ,CAAC;uCA5FO,YAAY;6BAAZ,YAAY"}
+{"version":3,"file":"when.d.ts","sourceRoot":"","sources":["when.js"],"names":[],"mappings":"AAQO,8EAiEQ,CAAC,EACA,QAAQ,eACR,QAAQ,qBACX,CAAC,yBACO,QAAQ,CAAC,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,sCAC9C,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,kBAC/C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAc1C;mBAIa,UAAU,CAAC,OAAO,QAAQ,CAAC;uCA9FO,YAAY;6BAAZ,YAAY"}

package/src/when.js

@@ -36,24 +36,26 @@ export const makeWhen = (
       if (seenPayloads.has(vowV0)) {
         throw Error('Vow resolution cycle detected');
       }
-      result = await basicE(vowV0)
-        .shorten()
-        .then(
-          res => {
-            seenPayloads.add(vowV0);
-            priorRetryValue = undefined;
-            return res;
-          },
-          e => {
-            const nextValue = isRetryableReason(e, priorRetryValue);
-            if (nextValue) {
-              // Shorten the same specimen to try again.
-              priorRetryValue = nextValue;
-              return result;
-            }
-            throw e;
-          },
-        );
+
+      try {
+        // Shorten the vow to the "next step", whether another vow or a final
+        // result.
+        const res = await basicE(vowV0).shorten();
+
+        // Prevent cycles in the resolution graph.
+        seenPayloads.add(vowV0);
+        priorRetryValue = undefined;
+        result = res;
+      } catch (e) {
+        const nextRetryValue = isRetryableReason(e, priorRetryValue);
+        if (!nextRetryValue) {
+          // Not a retry, so just reject with the reason.
+          throw e;
+        }
+
+        // Shorten the same specimen to try again.
+        priorRetryValue = nextRetryValue;
+      }
       // Advance to the next vow.
       payload = getVowPayload(result);
     }