Skip to content

Commit 6d871a2

Browse files
JustinBeckwithJustinBeckwith
authored
feat: use es style imports (#302)
1 parent 1a3f7b9 commit 6d871a2

14 files changed

Lines changed: 109 additions & 119 deletions

‎handwritten/spanner/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained].
6666

6767
```javascript
6868
// Imports the Google Cloud client library
69-
const Spanner = require('@google-cloud/spanner');
69+
const {Spanner} = require('@google-cloud/spanner');
7070

7171
// Your Google Cloud Platform project ID
7272
const projectId = 'YOUR_PROJECT_ID';

‎handwritten/spanner/src/batch-transaction.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class BatchTransaction extends Transaction {
5252
* @returns {Promise<BasicResponse>}
5353
*
5454
* @example
55-
* const Spanner = require('@google-cloud/spanner');
55+
* const {Spanner} = require('@google-cloud/spanner');
5656
* const spanner = new Spanner();
5757
*
5858
* const instance = spanner.instance('my-instance');
@@ -242,7 +242,7 @@ class BatchTransaction extends Transaction {
242242
* @returns {ReadableStream} A readable stream that emits rows.
243243
*
244244
* @example
245-
* const Spanner = require('@google-cloud/spanner');
245+
* const {Spanner} = require('@google-cloud/spanner');
246246
* const spanner = new Spanner();
247247
*
248248
* const instance = spanner.instance('my-instance');
@@ -296,7 +296,7 @@ class BatchTransaction extends Transaction {
296296
* @returns {TransactionIdentifier}
297297
*
298298
* @example
299-
* const Spanner = require('@google-cloud/spanner');
299+
* const {Spanner} = require('@google-cloud/spanner');
300300
* const spanner = new Spanner();
301301
*
302302
* const instance = spanner.instance('my-instance');

‎handwritten/spanner/src/database.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const TransactionRequest = require('./transaction-request');
9797
* configuration options or custom pool interface.
9898
*
9999
* @example
100-
* const Spanner = require('@google-cloud/spanner');
100+
* const {Spanner} = require('@google-cloud/spanner');
101101
* const spanner = new Spanner();
102102
* const instance = spanner.instance('my-instance');
103103
* const database = instance.database('my-database');
@@ -114,7 +114,7 @@ class Database extends ServiceObject {
114114
* @returns {Promise<CreateDatabaseResponse>}
115115
*
116116
* @example
117-
* const Spanner = require('@google-cloud/spanner');
117+
* const {Spanner} = require('@google-cloud/spanner');
118118
* const spanner = new Spanner();
119119
* const instance = spanner.instance('my-instance');
120120
* const database = instance.database('my-database');
@@ -163,7 +163,7 @@ class Database extends ServiceObject {
163163
* @returns {Promise<DatabaseExistsResponse>}
164164
*
165165
* @example
166-
* const Spanner = require('@google-cloud/spanner');
166+
* const {Spanner} = require('@google-cloud/spanner');
167167
* const spanner = new Spanner();
168168
*
169169
* const instance = spanner.instance('my-instance');
@@ -214,7 +214,7 @@ class Database extends ServiceObject {
214214
* @returns {BatchTransaction} A batch transaction object.
215215
*
216216
* @example
217-
* const Spanner = require('@google-cloud/spanner');
217+
* const {Spanner} = require('@google-cloud/spanner');
218218
* const spanner = new Spanner();
219219
*
220220
* const instance = spanner.instance('my-instance');
@@ -248,7 +248,7 @@ class Database extends ServiceObject {
248248
* @returns {Promise}
249249
*
250250
* @example
251-
* const Spanner = require('@google-cloud/spanner');
251+
* const {Spanner} = require('@google-cloud/spanner');
252252
* const spanner = new Spanner();
253253
*
254254
* const instance = spanner.instance('my-instance');
@@ -351,7 +351,7 @@ class Database extends ServiceObject {
351351
* @returns {Promise<CreateSessionResponse>}
352352
*
353353
* @example
354-
* const Spanner = require('@google-cloud/spanner');
354+
* const {Spanner} = require('@google-cloud/spanner');
355355
* const spanner = new Spanner();
356356
*
357357
* const instance = spanner.instance('my-instance');
@@ -428,7 +428,7 @@ class Database extends ServiceObject {
428428
* @returns {Promise<CreateTableResponse>}
429429
*
430430
* @example
431-
* const Spanner = require('@google-cloud/spanner');
431+
* const {Spanner} = require('@google-cloud/spanner');
432432
* const spanner = new Spanner();
433433
*
434434
* const instance = spanner.instance('my-instance');
@@ -510,7 +510,7 @@ class Database extends ServiceObject {
510510
* @returns {Promise<BasicResponse>}
511511
*
512512
* @example
513-
* const Spanner = require('@google-cloud/spanner');
513+
* const {Spanner} = require('@google-cloud/spanner');
514514
* const spanner = new Spanner();
515515
*
516516
* const instance = spanner.instance('my-instance');
@@ -573,7 +573,7 @@ class Database extends ServiceObject {
573573
* @returns {Promise<GetDatabaseResponse>}
574574
*
575575
* @example
576-
* const Spanner = require('@google-cloud/spanner');
576+
* const {Spanner} = require('@google-cloud/spanner');
577577
* const spanner = new Spanner();
578578
*
579579
* const instance = spanner.instance('my-instance');
@@ -641,7 +641,7 @@ class Database extends ServiceObject {
641641
* @returns {Promise<GetDatabaseMetadataResponse>}
642642
*
643643
* @example
644-
* const Spanner = require('@google-cloud/spanner');
644+
* const {Spanner} = require('@google-cloud/spanner');
645645
* const spanner = new Spanner();
646646
*
647647
* const instance = spanner.instance('my-instance');
@@ -700,7 +700,7 @@ class Database extends ServiceObject {
700700
* @returns {Promise<GetSchemaResponse>}
701701
*
702702
* @example
703-
* const Spanner = require('@google-cloud/spanner');
703+
* const {Spanner} = require('@google-cloud/spanner');
704704
* const spanner = new Spanner();
705705
*
706706
* const instance = spanner.instance('my-instance');
@@ -784,7 +784,7 @@ class Database extends ServiceObject {
784784
* @returns {Promise<GetSessionsResponse>}
785785
*
786786
* @example
787-
* const Spanner = require('@google-cloud/spanner');
787+
* const {Spanner} = require('@google-cloud/spanner');
788788
* const spanner = new Spanner();
789789
*
790790
* const instance = spanner.instance('my-instance');
@@ -865,7 +865,7 @@ class Database extends ServiceObject {
865865
* @returns {Promise<GetTransactionResponse>}
866866
*
867867
* @example
868-
* const Spanner = require('@google-cloud/spanner');
868+
* const {Spanner} = require('@google-cloud/spanner');
869869
* const spanner = new Spanner();
870870
*
871871
* const instance = spanner.instance('my-instance');
@@ -1031,7 +1031,7 @@ class Database extends ServiceObject {
10311031
* @returns {Promise<RunResponse>}
10321032
*
10331033
* @example
1034-
* const Spanner = require('@google-cloud/spanner');
1034+
* const {Spanner} = require('@google-cloud/spanner');
10351035
* const spanner = new Spanner();
10361036
*
10371037
* const instance = spanner.instance('my-instance');
@@ -1172,7 +1172,7 @@ class Database extends ServiceObject {
11721172
* @returns {ReadableStream} A readable stream that emits rows.
11731173
*
11741174
* @example
1175-
* const Spanner = require('@google-cloud/spanner');
1175+
* const {Spanner} = require('@google-cloud/spanner');
11761176
* const spanner = new Spanner();
11771177
*
11781178
* const instance = spanner.instance('my-instance');
@@ -1348,7 +1348,7 @@ class Database extends ServiceObject {
13481348
* of a transaction.
13491349
*
13501350
* @example
1351-
* const Spanner = require('@google-cloud/spanner');
1351+
* const {Spanner} = require('@google-cloud/spanner');
13521352
* const spanner = new Spanner();
13531353
*
13541354
* const instance = spanner.instance('my-instance');
@@ -1466,7 +1466,7 @@ class Database extends ServiceObject {
14661466
*
14671467
*
14681468
* @example
1469-
* const Spanner = require('@google-cloud/spanner');
1469+
* const {Spanner} = require('@google-cloud/spanner');
14701470
* const spanner = new Spanner();
14711471
*
14721472
* const instance = spanner.instance('my-instance');
@@ -1520,7 +1520,7 @@ class Database extends ServiceObject {
15201520
* @return {Table} A Table object.
15211521
*
15221522
* @example
1523-
* const Spanner = require('@google-cloud/spanner');
1523+
* const {Spanner} = require('@google-cloud/spanner');
15241524
* const spanner = new Spanner();
15251525
*
15261526
* const instance = spanner.instance('my-instance');
@@ -1556,7 +1556,7 @@ class Database extends ServiceObject {
15561556
* @returns {Promise<LongRunningOperationResponse>}
15571557
*
15581558
* @example
1559-
* const Spanner = require('@google-cloud/spanner');
1559+
* const {Spanner} = require('@google-cloud/spanner');
15601560
* const spanner = new Spanner();
15611561
*
15621562
* const instance = spanner.instance('my-instance');

‎handwritten/spanner/src/index.js‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ const gapic = Object.freeze({
162162
* @param {ClientConfig} [options] Configuration options.
163163
*/
164164
function Spanner(options) {
165-
if (!(this instanceof Spanner)) {
166-
return new Spanner(options);
167-
}
168-
169165
options = options || {};
170166

171167
this.clients_ = new Map();
@@ -232,7 +228,7 @@ Spanner.COMMIT_TIMESTAMP = 'spanner.commit_timestamp()';
232228
* @see {@link Spanner#date}
233229
*
234230
* @example
235-
* const Spanner = require('@google-cloud/spanner');
231+
* const {Spanner} = require('@google-cloud/spanner');
236232
* const date = Spanner.date('08-20-1969');
237233
*/
238234
Spanner.date = function(value) {
@@ -248,7 +244,7 @@ Spanner.date = function(value) {
248244
* @see {@link Spanner#float}
249245
*
250246
* @example
251-
* const Spanner = require('@google-cloud/spanner');
247+
* const {Spanner} = require('@google-cloud/spanner');
252248
* const float = Spanner.float(10);
253249
*/
254250
Spanner.float = function(value) {
@@ -264,7 +260,7 @@ Spanner.float = function(value) {
264260
* @see {@link Spanner#int}
265261
*
266262
* @example
267-
* const Spanner = require('@google-cloud/spanner');
263+
* const {Spanner} = require('@google-cloud/spanner');
268264
* const int = Spanner.int(10);
269265
*/
270266
Spanner.int = function(value) {
@@ -278,7 +274,7 @@ Spanner.int = function(value) {
278274
* @returns {object}
279275
*
280276
* @example
281-
* const Spanner = require('@google-cloud/spanner');
277+
* const {Spanner} = require('@google-cloud/spanner');
282278
* const struct = Spanner.struct({
283279
* user: 'bob',
284280
* age: 32
@@ -331,7 +327,7 @@ Spanner.struct = function(value) {
331327
* @returns {Promise<CreateInstanceResponse>}
332328
*
333329
* @example
334-
* const Spanner = require('@google-cloud/spanner');
330+
* const {Spanner} = require('@google-cloud/spanner');
335331
* const spanner = new Spanner();
336332
*
337333
* const config = {
@@ -474,7 +470,7 @@ Spanner.prototype.createInstance = function(name, config, callback) {
474470
* @returns {Promise<GetInstancesResponse>}
475471
*
476472
* @example
477-
* const Spanner = require('@google-cloud/spanner');
473+
* const {Spanner} = require('@google-cloud/spanner');
478474
* const spanner = new Spanner();
479475
*
480476
* spanner.getInstances(function(err, instances) {
@@ -550,7 +546,7 @@ Spanner.prototype.getInstances = function(query, callback) {
550546
* instances.
551547
*
552548
* @example
553-
* const Spanner = require('@google-cloud/spanner');
549+
* const {Spanner} = require('@google-cloud/spanner');
554550
* const spanner = new Spanner();
555551
*
556552
* spanner.getInstancesStream()
@@ -617,7 +613,7 @@ Spanner.prototype.getInstancesStream = paginator.streamify('getInstances');
617613
* @returns {Promise<GetInstanceConfigsResponse>}
618614
*
619615
* @example
620-
* const Spanner = require('@google-cloud/spanner');
616+
* const {Spanner} = require('@google-cloud/spanner');
621617
* const spanner = new Spanner();
622618
*
623619
* spanner.getInstanceConfigs(function(err, instanceConfigs) {
@@ -681,7 +677,7 @@ Spanner.prototype.getInstanceConfigs = function(query, callback) {
681677
* @returns {ReadableStream} A readable stream that emits instance configs.
682678
*
683679
* @example
684-
* const Spanner = require('@google-cloud/spanner');
680+
* const {Spanner} = require('@google-cloud/spanner');
685681
* const spanner = new Spanner();
686682
*
687683
* spanner.getInstanceConfigsStream()
@@ -722,7 +718,7 @@ Spanner.prototype.getInstanceConfigsStream = function(query) {
722718
* @returns {Instance} An Instance object.
723719
*
724720
* @example
725-
* const Spanner = require('@google-cloud/spanner');
721+
* const {Spanner} = require('@google-cloud/spanner');
726722
* const spanner = new Spanner();
727723
* const instance = spanner.instance('my-instance');
728724
*/
@@ -749,7 +745,7 @@ Spanner.prototype.instance = function(name) {
749745
* @returns {Operation} An Operation object.
750746
*
751747
* @example
752-
* const Spanner = require('@google-cloud/spanner');
748+
* const {Spanner} = require('@google-cloud/spanner');
753749
* const spanner = new Spanner();
754750
* const operation = spanner.operation('operation-name');
755751
*/
@@ -893,7 +889,7 @@ promisifyAll(Spanner, {
893889
* npm install --save @google-cloud/spanner
894890
*
895891
* @example <caption>Import the client library</caption>
896-
* const Spanner = require('@google-cloud/spanner');
892+
* const {Spanner} = require('@google-cloud/spanner');
897893
*
898894
* @example <caption>Create a client that uses <a href="https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application">Application Default Credentials (ADC)</a>:</caption>
899895
* const client = new Spanner();
@@ -908,7 +904,7 @@ promisifyAll(Spanner, {
908904
* region_tag:spanner_quickstart
909905
* Full quickstart example:
910906
*/
911-
module.exports = Spanner;
907+
module.exports.Spanner = Spanner;
912908

913909
/**
914910
* {@link Instance} class.

0 commit comments

Comments
 (0)