@agoric/kmarshal 0.1.1-orchestration-dev-096c4e8.0 → 0.1.1-other-dev-3eb1a1d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/kmarshal",
-  "version": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
+  "version": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
   "description": "Token-only marshaller for kernel and tests",
   "type": "module",
   "main": "./src/kmarshal.js",
@@ -13,7 +13,7 @@
   "scripts": {
     "build": "exit 0",
     "test": "ava",
-    "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
@@ -21,9 +21,9 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-orchestration-dev-096c4e8.0+096c4e8",
-    "@endo/far": "^1.0.4",
-    "@endo/marshal": "^1.3.0"
+    "@endo/errors": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/marshal": "^1.6.2"
   },
   "devDependencies": {
     "ava": "^5.3.0"
@@ -33,12 +33,12 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
     ],
     "require": [
       "@endo/init/debug.js"
     ],
     "timeout": "2m"
   },
-  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
+  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
 }

package/src/kmarshal.js

@@ -1,6 +1,10 @@
+import { assert, Fail } from '@endo/errors';
 import { Far, passStyleOf } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
-import { assert, Fail } from '@agoric/assert';
+
+/**
+ * @import {ConvertSlotToVal} from '@endo/marshal';
+ */
 
 // Simple wrapper for serializing and unserializing marshalled values inside the
 // kernel, where we don't actually want to use clists nor actually allocate real
@@ -14,7 +18,7 @@ import { assert, Fail } from '@agoric/assert';
 
 const { toStringTag } = Symbol;
 
-const makeStringStandinPromise = kref => {
+const makeStandinPromise = kref => {
   const p = Promise.resolve(`${kref} stand in`);
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
   Object.defineProperty(p, toStringTag, {
@@ -23,8 +27,9 @@ const makeStringStandinPromise = kref => {
   });
   return harden(p);
 };
+harden(makeStandinPromise);
 
-const getStringStandinPromiseTag = p => {
+const getStandinPromiseTag = p => {
   const desc = Object.getOwnPropertyDescriptor(p, toStringTag);
   assert(desc !== undefined, 'promise lacks own @@toStringTag property');
   const kref = desc.value;
@@ -32,73 +37,8 @@ const getStringStandinPromiseTag = p => {
   return kref;
 };
 
-const makeAccessorStandinPromise = kref => {
-  // TODO This Bizarro world hack is only for the version of Endo that
-  // agoric-sdk currently depends on, and is already inconsistent with
-  // the "current" endo. Once agoric-sdk depends only on the next endo,
-  // we should delete this code, and rename `makeStringStandinPromise`
-  // above to `makeStandinPromise`.
-  //
-  // Bizarro World hack for attaching a string property to a Promise, courtesy
-  // of MarkM.  Even though the @@toStringTag property nominally *is* a
-  // string, some unfortunate stuff in our hardened JS safety checks blows up
-  // if it actually is.  Eventually that will be fixed and we'll be able to
-  // use the @@toStringTag property directly, but for now we need to use this
-  // weird construct employing a sneaky getter function.  Note that this is
-  // only necessary in the first place because smallcaps encodes promise
-  // references differently from remotable object references, and the current
-  // version of the smallcaps decoder annoyingly insists that if the encoded
-  // body string says a slot is a promise, then convertSlotToVal had better by
-  // damn return an actual Promise, even if, as in the intended use case here,
-  // we neither want nor need a promise nor are capable of making any use of
-  // the fact that it is one.
-  const p = Promise.resolve(`${kref} stand in`);
-  // Bizarro World makes eslint hallucinate
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  Object.defineProperty(p, toStringTag, {
-    get: reveal => (reveal ? kref : NaN),
-    enumerable: false,
-  });
-  return harden(p);
-};
-
-const getAccessorStandinPromiseTag = p => {
-  // Other half of Bizarro World hack for handling promises.  Note the
-  // peculiar way the @@toStringTag getter is used.
-  const desc = Object.getOwnPropertyDescriptor(p, toStringTag);
-  assert(desc !== undefined, 'promise lacks toStringTag getter');
-
-  const getter = desc.get;
-  assert.typeof(getter, 'function', 'toStringTag getter is not a function');
-  // @ts-expect-error violates the norm that getters have zero parameters
-  const kref = getter(true);
-  assert.typeof(kref, 'string');
-  return kref;
-};
-
-const [makeStandinPromise, getStandinPromiseTag] = (() => {
-  // Use whatever works
-  try {
-    const p = makeStringStandinPromise('string mascot');
-    assert(passStyleOf(p) === 'promise');
-    return [makeStringStandinPromise, getStringStandinPromiseTag];
-  } catch (_1) {
-    try {
-      const p = makeAccessorStandinPromise('accessor mascot');
-      assert(passStyleOf(p) === 'promise');
-      return [makeAccessorStandinPromise, getAccessorStandinPromiseTag];
-    } catch (_2) {
-      throw Error('One of the promise tagging schemes should have worked');
-    }
-  }
-})();
-export { makeStandinPromise };
-harden(makeStandinPromise);
-
 /**
- * @param {string} kref
- * @param {string} [iface]
- * @returns {import('@endo/eventual-send').ERef<KCap>}
+ * @type {ConvertSlotToVal<string>}
  */
 export const kslot = (kref, iface = 'undefined') => {
   assert.typeof(kref, 'string');

package/tsconfig.json

@@ -1,10 +1,7 @@
 // This file can contain .js-specific Typescript compiler config.
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "maxNodeModuleJsDepth": 2,
-  },
+  "compilerOptions": {},
   "include": [
     "src/**/*.js",
     "test/**/*.js"