Merge branch 'master' of https://github.com/TencentCloudBase/cloudbase-framework

Author: binggg

packages/framework-core/src/index.ts

@@ -22,7 +22,11 @@ export { CloudApi } from "./api";
 export * from "./types";
 
 const packageInfo = require("../package");
-const SUPPORT_COMMANDS = ["deploy", "compile"];
+const SUPPORT_COMMANDS = ["deploy", "compile", "run"];
+
+interface CommandParams {
+  runCommand?: string
+}
 
 export async function run(
   {
@@ -33,7 +37,8 @@ export async function run(
     resourceProviders,
   }: CloudbaseFrameworkConfig,
   command: "deploy" = "deploy",
-  module?: string
+  module?: string,
+  params?: CommandParams
 ) {
   const logger = getLogger(logLevel);
 
@@ -113,7 +118,7 @@ export async function run(
     await pluginManager.init(module);
     await pluginManager.build(module);
     const compileResult = await pluginManager.compile(module);
-    await samManager.generate(
+    samManager.generate(
       samMeta,
       JSON.parse(JSON.stringify(compileResult))
     );
@@ -124,10 +129,12 @@ export async function run(
     await pluginManager.build(module);
 
     const compileResult = await pluginManager.compile(module);
-    await samManager.generate(
+    samManager.generate(
       samMeta,
       JSON.parse(JSON.stringify(compileResult))
     );
+  } else if (command === "run") {
+    await pluginManager.run(module, params?.runCommand);
   }
 
   logger.info("✨ done");

packages/framework-core/src/plugin-manager/index.ts

@@ -26,7 +26,7 @@ interface PluginHookOption {
   icon?: string;
 }
 
-type PluginHookName = "init" | "build" | "deploy" | "compile";
+type PluginHookName = "init" | "build" | "deploy" | "compile" | "run";
 
 /**
  * 插件管理器
@@ -76,7 +76,7 @@ export default class PluginManager {
   }
 
   /**
-   * 部署
+   * 编译
    *
    * @param id
    */
@@ -99,6 +99,19 @@ export default class PluginManager {
     });
   }
 
+  /**
+   * 执行本地命令
+   * 
+   * @param id
+   */
+  async run(id?: string, runCommand?: string) {
+    return this.callPluginHook("run", {
+      id,
+      params: { runCommand },
+      icon: emoji("🚢"),
+    });
+  }
+
   /**
    * 调用插件钩子
    * @param id

packages/framework-core/src/plugin/index.ts

@@ -72,6 +72,13 @@ export default abstract class Plugin {
    */
   abstract compile?(params: any): Promise<any>;
 
+  /**
+   * 执行本地命令
+   * 
+   * @param params 参数信息
+   */
+  abstract run?(params: any): Promise<any>;
+
   /**
    *
    * 移除资源

packages/framework-plugin-container/src/index.ts

@@ -71,6 +71,11 @@ class ContainerPlugin extends Plugin {
     this.api.logger.debug("ContainerPlugin: init", this.resolvedInputs);
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-dart/src/index.ts

@@ -44,6 +44,11 @@ class DartPlugin extends Plugin {
     return this.containerPlugin.compile();
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-database/src/index.ts

@@ -51,6 +51,11 @@ class DatabasePlugin extends Plugin {
     this.api.logger.debug("DatabasePlugin: init", this.resolvedInputs);
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-function/src/index.ts

@@ -107,6 +107,11 @@ class FunctionPlugin extends Plugin {
     };
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-node/src/index.ts

@@ -67,6 +67,11 @@ class NodePlugin extends Plugin {
     return this.pluginImpl.compile(params);
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-node/src/node-container-impl.ts

@@ -46,6 +46,11 @@ class NodeContainerPlugin extends Plugin {
     return this.containerPlugin.compile();
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */

packages/framework-plugin-node/src/node-function-impl.ts

@@ -45,6 +45,11 @@ class NodeFunctionPlugin extends Plugin {
     return this.functionPlugin.compile();
   }
 
+  /**
+   * 执行本地命令
+   */
+  async run() {}
+
   /**
    * 删除资源
    */