TMP commit

packages/compartment-mapper/src/import-hook.js

@@ -3,13 +3,15 @@
 /** @typedef {import('ses').ImportHook} ImportHook */
 /** @typedef {import('ses').StaticModuleType} StaticModuleType */
 /** @typedef {import('./types.js').ReadFn} ReadFn */
+/** @typedef {import('./types.js').ReadPowers} ReadPowers */
 /** @typedef {import('./types.js').HashFn} HashFn */
 /** @typedef {import('./types.js').Sources} Sources */
 /** @typedef {import('./types.js').CompartmentSources} CompartmentSources */
 /** @typedef {import('./types.js').CompartmentDescriptor} CompartmentDescriptor */
 /** @typedef {import('./types.js').ImportHookMaker} ImportHookMaker */
 
 import { parseExtension } from './extension.js';
+import { unpackReadPowers } from './powers.js';
 
 // q, as in quote, for quoting strings in error messages.
 const q = JSON.stringify;
@@ -44,7 +46,7 @@ function getImportsFromRecord(record) {
 }
 
 /**
- * @param {ReadFn} read
+ * @param {ReadFn|ReadPowers} readPowers
  * @param {string} baseLocation
  * @param {Sources} sources
  * @param {Record<string, CompartmentDescriptor>} compartments
@@ -53,7 +55,7 @@ function getImportsFromRecord(record) {
  * @returns {ImportHookMaker}
  */
 export const makeImportHookMaker = (
-  read,
+  readPowers,
   baseLocation,
   sources = Object.create(null),
   compartments = Object.create(null),
@@ -150,6 +152,8 @@ export const makeImportHookMaker = (
         }
       }
 
+      const { read } = unpackReadPowers(readPowers);
+
       for (const candidateSpecifier of candidates) {
         // Using a specifier as a location.
         // This is not always valid.
@@ -170,6 +174,7 @@ export const makeImportHookMaker = (
             candidateSpecifier,
             moduleLocation,
             packageLocation,
+            readPowers,
           );
           const {
             parser,

packages/compartment-mapper/src/import.js

@@ -69,7 +69,7 @@ export const loadLocation = async (readPowers, moduleLocation, options) => {
       __shimTransforms__,
       Compartment,
     } = options;
-    const makeImportHook = makeImportHookMaker(read, packageLocation);
+    const makeImportHook = makeImportHookMaker(readPowers, packageLocation);
     const { compartment } = link(compartmentMap, {
       makeImportHook,
       parserForLanguage,
@@ -88,13 +88,17 @@ export const loadLocation = async (readPowers, moduleLocation, options) => {
 };
 
 /**
- * @param {ReadFn} read
+ * @param {ReadFn | ReadPowers} readPowers
  * @param {string} moduleLocation
  * @param {ExecuteOptions & ArchiveOptions} [options]
  * @returns {Promise<Object>} the object of the imported modules exported
  * names.
  */
-export const importLocation = async (read, moduleLocation, options = {}) => {
-  const application = await loadLocation(read, moduleLocation, options);
+export const importLocation = async (
+  readPowers,
+  moduleLocation,
+  options = {},
+) => {
+  const application = await loadLocation(readPowers, moduleLocation, options);
   return application.import(options);
 };

packages/compartment-mapper/src/node-powers.js

@@ -90,7 +90,7 @@ const makeReadPowersSloppy = ({ fs, url = undefined, crypto = undefined }) => {
       }
     : undefined;
 
-  return { read, canonical, computeSha512 };
+  return { read, fileURLToPath, canonical, computeSha512 };
 };
 
 /**

packages/compartment-mapper/src/parse-cjs-shared-export-wrapper.js

@@ -8,13 +8,33 @@ const { freeze, keys, create, hasOwnProperty } = Object;
  * @returns {boolean}
  */
 const has = (object, key) => apply(hasOwnProperty, object, [key]);
-
-export const dropFileProtocol = url => {
+const removeProtocol = url => {
   if (url.substring(0, 7) === 'file://') {
     url = url.substring(7);
   }
   return url;
 };
+const locationParent = location => {
+  const index = location.lastIndexOf('/');
+  if (index >= 0) {
+    return location.slice(0, index);
+  }
+  return location;
+};
+
+export const getPaths = async (readPowers, url) => {
+  let urlF = url;
+  let urlD = locationParent(url);
+
+  if (readPowers && readPowers.canonical) {
+    urlF = await readPowers.canonical(urlF);
+    urlD = await readPowers.canonical(urlD);
+  }
+  return {
+    filename: removeProtocol(urlF),
+    dirname: removeProtocol(urlD),
+  };
+};
 
 /**
  * ModuleEnvironmentRecord wrapper

packages/compartment-mapper/src/parse-cjs.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 import { analyzeCommonJS } from '@endo/cjs-module-analyzer';
-import { wrap, dropFileProtocol } from './parse-cjs-shared-export-wrapper.js';
+import { wrap, getPaths } from './parse-cjs-shared-export-wrapper.js';
 
 const textDecoder = new TextDecoder();
 
@@ -13,6 +13,7 @@ export const parseCjs = async (
   _specifier,
   location,
   _packageLocation,
+  readPowers,
 ) => {
   const source = textDecoder.decode(bytes);
 
@@ -25,6 +26,8 @@ export const parseCjs = async (
     exports.push('default');
   }
 
+  const lowlow = await getPaths(readPowers, location); // __filename
+
   /**
    * @param {Object} moduleEnvironmentRecord
    * @param {Compartment} compartment
@@ -45,8 +48,8 @@ export const parseCjs = async (
       require,
       moduleExports,
       module,
-      dropFileProtocol(location), // __filename
-      dropFileProtocol(new URL('./', location).toString()), // __dirname
+      lowlow.filename,
+      lowlow.dirname,
     );
 
     afterExecute();

packages/compartment-mapper/src/parse-pre-cjs.js

@@ -1,31 +1,27 @@
 // @ts-check
 
 import { parseLocatedJson } from './json.js';
-import { wrap, dropFileProtocol } from './parse-cjs-shared-export-wrapper.js';
+import { wrap, getPaths } from './parse-cjs-shared-export-wrapper.js';
 
 const textDecoder = new TextDecoder();
 
-const locationParent = location => {
-  const index = location.lastIndexOf('/');
-  if (index >= 0) {
-    return location.slice(0, index);
-  }
-  return location;
-};
 
 /** @type {import('./types.js').ParseFn} */
 export const parsePreCjs = async (
   bytes,
   _specifier,
   location,
   _packageLocation,
+  readPowers,
 ) => {
   const text = textDecoder.decode(bytes);
   const { source, imports, exports, reexports } = parseLocatedJson(
     text,
     location,
   );
 
+  const lowlow = await getPaths(readPowers, location); // __filename
+
   /**
    * @param {Object} moduleEnvironmentRecord
    * @param {Compartment} compartment
@@ -44,8 +40,8 @@ export const parsePreCjs = async (
       require,
       moduleExports,
       module,
-      dropFileProtocol(location), // __filename
-      dropFileProtocol(locationParent(location)), // __dirname
+      lowlow.filename, // __filename
+      lowlow.dirname, // __dirname
     );
 
     afterExecute();

packages/compartment-mapper/src/types.js

@@ -190,6 +190,7 @@ export const moduleJSDocTypes = true;
  * @param {string} specifier
  * @param {string} location
  * @param {string} packageLocation
+ * @param {ReadFn | ReadPowers} [readPowers]
  * @returns {Promise<{
  *   bytes: Uint8Array,
  *   parser: Language,

packages/compartment-mapper/test/test-cjs-compat.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 // import "./ses-lockdown.js";
 import 'ses';
 import test from 'ava';
@@ -8,6 +9,10 @@ const fixture = new URL(
   'fixtures-cjs-compat/node_modules/app/index.js',
   import.meta.url,
 ).toString();
+const fixtureDirname = new URL(
+  'fixtures-cjs-compat/node_modules/app/dirname.js',
+  import.meta.url,
+).toString();
 
 const assertFixture = (t, { namespace }) => {
   const { assertions } = namespace;
@@ -32,3 +37,16 @@ scaffold(
   assertFixture,
   fixtureAssertionCount,
 );
+
+scaffold(
+  'fixtures-cjs-compat-__dirname',
+  test,
+  fixtureDirname,
+  (t, { namespace }) => {
+    const { __dirname, __filename } = namespace;
+    t.is(__filename, `${__dirname}/dirname.js`);
+    t.assert(!__dirname.startsWith('file://'));
+    throw JSON.stringify({ __dirname, __filename });
+  },
+  2,
+);