spice-couchbase 2.0.22 → 2.0.25

package/build/index.js

@@ -347,18 +347,20 @@ module.exports = class Database {
 
         var returned_all = yield Promise.allSettled(functions);
 
-        var responses = _.flatten(_.compact(_.map(returned_all, returned_obj => {
-          if (returned_obj.status == "fulfilled") return returned_obj.value;
-        })));
+        var responses = _.flatten(_.map(returned_all, returned_obj => {
+          return returned_obj === null || returned_obj === void 0 ? void 0 : returned_obj.value;
+        }));
+
+        return _.compact(_.map(responses, (res, index) => {
+          if (res) {
+            if (!keep_type) {
+              delete res.value.type;
+            }
 
-        return _.map(responses, (res, index) => {
-          if (!keep_type) {
-            delete res.value.type;
+            res.value.id = keys[index];
+            return res.value;
           }
-
-          res.value.id = keys[index];
-          return res.value;
-        });
+        }));
       } else {
         return [];
       }
@@ -432,52 +434,34 @@ module.exports = class Database {
     }());
   }
 
-  search(type, columns, query, limit, offset, order_by, do_count, query_scope) {
+  search(type, columns, query) {
     var _this15 = this;
 
+    var limit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+    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;
     return _asyncToGenerator(function* () {
       var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
-      var alias = "_reference";
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
 
-      try {
-        //let uses_scopes = this.scope this.scope_name !== "_default";
-        if (do_count == undefined) {
-          do_count = "false";
-        }
-
-        var fix = "";
-        var count_query = "";
-
-        if (!limit) {
-          limit = 0;
-        }
-
-        if (!offset) {
-          offset = 0;
-        }
-
-        if (columns == "*") {
-          columns = "(" + bucket + ").*";
-          fix = ", META(" + bucket + ").id  AS id";
-        }
+      function containsIdWithSpace(str) {
+        return /\bid/i.test(str); // \b for word boundary, 'i' flag for case-insensitive matching
+      }
 
-        if (!columns) {
-          columns = "(" + bucket + ").*";
-          fix = ", META(" + bucket + ").id AS id";
-        }
+      try {
+        var fix = ", META(".concat(bucket, ").id AS id");
 
-        if (columns == "id") {
-          fix = ", META(" + bucket + ").id AS id";
+        if (columns === "*" || !columns) {
+          columns = "(".concat(bucket, ").*");
+        } else if (columns !== "id") {
+          columns = "".concat(columns).concat(fix);
+        } else {
           columns = "";
         }
 
-        var front_query = "SELECT ".concat(columns, " ").concat(fix, " FROM ").concat(bucket);
-
-        if (is_legacy || query) {
-          front_query += " WHERE ";
-        }
-
+        var front_query = "SELECT ".concat(columns, " ").concat(containsIdWithSpace(columns) ? "" : fix, " FROM ").concat(bucket);
         var conditions = [];
 
         if (_this15.use_bucket_name) {
@@ -488,27 +472,13 @@ module.exports = class Database {
           conditions.push(query);
         }
 
-        query = front_query + conditions.join(" AND ");
-        count_query = "SELECT count(meta().id) as count FROM ".concat(bucket);
-
-        if (_this15.use_bucket_name || query) {
-          count_query += " WHERE ";
-        }
-
-        query = front_query + conditions.join(" AND ");
-
-        if (order_by) {
-          query = "".concat(query, " ORDER BY ").concat(order_by);
-        }
-
-        if (limit > 0) {
-          query = query + " LIMIT " + limit;
-        }
-
-        if (offset > 0) {
-          query = query + " OFFSET " + offset;
-        }
-
+        var where_clause = conditions.length ? " WHERE " : "";
+        query = front_query + where_clause + conditions.join(" AND ");
+        var count_query = "SELECT count(meta().id) as count FROM ".concat(bucket).concat(where_clause);
+        var order_by_clause = order_by ? " ORDER BY ".concat(order_by) : "";
+        var limit_clause = limit > 0 ? " LIMIT ".concat(limit) : "";
+        var offset_clause = offset > 0 ? " OFFSET ".concat(offset) : "";
+        query = query + order_by_clause + limit_clause + offset_clause;
         var active_query_space = query_scope || !_this15.use_bucket_name ? "scope" : "cluster";
         var queries = [_this15.getData(query, active_query_space)];
 

package/package.json

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

package/src/index.js

@@ -329,20 +329,22 @@ module.exports = class Database {
       let returned_all = await Promise.allSettled(functions);
 
       let responses = _.flatten(
-        _.compact(
-          _.map(returned_all, (returned_obj) => {
-            if (returned_obj.status == "fulfilled") return returned_obj.value;
-          })
-        )
+        _.map(returned_all, (returned_obj) => {
+          return returned_obj?.value;
+        })
       );
 
-      return _.map(responses, (res, index) => {
-        if (!keep_type) {
-          delete res.value.type;
-        }
-        res.value.id = keys[index];
-        return res.value;
-      });
+      return _.compact(
+        _.map(responses, (res, index) => {
+          if (res) {
+            if (!keep_type) {
+              delete res.value.type;
+            }
+            res.value.id = keys[index];
+            return res.value;
+          }
+        })
+      );
     } else {
       return [];
     }
@@ -414,6 +416,10 @@ module.exports = class Database {
       this.use_bucket_name ? this.bucket : this.collection_name
     }\``;
 
+    function containsIdWithSpace(str) {
+      return /\bid/i.test(str); // \b for word boundary, 'i' flag for case-insensitive matching
+    }
+
     try {
       const fix = `, META(${bucket}).id AS id`;
 
@@ -425,7 +431,7 @@ module.exports = class Database {
         columns = "";
       }
 
-      const front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
+      const front_query = `SELECT ${columns} ${containsIdWithSpace(columns) ? "" : fix} FROM ${bucket}`;
       const conditions = [];
 
       if (this.use_bucket_name) {