@lifo-sh/node-runner 0.1.19 → 0.1.21

package/dist/index.js

@@ -217,11 +217,20 @@ function resolveExportsCondition(value) {
   if (typeof value === "string") return value;
   if (value && typeof value === "object" && !Array.isArray(value)) {
     const cond = value;
-    if (typeof cond.require === "string") return cond.require;
-    if (typeof cond.default === "string") return cond.default;
-    if (typeof cond.import === "string") return cond.import;
+    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;
+    }
     for (const key of Object.keys(cond)) {
-      if (key === "types") continue;
+      if (key === "types" || key === "require" || key === "default" || key === "import") continue;
       const nested = resolveExportsCondition(cond[key]);
       if (nested) return nested;
     }
@@ -779,7 +788,7 @@ function transformEsmToCjs(source) {
       }).filter((s) => s).join(", ");
       return `
 ${indent}${cjsDecl(tmp)} ${tmp} = require(${mod});
-${indent}${cjsDecl(defaultName)} ${defaultName} = ${tmp}.default || ${tmp};
+${indent}${cjsDecl(defaultName)} ${defaultName} = ${tmp} && ${tmp}.__esModule && 'default' in ${tmp} ? ${tmp}.default : ${tmp};
 ${indent}const { ${mapped} } = ${tmp};`;
     }
   );
@@ -788,7 +797,7 @@ ${indent}const { ${mapped} } = ${tmp};`;
     (_match, indent, defaultName, nsName, mod) => {
       return `
 ${indent}${cjsDecl(nsName)} ${nsName} = require(${mod});
-${indent}${cjsDecl(defaultName)} ${defaultName} = ${nsName}.default || ${nsName};`;
+${indent}${cjsDecl(defaultName)} ${defaultName} = ${nsName} && ${nsName}.__esModule && 'default' in ${nsName} ? ${nsName}.default : ${nsName};`;
     }
   );
   result = result.replace(
@@ -816,8 +825,12 @@ ${indent}${cjsDecl(name)} ${name} = require(${mod});`
   );
   result = result.replace(
     /(?:^|\n)([ \t]*)import\s+([\w$]+)\s+from\s*(['"][^'"]+['"])[ \t]*;?/g,
-    (_match, indent, name, mod) => `
-${indent}${cjsDecl(name)} ${name} = require(${mod});`
+    (_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};`;
+    }
   );
   result = result.replace(
     /(?:^|\n)([ \t]*)import\s*(['"][^'"]+['"])[ \t]*;?/g,
@@ -963,19 +976,16 @@ ${indent}${decl}`;
     result += "\n" + trailingExports.join("\n");
   }
   result = unmaskStringLiterals(result, literals);
-  return result;
+  return 'Object.defineProperty(exports, "__esModule", { value: true });\n' + result;
 }
 function transformToCjs(source, filename, vfs) {
   if (shouldTreatAsEsm(source, filename, vfs)) {
-    const code2 = stripViteHmr(safetyNetImportMeta(transformEsmToCjs(source)));
+    const code2 = safetyNetImportMeta(transformEsmToCjs(source));
     return { code: code2, wasEsm: true };
   }
-  const code = stripViteHmr(safetyNetImportMeta(replaceImportMetaInCode(source)));
+  const code = safetyNetImportMeta(replaceImportMetaInCode(source));
   return { code, wasEsm: false };
 }
-function stripViteHmr(code) {
-  return code.replace(/^[ \t]*__importMeta\.hot\b.*$/gm, "").replace(/^[ \t]*import\.meta\.hot\b.*$/gm, "");
-}
 function safetyNetImportMeta(code) {
   if (!code.includes("import.meta")) return code;
   return code.replace(/\bimport\.meta\.url\b/g, "__importMetaUrl").replace(/\bimport\.meta\.dirname\b/g, "__dirname").replace(/\bimport\.meta\.filename\b/g, "__filename").replace(/\bimport\.meta\.require\b/g, "require").replace(/\bimport\.meta\.resolve\b/g, "__importMetaResolve").replace(/\bimport\.meta\b/g, "__importMeta");
@@ -983,6 +993,20 @@ function safetyNetImportMeta(code) {
 
 // src/runner.ts
 var textEncoder = new TextEncoder();
+function createHotStub() {
+  const noop = () => {
+  };
+  return {
+    accept: noop,
+    prune: noop,
+    dispose: noop,
+    decline: noop,
+    invalidate: noop,
+    on: noop,
+    send: noop,
+    data: {}
+  };
+}
 var JS_EXTENSIONS = /* @__PURE__ */ new Set([
   ".js",
   ".ts",
@@ -1207,9 +1231,8 @@ var NodeRunner = class {
         }
         const ext = resolved.path.slice(resolved.path.lastIndexOf("."));
         if (ext && !JS_EXTENSIONS.has(ext)) {
-          const clean = resolved.source.replace(/^[ \t]*import\.meta\.hot\b.*$/gm, "").replace(/^[ \t]*__importMeta\.hot\b.*$/gm, "");
-          self.moduleCache.set(resolved.path, clean);
-          return clean;
+          self.moduleCache.set(resolved.path, resolved.source);
+          return resolved.source;
         }
         const moduleExports2 = {};
         const moduleObj2 = { exports: moduleExports2 };
@@ -1221,7 +1244,7 @@ var NodeRunner = class {
         cleanSource = cjsSource;
         const factory = compileModule(cleanSource, resolved.path, self.stderr);
         const importMetaUrl = "file://" + resolved.path;
-        const importMeta = { url: importMetaUrl, dirname: moduleDir, filename: resolved.path };
+        const importMeta = { url: importMetaUrl, dirname: moduleDir, filename: resolved.path, hot: createHotStub() };
         const importMetaResolve = (specifier) => {
           throw new Error(`import.meta.resolve('${specifier}') is not supported`);
         };
@@ -1324,7 +1347,7 @@ ${cleanMainSource}
     const moduleObj = { exports: moduleExports };
     const global = { process: processObj, Buffer: BufferClass, console: scriptConsole };
     const mainImportMetaUrl = "file://" + absPath;
-    const mainImportMeta = { url: mainImportMetaUrl, dirname: scriptDir, filename: absPath };
+    const mainImportMeta = { url: mainImportMetaUrl, dirname: scriptDir, filename: absPath, hot: createHotStub() };
     const mainImportMetaResolve = (specifier) => {
       throw new Error(`import.meta.resolve('${specifier}') is not supported`);
     };