@giteeteam/apps-cli 0.2.6 → 0.2.8

package/dist/index.js

@@ -31,7 +31,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.2.6";
+var version = "0.2.8";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -118,8 +118,9 @@ const execActionWithSpinner = async (message, action) => {
 };
 
 class Manifest {
-    constructor(manifestStr) {
-        this.manifest = yaml.parse(manifestStr);
+    constructor(manifestString) {
+        this.manifest = yaml.parse(manifestString);
+        this.manifestString = manifestString;
     }
     get resources() {
         return this.manifest.resources;
@@ -127,13 +128,63 @@ class Manifest {
     get app() {
         return this.manifest.app;
     }
+    get tables() {
+        return this.manifest.tables;
+    }
+    getManifest() {
+        return this.manifest;
+    }
+    getManifestString() {
+        return this.manifestString;
+    }
+    /**
+     * 获取所有自定义事项类型
+     */
+    getCustomItemType() {
+        const { modules } = this.manifest;
+        return modules.customItemType || [];
+    }
+    /**
+     * 获取所有自定义字段类型
+     */
+    getCustomFieldType() {
+        const { modules } = this.manifest;
+        return modules.customFieldType || [];
+    }
+    /**
+     * 获取所有自定义字段
+     */
+    getCustomField() {
+        const { modules } = this.manifest;
+        return modules.customField || [];
+    }
     /**
-     * 根据key获取执行的function名称
+     * 根据key获取执行的function
      * @param key
      * @returns
      */
     getFunctionByKey(key) {
-        var _a, _b, _c, _d, _e;
+        const functionKey = this.getFunctionKeyByKey(key);
+        if (functionKey) {
+            return this.getFunctionByFunctionKey(functionKey);
+        }
+    }
+    /**
+     * 根据functionKey获取执行的function
+     * @param functionKey
+     * @returns
+     */
+    getFunctionByFunctionKey(functionKey) {
+        var _a, _b;
+        return (_b = (_a = this.manifest.modules) === null || _a === void 0 ? void 0 : _a.function) === null || _b === void 0 ? void 0 : _b.find(f => f.key === functionKey);
+    }
+    /**
+     * 根据key获取执行的functionKey
+     * @param key
+     * @returns
+     */
+    getFunctionKeyByKey(key) {
+        var _a, _b, _c;
         const { modules } = this.manifest;
         for (const k in modules) {
             if (k === 'function') {
@@ -142,13 +193,13 @@ class Manifest {
             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);
+                    return key;
                 }
             }
             else if (Array.isArray(modules[k])) {
-                const targetModule = (_d = modules[k]) === null || _d === void 0 ? void 0 : _d.find(v => v.key === key);
+                const targetModule = (_c = modules[k]) === null || _c === void 0 ? void 0 : _c.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);
+                    return targetModule.function;
                 }
             }
         }
@@ -168,6 +219,14 @@ class Manifest {
     }
 }
 
+var Triggers;
+(function (Triggers) {
+    Triggers["appInstall"] = "proxima:app:install";
+    Triggers["appUninstall"] = "proxima:app:uninstall";
+    Triggers["appUpdate"] = "proxima:app:update";
+    Triggers["itemChange"] = "proxima:item:change";
+})(Triggers || (Triggers = {}));
+
 const getManifest = async () => {
     const manifestFile = path__default["default"].resolve('manifest.yml');
     const strBuffer = await fse__default["default"].readFile(manifestFile);
@@ -436,10 +495,11 @@ const watchFiles = async (options) => {
     // 监听整个文件夹，有一个文件改动，则全部重新build
     // TODO 解析出文件之间的依赖关系，提升构建速度
     const watcher = chokidar__default["default"].watch(inputDir);
-    watcher.on('change', () => {
+    console.log(`watch: ${inputDir}`);
+    watcher.on('change', path => {
         clearTimeout(timer);
         timer = setTimeout(() => {
-            console.log(`build ${inputDir}`);
+            console.log(`${path} has change`);
             build(functionFiles, inputDir, outputDir);
         }, 1000);
     });
@@ -448,7 +508,7 @@ const watchFiles = async (options) => {
 var _a, _b;
 const image = {
     repository: 'registry.baidubce.com/proxima/proxima-apps-runtime-server',
-    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : '2.7.0-alpha-45',
+    tag: (_a = process.env.IMAGE_TAG) !== null && _a !== void 0 ? _a : 'latest',
 };
 const containerPort = Number((_b = process.env.CONTAINER_PORT) !== null && _b !== void 0 ? _b : 8455);
 const containerName = 'cli-dev-apps-runtime-server';
@@ -457,7 +517,7 @@ const tempAppDir = `${tempApp}/server-side`;
 const containerEnv = {
     PORT: containerPort,
     APPS_DIR: '/usr/src/app/apps',
-    LRU_TTL: 0,
+    LRU_TTL: 1,
     DEBUG: 'runtime*',
     PARSE_PUBLIC_SERVER_URL: process.env.PARSE_PUBLIC_SERVER_URL,
     PARSE_SERVER_MASTER_KEY: process.env.PARSE_SERVER_MASTER_KEY,
@@ -473,18 +533,20 @@ const copyManifest = async (appDir) => {
     await fse__default["default"].copy(manifestFile, targetFile);
 };
 var run = async (options) => {
-    const { inputDir, outputDir } = options;
+    const { inputDir, outputDir, server } = options;
     await fse__default["default"].emptyDir(outputDir);
     const imageName = `${image.repository}:${image.tag}`;
     const appDir = path__default["default"].join(outputDir, tempAppDir);
     const dockerService = new DockerService(imageName);
-    await dockerService.downloadImage();
-    await dockerService.runContainer({
-        port: containerPort,
-        env: containerEnv,
-        volume: [`${outputDir}:/usr/src/app/apps`],
-        name: containerName,
-    });
+    if (server) {
+        await dockerService.downloadImage();
+        await dockerService.runContainer({
+            port: containerPort,
+            env: containerEnv,
+            volume: [`${outputDir}:/usr/src/app/apps`],
+            name: containerName,
+        });
+    }
     process.on('SIGINT', async () => {
         await dockerService.removeContainer(containerName);
         await fse__default["default"].remove(outputDir);
@@ -492,15 +554,18 @@ var run = async (options) => {
     });
     await copyManifest(appDir);
     await watchFiles({ inputDir, outputDir: appDir });
-    console.log('You can use this url for test:');
-    console.log(`POST http://localhost:${containerPort}/v1/apps${tempApp}/functions/:key`);
+    if (server) {
+        console.log('You can use this url for test:');
+        console.log(`POST http://localhost:${containerPort}/v1/apps${tempApp}/functions/:key`);
+    }
 };
 
 var dev = async (options) => {
-    const { input = 'src', output = 'cache' } = options;
+    const { input = 'src', output = 'cache', server = true } = options;
     await run({
         outputDir: path__default["default"].resolve(output),
         inputDir: path__default["default"].resolve(input),
+        server,
     });
 };
 
@@ -519,5 +584,6 @@ program
     .command('dev')
     .option('-i --input [dir]', 'input dir')
     .option('-o --output [dir]', 'output dir,default cache')
+    .option('--no-server', 'no server')
     .action(dev);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@giteeteam/apps-bundler": "^0.1.7",
-    "@giteeteam/apps-manifest": "^0.1.0",
+    "@giteeteam/apps-manifest": "^0.1.1",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -58,6 +58,5 @@
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
-  },
-  "gitHead": "f32eb236ef8765f6788e9906416745043cf76158"
+  }
 }