@agoric/internal 0.3.3-dev-0142906.0 → 0.3.3-dev-7386420.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-0142906.0+0142906",
+  "version": "0.3.3-dev-7386420.0+7386420",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,8 +20,8 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-0142906.0+0142906",
-    "@agoric/base-zone": "0.1.1-dev-0142906.0+0142906",
+    "@agoric/assert": "0.6.1-dev-7386420.0+7386420",
+    "@agoric/base-zone": "0.1.1-dev-7386420.0+7386420",
     "@endo/common": "^1.0.2",
     "@endo/far": "^1.0.2",
     "@endo/init": "^1.0.2",
@@ -53,5 +53,5 @@
   "typeCoverage": {
     "atLeast": 92.28
   },
-  "gitHead": "01429068207eee29c412eadc15dabf70d519e5d3"
+  "gitHead": "738642095d444795a16ee23c6e34e97f0f8e37ba"
 }

package/src/upgrade-api.d.ts

@@ -1,7 +1,16 @@
-export function makeUpgradeDisconnection(upgradeMessage: string, toIncarnationNumber: number): DisconnectionObject;
-export function isUpgradeDisconnection(err: any): err is DisconnectionObject;
-export type DisconnectionObject = {
-    name: string;
+export namespace UpgradeDisconnectionShape {
+    let name: string;
+    let upgradeMessage: import("@endo/patterns").Matcher;
+    let incarnationNumber: import("@endo/patterns").Matcher;
+}
+export function makeUpgradeDisconnection(upgradeMessage: string, toIncarnationNumber: number): UpgradeDisconnection;
+export function isUpgradeDisconnection(reason: any): reason is UpgradeDisconnection;
+/**
+ * An Error-like object for use as the rejection reason of promises
+ * abandoned by upgrade.
+ */
+export type UpgradeDisconnection = {
+    name: 'vatUpgraded';
     upgradeMessage: string;
     incarnationNumber: number;
 };

package/src/upgrade-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-api.d.ts","sourceRoot":"","sources":["upgrade-api.js"],"names":[],"mappings":"AAgBO,yDAJI,MAAM,uBACN,MAAM,GACJ,mBAAmB,CAO5B;AAcG,4CAHI,GAAG,8BAO6B;kCAlC9B;IAAE,MAAM,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE"}
+{"version":3,"file":"upgrade-api.d.ts","sourceRoot":"","sources":["upgrade-api.js"],"names":[],"mappings":";;;;;AAgCO,yDAJI,MAAM,uBACN,MAAM,GACJ,oBAAoB,CAO7B;AASG,+CALI,GAAG,kCAMkD;;;;;mCApCnD;IACZ,MAAU,aAAa,CAAC;IACxB,cAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAqB,EAAE,MAAM,CAAA;CAC1B"}

package/src/upgrade-api.js

@@ -1,18 +1,34 @@
 // @ts-check
 // @jessie-check
-import { isObject } from '@endo/marshal';
+
+import { M, matches } from '@endo/patterns';
+
+const { isFrozen } = Object;
 
 /**
- * @typedef {{ name: string, upgradeMessage: string, incarnationNumber: number }} DisconnectionObject
+ * An Error-like object for use as the rejection reason of promises
+ * abandoned by upgrade.
+ *
+ * @typedef {{
+ *   name: 'vatUpgraded',
+ *   upgradeMessage: string,
+ *   incarnationNumber: number
+ * }} UpgradeDisconnection
  */
 
+export const UpgradeDisconnectionShape = harden({
+  name: 'vatUpgraded',
+  upgradeMessage: M.string(),
+  incarnationNumber: M.number(),
+});
+
 /**
- * Makes an Error-like object for use as the rejection value of promises
+ * Makes an Error-like object for use as the rejection reason of promises
  * abandoned by upgrade.
  *
  * @param {string} upgradeMessage
  * @param {number} toIncarnationNumber
- * @returns {DisconnectionObject}
+ * @returns {UpgradeDisconnection}
  */
 export const makeUpgradeDisconnection = (upgradeMessage, toIncarnationNumber) =>
   harden({
@@ -22,20 +38,12 @@ export const makeUpgradeDisconnection = (upgradeMessage, toIncarnationNumber) =>
   });
 harden(makeUpgradeDisconnection);
 
-// TODO: Simplify once we have @endo/patterns (or just export the shape).
-// const upgradeDisconnectionShape = harden({
-//   name: 'vatUpgraded',
-//   upgradeMessage: M.string(),
-//   incarnationNumber: M.number(),
-// });
-// const isUpgradeDisconnection = err => matches(err, upgradeDisconnectionShape);
 /**
- * @param {any} err
- * @returns {err is DisconnectionObject}
+ * @param {any} reason
+ *   If `reason` is not frozen, it cannot be an UpgradeDisconnection,
+ *   so returns false without even checking against the shape.
+ * @returns {reason is UpgradeDisconnection}
  */
-export const isUpgradeDisconnection = err =>
-  isObject(err) &&
-  err.name === 'vatUpgraded' &&
-  typeof err.upgradeMessage === 'string' &&
-  typeof err.incarnationNumber === 'number';
+export const isUpgradeDisconnection = reason =>
+  isFrozen(reason) && matches(reason, UpgradeDisconnectionShape);
 harden(isUpgradeDisconnection);