@8ms/helpers 1.2.17 → 1.3.0

package/google/bigQuery/IsTableExists.d.ts

@@ -1,10 +1,11 @@
 type IsTableExists = {
     datasetId: string;
+    projectId?: string;
     tableId: string;
 };
 /**
  * Check to see whether a given BigQuery table exists.
  * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
  */
-declare const isTableExists: ({ datasetId, tableId }: IsTableExists) => Promise<boolean>;
+declare const isTableExists: ({ datasetId, projectId, tableId }: IsTableExists) => Promise<boolean>;
 export default isTableExists;

package/google/bigQuery/IsTableExists.js

@@ -1,12 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Check to see whether a given BigQuery table exists.
  * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
  */
-const isTableExists = async ({ datasetId, tableId }) => {
+const isTableExists = async ({ datasetId, projectId, tableId }) => {
     let response;
-    const dataset = global.googleBigQueryClient.dataset(datasetId);
+    let client = (0, getClient_1.default)({ projectId });
+    const dataset = client.dataset(datasetId);
     try {
         await dataset.table(tableId)
             .get();

package/google/bigQuery/createTable.d.ts

@@ -1,5 +1,6 @@
 type CreateTable = {
     datasetId: string;
+    projectId?: string;
     options: object;
     tableId: string;
 };
@@ -7,5 +8,5 @@ type CreateTable = {
  * Create a Table if it doesn't already exist.
  * Returns table instance.
  */
-declare const createTable: ({ datasetId, options, tableId }: CreateTable) => Promise<void>;
+declare const createTable: ({ datasetId, options, projectId, tableId }: CreateTable) => Promise<void>;
 export default createTable;

package/google/bigQuery/createTable.js

@@ -4,17 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const IsTableExists_1 = __importDefault(require("./IsTableExists"));
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Create a Table if it doesn't already exist.
  * Returns table instance.
  */
-const createTable = async ({ datasetId, options, tableId }) => {
+const createTable = async ({ datasetId, options, projectId, tableId }) => {
     const tableExists = await (0, IsTableExists_1.default)({
         datasetId,
+        projectId,
         tableId
     });
     if (!tableExists) {
-        await global.googleBigQueryClient.dataset(datasetId)
+        let client = (0, getClient_1.default)({ projectId });
+        await client
+            .dataset(datasetId)
             .createTable(tableId, options);
     }
 };

package/google/bigQuery/getClient.d.ts

@@ -0,0 +1,8 @@
+type GetClient = {
+    projectId?: string;
+};
+/**
+ * Create a new client if the project id differs from the global.
+ */
+declare const getClient: ({ projectId }: GetClient) => any;
+export default getClient;

package/google/bigQuery/getClient.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Create a new client if the project id differs from the global.
+ */
+const getClient = ({ projectId }) => {
+    let client = global.googleBigQueryClient;
+    if (projectId !== global.googleBigQueryDefaultProjectId) {
+        const { BigQuery } = require('@google-cloud/bigquery');
+        client = new BigQuery({
+            credentials: global.googleBigQueryDefault.credentials,
+            projectId: projectId,
+        });
+    }
+    return client;
+};
+exports.default = getClient;

package/google/bigQuery/initClient.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../getConfig"));
+global.googleBigQueryDefaultProjectId = null;
 global.googleBigQueryClient = null;
 /**
  * Initialise the Big Query client.
@@ -13,9 +14,11 @@ const initClient = ({ parameter, projectId }) => {
     if (!global.googleBigQueryClient) {
         const { BigQuery } = require('@google-cloud/bigquery');
         const formattedConfig = (0, getConfig_1.default)({ parameter });
+        global.googleBigQueryDefault.credentials = formattedConfig;
+        global.googleBigQueryDefault.projectId = projectId;
         global.googleBigQueryClient = new BigQuery({
-            credentials: formattedConfig,
-            projectId: projectId,
+            credentials: global.googleBigQueryDefault.credentials,
+            projectId: global.googleBigQueryDefault.projectId,
         });
     }
 };

package/google/bigQuery/loadData.d.ts

@@ -5,6 +5,7 @@ type LoadData = {
         metadata: object;
     };
     table: {
+        projectId?: string;
         datasetId: string;
         tableId: string;
     };

package/google/bigQuery/loadData.js

@@ -4,16 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const IsTableExists_1 = __importDefault(require("./IsTableExists"));
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Load data into a given table.
  */
 const loadData = async ({ file, table }) => {
     const tableExists = await (0, IsTableExists_1.default)({
         datasetId: table.datasetId,
+        projectId: table.projectId,
         tableId: table.tableId,
     });
     if (tableExists) {
-        await global.googleBigQueryClient.dataset(table.datasetId)
+        let client = (0, getClient_1.default)({
+            projectId: table.projectId
+        });
+        await client
+            .dataset(table.datasetId)
             .table(table.tableId)
             .load(global.googleStorageClient.bucket(file.bucket)
             .file(file.key), file.metadata);

package/google/bigQuery/query.d.ts

@@ -1,8 +1,9 @@
 type Query = {
     input: string;
+    projectId?: string;
 };
 /**
  * Build the query and return the data.
  */
-declare const query: ({ input }: Query) => Promise<any>;
+declare const query: ({ input, projectId }: Query) => Promise<any>;
 export default query;

package/google/bigQuery/query.js

@@ -1,10 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const getClient_1 = __importDefault(require("./getClient"));
 /**
  * Build the query and return the data.
  */
-const query = async ({ input }) => {
-    const apiResponse = await global.googleBigQueryClient.query(input);
+const query = async ({ input, projectId }) => {
+    let client = (0, getClient_1.default)({ projectId });
+    const apiResponse = await client.query(input);
     return apiResponse;
 };
 exports.default = query;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name":            "@8ms/helpers",
     "license":         "UNLICENSED",
-    "version":         "1.2.17",
+    "version":         "1.3.0",
     "repository":      {
         "type": "git",
         "url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"