spice-couchbase 2.0.17 → 2.0.20

package/build/index.js

@@ -20,6 +20,10 @@ var {
 
 var qs = require("qs");
 
+var {
+  ConflictResolutionType
+} = require("couchbase");
+
 if (!Promise.allSettled) {
   Promise.allSettled = promises => Promise.all(promises.map((promise, i) => promise.then(value => ({
     status: "fulfilled",
@@ -50,17 +54,26 @@ module.exports = class Database {
       this.collection_manager = spice.database.buckets[connection].collections();
       this.auto_create_collection = auto_create_collection || (collection || spice.config.database.connections[connection].collection) != undefined && (collection || spice.config.database.connections[connection].collection) != "default" && (scope || spice.config.database.connections[connection].scope) != "_default";
       this.collection_name = collection || spice.config.database.connections[connection].collection || "_default";
+      /* console.log(
+        "Collection",
+        collection,
+        spice.config.database.connections[connection].collection,
+        this.collection_name 
+      );*/
+
       this.scope_name = scope || spice.config.database.connections[connection].scope || "_default";
       this.scope = spice.database.scopes[connection];
       this.full_text_index = spice.config.database.connections[connection].full_text_index || full_text_index;
       this.N1qlQuery = couchbase.N1qlQuery;
       this.SearchQuery = couchbase.SearchQuery;
-      this.connection = this.scope.collection(this.collection_name);
+      this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
 
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
+
+      this.use_bucket_name = spice.config.database.connections[this.connection_name].scope == undefined;
     }
   }
 
@@ -228,7 +241,7 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var response = yield _this8.connection.get(doc_id);
+        var response = yield (_this8.use_bucket_name ? _this8.connection : _this8.collection).get(doc_id);
         return _objectSpread({
           id: doc_id
         }, response.content);
@@ -239,56 +252,32 @@ module.exports = class Database {
   }
 
   insert(doc_id, document, expiry) {
-    var that = this;
-    return new Promise(
-    /*#__PURE__*/
-    function () {
-      var _ref = _asyncToGenerator(function* (resolve, reject) {
-        that.connection.insert(doc_id, document, {
-          expiry: expiry
-        },
-        /*#__PURE__*/
-        function () {
-          var _ref2 = _asyncToGenerator(function* (err, res) {
-            if (err) {
-              reject(err);
-            } else {
-              try {
-                var created = yield that.get(doc_id);
-                resolve(created);
-              } catch (e) {
-                reject(e);
-              }
-            }
-          });
+    var _this9 = this;
 
-          return function (_x3, _x4) {
-            return _ref2.apply(this, arguments);
-          };
-        }());
+    return _asyncToGenerator(function* () {
+      console.log("insert", _this9.use_bucket_name, _this9.connection._name, _this9.collection._name);
+      yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
+        expiry: expiry
       });
-
-      return function (_x, _x2) {
-        return _ref.apply(this, arguments);
-      };
-    }());
+      return yield _this9.get(doc_id);
+    })();
   }
 
   touch(doc_id) {
-    var _this9 = this;
+    var _this10 = this;
 
     var expiry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     return _asyncToGenerator(function* () {
-      yield _this9.connection.touch(doc_id, expiry);
-      return yield that.get(doc_id);
+      yield (_this10.use_bucket_name ? _this10.connection : _this10.collection).touch(doc_id, expiry);
+      return yield _this10.get(doc_id);
     })();
   }
 
   count(doc_id, adjustment, initial_value) {
-    var _this10 = this;
+    var _this11 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield _this10.connection.counter(doc_id, adjustment, {
+      var res = yield (_this11.use_bucket_name ? _this11.connection : _this11.collection).counter(doc_id, adjustment, {
         initial: initial_value
       });
       return res.value;
@@ -296,25 +285,25 @@ module.exports = class Database {
   }
 
   update(doc_id, document) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield _this11.connection.replace(doc_id, document);
+      var res = yield (_this12.use_bucket_name ? _this12.connection : _this12.collection).replace(doc_id, document);
       return res.value;
     })();
   }
 
   delete(doc_id) {
-    var _this12 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield _this12.connection.remove(doc_id);
+      var res = yield (_this13.use_bucket_name ? _this13.connection : _this13.collection).remove(doc_id);
       return res.value;
     })();
   }
 
   multi_get(keys, keep_type) {
-    var _this13 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
       /* var that = this; */
@@ -326,7 +315,7 @@ module.exports = class Database {
 
 
       if (_.isArray(keys) && keys.length > 0) {
-        var functions = _.map(keys, key => _this13.connection.get(key));
+        var functions = _.map(keys, key => (_this14.use_bucket_name ? _this14.connection : _this14.collection).get(key));
 
         var returned_all = yield Promise.allSettled(functions);
 
@@ -353,7 +342,7 @@ module.exports = class Database {
     return new Promise(
     /*#__PURE__*/
     function () {
-      var _ref3 = _asyncToGenerator(function* (resolve, reject) {
+      var _ref = _asyncToGenerator(function* (resolve, reject) {
         var ViewQuery = couchbase.ViewQuery;
         var query = ViewQuery.from(design_doc, view);
 
@@ -380,7 +369,7 @@ module.exports = class Database {
         that.connection.query(query,
         /*#__PURE__*/
         function () {
-          var _ref4 = _asyncToGenerator(function* (err, results, matrix) {
+          var _ref2 = _asyncToGenerator(function* (err, results, matrix) {
             var return_value = [];
 
             if (err) {
@@ -403,26 +392,25 @@ module.exports = class Database {
             }
           });
 
-          return function (_x7, _x8, _x9) {
-            return _ref4.apply(this, arguments);
+          return function (_x3, _x4, _x5) {
+            return _ref2.apply(this, arguments);
           };
         }());
       });
 
-      return function (_x5, _x6) {
-        return _ref3.apply(this, arguments);
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
       };
     }());
   }
 
   search(type, columns, query, limit, offset, order_by, do_count, query_scope) {
-    var _this14 = this;
+    var _this15 = this;
 
     return _asyncToGenerator(function* () {
-      var use_bucket_name = !(spice.config.database.connections[_this14.connection_name].scope && spice.config.database.connections[_this14.connection_name].collection);
-      var is_legacy = _this14.scope_name !== "_default" && _this14.collection_name !== "_default";
+      var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
       var alias = "_reference";
-      var bucket = "`".concat(use_bucket_name ? _this14.bucket : _this14.collection_name, "`");
+      var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
 
       try {
         //let uses_scopes = this.scope this.scope_name !== "_default";
@@ -464,7 +452,7 @@ module.exports = class Database {
 
         var conditions = [];
 
-        if (use_bucket_name) {
+        if (_this15.use_bucket_name) {
           conditions.push("type = '".concat(type, "'"));
         }
 
@@ -475,7 +463,7 @@ module.exports = class Database {
         query = front_query + conditions.join(" AND ");
         count_query = "SELECT count(meta().id) as count FROM ".concat(bucket);
 
-        if (use_bucket_name || query) {
+        if (_this15.use_bucket_name || query) {
           count_query += " WHERE ";
         }
 
@@ -493,11 +481,11 @@ module.exports = class Database {
           query = query + " OFFSET " + offset;
         }
 
-        var active_query_space = query_scope || !use_bucket_name ? "scope" : "cluster";
-        var queries = [_this14.getData(query, active_query_space)];
+        var active_query_space = query_scope || !_this15.use_bucket_name ? "scope" : "cluster";
+        var queries = [_this15.getData(query, active_query_space)];
 
         if (do_count === "true") {
-          queries.push(_this14.getCount(count_query, active_query_space));
+          queries.push(_this15.getCount(count_query, active_query_space));
         }
 
         var responses = yield Promise.all(queries);
@@ -518,7 +506,7 @@ module.exports = class Database {
     return new Promise(
     /*#__PURE__*/
     function () {
-      var _ref5 = _asyncToGenerator(function* (resolve, reject) {
+      var _ref3 = _asyncToGenerator(function* (resolve, reject) {
         try {
           var full_query = search_query + " AND type:" + type;
           var query = that.SearchQuery.new(that.full_text_index || full_text_index, that.SearchQuery.queryString(full_query));
@@ -539,7 +527,7 @@ module.exports = class Database {
           that.cluster.query(query,
           /*#__PURE__*/
           function () {
-            var _ref6 = _asyncToGenerator(function* (err, results, matrix) {
+            var _ref4 = _asyncToGenerator(function* (err, results, matrix) {
               var return_value = [];
 
               if (err) {
@@ -565,8 +553,8 @@ module.exports = class Database {
               }
             });
 
-            return function (_x12, _x13, _x14) {
-              return _ref6.apply(this, arguments);
+            return function (_x8, _x9, _x10) {
+              return _ref4.apply(this, arguments);
             };
           }());
         } catch (e) {
@@ -574,43 +562,43 @@ module.exports = class Database {
         }
       });
 
-      return function (_x10, _x11) {
-        return _ref5.apply(this, arguments);
+      return function (_x6, _x7) {
+        return _ref3.apply(this, arguments);
       };
     }());
   }
 
   getCount(count_query_element) {
-    var _this15 = this;
+    var _this16 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this15.query(count_query_element, query_scope);
+      var response = yield _this16.query(count_query_element, query_scope);
       return response.rows[0].count;
     })();
   }
 
   getData(query_element) {
-    var _this16 = this;
+    var _this17 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this16.query(query_element, query_scope);
+      var response = yield _this17.query(query_element, query_scope);
       return response.rows;
     })();
   }
 
   query(query) {
-    var _this17 = this;
+    var _this18 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var scope = query_scope || _this17.query_scope;
+      var scope = query_scope || _this18.query_scope;
 
       if (scope == "cluster") {
-        return yield _this17.cluster.query(query);
+        return yield _this18.cluster.query(query);
       } else {
-        return yield _this17.scope.query(query);
+        return yield _this18.scope.query(query);
       }
     })();
   }

package/package.json

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

package/src/index.js

@@ -4,6 +4,7 @@ let _ = require("lodash");
 let couchbase = require("couchbase");
 const { default: axios } = require("axios");
 var qs = require("qs");
+const { ConflictResolutionType } = require("couchbase");
 
 if (!Promise.allSettled) {
   Promise.allSettled = (promises) =>
@@ -51,10 +52,17 @@ module.exports = class Database {
             "default" &&
           (scope || spice.config.database.connections[connection].scope) !=
             "_default");
+
       this.collection_name =
         collection ||
         spice.config.database.connections[connection].collection ||
         "_default";
+      /* console.log(
+        "Collection",
+        collection,
+        spice.config.database.connections[connection].collection,
+        this.collection_name 
+      );*/
       this.scope_name =
         scope ||
         spice.config.database.connections[connection].scope ||
@@ -65,16 +73,15 @@ module.exports = class Database {
         full_text_index;
       this.N1qlQuery = couchbase.N1qlQuery;
       this.SearchQuery = couchbase.SearchQuery;
-      this.connection = this.scope.collection(this.collection_name);
+      this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
 
-      this.use_bucket_name = !(
-        spice.config.database.connections[this.connection_name].scope &&
-        spice.config.database.connections[this.connection_name].collection
-      );
+      this.use_bucket_name =
+        spice.config.database.connections[this.connection_name].scope ==
+        undefined;
     }
   }
 
@@ -238,6 +245,12 @@ module.exports = class Database {
   }
 
   async insert(doc_id, document, expiry) {
+    console.log(
+      "insert",
+      this.use_bucket_name,
+      this.connection._name,
+      this.collection._name
+    );
     await (this.use_bucket_name ? this.connection : this.collection).insert(
       doc_id,
       document,