@agoric/internal 0.3.3-dev-cd45c09.0 → 0.3.3-dev-fb620c9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/internal",
-  "version": "0.3.3-dev-cd45c09.0+cd45c09",
+  "version": "0.3.3-dev-fb620c9.0+fb620c9",
   "description": "Externally unsupported utilities internal to agoric-sdk",
   "type": "module",
   "main": "src/index.js",
@@ -20,10 +20,11 @@
     "lint:types": "tsc"
   },
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-cd45c09.0+cd45c09",
+    "@agoric/base-zone": "0.1.1-dev-fb620c9.0+fb620c9",
     "@endo/common": "^1.2.10",
     "@endo/compartment-mapper": "^1.6.0",
     "@endo/errors": "^1.2.10",
+    "@endo/eventual-send": "^1.3.1",
     "@endo/far": "^1.1.11",
     "@endo/init": "^1.1.9",
     "@endo/marshal": "^1.6.4",
@@ -36,7 +37,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-cd45c09.0+cd45c09",
+    "@agoric/cosmic-proto": "0.4.1-dev-fb620c9.0+fb620c9",
     "@endo/exo": "^1.5.9",
     "@endo/init": "^1.1.9",
     "@fast-check/ava": "^2.0.1",
@@ -63,5 +64,5 @@
   "typeCoverage": {
     "atLeast": 92.98
   },
-  "gitHead": "cd45c09e3b855745d1e641534f7d547bfa95ad74"
+  "gitHead": "fb620c9645318f87ca749aa437e58e5970c19cef"
 }

package/src/method-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AA0CO,+BAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,CAAC,EAAE,CAsBf;AAUM,qCAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,MAAM,EAAE,CAKlB;AA+BI,+BAJiC,CAAC,SAA3B,MAAM,CAAC,WAAW,EAAE,GAAG,CAAE,OAC5B,CAAC,GACC,CAAC,CAiBX"}
+{"version":3,"file":"method-tools.d.ts","sourceRoot":"","sources":["method-tools.js"],"names":[],"mappings":"AAmBO,+BAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,CAAC,EAAE,CAG8B;AAUvC,qCAJoB,CAAC,SAAd,WAAY,OACf,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GACZ,MAAM,EAAE,CAKlB;AA+BI,+BAJiC,CAAC,SAA3B,MAAM,CAAC,WAAW,EAAE,GAAG,CAAE,OAC5B,CAAC,GACC,CAAC,CAiBX"}

package/src/method-tools.js

@@ -1,66 +1,24 @@
 // @ts-check
-import { isObject } from '@endo/marshal';
+import { getMethodNames as realGetMethodNames } from '@endo/eventual-send/utils.js';
 
 /**
  * @file method-tools use dynamic property lookup, which is not
  *   Jessie-compatible
  */
 
-const { getPrototypeOf, create, fromEntries, getOwnPropertyDescriptors } =
-  Object;
-const { ownKeys, apply } = Reflect;
-
-/**
- * Prioritize symbols as earlier than strings.
- *
- * @param {string | symbol} a
- * @param {string | symbol} b
- * @returns {-1 | 0 | 1}
- */
-const compareStringified = (a, b) => {
-  if (typeof a === typeof b) {
-    const left = String(a);
-    const right = String(b);
-    // eslint-disable-next-line no-nested-ternary
-    return left < right ? -1 : left > right ? 1 : 0;
-  }
-  if (typeof a === 'symbol') {
-    assert(typeof b === 'string');
-    return -1;
-  }
-  assert(typeof a === 'string');
-  assert(typeof b === 'symbol');
-  return 1;
-};
+const { create, fromEntries } = Object;
+const { apply } = Reflect;
 
 /**
  * TODO Consolidate with the `getMethodNames` in `@endo/eventual-send`
  *
+ * @deprecated Use `getMethodNames` from `@endo/eventual-send/utils.js` instead.
  * @template {PropertyKey} K
  * @param {Record<K, any>} val
  * @returns {K[]}
  */
-export const getMethodNames = val => {
-  let layer = val;
-  const names = new Set(); // Set to deduplicate
-  while (layer !== null && layer !== Object.prototype) {
-    // be tolerant of non-objects
-    const descs = getOwnPropertyDescriptors(layer);
-    const ownNames = /** @type {K[]} */ (ownKeys(descs));
-    for (const name of ownNames) {
-      // In case a method is overridden by a non-method,
-      // test `val[name]` rather than `layer[name]`
-      if (typeof val[name] === 'function') {
-        names.add(name);
-      }
-    }
-    if (!isObject(val)) {
-      break;
-    }
-    layer = getPrototypeOf(layer);
-  }
-  return harden([...names].sort(compareStringified));
-};
+export const getMethodNames = val =>
+  /** @type {K[]} */ (realGetMethodNames(val));
 harden(getMethodNames);
 
 /**
@@ -72,7 +30,7 @@ harden(getMethodNames);
  */
 export const getStringMethodNames = val =>
   /** @type {string[]} */ (
-    getMethodNames(val).filter(name => typeof name === 'string')
+    realGetMethodNames(val).filter(name => typeof name === 'string')
   );
 
 /**
@@ -109,7 +67,7 @@ export const bindAllMethods = obj =>
     create(
       obj,
       fromEntries(
-        getMethodNames(obj).map(name => [
+        realGetMethodNames(obj).map(name => [
           name,
           {
             value: (/** @type {unknown[]} */ ...args) =>