metro 0.80.8 → 0.80.10

package/src/lib/BatchProcessor.js

@@ -62,5 +62,8 @@ class BatchProcessor {
       this._processQueueOnceReady();
     });
   }
+  getQueueLength() {
+    return this._queue.length;
+  }
 }
 module.exports = BatchProcessor;

package/src/lib/BatchProcessor.js.flow

@@ -125,6 +125,10 @@ class BatchProcessor<TItem, TResult> {
       },
     );
   }
+
+  getQueueLength(): number {
+    return this._queue.length;
+  }
 }
 
 module.exports = BatchProcessor;

package/src/lib/JsonReporter.js

@@ -5,13 +5,40 @@ class JsonReporter {
     this._stream = stream;
   }
   update(event) {
-    if (Object.prototype.toString.call(event.error) === "[object Error]") {
+    if (event.error instanceof Error) {
+      const { message, stack } = event.error;
       event = Object.assign(event, {
-        message: event.error.message,
-        stack: event.error.stack,
+        error: serializeError(event.error),
+        message,
+        stack,
       });
     }
     this._stream.write(JSON.stringify(event) + "\n");
   }
 }
+function serializeError(e, seen = new Set()) {
+  if (seen.has(e)) {
+    return {
+      message: "[circular]: " + e.message,
+      stack: e.stack,
+    };
+  }
+  seen.add(e);
+  const { message, stack, cause } = e;
+  const serialized = {
+    message,
+    stack,
+  };
+  if (e instanceof AggregateError) {
+    serialized.errors = [...e.errors]
+      .map((innerError) =>
+        innerError instanceof Error ? serializeError(innerError, seen) : null
+      )
+      .filter(Boolean);
+  }
+  if (cause instanceof Error) {
+    serialized.cause = serializeError(cause, seen);
+  }
+  return serialized;
+}
 module.exports = JsonReporter;

package/src/lib/JsonReporter.js.flow

@@ -13,6 +13,25 @@
 
 import type {Writable} from 'stream';
 
+export type SerializedError = {
+  message: string,
+  stack: string,
+  errors?: $ReadOnlyArray<SerializedError>,
+  cause?: SerializedError,
+  ...
+};
+
+export type SerializedEvent<TEvent: {[string]: any, ...}> = TEvent extends {
+  error: Error,
+  ...
+}
+  ? {
+      ...Omit<TEvent, 'error'>,
+      error: SerializedError,
+      ...
+    }
+  : TEvent;
+
 class JsonReporter<TEvent: {[string]: any, ...}> {
   _stream: Writable;
 
@@ -25,16 +44,42 @@ class JsonReporter<TEvent: {[string]: any, ...}> {
    * (Perhaps we should switch in favor of plain object?)
    */
   update(event: TEvent): void {
-    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-    if (Object.prototype.toString.call(event.error) === '[object Error]') {
+    if (event.error instanceof Error) {
+      const {message, stack} = event.error;
       event = Object.assign(event, {
-        message: event.error.message,
-        stack: event.error.stack,
+        error: serializeError(event.error),
+        // TODO: Preexisting issue - this writes message, stack, etc. as
+        // top-level siblings of event.error (which was serialized to {}), whereas it was presumably
+        // intended to nest them _under_ error. Fix this in a breaking change.
+        message,
+        stack,
       });
     }
-
     this._stream.write(JSON.stringify(event) + '\n');
   }
 }
 
+function serializeError(
+  e: Error,
+  seen: Set<Error> = new Set(),
+): SerializedError {
+  if (seen.has(e)) {
+    return {message: '[circular]: ' + e.message, stack: e.stack};
+  }
+  seen.add(e);
+  const {message, stack, cause} = e;
+  const serialized: SerializedError = {message, stack};
+  if (e instanceof AggregateError) {
+    serialized.errors = [...e.errors]
+      .map(innerError =>
+        innerError instanceof Error ? serializeError(innerError, seen) : null,
+      )
+      .filter(Boolean);
+  }
+  if (cause instanceof Error) {
+    serialized.cause = serializeError(cause, seen);
+  }
+  return serialized;
+}
+
 module.exports = JsonReporter;

package/src/lib/TerminalReporter.js

@@ -6,8 +6,6 @@ const chalk = require("chalk");
 const throttle = require("lodash.throttle");
 const { AmbiguousModuleResolutionError } = require("metro-core");
 const path = require("path");
-const GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT =
-  "The global cache is now disabled because %s";
 const DARK_BLOCK_CHAR = "\u2593";
 const LIGHT_BLOCK_CHAR = "\u2591";
 const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
@@ -61,25 +59,6 @@ class TerminalReporter {
       "\n"
     );
   }
-  _logCacheDisabled(reason) {
-    const format = GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT;
-    switch (reason) {
-      case "too_many_errors":
-        reporting.logWarning(
-          this.terminal,
-          format,
-          "it has been failing too many times."
-        );
-        break;
-      case "too_many_misses":
-        reporting.logWarning(
-          this.terminal,
-          format,
-          "it has been missing too many consecutive keys."
-        );
-        break;
-    }
-  }
   _logBundleBuildDone(buildID) {
     const progress = this._activeBundles.get(buildID);
     if (progress != null) {
@@ -163,9 +142,6 @@ class TerminalReporter {
       case "bundling_error":
         this._logBundlingError(event.error);
         break;
-      case "global_cache_disabled":
-        this._logCacheDisabled(event.reason);
-        break;
       case "resolver_warning":
         this._logWarning(event.message);
         break;
@@ -281,6 +257,9 @@ class TerminalReporter {
       case "bundle_transform_progressed_throttled":
         this._updateBundleProgress(event);
         break;
+      case "unstable_set_interaction_status":
+        this._interactionStatus = event.status;
+        break;
     }
   }
   _getStatusMessage() {
@@ -288,6 +267,7 @@ class TerminalReporter {
       .map(([_, progress]) =>
         this._getBundleStatusMessage(progress, "in_progress")
       )
+      .concat([this._interactionStatus])
       .filter((str) => str != null)
       .join("\n");
   }

package/src/lib/TerminalReporter.js.flow

@@ -11,11 +11,7 @@
 
 'use strict';
 
-import type {
-  BundleDetails,
-  GlobalCacheDisabledReason,
-  ReportableEvent,
-} from './reporting';
+import type {BundleDetails, ReportableEvent} from './reporting';
 import type {Terminal} from 'metro-core';
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
@@ -43,6 +39,11 @@ export type TerminalReportableEvent =
       transformedFileCount: number,
       totalFileCount: number,
       ...
+    }
+  | {
+      type: 'unstable_set_interaction_status',
+      status: ?string,
+      ...
     };
 
 type BuildPhase = 'in_progress' | 'done' | 'failed';
@@ -53,9 +54,6 @@ type SnippetError = ErrnoError &
     snippet?: string,
   };
 
-const GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT =
-  'The global cache is now disabled because %s';
-
 const DARK_BLOCK_CHAR = '\u2593';
 const LIGHT_BLOCK_CHAR = '\u2591';
 const MAX_PROGRESS_BAR_CHAR_WIDTH = 16;
@@ -72,6 +70,8 @@ class TerminalReporter {
    */
   _activeBundles: Map<string, BundleProgress>;
 
+  _interactionStatus: ?string;
+
   _scheduleUpdateBundleProgress: {
     (data: {
       buildID: string,
@@ -141,26 +141,6 @@ class TerminalReporter {
     );
   }
 
-  _logCacheDisabled(reason: GlobalCacheDisabledReason): void {
-    const format = GLOBAL_CACHE_DISABLED_MESSAGE_FORMAT;
-    switch (reason) {
-      case 'too_many_errors':
-        reporting.logWarning(
-          this.terminal,
-          format,
-          'it has been failing too many times.',
-        );
-        break;
-      case 'too_many_misses':
-        reporting.logWarning(
-          this.terminal,
-          format,
-          'it has been missing too many consecutive keys.',
-        );
-        break;
-    }
-  }
-
   _logBundleBuildDone(buildID: string): void {
     const progress = this._activeBundles.get(buildID);
     if (progress != null) {
@@ -253,9 +233,6 @@ class TerminalReporter {
       case 'bundling_error':
         this._logBundlingError(event.error);
         break;
-      case 'global_cache_disabled':
-        this._logCacheDisabled(event.reason);
-        break;
       case 'resolver_warning':
         this._logWarning(event.message);
         break;
@@ -408,6 +385,9 @@ class TerminalReporter {
       case 'bundle_transform_progressed_throttled':
         this._updateBundleProgress(event);
         break;
+      case 'unstable_set_interaction_status':
+        this._interactionStatus = event.status;
+        break;
     }
   }
 
@@ -421,7 +401,8 @@ class TerminalReporter {
       .map(([_, progress]: [string, BundleProgress]) =>
         this._getBundleStatusMessage(progress, 'in_progress'),
       )
-      .filter((str: null | string) => str != null)
+      .concat([this._interactionStatus])
+      .filter((str: ?string) => str != null)
       .join('\n');
   }
 

package/src/lib/getAppendScripts.js

@@ -5,7 +5,9 @@ function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : { default: obj };
 }
 const getInlineSourceMappingURL = require("../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL");
-const sourceMapString = require("../DeltaBundler/Serializers/sourceMapString");
+const {
+  sourceMapString,
+} = require("../DeltaBundler/Serializers/sourceMapString");
 const countLines = require("./countLines");
 const nullthrows = require("nullthrows");
 function getAppendScripts(entryPoint, modules, options) {
@@ -43,6 +45,7 @@ function getAppendScripts(entryPoint, modules, options) {
             processModuleFilter: () => true,
             excludeSource: false,
             shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+            getSourceUrl: options.getSourceUrl,
           })
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/getAppendScripts.js.flow

@@ -16,7 +16,9 @@ import type {Dependency} from '../DeltaBundler/types.flow';
 import CountingSet from './CountingSet';
 
 const getInlineSourceMappingURL = require('../DeltaBundler/Serializers/helpers/getInlineSourceMappingURL');
-const sourceMapString = require('../DeltaBundler/Serializers/sourceMapString');
+const {
+  sourceMapString,
+} = require('../DeltaBundler/Serializers/sourceMapString');
 const countLines = require('./countLines');
 const nullthrows = require('nullthrows');
 
@@ -30,6 +32,7 @@ type Options<T: number | string> = $ReadOnly<{
   shouldAddToIgnoreList: (Module<>) => boolean,
   sourceMapUrl: ?string,
   sourceUrl: ?string,
+  getSourceUrl: ?(Module<>) => string,
   ...
 }>;
 
@@ -75,6 +78,7 @@ function getAppendScripts<T: number | string>(
             processModuleFilter: (): boolean => true,
             excludeSource: false,
             shouldAddToIgnoreList: options.shouldAddToIgnoreList,
+            getSourceUrl: options.getSourceUrl,
           }),
         )
       : nullthrows(options.sourceMapUrl);

package/src/lib/logToConsole.js.flow

@@ -26,6 +26,7 @@ module.exports = (
   mode: 'BRIDGE' | 'NOBRIDGE',
   ...data: Array<mixed>
 ) => {
+  // $FlowFixMe[invalid-computed-prop]
   const logFunction = console[level] && level !== 'trace' ? level : 'log';
   const color =
     level === 'error'

package/src/lib/parseOptionsFromUrl.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _types = require("../shared/types.flow");
 const parsePlatformFilePath = require("../node-haste/lib/parsePlatformFilePath");
 const parseCustomResolverOptions = require("./parseCustomResolverOptions");
 const parseCustomTransformOptions = require("./parseCustomTransformOptions");
@@ -50,6 +51,9 @@ module.exports = function parseOptionsFromUrl(normalizedRequestUrl, platforms) {
           : "",
       pathname: pathname.replace(/\.(bundle|delta)$/, ".map"),
     }),
+    sourcePaths:
+      _types.SourcePathsMode.cast(query.sourcePaths) ??
+      _types.SourcePathsMode.Absolute,
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile

package/src/lib/parseOptionsFromUrl.js.flow

@@ -14,6 +14,8 @@
 import type {BundleOptions} from '../shared/types.flow';
 import type {TransformProfile} from 'metro-babel-transformer';
 
+import {SourcePathsMode} from '../shared/types.flow';
+
 const parsePlatformFilePath = require('../node-haste/lib/parsePlatformFilePath');
 const parseCustomResolverOptions = require('./parseCustomResolverOptions');
 const parseCustomTransformOptions = require('./parseCustomTransformOptions');
@@ -81,6 +83,8 @@ module.exports = function parseOptionsFromUrl(
           : '',
       pathname: pathname.replace(/\.(bundle|delta)$/, '.map'),
     }),
+    sourcePaths:
+      SourcePathsMode.cast(query.sourcePaths) ?? SourcePathsMode.Absolute,
     sourceUrl: jscSafeUrl.toJscSafeUrl(normalizedRequestUrl),
     unstable_transformProfile: getTransformProfile(
       query.unstable_transformProfile,

package/src/lib/reporting.d.ts

@@ -10,8 +10,6 @@
 
 import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 
-export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
-
 export interface BundleDetails {
   bundleType: string;
   dev: boolean;
@@ -65,12 +63,12 @@ export type ReportableEvent =
       totalFileCount: number;
     }
   | {
-      type: 'global_cache_error';
+      type: 'cache_read_error';
       error: Error;
     }
   | {
-      type: 'global_cache_disabled';
-      reason: GlobalCacheDisabledReason;
+      type: 'cache_write_error';
+      error: Error;
     }
   | {type: 'transform_cache_reset'}
   | {
@@ -98,6 +96,12 @@ export type ReportableEvent =
         | 'debug';
       data: unknown[];
     }
+  | {
+      type: 'server_listening';
+      port: number;
+      address: string;
+      family: string;
+    }
   | {
       type: 'transformer_load_started';
     }

package/src/lib/reporting.js.flow

@@ -20,8 +20,6 @@ const chalk = require('chalk');
 const stripAnsi = require('strip-ansi');
 const util = require('util');
 
-export type GlobalCacheDisabledReason = 'too_many_errors' | 'too_many_misses';
-
 export type BundleDetails = {
   bundleType: string,
   customResolverOptions: CustomResolverOptions,
@@ -90,13 +88,13 @@ export type ReportableEvent =
       ...
     }
   | {
-      type: 'global_cache_error',
+      type: 'cache_read_error',
       error: Error,
       ...
     }
   | {
-      type: 'global_cache_disabled',
-      reason: GlobalCacheDisabledReason,
+      type: 'cache_write_error',
+      error: Error,
       ...
     }
   | {type: 'transform_cache_reset', ...}
@@ -134,6 +132,12 @@ export type ReportableEvent =
       type: 'resolver_warning',
       message: string,
     }
+  | {
+      type: 'server_listening',
+      port: number,
+      address: string,
+      family: string,
+    }
   | {
       type: 'transformer_load_started',
     }

package/src/lib/splitBundleOptions.js

@@ -23,6 +23,7 @@ function splitBundleOptions(options) {
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      sourcePaths: options.sourcePaths,
     },
     graphOptions: {
       shallow: options.shallow,

package/src/lib/splitBundleOptions.js.flow

@@ -39,6 +39,7 @@ function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
       runModule: options.runModule,
       sourceMapUrl: options.sourceMapUrl,
       sourceUrl: options.sourceUrl,
+      sourcePaths: options.sourcePaths,
     },
     graphOptions: {
       shallow: options.shallow,

package/src/node-haste/DependencyGraph/ModuleResolution.js

@@ -14,7 +14,7 @@ class ModuleResolver {
     this._projectRootFakeModule = {
       path: path.join(projectRoot, "_"),
       getPackage: () =>
-        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+        moduleCache.getPackageOf(this._projectRootFakeModule.path)?.pkg,
       isHaste() {
         throw new Error("not implemented");
       },
@@ -97,8 +97,8 @@ class ModuleResolver {
             resolveHastePackage: (name) =>
               this._options.getHastePackagePath(name, platform),
             getPackage: this._getPackage,
-            getPackageForModule: (modulePath) =>
-              this._getPackageForModule(fromModule, modulePath),
+            getPackageForModule: (absoluteModulePath) =>
+              this._getPackageForModule(absoluteModulePath),
           },
           dependency
         ),
@@ -159,15 +159,16 @@ class ModuleResolver {
     } catch (e) {}
     return null;
   };
-  _getPackageForModule = (fromModule, modulePath) => {
-    let pkg;
+  _getPackageForModule = (absolutePath) => {
+    let result;
     try {
-      pkg = this._options.moduleCache.getPackageOf(modulePath);
+      result = this._options.moduleCache.getPackageOf(absolutePath);
     } catch (e) {}
-    return pkg != null
+    return result != null
       ? {
-          rootPath: path.dirname(pkg.path),
-          packageJson: pkg.read(),
+          rootPath: path.dirname(result.pkg.path),
+          packageJson: result.pkg.read(),
+          packageRelativePath: result.packageRelativePath,
         }
       : null;
   };

package/src/node-haste/DependencyGraph/ModuleResolution.js.flow

@@ -25,7 +25,7 @@ import type {
   Resolution,
   ResolveAsset,
 } from 'metro-resolver';
-import type {PackageInfo, PackageJson} from 'metro-resolver/src/types';
+import type {PackageForModule, PackageJson} from 'metro-resolver/src/types';
 
 const {codeFrameColumns} = require('@babel/code-frame');
 const fs = require('fs');
@@ -53,7 +53,10 @@ export type ModuleishCache<TPackage> = interface {
     platform?: string,
     supportsNativePlatform?: boolean,
   ): TPackage,
-  getPackageOf(modulePath: string): ?TPackage,
+  getPackageOf(absolutePath: string): ?{
+    pkg: TPackage,
+    packageRelativePath: string,
+  },
 };
 
 type Options<TPackage> = $ReadOnly<{
@@ -95,7 +98,7 @@ class ModuleResolver<TPackage: Packageish> {
     this._projectRootFakeModule = {
       path: path.join(projectRoot, '_'),
       getPackage: () =>
-        moduleCache.getPackageOf(this._projectRootFakeModule.path),
+        moduleCache.getPackageOf(this._projectRootFakeModule.path)?.pkg,
       isHaste() {
         throw new Error('not implemented');
       },
@@ -179,8 +182,8 @@ class ModuleResolver<TPackage: Packageish> {
             resolveHastePackage: (name: string) =>
               this._options.getHastePackagePath(name, platform),
             getPackage: this._getPackage,
-            getPackageForModule: (modulePath: string) =>
-              this._getPackageForModule(fromModule, modulePath),
+            getPackageForModule: (absoluteModulePath: string) =>
+              this._getPackageForModule(absoluteModulePath),
           },
           dependency,
         ),
@@ -249,23 +252,21 @@ class ModuleResolver<TPackage: Packageish> {
     return null;
   };
 
-  _getPackageForModule = (
-    fromModule: Moduleish,
-    modulePath: string,
-  ): ?PackageInfo => {
-    let pkg;
+  _getPackageForModule = (absolutePath: string): ?PackageForModule => {
+    let result;
 
     try {
-      pkg = this._options.moduleCache.getPackageOf(modulePath);
+      result = this._options.moduleCache.getPackageOf(absolutePath);
     } catch (e) {
       // Do nothing. The standard module cache does not trigger any error, but
       // the ModuleGraph one does, if the module does not exist.
     }
 
-    return pkg != null
+    return result != null
       ? {
-          rootPath: path.dirname(pkg.path),
-          packageJson: pkg.read(),
+          rootPath: path.dirname(result.pkg.path),
+          packageJson: result.pkg.read(),
+          packageRelativePath: result.packageRelativePath,
         }
       : null;
   };
@@ -322,6 +323,7 @@ function getArrayLowestItem(a: $ReadOnlyArray<string>): string | void {
   return lowest;
 }
 
+// $FlowFixMe[incompatible-extend]
 class UnableToResolveError extends Error {
   /**
    * File path of the module that tried to require a module, ex. `/js/foo.js`.

package/src/node-haste/DependencyGraph.js

@@ -80,8 +80,8 @@ class DependencyGraph extends EventEmitter {
     await self.ready();
     return self;
   }
-  _getClosestPackage(filePath) {
-    const parsedPath = path.parse(filePath);
+  _getClosestPackage(absoluteModulePath) {
+    const parsedPath = path.parse(absoluteModulePath);
     const root = parsedPath.root;
     let dir = path.join(parsedPath.dir, parsedPath.base);
     do {
@@ -90,7 +90,10 @@ class DependencyGraph extends EventEmitter {
       }
       const candidate = path.join(dir, "package.json");
       if (this._fileSystem.exists(candidate)) {
-        return candidate;
+        return {
+          packageJsonPath: candidate,
+          packageRelativePath: path.relative(dir, absoluteModulePath),
+        };
       }
       dir = path.dirname(dir);
     } while (dir !== "." && dir !== root);
@@ -163,7 +166,8 @@ class DependencyGraph extends EventEmitter {
   }
   _createModuleCache() {
     return new ModuleCache({
-      getClosestPackage: (filePath) => this._getClosestPackage(filePath),
+      getClosestPackage: (absoluteModulePath) =>
+        this._getClosestPackage(absoluteModulePath),
     });
   }
   getAllFiles() {

package/src/node-haste/DependencyGraph.js.flow

@@ -152,8 +152,10 @@ class DependencyGraph extends EventEmitter {
     return self;
   }
 
-  _getClosestPackage(filePath: string): ?string {
-    const parsedPath = path.parse(filePath);
+  _getClosestPackage(
+    absoluteModulePath: string,
+  ): ?{packageJsonPath: string, packageRelativePath: string} {
+    const parsedPath = path.parse(absoluteModulePath);
     const root = parsedPath.root;
     let dir = path.join(parsedPath.dir, parsedPath.base);
 
@@ -165,7 +167,12 @@ class DependencyGraph extends EventEmitter {
       }
       const candidate = path.join(dir, 'package.json');
       if (this._fileSystem.exists(candidate)) {
-        return candidate;
+        return {
+          packageJsonPath: candidate,
+          // Note that by construction, dir is a prefix of absoluteModulePath,
+          // so this relative path has no indirections.
+          packageRelativePath: path.relative(dir, absoluteModulePath),
+        };
       }
       dir = path.dirname(dir);
     } while (dir !== '.' && dir !== root);
@@ -242,7 +249,8 @@ class DependencyGraph extends EventEmitter {
 
   _createModuleCache(): ModuleCache {
     return new ModuleCache({
-      getClosestPackage: filePath => this._getClosestPackage(filePath),
+      getClosestPackage: absoluteModulePath =>
+        this._getClosestPackage(absoluteModulePath),
     });
   }