@giteeteam/apps-cli 0.1.16 → 0.1.17

package/dist/index.js

@@ -9,11 +9,13 @@ var archiver = require('archiver');
 var ora = require('ora');
 var yaml = require('yaml');
 var inquirer = require('inquirer');
-var simpleGit = require('simple-git');
 var uuid = require('uuid');
+var simpleGit = require('simple-git');
 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 }; }
 
@@ -25,8 +27,10 @@ var inquirer__default = /*#__PURE__*/_interopDefaultLegacy(inquirer);
 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.16";
+var version = "0.1.17";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -86,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,
@@ -117,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$1 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
-    const manifest = await getManifestObject();
-    const { app: { version, key }, } = manifest;
+var run$2 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
+    const manifest = await getManifest();
+    const { version, key } = manifest.app;
     if (!key) {
         console.error('manifest app key is required');
         return;
@@ -163,7 +212,7 @@ var run$1 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
 const defaultCopyFiles = ['manifest.yml'];
 var build = async (options) => {
     const { input = 'src', output = 'dist', prod, copy = [], zip } = options;
-    await run$1({
+    await run$2({
         outputDir: path__default["default"].resolve(output),
         inputDir: path__default["default"].resolve(input),
         prod: !!prod,
@@ -276,7 +325,7 @@ const dependenciesInstall = async (projectPath) => {
         succeed: 'Install dependencies success!',
     }, () => command.executeCommand('yarn', ['install'], projectPath));
 };
-var run = async (options) => {
+var run$1 = async (options) => {
     const { cwd, packageName } = options;
     const projectPath = path__default["default"].join(cwd, packageName);
     if (await fse__default["default"].pathExists(projectPath)) {
@@ -324,12 +373,84 @@ var create = async (packageName) => {
         console.error('Please input your project name');
         return;
     }
-    await run({
+    await run$1({
         cwd,
         packageName,
     });
 };
 
+const containerName = 'cli-dev-apps-runtime-server';
+class DockerService {
+    constructor(imageName) {
+        this.imageName = imageName;
+    }
+    async downloadImage() {
+        await this.execPromise(`docker pull ${this.imageName}`);
+    }
+    async runContainer() {
+        const command = `docker run -d -p 8455:8455 -e PORT=8455 --name ${containerName} ${this.imageName}`;
+        await this.execPromise(command);
+    }
+    async removeContainer() {
+        await this.execPromise(`docker rm -f ${containerName}`);
+    }
+    execPromise(cmd) {
+        return new Promise(resolve => {
+            child_process__default["default"].exec(cmd, (err, stdout, stderr) => {
+                resolve({
+                    err: err,
+                    stdout: stdout,
+                    stderr: stderr,
+                });
+            });
+        });
+    }
+}
+
+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, 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 watchFiles({ inputDir, outputDir });
+};
+
+const image = {
+    repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
+    tag: '2.5.0-alpha-41',
+};
+var dev = async (options) => {
+    const { input = 'src', output = 'dist' } = options;
+    await run({
+        imageName: `${image.repository}:${image.tag}`,
+        outputDir: path__default["default"].resolve(output),
+        inputDir: path__default["default"].resolve(input),
+    });
+};
+
 const program = new commander.Command();
 program.version(version).description('Giteeteam Apps Cli');
 program
@@ -341,4 +462,5 @@ program
     .option('-o --output [dir]', 'output dir')
     .action(build);
 program.command('create [name]').action(create);
+program.command('dev').action(dev);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -39,8 +39,10 @@
   },
   "dependencies": {
     "@giteeteam/apps-bundler": "^0.1.7",
+    "@giteeteam/apps-manifest": "^0.0.1",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
+    "chokidar": "^3.5.3",
     "commander": "^9.3.0",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
@@ -56,5 +58,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "ed0a34bda70ee112ec04caf0ee75247c912b0d5b"
+  "gitHead": "d8d5a8bac2ee65541cd015e3f2bb574caecf39fb"
 }