Skip to content

Use npm published resolution #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/cuddly-comics-poke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@arethetypeswrong/core": patch
---

Use `@loaderkit/resolve` for module resolution
1 change: 1 addition & 0 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/internal/esm/cjsNamespace.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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 {}
Expand Down
298 changes: 0 additions & 298 deletions packages/core/src/internal/esm/cjsResolve.ts

This file was deleted.

14 changes: 7 additions & 7 deletions packages/core/src/internal/esm/esmNamespace.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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])];
}
Loading