fixup! partially thread proper reporter into intrinsics.js

endojs · Nov 12, 2024 · 4f7a7fc · 4f7a7fc
1 parent 9609166
commit 4f7a7fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/packages/ses/src/compartment-shim.js b/packages/ses/src/compartment-shim.js
@@ -8,6 +8,7 @@ const markVirtualizedNativeFunction = tameFunctionToString();
 // @ts-ignore Compartment is definitely on globalThis.
 globalThis.Compartment = makeCompartmentConstructor(
   makeCompartmentConstructor,
+  // TODO pass a proper reporter as second arg to `getGlobalIntrinsics`?
   getGlobalIntrinsics(globalThis),
   markVirtualizedNativeFunction,
 );
diff --git a/packages/ses/src/intrinsics.js b/packages/ses/src/intrinsics.js
@@ -24,6 +24,10 @@ import {
   permitted,
 } from './permits.js';
 
+/**
+ * @import {Reporter} from './reporting-types.js'
+ */
+
 const isFunction = obj => typeof obj === 'function';
 
 // Like defineProperty, but throws if it would modify an existing property.
@@ -72,7 +76,10 @@ function sampleGlobals(globalObject, newPropertyNames) {
   return newIntrinsics;
 }
 
-export const makeIntrinsicsCollector = () => {
+/**
+ * @param {Reporter} reporter
+ */
+export const makeIntrinsicsCollector = reporter => {
   /** @type {Record<any, any>} */
   const intrinsics = create(null);
   let pseudoNatives;
@@ -106,7 +113,7 @@ export const makeIntrinsicsCollector = () => {
           'prototype',
           false,
           `${name}.prototype`,
-          console, // TODO should be a proper Reporter
+          reporter,
         );
         // eslint-disable-next-line no-continue
         continue;
@@ -173,9 +180,10 @@ export const makeIntrinsicsCollector = () => {
  * *original* unsafe (feral, untamed) bindings of these global variables.
  *
  * @param {object} globalObject
+ * @param {Reporter} [reporter] defaults to `console`
  */
-export const getGlobalIntrinsics = globalObject => {
-  const { addIntrinsics, finalIntrinsics } = makeIntrinsicsCollector();
+export const getGlobalIntrinsics = (globalObject, reporter = console) => {
+  const { addIntrinsics, finalIntrinsics } = makeIntrinsicsCollector(reporter);
 
   addIntrinsics(sampleGlobals(globalObject, sharedGlobalPropertyNames));
 

diff --git a/packages/ses/src/lockdown.js b/packages/ses/src/lockdown.js
@@ -281,7 +281,7 @@ export const repairIntrinsics = (options = {}) => {
   const markVirtualizedNativeFunction = tameFunctionToString();
 
   const { addIntrinsics, completePrototypes, finalIntrinsics } =
-    makeIntrinsicsCollector();
+    makeIntrinsicsCollector(reporter);
 
   // @ts-expect-error __hardenTaming__ could be any string
   const tamedHarden = tameHarden(safeHarden, __hardenTaming__);