Skip to content

Commit a40a23e

Browse files
authored
fix(cloud-rad): move comments for TSDoc (#1423)
As we move our ref docs to cloud.google.com, we rely on TSDoc rather JSDoc. TSDoc expects comments before the first overloaded function, we currently have those on the last function. Those comments don't make it into the d.ts files. We need to move comments to the first overloaded function rather than the last one. Internally b/190631834 Script used: https://github.com/fhinkel/cloud-rad-script/blob/main/moveComments.js
1 parent ba36862 commit a40a23e

File tree

9 files changed

+1001
-1001
lines changed

9 files changed

+1001
-1001
lines changed

src/iam.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ export class IAM {
105105
this.id = id;
106106
}
107107

108-
getPolicy(gaxOpts?: CallOptions): Promise<GetPolicyResponse>;
109-
getPolicy(callback: GetPolicyCallback): void;
110-
getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void;
111108
/**
112109
* @typedef {array} GetPolicyResponse
113110
* @property {object} 0 The policy.
@@ -149,6 +146,9 @@ export class IAM {
149146
* });
150147
* ```
151148
*/
149+
getPolicy(gaxOpts?: CallOptions): Promise<GetPolicyResponse>;
150+
getPolicy(callback: GetPolicyCallback): void;
151+
getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void;
152152
getPolicy(
153153
optsOrCallback?: CallOptions | GetPolicyCallback,
154154
callback?: GetPolicyCallback
@@ -171,13 +171,6 @@ export class IAM {
171171
);
172172
}
173173

174-
setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise<SetPolicyResponse>;
175-
setPolicy(
176-
policy: Policy,
177-
gaxOpts: CallOptions,
178-
callback: SetPolicyCallback
179-
): void;
180-
setPolicy(policy: Policy, callback: SetPolicyCallback): void;
181174
/**
182175
* @typedef {array} SetPolicyResponse
183176
* @property {object} 0 The policy.
@@ -237,6 +230,13 @@ export class IAM {
237230
* });
238231
* ```
239232
*/
233+
setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise<SetPolicyResponse>;
234+
setPolicy(
235+
policy: Policy,
236+
gaxOpts: CallOptions,
237+
callback: SetPolicyCallback
238+
): void;
239+
setPolicy(policy: Policy, callback: SetPolicyCallback): void;
240240
setPolicy(
241241
policy: Policy,
242242
optsOrCallback?: CallOptions | SetPolicyCallback,
@@ -265,19 +265,6 @@ export class IAM {
265265
);
266266
}
267267

268-
testPermissions(
269-
permissions: string | string[],
270-
gaxOpts?: CallOptions
271-
): Promise<TestIamPermissionsResponse>;
272-
testPermissions(
273-
permissions: string | string[],
274-
gaxOpts: CallOptions,
275-
callback: TestIamPermissionsCallback
276-
): void;
277-
testPermissions(
278-
permissions: string | string[],
279-
callback: TestIamPermissionsCallback
280-
): void;
281268
/**
282269
* @callback TestIamPermissionsCallback
283270
* @param {?Error} err Request error, if any.
@@ -356,6 +343,19 @@ export class IAM {
356343
* });
357344
* ```
358345
*/
346+
testPermissions(
347+
permissions: string | string[],
348+
gaxOpts?: CallOptions
349+
): Promise<TestIamPermissionsResponse>;
350+
testPermissions(
351+
permissions: string | string[],
352+
gaxOpts: CallOptions,
353+
callback: TestIamPermissionsCallback
354+
): void;
355+
testPermissions(
356+
permissions: string | string[],
357+
callback: TestIamPermissionsCallback
358+
): void;
359359
testPermissions(
360360
permissions: string | string[],
361361
optsOrCallback?: CallOptions | TestIamPermissionsCallback,

src/publisher/index.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ export class Publisher {
9595
this.orderedQueues = new Map();
9696
}
9797

98-
flush(): Promise<void>;
99-
flush(callback: EmptyCallback): void;
10098
/**
10199
* Immediately sends all remaining queued data. This is mostly useful
102100
* if you are planning to call close() on the PubSub object that holds
@@ -107,6 +105,8 @@ export class Publisher {
107105
* @param {EmptyCallback} [callback] Callback function.
108106
* @returns {Promise<EmptyResponse>}
109107
*/
108+
flush(): Promise<void>;
109+
flush(callback: EmptyCallback): void;
110110
flush(callback?: EmptyCallback): Promise<void> | void {
111111
const definedCallback = callback ? callback : () => {};
112112

@@ -122,13 +122,6 @@ export class Publisher {
122122
})
123123
.catch(definedCallback);
124124
}
125-
publish(data: Buffer, attributes?: Attributes): Promise<string>;
126-
publish(data: Buffer, callback: PublishCallback): void;
127-
publish(
128-
data: Buffer,
129-
attributes: Attributes,
130-
callback: PublishCallback
131-
): void;
132125
/**
133126
* Publish the provided message.
134127
*
@@ -143,6 +136,13 @@ export class Publisher {
143136
* @param {PublishCallback} [callback] Callback function.
144137
* @returns {Promise<PublishResponse>}
145138
*/
139+
publish(data: Buffer, attributes?: Attributes): Promise<string>;
140+
publish(data: Buffer, callback: PublishCallback): void;
141+
publish(
142+
data: Buffer,
143+
attributes: Attributes,
144+
callback: PublishCallback
145+
): void;
146146
publish(
147147
data: Buffer,
148148
attrsOrCb?: Attributes | PublishCallback,
@@ -153,8 +153,6 @@ export class Publisher {
153153
return this.publishMessage({data, attributes}, callback!);
154154
}
155155

156-
publishMessage(message: PubsubMessage): Promise<string>;
157-
publishMessage(message: PubsubMessage, callback: PublishCallback): void;
158156
/**
159157
* Publish the provided message.
160158
*
@@ -166,6 +164,8 @@ export class Publisher {
166164
* @param {PubsubMessage} [message] Options for this message.
167165
* @param {PublishCallback} [callback] Callback function.
168166
*/
167+
publishMessage(message: PubsubMessage): Promise<string>;
168+
publishMessage(message: PubsubMessage, callback: PublishCallback): void;
169169
publishMessage(
170170
message: PubsubMessage,
171171
callback?: PublishCallback

src/pubsub.ts

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,6 @@ export class PubSub {
313313
return this.projectId.indexOf(PROJECT_ID_PLACEHOLDER) < 0;
314314
}
315315

316-
close(): Promise<void>;
317-
close(callback: EmptyCallback): void;
318316
/**
319317
* Closes out this object, releasing any server connections. Note that once
320318
* you close a PubSub object, it may not be used again. Any pending operations
@@ -326,6 +324,8 @@ export class PubSub {
326324
* @callback EmptyCallback
327325
* @returns {Promise<void>}
328326
*/
327+
close(): Promise<void>;
328+
close(callback: EmptyCallback): void;
329329
close(callback?: EmptyCallback): Promise<void> | void {
330330
const definedCallback = callback || (() => {});
331331
if (this.isOpen) {
@@ -395,22 +395,6 @@ export class PubSub {
395395
return new Schema(this, schemaName);
396396
}
397397

398-
createSubscription(
399-
topic: Topic | string,
400-
name: string,
401-
options?: CreateSubscriptionOptions
402-
): Promise<CreateSubscriptionResponse>;
403-
createSubscription(
404-
topic: Topic | string,
405-
name: string,
406-
callback: CreateSubscriptionCallback
407-
): void;
408-
createSubscription(
409-
topic: Topic | string,
410-
name: string,
411-
options: CreateSubscriptionOptions,
412-
callback: CreateSubscriptionCallback
413-
): void;
414398
/**
415399
* @typedef {array} CreateSubscriptionResponse
416400
* @property {Subscription} 0 The new {@link Subscription}.
@@ -495,6 +479,22 @@ export class PubSub {
495479
* });
496480
* ```
497481
*/
482+
createSubscription(
483+
topic: Topic | string,
484+
name: string,
485+
options?: CreateSubscriptionOptions
486+
): Promise<CreateSubscriptionResponse>;
487+
createSubscription(
488+
topic: Topic | string,
489+
name: string,
490+
callback: CreateSubscriptionCallback
491+
): void;
492+
createSubscription(
493+
topic: Topic | string,
494+
name: string,
495+
options: CreateSubscriptionOptions,
496+
callback: CreateSubscriptionCallback
497+
): void;
498498
createSubscription(
499499
topic: Topic | string,
500500
name: string,
@@ -556,19 +556,6 @@ export class PubSub {
556556
);
557557
}
558558

559-
createTopic(
560-
name: string | TopicMetadata,
561-
gaxOpts?: CallOptions
562-
): Promise<CreateTopicResponse>;
563-
createTopic(
564-
name: string | TopicMetadata,
565-
callback: CreateTopicCallback
566-
): void;
567-
createTopic(
568-
name: string | TopicMetadata,
569-
gaxOpts: CallOptions,
570-
callback: CreateTopicCallback
571-
): void;
572559
/**
573560
* @typedef {array} CreateTopicResponse
574561
* @property {Topic} 0 The new {@link Topic}.
@@ -611,6 +598,19 @@ export class PubSub {
611598
* });
612599
* ```
613600
*/
601+
createTopic(
602+
name: string | TopicMetadata,
603+
gaxOpts?: CallOptions
604+
): Promise<CreateTopicResponse>;
605+
createTopic(
606+
name: string | TopicMetadata,
607+
callback: CreateTopicCallback
608+
): void;
609+
createTopic(
610+
name: string | TopicMetadata,
611+
gaxOpts: CallOptions,
612+
callback: CreateTopicCallback
613+
): void;
614614
createTopic(
615615
name: string | TopicMetadata,
616616
optsOrCallback?: CallOptions | CreateTopicCallback,
@@ -650,16 +650,6 @@ export class PubSub {
650650
);
651651
}
652652

653-
detachSubscription(
654-
name: string,
655-
gaxOpts?: CallOptions
656-
): Promise<DetachSubscriptionResponse>;
657-
detachSubscription(name: string, callback: DetachSubscriptionCallback): void;
658-
detachSubscription(
659-
name: string,
660-
gaxOpts: CallOptions,
661-
callback: DetachSubscriptionCallback
662-
): void;
663653
/**
664654
* Detach a subscription with the given name.
665655
*
@@ -690,6 +680,16 @@ export class PubSub {
690680
* });
691681
* ```
692682
*/
683+
detachSubscription(
684+
name: string,
685+
gaxOpts?: CallOptions
686+
): Promise<DetachSubscriptionResponse>;
687+
detachSubscription(name: string, callback: DetachSubscriptionCallback): void;
688+
detachSubscription(
689+
name: string,
690+
gaxOpts: CallOptions,
691+
callback: DetachSubscriptionCallback
692+
): void;
693693
detachSubscription(
694694
name: string,
695695
optsOrCallback?: CallOptions | DetachSubscriptionCallback,
@@ -823,9 +823,6 @@ export class PubSub {
823823
}
824824
}
825825

826-
getSnapshots(options?: PageOptions): Promise<GetSnapshotsResponse>;
827-
getSnapshots(callback: GetSnapshotsCallback): void;
828-
getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void;
829826
/**
830827
* Query object for listing snapshots.
831828
*
@@ -874,6 +871,9 @@ export class PubSub {
874871
* });
875872
* ```
876873
*/
874+
getSnapshots(options?: PageOptions): Promise<GetSnapshotsResponse>;
875+
getSnapshots(callback: GetSnapshotsCallback): void;
876+
getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void;
877877
getSnapshots(
878878
optsOrCallback?: PageOptions | GetSnapshotsCallback,
879879
callback?: GetSnapshotsCallback
@@ -926,14 +926,6 @@ export class PubSub {
926926
);
927927
}
928928

929-
getSubscriptions(
930-
options?: GetSubscriptionsOptions
931-
): Promise<GetSubscriptionsResponse>;
932-
getSubscriptions(callback: GetSubscriptionsCallback): void;
933-
getSubscriptions(
934-
options: GetSubscriptionsOptions,
935-
callback: GetSubscriptionsCallback
936-
): void;
937929
/**
938930
* Query object for listing subscriptions.
939931
*
@@ -993,6 +985,14 @@ export class PubSub {
993985
* });
994986
* ```
995987
*/
988+
getSubscriptions(
989+
options?: GetSubscriptionsOptions
990+
): Promise<GetSubscriptionsResponse>;
991+
getSubscriptions(callback: GetSubscriptionsCallback): void;
992+
getSubscriptions(
993+
options: GetSubscriptionsOptions,
994+
callback: GetSubscriptionsCallback
995+
): void;
996996
getSubscriptions(
997997
optsOrCallback?: GetSubscriptionsOptions | GetSubscriptionsCallback,
998998
callback?: GetSubscriptionsCallback
@@ -1052,9 +1052,6 @@ export class PubSub {
10521052
);
10531053
}
10541054

1055-
getTopics(options?: PageOptions): Promise<GetTopicsResponse>;
1056-
getTopics(callback: GetTopicsCallback): void;
1057-
getTopics(options: PageOptions, callback: GetTopicsCallback): void;
10581055
/**
10591056
* Query object for listing topics.
10601057
*
@@ -1113,6 +1110,9 @@ export class PubSub {
11131110
* });
11141111
* ```
11151112
*/
1113+
getTopics(options?: PageOptions): Promise<GetTopicsResponse>;
1114+
getTopics(callback: GetTopicsCallback): void;
1115+
getTopics(options: PageOptions, callback: GetTopicsCallback): void;
11161116
getTopics(
11171117
optsOrCallback?: PageOptions | GetTopicsCallback,
11181118
callback?: GetTopicsCallback

0 commit comments

Comments
 (0)