@lifo-sh/node-runner 0.1.22 → 0.1.24

package/dist/index.js

@@ -217,20 +217,11 @@ function resolveExportsCondition(value) {
   if (typeof value === "string") return value;
   if (value && typeof value === "object" && !Array.isArray(value)) {
     const cond = value;
-    if (cond.require != null) {
-      const r = resolveExportsCondition(cond.require);
-      if (r) return r;
-    }
-    if (cond.default != null) {
-      const r = resolveExportsCondition(cond.default);
-      if (r) return r;
-    }
-    if (cond.import != null) {
-      const r = resolveExportsCondition(cond.import);
-      if (r) return r;
-    }
+    if (typeof cond.require === "string") return cond.require;
+    if (typeof cond.default === "string") return cond.default;
+    if (typeof cond.import === "string") return cond.import;
     for (const key of Object.keys(cond)) {
-      if (key === "types" || key === "require" || key === "default" || key === "import") continue;
+      if (key === "types") continue;
       const nested = resolveExportsCondition(cond[key]);
       if (nested) return nested;
     }
@@ -788,7 +779,7 @@ function transformEsmToCjs(source) {
       }).filter((s) => s).join(", ");
       return `
 ${indent}${cjsDecl(tmp)} ${tmp} = require(${mod});
-${indent}${cjsDecl(defaultName)} ${defaultName} = ${tmp} && ${tmp}.__esModule && 'default' in ${tmp} ? ${tmp}.default : ${tmp};
+${indent}${cjsDecl(defaultName)} ${defaultName} = ${tmp}.default || ${tmp};
 ${indent}const { ${mapped} } = ${tmp};`;
     }
   );
@@ -797,7 +788,7 @@ ${indent}const { ${mapped} } = ${tmp};`;
     (_match, indent, defaultName, nsName, mod) => {
       return `
 ${indent}${cjsDecl(nsName)} ${nsName} = require(${mod});
-${indent}${cjsDecl(defaultName)} ${defaultName} = ${nsName} && ${nsName}.__esModule && 'default' in ${nsName} ? ${nsName}.default : ${nsName};`;
+${indent}${cjsDecl(defaultName)} ${defaultName} = ${nsName}.default || ${nsName};`;
     }
   );
   result = result.replace(
@@ -825,12 +816,8 @@ ${indent}${cjsDecl(name)} ${name} = require(${mod});`
   );
   result = result.replace(
     /(?:^|\n)([ \t]*)import\s+([\w$]+)\s+from\s*(['"][^'"]+['"])[ \t]*;?/g,
-    (_match, indent, name, mod) => {
-      const tmp = "__imp_" + Math.random().toString(36).slice(2, 8);
-      return `
-${indent}const ${tmp} = require(${mod});
-${indent}${cjsDecl(name)} ${name} = ${tmp} && ${tmp}.__esModule && 'default' in ${tmp} ? ${tmp}.default : ${tmp};`;
-    }
+    (_match, indent, name, mod) => `
+${indent}${cjsDecl(name)} ${name} = require(${mod});`
   );
   result = result.replace(
     /(?:^|\n)([ \t]*)import\s*(['"][^'"]+['"])[ \t]*;?/g,
@@ -976,7 +963,7 @@ ${indent}${decl}`;
     result += "\n" + trailingExports.join("\n");
   }
   result = unmaskStringLiterals(result, literals);
-  return 'Object.defineProperty(exports, "__esModule", { value: true });\n' + result;
+  return result;
 }
 function transformToCjs(source, filename, vfs) {
   if (shouldTreatAsEsm(source, filename, vfs)) {
@@ -1369,6 +1356,7 @@ ${cleanMainSource}
         ga[k] = this.globalShims[k];
       }
     }
+    let processExited = false;
     let pendingRejection = null;
     const rejectionHandler = (event) => {
       pendingRejection = event.reason;
@@ -1408,6 +1396,7 @@ ${cleanMainSource}
       if (pendingRejection) {
         if (pendingRejection instanceof ProcessExitError) {
           exitCode = pendingRejection.code;
+          processExited = true;
         } else {
           exitCode = 1;
         }
@@ -1415,6 +1404,7 @@ ${cleanMainSource}
     } catch (e) {
       if (e instanceof ProcessExitError) {
         exitCode = e.code;
+        processExited = true;
       } else {
         exitCode = 1;
         const msg = e instanceof Error ? e.stack || e.message : String(e);
@@ -1437,7 +1427,8 @@ ${cleanMainSource}
         globalThis.removeEventListener("unhandledrejection", rejectionHandler);
       }
     }
-    if (activeTimers.size > 0) {
+    if (activeTimers.size > 0 && !processExited) {
+      const DRAIN_TIMEOUT = 5e3;
       const drainPromise = new Promise((resolve) => {
         timerDrainResolve = resolve;
       });
@@ -1447,15 +1438,16 @@ ${cleanMainSource}
           return;
         }
         this.signal.addEventListener("abort", () => resolve(), { once: true });
-      }) : new Promise(() => {
+      }) : new Promise((resolve) => {
+        setTimeout(resolve, DRAIN_TIMEOUT);
       });
       await Promise.race([drainPromise, abortPromise]);
-      for (const id of activeTimers) {
-        globalThis.clearTimeout(id);
-        globalThis.clearInterval(id);
-      }
-      activeTimers.clear();
     }
+    for (const id of activeTimers) {
+      globalThis.clearTimeout(id);
+      globalThis.clearInterval(id);
+    }
+    activeTimers.clear();
     return {
       exitCode,
       stdout: isStreaming ? "" : stdoutLines.join("\n"),