cli: doric build and doric clean

doric-cli/package.json

@@ -24,11 +24,13 @@
   },
   "homepage": "https://github.com/penfeizhou/doric#readme",
   "dependencies": {
+    "@types/glob": "^7.1.3",
     "@types/node": "^14.14.25",
     "child_process": "^1.0.2",
     "chokidar": "^3.4.1",
     "colors": "^1.4.0",
     "commander": "^6.0.0",
+    "glob": "^7.1.6",
     "keypress": "^0.2.1",
     "nodejs-websocket": "^1.7.2",
     "qrcode-terminal": "^0.12.0",

doric-cli/scripts/command.js

@@ -30,7 +30,7 @@ function doMerge(startPath, fileName) {
     if (filePath.indexOf('.es5.') >= 0){
         return
     }
-    console.log('File change:', filePath)
+    console.log('File changed:', filePath)
     const mergedMap = SourceMapMerger.createMergedSourceMapFromFiles([
         filePath.replace(/bundle\//, 'build/'),
         filePath,
@@ -38,6 +38,7 @@ function doMerge(startPath, fileName) {
     fs.writeFileSync(filePath, mergedMap)
     return mergedMap
 }
+
 function mergeMappings() {
     fromDir("bundle", ".map")
 }

doric-cli/src/actions.ts

@@ -0,0 +1,32 @@
+import { Shell } from "./shell";
+import { createMergedSourceMapFromFiles } from "source-map-merger"
+import fs from "fs"
+import { glob } from "./util";
+
+export async function build() {
+    await Shell.exec("node", ["node_modules/.bin/tsc", "-p", "."]);
+    await Shell.exec("node", ["node_modules/.bin/rollup", "-c"]);
+    const bundleFiles = await glob("bundle/**/*.js");
+    for (let bundleFile of bundleFiles) {
+        await doMerge(bundleFile);
+    }
+}
+
+export async function clean() {
+    await Shell.exec("rm", ["-rf", "build"]);
+    await Shell.exec("rm", ["-rf", "bundle"]);
+}
+
+export async function doMerge(jsFile: string) {
+    const mappingFile = `${jsFile}.map`;
+    console.log(`Bundle -> ${jsFile.green}`);
+    if (!fs.existsSync(mappingFile)) {
+        return;
+    }
+    console.log(`       -> ${mappingFile.green}`);
+    const mergedMap = createMergedSourceMapFromFiles([
+        mappingFile.replace(/bundle\//, 'build/'),
+        mappingFile,
+    ], true);
+    await fs.promises.writeFile(mappingFile, mergedMap);
+}

doric-cli/src/index.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import commander from "commander"
+import { build, clean } from "./actions";
 import create from "./create"
 
 commander
@@ -19,10 +20,12 @@ commander
     })
 commander
     .command('build')
-    .action(function () {
+    .action(async function () {
+        await build();
     })
 commander
     .command('clean')
-    .action(function () {
+    .action(async function () {
+        await clean();
     })
 commander.parse(process.argv)

doric-cli/src/modules.d.ts

@@ -0,0 +1 @@
+declare module 'source-map-merger'

doric-cli/src/util.ts

@@ -1,3 +1,27 @@
+import globLib, { IOptions } from "glob";
+
 export function getAssetsDir() {
     return `${__dirname}/../assets`;
+}
+
+export async function glob(pattern: string, options?: IOptions) {
+    return new Promise((resolve, reject) => {
+        if (options) {
+            globLib(pattern, options, (err, ret) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(ret);
+                }
+            });
+        } else {
+            globLib(pattern, (err, ret) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(ret);
+                }
+            });
+        }
+    }) as Promise<string[]>;
 }