From 32aaffeb407ab83f332dc2d9c5eaa9a1110b3beb Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Tue, 1 Feb 2022 22:15:09 -0500
Subject: [PATCH] Fix #1389: Make `--showConfig` `moduleTypes` log correct,
 relative paths same as include (#1619)

* render proper relative moduleTypes paths and omit empty require array in --showConfig output

* lint-fix

* rewrite error message to mention --showConfig instead of --show-config

* fix

* Update index.spec.ts
---
 src/bin.ts             | 22 ++++++++++++++++++++--
 src/test/index.spec.ts |  5 ++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/bin.ts b/src/bin.ts
index c1a02be72..0194f3a3c 100644
--- a/src/bin.ts
+++ b/src/bin.ts
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { join, resolve, dirname, parse as parsePath } from 'path';
+import { join, resolve, dirname, parse as parsePath, relative } from 'path';
 import { inspect } from 'util';
 import Module = require('module');
 import arg = require('arg');
@@ -331,13 +331,31 @@ Options:
     const ts = service.ts as any as TSInternal;
     if (typeof ts.convertToTSConfig !== 'function') {
       console.error(
-        'Error: --show-config requires a typescript versions >=3.2 that support --showConfig'
+        'Error: --showConfig requires a typescript versions >=3.2 that support --showConfig'
       );
       process.exit(1);
     }
+    let moduleTypes = undefined;
+    if (service.options.moduleTypes) {
+      // Assumption: this codepath requires CLI invocation, so moduleTypes must have come from a tsconfig, not API.
+      const showRelativeTo = dirname(service.configFilePath!);
+      moduleTypes = {} as Record<string, string>;
+      for (const [key, value] of Object.entries(service.options.moduleTypes)) {
+        moduleTypes[
+          relative(
+            showRelativeTo,
+            resolve(service.options.optionBasePaths?.moduleTypes!, key)
+          )
+        ] = value;
+      }
+    }
     const json = {
       ['ts-node']: {
         ...service.options,
+        require: service.options.require?.length
+          ? service.options.require
+          : undefined,
+        moduleTypes,
         optionBasePaths: undefined,
         compilerOptions: undefined,
         project: service.configFilePath ?? service.options.project,
diff --git a/src/test/index.spec.ts b/src/test/index.spec.ts
index 40f12ca59..fb7870bc2 100644
--- a/src/test/index.spec.ts
+++ b/src/test/index.spec.ts
@@ -889,7 +889,7 @@ test.suite('ts-node', (test) => {
     });
 
     if (semver.gte(ts.version, '3.2.0')) {
-      test('--show-config should log resolved configuration', async (t) => {
+      test('--showConfig should log resolved configuration', async (t) => {
         function native(path: string) {
           return path.replace(/\/|\\/g, pathSep);
         }
@@ -908,7 +908,6 @@ test.suite('ts-node', (test) => {
                 cwd: native(`${ROOT_DIR}/tests`),
                 projectSearchDir: native(`${ROOT_DIR}/tests`),
                 project: native(`${ROOT_DIR}/tests/tsconfig.json`),
-                require: [],
               },
               compilerOptions: {
                 target: 'es6',
@@ -938,7 +937,7 @@ test.suite('ts-node', (test) => {
           `${CMD_TS_NODE_WITH_PROJECT_FLAG} --showConfig`
         );
         expect(err).not.toBe(null);
-        expect(stderr).toMatch('Error: --show-config requires');
+        expect(stderr).toMatch('Error: --showConfig requires');
       });
     }