fix: resolver cases (#386)

Author: guybedford

src/install/installer.ts

@@ -119,6 +119,7 @@ export class Installer {
   ) {
     this.log = log;
     this.resolver = resolver;
+    this.resolver.installer = this;
     this.resolutions = opts.resolutions || {};
     this.installBaseUrl = baseUrl;
     this.opts = opts;

src/trace/resolver.ts

@@ -105,6 +105,7 @@ export class Resolver {
   traceTs: boolean;
   traceSystem: boolean;
   context: Record<string, any>;
+  installer: Installer;
   constructor({
     env,
     log,
@@ -471,10 +472,7 @@ export class Resolver {
           const subpath = "./" + url.slice(pkgUrl.length);
           if (subpath in pcfg.browser) {
             const target = pcfg.browser[subpath];
-            if (target === false)
-              throw new Error(
-                `TODO: Empty browser map for ${subpath} in ${url}`
-              );
+            if (target === false) return this.resolveEmpty(parentIsCjs, url);
             if (!target.startsWith("./"))
               throw new Error(
                 `TODO: External browser map for ${subpath} to ${target} in ${url}`
@@ -720,14 +718,36 @@ export class Resolver {
     return null;
   }
 
+  async resolveEmpty(cjsEnv: boolean, originalSpecifier: string, parentUrl?: URL) {
+    const stdlibTarget = {
+      registry: "npm",
+      name: "@jspm/core",
+      ranges: [new SemverRange("*")],
+      unstable: true,
+    };
+    const provider = this.installer.getProvider(stdlibTarget);
+    const pkg = await this.resolveLatestTarget(
+      stdlibTarget,
+      provider,
+      parentUrl?.href
+    );
+    return this.resolveExport(
+      await this.pkgToUrl(pkg, provider),
+      "./nodelibs/@empty",
+      cjsEnv,
+      false,
+      originalSpecifier,
+      parentUrl
+    );
+  }
+
   // Note: updates here must be tracked in function above
   async resolveExport(
     pkgUrl: `${string}/`,
     subpath: `.${string}`,
     cjsEnv: boolean,
     parentIsCjs: boolean,
     originalSpecifier: string,
-    installer: Installer,
     parentUrl?: URL
   ): Promise<string> {
     const env = cjsEnv ? this.cjsEnv : this.env;
@@ -739,27 +759,7 @@ export class Resolver {
       pcfg.exports !== null &&
       Object.keys(pcfg.exports).length === 0
     ) {
-      const stdlibTarget = {
-        registry: "npm",
-        name: "@jspm/core",
-        ranges: [new SemverRange("*")],
-        unstable: true,
-      };
-      const provider = installer.getProvider(stdlibTarget);
-      const pkg = await this.resolveLatestTarget(
-        stdlibTarget,
-        provider,
-        parentUrl.href
-      );
-      return this.resolveExport(
-        await this.pkgToUrl(pkg, provider),
-        "./nodelibs/@empty",
-        cjsEnv,
-        parentIsCjs,
-        originalSpecifier,
-        installer,
-        parentUrl
-      );
+      return this.resolveEmpty(cjsEnv, originalSpecifier, parentUrl);
     }
 
     function throwExportNotDefined() {

src/trace/tracemap.ts

@@ -74,6 +74,8 @@ function combineSubpaths(
   installSubpath: "." | `./${string}` | null,
   traceSubpath: "." | `./${string}`
 ): `./${string}` | "." {
+  if (traceSubpath.endsWith('/'))
+    throw new Error('Trailing slash subpaths unsupported');
   return installSubpath === null ||
     installSubpath === "." ||
     traceSubpath === "."
@@ -508,7 +510,6 @@ export default class TraceMap {
           cjsEnv,
           parentIsCjs,
           specifier,
-          this.installer,
           new URL(parentUrl)
         )
       );
@@ -561,11 +562,10 @@ export default class TraceMap {
       const resolved = await this.resolver.realPath(
         await this.resolver.resolveExport(
           installUrl,
-          combineSubpaths(installSubpath, subpath),
+          combineSubpaths(installSubpath, parentIsCjs && subpath.endsWith('/') ? subpath.slice(0, -1) as `./${string}` : subpath),
           cjsEnv,
           parentIsCjs,
           specifier,
-          this.installer,
           new URL(parentUrl)
         )
       );

test/resolve/cjspkg/browser-dep-exclude.js

@@ -0,0 +1 @@
+import 'excluded';

test/resolve/cjspkg/browser-dep-include.js

@@ -0,0 +1 @@
+import 'jquery';

test/resolve/cjspkg/browser.js

@@ -0,0 +1,2 @@
+import './browser-dep-exclude.js';
+import './browser-dep-include.js';

test/resolve/cjspkg/package.json

@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "process": "^0.11.10"
+  },
+  "browser": {
+    "./browser-dep-exclude.js": false
   }
 }

test/resolve/unused-cjs.test.js

@@ -3,6 +3,7 @@ import assert from "assert";
 
 const generator = new Generator({
   mapUrl: import.meta.url,
+  commonJS: true
 });
 
 // Should not throw, index file doesn't use CJS:
@@ -15,3 +16,15 @@ await (async () => {
     assert(false);
   } catch {}
 })();
+
+await generator.install({ target: './cjspkg', subpath: './browser.js' });
+assert.deepStrictEqual(generator.getMap(), {
+  imports: {
+    './cjspkg/browser-dep-exclude.js': 'https://ga.jspm.io/npm:@jspm/[email protected]/nodelibs/@empty.js',
+    'cjspkg/browser.js': './cjspkg/browser.js',
+    unusedcjspkg: './unusedcjspkg/index.js'
+  },
+  scopes: {
+    './cjspkg/': { jquery: 'https://ga.jspm.io/npm:[email protected]/dist/jquery.js' }
+  }
+});

test/test.html

@@ -26,7 +26,7 @@
       "#lib/config/files/index.js": "https://ga.jspm.io/npm:@babel/[email protected]/lib/config/files/index-browser.js",
       "#lib/config/resolve-targets.js": "https://ga.jspm.io/npm:@babel/[email protected]/lib/config/resolve-targets-browser.js",
       "#lib/transform-file.js": "https://ga.jspm.io/npm:@babel/[email protected]/lib/transform-file-browser.js",
-      "#node.js": "https://ga.jspm.io/npm:browserslist@4.23.3/browser.js",
+      "#node.js": "https://ga.jspm.io/npm:browserslist@4.24.0/browser.js",
       "@ampproject/remapping": "https://ga.jspm.io/npm:@ampproject/[email protected]/dist/remapping.umd.js",
       "@babel/code-frame": "https://ga.jspm.io/npm:@babel/[email protected]/lib/index.js",
       "@babel/compat-data/native-modules": "https://ga.jspm.io/npm:@babel/[email protected]/native-modules.js",
@@ -63,15 +63,15 @@
       "@jridgewell/sourcemap-codec": "https://ga.jspm.io/npm:@jridgewell/[email protected]/dist/sourcemap-codec.umd.js",
       "@jridgewell/trace-mapping": "https://ga.jspm.io/npm:@jridgewell/[email protected]/dist/trace-mapping.umd.js",
       "ansi-styles": "https://ga.jspm.io/npm:[email protected]/index.js",
-      "browserslist": "https://ga.jspm.io/npm:browserslist@4.23.3/index.js",
+      "browserslist": "https://ga.jspm.io/npm:browserslist@4.24.0/index.js",
       "buffer": "https://ga.jspm.io/npm:@jspm/[email protected]/nodelibs/browser/buffer.js",
-      "caniuse-lite/dist/unpacker/agents": "https://ga.jspm.io/npm:[email protected].30001658/dist/unpacker/agents.js",
+      "caniuse-lite/dist/unpacker/agents": "https://ga.jspm.io/npm:[email protected].30001664/dist/unpacker/agents.js",
       "chalk": "https://ga.jspm.io/npm:[email protected]/index.js",
       "color-convert": "https://ga.jspm.io/npm:[email protected]/index.js",
       "color-name": "https://ga.jspm.io/npm:[email protected]/index.js",
       "convert-source-map": "https://ga.jspm.io/npm:[email protected]/index.js",
       "debug": "https://ga.jspm.io/npm:[email protected]/src/browser.js",
-      "electron-to-chromium/versions": "https://ga.jspm.io/npm:[email protected].18/versions.js",
+      "electron-to-chromium/versions": "https://ga.jspm.io/npm:[email protected].29/versions.js",
       "escape-string-regexp": "https://ga.jspm.io/npm:[email protected]/index.js",
       "fs": "https://ga.jspm.io/npm:@jspm/[email protected]/nodelibs/browser/fs.js",
       "gensync": "https://ga.jspm.io/npm:[email protected]/index.js",