Further endo errata

packages/endo/src/archive.js

@@ -156,7 +156,12 @@ export const makeArchive = async (read, moduleLocation) => {
   return archive.data();
 };
 
-export const writeArchive = async (write, read, archiveLocation, moduleLocation) => {
+export const writeArchive = async (
+  write,
+  read,
+  archiveLocation,
+  moduleLocation
+) => {
   const archiveBytes = await makeArchive(read, moduleLocation);
   await write(archiveLocation, archiveBytes);
 };

packages/endo/src/compartmap.js

@@ -110,7 +110,7 @@ const graphPackage = async (
   const { name, version } = packageDescriptor;
   result.label = `${name}@${version}`;
   result.dependencies = dependencies;
-  result.exports = inferExports(packageDescriptor, tags);
+  result.exports = inferExports(packageDescriptor, tags, packageLocation);
 
   return Promise.all(children);
 };

packages/endo/src/import.js

@@ -56,7 +56,12 @@ export const loadLocation = async (read, moduleLocation) => {
   return { execute };
 };
 
-export const importLocation = async (read, moduleLocation, endowments, modules) => {
+export const importLocation = async (
+  read,
+  moduleLocation,
+  endowments,
+  modules
+) => {
   const application = await loadLocation(read, moduleLocation);
   return application.execute(endowments, modules);
 };

packages/endo/src/infer-exports.js

@@ -49,14 +49,15 @@ function* interpretExports(name, exports, tags) {
 // ascending priority order, and the caller should use the last one that exists.
 export function* inferExportsEntries(
   { name, type, main, module, browser, exports },
-  tags
+  tags,
+  location
 ) {
   // TODO support commonjs type packages.
   if (type !== "module") {
     throw new Error(
       `Endo currently only supports packages with "type": "module" in package.json, got ${q(
         type
-      )} in package ${q(name)}`
+      )} in package ${q(name)} at location ${q(location)}`
     );
   }
   // From lowest to highest precedence, such that later entries override former
@@ -92,5 +93,5 @@ export function* inferExportsEntries(
 // every package.
 // That manifest will also prove useful for resolving aliases, like the
 // implicit index.js modules within a package.
-export const inferExports = (descriptor, tags) =>
-  fromEntries(inferExportsEntries(descriptor, tags));
+export const inferExports = (descriptor, tags, location) =>
+  fromEntries(inferExportsEntries(descriptor, tags, location));

packages/endo/src/search.js

@@ -16,7 +16,10 @@ const resolveLocation = (rel, abs) => new URL(rel, abs).toString();
 export const search = async (read, moduleLocation) => {
   let directory = resolveLocation("./", moduleLocation);
   for (;;) {
-    const packageDescriptorLocation = resolveLocation("package.json", directory);
+    const packageDescriptorLocation = resolveLocation(
+      "package.json",
+      directory
+    );
     // eslint-disable-next-line no-await-in-loop
     const packageDescriptorBytes = await read(packageDescriptorLocation).catch(
       () => undefined

packages/endo/test/main.test.js

@@ -69,7 +69,12 @@ test("loadLocation", async t => {
 test("importLocation", async t => {
   t.plan(fixtureAssertionCount);
 
-  const { namespace } = await importLocation(read, fixture, endowments, modules);
+  const { namespace } = await importLocation(
+    read,
+    fixture,
+    endowments,
+    modules
+  );
   assertFixture(t, namespace);
 });