Merge pull request #239 from laverdet/main

Use npm published resolution

Author: andrewbranch

Diff for: .changeset/cuddly-comics-poke.md

@@ -0,0 +1,5 @@
+---
+"@arethetypeswrong/core": patch
+---
+
+Use `@loaderkit/resolve` for module resolution

Diff for: packages/core/package.json

@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@andrewbranch/untar.js": "^1.0.3",
+    "@loaderkit/resolve": "^1.0.2",
     "cjs-module-lexer": "^1.2.3",
     "fflate": "^0.8.2",
     "lru-cache": "^10.4.3",

Diff for: packages/core/src/internal/esm/cjsNamespace.ts

@@ -1,6 +1,6 @@
 import { Package } from "../../createPackage.js";
 import { getCjsModuleBindings } from "./cjsBindings.js";
-import { cjsResolve } from "./cjsResolve.js";
+import { cjsResolve } from "./resolve.js";
 
 export function getCjsModuleNamespace(fs: Package, file: URL, seen = new Set<string>()): Set<string> {
   seen.add(file.pathname);
@@ -17,9 +17,9 @@ export function getCjsModuleNamespace(fs: Package, file: URL, seen = new Set<str
 
   for (const source of bindings.reexports.reverse()) {
     try {
-      const { format, resolved } = cjsResolve(fs, source, file);
-      if (format === "commonjs" && !seen.has(resolved.pathname)) {
-        const reexported = getCjsModuleNamespace(fs, resolved, seen);
+      const { format, url } = cjsResolve(fs, source, file);
+      if (format === "commonjs" && !seen.has(url.pathname)) {
+        const reexported = getCjsModuleNamespace(fs, url, seen);
         reexported.forEach((name) => exports.add(name));
       }
     } catch {}

Diff for: packages/core/src/internal/esm/cjsResolve.ts

@@ -1,7 +1,7 @@
 import { Package } from "../../createPackage.js";
 import { getEsmModuleBindings } from "./esmBindings.js";
-import { esmResolve } from "./esmResolve.js";
 import { getCjsModuleNamespace } from "./cjsNamespace.js";
+import { esmResolve } from "./resolve.js";
 
 // Note: this doesn't handle ambiguous indirect exports which probably isn't worth the
 // implementation complexity.
@@ -13,28 +13,28 @@ export function getEsmModuleNamespace(
   seen = new Set<string>(),
 ): string[] {
   // Resolve specifier
-  const { format, resolved } = esmResolve(fs, specifier, parentURL);
+  const { format, url } = esmResolve(fs, specifier, parentURL);
 
   // Don't recurse for circular indirect exports
-  if (seen.has(resolved.pathname)) {
+  if (seen.has(url.pathname)) {
     return [];
   }
-  seen.add(resolved.pathname);
+  seen.add(url.pathname);
 
   if (format === "commonjs") {
-    return [...getCjsModuleNamespace(fs, resolved)];
+    return [...getCjsModuleNamespace(fs, url)];
   }
 
   // Parse module bindings
   const bindings =
     (format ?? "module") === "module"
-      ? getEsmModuleBindings(fs.readFile(resolved.pathname))
+      ? getEsmModuleBindings(fs.readFile(url.pathname))
       : // Maybe JSON, WASM, etc
         { exports: ["default"], reexports: [] };
 
   // Concat indirect exports
   const indirect = bindings.reexports
-    .flatMap((specifier) => getEsmModuleNamespace(fs, specifier, resolved, seen))
+    .flatMap((specifier) => getEsmModuleNamespace(fs, specifier, url, seen))
     .filter((name) => name !== "default");
   return [...new Set([...bindings.exports, ...indirect])];
 }

Diff for: packages/core/src/internal/esm/esmNamespace.ts

@@ -0,0 +1,21 @@
+import type { Package } from "#createPackage.js";
+import * as cjs from "@loaderkit/resolve/cjs";
+import * as esm from "@loaderkit/resolve/esm";
+import type { FileSystemSync } from "@loaderkit/resolve/fs";
+
+function makeFileSystemAdapter(fs: Package): FileSystemSync {
+  return {
+    directoryExists: url => fs.directoryExists(url.pathname),
+    fileExists: url => fs.fileExists(url.pathname),
+    readFileJSON: (url) => JSON.parse(fs.readFile(url.pathname)),
+    readLink: () => undefined,
+  }
+}
+
+export function cjsResolve(fs: Package, specifier: string, parentURL: URL) {
+  return cjs.resolveSync(makeFileSystemAdapter(fs), specifier, parentURL);
+}
+
+export function esmResolve(fs: Package, specifier: string, parentURL: URL) {
+  return esm.resolveSync(makeFileSystemAdapter(fs), specifier, parentURL);
+}