Merge pull request #1794 from endojs/markm-symbol-insteadof-VatData

feat(pass-style): Use endowed passStyleOf if at global symbol
endojs · Sep 29, 2023 · 2a85f8a · 2a85f8a
2 parents 1407148 + 53658ea
commit 2a85f8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/pass-style/endow.js b/packages/pass-style/endow.js
@@ -0,0 +1 @@
+export { PassStyleOfEndowmentSymbol } from './src/passStyleOf.js';
diff --git a/packages/pass-style/package.json b/packages/pass-style/package.json
@@ -19,6 +19,7 @@
   "exports": {
     ".": "./index.js",
     "./tools.js": "./tools.js",
+    "./endow.js": "./endow.js",
     "./package.json": "./package.json"
   },
   "scripts": {

diff --git a/packages/pass-style/src/passStyleOf.js b/packages/pass-style/src/passStyleOf.js
@@ -190,10 +190,13 @@ const makePassStyleOf = passStyleHelpers => {
   return harden(passStyleOf);
 };
 
+export const PassStyleOfEndowmentSymbol = Symbol.for('@endo passStyleOf');
+
 /**
- * If there is already a `VataData` global containing a `passStyleOf`,
- * then presumably it was endowed for us by liveslots, so we should use
- * and export that one instead. Other software may have left it for us here,
+ * If there is already a PassStyleOfEndowmentSymbol property on the global,
+ * then presumably it was endowed for us by liveslots with a `passStyleOf`
+ * function, so we should use and export that one instead.
+ * Other software may have left it for us here,
  * but it would require write access to our global, or the ability to
  * provide endowments to our global, both of which seems adequate as a test of
  * whether it is authorized to serve the same role as liveslots.
@@ -205,9 +208,7 @@ const makePassStyleOf = passStyleHelpers => {
  * @type {PassStyleOf}
  */
 export const passStyleOf =
-  // UNTIL https://github.com/endojs/endo/issues/1514
-  // Prefer: globalThis?.VatData?.passStyleOf ||
-  (globalThis && globalThis.VatData && globalThis.VatData.passStyleOf) ||
+  (globalThis && globalThis[PassStyleOfEndowmentSymbol]) ||
   makePassStyleOf([
     CopyArrayHelper,
     CopyRecordHelper,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { PassStyleOfEndowmentSymbol } from './src/passStyleOf.js';