Move tsx to separate module + reuse node resolver (fixes #344)

Author: webpro

Diff for: src/binaries/resolvers/fallback.ts

@@ -19,7 +19,6 @@ const argFilters: ArgResolvers = {
   execa: withPositional,
   'ts-node': withPositional,
   zx: withPositional,
-  tsx: parsed => parsed._.filter(p => p !== 'watch'),
   default: withoutPositional,
 };
 

Diff for: src/binaries/resolvers/index.ts

@@ -6,4 +6,5 @@ export * as npx from './npx.js';
 export * as nx from './nx.js';
 export * as pnpm from './pnpm.js';
 export * as rollup from './rollup.js';
+export * as tsx from './tsx.js';
 export * as yarn from './yarn.js';

Diff for: src/binaries/resolvers/tsx.ts

@@ -0,0 +1,8 @@
+import { toBinary } from '../../util/protocols.js';
+import { resolve as resolveNode } from './node.js';
+import type { Resolver } from '../types.js';
+
+export const resolve: Resolver = (binary, args, options) => {
+  args = args.map(a => (a === 'watch' ? '--watch' : a));
+  return [toBinary(binary), ...resolveNode(binary, args, options)];
+};

Diff for: test/util/getReferencesFromScripts.test.ts

@@ -44,15 +44,20 @@ test('getReferencesFromScripts (node)', () => {
   t('node dist/index.js', []);
   t('./script.js', [js]);
   t('node --watch ./script.js', [js]);
+  t('node ./script.js build', [js]);
 });
 
-test('getReferencesFromScripts (ts-node/tsx)', () => {
+test('getReferencesFromScripts (ts-node)', () => {
   t('ts-node --require pkg/register main.ts', ['bin:ts-node', ts, 'pkg']);
+  t('babel-node --inspect=0.0.0.0 ./main.ts', ['bin:babel-node', ts]);
+});
+
+test('getReferencesFromScripts (tsx)', () => {
   t('tsx ./main.ts', ['bin:tsx', ts]);
   t('tsx watch ./main.ts', ['bin:tsx', ts]);
   t('node --loader tsx ./main.ts', [ts, 'tsx']);
-  t('npx tsx main', ['bin:tsx', ts]);
-  t('babel-node --inspect=0.0.0.0 ./main.ts', ['bin:babel-node', ts]);
+  t('tsx main', ['bin:tsx', ts]);
+  t('tsx ./main.ts build', ['bin:tsx', ts]);
 });
 
 test('getReferencesFromScripts (--require)', () => {
@@ -121,6 +126,9 @@ test('getReferencesFromScripts (npx)', () => {
   t("npx --package=foo -c 'curl --output /dev/null'", ['foo', 'bin:curl']);
   t('npx swagger-typescript-api -p http://localhost:3030/swagger.v1.json', ['bin:swagger-typescript-api']);
   t('npx swagger-typescript-api -- -p http://localhost:3030/swagger.v1.json', ['bin:swagger-typescript-api']);
+  t('npx tsx main', ['bin:tsx', ts]);
+  t('npx tsx ./main.ts build', ['bin:tsx', ts]);
+  t('npx tsx ./main.ts -- build', ['bin:tsx', ts]);
 });
 
 test('getReferencesFromScripts (pnpm)', () => {