support include in dubbo.json to specify provider interfaces

dubbo.json

@@ -3,5 +3,6 @@
   "entry": "com.alibaba.dubbo.demo",
   "entryJarPath": "./java/dubbo-demo/dubbo-demo-api/target/dubbo-demo-api-2.5.7.jar",
   "libDirPath": "./java/dubbo-demo/dubbo-demo-api/target/dependency/",
-  "providerSuffix":"Service"
+  "providerSuffix":"Service",
+  "include": ".*DemoProviderInterface|.*myDubboService"
 }

packages/interpret-cli/src/ext/index.ts

@@ -29,15 +29,26 @@ const startFlag = 'Output at:';
  */
 export async function extra(extraParam: IDubboExtInfo): Promise<IExtraResult> {
   await checkConfigPath([extraParam.entryJarPath, extraParam.libDirPath]);
+  await checkConfigPath([extraParam.entryJarPath, extraParam.libDirPath]);
+  let params = ['-jar',
+    join(__dirname, '../../ext/jexpose-1.4.jar'),
+    '-t',
+    extraParam.entry,
+    '-j',
+    extraParam.entryJarPath,
+    '-l',
+    extraParam.libDirPath];
+  if (extraParam.providerSuffix) {
+    params.push("-s");
+    params.push(extraParam.providerSuffix)
+  }
+  if (extraParam.include) {
+    params.push("-i");
+    params.push(extraParam.include)
+  }
+
   return new Promise<IExtraResult>(async (resolve, reject) => {
-    let execCmd = spawn(`java`, [
-      '-jar',
-      join(__dirname, '../../ext/jexpose-1.3.jar'),
-      extraParam.entry,
-      extraParam.entryJarPath,
-      extraParam.libDirPath,
-      extraParam.providerSuffix || 'Provider',
-    ]);
+    let execCmd = spawn(`java`, params);
 
     let err: string = '';
     let jarDir: string = '';

packages/interpret-cli/src/handle.ts

@@ -64,6 +64,10 @@ export class IntepretHandle implements ITypeSearch {
     return this.request.providerSuffix;
   }
 
+  get include(): string {
+    return this.request.include;
+  }
+
   public async work() {
     await this.prepare();
     await this.doItRecursively();

packages/interpret-cli/src/request.ts

@@ -89,6 +89,11 @@ export class Request {
     return this.config.providerSuffix || 'Provider';
   }
 
+
+  get include(): string {
+    return this.config.include || '';
+  }
+
   registerTypeInfo(typeInfoItem: TypeInfoI) {
     let key = '';
     if (typeInfoItem.classPath) {

packages/interpret-cli/src/transfer/to-typescript.ts

@@ -38,6 +38,16 @@ export async function toTypescript(
   let {sourceFile, astJava} = intepretHandle;
 
   let lastPointIndex = astJava.name.lastIndexOf('.') + 1;
+  let isProvider = false;
+  if (intepretHandle.providerSuffix && astJava.name.endsWith(String(intepretHandle.providerSuffix))) {
+    isProvider = true;
+  }
+  if (intepretHandle.include ) {
+    var reg = new RegExp(intepretHandle.include);
+    if (reg.test(astJava.name)) {
+      isProvider = true;
+    }
+  }
   let typeInfo = {
     classPath: astJava.name,
     packagePath: astJava.name.substring(0, lastPointIndex),
@@ -46,7 +56,7 @@ export async function toTypescript(
     isAbstract: astJava.isAbstract,
     isInterface: astJava.isInterface,
     isClass: !astJava.isEnum && !astJava.isInterface,
-    isProvider: astJava.name.endsWith(String(intepretHandle.providerSuffix) || 'Provider'),
+    isProvider: isProvider,
   };
   intepretHandle.request.registerTypeInfo(typeInfo);
 

packages/interpret-cli/src/typings.ts

@@ -29,6 +29,8 @@ export interface IDubboExtInfo {
   libDirPath: string;
   //provider后缀名可配置,默认值 Provider
   providerSuffix?: string;
+  //provider正则
+  include?: string;
 }
 
 export interface IConfig extends IDubboExtInfo {