Include method parameters map (#158)

* add method parameters Keep track of the number of arguments of services * update test fixtures
creditkarma · May 24, 2019 · 187aec6 · 187aec6
1 parent 5ca9aaf
commit 187aec6
Show file tree

Hide file tree

Showing 15 changed files with 179 additions and 0 deletions.
diff --git a/src/main/render/shared/identifiers.ts b/src/main/render/shared/identifiers.ts
@@ -10,6 +10,8 @@ export const COMMON_IDENTIFIERS = {
     thrift: ts.createIdentifier('thrift'),
     methodNames: ts.createIdentifier('methodNames'),
     _methodNames: ts.createIdentifier('_methodNames'),
+    methodParameters: ts.createIdentifier('methodParameters'),
+    _methodParameters: ts.createIdentifier('_methodParameters'),
     serviceName: ts.createIdentifier('serviceName'),
     fieldAnnotations: ts.createIdentifier('fieldAnnotations'),
     methodAnnotations: ts.createIdentifier('methodAnnotations'),

diff --git a/src/main/render/thrift-server/service/client.ts b/src/main/render/thrift-server/service/client.ts
@@ -15,6 +15,8 @@ import {
     createStructResultName,
     renderMethodNamesProperty,
     renderMethodNamesStaticProperty,
+    renderMethodParametersProperty,
+    renderMethodParametersStaticProperty,
     renderServiceNameProperty,
     renderServiceNameStaticProperty,
 } from './utils'
@@ -84,11 +86,13 @@ export function renderClient(
     const staticAnnotations: ts.PropertyDeclaration = renderServiceAnnotationsStaticProperty()
     const staticMethodAnnotations: ts.PropertyDeclaration = renderMethodAnnotationsStaticProperty()
     const staticMethodNames: ts.PropertyDeclaration = renderMethodNamesStaticProperty()
+    const staticMethodParameters: ts.PropertyDeclaration = renderMethodParametersStaticProperty()
 
     const serviceName: ts.PropertyDeclaration = renderServiceNameProperty()
     const annotations: ts.PropertyDeclaration = renderServiceAnnotationsProperty()
     const methodAnnotations: ts.PropertyDeclaration = renderMethodAnnotationsProperty()
     const methodNames: ts.PropertyDeclaration = renderMethodNamesProperty()
+    const methodParameters: ts.PropertyDeclaration = renderMethodParametersProperty()
 
     const baseMethods: Array<ts.MethodDeclaration> = service.functions.map(
         (func: FunctionDefinition) => {
@@ -119,10 +123,12 @@ export function renderClient(
             staticAnnotations,
             staticMethodAnnotations,
             staticMethodNames,
+            staticMethodParameters,
             serviceName,
             annotations,
             methodAnnotations,
             methodNames,
+            methodParameters,
             ...createCtor(service),
             ...baseMethods,
         ], // body

diff --git a/src/main/render/thrift-server/service/index.ts b/src/main/render/thrift-server/service/index.ts
@@ -15,6 +15,7 @@ import {
     createStructArgsName,
     createStructResultName,
     renderMethodNames,
+    renderMethodParameters,
     renderServiceName,
 } from './utils'
 
@@ -51,6 +52,7 @@ export function renderService(
         renderServiceAnnotations(collectAllAnnotations(service, state)),
         renderMethodAnnotations(collectAllMethods(service, state)),
         renderMethodNames(service, state),
+        renderMethodParameters(service, state),
         ...renderArgsStruct(service, state),
         ...renderResultStruct(service, state),
         renderClient(service, state),

diff --git a/src/main/render/thrift-server/service/utils.ts b/src/main/render/thrift-server/service/utils.ts
@@ -165,6 +165,77 @@ export function renderMethodNamesStaticProperty(): ts.PropertyDeclaration {
     )
 }
 
+export function renderMethodParameters(
+    service: ServiceDefinition,
+    state: IRenderState,
+): ts.VariableStatement {
+    return ts.createVariableStatement(
+        [ts.createToken(ts.SyntaxKind.ExportKeyword)],
+        ts.createVariableDeclarationList(
+            [
+                ts.createVariableDeclaration(
+                    COMMON_IDENTIFIERS.methodParameters,
+                    ts.createTypeReferenceNode(
+                        '{ [methodName: string]: number }',
+                        undefined,
+                    ),
+                    ts.createObjectLiteral(
+                        [
+                            ...collectAllMethods(service, state).map(
+                                (next: FunctionDefinition) => {
+                                    return ts.createPropertyAssignment(
+                                        next.name.value,
+                                        ts.createLiteral(
+                                            next.fields.length + 1, // including context
+                                        ),
+                                    )
+                                },
+                            ),
+                        ],
+                        true,
+                    ),
+                ),
+            ],
+            ts.NodeFlags.Const,
+        ),
+    )
+}
+
+export function renderMethodParametersProperty(): ts.PropertyDeclaration {
+    return ts.createProperty(
+        undefined,
+        [
+            ts.createToken(ts.SyntaxKind.PublicKeyword),
+            ts.createToken(ts.SyntaxKind.ReadonlyKeyword),
+        ],
+        COMMON_IDENTIFIERS._methodParameters,
+        undefined,
+        ts.createTypeReferenceNode(
+            '{ [methodName: string]: number }',
+            undefined,
+        ),
+        COMMON_IDENTIFIERS.methodParameters,
+    )
+}
+
+export function renderMethodParametersStaticProperty(): ts.PropertyDeclaration {
+    return ts.createProperty(
+        undefined,
+        [
+            ts.createToken(ts.SyntaxKind.PublicKeyword),
+            ts.createToken(ts.SyntaxKind.StaticKeyword),
+            ts.createToken(ts.SyntaxKind.ReadonlyKeyword),
+        ],
+        COMMON_IDENTIFIERS.methodParameters,
+        undefined,
+        ts.createTypeReferenceNode(
+            '{ [methodName: string]: number }',
+            undefined,
+        ),
+        COMMON_IDENTIFIERS.methodParameters,
+    )
+}
+
 function getRawAnnotations(
     service: ServiceDefinition,
     state: IRenderState,

diff --git a/src/tests/unit/fixtures/thrift-server/annotations_service.solution.ts b/src/tests/unit/fixtures/thrift-server/annotations_service.solution.ts
@@ -144,6 +144,11 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getUser", "saveUser", "ping"];
+export const methodParameters: { [methodName: string]: number } = {
+    getUser: 2,
+    saveUser: 2,
+    ping: 1
+};
 export interface IGetUser__Args {
     __name: "GetUser__Args";
     id: number;
@@ -589,10 +594,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public getUser(id: number, context?: Context): Promise<IUser> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/basic_service.solution.ts b/src/tests/unit/fixtures/thrift-server/basic_service.solution.ts
@@ -132,6 +132,11 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getUser", "saveUser", "ping"];
+export const methodParameters: { [methodName: string]: number } = {
+    getUser: 2,
+    saveUser: 2,
+    ping: 1
+};
 export interface IGetUser__Args {
     __name: "GetUser__Args";
     id: number;
@@ -577,10 +582,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public getUser(id: number, context?: Context): Promise<IUser> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/basic_service.strict_union.solution.ts b/src/tests/unit/fixtures/thrift-server/basic_service.strict_union.solution.ts
@@ -172,6 +172,10 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getUser", "ping"];
+export const methodParameters: { [methodName: string]: number } = {
+    getUser: 2,
+    ping: 1
+};
 export interface IGetUser__Args {
     __name: "GetUser__Args";
     arg1: MyUnion;
@@ -461,10 +465,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public getUser(arg1: MyUnionArgs, context?: Context): Promise<string> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/generated-strict/SharedService.ts b/src/tests/unit/fixtures/thrift-server/generated-strict/SharedService.ts
@@ -22,6 +22,11 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getStruct", "getUnion", "getEnum"];
+export const methodParameters: { [methodName: string]: number } = {
+    getStruct: 2,
+    getUnion: 2,
+    getEnum: 1
+};
 export interface IGetStruct__Args {
     __name: "GetStruct__Args";
     key: number;
@@ -485,10 +490,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public getStruct(key: number, context?: Context): Promise<__NAMESPACE__.ISharedStruct> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/generated-strict/com/test/calculator/Calculator.ts b/src/tests/unit/fixtures/thrift-server/generated-strict/com/test/calculator/Calculator.ts
@@ -81,6 +81,25 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getStruct", "getUnion", "getEnum", "ping", "add", "addInt64", "addWithContext", "calculate", "echoBinary", "echoString", "checkName", "checkOptional", "mapOneList", "mapValues", "listToMap", "fetchThing", "zip"];
+export const methodParameters: { [methodName: string]: number } = {
+    getStruct: 2,
+    getUnion: 2,
+    getEnum: 1,
+    ping: 1,
+    add: 3,
+    addInt64: 3,
+    addWithContext: 3,
+    calculate: 3,
+    echoBinary: 2,
+    echoString: 2,
+    checkName: 2,
+    checkOptional: 2,
+    mapOneList: 2,
+    mapValues: 2,
+    listToMap: 2,
+    fetchThing: 1,
+    zip: 1
+};
 export interface IPing__Args {
     __name: "Ping__Args";
 }
@@ -2552,10 +2571,12 @@ export class Client<Context = any> extends __ROOT_NAMESPACE__.SharedService.Clie
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     constructor(connection: thrift.IThriftConnection<Context>) {
         super(connection);
     }

diff --git a/src/tests/unit/fixtures/thrift-server/generated/SharedService.ts b/src/tests/unit/fixtures/thrift-server/generated/SharedService.ts
@@ -22,6 +22,11 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getStruct", "getUnion", "getEnum"];
+export const methodParameters: { [methodName: string]: number } = {
+    getStruct: 2,
+    getUnion: 2,
+    getEnum: 1
+};
 export interface IGetStruct__Args {
     __name: "GetStruct__Args";
     key: number;
@@ -485,10 +490,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public getStruct(key: number, context?: Context): Promise<__NAMESPACE__.ISharedStruct> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/generated/com/test/calculator/Calculator.ts b/src/tests/unit/fixtures/thrift-server/generated/com/test/calculator/Calculator.ts
@@ -81,6 +81,25 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["getStruct", "getUnion", "getEnum", "ping", "add", "addInt64", "addWithContext", "calculate", "echoBinary", "echoString", "checkName", "checkOptional", "mapOneList", "mapValues", "listToMap", "fetchThing", "zip"];
+export const methodParameters: { [methodName: string]: number } = {
+    getStruct: 2,
+    getUnion: 2,
+    getEnum: 1,
+    ping: 1,
+    add: 3,
+    addInt64: 3,
+    addWithContext: 3,
+    calculate: 3,
+    echoBinary: 2,
+    echoString: 2,
+    checkName: 2,
+    checkOptional: 2,
+    mapOneList: 2,
+    mapValues: 2,
+    listToMap: 2,
+    fetchThing: 1,
+    zip: 1
+};
 export interface IPing__Args {
     __name: "Ping__Args";
 }
@@ -2552,10 +2571,12 @@ export class Client<Context = any> extends __ROOT_NAMESPACE__.SharedService.Clie
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     constructor(connection: thrift.IThriftConnection<Context>) {
         super(connection);
     }

diff --git a/src/tests/unit/fixtures/thrift-server/i64_service.solution.ts b/src/tests/unit/fixtures/thrift-server/i64_service.solution.ts
@@ -88,6 +88,10 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["peg", "pong"];
+export const methodParameters: { [methodName: string]: number } = {
+    peg: 2,
+    pong: 2
+};
 export interface IPeg__Args {
     __name: "Peg__Args";
     name: string;
@@ -412,10 +416,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public peg(name: string, context?: Context): Promise<string> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);

diff --git a/src/tests/unit/fixtures/thrift-server/resolved_field_service.solution.ts b/src/tests/unit/fixtures/thrift-server/resolved_field_service.solution.ts
@@ -8,6 +8,9 @@ export const methodAnnotations: thrift.IMethodAnnotations = {
     }
 };
 export const methodNames: Array<string> = ["ping"];
+export const methodParameters: { [methodName: string]: number } = {
+    ping: 2
+};
 export interface IPing__Args {
     __name: "Ping__Args";
     id: thrift.Int64;
@@ -169,10 +172,12 @@ export class Client<Context = any> extends thrift.ThriftClient<Context> {
     public static readonly annotations: thrift.IThriftAnnotations = annotations;
     public static readonly methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public static readonly methodNames: Array<string> = methodNames;
+    public static readonly methodParameters: { [methodName: string]: number } = methodParameters;
     public readonly _serviceName: string = serviceName;
     public readonly _annotations: thrift.IThriftAnnotations = annotations;
     public readonly _methodAnnotations: thrift.IMethodAnnotations = methodAnnotations;
     public readonly _methodNames: Array<string> = methodNames;
+    public readonly _methodParameters: { [methodName: string]: number } = methodParameters;
     public ping(id: number | string | thrift.Int64, context?: Context): Promise<void> {
         const writer: thrift.TTransport = new this.transport();
         const output: thrift.TProtocol = new this.protocol(writer);