@atlaspack/node-resolver-core 3.5.5-canary.137 → 3.5.5-canary.139

package/lib/Wrapper.d.ts

@@ -0,0 +1,36 @@
+import type { FilePath, SpecifierType, SemverRange, Environment, SourceLocation, BuildMode, ResolveResult, PluginLogger } from '@atlaspack/types';
+import type { FileSystem } from '@atlaspack/fs';
+import type { PackageManager } from '@atlaspack/package-manager';
+import type { Diagnostic } from '@atlaspack/diagnostic';
+type Options = {
+    fs: FileSystem;
+    projectRoot: FilePath;
+    packageManager?: PackageManager;
+    logger?: PluginLogger;
+    shouldAutoInstall?: boolean;
+    mode: BuildMode;
+    mainFields?: Array<string>;
+    extensions?: Array<string>;
+    packageExports?: boolean;
+};
+type ResolveOptions = {
+    filename: FilePath;
+    parent: FilePath | null | undefined;
+    specifierType: SpecifierType;
+    range?: SemverRange | null | undefined;
+    env: Environment;
+    sourcePath?: FilePath | null | undefined;
+    loc?: SourceLocation | null | undefined;
+    packageConditions?: Array<string> | null | undefined;
+};
+export default class NodeResolver {
+    resolversByEnv: Map<string, any>;
+    options: Options;
+    constructor(options: Options);
+    resolve(options: ResolveOptions): Promise<ResolveResult | null | undefined>;
+    resolveBuiltin(name: string, options: ResolveOptions): Promise<ResolveResult | null | undefined>;
+    shouldIncludeNodeModule({ includeNodeModules }: Environment, name: string): boolean | null | undefined;
+    handleError(error: any, options: ResolveOptions): Promise<Diagnostic | Array<Diagnostic> | null | undefined>;
+    checkExcludedDependency(sourceFile: FilePath, name: string, options: ResolveOptions): Promise<Diagnostic | null | undefined>;
+}
+export {};

package/lib/Wrapper.js

@@ -71,6 +71,8 @@ function _featureFlags() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// @ts-expect-error TS2305
+
 // Package.json fields. Must match package_json.rs.
 const MAIN = 1 << 0;
 const MODULE = 1 << 1;
@@ -116,7 +118,7 @@ class NodeResolver {
         conditions: environmentToExportsConditions(options.env, this.options.mode),
         packageExports: this.options.packageExports ?? false,
         moduleDirResolver: process.versions.pnp != null ? (module, from) => {
-          // $FlowFixMe[prop-missing]
+          // @ts-expect-error TS2339
           let pnp = _module().default.findPnpApi(_path().default.dirname(from));
           return pnp.resolveToUnqualified(
           // append slash to force loading builtins from npm
@@ -137,16 +139,12 @@ class NodeResolver {
 
     // Async resolver is only supported in non-WASM environments, and does not support JS callbacks (e.g. FS, PnP).
     let canResolveAsync = !_rust().init && this.options.fs instanceof _fs().NodeFS && process.versions.pnp == null;
-    let res = canResolveAsync ?
-    // $FlowFixMe[incompatible-call] - parent is not null here.
-    await resolver.resolveAsync(options) :
-    // $FlowFixMe[incompatible-call] - parent is not null here.
-    resolver.resolve(options);
+    let res = canResolveAsync ? await resolver.resolveAsync(options) : resolver.resolve(options);
 
     // Invalidate whenever the .pnp.js file changes.
     // TODO: only when we actually resolve a node_modules package?
     if (process.versions.pnp != null && options.parent && res.invalidateOnFileChange) {
-      // $FlowFixMe[prop-missing]
+      // @ts-expect-error TS2339
       let pnp = _module().default.findPnpApi(_path().default.dirname(options.parent));
       res.invalidateOnFileChange.push(pnp.resolveToUnqualified('pnpapi', null));
     }
@@ -242,6 +240,7 @@ class NodeResolver {
         if (this.options.shouldAutoInstall && packageManager) {
           var _this$options$logger2;
           (_this$options$logger2 = this.options.logger) === null || _this$options$logger2 === void 0 || _this$options$logger2.warn({
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Auto installing polyfill for Node builtin module "${packageName}"...`,
             codeFrames: options.loc ? [{
               filePath: options.loc.filePath,
@@ -267,13 +266,16 @@ class NodeResolver {
         } else {
           throw new (_diagnostic().default)({
             diagnostic: {
+              // @ts-expect-error TS2345
               message: (0, _diagnostic().md)`Node builtin polyfill "${packageName}" is not installed, but auto install is disabled.`,
               codeFrames: options.loc ? [{
                 filePath: options.loc.filePath,
                 codeHighlights: [(0, _diagnostic().convertSourceLocationToHighlight)(options.loc, 'used here')]
               }] : [],
               documentationURL: 'https://parceljs.org/features/node-emulation/#polyfilling-%26-excluding-builtin-node-modules',
-              hints: [(0, _diagnostic().md)`Install the "${packageName}" package with your package manager, and run Parcel again.`]
+              hints: [
+              // @ts-expect-error TS2345
+              (0, _diagnostic().md)`Install the "${packageName}" package with your package manager, and run Parcel again.`]
             }
           });
         }
@@ -327,6 +329,7 @@ class NodeResolver {
           );
 
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Cannot load file '${relative}' in '${(0, _utils().relativePath)(this.options.projectRoot, dir)}'.`,
             hints: potentialFiles.map(r => {
               return `Did you mean '__${r}__'?`;
@@ -337,6 +340,7 @@ class NodeResolver {
         {
           let alternativeModules = await (0, _utils().findAlternativeNodeModules)(this.options.fs, error.module, options.parent ? _path().default.dirname(options.parent) : this.options.projectRoot);
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Cannot find module '${error.module}'`,
             hints: alternativeModules.map(r => {
               return `Did you mean '__${r}__'?`;
@@ -351,6 +355,7 @@ class NodeResolver {
           let alternative = alternatives[0];
           let pkgContent = await this.options.fs.readFile(error.package_path, 'utf8');
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Could not load '${fileSpecifier}' from module '${error.module}' found in package.json#${error.field}`,
             codeFrames: [{
               filePath: error.package_path,
@@ -359,6 +364,7 @@ class NodeResolver {
               codeHighlights: (0, _diagnostic().generateJSONCodeHighlights)(pkgContent, [{
                 key: `/${error.field}`,
                 type: 'value',
+                // @ts-expect-error TS2345
                 message: (0, _diagnostic().md)`'${fileSpecifier}' does not exist${alternative ? `, did you mean '${alternative}'?` : ''}'`
               }])
             }]
@@ -378,6 +384,7 @@ class NodeResolver {
             relative = './' + relative;
           }
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Cannot load file '${relative}' from module '${error.module}'`,
             hints: potentialFiles.map(r => {
               return `Did you mean '__${error.module}/${r}__'?`;
@@ -433,6 +440,7 @@ class NodeResolver {
       case 'UnknownScheme':
         {
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Unknown url scheme or pipeline '${error.scheme}:'`
           };
         }
@@ -444,6 +452,7 @@ class NodeResolver {
             case 'PackagePathNotExported':
               {
                 return {
+                  // @ts-expect-error TS2345
                   message: (0, _diagnostic().md)`Module '${options.filename}' is not exported from the '${error.module}' package`,
                   codeFrames: [{
                     filePath: error.path,
@@ -460,6 +469,7 @@ class NodeResolver {
               {
                 let parsed = (0, _jsonSourcemap().parse)(pkgContent);
                 return {
+                  // @ts-expect-error TS2345
                   message: (0, _diagnostic().md)`Package import '${options.filename}' is not defined in the '${error.module}' package`,
                   codeFrames: [{
                     filePath: error.path,
@@ -475,6 +485,7 @@ class NodeResolver {
             case 'InvalidPackageTarget':
               {
                 return {
+                  // @ts-expect-error TS2345
                   message: (0, _diagnostic().md)`Invalid package target in the '${error.module} package. Targets may not refer to files outside the package.`,
                   codeFrames: [{
                     filePath: error.path,
@@ -491,6 +502,7 @@ class NodeResolver {
             case 'InvalidSpecifier':
               {
                 return {
+                  // @ts-expect-error TS2345
                   message: (0, _diagnostic().md)`Invalid package import specifier '${options.filename}'.`
                 };
               }
@@ -500,6 +512,7 @@ class NodeResolver {
       case 'PackageJsonNotFound':
         {
           return {
+            // @ts-expect-error TS2345
             message: (0, _diagnostic().md)`Cannot find a package.json above '${(0, _utils().relativePath)(this.options.projectRoot, options.parent ? _path().default.dirname(options.parent) : this.options.projectRoot)}'`
           };
         }
@@ -545,6 +558,7 @@ class NodeResolver {
     if (!((_pkg$dependencies = pkg.dependencies) !== null && _pkg$dependencies !== void 0 && _pkg$dependencies[moduleName]) && !((_pkg$peerDependencies = pkg.peerDependencies) !== null && _pkg$peerDependencies !== void 0 && _pkg$peerDependencies[moduleName]) && !((_pkg$engines = pkg.engines) !== null && _pkg$engines !== void 0 && _pkg$engines[moduleName])) {
       let pkgContent = await this.options.fs.readFile(pkgfile, 'utf8');
       return {
+        // @ts-expect-error TS2345
         message: (0, _diagnostic().md)`External dependency "${moduleName}" is not declared in package.json.`,
         codeFrames: [{
           filePath: pkgfile,
@@ -576,6 +590,7 @@ class NodeResolver {
         let pkgContent = await this.options.fs.readFile(pkgfile, 'utf8');
         let field = (_pkg$dependencies3 = pkg.dependencies) !== null && _pkg$dependencies3 !== void 0 && _pkg$dependencies3[moduleName] ? 'dependencies' : 'peerDependencies';
         return {
+          // @ts-expect-error TS2345
           message: (0, _diagnostic().md)`External dependency "${moduleName}" does not satisfy required semver range "${range}".`,
           codeFrames: [{
             filePath: pkgfile,

package/lib/builtins.browser.d.ts

@@ -0,0 +1,8 @@
+export declare const empty: string;
+declare let builtins: {
+    [key: string]: {
+        name: string;
+        range: string | null | undefined;
+    };
+};
+export default builtins;

package/lib/builtins.browser.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.empty = exports.default = void 0;
 const builtinModules = ['_http_agent', '_http_client', '_http_common', '_http_incoming', '_http_outgoing', '_http_server', '_stream_duplex', '_stream_passthrough', '_stream_readable', '_stream_transform', '_stream_wrap', '_stream_writable', '_tls_common', '_tls_wrap', 'assert', 'assert/strict', 'async_hooks', 'buffer', 'child_process', 'cluster', 'console', 'constants', 'crypto', 'dgram', 'diagnostics_channel', 'dns', 'dns/promises', 'domain', 'events', 'fs', 'fs/promises', 'http', 'http2', 'https', 'inspector', 'module', 'net', 'os', 'path', 'path/posix', 'path/win32', 'perf_hooks', 'process', 'punycode', 'querystring', 'readline', 'repl', 'stream', 'stream/consumers', 'stream/promises', 'stream/web', 'string_decoder', 'sys', 'timers', 'timers/promises', 'tls', 'trace_events', 'tty', 'url', 'util', 'util/types', 'v8', 'vm', 'worker_threads', 'zlib'];
 const empty = exports.empty = '/_empty.js';
-let builtins =
-// $FlowFixMe
-Object.create(null);
+let builtins = Object.create(null);
 
 // use definite (current) list of Node builtins
 for (let key of builtinModules) {

package/lib/builtins.d.ts

@@ -0,0 +1,8 @@
+export declare const empty: string;
+declare let builtins: {
+    [key: string]: {
+        name: string;
+        range: string | null | undefined;
+    };
+};
+export default builtins;

package/lib/builtins.js

@@ -20,12 +20,10 @@ function _nullthrows() {
 }
 var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe this is untyped
 // flowlint-next-line untyped-import:off
+
 const empty = exports.empty = require.resolve('./_empty.js');
-let builtins =
-// $FlowFixMe
-Object.create(null);
+let builtins = Object.create(null);
 
 // use definite (current) list of Node builtins
 for (let key of _module().builtinModules) {
@@ -60,9 +58,11 @@ let polyfills = {
   zlib: 'browserify-zlib'
 };
 for (let k in polyfills) {
+  // @ts-expect-error TS7053
   let polyfill = polyfills[k];
   builtins[k] = {
     name: polyfill + (_module().builtinModules.includes(polyfill) ? '/' : ''),
+    // @ts-expect-error TS7053
     range: (0, _nullthrows().default)(_package.default.devDependencies[polyfill])
   };
 }

package/lib/index.d.ts

@@ -0,0 +1,4 @@
+import { Resolver } from '@atlaspack/rust';
+export declare const ResolverBase: typeof Resolver;
+export { default } from './Wrapper';
+export { init } from '@atlaspack/rust';

package/lib/index.js

@@ -25,4 +25,6 @@ function _rust() {
 }
 var _Wrapper = _interopRequireDefault(require("./Wrapper"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const ResolverBase = exports.ResolverBase = _rust().Resolver;
+const ResolverBase = exports.ResolverBase = _rust().Resolver;
+
+// @ts-expect-error TS2305

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/node-resolver-core",
-  "version": "3.5.5-canary.137+069de478e",
+  "version": "3.5.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,23 +9,25 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/index.js",
-  "source": "src/index.js",
+  "main": "./lib/index.js",
+  "source": "./src/index.ts",
+  "types": "./lib/index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "scripts": {
-    "test": "mocha test"
+    "test": "mocha test",
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
   },
   "files": [
     "lib"
   ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.205+069de478e",
-    "@atlaspack/feature-flags": "2.14.1-canary.205+069de478e",
-    "@atlaspack/fs": "2.14.5-canary.137+069de478e",
-    "@atlaspack/rust": "3.2.1-canary.137+069de478e",
-    "@atlaspack/utils": "2.14.5-canary.137+069de478e",
+    "@atlaspack/diagnostic": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/feature-flags": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/fs": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/rust": "3.2.1-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "@mischnic/json-sourcemap": "^0.1.0",
     "nullthrows": "^1.1.1",
     "semver": "^7.5.2"
@@ -58,5 +60,5 @@
     "./src/builtins.js": "./src/builtins.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "069de478e64fb5889f6f2ce023eb510782767fbd"
-}
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}