prefer file over folder

stainless-em · stainless-em · commit 2d8b709bf8a2 · 2024-12-04T16:55:53.000-05:00
diff --git a/integration/__file_snapshots__/folder-and-file/.files b/integration/__file_snapshots__/folder-and-file/.files
@@ -0,0 +1,10 @@
+dist/constants.cjs
+dist/constants.mjs
+dist/index.cjs
+dist/index.mjs
+dist/name.cjs
+dist/name.mjs
+dist/print.cjs
+dist/print.mjs
+dist/print/out.cjs
+dist/print/out.mjs
diff --git a/integration/__file_snapshots__/folder-and-file/dist/constants.cjs b/integration/__file_snapshots__/folder-and-file/dist/constants.cjs
@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NAME = void 0;
+exports.NAME = "TypeScript";
diff --git a/integration/__file_snapshots__/folder-and-file/dist/constants.mjs b/integration/__file_snapshots__/folder-and-file/dist/constants.mjs
@@ -0,0 +1 @@
+export var NAME = "TypeScript";
diff --git a/integration/__file_snapshots__/folder-and-file/dist/index.cjs b/integration/__file_snapshots__/folder-and-file/dist/index.cjs
@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var name_1 = require("./name.cjs");
+var print_1 = require("./print.cjs");
+(0, print_1.default)(name_1.default);
diff --git a/integration/__file_snapshots__/folder-and-file/dist/index.mjs b/integration/__file_snapshots__/folder-and-file/dist/index.mjs
@@ -0,0 +1,3 @@
+import name from "./name.mjs";
+import print from "./print.mjs";
+print(name);
diff --git a/integration/__file_snapshots__/folder-and-file/dist/name.cjs b/integration/__file_snapshots__/folder-and-file/dist/name.cjs
@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = void 0;
+var constants_1 = require("./constants.cjs");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return constants_1.NAME; } });
diff --git a/integration/__file_snapshots__/folder-and-file/dist/name.mjs b/integration/__file_snapshots__/folder-and-file/dist/name.mjs
@@ -0,0 +1 @@
+export { NAME as default } from "./constants.mjs";
diff --git a/integration/__file_snapshots__/folder-and-file/dist/print.cjs b/integration/__file_snapshots__/folder-and-file/dist/print.cjs
@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = print;
+var out_1 = require("./print/out.cjs");
+function print(name) {
+    (0, out_1.default)("Hello ".concat(name));
+}
diff --git a/integration/__file_snapshots__/folder-and-file/dist/print.mjs b/integration/__file_snapshots__/folder-and-file/dist/print.mjs
@@ -0,0 +1,4 @@
+import out from "./print/out.mjs";
+export default function print(name) {
+    out("Hello ".concat(name));
+}
diff --git a/integration/__file_snapshots__/folder-and-file/dist/print/out.cjs b/integration/__file_snapshots__/folder-and-file/dist/print/out.cjs
@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = console.log.bind(console);
diff --git a/integration/__file_snapshots__/folder-and-file/dist/print/out.mjs b/integration/__file_snapshots__/folder-and-file/dist/print/out.mjs
@@ -0,0 +1 @@
+export default console.log.bind(console);
diff --git a/integration/__fixtures__/folder-and-file/src/constants.ts b/integration/__fixtures__/folder-and-file/src/constants.ts
@@ -0,0 +1 @@
+export const NAME = "TypeScript";
diff --git a/integration/__fixtures__/folder-and-file/src/index.ts b/integration/__fixtures__/folder-and-file/src/index.ts
@@ -0,0 +1,5 @@
+import name from "./name";
+import print from "./print";
+
+print(name);
+export type { print };
diff --git a/integration/__fixtures__/folder-and-file/src/name.ts b/integration/__fixtures__/folder-and-file/src/name.ts
@@ -0,0 +1 @@
+export { NAME as default } from "./constants";
diff --git a/integration/__fixtures__/folder-and-file/src/print.ts b/integration/__fixtures__/folder-and-file/src/print.ts
@@ -0,0 +1,4 @@
+import out from "./print/out";
+export default function print(name: string): void {
+  out(`Hello ${name}`);
+}
diff --git a/integration/__fixtures__/folder-and-file/src/print/out.ts b/integration/__fixtures__/folder-and-file/src/print/out.ts
@@ -0,0 +1 @@
+export default console.log.bind(console);
diff --git a/integration/__fixtures__/folder-and-file/tsconfig.json b/integration/__fixtures__/folder-and-file/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "outDir": "dist",
+    "moduleResolution": "node"
+  }
+}
diff --git a/integration/build.test.ts b/integration/build.test.ts
@@ -508,6 +508,36 @@ describe("nested folders", () => {
   });
 });
 
+describe("folder and file", () => {
+  beforeEach(async () => {
+    await copyInputFixture("folder-and-file");
+  });
+
+  test("multiple targets", async () => {
+    await writeConfig({
+      targets: [
+        { extname: ".cjs", module: "commonjs" },
+        { extname: ".mjs", module: "esnext" },
+      ],
+    });
+
+    const { exitCode } = await runCLI(["."]);
+    expect(exitCode).toEqual(0);
+
+    await matchOutputFiles("folder-and-file");
+
+    const expectedOutput = "Hello TypeScript";
+
+    // Check if the output files are executable
+    let result = await runCJSModule("dist/index.cjs");
+    expect(result.stdout).toEqual(expectedOutput);
+
+    // Check if the output files are executable
+    result = await runESMModule("dist/index.mjs");
+    expect(result.stdout).toEqual(expectedOutput);
+  });
+});
+
 describe("custom compiler", () => {
   beforeEach(async () => {
     await copyInputFixture("custom-compiler");
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tsc-multi",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Compile multiple TypeScript projects into multiple targets.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/src/transformers/rewriteImport.ts b/src/transformers/rewriteImport.ts
@@ -39,19 +39,20 @@ export function createRewriteImportTransformer<
     return sys.directoryExists(fullPath);
   }
 
+  function fileExists(sourceFile: ts.SourceFile, path: string): boolean {
+    const sourcePath = sourceFile.fileName;
+    const fullPath = resolve(dirname(sourcePath), path);
+
+    return sys.fileExists(fullPath);
+  }
+
   function updateModuleSpecifier(
     ctx: ts.TransformationContext,
     sourceFile: ts.SourceFile,
     node: ts.Expression
   ): ts.Expression {
     if (!isStringLiteral(node) || !isRelativePath(node.text)) return node;
 
-    if (isDirectory(sourceFile, node.text)) {
-      return factory.createStringLiteral(
-        `${node.text}/index${options.extname}`
-      );
-    }
-
     const ext = extname(node.text);
 
     if (ext === JSON_EXT && ctx.getCompilerOptions().resolveJsonModule) {
@@ -60,6 +61,18 @@ export function createRewriteImportTransformer<
 
     const base = ext === JS_EXT ? trimSuffix(node.text, JS_EXT) : node.text;
 
+    if (
+      !(
+        fileExists(sourceFile, `${base}.ts`) ||
+        fileExists(sourceFile, `${base}.js`)
+      ) &&
+      isDirectory(sourceFile, node.text)
+    ) {
+      return factory.createStringLiteral(
+        `${node.text}/index${options.extname}`
+      );
+    }
+
     return factory.createStringLiteral(`${base}${options.extname}`);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import name from "./name.mjs";`
	`2`	`+import print from "./print.mjs";`
	`3`	`+print(name);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { NAME as default } from "./constants.mjs";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"use strict";`
	`2`	`+Object.defineProperty(exports, "__esModule", { value: true });`
	`3`	`+exports.default = console.log.bind(console);`