cdk-comprehend-s3olap 2.0.99 → 2.0.101

package/node_modules/esbuild/lib/main.js

@@ -206,6 +206,8 @@ function writeUInt32LE(buffer, value, offset) {
 }
 
 // lib/shared/common.ts
+var buildLogLevelDefault = "warning";
+var transformLogLevelDefault = "silent";
 function validateTarget(target) {
   target += "";
   if (target.indexOf(",") >= 0)
@@ -306,6 +308,7 @@ function pushCommonFlags(flags, options, keys) {
   let jsxFragment = getFlag(options, keys, "jsxFragment", mustBeString);
   let jsxImportSource = getFlag(options, keys, "jsxImportSource", mustBeString);
   let jsxDev = getFlag(options, keys, "jsxDev", mustBeBoolean);
+  let jsxSideEffects = getFlag(options, keys, "jsxSideEffects", mustBeBoolean);
   let define = getFlag(options, keys, "define", mustBeObject);
   let logOverride = getFlag(options, keys, "logOverride", mustBeObject);
   let supported = getFlag(options, keys, "supported", mustBeObject);
@@ -363,6 +366,8 @@ function pushCommonFlags(flags, options, keys) {
     flags.push(`--jsx-import-source=${jsxImportSource}`);
   if (jsxDev)
     flags.push(`--jsx-dev`);
+  if (jsxSideEffects)
+    flags.push(`--jsx-side-effects`);
   if (define) {
     for (let key in define) {
       if (key.indexOf("=") >= 0)
@@ -616,11 +621,9 @@ function flagsForTransformOptions(callName, options, isTTY2, logLevelDefault) {
   };
 }
 function createChannel(streamIn) {
-  let responseCallbacks = /* @__PURE__ */ new Map();
-  let pluginCallbacks = /* @__PURE__ */ new Map();
-  let watchCallbacks = /* @__PURE__ */ new Map();
-  let serveCallbacks = /* @__PURE__ */ new Map();
-  let closeData = null;
+  const requestCallbacksByKey = {};
+  const closeData = { didClose: false, reason: "" };
+  let responseCallbacks = {};
   let nextRequestID = 0;
   let nextBuildKey = 0;
   let stdout = new Uint8Array(16 * 1024);
@@ -650,105 +653,53 @@ function createChannel(streamIn) {
     }
   };
   let afterClose = (error) => {
-    closeData = { reason: error ? ": " + (error.message || error) : "" };
+    closeData.didClose = true;
+    if (error)
+      closeData.reason = ": " + (error.message || error);
     const text = "The service was stopped" + closeData.reason;
-    for (let callback of responseCallbacks.values()) {
-      callback(text, null);
+    for (let id in responseCallbacks) {
+      responseCallbacks[id](text, null);
     }
-    responseCallbacks.clear();
-    for (let callbacks of serveCallbacks.values()) {
-      callbacks.onWait(text);
-    }
-    serveCallbacks.clear();
-    for (let callback of watchCallbacks.values()) {
-      try {
-        callback(new Error(text), null);
-      } catch (e) {
-        console.error(e);
-      }
-    }
-    watchCallbacks.clear();
+    responseCallbacks = {};
   };
   let sendRequest = (refs, value, callback) => {
-    if (closeData)
+    if (closeData.didClose)
       return callback("The service is no longer running" + closeData.reason, null);
     let id = nextRequestID++;
-    responseCallbacks.set(id, (error, response) => {
+    responseCallbacks[id] = (error, response) => {
       try {
         callback(error, response);
       } finally {
         if (refs)
           refs.unref();
       }
-    });
+    };
     if (refs)
       refs.ref();
     streamIn.writeToStdin(encodePacket({ id, isRequest: true, value }));
   };
   let sendResponse = (id, value) => {
-    if (closeData)
+    if (closeData.didClose)
       throw new Error("The service is no longer running" + closeData.reason);
     streamIn.writeToStdin(encodePacket({ id, isRequest: false, value }));
   };
   let handleRequest = async (id, request) => {
     try {
-      switch (request.command) {
-        case "ping": {
-          sendResponse(id, {});
-          break;
-        }
-        case "on-start": {
-          let callback = pluginCallbacks.get(request.key);
-          if (!callback)
-            sendResponse(id, {});
-          else
-            sendResponse(id, await callback(request));
-          break;
-        }
-        case "on-resolve": {
-          let callback = pluginCallbacks.get(request.key);
-          if (!callback)
-            sendResponse(id, {});
-          else
-            sendResponse(id, await callback(request));
-          break;
-        }
-        case "on-load": {
-          let callback = pluginCallbacks.get(request.key);
-          if (!callback)
-            sendResponse(id, {});
-          else
-            sendResponse(id, await callback(request));
-          break;
-        }
-        case "serve-request": {
-          let callbacks = serveCallbacks.get(request.key);
-          if (callbacks && callbacks.onRequest)
-            callbacks.onRequest(request.args);
-          sendResponse(id, {});
-          break;
-        }
-        case "serve-wait": {
-          let callbacks = serveCallbacks.get(request.key);
-          if (callbacks)
-            callbacks.onWait(request.error);
-          sendResponse(id, {});
-          break;
-        }
-        case "watch-rebuild": {
-          let callback = watchCallbacks.get(request.key);
-          try {
-            if (callback)
-              callback(null, request.args);
-          } catch (err) {
-            console.error(err);
+      if (request.command === "ping") {
+        sendResponse(id, {});
+        return;
+      }
+      if (typeof request.key === "number") {
+        const requestCallbacks = requestCallbacksByKey[request.key];
+        if (requestCallbacks) {
+          const callback = requestCallbacks[request.command];
+          if (callback) {
+            await callback(id, request);
+            return;
           }
-          sendResponse(id, {});
-          break;
         }
-        default:
-          throw new Error(`Invalid command: ` + request.command);
       }
+      throw new Error(`Invalid command: ` + request.command);
     } catch (e) {
       sendResponse(id, { errors: [extractErrorMessageV8(e, streamIn, null, void 0, "")] });
     }
@@ -758,8 +709,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.15.7") {
-        throw new Error(`Cannot start service: Host version "${"0.15.7"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.15.8") {
+        throw new Error(`Cannot start service: Host version "${"0.15.8"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -767,452 +718,259 @@ function createChannel(streamIn) {
     if (packet.isRequest) {
       handleRequest(packet.id, packet.value);
     } else {
-      let callback = responseCallbacks.get(packet.id);
-      responseCallbacks.delete(packet.id);
+      let callback = responseCallbacks[packet.id];
+      delete responseCallbacks[packet.id];
       if (packet.value.error)
         callback(packet.value.error, {});
       else
         callback(null, packet.value);
     }
   };
-  let handlePlugins = async (initialOptions, plugins, buildKey, stash, refs) => {
-    let onStartCallbacks = [];
-    let onEndCallbacks = [];
-    let onResolveCallbacks = {};
-    let onLoadCallbacks = {};
-    let nextCallbackID = 0;
-    let i = 0;
-    let requestPlugins = [];
-    let isSetupDone = false;
-    plugins = [...plugins];
-    for (let item of plugins) {
-      let keys = {};
-      if (typeof item !== "object")
-        throw new Error(`Plugin at index ${i} must be an object`);
-      const name = getFlag(item, keys, "name", mustBeString);
-      if (typeof name !== "string" || name === "")
-        throw new Error(`Plugin at index ${i} is missing a name`);
+  let buildOrServe = ({ callName, refs, serveOptions, options, isTTY: isTTY2, defaultWD: defaultWD2, callback }) => {
+    let refCount = 0;
+    const buildKey = nextBuildKey++;
+    const requestCallbacks = {};
+    const buildRefs = {
+      ref() {
+        if (++refCount === 1) {
+          if (refs)
+            refs.ref();
+        }
+      },
+      unref() {
+        if (--refCount === 0) {
+          delete requestCallbacksByKey[buildKey];
+          if (refs)
+            refs.unref();
+        }
+      }
+    };
+    requestCallbacksByKey[buildKey] = requestCallbacks;
+    buildRefs.ref();
+    buildOrServeImpl(
+      callName,
+      buildKey,
+      sendRequest,
+      sendResponse,
+      buildRefs,
+      streamIn,
+      requestCallbacks,
+      options,
+      serveOptions,
+      isTTY2,
+      defaultWD2,
+      closeData,
+      (err, res) => {
+        try {
+          callback(err, res);
+        } finally {
+          buildRefs.unref();
+        }
+      }
+    );
+  };
+  let transform2 = ({ callName, refs, input, options, isTTY: isTTY2, fs: fs3, callback }) => {
+    const details = createObjectStash();
+    let start = (inputPath) => {
       try {
-        let setup = getFlag(item, keys, "setup", mustBeFunction);
-        if (typeof setup !== "function")
-          throw new Error(`Plugin is missing a setup function`);
-        checkForInvalidFlags(item, keys, `on plugin ${JSON.stringify(name)}`);
-        let plugin = {
-          name,
-          onResolve: [],
-          onLoad: []
-        };
-        i++;
-        let resolve = (path3, options = {}) => {
-          if (!isSetupDone)
-            throw new Error('Cannot call "resolve" before plugin setup has completed');
-          if (typeof path3 !== "string")
-            throw new Error(`The path to resolve must be a string`);
-          let keys2 = /* @__PURE__ */ Object.create(null);
-          let pluginName = getFlag(options, keys2, "pluginName", mustBeString);
-          let importer = getFlag(options, keys2, "importer", mustBeString);
-          let namespace = getFlag(options, keys2, "namespace", mustBeString);
-          let resolveDir = getFlag(options, keys2, "resolveDir", mustBeString);
-          let kind = getFlag(options, keys2, "kind", mustBeString);
-          let pluginData = getFlag(options, keys2, "pluginData", canBeAnything);
-          checkForInvalidFlags(options, keys2, "in resolve() call");
-          return new Promise((resolve2, reject) => {
-            const request = {
-              command: "resolve",
-              path: path3,
-              key: buildKey,
-              pluginName: name
-            };
-            if (pluginName != null)
-              request.pluginName = pluginName;
-            if (importer != null)
-              request.importer = importer;
-            if (namespace != null)
-              request.namespace = namespace;
-            if (resolveDir != null)
-              request.resolveDir = resolveDir;
-            if (kind != null)
-              request.kind = kind;
-            if (pluginData != null)
-              request.pluginData = stash.store(pluginData);
-            sendRequest(refs, request, (error, response) => {
-              if (error !== null)
-                reject(new Error(error));
-              else
-                resolve2({
-                  errors: replaceDetailsInMessages(response.errors, stash),
-                  warnings: replaceDetailsInMessages(response.warnings, stash),
-                  path: response.path,
-                  external: response.external,
-                  sideEffects: response.sideEffects,
-                  namespace: response.namespace,
-                  suffix: response.suffix,
-                  pluginData: stash.load(response.pluginData)
-                });
-            });
-          });
+        if (typeof input !== "string" && !(input instanceof Uint8Array))
+          throw new Error('The input to "transform" must be a string or a Uint8Array');
+        let {
+          flags,
+          mangleCache
+        } = flagsForTransformOptions(callName, options, isTTY2, transformLogLevelDefault);
+        let request = {
+          command: "transform",
+          flags,
+          inputFS: inputPath !== null,
+          input: inputPath !== null ? encodeUTF8(inputPath) : typeof input === "string" ? encodeUTF8(input) : input
         };
-        let promise = setup({
-          initialOptions,
-          resolve,
-          onStart(callback2) {
-            let registeredText = `This error came from the "onStart" callback registered here:`;
-            let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onStart");
-            onStartCallbacks.push({ name, callback: callback2, note: registeredNote });
-          },
-          onEnd(callback2) {
-            let registeredText = `This error came from the "onEnd" callback registered here:`;
-            let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onEnd");
-            onEndCallbacks.push({ name, callback: callback2, note: registeredNote });
-          },
-          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);
-            checkForInvalidFlags(options, keys2, `in onResolve() call for plugin ${JSON.stringify(name)}`);
-            if (filter == null)
-              throw new Error(`onResolve() call is missing a filter`);
-            let id = nextCallbackID++;
-            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);
-            checkForInvalidFlags(options, keys2, `in onLoad() call for plugin ${JSON.stringify(name)}`);
-            if (filter == null)
-              throw new Error(`onLoad() call is missing a filter`);
-            let id = nextCallbackID++;
-            onLoadCallbacks[id] = { name, callback: callback2, note: registeredNote };
-            plugin.onLoad.push({ id, filter: filter.source, namespace: namespace || "" });
-          },
-          esbuild: streamIn.esbuild
-        });
-        if (promise)
-          await promise;
-        requestPlugins.push(plugin);
-      } catch (e) {
-        return { ok: false, error: e, pluginName: name };
-      }
-    }
-    const callback = async (request) => {
-      switch (request.command) {
-        case "on-start": {
-          let response = { errors: [], warnings: [] };
-          await Promise.all(onStartCallbacks.map(async ({ name, callback: callback2, note }) => {
-            try {
-              let result = await callback2();
-              if (result != null) {
-                if (typeof result !== "object")
-                  throw new Error(`Expected onStart() callback in plugin ${JSON.stringify(name)} to return an object`);
-                let keys = {};
-                let errors = getFlag(result, keys, "errors", mustBeArray);
-                let warnings = getFlag(result, keys, "warnings", mustBeArray);
-                checkForInvalidFlags(result, keys, `from onStart() callback in plugin ${JSON.stringify(name)}`);
-                if (errors != null)
-                  response.errors.push(...sanitizeMessages(errors, "errors", stash, name));
-                if (warnings != null)
-                  response.warnings.push(...sanitizeMessages(warnings, "warnings", stash, name));
-              }
-            } catch (e) {
-              response.errors.push(extractErrorMessageV8(e, streamIn, stash, note && note(), name));
+        if (mangleCache)
+          request.mangleCache = mangleCache;
+        sendRequest(refs, request, (error, response) => {
+          if (error)
+            return callback(new Error(error), null);
+          let errors = replaceDetailsInMessages(response.errors, details);
+          let warnings = replaceDetailsInMessages(response.warnings, details);
+          let outstanding = 1;
+          let next = () => {
+            if (--outstanding === 0) {
+              let result = { warnings, code: response.code, map: response.map };
+              if (response.mangleCache)
+                result.mangleCache = response == null ? void 0 : response.mangleCache;
+              callback(null, result);
             }
-          }));
-          return response;
-        }
-        case "on-resolve": {
-          let response = {}, name = "", callback2, note;
-          for (let id of request.ids) {
-            try {
-              ({ name, callback: callback2, note } = onResolveCallbacks[id]);
-              let result = await callback2({
-                path: request.path,
-                importer: request.importer,
-                namespace: request.namespace,
-                resolveDir: request.resolveDir,
-                kind: request.kind,
-                pluginData: stash.load(request.pluginData)
-              });
-              if (result != null) {
-                if (typeof result !== "object")
-                  throw new Error(`Expected onResolve() callback in plugin ${JSON.stringify(name)} to return an object`);
-                let keys = {};
-                let pluginName = getFlag(result, keys, "pluginName", mustBeString);
-                let path3 = getFlag(result, keys, "path", mustBeString);
-                let namespace = getFlag(result, keys, "namespace", mustBeString);
-                let suffix = getFlag(result, keys, "suffix", mustBeString);
-                let external = getFlag(result, keys, "external", mustBeBoolean);
-                let sideEffects = getFlag(result, keys, "sideEffects", mustBeBoolean);
-                let pluginData = getFlag(result, keys, "pluginData", canBeAnything);
-                let errors = getFlag(result, keys, "errors", mustBeArray);
-                let warnings = getFlag(result, keys, "warnings", mustBeArray);
-                let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
-                let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
-                checkForInvalidFlags(result, keys, `from onResolve() callback in plugin ${JSON.stringify(name)}`);
-                response.id = id;
-                if (pluginName != null)
-                  response.pluginName = pluginName;
-                if (path3 != null)
-                  response.path = path3;
-                if (namespace != null)
-                  response.namespace = namespace;
-                if (suffix != null)
-                  response.suffix = suffix;
-                if (external != null)
-                  response.external = external;
-                if (sideEffects != null)
-                  response.sideEffects = sideEffects;
-                if (pluginData != null)
-                  response.pluginData = stash.store(pluginData);
-                if (errors != null)
-                  response.errors = sanitizeMessages(errors, "errors", stash, name);
-                if (warnings != null)
-                  response.warnings = sanitizeMessages(warnings, "warnings", stash, name);
-                if (watchFiles != null)
-                  response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
-                if (watchDirs != null)
-                  response.watchDirs = sanitizeStringArray(watchDirs, "watchDirs");
-                break;
+          };
+          if (errors.length > 0)
+            return callback(failureErrorWithLog("Transform failed", errors, warnings), null);
+          if (response.codeFS) {
+            outstanding++;
+            fs3.readFile(response.code, (err, contents) => {
+              if (err !== null) {
+                callback(err, null);
+              } else {
+                response.code = contents;
+                next();
               }
-            } catch (e) {
-              return { id, errors: [extractErrorMessageV8(e, streamIn, stash, note && note(), name)] };
-            }
+            });
           }
-          return response;
-        }
-        case "on-load": {
-          let response = {}, name = "", callback2, note;
-          for (let id of request.ids) {
-            try {
-              ({ name, callback: callback2, note } = onLoadCallbacks[id]);
-              let result = await callback2({
-                path: request.path,
-                namespace: request.namespace,
-                suffix: request.suffix,
-                pluginData: stash.load(request.pluginData)
-              });
-              if (result != null) {
-                if (typeof result !== "object")
-                  throw new Error(`Expected onLoad() callback in plugin ${JSON.stringify(name)} to return an object`);
-                let keys = {};
-                let pluginName = getFlag(result, keys, "pluginName", mustBeString);
-                let contents = getFlag(result, keys, "contents", mustBeStringOrUint8Array);
-                let resolveDir = getFlag(result, keys, "resolveDir", mustBeString);
-                let pluginData = getFlag(result, keys, "pluginData", canBeAnything);
-                let loader = getFlag(result, keys, "loader", mustBeString);
-                let errors = getFlag(result, keys, "errors", mustBeArray);
-                let warnings = getFlag(result, keys, "warnings", mustBeArray);
-                let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
-                let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
-                checkForInvalidFlags(result, keys, `from onLoad() callback in plugin ${JSON.stringify(name)}`);
-                response.id = id;
-                if (pluginName != null)
-                  response.pluginName = pluginName;
-                if (contents instanceof Uint8Array)
-                  response.contents = contents;
-                else if (contents != null)
-                  response.contents = encodeUTF8(contents);
-                if (resolveDir != null)
-                  response.resolveDir = resolveDir;
-                if (pluginData != null)
-                  response.pluginData = stash.store(pluginData);
-                if (loader != null)
-                  response.loader = loader;
-                if (errors != null)
-                  response.errors = sanitizeMessages(errors, "errors", stash, name);
-                if (warnings != null)
-                  response.warnings = sanitizeMessages(warnings, "warnings", stash, name);
-                if (watchFiles != null)
-                  response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
-                if (watchDirs != null)
-                  response.watchDirs = sanitizeStringArray(watchDirs, "watchDirs");
-                break;
+          if (response.mapFS) {
+            outstanding++;
+            fs3.readFile(response.map, (err, contents) => {
+              if (err !== null) {
+                callback(err, null);
+              } else {
+                response.map = contents;
+                next();
               }
-            } catch (e) {
-              return { id, errors: [extractErrorMessageV8(e, streamIn, stash, note && note(), name)] };
-            }
+            });
           }
-          return response;
+          next();
+        });
+      } catch (e) {
+        let flags = [];
+        try {
+          pushLogFlags(flags, options, {}, isTTY2, transformLogLevelDefault);
+        } catch {
         }
-        default:
-          throw new Error(`Invalid command: ` + request.command);
+        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);
+        });
       }
     };
-    let runOnEndCallbacks = (result, logPluginError, done) => done();
-    if (onEndCallbacks.length > 0) {
-      runOnEndCallbacks = (result, logPluginError, done) => {
-        (async () => {
-          for (const { name, callback: callback2, note } of onEndCallbacks) {
-            try {
-              await callback2(result);
-            } catch (e) {
-              result.errors.push(await new Promise((resolve) => logPluginError(e, name, note && note(), resolve)));
-            }
-          }
-        })().then(done);
-      };
+    if ((typeof input === "string" || input instanceof Uint8Array) && input.length > 1024 * 1024) {
+      let next = start;
+      start = () => fs3.writeFile(input, next);
     }
-    isSetupDone = true;
-    let refCount = 0;
-    return {
-      ok: true,
-      requestPlugins,
-      runOnEndCallbacks,
-      pluginRefs: {
-        ref() {
-          if (++refCount === 1)
-            pluginCallbacks.set(buildKey, callback);
-        },
-        unref() {
-          if (--refCount === 0)
-            pluginCallbacks.delete(buildKey);
-        }
-      }
-    };
+    start(null);
   };
-  let buildServeData = (refs, options, request, key) => {
+  let formatMessages2 = ({ callName, refs, messages, options, callback }) => {
+    let result = sanitizeMessages(messages, "messages", null, "");
+    if (!options)
+      throw new Error(`Missing second argument in ${callName}() call`);
     let keys = {};
-    let port = getFlag(options, keys, "port", mustBeInteger);
-    let host = getFlag(options, keys, "host", mustBeString);
-    let servedir = getFlag(options, keys, "servedir", mustBeString);
-    let onRequest = getFlag(options, keys, "onRequest", mustBeFunction);
-    let onWait;
-    let wait = new Promise((resolve, reject) => {
-      onWait = (error) => {
-        serveCallbacks.delete(key);
-        if (error !== null)
-          reject(new Error(error));
-        else
-          resolve();
-      };
-    });
-    request.serve = {};
-    checkForInvalidFlags(options, keys, `in serve() call`);
-    if (port !== void 0)
-      request.serve.port = port;
-    if (host !== void 0)
-      request.serve.host = host;
-    if (servedir !== void 0)
-      request.serve.servedir = servedir;
-    serveCallbacks.set(key, {
-      onRequest,
-      onWait
+    let kind = getFlag(options, keys, "kind", mustBeString);
+    let color = getFlag(options, keys, "color", mustBeBoolean);
+    let terminalWidth = getFlag(options, keys, "terminalWidth", mustBeInteger);
+    checkForInvalidFlags(options, keys, `in ${callName}() call`);
+    if (kind === void 0)
+      throw new Error(`Missing "kind" in ${callName}() call`);
+    if (kind !== "error" && kind !== "warning")
+      throw new Error(`Expected "kind" to be "error" or "warning" in ${callName}() call`);
+    let request = {
+      command: "format-msgs",
+      messages: result,
+      isWarning: kind === "warning"
+    };
+    if (color !== void 0)
+      request.color = color;
+    if (terminalWidth !== void 0)
+      request.terminalWidth = terminalWidth;
+    sendRequest(refs, request, (error, response) => {
+      if (error)
+        return callback(new Error(error), null);
+      callback(null, response.messages);
     });
-    return {
-      wait,
-      stop() {
-        sendRequest(refs, { command: "serve-stop", key }, () => {
-        });
-      }
+  };
+  let analyzeMetafile2 = ({ callName, refs, metafile, options, callback }) => {
+    if (options === void 0)
+      options = {};
+    let keys = {};
+    let color = getFlag(options, keys, "color", mustBeBoolean);
+    let verbose = getFlag(options, keys, "verbose", mustBeBoolean);
+    checkForInvalidFlags(options, keys, `in ${callName}() call`);
+    let request = {
+      command: "analyze-metafile",
+      metafile
     };
+    if (color !== void 0)
+      request.color = color;
+    if (verbose !== void 0)
+      request.verbose = verbose;
+    sendRequest(refs, request, (error, response) => {
+      if (error)
+        return callback(new Error(error), null);
+      callback(null, response.result);
+    });
   };
-  const buildLogLevelDefault = "warning";
-  const transformLogLevelDefault = "silent";
-  let buildOrServe = (args) => {
-    let key = nextBuildKey++;
-    const details = createObjectStash();
-    let plugins;
-    let { refs, options, isTTY: isTTY2, callback } = args;
-    if (typeof options === "object") {
-      let value = options.plugins;
-      if (value !== void 0) {
-        if (!Array.isArray(value))
-          throw new Error(`"plugins" must be an array`);
-        plugins = value;
-      }
+  return {
+    readFromStdout,
+    afterClose,
+    service: {
+      buildOrServe,
+      transform: transform2,
+      formatMessages: formatMessages2,
+      analyzeMetafile: analyzeMetafile2
     }
-    let logPluginError = (e, pluginName, note, done) => {
-      let flags = [];
-      try {
-        pushLogFlags(flags, options, {}, isTTY2, buildLogLevelDefault);
-      } catch {
-      }
-      const message = extractErrorMessageV8(e, streamIn, details, note, pluginName);
-      sendRequest(refs, { command: "error", flags, error: message }, () => {
-        message.detail = details.load(message.detail);
-        done(message);
-      });
-    };
-    let handleError = (e, pluginName) => {
-      logPluginError(e, pluginName, void 0, (error) => {
-        callback(failureErrorWithLog("Build failed", [error], []), null);
-      });
-    };
-    if (plugins && plugins.length > 0) {
-      if (streamIn.isSync)
-        return handleError(new Error("Cannot use plugins in synchronous API calls"), "");
-      handlePlugins(options, plugins, key, details, refs).then(
-        (result) => {
-          if (!result.ok) {
-            handleError(result.error, result.pluginName);
-          } else {
-            try {
-              buildOrServeContinue({
-                ...args,
-                key,
-                details,
-                logPluginError,
-                requestPlugins: result.requestPlugins,
-                runOnEndCallbacks: result.runOnEndCallbacks,
-                pluginRefs: result.pluginRefs
-              });
-            } catch (e) {
-              handleError(e, "");
-            }
-          }
-        },
-        (e) => handleError(e, "")
-      );
-    } else {
-      try {
-        buildOrServeContinue({
-          ...args,
-          key,
-          details,
-          logPluginError,
-          requestPlugins: null,
-          runOnEndCallbacks: (result, logPluginError2, done) => done(),
-          pluginRefs: null
-        });
-      } catch (e) {
-        handleError(e, "");
-      }
+  };
+}
+function buildOrServeImpl(callName, buildKey, sendRequest, sendResponse, refs, streamIn, requestCallbacks, options, serveOptions, isTTY2, defaultWD2, closeData, callback) {
+  const details = createObjectStash();
+  const logPluginError = (e, pluginName, note, done) => {
+    const flags = [];
+    try {
+      pushLogFlags(flags, options, {}, isTTY2, buildLogLevelDefault);
+    } catch {
     }
+    const message = extractErrorMessageV8(e, streamIn, details, note, pluginName);
+    sendRequest(refs, { command: "error", flags, error: message }, () => {
+      message.detail = details.load(message.detail);
+      done(message);
+    });
   };
-  let buildOrServeContinue = ({
-    callName,
-    refs: callerRefs,
-    serveOptions,
-    options,
-    isTTY: isTTY2,
-    defaultWD: defaultWD2,
-    callback,
-    key,
-    details,
-    logPluginError,
-    requestPlugins,
-    runOnEndCallbacks,
-    pluginRefs
-  }) => {
-    const refs = {
-      ref() {
-        if (pluginRefs)
-          pluginRefs.ref();
-        if (callerRefs)
-          callerRefs.ref();
+  const handleError = (e, pluginName) => {
+    logPluginError(e, pluginName, void 0, (error) => {
+      callback(failureErrorWithLog("Build failed", [error], []), null);
+    });
+  };
+  let plugins;
+  if (typeof options === "object") {
+    const value = options.plugins;
+    if (value !== void 0) {
+      if (!Array.isArray(value))
+        throw new Error(`"plugins" must be an array`);
+      plugins = value;
+    }
+  }
+  if (plugins && plugins.length > 0) {
+    if (streamIn.isSync) {
+      handleError(new Error("Cannot use plugins in synchronous API calls"), "");
+      return;
+    }
+    handlePlugins(
+      buildKey,
+      sendRequest,
+      sendResponse,
+      refs,
+      streamIn,
+      requestCallbacks,
+      options,
+      plugins,
+      details
+    ).then(
+      (result) => {
+        if (!result.ok) {
+          handleError(result.error, result.pluginName);
+          return;
+        }
+        try {
+          buildOrServeContinue(result.requestPlugins, result.runOnEndCallbacks);
+        } catch (e) {
+          handleError(e, "");
+        }
       },
-      unref() {
-        if (pluginRefs)
-          pluginRefs.unref();
-        if (callerRefs)
-          callerRefs.unref();
-      }
-    };
+      (e) => handleError(e, "")
+    );
+    return;
+  }
+  try {
+    buildOrServeContinue(null, (result, logPluginError2, done) => done());
+  } catch (e) {
+    handleError(e, "");
+  }
+  function buildOrServeContinue(requestPlugins, runOnEndCallbacks) {
     let writeDefault = !streamIn.isWriteUnavailable;
     let {
       entries,
@@ -1228,7 +986,7 @@ function createChannel(streamIn) {
     } = flagsForBuildOptions(callName, options, isTTY2, buildLogLevelDefault, writeDefault);
     let request = {
       command: "build",
-      key,
+      key: buildKey,
       entries,
       flags,
       write,
@@ -1242,7 +1000,7 @@ function createChannel(streamIn) {
       request.plugins = requestPlugins;
     if (mangleCache)
       request.mangleCache = mangleCache;
-    let serve2 = serveOptions && buildServeData(refs, serveOptions, request, key);
+    let serve2 = serveOptions && buildServeData(buildKey, sendRequest, sendResponse, refs, requestCallbacks, serveOptions, request);
     let rebuild;
     let stop;
     let copyResponseToResult = (response, result) => {
@@ -1269,11 +1027,11 @@ function createChannel(streamIn) {
           if (!rebuild) {
             let isDisposed = false;
             rebuild = () => new Promise((resolve, reject) => {
-              if (isDisposed || closeData)
+              if (isDisposed || closeData.didClose)
                 throw new Error("Cannot rebuild");
               sendRequest(
                 refs,
-                { command: "rebuild", key },
+                { command: "rebuild", key: buildKey },
                 (error2, response2) => {
                   if (error2) {
                     const message = { id: "", pluginName: "", text: error2, location: null, notes: [], detail: void 0 };
@@ -1293,7 +1051,7 @@ function createChannel(streamIn) {
               if (isDisposed)
                 return;
               isDisposed = true;
-              sendRequest(refs, { command: "rebuild-dispose", key }, () => {
+              sendRequest(refs, { command: "rebuild-dispose", key: buildKey }, () => {
               });
               refs.unref();
             };
@@ -1308,36 +1066,35 @@ function createChannel(streamIn) {
               if (isStopped)
                 return;
               isStopped = true;
-              watchCallbacks.delete(key);
-              sendRequest(refs, { command: "watch-stop", key }, () => {
+              delete requestCallbacks["watch-rebuild"];
+              sendRequest(refs, { command: "watch-stop", key: buildKey }, () => {
               });
               refs.unref();
             };
             if (watch) {
-              watchCallbacks.set(key, (serviceStopError, watchResponse) => {
-                if (serviceStopError) {
-                  if (watch.onRebuild)
-                    watch.onRebuild(serviceStopError, null);
-                  return;
-                }
-                let result2 = {
-                  errors: replaceDetailsInMessages(watchResponse.errors, details),
-                  warnings: replaceDetailsInMessages(watchResponse.warnings, details)
-                };
-                copyResponseToResult(watchResponse, result2);
-                runOnEndCallbacks(result2, logPluginError, () => {
-                  if (result2.errors.length > 0) {
+              requestCallbacks["watch-rebuild"] = (id, request2) => {
+                try {
+                  let watchResponse = request2.args;
+                  let result2 = {
+                    errors: replaceDetailsInMessages(watchResponse.errors, details),
+                    warnings: replaceDetailsInMessages(watchResponse.warnings, details)
+                  };
+                  copyResponseToResult(watchResponse, result2);
+                  runOnEndCallbacks(result2, logPluginError, () => {
+                    if (result2.errors.length > 0) {
+                      if (watch.onRebuild)
+                        watch.onRebuild(failureErrorWithLog("Build failed", result2.errors, result2.warnings), null);
+                      return;
+                    }
+                    result2.stop = stop;
                     if (watch.onRebuild)
-                      watch.onRebuild(failureErrorWithLog("Build failed", result2.errors, result2.warnings), null);
-                    return;
-                  }
-                  if (watchResponse.rebuildID !== void 0)
-                    result2.rebuild = rebuild;
-                  result2.stop = stop;
-                  if (watch.onRebuild)
-                    watch.onRebuild(null, result2);
-                });
-              });
+                      watch.onRebuild(null, result2);
+                  });
+                } catch (err) {
+                  console.error(err);
+                }
+                sendResponse(id, {});
+              };
             }
           }
           result.stop = stop;
@@ -1376,144 +1133,329 @@ function createChannel(streamIn) {
       }
       return buildResponseToResult(response, callback);
     });
+  }
+}
+var buildServeData = (buildKey, sendRequest, sendResponse, refs, requestCallbacks, options, request) => {
+  let keys = {};
+  let port = getFlag(options, keys, "port", mustBeInteger);
+  let host = getFlag(options, keys, "host", mustBeString);
+  let servedir = getFlag(options, keys, "servedir", mustBeString);
+  let onRequest = getFlag(options, keys, "onRequest", mustBeFunction);
+  let wait = new Promise((resolve, reject) => {
+    requestCallbacks["serve-wait"] = (id, request2) => {
+      if (request2.error !== null)
+        reject(new Error(request2.error));
+      else
+        resolve();
+      sendResponse(id, {});
+    };
+  });
+  request.serve = {};
+  checkForInvalidFlags(options, keys, `in serve() call`);
+  if (port !== void 0)
+    request.serve.port = port;
+  if (host !== void 0)
+    request.serve.host = host;
+  if (servedir !== void 0)
+    request.serve.servedir = servedir;
+  requestCallbacks["serve-request"] = (id, request2) => {
+    if (onRequest)
+      onRequest(request2.args);
+    sendResponse(id, {});
   };
-  let transform2 = ({ callName, refs, input, options, isTTY: isTTY2, fs: fs3, callback }) => {
-    const details = createObjectStash();
-    let start = (inputPath) => {
-      try {
-        if (typeof input !== "string" && !(input instanceof Uint8Array))
-          throw new Error('The input to "transform" must be a string or a Uint8Array');
-        let {
-          flags,
-          mangleCache
-        } = flagsForTransformOptions(callName, options, isTTY2, transformLogLevelDefault);
-        let request = {
-          command: "transform",
-          flags,
-          inputFS: inputPath !== null,
-          input: inputPath !== null ? encodeUTF8(inputPath) : typeof input === "string" ? encodeUTF8(input) : input
-        };
-        if (mangleCache)
-          request.mangleCache = mangleCache;
-        sendRequest(refs, request, (error, response) => {
-          if (error)
-            return callback(new Error(error), null);
-          let errors = replaceDetailsInMessages(response.errors, details);
-          let warnings = replaceDetailsInMessages(response.warnings, details);
-          let outstanding = 1;
-          let next = () => {
-            if (--outstanding === 0) {
-              let result = { warnings, code: response.code, map: response.map };
-              if (response.mangleCache)
-                result.mangleCache = response == null ? void 0 : response.mangleCache;
-              callback(null, result);
-            }
+  return {
+    wait,
+    stop() {
+      sendRequest(refs, { command: "serve-stop", key: buildKey }, () => {
+      });
+    }
+  };
+};
+var handlePlugins = async (buildKey, sendRequest, sendResponse, refs, streamIn, requestCallbacks, initialOptions, plugins, details) => {
+  let onStartCallbacks = [];
+  let onEndCallbacks = [];
+  let onResolveCallbacks = {};
+  let onLoadCallbacks = {};
+  let nextCallbackID = 0;
+  let i = 0;
+  let requestPlugins = [];
+  let isSetupDone = false;
+  plugins = [...plugins];
+  for (let item of plugins) {
+    let keys = {};
+    if (typeof item !== "object")
+      throw new Error(`Plugin at index ${i} must be an object`);
+    const name = getFlag(item, keys, "name", mustBeString);
+    if (typeof name !== "string" || name === "")
+      throw new Error(`Plugin at index ${i} is missing a name`);
+    try {
+      let setup = getFlag(item, keys, "setup", mustBeFunction);
+      if (typeof setup !== "function")
+        throw new Error(`Plugin is missing a setup function`);
+      checkForInvalidFlags(item, keys, `on plugin ${JSON.stringify(name)}`);
+      let plugin = {
+        name,
+        onResolve: [],
+        onLoad: []
+      };
+      i++;
+      let resolve = (path3, options = {}) => {
+        if (!isSetupDone)
+          throw new Error('Cannot call "resolve" before plugin setup has completed');
+        if (typeof path3 !== "string")
+          throw new Error(`The path to resolve must be a string`);
+        let keys2 = /* @__PURE__ */ Object.create(null);
+        let pluginName = getFlag(options, keys2, "pluginName", mustBeString);
+        let importer = getFlag(options, keys2, "importer", mustBeString);
+        let namespace = getFlag(options, keys2, "namespace", mustBeString);
+        let resolveDir = getFlag(options, keys2, "resolveDir", mustBeString);
+        let kind = getFlag(options, keys2, "kind", mustBeString);
+        let pluginData = getFlag(options, keys2, "pluginData", canBeAnything);
+        checkForInvalidFlags(options, keys2, "in resolve() call");
+        return new Promise((resolve2, reject) => {
+          const request = {
+            command: "resolve",
+            path: path3,
+            key: buildKey,
+            pluginName: name
           };
-          if (errors.length > 0)
-            return callback(failureErrorWithLog("Transform failed", errors, warnings), null);
-          if (response.codeFS) {
-            outstanding++;
-            fs3.readFile(response.code, (err, contents) => {
-              if (err !== null) {
-                callback(err, null);
-              } else {
-                response.code = contents;
-                next();
-              }
-            });
-          }
-          if (response.mapFS) {
-            outstanding++;
-            fs3.readFile(response.map, (err, contents) => {
-              if (err !== null) {
-                callback(err, null);
-              } else {
-                response.map = contents;
-                next();
-              }
-            });
-          }
-          next();
+          if (pluginName != null)
+            request.pluginName = pluginName;
+          if (importer != null)
+            request.importer = importer;
+          if (namespace != null)
+            request.namespace = namespace;
+          if (resolveDir != null)
+            request.resolveDir = resolveDir;
+          if (kind != null)
+            request.kind = kind;
+          if (pluginData != null)
+            request.pluginData = details.store(pluginData);
+          sendRequest(refs, request, (error, response) => {
+            if (error !== null)
+              reject(new Error(error));
+            else
+              resolve2({
+                errors: replaceDetailsInMessages(response.errors, details),
+                warnings: replaceDetailsInMessages(response.warnings, details),
+                path: response.path,
+                external: response.external,
+                sideEffects: response.sideEffects,
+                namespace: response.namespace,
+                suffix: response.suffix,
+                pluginData: details.load(response.pluginData)
+              });
+          });
         });
-      } catch (e) {
-        let flags = [];
-        try {
-          pushLogFlags(flags, options, {}, isTTY2, transformLogLevelDefault);
-        } catch {
+      };
+      let promise = setup({
+        initialOptions,
+        resolve,
+        onStart(callback) {
+          let registeredText = `This error came from the "onStart" callback registered here:`;
+          let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onStart");
+          onStartCallbacks.push({ name, callback, note: registeredNote });
+        },
+        onEnd(callback) {
+          let registeredText = `This error came from the "onEnd" callback registered here:`;
+          let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onEnd");
+          onEndCallbacks.push({ name, callback, note: registeredNote });
+        },
+        onResolve(options, callback) {
+          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);
+          checkForInvalidFlags(options, keys2, `in onResolve() call for plugin ${JSON.stringify(name)}`);
+          if (filter == null)
+            throw new Error(`onResolve() call is missing a filter`);
+          let id = nextCallbackID++;
+          onResolveCallbacks[id] = { name, callback, note: registeredNote };
+          plugin.onResolve.push({ id, filter: filter.source, namespace: namespace || "" });
+        },
+        onLoad(options, callback) {
+          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);
+          checkForInvalidFlags(options, keys2, `in onLoad() call for plugin ${JSON.stringify(name)}`);
+          if (filter == null)
+            throw new Error(`onLoad() call is missing a filter`);
+          let id = nextCallbackID++;
+          onLoadCallbacks[id] = { name, callback, note: registeredNote };
+          plugin.onLoad.push({ id, filter: filter.source, namespace: namespace || "" });
+        },
+        esbuild: streamIn.esbuild
+      });
+      if (promise)
+        await promise;
+      requestPlugins.push(plugin);
+    } catch (e) {
+      return { ok: false, error: e, pluginName: name };
+    }
+  }
+  requestCallbacks["on-start"] = async (id, request) => {
+    let response = { errors: [], warnings: [] };
+    await Promise.all(onStartCallbacks.map(async ({ name, callback, note }) => {
+      try {
+        let result = await callback();
+        if (result != null) {
+          if (typeof result !== "object")
+            throw new Error(`Expected onStart() callback in plugin ${JSON.stringify(name)} to return an object`);
+          let keys = {};
+          let errors = getFlag(result, keys, "errors", mustBeArray);
+          let warnings = getFlag(result, keys, "warnings", mustBeArray);
+          checkForInvalidFlags(result, keys, `from onStart() callback in plugin ${JSON.stringify(name)}`);
+          if (errors != null)
+            response.errors.push(...sanitizeMessages(errors, "errors", details, name));
+          if (warnings != null)
+            response.warnings.push(...sanitizeMessages(warnings, "warnings", details, name));
         }
-        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);
+      } catch (e) {
+        response.errors.push(extractErrorMessageV8(e, streamIn, details, note && note(), name));
+      }
+    }));
+    sendResponse(id, response);
+  };
+  requestCallbacks["on-resolve"] = async (id, request) => {
+    let response = {}, name = "", callback, note;
+    for (let id2 of request.ids) {
+      try {
+        ({ name, callback, note } = onResolveCallbacks[id2]);
+        let result = await callback({
+          path: request.path,
+          importer: request.importer,
+          namespace: request.namespace,
+          resolveDir: request.resolveDir,
+          kind: request.kind,
+          pluginData: details.load(request.pluginData)
         });
+        if (result != null) {
+          if (typeof result !== "object")
+            throw new Error(`Expected onResolve() callback in plugin ${JSON.stringify(name)} to return an object`);
+          let keys = {};
+          let pluginName = getFlag(result, keys, "pluginName", mustBeString);
+          let path3 = getFlag(result, keys, "path", mustBeString);
+          let namespace = getFlag(result, keys, "namespace", mustBeString);
+          let suffix = getFlag(result, keys, "suffix", mustBeString);
+          let external = getFlag(result, keys, "external", mustBeBoolean);
+          let sideEffects = getFlag(result, keys, "sideEffects", mustBeBoolean);
+          let pluginData = getFlag(result, keys, "pluginData", canBeAnything);
+          let errors = getFlag(result, keys, "errors", mustBeArray);
+          let warnings = getFlag(result, keys, "warnings", mustBeArray);
+          let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
+          let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
+          checkForInvalidFlags(result, keys, `from onResolve() callback in plugin ${JSON.stringify(name)}`);
+          response.id = id2;
+          if (pluginName != null)
+            response.pluginName = pluginName;
+          if (path3 != null)
+            response.path = path3;
+          if (namespace != null)
+            response.namespace = namespace;
+          if (suffix != null)
+            response.suffix = suffix;
+          if (external != null)
+            response.external = external;
+          if (sideEffects != null)
+            response.sideEffects = sideEffects;
+          if (pluginData != null)
+            response.pluginData = details.store(pluginData);
+          if (errors != null)
+            response.errors = sanitizeMessages(errors, "errors", details, name);
+          if (warnings != null)
+            response.warnings = sanitizeMessages(warnings, "warnings", details, name);
+          if (watchFiles != null)
+            response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
+          if (watchDirs != null)
+            response.watchDirs = sanitizeStringArray(watchDirs, "watchDirs");
+          break;
+        }
+      } catch (e) {
+        response = { id: id2, errors: [extractErrorMessageV8(e, streamIn, details, note && note(), name)] };
+        break;
       }
-    };
-    if ((typeof input === "string" || input instanceof Uint8Array) && input.length > 1024 * 1024) {
-      let next = start;
-      start = () => fs3.writeFile(input, next);
     }
-    start(null);
+    sendResponse(id, response);
   };
-  let formatMessages2 = ({ callName, refs, messages, options, callback }) => {
-    let result = sanitizeMessages(messages, "messages", null, "");
-    if (!options)
-      throw new Error(`Missing second argument in ${callName}() call`);
-    let keys = {};
-    let kind = getFlag(options, keys, "kind", mustBeString);
-    let color = getFlag(options, keys, "color", mustBeBoolean);
-    let terminalWidth = getFlag(options, keys, "terminalWidth", mustBeInteger);
-    checkForInvalidFlags(options, keys, `in ${callName}() call`);
-    if (kind === void 0)
-      throw new Error(`Missing "kind" in ${callName}() call`);
-    if (kind !== "error" && kind !== "warning")
-      throw new Error(`Expected "kind" to be "error" or "warning" in ${callName}() call`);
-    let request = {
-      command: "format-msgs",
-      messages: result,
-      isWarning: kind === "warning"
-    };
-    if (color !== void 0)
-      request.color = color;
-    if (terminalWidth !== void 0)
-      request.terminalWidth = terminalWidth;
-    sendRequest(refs, request, (error, response) => {
-      if (error)
-        return callback(new Error(error), null);
-      callback(null, response.messages);
-    });
+  requestCallbacks["on-load"] = async (id, request) => {
+    let response = {}, name = "", callback, note;
+    for (let id2 of request.ids) {
+      try {
+        ({ name, callback, note } = onLoadCallbacks[id2]);
+        let result = await callback({
+          path: request.path,
+          namespace: request.namespace,
+          suffix: request.suffix,
+          pluginData: details.load(request.pluginData)
+        });
+        if (result != null) {
+          if (typeof result !== "object")
+            throw new Error(`Expected onLoad() callback in plugin ${JSON.stringify(name)} to return an object`);
+          let keys = {};
+          let pluginName = getFlag(result, keys, "pluginName", mustBeString);
+          let contents = getFlag(result, keys, "contents", mustBeStringOrUint8Array);
+          let resolveDir = getFlag(result, keys, "resolveDir", mustBeString);
+          let pluginData = getFlag(result, keys, "pluginData", canBeAnything);
+          let loader = getFlag(result, keys, "loader", mustBeString);
+          let errors = getFlag(result, keys, "errors", mustBeArray);
+          let warnings = getFlag(result, keys, "warnings", mustBeArray);
+          let watchFiles = getFlag(result, keys, "watchFiles", mustBeArray);
+          let watchDirs = getFlag(result, keys, "watchDirs", mustBeArray);
+          checkForInvalidFlags(result, keys, `from onLoad() callback in plugin ${JSON.stringify(name)}`);
+          response.id = id2;
+          if (pluginName != null)
+            response.pluginName = pluginName;
+          if (contents instanceof Uint8Array)
+            response.contents = contents;
+          else if (contents != null)
+            response.contents = encodeUTF8(contents);
+          if (resolveDir != null)
+            response.resolveDir = resolveDir;
+          if (pluginData != null)
+            response.pluginData = details.store(pluginData);
+          if (loader != null)
+            response.loader = loader;
+          if (errors != null)
+            response.errors = sanitizeMessages(errors, "errors", details, name);
+          if (warnings != null)
+            response.warnings = sanitizeMessages(warnings, "warnings", details, name);
+          if (watchFiles != null)
+            response.watchFiles = sanitizeStringArray(watchFiles, "watchFiles");
+          if (watchDirs != null)
+            response.watchDirs = sanitizeStringArray(watchDirs, "watchDirs");
+          break;
+        }
+      } catch (e) {
+        response = { id: id2, errors: [extractErrorMessageV8(e, streamIn, details, note && note(), name)] };
+        break;
+      }
+    }
+    sendResponse(id, response);
   };
-  let analyzeMetafile2 = ({ callName, refs, metafile, options, callback }) => {
-    if (options === void 0)
-      options = {};
-    let keys = {};
-    let color = getFlag(options, keys, "color", mustBeBoolean);
-    let verbose = getFlag(options, keys, "verbose", mustBeBoolean);
-    checkForInvalidFlags(options, keys, `in ${callName}() call`);
-    let request = {
-      command: "analyze-metafile",
-      metafile
+  let runOnEndCallbacks = (result, logPluginError, done) => done();
+  if (onEndCallbacks.length > 0) {
+    runOnEndCallbacks = (result, logPluginError, done) => {
+      (async () => {
+        for (const { name, callback, note } of onEndCallbacks) {
+          try {
+            await callback(result);
+          } catch (e) {
+            result.errors.push(await new Promise((resolve) => logPluginError(e, name, note && note(), resolve)));
+          }
+        }
+      })().then(done);
     };
-    if (color !== void 0)
-      request.color = color;
-    if (verbose !== void 0)
-      request.verbose = verbose;
-    sendRequest(refs, request, (error, response) => {
-      if (error)
-        return callback(new Error(error), null);
-      callback(null, response.result);
-    });
-  };
+  }
+  isSetupDone = true;
   return {
-    readFromStdout,
-    afterClose,
-    service: {
-      buildOrServe,
-      transform: transform2,
-      formatMessages: formatMessages2,
-      analyzeMetafile: analyzeMetafile2
-    }
+    ok: true,
+    requestPlugins,
+    runOnEndCallbacks
   };
-}
+};
 function createObjectStash() {
   const map = /* @__PURE__ */ new Map();
   let nextID = 0;
@@ -1747,6 +1689,7 @@ var knownUnixlikePackages = {
   "sunos x64 LE": "esbuild-sunos-64"
 };
 var knownWebAssemblyFallbackPackages = {
+  "android arm LE": "@esbuild/android-arm",
   "android x64 LE": "esbuild-android-64"
 };
 function pkgAndSubpathForCurrentPlatform() {
@@ -1861,7 +1804,7 @@ by esbuild to install the correct binary executable for your current platform.`)
       "node_modules",
       ".cache",
       "esbuild",
-      `pnpapi-${pkg}-${"0.15.7"}-${path.basename(subpath)}`
+      `pnpapi-${pkg}-${"0.15.8"}-${path.basename(subpath)}`
     );
     if (!fs.existsSync(binTargetPath)) {
       fs.mkdirSync(path.dirname(binTargetPath), { recursive: true });
@@ -1892,7 +1835,7 @@ if (process.env.ESBUILD_WORKER_THREADS !== "0") {
   }
 }
 var _a;
-var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.15.7";
+var isInternalWorkerThread = ((_a = worker_threads == null ? void 0 : worker_threads.workerData) == null ? void 0 : _a.esbuildVersion) === "0.15.8";
 var esbuildCommandAndArgs = () => {
   if ((!ESBUILD_BINARY_PATH || false) && (path2.basename(__filename) !== "main.js" || path2.basename(__dirname) !== "lib")) {
     throw new Error(
@@ -1959,7 +1902,7 @@ var fsAsync = {
     }
   }
 };
-var version = "0.15.7";
+var version = "0.15.8";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = (serveOptions, buildOptions) => ensureServiceIsRunning().serve(serveOptions, buildOptions);
 var transform = (input, options) => ensureServiceIsRunning().transform(input, options);
@@ -2070,7 +2013,7 @@ var ensureServiceIsRunning = () => {
   if (longLivedService)
     return longLivedService;
   let [command, args] = esbuildCommandAndArgs();
-  let child = child_process.spawn(command, args.concat(`--service=${"0.15.7"}`, "--ping"), {
+  let child = child_process.spawn(command, args.concat(`--service=${"0.15.8"}`, "--ping"), {
     windowsHide: true,
     stdio: ["pipe", "pipe", "inherit"],
     cwd: defaultWD
@@ -2184,7 +2127,7 @@ var runServiceSync = (callback) => {
     esbuild: node_exports
   });
   callback(service);
-  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.15.7"}`), {
+  let stdout = child_process.execFileSync(command, args.concat(`--service=${"0.15.8"}`), {
     cwd: defaultWD,
     windowsHide: true,
     input: stdin,
@@ -2200,7 +2143,7 @@ var workerThreadService = null;
 var startWorkerThreadService = (worker_threads2) => {
   let { port1: mainPort, port2: workerPort } = new worker_threads2.MessageChannel();
   let worker = new worker_threads2.Worker(__filename, {
-    workerData: { workerPort, defaultWD, esbuildVersion: "0.15.7" },
+    workerData: { workerPort, defaultWD, esbuildVersion: "0.15.8" },
     transferList: [workerPort],
     execArgv: []
   });