screw-up 1.24.0 → 1.26.0

package/dist/index.cjs

@@ -1,11 +1,11 @@
 /*!
  * name: screw-up
- * version: 1.24.0
+ * version: 1.26.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: f42bca9fbfabb81d8b48ffa76953eafbf8b9d280
+ * git.commit.hash: 482a79d9b3fc68a60c1b8696b7d95a776b91468e
  */
 
 "use strict";
@@ -34,7 +34,7 @@ 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-RkyZOp_d.cjs");
+const packageMetadata = require("./metadata-file-6Y1AngPB.cjs");
 const crypto = require("crypto");
 const __NOOP_HANDLER = () => {
 };
@@ -421,23 +421,37 @@ function __resolveDefaultExport<T>(module: T | { default?: T }, isESM: boolean):
     typeof globalThis !== 'undefined' &&
     (globalThis as any).${cjsInteropGlobalFlagPrefix}${helperId} === true;
   const maybe = module as { default?: T };
+  const hasDefault = !!(maybe && typeof maybe === 'object' && 'default' in maybe);
+  const unwrapNamespaceDefault = (value: unknown): unknown => {
+    if (!value || typeof value !== 'object') {
+      return value;
+    }
+    const inner = value as any;
+    const isModule =
+      inner.__esModule === true ||
+      (typeof Symbol !== 'undefined' &&
+        (inner as any)[Symbol.toStringTag] === 'Module');
+    if (isModule && 'default' in inner) {
+      return inner.default;
+    }
+    return value;
+  };
+  const resolvedDefault = hasDefault
+    ? unwrapNamespaceDefault((maybe as any).default)
+    : undefined;
 
   if (__isInCJS) {
-    return maybe && typeof maybe === 'object' && 'default' in maybe
-      ? (maybe.default ?? (module as T))
-      : (module as T);
+    return hasDefault ? ((resolvedDefault as T) ?? (module as T)) : (module as T);
   }
 
   if (isESM) {
-    if (maybe && typeof maybe === 'object' && 'default' in maybe) {
-      return maybe.default as T;
+    if (hasDefault) {
+      return resolvedDefault 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);
+  return hasDefault ? ((resolvedDefault as T) ?? (module as T)) : (module as T);
 }`;
 const injectCjsInteropFlag = (code) => {
   let changed = false;
@@ -572,14 +586,26 @@ const transformDefaultImports = async (ts, code, id, resolveModuleKind) => {
       continue;
     }
     const isESM = moduleKind === "esm";
+    const isCJS = moduleKind === "cjs";
     const defaultName = importClause.name.text;
     const replacementImports = [];
     let namespaceName;
+    let defaultImportName;
     if (importClause.namedBindings && ts.isNamespaceImport(importClause.namedBindings)) {
       namespaceName = importClause.namedBindings.name.text;
       replacementImports.push(
         `import * as ${namespaceName} from ${formatModuleSpecifier(moduleName)};`
       );
+    } else if (isCJS) {
+      defaultImportName = usedNamespace("__screwUpDefaultImportModule");
+      replacementImports.push(
+        `import ${defaultImportName} from ${formatModuleSpecifier(moduleName)};`
+      );
+      if (importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) {
+        replacementImports.push(
+          buildNamedImport(moduleName, importClause.namedBindings)
+        );
+      }
     } else {
       namespaceName = usedNamespace("__screwUpDefaultImportModule");
       replacementImports.push(
@@ -591,8 +617,9 @@ const transformDefaultImports = async (ts, code, id, resolveModuleKind) => {
         );
       }
     }
+    const interopSource = namespaceName != null ? namespaceName : defaultImportName;
     const replacement = `${replacementImports.join("\n")}
-const ${defaultName} = __resolveDefaultExport(${namespaceName}, ${isESM});`;
+const ${defaultName} = __resolveDefaultExport(${interopSource}, ${isESM});`;
     edits.push({
       start: statement.getStart(sourceFile),
       end: statement.getEnd(),