Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow strings for enums, bytes, and Long in .d.ts #714

Merged
merged 1 commit into from
Jan 27, 2020
Merged

feat: allow strings for enums, bytes, and Long in .d.ts #714

merged 1 commit into from
Jan 27, 2020

Conversation

alexander-fenster
Copy link
Contributor

@alexander-fenster alexander-fenster commented Jan 27, 2020 •
edited
Loading

Fixes googleapis/gapic-generator-typescript#196, googleapis/nodejs-tasks#334, googleapis/nodejs-iot#250, googleapis/nodejs-scheduler#181, googleapis/nodejs-tasks#331 (and maybe more).

TL;DR

We will accept enum string values in TypeScript request and response types, just like our JavaScript samples suggest to do.

More details

In this PR I'm updating the compileProtos tool so that the request and response types accepted strings for enums, bytes, and Long. For enums, I'm using the magic keyof typeof TypeScript feature to only allow proper strings as values. For bytes, protobuf.js allows passing arbitrary string (it will base64-decode it). For Long, string is also accepted with our current set of options.

Example

This .d.ts file from Speech API will have the following changes. I verified that with these changes it's possible to pass a string (e.g. "FLAC") as an encoding.

diff --git a/protos/protos.d.ts b/protos/protos.d.ts
index 74cac6f..45cc6c8 100644
--- a/protos/protos.d.ts
+++ b/protos/protos.d.ts
@@ -312,7 +312,7 @@ export namespace google {
                     streamingConfig?: (google.cloud.speech.v1.IStreamingRecognitionConfig|null);
 
                     /** StreamingRecognizeRequest audioContent */
-                    audioContent?: (Uint8Array|null);
+                    audioContent?: (Uint8Array|string|null);
                 }
 
                 /** Represents a StreamingRecognizeRequest. */
@@ -328,7 +328,7 @@ export namespace google {
                     public streamingConfig?: (google.cloud.speech.v1.IStreamingRecognitionConfig|null);
 
                     /** StreamingRecognizeRequest audioContent. */
-                    public audioContent: Uint8Array;
+                    public audioContent: (Uint8Array|string);
 
                     /** StreamingRecognizeRequest streamingRequest. */
                     public streamingRequest?: ("streamingConfig"|"audioContent");
@@ -510,7 +510,7 @@ export namespace google {
                 interface IRecognitionConfig {
 
                     /** RecognitionConfig encoding */
-                    encoding?: (google.cloud.speech.v1.RecognitionConfig.AudioEncoding|null);
+                    encoding?: (google.cloud.speech.v1.RecognitionConfig.AudioEncoding|keyof typeof google.cloud.speech.v1.RecognitionConfig.AudioEncoding|null);
 
                     /** RecognitionConfig sampleRateHertz */
                     sampleRateHertz?: (number|null);
@@ -562,7 +562,7 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1.IRecognitionConfig);
 
                     /** RecognitionConfig encoding. */
-                    public encoding: google.cloud.speech.v1.RecognitionConfig.AudioEncoding;
+                    public encoding: (google.cloud.speech.v1.RecognitionConfig.AudioEncoding|keyof typeof google.cloud.speech.v1.RecognitionConfig.AudioEncoding);
 
                     /** RecognitionConfig sampleRateHertz. */
                     public sampleRateHertz: number;
@@ -801,19 +801,19 @@ export namespace google {
                 interface IRecognitionMetadata {
 
                     /** RecognitionMetadata interactionType */
-                    interactionType?: (google.cloud.speech.v1.RecognitionMetadata.InteractionType|null);
+                    interactionType?: (google.cloud.speech.v1.RecognitionMetadata.InteractionType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.InteractionType|null);
 
                     /** RecognitionMetadata industryNaicsCodeOfAudio */
                     industryNaicsCodeOfAudio?: (number|null);
 
                     /** RecognitionMetadata microphoneDistance */
-                    microphoneDistance?: (google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance|null);
+                    microphoneDistance?: (google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance|keyof typeof google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance|null);
 
                     /** RecognitionMetadata originalMediaType */
-                    originalMediaType?: (google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType|null);
+                    originalMediaType?: (google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType|null);
 
                     /** RecognitionMetadata recordingDeviceType */
-                    recordingDeviceType?: (google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType|null);
+                    recordingDeviceType?: (google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType|null);
 
                     /** RecognitionMetadata recordingDeviceName */
                     recordingDeviceName?: (string|null);
@@ -835,19 +835,19 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1.IRecognitionMetadata);
 
                     /** RecognitionMetadata interactionType. */
-                    public interactionType: google.cloud.speech.v1.RecognitionMetadata.InteractionType;
+                    public interactionType: (google.cloud.speech.v1.RecognitionMetadata.InteractionType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.InteractionType);
 
                     /** RecognitionMetadata industryNaicsCodeOfAudio. */
                     public industryNaicsCodeOfAudio: number;
 
                     /** RecognitionMetadata microphoneDistance. */
-                    public microphoneDistance: google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance;
+                    public microphoneDistance: (google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance|keyof typeof google.cloud.speech.v1.RecognitionMetadata.MicrophoneDistance);
 
                     /** RecognitionMetadata originalMediaType. */
-                    public originalMediaType: google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType;
+                    public originalMediaType: (google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.OriginalMediaType);
 
                     /** RecognitionMetadata recordingDeviceType. */
-                    public recordingDeviceType: google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType;
+                    public recordingDeviceType: (google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType|keyof typeof google.cloud.speech.v1.RecognitionMetadata.RecordingDeviceType);
 
                     /** RecognitionMetadata recordingDeviceName. */
                     public recordingDeviceName: string;
@@ -1065,7 +1065,7 @@ export namespace google {
                 interface IRecognitionAudio {
 
                     /** RecognitionAudio content */
-                    content?: (Uint8Array|null);
+                    content?: (Uint8Array|string|null);
 
                     /** RecognitionAudio uri */
                     uri?: (string|null);
@@ -1081,7 +1081,7 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1.IRecognitionAudio);
 
                     /** RecognitionAudio content. */
-                    public content: Uint8Array;
+                    public content: (Uint8Array|string);
 
                     /** RecognitionAudio uri. */
                     public uri: string;
@@ -1452,7 +1452,7 @@ export namespace google {
                     results?: (google.cloud.speech.v1.IStreamingRecognitionResult[]|null);
 
                     /** StreamingRecognizeResponse speechEventType */
-                    speechEventType?: (google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType|null);
+                    speechEventType?: (google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType|keyof typeof google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType|null);
                 }
 
                 /** Represents a StreamingRecognizeResponse. */
@@ -1471,7 +1471,7 @@ export namespace google {
                     public results: google.cloud.speech.v1.IStreamingRecognitionResult[];
 
                     /** StreamingRecognizeResponse speechEventType. */
-                    public speechEventType: google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType;
+                    public speechEventType: (google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType|keyof typeof google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType);
 
                     /**
                      * Creates a new StreamingRecognizeResponse instance using the specified properties.
@@ -2269,7 +2269,7 @@ export namespace google {
                     streamingConfig?: (google.cloud.speech.v1p1beta1.IStreamingRecognitionConfig|null);
 
                     /** StreamingRecognizeRequest audioContent */
-                    audioContent?: (Uint8Array|null);
+                    audioContent?: (Uint8Array|string|null);
                 }
 
                 /** Represents a StreamingRecognizeRequest. */
@@ -2285,7 +2285,7 @@ export namespace google {
                     public streamingConfig?: (google.cloud.speech.v1p1beta1.IStreamingRecognitionConfig|null);
 
                     /** StreamingRecognizeRequest audioContent. */
-                    public audioContent: Uint8Array;
+                    public audioContent: (Uint8Array|string);
 
                     /** StreamingRecognizeRequest streamingRequest. */
                     public streamingRequest?: ("streamingConfig"|"audioContent");
@@ -2467,7 +2467,7 @@ export namespace google {
                 interface IRecognitionConfig {
 
                     /** RecognitionConfig encoding */
-                    encoding?: (google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding|null);
+                    encoding?: (google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding|keyof typeof google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding|null);
 
                     /** RecognitionConfig sampleRateHertz */
                     sampleRateHertz?: (number|null);
@@ -2531,7 +2531,7 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1p1beta1.IRecognitionConfig);
 
                     /** RecognitionConfig encoding. */
-                    public encoding: google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding;
+                    public encoding: (google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding|keyof typeof google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding);
 
                     /** RecognitionConfig sampleRateHertz. */
                     public sampleRateHertz: number;
@@ -2777,19 +2777,19 @@ export namespace google {
                 interface IRecognitionMetadata {
 
                     /** RecognitionMetadata interactionType */
-                    interactionType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType|null);
+                    interactionType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType|null);
 
                     /** RecognitionMetadata industryNaicsCodeOfAudio */
                     industryNaicsCodeOfAudio?: (number|null);
 
                     /** RecognitionMetadata microphoneDistance */
-                    microphoneDistance?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance|null);
+                    microphoneDistance?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance|null);
 
                     /** RecognitionMetadata originalMediaType */
-                    originalMediaType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType|null);
+                    originalMediaType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType|null);
 
                     /** RecognitionMetadata recordingDeviceType */
-                    recordingDeviceType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType|null);
+                    recordingDeviceType?: (google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType|null);
 
                     /** RecognitionMetadata recordingDeviceName */
                     recordingDeviceName?: (string|null);
@@ -2798,7 +2798,7 @@ export namespace google {
                     originalMimeType?: (string|null);
 
                     /** RecognitionMetadata obfuscatedId */
-                    obfuscatedId?: (number|Long|null);
+                    obfuscatedId?: (number|Long|string|null);
 
                     /** RecognitionMetadata audioTopic */
                     audioTopic?: (string|null);
@@ -2814,19 +2814,19 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1p1beta1.IRecognitionMetadata);
 
                     /** RecognitionMetadata interactionType. */
-                    public interactionType: google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType;
+                    public interactionType: (google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType);
 
                     /** RecognitionMetadata industryNaicsCodeOfAudio. */
                     public industryNaicsCodeOfAudio: number;
 
                     /** RecognitionMetadata microphoneDistance. */
-                    public microphoneDistance: google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance;
+                    public microphoneDistance: (google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance);
 
                     /** RecognitionMetadata originalMediaType. */
-                    public originalMediaType: google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType;
+                    public originalMediaType: (google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType);
 
                     /** RecognitionMetadata recordingDeviceType. */
-                    public recordingDeviceType: google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType;
+                    public recordingDeviceType: (google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType|keyof typeof google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType);
 
                     /** RecognitionMetadata recordingDeviceName. */
                     public recordingDeviceName: string;
@@ -2835,7 +2835,7 @@ export namespace google {
                     public originalMimeType: string;
 
                     /** RecognitionMetadata obfuscatedId. */
-                    public obfuscatedId: (number|Long);
+                    public obfuscatedId: (number|Long|string);
 
                     /** RecognitionMetadata audioTopic. */
                     public audioTopic: string;
@@ -3053,7 +3053,7 @@ export namespace google {
                 interface IRecognitionAudio {
 
                     /** RecognitionAudio content */
-                    content?: (Uint8Array|null);
+                    content?: (Uint8Array|string|null);
 
                     /** RecognitionAudio uri */
                     uri?: (string|null);
@@ -3069,7 +3069,7 @@ export namespace google {
                     constructor(properties?: google.cloud.speech.v1p1beta1.IRecognitionAudio);
 
                     /** RecognitionAudio content. */
-                    public content: Uint8Array;
+                    public content: (Uint8Array|string);
 
                     /** RecognitionAudio uri. */
                     public uri: string;
@@ -3440,7 +3440,7 @@ export namespace google {
                     results?: (google.cloud.speech.v1p1beta1.IStreamingRecognitionResult[]|null);
 
                     /** StreamingRecognizeResponse speechEventType */
-                    speechEventType?: (google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType|null);
+                    speechEventType?: (google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType|keyof typeof google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType|null);
                 }
 
                 /** Represents a StreamingRecognizeResponse. */
@@ -3459,7 +3459,7 @@ export namespace google {
                     public results: google.cloud.speech.v1p1beta1.IStreamingRecognitionResult[];
 
                     /** StreamingRecognizeResponse speechEventType. */
-                    public speechEventType: google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType;
+                    public speechEventType: (google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType|keyof typeof google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType);
 
                     /**
                      * Creates a new StreamingRecognizeResponse instance using the specified properties.
@@ -5029,10 +5029,10 @@ export namespace google {
             number?: (number|null);
 
             /** FieldDescriptorProto label */
-            label?: (google.protobuf.FieldDescriptorProto.Label|null);
+            label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null);
 
             /** FieldDescriptorProto type */
-            type?: (google.protobuf.FieldDescriptorProto.Type|null);
+            type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null);
 
             /** FieldDescriptorProto typeName */
             typeName?: (string|null);
@@ -5069,10 +5069,10 @@ export namespace google {
             public number: number;
 
             /** FieldDescriptorProto label. */
-            public label: google.protobuf.FieldDescriptorProto.Label;
+            public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label);
 
             /** FieldDescriptorProto type. */
-            public type: google.protobuf.FieldDescriptorProto.Type;
+            public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type);
 
             /** FieldDescriptorProto typeName. */
             public typeName: string;
@@ -5847,7 +5847,7 @@ export namespace google {
             javaStringCheckUtf8?: (boolean|null);
 
             /** FileOptions optimizeFor */
-            optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null);
+            optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null);
 
             /** FileOptions goPackage */
             goPackage?: (string|null);
@@ -5920,7 +5920,7 @@ export namespace google {
             public javaStringCheckUtf8: boolean;
 
             /** FileOptions optimizeFor. */
-            public optimizeFor: google.protobuf.FileOptions.OptimizeMode;
+            public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode);
 
             /** FileOptions goPackage. */
             public goPackage: string;
@@ -6166,13 +6166,13 @@ export namespace google {
         interface IFieldOptions {
 
             /** FieldOptions ctype */
-            ctype?: (google.protobuf.FieldOptions.CType|null);
+            ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null);
 
             /** FieldOptions packed */
             packed?: (boolean|null);
 
             /** FieldOptions jstype */
-            jstype?: (google.protobuf.FieldOptions.JSType|null);
+            jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null);
 
             /** FieldOptions lazy */
             lazy?: (boolean|null);
@@ -6200,13 +6200,13 @@ export namespace google {
             constructor(properties?: google.protobuf.IFieldOptions);
 
             /** FieldOptions ctype. */
-            public ctype: google.protobuf.FieldOptions.CType;
+            public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType);
 
             /** FieldOptions packed. */
             public packed: boolean;
 
             /** FieldOptions jstype. */
-            public jstype: google.protobuf.FieldOptions.JSType;
+            public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType);
 
             /** FieldOptions lazy. */
             public lazy: boolean;
@@ -6705,7 +6705,7 @@ export namespace google {
             deprecated?: (boolean|null);
 
             /** MethodOptions idempotencyLevel */
-            idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null);
+            idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null);
 
             /** MethodOptions uninterpretedOption */
             uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null);
@@ -6733,7 +6733,7 @@ export namespace google {
             public deprecated: boolean;
 
             /** MethodOptions idempotencyLevel. */
-            public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel;
+            public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel);
 
             /** MethodOptions uninterpretedOption. */
             public uninterpretedOption: google.protobuf.IUninterpretedOption[];
@@ -6829,16 +6829,16 @@ export namespace google {
             identifierValue?: (string|null);
 
             /** UninterpretedOption positiveIntValue */
-            positiveIntValue?: (number|Long|null);
+            positiveIntValue?: (number|Long|string|null);
 
             /** UninterpretedOption negativeIntValue */
-            negativeIntValue?: (number|Long|null);
+            negativeIntValue?: (number|Long|string|null);
 
             /** UninterpretedOption doubleValue */
             doubleValue?: (number|null);
 
             /** UninterpretedOption stringValue */
-            stringValue?: (Uint8Array|null);
+            stringValue?: (Uint8Array|string|null);
 
             /** UninterpretedOption aggregateValue */
             aggregateValue?: (string|null);
@@ -6860,16 +6860,16 @@ export namespace google {
             public identifierValue: string;
 
             /** UninterpretedOption positiveIntValue. */
-            public positiveIntValue: (number|Long);
+            public positiveIntValue: (number|Long|string);
 
             /** UninterpretedOption negativeIntValue. */
-            public negativeIntValue: (number|Long);
+            public negativeIntValue: (number|Long|string);
 
             /** UninterpretedOption doubleValue. */
             public doubleValue: number;
 
             /** UninterpretedOption stringValue. */
-            public stringValue: Uint8Array;
+            public stringValue: (Uint8Array|string);
 
             /** UninterpretedOption aggregateValue. */
             public aggregateValue: string;
@@ -7459,7 +7459,7 @@ export namespace google {
             type_url?: (string|null);
 
             /** Any value */
-            value?: (Uint8Array|null);
+            value?: (Uint8Array|string|null);
         }
 
         /** Represents an Any. */
@@ -7475,7 +7475,7 @@ export namespace google {
             public type_url: string;
 
             /** Any value. */
-            public value: Uint8Array;
+            public value: (Uint8Array|string);
 
             /**
              * Creates a new Any instance using the specified properties.
@@ -7552,7 +7552,7 @@ export namespace google {
         interface IDuration {
 
             /** Duration seconds */
-            seconds?: (number|Long|null);
+            seconds?: (number|Long|string|null);
 
             /** Duration nanos */
             nanos?: (number|null);
@@ -7568,7 +7568,7 @@ export namespace google {
             constructor(properties?: google.protobuf.IDuration);
 
             /** Duration seconds. */
-            public seconds: (number|Long);
+            public seconds: (number|Long|string);
 
             /** Duration nanos. */
             public nanos: number;
@@ -7732,7 +7732,7 @@ export namespace google {
         interface ITimestamp {
 
             /** Timestamp seconds */
-            seconds?: (number|Long|null);
+            seconds?: (number|Long|string|null);
 
             /** Timestamp nanos */
             nanos?: (number|null);
@@ -7748,7 +7748,7 @@ export namespace google {
             constructor(properties?: google.protobuf.ITimestamp);
 
             /** Timestamp seconds. */
-            public seconds: (number|Long);
+            public seconds: (number|Long|string);
 
             /** Timestamp nanos. */
             public nanos: number;

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jan 27, 2020
@codecov
Copy link

codecov bot commented Jan 27, 2020 •
edited
Loading

Codecov Report

Merging #714 into master will increase coverage by 0.12%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #714      +/-   ##
==========================================
+ Coverage   89.43%   89.56%   +0.12%     
==========================================
  Files          44       44              
  Lines        7282     7369      +87     
  Branches      414      427      +13     
==========================================
+ Hits         6513     6600      +87     
  Misses        766      766              
  Partials        3        3
Impacted Files Coverage Δ
tools/compileProtos.ts 91.94% <100%> (+3.32%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 36d8864...f91e3e2. Read the comment docs.

@alexander-fenster
Copy link
Contributor Author

Cc: @AVaksman - this is how I'm going to change enums in the generated .d.ts files to allow for passing and receiving strings (all our samples do that, and gax returns strings for enums and longs because of the option set we use).

bcoe
bcoe approved these changes Jan 27, 2020
View reviewed changes
Copy link
Contributor

@bcoe bcoe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for taking this on.

@alexander-fenster alexander-fenster merged commit 154d771 into master Jan 27, 2020
@alexander-fenster alexander-fenster deleted the dtsmagic branch January 27, 2020 22:00
@alexander-fenster alexander-fenster mentioned this pull request Jan 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bcoe bcoe bcoe approved these changes

@JustinBeckwith JustinBeckwith JustinBeckwith approved these changes

@xiaozhenliu-gg5 xiaozhenliu-gg5 Awaiting requested review from xiaozhenliu-gg5

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

properly support enums
4 participants
@alexander-fenster @bcoe @JustinBeckwith @googlebot