refactor: esm directory (#8)

privatenumber · May 1, 2024 · d82d7f0 · d82d7f0
1 parent 4b1f03c
commit d82d7f0
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 104 deletions.
diff --git a/src/esm/api/index.ts b/src/esm/api/index.ts
@@ -0,0 +1 @@
+export { register } from './register.js';
diff --git a/src/esm/register.ts → src/esm/api/register.ts b/src/esm/register.ts → src/esm/api/register.ts
@@ -1,7 +1,7 @@
 import module from 'node:module';
-import { installSourceMapSupport } from '../source-map.js';
+import { installSourceMapSupport } from '../../source-map.js';
 
-export const registerLoader = () => {
+export const register = () => {
 	installSourceMapSupport();
 
 	module.register(

diff --git a/src/esm/hook/index.ts b/src/esm/hook/index.ts
@@ -0,0 +1,19 @@
+import type { GlobalPreloadHook, InitializeHook } from 'module';
+
+export const initialize: InitializeHook = async (data) => {
+	if (!data) {
+		throw new Error('tsx must be loaded with --import instead of --loader\nThe --loader flag was deprecated in Node v20.6.0 and v18.19.0');
+	}
+};
+
+/**
+ * Technically globalPreload is deprecated so it should be in loaders-deprecated
+ * but it shares a closure with the new load hook
+ */
+export const globalPreload: GlobalPreloadHook = () => `
+const require = getBuiltin('module').createRequire("${import.meta.url}");
+require('../source-map.cjs').installSourceMapSupport();
+`;
+
+export { load } from './load.js';
+export { resolve } from './resolve.js';
diff --git a/src/esm/hook/load.ts b/src/esm/hook/load.ts
@@ -0,0 +1,84 @@
+import { fileURLToPath } from 'url';
+import type { LoadHook } from 'module';
+import type { TransformOptions } from 'esbuild';
+import { transform } from '../../utils/transform/index.js';
+import { transformDynamicImport } from '../../utils/transform/transform-dynamic-import.js';
+import { installSourceMapSupport } from '../../source-map.js';
+import { isFeatureSupported, importAttributes } from '../../utils/node-features.js';
+import { parent } from '../../utils/ipc/client.js';
+import {
+	fileMatcher,
+	tsExtensionsPattern,
+	isJsonPattern,
+} from './utils.js';
+
+const applySourceMap = installSourceMapSupport();
+
+const contextAttributesProperty = (
+	isFeatureSupported(importAttributes)
+		? 'importAttributes'
+		: 'importAssertions'
+);
+
+export const load: LoadHook = async (
+	url,
+	context,
+	defaultLoad,
+) => {
+	/*
+	Filter out node:*
+	Maybe only handle files that start with file://
+	*/
+	if (parent.send) {
+		parent.send({
+			type: 'dependency',
+			path: url,
+		});
+	}
+
+	if (isJsonPattern.test(url)) {
+		if (!context[contextAttributesProperty]) {
+			context[contextAttributesProperty] = {};
+		}
+
+		context[contextAttributesProperty]!.type = 'json';
+	}
+
+	const loaded = await defaultLoad(url, context);
+
+	// CommonJS and Internal modules (e.g. node:*)
+	if (!loaded.source) {
+		return loaded;
+	}
+
+	const filePath = url.startsWith('file://') ? fileURLToPath(url) : url;
+	const code = loaded.source.toString();
+
+	if (
+		// Support named imports in JSON modules
+		loaded.format === 'json'
+		|| tsExtensionsPattern.test(url)
+	) {
+		const transformed = await transform(
+			code,
+			filePath,
+			{
+				tsconfigRaw: fileMatcher?.(filePath) as TransformOptions['tsconfigRaw'],
+			},
+		);
+
+		return {
+			format: 'module',
+			source: applySourceMap(transformed),
+		};
+	}
+
+	if (loaded.format === 'module') {
+		const dynamicImportTransformed = transformDynamicImport(filePath, code);
+		if (dynamicImportTransformed) {
+			loaded.source = applySourceMap(dynamicImportTransformed);
+		}
+	}
+
+	return loaded;
+};
diff --git a/src/esm/package-json.ts → src/esm/hook/package-json.ts b/src/esm/package-json.ts → src/esm/hook/package-json.ts
diff --git a/src/esm/loaders.ts → src/esm/hook/resolve.ts b/src/esm/loaders.ts → src/esm/hook/resolve.ts
@@ -1,30 +1,20 @@
 import path from 'path';
-import { pathToFileURL, fileURLToPath } from 'url';
+import { pathToFileURL } from 'url';
 import type {
-	ResolveFnOutput, ResolveHookContext, LoadHook, GlobalPreloadHook, InitializeHook,
+	ResolveFnOutput, ResolveHookContext,
 } from 'module';
-import type { TransformOptions } from 'esbuild';
-import { transform } from '../utils/transform/index.js';
-import { transformDynamicImport } from '../utils/transform/transform-dynamic-import.js';
-import { resolveTsPath } from '../utils/resolve-ts-path.js';
-import { installSourceMapSupport } from '../source-map.js';
-import { isFeatureSupported, importAttributes } from '../utils/node-features.js';
-import { parent } from '../utils/ipc/client.js';
-import type { NodeError } from '../types.js';
-import { isRelativePathPattern } from '../utils/is-relative-path-pattern.js';
+import { resolveTsPath } from '../../utils/resolve-ts-path.js';
+import type { NodeError } from '../../types.js';
+import { isRelativePathPattern } from '../../utils/is-relative-path-pattern.js';
 import {
 	tsconfigPathsMatcher,
-	fileMatcher,
 	tsExtensionsPattern,
-	isJsonPattern,
 	getFormatFromFileUrl,
 	fileProtocol,
 	allowJs,
 	type MaybePromise,
 } from './utils.js';
 
-const applySourceMap = installSourceMapSupport();
-
 const isDirectoryPattern = /\/(?:$|\?)/;
 
 type NextResolve = (
@@ -39,21 +29,6 @@ type resolve = (
 	recursiveCall?: boolean,
 ) => MaybePromise<ResolveFnOutput>;
 
-export const initialize: InitializeHook = async (data) => {
-	if (!data) {
-		throw new Error('tsx must be loaded with --import instead of --loader\nThe --loader flag was deprecated in Node v20.6.0 and v18.19.0');
-	}
-};
-
-/**
- * Technically globalPreload is deprecated so it should be in loaders-deprecated
- * but it shares a closure with the new load hook
- */
-export const globalPreload: GlobalPreloadHook = () => `
-const require = getBuiltin('module').createRequire("${import.meta.url}");
-require('../source-map.cjs').installSourceMapSupport();
-`;
-
 const resolveExplicitPath = async (
 	defaultResolve: NextResolve,
 	specifier: string,
@@ -218,72 +193,3 @@ export const resolve: resolve = async (
 		throw error;
 	}
 };
-
-const contextAttributesProperty = (
-	isFeatureSupported(importAttributes)
-		? 'importAttributes'
-		: 'importAssertions'
-);
-
-export const load: LoadHook = async (
-	url,
-	context,
-	defaultLoad,
-) => {
-	/*
-	Filter out node:*
-	Maybe only handle files that start with file://
-	*/
-	if (parent.send) {
-		parent.send({
-			type: 'dependency',
-			path: url,
-		});
-	}
-
-	if (isJsonPattern.test(url)) {
-		if (!context[contextAttributesProperty]) {
-			context[contextAttributesProperty] = {};
-		}
-
-		context[contextAttributesProperty]!.type = 'json';
-	}
-
-	const loaded = await defaultLoad(url, context);
-
-	// CommonJS and Internal modules (e.g. node:*)
-	if (!loaded.source) {
-		return loaded;
-	}
-
-	const filePath = url.startsWith('file://') ? fileURLToPath(url) : url;
-	const code = loaded.source.toString();
-
-	if (
-		// Support named imports in JSON modules
-		loaded.format === 'json'
-		|| tsExtensionsPattern.test(url)
-	) {
-		const transformed = await transform(
-			code,
-			filePath,
-			{
-				tsconfigRaw: fileMatcher?.(filePath) as TransformOptions['tsconfigRaw'],
-			},
-		);
-
-		return {
-			format: 'module',
-			source: applySourceMap(transformed),
-		};
-	}
-
-	if (loaded.format === 'module') {
-		const dynamicImportTransformed = transformDynamicImport(filePath, code);
-		if (dynamicImportTransformed) {
-			loaded.source = applySourceMap(dynamicImportTransformed);
-		}
-	}
-
-	return loaded;
-};
diff --git a/src/esm/utils.ts → src/esm/hook/utils.ts b/src/esm/utils.ts → src/esm/hook/utils.ts
diff --git a/src/esm/index.ts b/src/esm/index.ts
@@ -1,13 +1,13 @@
 import { isMainThread } from 'node:worker_threads';
 import { isFeatureSupported, moduleRegister } from '../utils/node-features.js';
-import { registerLoader } from './register.js';
+import { register } from './api/index.js';
 
 // Loaded via --import flag
 if (
 	isFeatureSupported(moduleRegister)
 	&& isMainThread
 ) {
-	registerLoader();
+	register();
 }
 
-export * from './loaders.js';
+export * from './hook/index.js';