feat: add project options in midway-bin

packages/midway-bin/lib/cmd/build.js

@@ -18,6 +18,12 @@ class BuildCommand extends Command {
         type: 'boolean',
         alias: 'c',
       },
+      project: {
+        description: 'project file location',
+        type: 'string',
+        alias: 'p',
+        default: 'tsconfig.json',
+      },
     };
   }
 
@@ -29,22 +35,41 @@ class BuildCommand extends Command {
     const { cwd, argv } = context;
 
     const tscCli = require.resolve('typescript/bin/tsc');
-    if (!fs.existsSync(path.join(cwd, 'tsconfig.json'))) {
+    if (!fs.existsSync(path.join(cwd, argv.project))) {
       console.log(`[midway-bin] tsconfig.json not found in ${cwd}\n`);
       return;
     }
 
     if (argv.clean) {
-      yield this.cleanDir(cwd);
+      yield this.cleanDir(cwd, argv.project);
     }
 
-    yield this.copyFiles(cwd);
+    yield this.copyFiles(cwd, argv.project);
+
+    const args = [];
 
-    yield this.helper.forkNode(tscCli, [], { cwd });
+    if (argv.project) {
+      args.push('-p');
+      args.push(argv.project);
+    }
+    yield this.helper.forkNode(tscCli, args, { cwd });
   }
 
-  * cleanDir(cwd) {
-    const tsConfig = require(path.join(cwd, 'tsconfig.json'));
+  * cleanDir(cwd, projectFile) {
+    const tsConfig = require(path.join(cwd, projectFile));
+
+    // if projectFile extended and without outDir,
+    // get setting from its parent
+    if (tsConfig && tsConfig.extends) {
+      if (
+        !tsConfig.compilerOptions ||
+        (tsConfig.compilerOptions && !tsConfig.compilerOptions.outDir)
+      ) {
+        yield this.cleanDir(cwd, tsConfig.extends);
+        return;
+      }
+    }
+
     if (tsConfig && tsConfig.compilerOptions) {
       const outDir = tsConfig.compilerOptions.outDir;
       if (outDir) {
@@ -53,8 +78,21 @@ class BuildCommand extends Command {
     }
   }
 
-  * copyFiles(cwd) {
-    const tsConfig = require(path.join(cwd, 'tsconfig.json'));
+  * copyFiles(cwd, projectFile) {
+    const tsConfig = require(path.join(cwd, projectFile));
+
+    // if projectFile extended and without outDir,
+    // get setting from its parent
+    if (tsConfig && tsConfig.extends) {
+      if (
+        !tsConfig.compilerOptions ||
+        (tsConfig.compilerOptions && !tsConfig.compilerOptions.outDir)
+      ) {
+        yield this.copyFiles(cwd, tsConfig.extends);
+        return;
+      }
+    }
+
     if (tsConfig && tsConfig.compilerOptions) {
       const outDir = tsConfig.compilerOptions.outDir;
       if (outDir && fs.existsSync(path.join(cwd, 'package.json'))) {

packages/midway-bin/lib/cmd/clean.js

@@ -32,7 +32,7 @@ class CleanCommand extends Command {
       }, error => {
         if (error) {
           console.error(`[midway-bin] exec error: ${error}`);
-          reject();
+          reject(error);
           return;
         }
         console.log('[midway-bin] clean midway temporary files complete!');

packages/midway-bin/test/fixtures/ts-dir-with-another-tsconfig/a.ts

@@ -0,0 +1,2 @@
+import * as path from 'path';
+console.log(path.extname(__filename));

packages/midway-bin/test/fixtures/ts-dir-with-another-tsconfig/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "stripInternal": true,
+    "pretty": true,
+    "declaration": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "lib": ["es2017", "dom"]
+  },
+  "exclude": [
+    "dist",
+    "node_modules",
+    "test"
+  ]
+}

packages/midway-bin/test/fixtures/ts-dir-with-another-tsconfig/tsconfig.prod.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.json"
+}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "ts-dir-with-assets",
+  "version": "0.0.1",
+  "dependencies": {
+
+  },
+  "midway-bin-build": {
+    "include": [
+      "public",
+      "view",
+      "resource.json",
+      "lib/*.json",
+      "lib/*.text",
+      ["pattern/**", "!pattern/**/*.js"]
+    ]
+  }
+}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/a.ts

@@ -0,0 +1,2 @@
+import * as path from 'path';
+console.log(path.extname(__filename));

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/lib/a.text

@@ -0,0 +1 @@
+abc

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/lib/b.json

@@ -0,0 +1 @@
+{}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/pattern/ignore.css

@@ -0,0 +1 @@
+body {}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/pattern/ignore.js

@@ -0,0 +1 @@
+alert(1);

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/pattern/sub/sub_ignore.css

@@ -0,0 +1 @@
+body {}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/pattern/sub/sub_ignore.js

@@ -0,0 +1 @@
+alert(1);

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/public/test.css

@@ -0,0 +1 @@
+body{}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/public/test.js

@@ -0,0 +1 @@
+alert(123);

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/resource.json

@@ -0,0 +1,3 @@
+{
+  "a": 1
+}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/src/view/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "stripInternal": true,
+    "pretty": true,
+    "declaration": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "lib": ["es2017", "dom"]
+  },
+  "exclude": [
+    "dist",
+    "node_modules",
+    "test"
+  ]
+}

packages/midway-bin/test/fixtures/ts-dir-with-assets-and-another-tsconfig/tsconfig.prod.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.json"
+}

packages/midway-bin/test/lib/cmd/build.test.js

@@ -52,5 +52,75 @@ describe('test/lib/cmd/build.test.js', () => {
     assert(fs.existsSync(path.join(cwd, 'dist/pattern/sub/sub_ignore.css')));
     yield rimraf(path.join(cwd, 'dist'));
   });
+});
+
+describe('test/lib/cmd/build.test.js - with another tsconfig', () => {
+  const midwayBin = require.resolve('../../../bin/midway-bin.js');
+
+  afterEach(mm.restore);
+
+  it('should warn message', function*() {
+    const cwd = path.join(__dirname, '../../fixtures/ts-dir-without-config');
+    const child = coffee
+      .fork(midwayBin, ['build', '-p', 'tsconfig.prod.json'], { cwd })
+      .expect('stdout', /tsconfig/);
+
+    yield child.expect('code', 0).end();
+  });
+
+  it('should build success with another tsconfig', function*() {
+    const cwd = path.join(
+      __dirname,
+      '../../fixtures/ts-dir-with-another-tsconfig'
+    );
+    yield rimraf(path.join(cwd, 'dist'));
+    const child = coffee.fork(
+      midwayBin,
+      ['build', '-p', 'tsconfig.prod.json'],
+      { cwd }
+    );
+    yield child.expect('code', 0).end();
+    assert(fs.existsSync(path.join(cwd, 'dist/a.js')));
+    yield rimraf(path.join(cwd, 'dist'));
+  });
+
+  it('should auto clean dir before build with another tsconfig', function*() {
+    const cwd = path.join(
+      __dirname,
+      '../../fixtures/ts-dir-with-another-tsconfig'
+    );
+    yield rimraf(path.join(cwd, 'dist'));
+    const child = coffee.fork(
+      midwayBin,
+      ['build', '-p', 'tsconfig.prod.json'],
+      { cwd }
+    );
+    yield child.expect('code', 0).end();
+    assert(fs.existsSync(path.join(cwd, 'dist/a.js')));
+    yield rimraf(path.join(cwd, 'dist'));
+  });
 
+  it('should copy assets file to dist dir with another tsconfig', function*() {
+    const cwd = path.join(
+      __dirname,
+      '../../fixtures/ts-dir-with-assets-and-another-tsconfig'
+    );
+
+    const child = coffee.fork(
+      midwayBin,
+      ['build', '-c', '-p', 'tsconfig.prod.json'],
+      { cwd }
+    );
+    yield child.expect('code', 0).end();
+    assert(fs.existsSync(path.join(cwd, 'dist/a.js')));
+    assert(fs.existsSync(path.join(cwd, 'dist/view/index.html')));
+    assert(fs.existsSync(path.join(cwd, 'dist/public/test.css')));
+    assert(fs.existsSync(path.join(cwd, 'dist/public/test.js')));
+    assert(fs.existsSync(path.join(cwd, 'dist/resource.json')));
+    assert(fs.existsSync(path.join(cwd, 'dist/lib/b.json')));
+    assert(fs.existsSync(path.join(cwd, 'dist/lib/a.text')));
+    assert(fs.existsSync(path.join(cwd, 'dist/pattern/ignore.css')));
+    assert(fs.existsSync(path.join(cwd, 'dist/pattern/sub/sub_ignore.css')));
+    yield rimraf(path.join(cwd, 'dist'));
+  });
 });