Merge pull request #160 from midwayjs/disabled_autoload_js

chore: disable auto load in js mode
midwayjs · Mar 6, 2019 · b22ba04 · b22ba04
2 parents 8cd24b8 + 9f9fb03
commit b22ba04
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/packages/midway-core/src/loader.ts b/packages/midway-core/src/loader.ts
@@ -57,6 +57,11 @@ export class ContainerLoader {
     ignore?: string;
     configLocations?: string[];
   } = {}) {
+    if (!this.isTsMode && loadOpts.disableAutoLoad === undefined) {
+      // disable auto load in js mode by default
+      loadOpts.disableAutoLoad = true;
+    }
+
     // 如果没有关闭autoLoad 则进行load
     if (!loadOpts.disableAutoLoad) {
       const defaultLoadDir = this.isTsMode ? [this.baseDir] : ['app', 'lib'];

diff --git a/packages/midway-core/test/loader.test.ts b/packages/midway-core/test/loader.test.ts
@@ -118,4 +118,32 @@ describe('/test/loader.test.ts', () => {
     assert(baseServiceCtx.factory('google'));
   });
 
+  it('should load js directory and set auto load', async () => {
+    const loader = new ContainerLoader({
+      baseDir: path.join(__dirname, './fixtures/js-app-loader'),
+      isTsMode: false,
+    });
+    loader.initialize();
+    loader.loadDirectory({disableAutoLoad: false});
+    await loader.refresh();
+    const appCtx = loader.getApplicationContext();
+    assert(await appCtx.getAsync('app'));
+  });
+
+  it('should load js directory and auto disable', async () => {
+    const loader = new ContainerLoader({
+      baseDir: path.join(__dirname, './fixtures/js-app-loader'),
+      isTsMode: false,
+    });
+    loader.initialize();
+    loader.loadDirectory();
+    await loader.refresh();
+    const appCtx = loader.getApplicationContext();
+    try {
+      await appCtx.getAsync('app');
+    } catch (err) {
+      assert(err);
+    }
+  });
+
 });