fix: tsconfig.json with extends config

lib/index.js

@@ -8,12 +8,19 @@ const {
   copyFilesRecursive,
   output,
   colors,
-  debug
+  debug,
 } = require('./util');
 const path = require('path');
 const { replaceTscAliasPaths } = require('tsc-alias');
 const chokidar = require('chokidar');
 
+function getRelativeDir(rootDir, filePathDir) {
+  if (!filePathDir) {
+    return filePathDir;
+  }
+  return path.relative(rootDir, filePathDir);
+}
+
 function run() {
   const [runCmd, tscArgs, runArgs, isCleanDirectory] = parseArgs(process.argv);
   const cwd = process.cwd();
@@ -52,10 +59,10 @@ function run() {
   }
 
   if (tsconfig.options) {
-    outDir = tsconfig.options.outDir;
+    outDir = getRelativeDir(cwd, tsconfig.options.outDir);
     // 解析出来的 tsconfig.json 中的 allowJs 优先级更高
     allowJs = tsconfig.options.allowJs;
-    sourceDir = tsconfig.options.rootDir || sourceDir;
+    sourceDir = getRelativeDir(cwd, tsconfig.options.rootDir) || sourceDir;
     // 判断是否需要启动 tsc-alias
     hasPaths = !!(
       tsconfig.options.paths && Object.keys(tsconfig.options.paths).length > 0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mwtsc",
-  "version": "1.7.0",
+  "version": "1.7.1-beta.1",
   "description": "tsc wrapper for midway development",
   "main": "lib/index.js",
   "bin": {
@@ -14,9 +14,9 @@
   },
   "devDependencies": {
     "execa": "^5.1.1",
-    "jest": "^29.4.1",
+    "jest": "^29.7.0",
     "mwts": "^1.3.0",
-    "typescript": "~4.9.0"
+    "typescript": "~4.9.5"
   },
   "engines": {
     "node": ">=12.0.0"

test/fixtures/ts_config/tsconfig_extend.json

@@ -1,10 +1,5 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "paths": {
-      "##/*": ["src/*"],
-      "#a/*": ["src/app/*"],
-      "#@/*": ["test/*"]
-    },
   }
 }

test/util.test.js

@@ -78,12 +78,16 @@ describe('test/util.test.js', () => {
 
   it('should test read tsconfig file', () => {
     const data = readJSONCFile(path.join(__dirname, 'fixtures/ts_config/tsconfig.json'));
-    expect(data).toMatchSnapshot();
+    expect(data.options).toBeDefined();
+    expect(data.raw).toBeDefined();
   });
 
   it('should test read tsconfig file with extends', () => {
     const data = readJSONCFile(path.join(__dirname, 'fixtures/ts_config/tsconfig_extend.json'));
-    expect(data).toMatchSnapshot();
+    expect(data.options).toBeDefined();
+    expect(data.options.paths).toBeDefined();
+    expect(data.raw).toBeDefined();
+    expect(data.raw.paths).not.toBeDefined();
   });
 
 });