spice-couchbase 2.0.38 → 2.0.40

package/build/index.js

@@ -88,24 +88,24 @@ module.exports = class Database {
     }
   }
 
-  setGlobalConnectionObject(connection) {
+  setGlobalConnectionObject(collection) {
     if (spice.checked_collections == undefined) {
       spice.checked_collections = {};
     }
 
-    _.set(spice.checked_collections, connection, true);
+    _.set(spice.checked_collections, collection, true);
   }
 
-  checkGlobelConnectionObject(connection) {
+  checkGlobelConnectionObject(collection) {
     if (spice.checked_collections == undefined) {
       spice.checked_collections = {};
     }
 
-    if (_.get(spice.checked_collections, connection)) {
+    if (_.get(spice.checked_collections, collection)) {
       return true;
     }
 
-    this.setGlobalConnectionObject(connection);
+    this.setGlobalConnectionObject(collection);
     return false;
   }
 
@@ -177,9 +177,9 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var collection_exists = yield _this3.collectionExists(_this3.collection_name, _this3.scope_name);
-
         if (!_this3.checkGlobelConnectionObject(_this3.collection_name)) {
+          var collection_exists = yield _this3.collectionExists(_this3.collection_name, _this3.scope_name);
+
           if (!collection_exists) {
             yield _this3.createCollection(_this3.collection_name, _this3.scope_name);
             yield _this3.wait(2000);
@@ -476,7 +476,7 @@ module.exports = class Database {
     var order_by = arguments.length > 5 ? arguments[5] : undefined;
     var do_count = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : "false";
     var query_scope = arguments.length > 7 ? arguments[7] : undefined;
-    var join = arguments.length > 8 ? arguments[8] : undefined;
+    var join = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : "";
     return _asyncToGenerator(function* () {
       var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/index.js

@@ -91,21 +91,21 @@ module.exports = class Database {
     }
   }
 
-  setGlobalConnectionObject(connection) {
+  setGlobalConnectionObject(collection) {
     if (spice.checked_collections == undefined) {
       spice.checked_collections = {};
     }
-    _.set(spice.checked_collections, connection, true);
+    _.set(spice.checked_collections, collection, true);
   }
 
-  checkGlobelConnectionObject(connection) {
+  checkGlobelConnectionObject(collection) {
     if (spice.checked_collections == undefined) {
       spice.checked_collections = {};
     }
-    if (_.get(spice.checked_collections, connection)) {
+    if (_.get(spice.checked_collections, collection)) {
       return true;
     }
-    this.setGlobalConnectionObject(connection);
+    this.setGlobalConnectionObject(collection);
     return false;
   }
 
@@ -173,11 +173,11 @@ module.exports = class Database {
 
   async upsertCollection() {
     try {
-      let collection_exists = await this.collectionExists(
-        this.collection_name,
-        this.scope_name
-      );
       if (!this.checkGlobelConnectionObject(this.collection_name)) {
+        let collection_exists = await this.collectionExists(
+          this.collection_name,
+          this.scope_name
+        );
         if (!collection_exists) {
           await this.createCollection(this.collection_name, this.scope_name);
           await this.wait(2000);
@@ -267,9 +267,8 @@ module.exports = class Database {
 
   async get(doc_id) {
     try {
-      let response = await (this.use_bucket_name
-        ? this.connection
-        : this.collection
+      let response = await (
+        this.use_bucket_name ? this.connection : this.collection
       ).get(doc_id);
 
       return { id: doc_id, ...response.content };
@@ -302,9 +301,8 @@ module.exports = class Database {
   }
 
   async count(doc_id, adjustment, initial_value) {
-    let res = await (this.use_bucket_name
-      ? this.connection
-      : this.collection
+    let res = await (
+      this.use_bucket_name ? this.connection : this.collection
     ).counter(doc_id, adjustment, {
       initial: initial_value,
     });
@@ -312,17 +310,15 @@ module.exports = class Database {
   }
 
   async update(doc_id, document) {
-    let res = await (this.use_bucket_name
-      ? this.connection
-      : this.collection
+    let res = await (
+      this.use_bucket_name ? this.connection : this.collection
     ).replace(doc_id, document);
     return res.value;
   }
 
   async delete(doc_id) {
-    let res = await (this.use_bucket_name
-      ? this.connection
-      : this.collection
+    let res = await (
+      this.use_bucket_name ? this.connection : this.collection
     ).remove(doc_id);
     return res.value;
   }