screw-up 1.23.0 → 1.25.0

package/dist/index.cjs

@@ -1,11 +1,11 @@
 /*!
  * name: screw-up
- * version: 1.23.0
+ * version: 1.25.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: 40f2edb1e98e9724413f5a23b820fc41e8f0b4d6
+ * git.commit.hash: 8275b6db6558235b0fe73f99368acf3f9a6e1b29
  */
 
 "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-o2vGfdZO.cjs");
+const packageMetadata = require("./metadata-file-3UqfivKm.cjs");
 const crypto = require("crypto");
 const __NOOP_HANDLER = () => {
 };
@@ -404,10 +404,10 @@ const scanHasDefaultImport = (ts, code) => {
   }
   return false;
 };
-const cjsInteropFlagPrefix = "__isInCJS_";
+const cjsInteropGlobalFlagPrefix = "__screwUpIsInCJS_";
 const cjsInteropIdLength = 12;
-const cjsInteropFlagAssignmentPattern = new RegExp(
-  `\\bvar\\s+${cjsInteropFlagPrefix}[0-9a-f]+(?:\\$\\d+)?\\s*=\\s*false\\b`,
+const cjsInteropGlobalFlagAssignmentPattern = new RegExp(
+  `\\bglobalThis\\.${cjsInteropGlobalFlagPrefix}[0-9a-f]+\\s*=\\s*false\\b`,
   "g"
 );
 const createCjsInteropHelperId = (seed) => {
@@ -415,33 +415,53 @@ const createCjsInteropHelperId = (seed) => {
   return hash.slice(0, cjsInteropIdLength);
 };
 const buildHelperFunctionSource = (helperId) => `
+globalThis.${cjsInteropGlobalFlagPrefix}${helperId} = false;
 function __resolveDefaultExport<T>(module: T | { default?: T }, isESM: boolean): T {
-  var ${cjsInteropFlagPrefix}${helperId}: boolean = false;
+  const __isInCJS =
+    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 (${cjsInteropFlagPrefix}${helperId}) {
-    return maybe && typeof maybe === 'object' && 'default' in maybe
-      ? (maybe.default ?? (module as T))
-      : (module as T);
+  if (__isInCJS) {
+    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 replaceCjsInteropFlag = (code) => {
+const injectCjsInteropFlag = (code) => {
   let changed = false;
-  const nextCode = code.replace(cjsInteropFlagAssignmentPattern, (match) => {
-    changed = true;
-    return match.replace(/\bfalse\b/, "true ");
-  });
+  const nextCode = code.replace(
+    cjsInteropGlobalFlagAssignmentPattern,
+    (match) => {
+      changed = true;
+      return match.replace(/\bfalse\b/, "true ");
+    }
+  );
   return { code: nextCode, changed };
 };
 const hasResolveDefaultExport = (ts, sourceFile) => {
@@ -997,7 +1017,7 @@ const screwUp = (options = {}) => {
       if (!fixDefaultImport || outputOptions.format !== "cjs") {
         return null;
       }
-      const result = replaceCjsInteropFlag(code);
+      const result = injectCjsInteropFlag(code);
       if (!result.changed) {
         return null;
       }