fix: declaration extensions should correspond to their js extension (u…

…njs#138)
cjpearson · Dec 13, 2024 · 8c69d0c · 8c69d0c
1 parent 9390803
commit 8c69d0c
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 76 deletions.
diff --git a/src/loaders/js.ts b/src/loaders/js.ts
@@ -19,15 +19,20 @@ export const jsLoader: Loader = async (input, { options }) => {
 
   let contents = await input.getContents();
 
+  const isCjs = options.format === "cjs";
+  let extension = isCjs ? ".js" : ".mjs"; // TODO: Default to .cjs in next major version
+  if (options.ext) {
+    extension = options.ext.startsWith(".") ? options.ext : `.${options.ext}`;
+  }
+
   // declaration
   if (options.declaration && !input.srcPath?.match(DECLARATION_RE)) {
-    const cm = input.srcPath?.match(CM_LETTER_RE)?.[0] || "";
-    const extension = `.d.${cm}ts`;
+    const cm = extension.match(CM_LETTER_RE)?.[0] || "";
     output.push({
       contents,
       srcPath: input.srcPath,
       path: input.path,
-      extension,
+      extension: `.d.${cm}ts`,
       declaration: true,
     });
   }
@@ -46,7 +51,6 @@ export const jsLoader: Loader = async (input, { options }) => {
   }
 
   // esm => cjs
-  const isCjs = options.format === "cjs";
   if (isCjs) {
     contents = jiti("")
       .transform({ source: contents, retainLines: false })
@@ -55,11 +59,6 @@ export const jsLoader: Loader = async (input, { options }) => {
       .replace("module.exports = void 0;", "");
   }
 
-  let extension = isCjs ? ".js" : ".mjs"; // TODO: Default to .cjs in next major version
-  if (options.ext) {
-    extension = options.ext.startsWith(".") ? options.ext : `.${options.ext}`;
-  }
-
   output.push({
     contents,
     path: input.path,