@8ms/helpers 2.0.42 → 2.0.44

package/google/bigQuery/GoogleBigQueryNamespace.d.ts

@@ -6,7 +6,7 @@ export type QueryInput = string | {
     location?: string;
     params: QueryOptions;
 };
-type Datasets = {
+type Dataset = {
     id: string;
     location: string;
     projectId: string;
@@ -34,7 +34,7 @@ export declare class GoogleBigQueryNamespace extends BaseNamespace {
     /**
      * Retrieve all the Datasets
      */
-    getDataset: () => Promise<Datasets[]>;
+    getDatasets: () => Promise<Dataset[]>;
     query: (props: QueryInput) => Promise<any>;
     /**
      * Create a Table if it doesn't already exist.

package/google/bigQuery/GoogleBigQueryNamespace.js

@@ -43,11 +43,8 @@ class GoogleBigQueryNamespace extends _class_1.BaseNamespace {
             if (!this.client) {
                 try {
                     const { BigQuery } = await Promise.resolve().then(() => __importStar(require("@google-cloud/bigquery")));
-                    const formattedConfig = (0, server_1.getConfig)(this.config);
-                    this.client = new BigQuery({
-                        ...formattedConfig,
-                        projectId: this.config?.projectId,
-                    });
+                    const formattedConfig = (0, server_1.getConfig)(this.config, this.config?.projectId);
+                    this.client = new BigQuery(formattedConfig);
                 }
                 catch (e) {
                     throw new Error("Google BigQuery Client not installed");
@@ -87,7 +84,7 @@ class GoogleBigQueryNamespace extends _class_1.BaseNamespace {
         /**
          * Retrieve all the Datasets
          */
-        this.getDataset = async () => {
+        this.getDatasets = async () => {
             await this.ensureInit();
             let response = [];
             const datasets = await this.client.getDatasets();

package/google/server.d.ts

@@ -13,15 +13,17 @@ export type GoogleCloudConfig = {
 /**
  * Using the response from Parameter Store and format it ready to be used with Google API.
  */
-export declare const getConfig: (parameter: GoogleCloudConfig) => {
-    type: string;
-    project_id: string;
-    private_key_id: string;
-    private_key: string;
-    client_email: string;
-    client_id: string;
-    auth_uri: string;
-    token_uri: string;
-    auth_provider_x509_cert_url: string;
-    client_x509_cert_url: string;
+export declare const getConfig: (parameter: GoogleCloudConfig, projectId?: string) => {
+    credentials: {
+        type: string;
+        project_id: string;
+        private_key_id: string;
+        private_key: string;
+        client_email: string;
+        client_id: string;
+        auth_uri: string;
+        token_uri: string;
+        auth_provider_x509_cert_url: string;
+        client_x509_cert_url: string;
+    };
 };

package/google/server.js

@@ -4,21 +4,26 @@ exports.getConfig = void 0;
 /**
  * Using the response from Parameter Store and format it ready to be used with Google API.
  */
-const getConfig = (parameter) => {
+const getConfig = (parameter, projectId) => {
     // Format the private key to be in the same format as required by Google
     const privateKey = parameter["private_key"].replace(/\\n/g, "\n");
-    const response = {
-        type: parameter["type"],
-        project_id: parameter["project_id"],
-        private_key_id: parameter["private_key_id"],
-        private_key: privateKey,
-        client_email: parameter["client_email"],
-        client_id: parameter["client_id"],
-        auth_uri: parameter["auth_uri"],
-        token_uri: parameter["token_uri"],
-        auth_provider_x509_cert_url: parameter["auth_provider_x509_cert_url"],
-        client_x509_cert_url: parameter["client_x509_cert_url"],
+    let response = {
+        credentials: {
+            type: parameter["type"],
+            project_id: parameter["project_id"],
+            private_key_id: parameter["private_key_id"],
+            private_key: privateKey,
+            client_email: parameter["client_email"],
+            client_id: parameter["client_id"],
+            auth_uri: parameter["auth_uri"],
+            token_uri: parameter["token_uri"],
+            auth_provider_x509_cert_url: parameter["auth_provider_x509_cert_url"],
+            client_x509_cert_url: parameter["client_x509_cert_url"],
+        },
     };
+    if (projectId) {
+        response['projectId'] = projectId;
+    }
     return response;
 };
 exports.getConfig = getConfig;

package/google/sheets/GoogleSheetsNamespace.js

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

package/google/storage/GoogleCloudStorageNamespace.js

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

package/package.json

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

package/prisma/server.js

@@ -10,6 +10,7 @@ const prismaClient = async (key = "default", config) => {
     }
     if (!config) {
         if (key === "default") {
+            console.log('Library process.env.DATABASE_URL:', process.env.DATABASE_URL);
             config = {
                 url: process.env.DATABASE_URL,
                 isDebug: 'true' === process.env.DATABASE_IS_DEBUG,