test: add ts module loader

src/utils/index.ts

@@ -1,8 +1,11 @@
+import { debuglog } from 'node:util';
 import path from 'node:path';
 import fs from 'node:fs';
 import BuiltinModule from 'node:module';
 import { isGeneratorFunction } from 'is-type-of';
 
+const debug = debuglog('egg-core:utils');
+
 export type Fun = (...args: any[]) => any;
 
 // Guard against poorly mocked module constructors.
@@ -11,29 +14,34 @@ const Module = typeof module !== 'undefined' && module.constructor.length > 1
   /* istanbul ignore next */
   : BuiltinModule;
 
+const extensions = (Module as any)._extensions;
+debug('Module extensions: %j', Object.keys(extensions));
+
 export default {
-  extensions: (Module as any)._extensions,
+  extensions,
 
   async loadFile(filepath: string) {
     try {
       // if not js module, just return content buffer
       const extname = path.extname(filepath);
-      if (extname && !(Module as any)._extensions[extname]) {
+      if (extname && !extensions[extname]) {
         return fs.readFileSync(filepath);
       }
       let obj: any;
       let isESM = false;
       if (typeof require === 'function') {
         // commonjs
         obj = require(filepath);
+        debug('require %s => %o', filepath, obj);
         if (obj && obj.__esModule) {
           isESM = true;
         }
       } else {
         // esm
         obj = await import(filepath);
+        debug('await import %s => %o', filepath, obj);
         isESM = true;
-        if (obj && obj.__esModule && 'default' in obj) {
+        if (obj && 'default' in obj) {
           // default: { default: [Function (anonymous)] }
           obj = obj.default;
         }

test/fixtures/load_dirs/ts_module/mod.ts

@@ -0,0 +1,3 @@
+export default function() {
+  return { a: 1 };
+}

test/fixtures/load_dirs/ts_module/mod2.ts

@@ -0,0 +1,2 @@
+export const foo = 'bar';
+export class HelloFoo {}

test/fixtures/load_dirs/ts_module/mod3.ts

@@ -0,0 +1,4 @@
+export default {
+  ok: true,
+  foo: 'bar',
+}

test/loader/file_loader.test.ts

@@ -207,7 +207,20 @@ describe('test/loader/file_loader.test.ts', () => {
       directory: path.join(dirBase, 'es6_module'),
       target: app.model,
     }).load();
-    assert.deepEqual(app.model.mod.a, 1);
+    assert.equal(app.model.mod.a, 1);
+  });
+
+  it('should pass ts module', async () => {
+    const app: Record<string, any> = { model: {} };
+    await new FileLoader({
+      directory: path.join(dirBase, 'ts_module'),
+      target: app.model,
+    }).load();
+    assert.equal(app.model.mod.a, 1);
+    assert.equal(app.model.mod2.foo, 'bar');
+    assert(app.model.mod2.HelloFoo);
+    assert.equal(app.model.mod3.ok, true);
+    assert.equal(app.model.mod3.foo, 'bar');
   });
 
   it('should contain syntax error filepath', async () => {