@pi-r/gcp 0.8.3 → 0.8.5

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2024 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/client/index.js

@@ -124,6 +124,10 @@ const asFieldPath = (params) => Array.isArray(params) && params.every(item => ty
 const getFirebasePackageName = (credential) => credential.apiKey && credential.authDomain ? 'firebase' : 'firebase-admin';
 const isErrorConflict = (err) => (err instanceof Error) && err.code === 409;
 const hasGoogleAuth = (credential) => (0, types_1.isString)(credential.keyFilename || credential.keyFile || process.env.GOOGLE_APPLICATION_CREDENTIALS) || (0, types_1.isObject)(credential.credentials) || !!credential.authClient;
+const isSpanner = (data) => data.product === "spanner" || !data.product && !!(data.name && data.database && (data.query || data.table));
+const isBigtable = (data) => data.product === "bigtable" || !data.product && !!(data.name && data.table && !data.database);
+const isBigQuery = (data) => data.product === "bigquery" || !data.product && !!(!data.name && data.table && data.database || (0, types_1.isString)(data.query) || (0, types_1.isString)(data.options?.query));
+const isDatastore = (data) => data.product === "datastore" || !data.product && !!(data.keys || data.kind || data.query && !data.table && !data.id);
 function isFirebaseApp(credential, store, admin) {
     return !!(credential.apiKey && credential.authDomain && (store || credential.databaseURL) || credential.product === "firebase" && process.env.GOOGLE_APPLICATION_CREDENTIALS) && (!admin || !credential.admin);
 }
@@ -160,20 +164,19 @@ function createDatabaseClient(credential, data) {
         }
         getProjectId(credential, true);
         if (data) {
-            const { product, name, table, query, database } = data;
-            if (product === "spanner" || !product && name && database && (query || table)) {
+            if (isSpanner(data)) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
                 return new Spanner(credential);
             }
-            if (product === "bigquery" || !product && (!name && table && database || (0, types_1.isString)(query))) {
-                const { BigQuery } = require(packageName = '@google-cloud/bigquery');
-                return new BigQuery(credential);
-            }
-            if (product === "bigtable" || !product && name && table && !database) {
+            if (isBigtable(data)) {
                 const { Bigtable } = require(packageName = '@google-cloud/bigtable');
                 return new Bigtable(credential);
             }
-            if (product === "datastore" || !product && (data.keys || data.kind || query && !table && !data.id)) {
+            if (isBigQuery(data)) {
+                const { BigQuery } = require(packageName = '@google-cloud/bigquery');
+                return new BigQuery(credential);
+            }
+            if (isDatastore(data)) {
                 const { Datastore } = require(packageName = '@google-cloud/datastore');
                 return new Datastore(credential);
             }
@@ -504,7 +507,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = [group && (0, types_1.isObject)(val) && (0, types_1.isObject)(val[group[0]]) ? val[group[0]] : val];
             }
         }
-        else if (product === "spanner" || !product && name && database && (query || table)) {
+        else if (isSpanner(item)) {
             const columns = (0, types_1.isPlainObject)(query) && query.columns || item.columns;
             if (!(query || table && columns)) {
                 closeClient();
@@ -567,7 +570,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 [rows] = await db.run(request);
             }
         }
-        else if (product === "bigtable" || !product && name && table && !database) {
+        else if (isBigtable(item)) {
             if (!name || !table) {
                 closeClient();
                 throw (0, util_1.formatError)(item, !name ? "Missing database name" : "Missing database table");
@@ -613,7 +616,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 });
             }
         }
-        else if (product === "bigquery" || !product && (!name && database && table || (0, types_1.isString)(query) || (0, types_1.isString)(item.options?.query))) {
+        else if (isBigQuery(item)) {
             const { params, options = {} } = item;
             if ((0, types_1.isString)(query)) {
                 options.query = query;
@@ -655,7 +658,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 [rows] = await instance.query(options);
             }
         }
-        else if (product === "datastore" || !product && (item.keys || item.kind || query && !table && !id)) {
+        else if (isDatastore(item)) {
             const { keys, kind, options } = item;
             if (!keys && !kind && !Array.isArray(query)) {
                 closeClient();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/module": "^0.10.3",
-    "@e-mc/types": "^0.10.3",
+    "@e-mc/cloud": "^0.10.20",
+    "@e-mc/module": "^0.10.20",
+    "@e-mc/types": "^0.10.20",
     "@google-cloud/firestore": "^7.10.0",
     "@google-cloud/storage": "^7.13.0"
   }