fix: node 20 目录解析

eavidy · Sep 10, 2023 · 561af7a · 561af7a
1 parent 0075ff3
commit 561af7a
Show file tree

Hide file tree

Showing 5 changed files with 374 additions and 86 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,6 +20,7 @@
  "env": {
  "SAME_PARSER": "${input:SAME_PARSER}"
  },
+ "autoAttachChildProcesses": true,
  "sourceMaps": true,
  "program": "${relativeFile}"
  }

diff --git a/src/internal/common_resolve.ts b/src/internal/common_resolve.ts
diff --git a/src/internal/errors/error.mts → src/internal/errors/error.ts b/src/internal/errors/error.mts → src/internal/errors/error.ts
@@ -38,7 +38,7 @@ export class ERR_INVALID_PACKAGE_TARGET extends CodeError {
 }
 
 export class ERR_INVALID_MODULE_SPECIFIER extends CodeError {
- constructor(request: string, reason: string, base?: string) {
+ constructor(request: string | URL, reason: string, base?: string | null) {
  super(
  `Invalid module "${request}" ${reason}${base ? ` imported from ${base}` : ""}`,
  ERR_INVALID_MODULE_SPECIFIER.name
@@ -47,7 +47,7 @@ export class ERR_INVALID_MODULE_SPECIFIER extends CodeError {
 }
 
 export class ERR_PACKAGE_IMPORT_NOT_DEFINED extends CodeError {
- constructor(specifier: string, packagePath: string, base: string) {
+ constructor(specifier: string, packagePath: string | URL | undefined, base: string) {
  super(
  `Package import specifier "${specifier}" is not defined${
  packagePath ? ` in package ${packagePath}package.json` : ""
@@ -56,7 +56,19 @@ export class ERR_PACKAGE_IMPORT_NOT_DEFINED extends CodeError {
  );
  }
 }
+export class ERR_PACKAGE_PATH_NOT_EXPORTED extends Error {
+ constructor(pkgPath: string, subpath: string, base: undefined | null | string | URL = undefined) {
+ let msg: string;
+ if (subpath === ".")
+ msg = `No "exports" main defined in ${pkgPath}package.json${base ? ` imported from ${base}` : ""}`;
+ else
+ msg = `Package subpath '${subpath}' is not defined by "exports" in ${pkgPath}package.json${
+ base ? ` imported from ${base}` : ""
+ }`;
 
+ super(msg);
+ }
+}
 export function invalidPackageTarget(subpath: string, target: string, packageJSONUrl: URL, internal: any, base: any) {
  if (typeof target === "object" && target !== null) {
  target = JSON.stringify(target, null, "");
@@ -71,7 +83,7 @@ export function invalidPackageTarget(subpath: string, target: string, packageJSO
  base && fileURLToPath(base)
  );
 }
-export function importNotDefined(specifier: string, packageJSONUrl: URL, base: string) {
+export function importNotDefined(specifier: string, packageJSONUrl: URL | undefined, base: string | URL) {
  return new ERR_PACKAGE_IMPORT_NOT_DEFINED(
  specifier,
  packageJSONUrl && fileURLToPath(new URL(".", packageJSONUrl)),
@@ -91,3 +103,18 @@ export function throwInvalidSubpath(
  }" resolution of ${fileURLToPath(packageJSONUrl)}`;
  throw new ERR_INVALID_MODULE_SPECIFIER(request, reason, base && fileURLToPath(base));
 }
+
+export function exportsNotFound(subpath: string, packageJSONUrl: URL, base?: string | URL | null) {
+ return new ERR_PACKAGE_PATH_NOT_EXPORTED(
+ fileURLToPath(new URL(".", packageJSONUrl)),
+ subpath,
+ base && fileURLToPath(base)
+ );
+}
+export function createEsmNotFoundErr(request: string, path: string) {
+ // eslint-disable-next-line no-restricted-syntax
+ const err = new CodeError(`Cannot find module '${request}'`, "MODULE_NOT_FOUND");
+ if (path) (err as any).path = path;
+ // TODO(BridgeAR): Add the requireStack as well.
+ return err;
+}
diff --git a/src/internal/esm_loader.mts b/src/internal/esm_loader.mts
@@ -53,8 +53,8 @@ async function tryResolveDir(
  parentDir: string,
  isCommonJs?: boolean
 ): Promise<NodeLoader.ResolveFxReturn | undefined> {
- const pkgConfig = ExtraModule._readPackage(path);
- if (pkgConfig) {
+ const pkgConfig = ExtraModule._readPackage(path); //node 20 即使不存在也会返回
+ if (pkgConfig && pkgConfig.exists !== false) {
  return tryResolvePkg(nextResolve, path, parentDir);
  } else if (isCommonJs) {
  const absPath = await tryResolveFile(Path.resolve(path, "index"), [".ts", ".js", ".json"]);