refactor: add keep case args (#5)

Author: czy88840616

README.md

@@ -42,11 +42,17 @@ $ tsproto --path ./hero-proto
 Output:
 
 ```ts
-import { Metadata } from '@grpc/grpc-js';
+import * as grpc from '@midwayjs/grpc';
 
 export namespace hero {
-  export interface HeroesService {
-    findOne(data: HeroById, metadata?: Metadata): Promise<Hero>;
+  export interface HeroService {
+    findOne(data: HeroById): Promise<Hero>;
+  }
+  /**
+   * HeroService client interface
+   */
+  export interface HeroServiceClient {
+    findOne(options?: grpc.IClientOptions): grpc.IClientUnaryService<HeroById, Hero>;
   }
   export interface HeroById {
     id?: number;
@@ -56,6 +62,8 @@ export namespace hero {
     name?: string;
   }
 }
+
+
 ```
 
 ## Usage
@@ -91,4 +99,5 @@ The following options are available:
                                       [array] [default: ["node_modules","dist"]]
   --comments, -c  Add comments from proto              [boolean] [default: true]
   --verbose       Log all output to console            [boolean] [default: true]
+  --keepCase, -k  keep property case                   [boolean] [default: true]
 ```

bin/tsproto.js

@@ -9,7 +9,7 @@ const options = {
   output: null,
   target: ['.proto'],
   ignore: ['node_modules', 'dist'],
-  keepCase: false,
+  keepCase: true,
   comments: true,
   verbose: true,
 };
@@ -56,6 +56,12 @@ const cli = usage('Extract and merge locale files.\nUsage: $0 [options]')
     default: options.verbose,
     type: 'boolean',
   })
+  .option('keepCase', {
+    alias: 'k',
+    describe: 'keep property case',
+    default: options.keepCase,
+    type: 'boolean',
+  })
   .demandOption(
     ['path'],
     red.bold(

test/fixtures/hello_stream.proto renamed to test/fixtures/common/hello_stream.proto

@@ -0,0 +1,28 @@
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+syntax = "proto3";
+
+package hello;
+
+service Service {
+  rpc SayHello( HelloRequest ) returns( HelloResponse ) {}
+}
+
+message HelloRequest {
+  int32  key_filed = 1;
+}
+
+message HelloResponse {
+  string value_filed = 2;
+}

test/fixtures/helloworld.proto renamed to test/fixtures/common/helloworld.proto

@@ -6,18 +6,18 @@ import { remove, readFileSync } from 'fs-extra';
 describe('/test/index.test.ts', () => {
   it('test generate ts interface', async () => {
     const compiler = new Compiler({
-      path: ['test/fixtures'],
+      path: ['test/fixtures/common'],
       target: ['.proto'],
       ignore: ['node_modules', 'dist'],
     });
 
     compiler.compile();
 
-    expect(existsSync(join(__dirname, './fixtures/hero.ts'))).toBeTruthy();
-    expect(existsSync(join(__dirname, './fixtures/helloworld.ts'))).toBeTruthy();
-    expect(existsSync(join(__dirname, './fixtures/math.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/hero.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/helloworld.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/math.ts'))).toBeTruthy();
 
-    const content = readFileSync(join(__dirname, './fixtures/math.ts'), 'utf8');
+    const content = readFileSync(join(__dirname, './fixtures/common/math.ts'), 'utf8');
     expect(content.includes('add(data: AddArgs): Promise<Num>;')).toBeTruthy();
     expect(content.includes('addMore(data: AddArgs): Promise<void>;')).toBeTruthy();
     expect(content.includes('sumMany(data: AddArgs): Promise<void>;')).toBeTruthy();
@@ -32,26 +32,44 @@ describe('/test/index.test.ts', () => {
     expect(content.includes('addMany(options?: grpc.IClientOptions): grpc.IClientWritableStreamService<AddArgs, Num>;')).toBeTruthy();
     expect(content.includes('addEmpty(options?: grpc.IClientOptions): grpc.IClientUnaryService<any, any>;')).toBeTruthy();
 
-    await remove(join(__dirname, './fixtures/hero.ts'));
-    await remove(join(__dirname, './fixtures/helloworld.ts'));
-    await remove(join(__dirname, './fixtures/math.ts'));
-    await remove(join(__dirname, './fixtures/hello_stream.ts'));
+    await remove(join(__dirname, './fixtures/common/hero.ts'));
+    await remove(join(__dirname, './fixtures/common/helloworld.ts'));
+    await remove(join(__dirname, './fixtures/common/math.ts'));
+    await remove(join(__dirname, './fixtures/common/hello_stream.ts'));
   });
 
   it('test generate ts interface to specified directory', async () => {
     const compiler = new Compiler({
-      path: ['test/fixtures'],
+      path: ['test/fixtures/common'],
       target: ['.proto'],
       ignore: ['node_modules', 'dist'],
-      output: 'test/fixtures/domain'
+      output: 'test/fixtures/common/domain'
     });
 
     compiler.compile();
 
-    expect(existsSync(join(__dirname, './fixtures/domain/hero.ts'))).toBeTruthy();
-    expect(existsSync(join(__dirname, './fixtures/domain/helloworld.ts'))).toBeTruthy();
-    expect(existsSync(join(__dirname, './fixtures/domain/math.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/domain/hero.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/domain/helloworld.ts'))).toBeTruthy();
+    expect(existsSync(join(__dirname, './fixtures/common/domain/math.ts'))).toBeTruthy();
 
-    await remove(join(__dirname, './fixtures/domain'));
+    await remove(join(__dirname, './fixtures/common/domain'));
+  });
+
+  it('test generate ts interface keep case', async () => {
+    const compiler = new Compiler({
+      path: ['test/fixtures/keep_case'],
+      target: ['.proto'],
+      ignore: ['node_modules', 'dist'],
+      output: 'test/fixtures/keep_case/domain',
+      keepCase: true,
+    });
+
+    compiler.compile();
+
+    expect(existsSync(join(__dirname, './fixtures/keep_case/domain/helloworld_keep_case.ts'))).toBeTruthy();
+    const content = readFileSync(join(__dirname, './fixtures/keep_case/domain/helloworld_keep_case.ts'), 'utf8');
+    expect(content.includes('key_filed')).toBeTruthy();
+
+    await remove(join(__dirname, './fixtures/keep_case/domain'));
   });
 });