esbuild 0.8.43 → 0.8.44

package/install.js

@@ -27,7 +27,7 @@ const path = require("path");
 const zlib = require("zlib");
 const https = require("https");
 const child_process = require("child_process");
-const version = "0.8.43";
+const version = "0.8.44";
 const binPath = path.join(__dirname, "bin", "esbuild");
 function installBinaryFromPackage(name, fromPath, toPath) {
   return __async(this, null, function* () {

package/lib/main.d.ts

@@ -37,6 +37,7 @@ interface CommonOptions {
 export interface BuildOptions extends CommonOptions {
   bundle?: boolean;
   splitting?: boolean;
+  preserveSymlinks?: boolean;
   outfile?: string;
   metafile?: string;
   outdir?: string;
@@ -74,12 +75,18 @@ export interface StdinOptions {
 export interface Message {
   text: string;
   location: Location | null;
+  notes: Note[];
 
   // Optional user-specified data that is passed through unmodified. You can
   // use this to stash the original error, for example.
   detail: any;
 }
 
+export interface Note {
+  text: string;
+  location: Location | null;
+}
+
 export interface Location {
   file: string;
   namespace: string;
@@ -225,9 +232,15 @@ export interface OnLoadResult {
 export interface PartialMessage {
   text?: string;
   location?: Partial<Location> | null;
+  notes?: PartialNote[];
   detail?: any;
 }
 
+export interface PartialNote {
+  text?: string;
+  location?: Partial<Location> | null;
+}
+
 export type MetadataImportKind =
   // JS
   | 'import-statement'

package/lib/main.js

@@ -333,6 +333,7 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   let bundle = getFlag(options, keys, "bundle", mustBeBoolean);
   let watch = getFlag(options, keys, "watch", mustBeBooleanOrObject);
   let splitting = getFlag(options, keys, "splitting", mustBeBoolean);
+  let preserveSymlinks = getFlag(options, keys, "preserveSymlinks", mustBeBoolean);
   let metafile = getFlag(options, keys, "metafile", mustBeString);
   let outfile = getFlag(options, keys, "outfile", mustBeString);
   let outdir = getFlag(options, keys, "outdir", mustBeString);
@@ -371,6 +372,8 @@ function flagsForBuildOptions(callName, options, isTTY2, logLevelDefault, writeD
   }
   if (splitting)
     flags.push("--splitting");
+  if (preserveSymlinks)
+    flags.push("--preserve-symlinks");
   if (metafile)
     flags.push(`--metafile=${metafile}`);
   if (outfile)
@@ -614,7 +617,7 @@ function createChannel(streamIn) {
           throw new Error(`Invalid command: ` + request.command);
       }
     } catch (e) {
-      sendResponse(id, {errors: [extractErrorMessageV8(e, streamIn, null)]});
+      sendResponse(id, {errors: [extractErrorMessageV8(e, streamIn, null, void 0)]});
     }
   });
   let isFirstPacket = true;
@@ -622,8 +625,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.8.43") {
-        throw new Error(`Cannot start service: Host version "${"0.8.43"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.8.44") {
+        throw new Error(`Cannot start service: Host version "${"0.8.44"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -666,6 +669,8 @@ function createChannel(streamIn) {
       i++;
       setup({
         onResolve(options, callback2) {
+          let registeredText = `This error came from the "onResolve" callback registered here`;
+          let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onResolve");
           let keys2 = {};
           let filter = getFlag(options, keys2, "filter", mustBeRegExp);
           let namespace = getFlag(options, keys2, "namespace", mustBeString);
@@ -673,10 +678,12 @@ function createChannel(streamIn) {
           if (filter == null)
             throw new Error(`[${plugin.name}] onResolve() call is missing a filter`);
           let id = nextCallbackID++;
-          onResolveCallbacks[id] = {name, callback: callback2};
+          onResolveCallbacks[id] = {name, callback: callback2, note: registeredNote};
           plugin.onResolve.push({id, filter: filter.source, namespace: namespace || ""});
         },
         onLoad(options, callback2) {
+          let registeredText = `This error came from the "onLoad" callback registered here`;
+          let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onLoad");
           let keys2 = {};
           let filter = getFlag(options, keys2, "filter", mustBeRegExp);
           let namespace = getFlag(options, keys2, "namespace", mustBeString);
@@ -684,7 +691,7 @@ function createChannel(streamIn) {
           if (filter == null)
             throw new Error(`[${plugin.name}] onLoad() call is missing a filter`);
           let id = nextCallbackID++;
-          onLoadCallbacks[id] = {name, callback: callback2};
+          onLoadCallbacks[id] = {name, callback: callback2, note: registeredNote};
           plugin.onLoad.push({id, filter: filter.source, namespace: namespace || ""});
         }
       });
@@ -693,10 +700,10 @@ function createChannel(streamIn) {
     const callback = (request2) => __async(this, null, function* () {
       switch (request2.command) {
         case "resolve": {
-          let response = {};
+          let response = {}, name, callback2, note;
           for (let id of request2.ids) {
             try {
-              let {name, callback: callback2} = onResolveCallbacks[id];
+              ({name, callback: callback2, note} = onResolveCallbacks[id]);
               let result = yield callback2({
                 path: request2.path,
                 importer: request2.importer,
@@ -734,16 +741,16 @@ function createChannel(streamIn) {
                 break;
               }
             } catch (e) {
-              return {id, errors: [extractErrorMessageV8(e, streamIn, stash)]};
+              return {id, errors: [extractErrorMessageV8(e, streamIn, stash, note)]};
             }
           }
           return response;
         }
         case "load": {
-          let response = {};
+          let response = {}, name, callback2, note;
           for (let id of request2.ids) {
             try {
-              let {name, callback: callback2} = onLoadCallbacks[id];
+              ({name, callback: callback2, note} = onLoadCallbacks[id]);
               let result = yield callback2({
                 path: request2.path,
                 namespace: request2.namespace,
@@ -781,7 +788,7 @@ function createChannel(streamIn) {
                 break;
               }
             } catch (e) {
-              return {id, errors: [extractErrorMessageV8(e, streamIn, stash)]};
+              return {id, errors: [extractErrorMessageV8(e, streamIn, stash, note)]};
             }
           }
           return response;
@@ -996,7 +1003,7 @@ function createChannel(streamIn) {
             pushLogFlags(flags, options, {}, isTTY2, logLevelDefault);
           } catch (e2) {
           }
-          const error = extractErrorMessageV8(e, streamIn, details);
+          const error = extractErrorMessageV8(e, streamIn, details, void 0);
           sendRequest(refs, {command: "error", flags, error}, () => {
             error.detail = details.load(error.detail);
             callback(failureErrorWithLog("Build failed", [error], []), null);
@@ -1054,7 +1061,7 @@ function createChannel(streamIn) {
               pushLogFlags(flags, options, {}, isTTY2, logLevelDefault);
             } catch (e2) {
             }
-            const error = extractErrorMessageV8(e, streamIn, details);
+            const error = extractErrorMessageV8(e, streamIn, details, void 0);
             sendRequest(refs, {command: "error", flags, error}, () => {
               error.detail = details.load(error.detail);
               callback(failureErrorWithLog("Transform failed", [error], []), null);
@@ -1086,7 +1093,18 @@ function createObjectStash() {
     }
   };
 }
-function extractErrorMessageV8(e, streamIn, stash) {
+function extractCallerV8(e, streamIn, ident) {
+  try {
+    let lines = (e.stack + "").split("\n", 4);
+    lines.splice(1, 1);
+    let location = parseStackLinesV8(streamIn, lines, ident);
+    if (location) {
+      return {text: e.message, location};
+    }
+  } catch (e2) {
+  }
+}
+function extractErrorMessageV8(e, streamIn, stash, note) {
   let text = "Internal error";
   let location = null;
   try {
@@ -1094,41 +1112,45 @@ function extractErrorMessageV8(e, streamIn, stash) {
   } catch (e2) {
   }
   try {
-    let stack = e.stack + "";
-    let lines = stack.split("\n", 3);
-    let at = "    at ";
-    if (streamIn.readFileSync && !lines[0].startsWith(at) && lines[1].startsWith(at)) {
-      let line = lines[1].slice(at.length);
-      while (true) {
-        let match = /^\S+ \((.*)\)$/.exec(line);
-        if (match) {
-          line = match[1];
-          continue;
-        }
-        match = /^eval at \S+ \((.*)\)(?:, \S+:\d+:\d+)?$/.exec(line);
-        if (match) {
-          line = match[1];
-          continue;
-        }
-        match = /^(\S+):(\d+):(\d+)$/.exec(line);
-        if (match) {
-          let contents = streamIn.readFileSync(match[1], "utf8");
-          let lineText = contents.split(/\r\n|\r|\n|\u2028|\u2029/)[+match[2] - 1] || "";
-          location = {
-            file: match[1],
-            namespace: "file",
-            line: +match[2],
-            column: +match[3] - 1,
-            length: 0,
-            lineText: lineText + "\n" + lines.slice(1).join("\n")
-          };
-        }
-        break;
+    location = parseStackLinesV8(streamIn, (e.stack + "").split("\n", 3), "");
+  } catch (e2) {
+  }
+  return {text, location, notes: note ? [note] : [], detail: stash ? stash.store(e) : -1};
+}
+function parseStackLinesV8(streamIn, lines, ident) {
+  let at = "    at ";
+  if (streamIn.readFileSync && !lines[0].startsWith(at) && lines[1].startsWith(at)) {
+    let line = lines[1].slice(at.length);
+    while (true) {
+      let match = /^\S+ \((.*)\)$/.exec(line);
+      if (match) {
+        line = match[1];
+        continue;
+      }
+      match = /^eval at \S+ \((.*)\)(?:, \S+:\d+:\d+)?$/.exec(line);
+      if (match) {
+        line = match[1];
+        continue;
+      }
+      match = /^(\S+):(\d+):(\d+)$/.exec(line);
+      if (match) {
+        let contents = streamIn.readFileSync(match[1], "utf8");
+        let lineText = contents.split(/\r\n|\r|\n|\u2028|\u2029/)[+match[2] - 1] || "";
+        let column = +match[3] - 1;
+        let length = lineText.slice(column, column + ident.length) === ident ? ident.length : 0;
+        return {
+          file: match[1],
+          namespace: "file",
+          line: +match[2],
+          column: encodeUTF8(lineText.slice(0, column)).length,
+          length: encodeUTF8(lineText.slice(column, column + length)).length,
+          lineText: lineText + "\n" + lines.slice(1).join("\n")
+        };
       }
+      break;
     }
-  } catch (e2) {
   }
-  return {text, location, detail: stash ? stash.store(e) : -1};
+  return null;
 }
 function failureErrorWithLog(text, errors, warnings) {
   let limit = 5;
@@ -1153,6 +1175,26 @@ function replaceDetailsInMessages(messages, stash) {
   }
   return messages;
 }
+function sanitizeLocation(location, where) {
+  if (location == null)
+    return null;
+  let keys = {};
+  let file = getFlag(location, keys, "file", mustBeString);
+  let namespace = getFlag(location, keys, "namespace", mustBeString);
+  let line = getFlag(location, keys, "line", mustBeInteger);
+  let column = getFlag(location, keys, "column", mustBeInteger);
+  let length = getFlag(location, keys, "length", mustBeInteger);
+  let lineText = getFlag(location, keys, "lineText", mustBeString);
+  checkForInvalidFlags(location, keys, where);
+  return {
+    file: file || "",
+    namespace: namespace || "",
+    line: line || 0,
+    column: column || 0,
+    length: length || 0,
+    lineText: lineText || ""
+  };
+}
 function sanitizeMessages(messages, property, stash) {
   let messagesClone = [];
   let index = 0;
@@ -1160,30 +1202,27 @@ function sanitizeMessages(messages, property, stash) {
     let keys = {};
     let text = getFlag(message, keys, "text", mustBeString);
     let location = getFlag(message, keys, "location", mustBeObjectOrNull);
+    let notes = getFlag(message, keys, "notes", mustBeArray);
     let detail = getFlag(message, keys, "detail", canBeAnything);
-    checkForInvalidFlags(message, keys, `in element ${index} of "${property}"`);
-    let locationClone = null;
-    if (location != null) {
-      let keys2 = {};
-      let file = getFlag(location, keys2, "file", mustBeString);
-      let namespace = getFlag(location, keys2, "namespace", mustBeString);
-      let line = getFlag(location, keys2, "line", mustBeInteger);
-      let column = getFlag(location, keys2, "column", mustBeInteger);
-      let length = getFlag(location, keys2, "length", mustBeInteger);
-      let lineText = getFlag(location, keys2, "lineText", mustBeString);
-      checkForInvalidFlags(location, keys2, `in element ${index} of "${property}"`);
-      locationClone = {
-        file: file || "",
-        namespace: namespace || "",
-        line: line || 0,
-        column: column || 0,
-        length: length || 0,
-        lineText: lineText || ""
-      };
+    let where = `in element ${index} of "${property}"`;
+    checkForInvalidFlags(message, keys, where);
+    let notesClone = [];
+    if (notes) {
+      for (const note of notes) {
+        let noteKeys = {};
+        let noteText = getFlag(note, noteKeys, "text", mustBeString);
+        let noteLocation = getFlag(note, noteKeys, "location", mustBeObjectOrNull);
+        checkForInvalidFlags(note, noteKeys, where);
+        notesClone.push({
+          text: noteText || "",
+          location: sanitizeLocation(noteLocation, where)
+        });
+      }
     }
     messagesClone.push({
       text: text || "",
-      location: locationClone,
+      location: sanitizeLocation(location, where),
+      notes: notesClone,
       detail: stash.store(detail)
     });
     index++;
@@ -1269,7 +1308,7 @@ var esbuildCommandAndArgs = () => {
   return [path.join(__dirname, "..", "bin", "esbuild"), []];
 };
 var isTTY = () => tty.isatty(2);
-var version = "0.8.43";
+var version = "0.8.44";
 var build = (options) => startService().then((service) => service.build(options));
 var serve = (serveOptions, buildOptions) => startService().then((service) => service.serve(serveOptions, buildOptions));
 var transform = (input, options) => {
@@ -1325,7 +1364,7 @@ var startService = longLivedService(() => process.cwd(), (options) => {
     throw new Error(`The "worker" option only works in the browser`);
   let [command, args] = esbuildCommandAndArgs();
   let defaultWD = process.cwd();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.8.43"}`), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.8.44"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"]
   });
@@ -1426,7 +1465,7 @@ var runServiceSync = (callback) => {
     isBrowser: false
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.8.43"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.8.44"}`), {
     cwd: process.cwd(),
     windowsHide: true,
     input: stdin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.8.43",
+  "version": "0.8.44",
   "description": "An extremely fast JavaScript bundler and minifier.",
   "repository": "https://github.com/evanw/esbuild",
   "scripts": {