@8ms/helpers 2.0.38 → 2.0.39

package/google/bigQuery/GoogleBigQueryNamespace.d.ts

@@ -17,7 +17,7 @@ type Tables = {
 export declare class GoogleBigQueryNamespace extends BaseNamespace {
     client: BigQuery;
     config: GoogleCloudConfig & {
-        defaultProjectId: string;
+        projectId: string;
     };
     ensureInit: () => Promise<void>;
     /**

package/google/bigQuery/GoogleBigQueryNamespace.js

@@ -46,7 +46,7 @@ class GoogleBigQueryNamespace extends _class_1.BaseNamespace {
                     const formattedConfig = (0, server_1.getConfig)(this.config);
                     this.client = new BigQuery({
                         ...formattedConfig,
-                        projectId: this.config.defaultProjectId,
+                        projectId: this.config.projectId,
                     });
                 }
                 catch (e) {

package/google/bigQuery/server.d.ts

@@ -1,6 +1,6 @@
 import { GoogleBigQueryNamespace } from "./GoogleBigQueryNamespace";
 import type { GoogleAuthOptions } from "@google-cloud/common";
-export declare const googleBigQueryClient: (defaultProjectId: string, key?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleBigQueryNamespace>;
+export declare const googleBigQueryClient: (key: string, projectId: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleBigQueryNamespace>;
 export declare const getHandlerPath: (input: string) => string;
 export { loadData } from "./loadData";
 export type { QueryInput } from "./GoogleBigQueryNamespace";

package/google/bigQuery/server.js

@@ -4,7 +4,7 @@ exports.loadData = exports.getHandlerPath = exports.googleBigQueryClient = void
 const GoogleBigQueryNamespace_1 = require("./GoogleBigQueryNamespace");
 const server_1 = require("../../onePassword/server");
 const googleBigQueryNamespaces = new Map();
-const googleBigQueryClient = async (defaultProjectId, key = "default", config, vaultId, itemId) => {
+const googleBigQueryClient = async (key = "default", projectId, config, vaultId, itemId) => {
     if (googleBigQueryNamespaces.has(key)) {
         return googleBigQueryNamespaces.get(key);
     }
@@ -12,7 +12,7 @@ const googleBigQueryClient = async (defaultProjectId, key = "default", config, v
     if (config) {
         instanceConfig = {
             ...config,
-            defaultProjectId,
+            projectId,
         };
     }
     else if (vaultId && itemId) {
@@ -20,7 +20,7 @@ const googleBigQueryClient = async (defaultProjectId, key = "default", config, v
             .getJsonNote(vaultId, itemId);
         instanceConfig = {
             ...onePasswordConfig,
-            defaultProjectId,
+            projectId,
         };
     }
     else if ("default" === key && process.env.GOOGLE_CLOUD_VAULT_ID && process.env.GOOGLE_CLOUD_ITEM_ID) {
@@ -28,7 +28,7 @@ const googleBigQueryClient = async (defaultProjectId, key = "default", config, v
             .getJsonNote(process.env.GOOGLE_CLOUD_VAULT_ID, process.env.GOOGLE_CLOUD_ITEM_ID);
         instanceConfig = {
             ...onePasswordConfig,
-            defaultProjectId,
+            projectId,
         };
     }
     else {

package/google/sheets/GoogleSheetsNamespace.d.ts

@@ -9,7 +9,9 @@ type GetBatchDataProps = {
 };
 export declare class GoogleSheetsNamespace extends BaseNamespace {
     client: GoogleAuth;
-    config: GoogleCloudConfig;
+    config: GoogleCloudConfig & {
+        projectId: string;
+    };
     ensureInit: () => Promise<void>;
     getBatchData: (props: GetBatchDataProps) => Promise<import("@googleapis/sheets").sheets_v4.Schema$BatchGetValuesResponse>;
 }

package/google/sheets/GoogleSheetsNamespace.js

@@ -45,8 +45,8 @@ class GoogleSheetsNamespace extends _class_1.BaseNamespace {
                     const googleApisSheets = await Promise.resolve().then(() => __importStar(require("@googleapis/sheets")));
                     const formattedConfig = (0, server_1.getConfig)(this.config);
                     this.client = new googleApisSheets.auth.GoogleAuth({
-                        // @ts-ignore
                         credentials: formattedConfig,
+                        projectId: this.config.projectId,
                         scopes: [
                             "https://www.googleapis.com/auth/spreadsheets",
                         ],

package/google/sheets/server.d.ts

@@ -1,6 +1,6 @@
 import { GoogleSheetsNamespace } from "./GoogleSheetsNamespace";
 import type { GoogleAuthOptions } from "@google-cloud/common";
-export declare const googleSheetsAuths: (key?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleSheetsNamespace>;
+export declare const googleSheetsAuths: (key: string, projectId: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleSheetsNamespace>;
 /**
  * Noticed sometimes Google Sheets can struggle with import XML resulting to N/A values.
  */

package/google/sheets/server.js

@@ -4,21 +4,32 @@ exports.getAssociatedData = exports.isCellNa = exports.googleSheetsAuths = void
 const GoogleSheetsNamespace_1 = require("./GoogleSheetsNamespace");
 const server_1 = require("../../onePassword/server");
 const googleSheetsNamespaces = new Map();
-const googleSheetsAuths = async (key = "default", config, vaultId, itemId) => {
+const googleSheetsAuths = async (key = "default", projectId, config, vaultId, itemId) => {
     if (googleSheetsNamespaces.has(key)) {
         return googleSheetsNamespaces.get(key);
     }
     let instanceConfig;
     if (config) {
-        instanceConfig = config;
+        instanceConfig = {
+            ...config,
+            projectId,
+        };
     }
     else if (vaultId && itemId) {
-        instanceConfig = await (await (0, server_1.onePasswordClient)())
+        const onePasswordConfig = await (await (0, server_1.onePasswordClient)())
             .getJsonNote(vaultId, itemId);
+        instanceConfig = {
+            ...onePasswordConfig,
+            projectId,
+        };
     }
     else if ('default' === key && process.env.GOOGLE_CLOUD_VAULT_ID && process.env.GOOGLE_CLOUD_ITEM_ID) {
-        instanceConfig = await (await (0, server_1.onePasswordClient)())
+        const onePasswordConfig = await (await (0, server_1.onePasswordClient)())
             .getJsonNote(process.env.GOOGLE_CLOUD_VAULT_ID, process.env.GOOGLE_CLOUD_ITEM_ID);
+        instanceConfig = {
+            ...onePasswordConfig,
+            projectId,
+        };
     }
     else {
         throw new Error(`Config required for namespace '${key}'`);

package/google/storage/GoogleCloudStorageNamespace.d.ts

@@ -3,7 +3,9 @@ import type { Storage } from "@google-cloud/storage";
 import { GoogleCloudConfig } from "../server";
 export declare class GoogleCloudStorageNamespace extends BaseNamespace {
     client: Storage;
-    config: GoogleCloudConfig;
+    config: GoogleCloudConfig & {
+        projectId: string;
+    };
     ensureInit: () => Promise<void>;
     /**
      * Copy a local file to Google Cloud Storage.

package/google/storage/GoogleCloudStorageNamespace.js

@@ -44,8 +44,10 @@ class GoogleCloudStorageNamespace extends _class_1.BaseNamespace {
                 try {
                     const { Storage } = await Promise.resolve().then(() => __importStar(require("@google-cloud/storage")));
                     const formattedConfig = (0, server_1.getConfig)(this.config);
-                    // @ts-ignore
-                    this.client = new Storage(formattedConfig);
+                    this.client = new Storage({
+                        ...formattedConfig,
+                        projectId: this.config.projectId,
+                    });
                 }
                 catch (e) {
                     throw new Error("Google Cloud Storage Client not installed");

package/google/storage/server.d.ts

@@ -1,3 +1,3 @@
 import { GoogleCloudStorageNamespace } from "./GoogleCloudStorageNamespace";
 import type { GoogleAuthOptions } from "@google-cloud/common";
-export declare const googleCloudStorageClient: (key?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleCloudStorageNamespace>;
+export declare const googleCloudStorageClient: (key: string, projectId: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleCloudStorageNamespace>;

package/google/storage/server.js

@@ -4,21 +4,32 @@ exports.googleCloudStorageClient = void 0;
 const GoogleCloudStorageNamespace_1 = require("./GoogleCloudStorageNamespace");
 const server_1 = require("../../onePassword/server");
 const googleCloudStorageNamespaces = new Map();
-const googleCloudStorageClient = async (key = "default", config, vaultId, itemId) => {
+const googleCloudStorageClient = async (key = "default", projectId, config, vaultId, itemId) => {
     if (googleCloudStorageNamespaces.has(key)) {
         return googleCloudStorageNamespaces.get(key);
     }
     let instanceConfig;
     if (config) {
-        instanceConfig = config;
+        instanceConfig = {
+            ...config,
+            projectId,
+        };
     }
     else if (vaultId && itemId) {
-        instanceConfig = await (await (0, server_1.onePasswordClient)())
+        const onePasswordConfig = await (await (0, server_1.onePasswordClient)())
             .getJsonNote(vaultId, itemId);
+        instanceConfig = {
+            ...onePasswordConfig,
+            projectId,
+        };
     }
     else if ('default' === key && process.env.GOOGLE_CLOUD_VAULT_ID && process.env.GOOGLE_CLOUD_ITEM_ID) {
-        instanceConfig = await (await (0, server_1.onePasswordClient)())
+        const onePasswordConfig = await (await (0, server_1.onePasswordClient)())
             .getJsonNote(process.env.GOOGLE_CLOUD_VAULT_ID, process.env.GOOGLE_CLOUD_ITEM_ID);
+        instanceConfig = {
+            ...onePasswordConfig,
+            projectId,
+        };
     }
     else {
         throw new Error(`Config required for namespace '${key}'`);

package/package.json

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