f

Author: fengmk2

src/commands/start.ts

@@ -223,7 +223,7 @@ export default class Start<T extends typeof Start> extends BaseCommand<T> {
       flags.sourcemap = true;
     }
     if (flags.sourcemap) {
-      const sourceMapSupport = importResolve('source-map-support/register', {
+      const sourceMapSupport = importResolve('source-map-support/register.js', {
         paths: [ getSourceDirname() ],
       });
       if (this.isESM) {

test/fixtures/subdir-as-basedir/base-dir/app/router.js

@@ -1,15 +1,13 @@
-'use strict';
-
 module.exports = app => {
-  app.get('/', function* () {
+  app.get('/', async function() {
     this.body = `hi, ${app.config.framework || 'egg'}`;
   });
 
-  app.get('/env', function* () {
+  app.get('/env', async function() {
     this.body = app.config.env + ', ' + app.config.pre;
   });
 
-  app.get('/path', function* () {
+  app.get('/path', async function() {
     this.body = process.env.PATH;
   });
 };

test/fixtures/ts-pkg/package.json

@@ -8,7 +8,7 @@
     "typescript": true
   },
   "scripts": {
-    "build": "node ../../../node_modules/.bin/tsc",
+    "build": "sh ../../../node_modules/.bin/tsc",
     "windows-build": "call ../../../node_modules/.bin/tsc.cmd"
   }
 }

test/fixtures/ts/package.json

@@ -5,7 +5,7 @@
     "egg": "^1.0.0"
   },
   "scripts": {
-    "build": "node ../../../node_modules/.bin/tsc",
+    "build": "sh ../../../node_modules/.bin/tsc",
     "windows-build": "call ../../../node_modules/.bin/tsc.cmd"
   }
 }

test/fixtures/ts/tsconfig.json

@@ -7,7 +7,6 @@
     "noImplicitAny": false,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "charset": "utf8",
     "allowJs": false,
     "pretty": true,
     "noEmitOnError": false,
@@ -26,4 +25,4 @@
     "app/public",
     "app/views"
   ]
-}
+}

test/ts.test.js

@@ -0,0 +1,120 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { strict as assert } from 'node:assert';
+import fs from 'node:fs/promises';
+import cp from 'node:child_process';
+import { scheduler } from 'node:timers/promises';
+import coffee from 'coffee';
+import { request } from 'urllib';
+import { mm, restore } from 'mm';
+import { cleanup, replaceWeakRefMessage, Coffee } from './utils.js';
+import { isWindows, getSourceFilename } from '../src/helper.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+describe('test/ts.test.ts', () => {
+  const eggBin = getSourceFilename('../bin/run.js');
+  const homePath = path.join(__dirname, 'fixtures/home');
+  const waitTime = 5000;
+  let fixturePath: string;
+
+  beforeEach(() => mm(process.env, 'MOCK_HOME_DIR', homePath));
+  afterEach(restore);
+
+  before(() => fs.mkdir(homePath, { recursive: true }));
+  after(() => fs.rm(homePath, { recursive: true, force: true }));
+
+  describe('should display correct stack traces', () => {
+    let app: Coffee;
+    beforeEach(async () => {
+      fixturePath = path.join(__dirname, 'fixtures/ts');
+      await cleanup(fixturePath);
+      const result = cp.spawnSync('npm', [ 'run', isWindows ? 'windows-build' : 'build' ], {
+        cwd: fixturePath,
+        shell: isWindows,
+      });
+      assert.equal(result.stderr.toString(), '');
+    });
+
+    afterEach(async () => {
+      app && app.proc.kill('SIGTERM');
+      await cleanup(fixturePath);
+    });
+
+    it('--ts', async () => {
+      app = coffee.fork(eggBin, [ 'start', '--workers=1', '--ts', fixturePath ]) as Coffee;
+      // app.debug();
+      app.expect('code', 0);
+
+      await scheduler.wait(waitTime);
+
+      assert.equal(replaceWeakRefMessage(app.stderr), '');
+      assert.match(app.stdout, /egg started on http:\/\/127\.0\.0\.1:7001/);
+      const result = await request('http://127.0.0.1:7001', { dataType: 'json' });
+      // console.log(result.data);
+      assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
+    });
+
+    it('--typescript', async () => {
+      app = coffee.fork(eggBin, [ 'start', '--workers=1', '--typescript', fixturePath ]) as Coffee;
+      // app.debug();
+      app.expect('code', 0);
+
+      await scheduler.wait(waitTime);
+
+      assert.equal(replaceWeakRefMessage(app.stderr), '');
+      assert.match(app.stdout, /egg started on http:\/\/127\.0\.0\.1:7001/);
+      const result = await request('http://127.0.0.1:7001', { dataType: 'json' });
+      // console.log(result.data);
+      assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
+    });
+
+    it('--sourcemap', async () => {
+      app = coffee.fork(eggBin, [ 'start', '--workers=1', '--sourcemap', fixturePath ]) as Coffee;
+      // app.debug();
+      app.expect('code', 0);
+
+      await scheduler.wait(waitTime);
+
+      assert.equal(replaceWeakRefMessage(app.stderr), '');
+      assert.match(app.stdout, /egg started on http:\/\/127\.0\.0\.1:7001/);
+      const result = await request('http://127.0.0.1:7001', { dataType: 'json' });
+      // console.log(result.data);
+      assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
+    });
+  });
+
+  describe('pkg.egg.typescript', () => {
+    let app: Coffee;
+    beforeEach(async () => {
+      fixturePath = path.join(__dirname, 'fixtures/ts-pkg');
+      await cleanup(fixturePath);
+      const result = cp.spawnSync('npm', [ 'run', isWindows ? 'windows-build' : 'build' ], {
+        cwd: fixturePath,
+        shell: isWindows,
+      });
+      assert(!result.stderr.toString());
+    });
+
+    afterEach(async () => {
+      app && app.proc.kill('SIGTERM');
+      await cleanup(fixturePath);
+    });
+
+    it('should got correct stack', async () => {
+      app = coffee.fork(eggBin, [ 'start', '--workers=1', fixturePath ]) as Coffee;
+      // app.debug();
+      app.expect('code', 0);
+
+      await scheduler.wait(waitTime);
+
+      assert.equal(replaceWeakRefMessage(app.stderr), '');
+      assert.match(app.stdout, /egg started on http:\/\/127\.0\.0\.1:7001/);
+      const result = await request('http://127.0.0.1:7001', { dataType: 'json' });
+      // console.log(result.data);
+      assert(result.data.stack.includes(path.normalize('app/controller/home.ts:6:13')));
+    });
+  });
+});
+