feat: new 2.x

midwayjs · czy88840616 · Sep 13, 2020 · Aug 31, 2020 · Aug 31, 2020 · Sep 1, 2020
commit 3af2cd155f56a518698432e889e47f706b0612b3
diff --git a/.githooks/pre-commit/filter.sh b/.githooks/pre-commit/filter.sh
diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('mwts/.prettierrc.json')
+}
diff --git a/package.json b/package.json
@@ -3,25 +3,17 @@
   "description": "a web framework for complex Node.js application",
   "version": "1.0.0",
   "devDependencies": {
-    "@types/chai": "^4.2.11",
-    "@types/lodash": "^4.14.150",
-    "@types/mocha": "^5.2.7",
+    "@types/jest": "^26.0.10",
     "@types/node": "^10.17.21",
-    "autocannon": "^2.4.1",
-    "chalk": "^3.0.0",
-    "debug": "^4.1.1",
-    "eslint": "^6.1.0",
     "gh-pages": "^2.2.0",
-    "git-hooks": "^1.1.10",
+    "jest": "^26.4.0",
     "lerna": "^3.20.2",
     "lerna-relinker": "^1.4.0",
-    "node-ab": "0.0.6",
+    "mwts": "^1.0.5",
     "opencollective": "^1.0.3",
     "opencollective-postinstall": "^2.0.2",
     "rimraf": "^3.0.2",
-    "tree-kill": "^1.2.2",
-    "tslint": "^5.20.1",
-    "tslint-no-unused-expression-chai": "^0.1.4",
+    "ts-jest": "^26.2.0",
     "typescript": "^3.8.3",
     "vuepress": "^0.14.11"
   },
@@ -60,38 +52,11 @@
     "url": "http://github.com/midwayjs/midway.git"
   },
   "engines": {
-    "node": ">= 8.2.1"
+    "node": ">= 8.0.0"
   },
   "license": "MIT",
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/midway"
-  },
-  "nyc": {
-    "include": [
-      "packages/**/src/*.ts",
-      "packages/**/src/**/*.ts",
-      "packages/midway-bin/lib/*.js",
-      "packages/midway-init/lib/*.js"
-    ],
-    "exclude": [
-      "**/typings",
-      "**/*.d.ts",
-      "**/dist",
-      "**/test",
-      "**/src/domain.ts",
-      "**/src/interface.ts",
-      "packages/midway-web/src/baseController.ts",
-      "packages/midway-web/src/decorators/babel.ts"
-    ],
-    "extension": [
-      ".ts",
-      ".js"
-    ],
-    "reporter": [
-      "json",
-      "html"
-    ],
-    "all": true
   }
 }
diff --git a/packages/bootstrap/jest.config.js b/packages/bootstrap/jest.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'midway-bin/jest/env.js',
+};
diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@midwayjs/bootstrap",
+  "version": "1.0.0",
+  "description": "midwayjs bootstrap",
+  "main": "dist/index",
+  "typings": "dist/index.d.ts",
+  "scripts": {
+    "build": "midway-bin build -c",
+    "lint": "../../node_modules/.bin/tslint --format prose -c ../../tslint.json --fix 'src/**/*.ts' 'test/**/*.ts'",
+    "test": "../../node_modules/.bin/jest",
+    "cov": "midway-bin clean && midway-bin cov --ts",
+    "autod": "midway-bin autod"
+  },
+  "keywords": [
+    "midway",
+    "IoC",
+    "bootstrap"
+  ],
+  "files": [
+    "src",
+    "dist"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "midway-bin": "^2.0.15"
+  },
+  "dependencies": {
+    "@midwayjs/core": "^2.1.4"
+  },
+  "author": "Harry Chen <czy88840616@gmail.com>",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/midwayjs/midway.git"
+  }
+}
diff --git a/packages/bootstrap/src/bootstrap.ts b/packages/bootstrap/src/bootstrap.ts
@@ -0,0 +1,92 @@
+import { IMidwayFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
+import { join } from 'path';
+
+function isTypeScriptEnvironment() {
+  const TS_MODE_PROCESS_FLAG: string = process.env.MIDWAY_TS_MODE;
+  if ('false' === TS_MODE_PROCESS_FLAG) {
+    return false;
+  }
+  // eslint-disable-next-line node/no-deprecated-api
+  return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
+}
+
+class BootstrapStarter {
+  private appDir;
+  private bootstrapItems: IMidwayFramework[] = [];
+  private globalOptions: Partial<IMidwayBootstrapOptions>;
+
+  public configure(options: Partial<IMidwayBootstrapOptions>) {
+    this.globalOptions = options;
+  }
+
+  public pushFrameworkUnit(unit: IMidwayFramework) {
+    this.bootstrapItems.push(unit);
+  }
+
+  public async init() {
+    this.appDir =  this.globalOptions.baseDir;
+    await Promise.all(
+      this.getActions('initialize', {
+        ...this.globalOptions,
+        baseDir: this.getBaseDir(),
+        appDir: this.appDir,
+      })
+    );
+  }
+
+  public getActions(action: string, args?): any[] {
+    return this.bootstrapItems.map(item => {
+      return item[action](args);
+    });
+  }
+
+  private getBaseDir() {
+    if (isTypeScriptEnvironment()) {
+      return join(this.appDir, 'src');
+    } else {
+      return join(this.appDir, 'dist');
+    }
+  }
+}
+
+export class Bootstrap {
+  static starter: BootstrapStarter;
+
+  /**
+   * set global configuration for midway
+   * @param configuration
+   */
+  static configure(configuration: Partial<IMidwayBootstrapOptions>) {
+    this.getStarter().configure(configuration);
+    return this;
+  }
+
+  /**
+   * load midway framework unit
+   * @param unit
+   */
+  static load(unit: IMidwayFramework) {
+    this.getStarter().pushFrameworkUnit(unit);
+    return this;
+  }
+
+  private static getStarter() {
+    if (!this.starter) {
+      this.starter = new BootstrapStarter();
+    }
+    return this.starter;
+  }
+
+  static async run() {
+    await this.getStarter().init();
+    return Promise.all(this.getStarter().getActions('run')).catch(
+      console.error
+    );
+  }
+
+  static async stop() {
+    return Promise.all(this.getStarter().getActions('stop')).catch(
+      console.error
+    );
+  }
+}
diff --git a/packages/bootstrap/src/index.ts b/packages/bootstrap/src/index.ts
@@ -0,0 +1 @@
+export { Bootstrap } from './bootstrap';
diff --git a/packages/bootstrap/test/index.test.ts b/packages/bootstrap/test/index.test.ts
@@ -0,0 +1,56 @@
+import { Bootstrap } from '../src';
+import {
+  IMidwayFramework,
+  IMidwayApplication,
+  IMidwayBootstrapOptions,
+  IMidwayContainer,
+} from '@midwayjs/core';
+
+class TestFrameworkUnit implements IMidwayFramework {
+  options;
+  app;
+  configure(options: any): TestFrameworkUnit {
+    this.options = options;
+    return this;
+  }
+  async run(): Promise<any> {
+    return 'bbb';
+  }
+
+  async stop(): Promise<void> {
+  }
+
+  async initialize(options: IMidwayBootstrapOptions): Promise<void> {
+    this.app = { bbb: 22 };
+  }
+  getApplicationContext(): IMidwayContainer {
+    return { a: 1 } as any;
+  }
+  getApplication(): IMidwayApplication {
+    return this.app;
+  }
+}
+
+describe('/test/index.test.ts', () => {
+  it('create case', async () => {
+    const bootstrap = Bootstrap.configure({
+      baseDir: __dirname,
+    });
+
+    expect(bootstrap);
+
+    const framework = new TestFrameworkUnit().configure({
+      port: 7001,
+    });
+    await bootstrap.load(framework).run();
+    expect(framework);
+    expect(framework.getApplicationContext()).toStrictEqual({ a: 1 });
+    expect(framework.app).toStrictEqual({ bbb: 22 });
+    expect(framework.getApplication()).toStrictEqual({ bbb: 22 });
+
+
+    // Bootstrap.configure({})
+    //   .load(new TestFrameworkUnit().configure({port: 7001}))
+    //   .run();
+  });
+});
diff --git a/packages/bootstrap/tsconfig.json b/packages/bootstrap/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compileOnSave": true,
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist"
+  },
+  "include": [
+    "./src/**/*.ts"
+  ]
+}
diff --git a/packages/midway-core/.autod.conf.js → packages/core/.autod.conf.js b/packages/midway-core/.autod.conf.js → packages/core/.autod.conf.js
diff --git a/packages/midway-core/CHANGELOG.md → packages/core/CHANGELOG.md b/packages/midway-core/CHANGELOG.md → packages/core/CHANGELOG.md
diff --git a/packages/midway-core/README.md → packages/core/README.md b/packages/midway-core/README.md → packages/core/README.md
diff --git a/packages/midway-core/package.json → packages/core/package.json b/packages/midway-core/package.json → packages/core/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "npm run lint && midway-bin build -c",
+    "build": "midway-bin build -c",
     "lint": "../../node_modules/.bin/tslint --format prose -c ../../tslint.json --fix 'src/**/*.ts' 'test/**/*.ts'",
     "test": "npm run lint && midway-bin clean && NODE_ENV=test midway-bin test --ts",
     "cov": "midway-bin clean && midway-bin cov --ts",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@midwayjs/decorator": "^2.1.4",
+    "@midwayjs/glob": "^1.0.2",
     "debug": "^4.1.1",
     "extend2": "^1.0.0",
-    "globby": "^10.0.1",
     "is-type-of": "^1.2.1",
     "lodash.assign": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",

diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -0,0 +1,69 @@
+import {
+  IConfigurationOptions,
+  IMidwayApplication,
+  IMidwayBootstrapOptions,
+  IMidwayContainer,
+  IMidwayFramework,
+} from './interface';
+import { ContainerLoader } from './';
+
+export abstract class BaseFramework<T extends IConfigurationOptions>
+  implements IMidwayFramework {
+  protected baseDir: string;
+  protected appDir: string;
+  protected configurationOptions: T;
+  protected containerLoader: ContainerLoader;
+
+  public configure(options: T): IMidwayFramework {
+    this.configurationOptions = options;
+    return this;
+  }
+
+  public async initialize(
+    options: Partial<IMidwayBootstrapOptions>
+  ): Promise<void> {
+    this.baseDir = options.baseDir;
+    this.appDir = options.appDir;
+
+    this.containerLoader = new ContainerLoader({
+      baseDir: this.baseDir,
+      isTsMode: true,
+      preloadModules: options.preloadModules || [],
+    });
+    this.containerLoader.initialize();
+
+    const applicationContext = this.containerLoader.getApplicationContext();
+    applicationContext.registerObject('baseDir', this.baseDir);
+    applicationContext.registerObject('appDir', this.appDir);
+    // 如果没有关闭autoLoad 则进行load
+    this.containerLoader.loadDirectory(options);
+    await this.containerLoader.refresh();
+    await this.afterInitialize(options);
+  }
+
+  public getApplicationContext(): IMidwayContainer {
+    return this.containerLoader.getApplicationContext();
+  }
+
+  public getConfiguration(key?: string): any {
+    return this.getApplicationContext()
+      .getConfigService()
+      .getConfiguration(key);
+  }
+
+  public getCurrentEnvironment() {
+    return this.getApplicationContext()
+    .getEnvironmentService()
+    .getCurrentEnvironment();
+  }
+
+  public abstract getApplication(): IMidwayApplication;
+
+  public abstract run(): Promise<void>;
+
+  public abstract stop(): Promise<void>;
+
+  protected abstract async afterInitialize(
+    options: Partial<IMidwayBootstrapOptions>
+  ): Promise<void>;
+}
diff --git a/packages/midway-core/src/common/constants.ts → packages/core/src/common/constants.ts b/packages/midway-core/src/common/constants.ts → packages/core/src/common/constants.ts
diff --git a/...ages/midway-core/src/common/lodashWrap.ts → packages/core/src/common/lodashWrap.ts b/...ages/midway-core/src/common/lodashWrap.ts → packages/core/src/common/lodashWrap.ts
diff --git a/...s/midway-core/src/common/notFoundError.ts → packages/core/src/common/notFoundError.ts b/...s/midway-core/src/common/notFoundError.ts → packages/core/src/common/notFoundError.ts
diff --git a/...ges/midway-core/src/common/reflectTool.ts → packages/core/src/common/reflectTool.ts b/...ges/midway-core/src/common/reflectTool.ts → packages/core/src/common/reflectTool.ts
diff --git a/packages/midway-core/src/common/util.ts → packages/core/src/common/util.ts b/packages/midway-core/src/common/util.ts → packages/core/src/common/util.ts
diff --git a/...ay-core/src/context/applicationContext.ts → ...es/core/src/context/applicationContext.ts b/...ay-core/src/context/applicationContext.ts → ...es/core/src/context/applicationContext.ts
diff --git a/.../midway-core/src/context/configuration.ts → packages/core/src/context/configuration.ts b/.../midway-core/src/context/configuration.ts → packages/core/src/context/configuration.ts
diff --git a/...ages/midway-core/src/context/container.ts → packages/core/src/context/container.ts b/...ages/midway-core/src/context/container.ts → packages/core/src/context/container.ts
diff --git a/packages/midway-core/src/context/managed.ts → packages/core/src/context/managed.ts b/packages/midway-core/src/context/managed.ts → packages/core/src/context/managed.ts
diff --git a/...ore/src/context/managedResolverFactory.ts → ...ore/src/context/managedResolverFactory.ts b/...ore/src/context/managedResolverFactory.ts → ...ore/src/context/managedResolverFactory.ts