feat: merge from upstream oxc-project/oxc-resolver - 7th

.gitignore

@@ -1,5 +1,6 @@
 target/
 /npm
 /node_modules
+/napi/node_modules
 /fixtures/pnpm/node_modules
 fuzz/Cargo.lock

Cargo.toml

@@ -80,8 +80,6 @@ name = "resolver"
 
 [dependencies]
 cfg-if = "1.0"
-dashmap = "7.0.0-rc2"
-dunce = "1.0.5" # Normalize Windows paths to the most compatible format, avoiding UNC where possible
 indexmap = { version = "2.10.0", features = ["serde"] }
 json-strip-comments = "1.0.4"
 once_cell = "1.21.3" # Use `std::sync::OnceLock::get_or_try_init` when it is stable.
@@ -93,7 +91,7 @@ simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
 thiserror = "2.0.12"
 tracing = "0.1.41"
 url = "2.5.4"
-windows-sys = { version = "0.60", features = ["Win32_Foundation", "Win32_Storage_FileSystem"] }
+windows-sys = { version = "0.60.2", features = ["Win32_Foundation", "Win32_Storage_FileSystem"] }
 
 pnp = { version = "0.11.0", optional = true }
 

README.md

@@ -189,28 +189,36 @@ The following options are aligned with [enhanced-resolve], and is implemented fo
 
 See [index.d.ts](https://github.com/unrs/unrs-resolver/blob/main/napi/index.d.ts) for Node.js usage.
 
-| Field            | Default                   | Description                                                                                                                                               |
-| ---------------- | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| alias            | {}                        | A hash map of module alias configurations                                                                                                                 |
-| aliasFields      | []                        | A list of alias fields in description files                                                                                                               |
-| extensionAlias   | {}                        | An object which maps extension to extension aliases                                                                                                       |
-| conditionNames   | []                        | A list of exports field condition names                                                                                                                   |
-| descriptionFiles | ["package.json"]          | A list of description files to read from                                                                                                                  |
-| enforceExtension | false                     | Enforce that an extension from extensions must be used                                                                                                    |
-| exportsFields    | ["exports"]               | A list of exports fields in description files                                                                                                             |
-| extensions       | [".js", ".json", ".node"] | A list of extensions which should be tried for files                                                                                                      |
-| fallback         | {}                        | Same as `alias`, but only used if default resolving fails                                                                                                 |
-| fileSystem       |                           | The file system which should be used                                                                                                                      |
-| fullySpecified   | false                     | Request passed to resolve is already fully specified and extensions or main files are not resolved for it (they are still resolved for internal requests) |
-| mainFields       | ["main"]                  | A list of main fields in description files                                                                                                                |
-| mainFiles        | ["index"]                 | A list of main files in directories                                                                                                                       |
-| modules          | ["node_modules"]          | A list of directories to resolve modules from, can be absolute path or folder name                                                                        |
-| resolveToContext | false                     | Resolve to a context instead of a file                                                                                                                    |
-| preferRelative   | false                     | Prefer to resolve module requests as relative request and fallback to resolving as module                                                                 |
-| preferAbsolute   | false                     | Prefer to resolve server-relative urls as absolute paths before falling back to resolve in roots                                                          |
-| restrictions     | []                        | A list of resolve restrictions                                                                                                                            |
-| roots            | []                        | A list of root paths                                                                                                                                      |
-| symlinks         | true                      | Whether to resolve symlinks to their symlinked location, [if possible](https://github.com/unrs/unrs-resolver/blob/main/src/options.rs#L157-L170).         |
+| Field                                 | Default                   | Description                                                                                                                                               |
+| ------------------------------------- | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| alias                                 | {}                        | A hash map of module alias configurations                                                                                                                 |
+| aliasFields                           | []                        | A list of alias fields in description files                                                                                                               |
+| extensionAlias                        | {}                        | An object which maps extension to extension aliases                                                                                                       |
+| conditionNames                        | []                        | A list of exports field condition names                                                                                                                   |
+| enforceExtension                      | false                     | Enforce that a extension from extensions must be used                                                                                                     |
+| exportsFields                         | ["exports"]               | A list of exports fields in description files                                                                                                             |
+| extensions                            | [".js", ".json", ".node"] | A list of extensions which should be tried for files                                                                                                      |
+| fallback                              | {}                        | Same as `alias`, but only used if default resolving fails                                                                                                 |
+| fileSystem                            |                           | The file system which should be used                                                                                                                      |
+| fullySpecified                        | false                     | Request passed to resolve is already fully specified and extensions or main files are not resolved for it (they are still resolved for internal requests) |
+| mainFields                            | ["main"]                  | A list of main fields in description files                                                                                                                |
+| mainFiles                             | ["index"]                 | A list of main files in directories                                                                                                                       |
+| modules                               | ["node_modules"]          | A list of directories to resolve modules from, can be absolute path or folder name                                                                        |
+| resolveToContext                      | false                     | Resolve to a context instead of a file                                                                                                                    |
+| preferRelative                        | false                     | Prefer to resolve module requests as relative request and fallback to resolving as module                                                                 |
+| preferAbsolute                        | false                     | Prefer to resolve server-relative urls as absolute paths before falling back to resolve in roots                                                          |
+| restrictions                          | []                        | A list of resolve restrictions                                                                                                                            |
+| roots                                 | []                        | A list of root paths                                                                                                                                      |
+| symlinks                              | true                      | Whether to resolve symlinks to their symlinked location                                                                                                   |
+| allowPackageExportsInDirectoryResolve | false                     | Allow `exports` field in `require('../directory')`. Not part of `enhanced-resolve`.                                                                       |
+
+### TypeScript Configuration
+
+| Field               | Default | Description                                                                                                                                                                          |
+| ------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| tsconfig            | None    | TypeScript related config for resolver                                                                                                                                               |
+| tsconfig.configFile |         | A relative path to the tsconfig file based on `cwd`, or an absolute path of tsconfig file.                                                                                           |
+| tsconfig.references | `[]`    | - 'auto': inherits from TypeScript config <br/> - `string []`: relative path (based on directory of the referencing tsconfig file) or absolute path of referenced project's tsconfig |
 
 ### Unimplemented Options
 

fixtures/pnp/shared/lib.js

@@ -1,3 +1,3 @@
 module.exports = function(){
     return 42;
-}
+}

justfile

@@ -21,6 +21,7 @@ install:
 # When ready, run the same CI commands
 ready:
   git diff --exit-code --quiet
+  just install
   typos
   cargo fmt
   just check
@@ -54,7 +55,8 @@ check:
 # Run all the tests
 test:
   cargo test --all-features
-  pnpm test
+  node --run build
+  node --run test
 
 # Lint the whole project
 lint:

napi/index.d.ts

@@ -13,6 +13,22 @@ export declare class ResolverFactory {
   async(directory: string, request: string): Promise<ResolveResult>
 }
 
+/** Node.js builtin module when `Options::builtin_modules` is enabled. */
+export interface Builtin {
+  /**
+   * Resolved module.
+   *
+   * Always prefixed with "node:" in compliance with the ESM specification.
+   */
+  resolved: string
+  /**
+   * Whether the request was prefixed with `node:` or not.
+   * `fs` -> `false`.
+   * `node:fs` returns `true`.
+   */
+  isRuntimeModule: boolean
+}
+
 export declare const enum EnforceExtension {
   Auto = 0,
   Enabled = 1,
@@ -41,6 +57,8 @@ export interface NapiResolveOptions {
    * Default `None`
    */
   tsconfig?: TsconfigOptions
+  /** Enable Yarn Plug'n'Play */
+  yarnPnp?: boolean
   /**
    * Alias for [ResolveOptions::alias] and [ResolveOptions::fallback].
    *
@@ -198,11 +216,23 @@ export interface NapiResolveOptions {
    * Default `false`
    */
   moduleType?: boolean
+  /**
+   * Allow `exports` field in `require('../directory')`.
+   *
+   * This is not part of the spec but some vite projects rely on this behavior.
+   * See
+   * * <https://github.com/vitejs/vite/pull/20252>
+   * * <https://github.com/nodejs/node/issues/58827>
+   *
+   * Default: `false`
+   */
+  allowPackageExportsInDirectoryResolve?: boolean
 }
 
 export interface ResolveResult {
   path?: string
   error?: string
+  builtin?: Builtin
   /**
    * Module type for this path.
    *