@parcel/utils 2.0.0-beta.2 → 2.0.0-nightly.1004

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-nightly.1004+47379bf8",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -19,30 +19,50 @@
   "engines": {
     "node": ">= 12.0.0"
   },
+  "targets": {
+    "main": {
+      "includeNodeModules": {
+        "@parcel/codeframe": false,
+        "@parcel/diagnostic": false,
+        "@parcel/hash": false,
+        "@parcel/logger": false,
+        "@parcel/markdown-ansi": false,
+        "@parcel/source-map": false,
+        "chalk": false
+      }
+    }
+  },
   "dependencies": {
+    "@parcel/codeframe": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/diagnostic": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/hash": "2.3.3-nightly.2627+47379bf8",
+    "@parcel/logger": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/markdown-ansi": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/source-map": "^2.0.0",
+    "chalk": "^4.1.0"
+  },
+  "devDependencies": {
+    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
     "@iarna/toml": "^2.2.0",
-    "@parcel/codeframe": "2.0.0-beta.2",
-    "@parcel/diagnostic": "2.0.0-beta.2",
-    "@parcel/logger": "2.0.0-beta.2",
-    "@parcel/markdown-ansi": "2.0.0-beta.2",
-    "@parcel/source-map": "2.0.0-alpha.4.21",
-    "ansi-html": "^0.0.7",
-    "chalk": "^4.1.0",
+    "ansi-html-community": "0.0.8",
     "clone": "^2.1.1",
     "fast-glob": "3.1.1",
     "fastest-levenshtein": "^1.0.8",
     "is-glob": "^4.0.0",
     "is-url": "^1.2.2",
-    "json5": "^1.0.1",
+    "json5": "^2.2.0",
     "lru-cache": "^6.0.0",
-    "micromatch": "^4.0.2",
-    "node-forge": "^0.10.0",
+    "micromatch": "^4.0.4",
+    "node-forge": "^1.2.1",
     "nullthrows": "^1.1.1",
-    "open": "^7.0.3"
+    "open": "^7.0.3",
+    "random-int": "^1.0.0",
+    "terminal-link": "^2.1.1"
   },
-  "devDependencies": {
-    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
-    "random-int": "^1.0.0"
+  "browser": {
+    "./src/generateCertificate.js": false,
+    "./src/http-server.js": false,
+    "./src/openInBrowser.js": false
   },
-  "gitHead": "a3aa86815e098c90fda72a08d29646ff059ab74d"
+  "gitHead": "47379bf8fabeb2cfe03ade8802d942388b153e5b"
 }

package/src/DefaultMap.js

@@ -24,7 +24,7 @@ export class DefaultMap<K, V> extends Map<K, V> {
 
 // Duplicated from DefaultMap implementation for Flow
 // Roughly mirrors https://github.com/facebook/flow/blob/2eb5a78d92c167117ba9caae070afd2b9f598599/lib/core.js#L617
-export class DefaultWeakMap<K: {...}, V> extends WeakMap<K, V> {
+export class DefaultWeakMap<K: interface {}, V> extends WeakMap<K, V> {
   _getDefault: K => V;
 
   constructor(getDefault: K => V, entries?: Iterable<[K, V]>) {

package/src/alternatives.js

@@ -62,6 +62,8 @@ async function findAllFilesUp({
   basedir,
   maxlength,
   collected,
+  leadingDotSlash = true,
+  includeDirectories = true,
 }: {|
   fs: FileSystem,
   dir: string,
@@ -69,16 +71,18 @@ async function findAllFilesUp({
   basedir: string,
   maxlength: number,
   collected: Array<string>,
+  leadingDotSlash?: boolean,
+  includeDirectories?: boolean,
 |}): Promise<mixed> {
   let dirContent = (await fs.readdir(dir)).sort();
   return Promise.all(
     dirContent.map(async item => {
       let fullPath = path.join(dir, item);
-      let relativeFilePath = relativePath(basedir, fullPath);
+      let relativeFilePath = relativePath(basedir, fullPath, leadingDotSlash);
       if (relativeFilePath.length < maxlength) {
         let stats = await fs.stat(fullPath);
         let isDir = stats.isDirectory();
-        if (isDir || stats.isFile()) {
+        if ((isDir && includeDirectories) || stats.isFile()) {
           collected.push(relativeFilePath);
         }
 
@@ -102,15 +106,21 @@ export async function findAlternativeFiles(
   fs: FileSystem,
   fileSpecifier: string,
   dir: string,
+  projectRoot: string,
+  leadingDotSlash?: boolean = true,
+  includeDirectories?: boolean = true,
+  includeExtension?: boolean = false,
 ): Promise<Array<string>> {
   let potentialFiles: Array<string> = [];
   // Find our root, we won't recommend files above the package root as that's bad practise
-  let pkg = await resolveConfig(fs, path.join(dir, 'index'), ['package.json']);
-  if (!pkg) {
-    return potentialFiles;
-  }
+  let pkg = await resolveConfig(
+    fs,
+    path.join(dir, 'index'),
+    ['package.json'],
+    projectRoot,
+  );
 
-  let pkgRoot = path.dirname(pkg);
+  let pkgRoot = pkg ? path.dirname(pkg) : projectRoot;
   await findAllFilesUp({
     fs,
     dir: pkgRoot,
@@ -118,7 +128,16 @@ export async function findAlternativeFiles(
     basedir: dir,
     maxlength: fileSpecifier.length + 10,
     collected: potentialFiles,
+    leadingDotSlash,
+    includeDirectories,
   });
 
+  if (path.extname(fileSpecifier) === '' && !includeExtension) {
+    potentialFiles = potentialFiles.map(p => {
+      let ext = path.extname(p);
+      return ext.length > 0 ? p.slice(0, -ext.length) : p;
+    });
+  }
+
   return fuzzySearch(potentialFiles, fileSpecifier).slice(0, 2);
 }

package/src/ansi-html.js

@@ -1,5 +1,5 @@
 // @flow strict-local
-import ansiHTML from 'ansi-html';
+import ansiHTML from 'ansi-html-community';
 import {escapeHTML} from './escape-html';
 
 export function ansiHtml(ansi: string): string {

package/src/blob.js

@@ -2,6 +2,7 @@
 
 import type {Blob} from '@parcel/types';
 
+import {Buffer} from 'buffer';
 import {bufferStream} from './';
 import {Readable} from 'stream';
 

package/src/collection.js

@@ -6,14 +6,14 @@ export function unique<T>(array: Array<T>): Array<T> {
 
 export function objectSortedEntries(obj: {
   +[string]: mixed,
-  ...,
+  ...
 }): Array<[string, mixed]> {
   return Object.entries(obj).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
 }
 
 export function objectSortedEntriesDeep(object: {
   +[string]: mixed,
-  ...,
+  ...
 }): Array<[string, mixed]> {
   let sortedEntries = objectSortedEntries(object);
   for (let i = 0; i < sortedEntries.length; i++) {
@@ -43,3 +43,15 @@ export function setDifference<T>(a: Set<T>, b: Set<T>): Set<T> {
   }
   return difference;
 }
+
+export function setIntersect<T>(a: Set<T>, b: Set<T>): void {
+  for (let entry of a) {
+    if (!b.has(entry)) {
+      a.delete(entry);
+    }
+  }
+}
+
+export function setUnion<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
+  return new Set([...a, ...b]);
+}

package/src/config.js

@@ -2,9 +2,10 @@
 
 import type {ConfigResult, File, FilePath} from '@parcel/types';
 import type {FileSystem} from '@parcel/fs';
+import ThrowableDiagnostic from '@parcel/diagnostic';
 import path from 'path';
 import clone from 'clone';
-import {parse as json5} from 'json5';
+import json5 from 'json5';
 import {parse as toml} from '@iarna/toml';
 import LRU from 'lru-cache';
 
@@ -15,36 +16,53 @@ export type ConfigOutput = {|
 
 export type ConfigOptions = {|
   parse?: boolean,
+  parser?: string => any,
 |};
 
 const configCache = new LRU<FilePath, ConfigOutput>({max: 500});
+const resolveCache = new Map();
 
 export function resolveConfig(
   fs: FileSystem,
   filepath: FilePath,
   filenames: Array<FilePath>,
+  projectRoot: FilePath,
 ): Promise<?FilePath> {
-  return Promise.resolve(
-    fs.findAncestorFile(filenames, path.dirname(filepath)),
+  // Cache the result of resolving config for this directory.
+  // This is automatically invalidated at the end of the current build.
+  let key = path.dirname(filepath) + filenames.join(',');
+  let cached = resolveCache.get(key);
+  if (cached !== undefined) {
+    return Promise.resolve(cached);
+  }
+
+  let resolved = fs.findAncestorFile(
+    filenames,
+    path.dirname(filepath),
+    projectRoot,
   );
+  resolveCache.set(key, resolved);
+  return Promise.resolve(resolved);
 }
 
 export function resolveConfigSync(
   fs: FileSystem,
   filepath: FilePath,
   filenames: Array<FilePath>,
+  projectRoot: FilePath,
 ): ?FilePath {
-  return fs.findAncestorFile(filenames, path.dirname(filepath));
+  return fs.findAncestorFile(filenames, path.dirname(filepath), projectRoot);
 }
 
 export async function loadConfig(
   fs: FileSystem,
   filepath: FilePath,
   filenames: Array<FilePath>,
+  projectRoot: FilePath,
   opts: ?ConfigOptions,
 ): Promise<ConfigOutput | null> {
   let parse = opts?.parse ?? true;
-  let configFile = await resolveConfig(fs, filepath, filenames);
+  let configFile = await resolveConfig(fs, filepath, filenames, projectRoot);
   if (configFile) {
     let cachedOutput = configCache.get(String(parse) + configFile);
     if (cachedOutput) {
@@ -65,14 +83,45 @@ export async function loadConfig(
       }
 
       let configContent = await fs.readFile(configFile, 'utf8');
-      if (!configContent) return null;
 
       let config;
       if (parse === false) {
         config = configContent;
       } else {
-        let parse = getParser(extname);
-        config = parse(configContent);
+        let parse = opts?.parser ?? getParser(extname);
+        try {
+          config = parse(configContent);
+        } catch (e) {
+          if (extname !== '' && extname !== 'json') {
+            throw e;
+          }
+
+          let pos = {
+            line: e.lineNumber,
+            column: e.columnNumber,
+          };
+
+          throw new ThrowableDiagnostic({
+            diagnostic: {
+              message: `Failed to parse ${path.basename(configFile)}`,
+              origin: '@parcel/utils',
+              codeFrames: [
+                {
+                  language: 'json5',
+                  filePath: configFile,
+                  code: configContent,
+                  codeHighlights: [
+                    {
+                      start: pos,
+                      end: pos,
+                      message: e.message,
+                    },
+                  ],
+                },
+              ],
+            },
+          });
+        }
       }
 
       let output = {
@@ -96,6 +145,7 @@ export async function loadConfig(
 
 loadConfig.clear = () => {
   configCache.reset();
+  resolveCache.clear();
 };
 
 function getParser(extname) {
@@ -104,6 +154,6 @@ function getParser(extname) {
       return toml;
     case 'json':
     default:
-      return json5;
+      return json5.parse;
   }
 }

package/src/countLines.js

@@ -1,8 +1,11 @@
 // @flow strict-local
 
-export default function countLines(string: string): number {
+export default function countLines(
+  string: string,
+  startIndex: number = 0,
+): number {
   let lines = 1;
-  for (let i = 0; i < string.length; i++) {
+  for (let i = startIndex; i < string.length; i++) {
     if (string.charAt(i) === '\n') {
       lines++;
     }

package/src/debounce.js

@@ -6,7 +6,7 @@ export default function debounce<TArgs: Array<mixed>>(
 ): (...args: TArgs) => void {
   let timeout;
 
-  return function(...args: TArgs) {
+  return function (...args: TArgs) {
     if (timeout) {
       clearTimeout(timeout);
     }

package/src/dependency-location.js

@@ -1,11 +1,11 @@
 // @flow
+
 export default function createDependencyLocation(
-  start: {
+  start: interface {
     line: number,
     column: number,
-    ...
   },
-  moduleSpecifier: string,
+  specifier: string,
   lineOffset: number = 0,
   columnOffset: number = 0,
   // Imports are usually wrapped in quotes
@@ -16,7 +16,7 @@ export default function createDependencyLocation(
   start: {|column: number, line: number|},
 |} {
   return {
-    filePath: moduleSpecifier,
+    filePath: specifier,
     start: {
       line: start.line + lineOffset,
       column: start.column + columnOffset,
@@ -25,7 +25,7 @@ export default function createDependencyLocation(
       line: start.line + lineOffset,
       column:
         start.column +
-        moduleSpecifier.length -
+        specifier.length -
         1 +
         importWrapperLength +
         columnOffset,

package/src/generateBuildMetrics.js

@@ -1,6 +1,6 @@
 // @flow
 
-import type {FilePath, NamedBundle} from '@parcel/types';
+import type {FilePath, PackagedBundle} from '@parcel/types';
 import type {FileSystem} from '@parcel/fs';
 import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
@@ -38,7 +38,7 @@ async function getSourcemapSizes(
 
   let rawMap = mapUrlData.map;
   let sourceMap = new SourceMap(projectRoot);
-  sourceMap.addRawMappings(rawMap);
+  sourceMap.addVLQMap(rawMap);
   let parsedMapData = sourceMap.getMap();
 
   if (parsedMapData.mappings.length > 2) {
@@ -97,7 +97,7 @@ async function getSourcemapSizes(
 }
 
 async function createBundleStats(
-  bundle: NamedBundle,
+  bundle: PackagedBundle,
   fs: FileSystem,
   projectRoot: FilePath,
 ) {
@@ -144,7 +144,7 @@ async function createBundleStats(
 }
 
 export default async function generateBuildMetrics(
-  bundles: Array<NamedBundle>,
+  bundles: Array<PackagedBundle>,
   fs: FileSystem,
   projectRoot: FilePath,
 ): Promise<BuildMetrics> {

package/src/getExisting.js

@@ -14,10 +14,7 @@ export default function getExisting(
   return {
     source,
     minified: fs.existsSync(minifiedPath)
-      ? fs
-          .readFileSync(minifiedPath, 'utf8')
-          .trim()
-          .replace(/;$/, '')
+      ? fs.readFileSync(minifiedPath, 'utf8').trim().replace(/;$/, '')
       : source,
   };
 }

package/src/glob.js

@@ -5,15 +5,26 @@ import type {FileSystem} from '@parcel/fs';
 
 import _isGlob from 'is-glob';
 import fastGlob, {type FastGlobOptions} from 'fast-glob';
-import {isMatch} from 'micromatch';
+import {isMatch, makeRe, type Options} from 'micromatch';
 import {normalizeSeparators} from './path';
 
 export function isGlob(p: FilePath): any {
   return _isGlob(normalizeSeparators(p));
 }
 
-export function isGlobMatch(filePath: FilePath, glob: Glob): any {
-  return isMatch(filePath, normalizeSeparators(glob));
+export function isGlobMatch(
+  filePath: FilePath,
+  glob: Glob | Array<Glob>,
+  opts?: Options,
+): any {
+  glob = Array.isArray(glob)
+    ? glob.map(normalizeSeparators)
+    : normalizeSeparators(glob);
+  return isMatch(filePath, glob, opts);
+}
+
+export function globToRegex(glob: Glob, opts?: Options): RegExp {
+  return makeRe(glob, opts);
 }
 
 export function globSync(

package/src/hash.js

@@ -0,0 +1,34 @@
+// @flow strict-local
+
+import type {Readable} from 'stream';
+import type {FileSystem} from '@parcel/fs';
+
+import {objectSortedEntriesDeep} from './collection';
+import {hashString, Hash} from '@parcel/hash';
+
+export function hashStream(stream: Readable): Promise<string> {
+  let hash = new Hash();
+  return new Promise((resolve, reject) => {
+    stream.on('error', err => {
+      reject(err);
+    });
+    stream
+      .on('data', chunk => {
+        hash.writeBuffer(chunk);
+      })
+      .on('end', function () {
+        resolve(hash.finish());
+      })
+      .on('error', err => {
+        reject(err);
+      });
+  });
+}
+
+export function hashObject(obj: {+[string]: mixed, ...}): string {
+  return hashString(JSON.stringify(objectSortedEntriesDeep(obj)));
+}
+
+export function hashFile(fs: FileSystem, filePath: string): Promise<string> {
+  return hashStream(fs.createReadStream(filePath));
+}

package/src/index.js

@@ -1,9 +1,11 @@
 // @flow strict-local
 export type * from './config';
+export type * from './Deferred';
 export type * from './generateBuildMetrics';
+export type * from './http-server';
+export type * from './path';
 export type * from './prettyDiagnostic';
 export type * from './schema';
-export type * from './http-server';
 
 export {default as countLines} from './countLines';
 export {default as generateBuildMetrics} from './generateBuildMetrics';
@@ -33,21 +35,18 @@ export {
   objectSortedEntries,
   objectSortedEntriesDeep,
   setDifference,
+  setIntersect,
+  setUnion,
 } from './collection';
 export {resolveConfig, resolveConfigSync, loadConfig} from './config';
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
-export {isGlob, isGlobMatch, globSync, glob} from './glob';
-export {
-  md5FromString,
-  md5FromReadableStream,
-  md5FromObject,
-  md5FromOrderedObject,
-  md5FromFilePath,
-} from './md5';
+export {isGlob, isGlobMatch, globSync, glob, globToRegex} from './glob';
+export {hashStream, hashObject, hashFile} from './hash';
+export {SharedBuffer} from './shared-buffer';
 export {fuzzySearch} from './schema';
 export {createHTTPServer} from './http-server';
-export {normalizeSeparators, normalizePath, relativePath} from './path';
+export {normalizePath, normalizeSeparators, relativePath} from './path';
 export {
   replaceURLReferences,
   replaceInlineReferences,
@@ -69,4 +68,5 @@ export {
   matchSourceMappingURL,
   loadSourceMapUrl,
   loadSourceMap,
+  remapSourceLocation,
 } from './sourcemap';

package/src/path.js

@@ -22,7 +22,12 @@ export function normalizePath(
   filePath: FilePath,
   leadingDotSlash: boolean = true,
 ): FilePath {
-  if (leadingDotSlash && filePath[0] !== '.' && filePath[0] !== '/') {
+  if (
+    leadingDotSlash &&
+    (filePath[0] !== '.' ||
+      (filePath[1] !== '.' && filePath[1] !== '/' && filePath[1] !== '\\')) &&
+    !path.isAbsolute(filePath)
+  ) {
     return normalizeSeparators('./' + filePath);
   } else {
     return normalizeSeparators(filePath);
@@ -34,5 +39,10 @@ export function relativePath(
   to: string,
   leadingDotSlash: boolean = true,
 ): FilePath {
+  // Fast path
+  if (to.startsWith(from + '/')) {
+    return (leadingDotSlash ? './' : '') + to.slice(from.length + 1);
+  }
+
   return normalizePath(path.relative(from, to), leadingDotSlash);
 }