@giteeteam/apps-cli 0.1.17-alpha.0 → 0.1.18-alpha.0

package/README.md

@@ -8,10 +8,15 @@ $ npm install @giteeteam/apps-cli -g
 ## 创建应用
 ```bash
 // uikit-app为项目名称
-$ giteeteam-apps-cli create uikit-app
+$ giteeteam-apps create uikit-app
 ```
 
 ## 打包应用
 ```bash
-$ giteeteam-apps-cli build
+$ giteeteam-apps build
+```
+
+## 调试插件function
+```bash
+$ giteeteam-apps dev
 ```

package/dist/index.js

@@ -15,6 +15,7 @@ var chalk = require('chalk');
 var readline = require('readline');
 var execa = require('execa');
 var child_process = require('child_process');
+var chokidar = require('chokidar');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27,8 +28,9 @@ var simpleGit__default = /*#__PURE__*/_interopDefaultLegacy(simpleGit);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
+var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.1.17-alpha.0";
+var version = "0.1.18-alpha.0";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -88,14 +90,9 @@ const archiveApp = async (archiveDir, pkgName) => {
 };
 
 const bundleApp = async (opts) => {
-    var _a, _b;
     const { manifest, mode, outputDir, inputDir } = opts;
-    const fileNames = new Set();
-    (_b = (_a = manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.forEach(({ handler }) => {
-        const filename = handler.split('.')[0];
-        fileNames.add(filename);
-    });
-    const bundlePromise = [...fileNames].map(async (fileName) => {
+    const functionFiles = manifest.getFunctionFiles();
+    const bundlePromise = functionFiles.map(async (fileName) => {
         await appsBundler.bundle({
             inputDir,
             fileName,
@@ -119,16 +116,66 @@ const execActionWithSpinner = async (message, action) => {
     spinner.succeed(message.succeed);
 };
 
-const getManifestObject = async () => {
+class Manifest {
+    constructor(manifestStr) {
+        this.manifest = yaml.parse(manifestStr);
+    }
+    get resources() {
+        return this.manifest.resources;
+    }
+    get app() {
+        return this.manifest.app;
+    }
+    /**
+     * 根据key获取执行的function名称
+     * @param key
+     * @returns
+     */
+    getFunctionByKey(key) {
+        var _a, _b, _c, _d, _e;
+        const { modules } = this.manifest;
+        for (const k in modules) {
+            if (k === 'function') {
+                continue;
+            }
+            else if (k === 'importer') {
+                // importer扩展点需要判断function和validate
+                if (key === ((_a = modules[k]) === null || _a === void 0 ? void 0 : _a.function) || key === ((_b = modules[k]) === null || _b === void 0 ? void 0 : _b.validate)) {
+                    return (_c = modules === null || modules === void 0 ? void 0 : modules.function) === null || _c === void 0 ? void 0 : _c.find(v => v.key === key);
+                }
+            }
+            else if (Array.isArray(modules[k])) {
+                const targetModule = (_d = modules[k]) === null || _d === void 0 ? void 0 : _d.find(v => v.key === key);
+                if (targetModule) {
+                    return (_e = modules === null || modules === void 0 ? void 0 : modules.function) === null || _e === void 0 ? void 0 : _e.find(v => v.key === targetModule.function);
+                }
+            }
+        }
+    }
+    /**
+     * 获取function下的文件列表
+     * @returns
+     */
+    getFunctionFiles() {
+        var _a, _b;
+        const fileNames = new Set();
+        (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.forEach(({ handler }) => {
+            const filename = handler.split('.')[0];
+            fileNames.add(filename);
+        });
+        return [...fileNames];
+    }
+}
+
+const getManifest = async () => {
     const manifestFile = path__default["default"].resolve('./manifest.yml');
     const strBuffer = await fse__default["default"].readFile(manifestFile);
-    const obj = yaml.parse(strBuffer.toString());
-    return obj;
+    return new Manifest(strBuffer.toString());
 };
 
 var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
-    const manifest = await getManifestObject();
-    const { app: { version, key }, } = manifest;
+    const manifest = await getManifest();
+    const { version, key } = manifest.app;
     if (!key) {
         console.error('manifest app key is required');
         return;
@@ -360,18 +407,35 @@ class DockerService {
     }
 }
 
-const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+const watchFiles = async (options) => {
+    const { inputDir, outputDir } = options;
+    const manifest = await getManifest();
+    const functionFiles = manifest.getFunctionFiles();
+    for (const fileName of functionFiles) {
+        const filePath = path__default["default"].join(inputDir, fileName);
+        const watcher = chokidar__default["default"].watch(filePath);
+        watcher.on('change', () => {
+            appsBundler.bundle({
+                inputDir,
+                outputDir,
+                fileName,
+                mode: appsBundler.MODE.DEV,
+            });
+        });
+    }
+};
+
 var run = async (options) => {
-    const { imageName } = options;
+    const { imageName, inputDir, outputDir } = options;
     const dockerService = new DockerService(imageName);
+    await dockerService.downloadImage();
+    await dockerService.runContainer();
     process.on('SIGINT', () => {
         console.log('process,SIGINT');
         dockerService.removeContainer();
         process.exit();
     });
-    await dockerService.downloadImage();
-    await dockerService.runContainer();
-    await sleep(30000);
+    await watchFiles({ inputDir, outputDir });
 };
 
 const image = {
@@ -398,5 +462,5 @@ program
     .option('-o --output [dir]', 'output dir')
     .action(build);
 program.command('create [name]').action(create);
-program.command('dev').action(dev);
+program.command('dev').option('-i --input [dir]', 'input dir').option('-o --output [dir]', 'output dir').action(dev);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.1.17-alpha.0",
+  "version": "0.1.18-alpha.0",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@giteeteam/apps-bundler": "^0.1.7",
+    "@giteeteam/apps-manifest": "^0.1.0",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -57,5 +58,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "2151038acb5e1e9695f11009e542187839482907"
+  "gitHead": "0b6fe536c2487a1f43e9d373bd2dc2f800c8ae92"
 }