wip

src/cjs/index.ts

@@ -11,7 +11,6 @@ import type { TransformOptions } from 'esbuild';
 import { installSourceMapSupport } from '../source-map';
 import { transformSync, transformDynamicImport } from '../utils/transform';
 import { resolveTsPath } from '../utils/resolve-ts-path';
-import { time } from '../utils/debug';
 import { isESM } from '../utils/esm-pattern';
 
 const isRelativePathPattern = /^\.{1,2}\//;

src/esm/loaders.ts

@@ -18,7 +18,6 @@ import {
 	type MaybePromise,
 	type NodeError,
 } from './utils.js';
-import { time } from '../utils/debug';
 
 const isDirectoryPattern = /\/(?:$|\?)/;
 

src/utils/debug.ts

@@ -1,21 +1,30 @@
-export const time = (name: string, fn: Function) => {
-	return function (this: unknown, ...args: unknown[]) {
+export const time = <Argument>(
+	name: string,
+	_function: (...args: Argument[]) => unknown,
+) => function (
+		this: unknown,
+		...args: Argument[]
+	) {
 		const timeStart = Date.now();
 		const logTimeElapsed = () => {
 			const elapsed = Date.now() - timeStart;
 
 			if (elapsed > 10) {
-				// console.log({
-				// 	name,
-				// 	args,
-				// 	elapsed,
-				// });
+			// console.log({
+			// 	name,
+			// 	args,
+			// 	elapsed,
+			// });
 			}
 		};
 
-		const result = Reflect.apply(fn, this, args);
-		if (result && 'then' in result) {
-			result.then(
+		const result = Reflect.apply(_function, this, args);
+		if (
+			result
+		&& typeof result === 'object'
+		&& 'then' in result
+		) {
+			(result as Promise<unknown>).then(
 				logTimeElapsed,
 				// Ignore error in this chain
 				() => {},
@@ -25,4 +34,3 @@ export const time = (name: string, fn: Function) => {
 		}
 		return result;
 	};
-};

src/utils/esm-pattern.ts

@@ -22,4 +22,4 @@ export const isESM = (code: string) => {
 		return imports.length > 0 || exports.length > 0;
 	}
 	return false;
-};
+};

src/utils/transform/transform-dynamic-import.ts

@@ -3,19 +3,21 @@ import type { RawSourceMap } from '../../source-map';
 import { parseEsm } from '../es-module-lexer';
 
 const handlerName = '___tsxInteropDynamicImport';
-const handleEsModuleFunction = 'function ' + handlerName + (function (imported: Record<string, unknown>) {
+const handleEsModuleFunction = `function ${handlerName}${(function (imported: Record<string, unknown>) {
+	const d = 'default';
 	const exports = Object.keys(imported);
 	if (
 		exports.length === 1
-		&& exports[0] === 'default'
-		&& imported.default
-		&& imported.default.__esModule
-	){
-		return imported.default;
+		&& exports[0] === d
+		&& imported[d]
+		&& typeof imported[d] === 'object'
+		&& '__esModule' in imported[d]
+	) {
+		return imported[d];
 	}
 
 	return imported;
-}).toString().slice('function'.length);
+}).toString().slice('function'.length)}`;
 
 const handleDynamicImport = `.then(${handlerName})`;