screw-up 1.22.0 → 1.23.0

package/dist/index.cjs

@@ -1,11 +1,11 @@
 /*!
  * name: screw-up
- * version: 1.22.0
+ * version: 1.23.0
  * description: Simply package metadata inserter on Vite plugin
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/screw-up.git
- * git.commit.hash: fe583d081fa3f9c395edece7548ec4535bc5e646
+ * git.commit.hash: 40f2edb1e98e9724413f5a23b820fc41e8f0b4d6
  */
 
 "use strict";
@@ -34,7 +34,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 const fs$1 = require("fs/promises");
 const fs = require("fs");
 const path = require("path");
-const packageMetadata = require("./metadata-file-vLRNRjsl.cjs");
+const packageMetadata = require("./metadata-file-o2vGfdZO.cjs");
+const crypto = require("crypto");
 const __NOOP_HANDLER = () => {
 };
 const __NOOP_RELEASABLE = {
@@ -403,9 +404,46 @@ const scanHasDefaultImport = (ts, code) => {
   }
   return false;
 };
-const helperFunctionSource = `function __resolveDefaultExport<T>(module: T | { default?: T }): T {
-  return (module as { default?: T }).default ?? (module as T);
+const cjsInteropFlagPrefix = "__isInCJS_";
+const cjsInteropIdLength = 12;
+const cjsInteropFlagAssignmentPattern = new RegExp(
+  `\\bvar\\s+${cjsInteropFlagPrefix}[0-9a-f]+(?:\\$\\d+)?\\s*=\\s*false\\b`,
+  "g"
+);
+const createCjsInteropHelperId = (seed) => {
+  const hash = crypto.createHash("sha256").update(seed).digest("hex");
+  return hash.slice(0, cjsInteropIdLength);
+};
+const buildHelperFunctionSource = (helperId) => `
+function __resolveDefaultExport<T>(module: T | { default?: T }, isESM: boolean): T {
+  var ${cjsInteropFlagPrefix}${helperId}: boolean = false;
+  const maybe = module as { default?: T };
+
+  if (${cjsInteropFlagPrefix}${helperId}) {
+    return maybe && typeof maybe === 'object' && 'default' in maybe
+      ? (maybe.default ?? (module as T))
+      : (module as T);
+  }
+
+  if (isESM) {
+    if (maybe && typeof maybe === 'object' && 'default' in maybe) {
+      return maybe.default as T;
+    }
+    throw new Error('Default export not found.');
+  }
+
+  return maybe && typeof maybe === 'object' && 'default' in maybe
+    ? (maybe.default ?? (module as T))
+    : (module as T);
 }`;
+const replaceCjsInteropFlag = (code) => {
+  let changed = false;
+  const nextCode = code.replace(cjsInteropFlagAssignmentPattern, (match) => {
+    changed = true;
+    return match.replace(/\bfalse\b/, "true ");
+  });
+  return { code: nextCode, changed };
+};
 const hasResolveDefaultExport = (ts, sourceFile) => {
   return sourceFile.statements.some((statement) => {
     var _a, _b;
@@ -524,9 +562,10 @@ const transformDefaultImports = async (ts, code, id, resolveModuleKind) => {
     }
     const moduleName = statement.moduleSpecifier.text;
     const moduleKind = await resolveModuleKind(moduleName, normalizedId);
-    if (moduleKind !== "cjs") {
+    if (moduleKind === "unknown" || moduleKind === "unresolvable") {
       continue;
     }
+    const isESM = moduleKind === "esm";
     const defaultName = importClause.name.text;
     const replacementImports = [];
     let namespaceName;
@@ -547,7 +586,7 @@ const transformDefaultImports = async (ts, code, id, resolveModuleKind) => {
       }
     }
     const replacement = `${replacementImports.join("\n")}
-const ${defaultName} = __resolveDefaultExport(${namespaceName});`;
+const ${defaultName} = __resolveDefaultExport(${namespaceName}, ${isESM});`;
     edits.push({
       start: statement.getStart(sourceFile),
       end: statement.getEnd(),
@@ -565,10 +604,11 @@ const ${defaultName} = __resolveDefaultExport(${namespaceName});`;
     const lastImport = importStatements[importStatements.length - 1];
     if (lastImport) {
       const newline = code.includes("\r\n") ? "\r\n" : "\n";
+      const helperId = createCjsInteropHelperId(normalizedId);
       edits.push({
         start: lastImport.getEnd(),
         end: lastImport.getEnd(),
-        text: `${newline}${helperFunctionSource}${newline}`
+        text: `${newline}${buildHelperFunctionSource(helperId)}${newline}`
       });
     }
   }
@@ -953,6 +993,16 @@ const screwUp = (options = {}) => {
         l.release();
       }
     },
+    renderChunk: (code, chunk, outputOptions) => {
+      if (!fixDefaultImport || outputOptions.format !== "cjs") {
+        return null;
+      }
+      const result = replaceCjsInteropFlag(code);
+      if (!result.changed) {
+        return null;
+      }
+      return { code: result.code, map: null };
+    },
     // Generate bundle phase
     generateBundle: {
       order: "post",