fix: dev pack clean (#141)

* fix: dev pack clean * fix: get function list
midwayjs · Apr 23, 2020 · d2731c8 · d2731c8
1 parent c1e5d0a
commit d2731c8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/packages/faas-cli-command-core/src/core.ts b/packages/faas-cli-command-core/src/core.ts
@@ -434,7 +434,7 @@ export class CommandHookCore implements ICommandHooksCore {
 
   debug(...args) {
 
-    const verbose = this.options.options.V || this.options.options.verbose;
+    const verbose = this.options.options.V || this.options.options.verbose || process.env.MIDWAY_FAAS_VERBOSE;
     if (!verbose) {
         return;
     }

diff --git a/packages/faas-cli-plugin-invoke/src/index.ts b/packages/faas-cli-plugin-invoke/src/index.ts
@@ -226,6 +226,7 @@ export class FaaSInvokePlugin extends BasePlugin {
     const specFile = this.core.config.specFile.path;
     // 只有当非首次调用时才会进行增量分析，其他情况均进行全量分析
     if (existsSync(buildLockPath)) {
+      this.core.debug('buildLockPath', buildLockPath);
       this.fileChanges = await compareFileChange(
         [
           specFile,
@@ -253,6 +254,7 @@ export class FaaSInvokePlugin extends BasePlugin {
       //   this.getAnaLysisCodeInfo();
       // }
     }
+    this.core.debug('fileChanges', this.fileChanges);
     this.setLock(this.buildLockPath, LOCK_TYPE.WAITING);
   }
 
@@ -419,6 +421,7 @@ export class FaaSInvokePlugin extends BasePlugin {
         // ts模式 midway-core 会默认加载入口文件所在目录下的 src 目录里面的ts代码
         // 因此通过软连接的形式将其与原代码目录进行绑定
         const symlinkPath = resolve(this.buildDir, 'src');
+        this.core.debug('tsMode symlink', symlinkPath);
         if (!existsSync(symlinkPath)) {
           symlinkSync(this.codeAnalyzeResult.tsCodeRoot, resolve(this.buildDir, 'src'));
         }

diff --git a/packages/faas-cli-plugin-invoke/src/invoke.ts b/packages/faas-cli-plugin-invoke/src/invoke.ts
@@ -16,14 +16,14 @@ export interface InvokeOptions {
 export const getFunction = (getOptions) => {
   return async (options: any) => {
     const baseDir = options.functionDir || process.cwd();
-    const specFile = getSpecFile(baseDir);
+    const specFile = getOptions.specFile || getSpecFile(baseDir);
     const core = new CommandHookCore({
       config: {
         servicePath: baseDir,
         specFile
       },
       commands: ['invoke'],
-      service: loadSpec(baseDir, specFile),
+      service: getOptions.spec || loadSpec(baseDir, specFile),
       provider: '',
       options: {
         function: options.functionName,
@@ -63,11 +63,23 @@ export interface IGetFuncList {
   functionDir?: string; // 函数所在目录
   sourceDir?: string; // 一体化目录结构下，函数的目录，比如 src/apis，这个影响到编译
   verbose?: boolean; // 输出更多信息
+  [key: string]: any;
 }
 export async function getFuncList (options: IGetFuncList) {
+  const baseDir = options.functionDir || process.cwd();
+  const specFile = getSpecFile(baseDir);
+  const spec = loadSpec(baseDir, specFile);
+  // 如果spec中有functions，就不走代码分析
+  if (spec.functions) {
+    return spec.functions;
+  }
   const invokeFun = getFunction({
     stopLifecycle: 'invoke:analysisCode',
-    key: 'functions'
+    key: 'functions',
+    specFile,
+    spec
   });
+  options.clean = false;
+  options.incremental = true;
   return invokeFun(options);
 }