@pi-r/gcp 0.6.2 → 0.6.3

package/client/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
 const path = require("path");
 const storage = require("@google-cloud/storage");
-const firestore = require("@google-cloud/firestore");
+const firestore_1 = require("@google-cloud/firestore");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -135,7 +135,7 @@ function createStorageClient(credential, bucket) {
             throw err;
         }
     }
-    getProjectId(credential);
+    getProjectId(credential, false);
     return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
@@ -144,13 +144,13 @@ function createDatabaseClient(credential, data) {
     try {
         let product, name, database, table, query;
         if (data) {
-            ({ product, name, table, query } = data);
+            ({ product, name, table, query, database } = data);
         }
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
-        getProjectId(credential);
+        getProjectId(credential, true);
         if (data) {
             if (product === 'spanner' || !product && name && database && (query || table)) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
@@ -174,7 +174,7 @@ function createDatabaseClient(credential, data) {
         this.checkPackage(err, packageName, { passThrough: true });
         throw err;
     }
-    return new firestore.Firestore(credential);
+    return new firestore_1.Firestore(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'gcp') {
@@ -700,7 +700,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     if ((0, types_1.isPlainObject)(item.options)) {
                         items.push(item.options);
                     }
-                    rows = await db.getAll(...items);
+                    rows = (await db.getAll(...items)).filter(value => value.exists).map(value => value.data());
                 }
                 else {
                     const doc = db.collection(table).doc(id);
@@ -723,7 +723,17 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 for (const args of query) {
                     if ((0, types_1.isArray)(args)) {
                         const method = args[0];
+                        const params = args.slice(1);
                         switch (method) {
+                            case 'whereAnd':
+                            case 'whereOr':
+                                if (params.every(p => Array.isArray(p))) {
+                                    db = db.where(firestore_1.Filter[method === 'whereAnd' ? 'and' : 'or'](...params.map((p) => firestore_1.Filter.where(p[0], p[1], p[2]))));
+                                }
+                                else {
+                                    throw (0, types_1.errorMessage)(method, 'Conditionals are not in array format', Cloud.asString(params));
+                                }
+                                break;
                             case 'endAt':
                             case 'endBefore':
                             case 'limit':
@@ -735,7 +745,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                             case 'startAt':
                             case 'where':
                             case 'withConverter':
-                                db = db[method].apply(db, args.slice(1)); // eslint-disable-line prefer-spread
+                                db = db[method].apply(db, params); // eslint-disable-line prefer-spread
                                 break;
                         }
                     }
@@ -888,19 +898,24 @@ function createBucketRequest(credential) {
     return options;
 }
 exports.createBucketRequest = createBucketRequest;
-function getProjectId(credential) {
+function getProjectId(credential, cache) {
+    let projectId = credential.projectId;
+    if (!cache && projectId) {
+        return projectId;
+    }
     let pathname = credential.keyFilename || credential.keyFile;
-    if (pathname && Module.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Module.isPath(pathname = path.resolve(pathname))) {
+    if (pathname && Cloud.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Cloud.isPath(pathname = path.resolve(pathname))) {
         if (credential.keyFilename) {
             credential.keyFilename = pathname;
         }
         else {
             credential.keyFile = pathname;
         }
-        if (!credential.projectId) {
+        if (!projectId) {
             try {
-                const projectId = require(pathname).project_id;
-                if ((0, types_1.isString)(projectId)) {
+                const id = require(pathname).project_id;
+                if ((0, types_1.isString)(id)) {
+                    projectId = id;
                     credential.projectId = projectId;
                 }
             }
@@ -908,6 +923,6 @@ function getProjectId(credential) {
             }
         }
     }
-    return credential.projectId;
+    return projectId;
 }
 exports.getProjectId = getProjectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/gcp"
   },
   "keywords": [
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.2",
-    "@e-mc/module": "^0.8.2",
-    "@e-mc/types": "^0.8.2",
+    "@e-mc/cloud": "^0.8.3",
+    "@e-mc/module": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
     "@google-cloud/firestore": "^7.2.0",
     "@google-cloud/storage": "^7.7.0"
   }