Updating synth.py to add V1 Admin API

schmidt-sebastian · schmidt-sebastian · commit 6c3f1a0c400a · 2019-03-20T13:18:09.000-07:00
diff --git a/dev/src/v1/index.js b/dev/src/v1/index.js
@@ -15,5 +15,8 @@
 'use strict';
 
 const FirestoreClient = require('./firestore_client');
+const FirestoreAdminClient = require('./firestore_admin_client');
 
+FirestoreClient.FirestoreClient = FirestoreClient;
+FirestoreClient.FirestoreAdminClient = FirestoreAdminClient;
 module.exports = FirestoreClient;
diff --git a/package.json b/package.json
@@ -71,16 +71,17 @@
     "extend": "^3.0.1",
     "gts": "^0.9.0",
     "hard-rejection": "^2.0.0",
-    "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git",
     "intelli-espower-loader": "^1.0.1",
     "jsdoc": "^3.5.5",
+    "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git",
+    "linkinator": "^1.1.2",
     "mocha": "^6.0.0",
     "nyc": "^13.0.0",
-    "proxyquire": "^2.0.1",
+    "power-assert": "^1.6.1",
     "protobufjs": "^6.8.6",
+    "proxyquire": "^2.0.1",
     "source-map-support": "^0.5.6",
     "ts-node": "^8.0.0",
-    "typescript": "~3.3.0",
-    "linkinator": "^1.1.2"
+    "typescript": "~3.3.0"
   }
 }
diff --git a/synth.py b/synth.py
@@ -8,30 +8,23 @@
 gapic = gcp.GAPICGenerator()
 
 # tasks has two product names, and a poorly named artman yaml
+admin_library = gapic.node_library(
+    "firestore-admin", "v1", config_path="/google/firestore/admin/artman_firestore_v1.yaml"
+)
 library = gapic.node_library(
     "firestore", "v1", config_path="/google/firestore/artman_firestore_v1.yaml"
 )
 
 # skip index, protos, package.json, and README.md
-s.copy(library, "dev", excludes=["package.json", "README.md", "src/index.js"])
+s.copy(admin_library, "dev", excludes=["package.json", "README.md", "src/index.js", "src/v1/index.js"])
+s.copy(library, "dev", excludes=["package.json", "README.md", "src/index.js", "src/v1/index.js"])
 
 # package.json is one level deeper since firestore's src/ is under dev/
 s.replace(
-    "dev/src/v1/firestore_client.js", "../../package.json", "../../../package.json"
+    "dev/src/v1/firestore_admin_client.js", "../../package.json", "../../../package.json"
 )
-
-# Special case for firestore: FirestoreClient is exported as top level module.exports
-# from gapic-generated code
 s.replace(
-    "dev/src/v1/index.js",
-    "module.exports.FirestoreClient = FirestoreClient",
-    "module.exports = FirestoreClient",
-)
-
-s.replace(
-    "dev/test/gapic-v1.js",
-    "new firestoreModule.v1.FirestoreClient\(",
-    "new firestoreModule.v1(",
+    "dev/src/v1/firestore_client.js", "../../package.json", "../../../package.json"
 )
 
 # Fix dropping of google-cloud-resource-header
diff --git a/types/firestore.d.ts b/types/firestore.d.ts
@@ -1340,6 +1340,18 @@ declare namespace FirebaseFirestore {
      */
     isEqual(other: Timestamp): boolean;
   }
+
+  /**
+   * The v1beta1 Veneer client. This client provides access to to the underlying
+   * Firestore v1beta1 RPCs.
+   */
+  export const v1beta1 : any;
+
+  /**
+   * The v1 Veneer clients. These clients provide access to the Firestore Admin
+   * API and the underlying Firestore v1 RPCs.
+   */
+  export const v1: {FirestoreClient: any, FirestoreAdminClient: any};
 }
 
 declare module '@google-cloud/firestore' {
