@parcel/utils 2.8.4-nightly.0 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.8.4-nightly.0+7b79c6d",
+  "version": "2.9.1",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -33,11 +33,11 @@
     }
   },
   "dependencies": {
-    "@parcel/codeframe": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/diagnostic": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/hash": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/logger": "2.8.4-nightly.0+7b79c6d",
-    "@parcel/markdown-ansi": "2.8.4-nightly.0+7b79c6d",
+    "@parcel/codeframe": "2.9.1",
+    "@parcel/diagnostic": "2.9.1",
+    "@parcel/hash": "2.9.1",
+    "@parcel/logger": "2.9.1",
+    "@parcel/markdown-ansi": "2.9.1",
     "@parcel/source-map": "^2.1.1",
     "chalk": "^4.1.0",
     "nullthrows": "^1.1.1"
@@ -47,7 +47,7 @@
     "ansi-html-community": "0.0.8",
     "clone": "^2.1.1",
     "fast-glob": "^3.2.12",
-    "fastest-levenshtein": "^1.0.8",
+    "fastest-levenshtein": "^1.0.16",
     "is-glob": "^4.0.0",
     "is-url": "^1.2.2",
     "json5": "^2.2.0",
@@ -65,5 +65,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "7b79c6d69ffabef89810a8db61e9abdeb70d6990"
+  "gitHead": "5c5dc302b559f0b0d8c57b4d638aac521c879b70"
 }

package/src/glob.js

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

package/src/index.js

@@ -49,7 +49,14 @@ export {
 export {DefaultMap, DefaultWeakMap} from './DefaultMap';
 export {makeDeferredWithPromise} from './Deferred';
 export {getProgressMessage} from './progress-message.js';
-export {isGlob, isGlobMatch, globSync, glob, globToRegex} from './glob';
+export {
+  isGlob,
+  isGlobMatch,
+  globMatch,
+  globSync,
+  glob,
+  globToRegex,
+} from './glob';
 export {hashStream, hashObject, hashFile} from './hash';
 export {SharedBuffer} from './shared-buffer';
 export {fuzzySearch} from './schema';

package/src/schema.js

@@ -6,8 +6,7 @@ import ThrowableDiagnostic, {
 } from '@parcel/diagnostic';
 import type {Mapping} from '@mischnic/json-sourcemap';
 import nullthrows from 'nullthrows';
-// flowlint-next-line untyped-import:off
-import levenshtein from 'fastest-levenshtein';
+import * as levenshtein from 'fastest-levenshtein';
 
 export type SchemaEntity =
   | SchemaObject

package/src/sourcemap.js

@@ -94,8 +94,8 @@ export function remapSourceLocation(
   } = loc;
   let lineDiff = endLine - startLine;
   let colDiff = endCol - startCol;
-  let start = originalMap.findClosestMapping(startLine, startCol);
-  let end = originalMap.findClosestMapping(endLine, endCol);
+  let start = originalMap.findClosestMapping(startLine, startCol - 1);
+  let end = originalMap.findClosestMapping(endLine, endCol - 1);
 
   if (start?.original) {
     if (start.source) {
@@ -108,13 +108,16 @@ export function remapSourceLocation(
 
   if (end?.original) {
     ({line: endLine, column: endCol} = end.original);
-    endCol++;
+    endCol++; // source map columns are 0-based
 
     if (endLine < startLine) {
       endLine = startLine;
       endCol = startCol;
     } else if (endLine === startLine && endCol < startCol && lineDiff === 0) {
       endCol = startCol + colDiff;
+    } else if (endLine === startLine && startCol === endCol && lineDiff === 0) {
+      // Prevent 0-length ranges
+      endCol = startCol + 1;
     }
   } else {
     endLine = startLine;