spice-couchbase 2.0.26 → 2.0.28

package/build/index.js

@@ -434,9 +434,11 @@ module.exports = class Database {
     }());
   }
 
-  search(type, columns, query) {
+  search(type) {
     var _this15 = this;
 
+    var columns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+    var query = arguments.length > 2 ? arguments[2] : undefined;
     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;
@@ -447,21 +449,19 @@ module.exports = class Database {
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
 
       function containsIdWithSpace(str) {
-        return /\b\.?id\b/i.test(str); // Updated regex to match "id" as a separate word or preceded by a dot (".id")
+        return /(?<=\W|^)(?!`)(?:(?:\w+`?\.)*)(?:\w+`?\.)?id(?<!`)(?!\w)/i.test(str);
       }
 
       try {
         var fix = ", META(".concat(bucket, ").id AS id");
 
         if (columns === "*" || !columns) {
-          columns = "(".concat(bucket, ").*");
-        } else if (columns !== "id") {
+          columns = "(".concat(bucket, ").* ").concat(fix);
+        } else if (!containsIdWithSpace(columns)) {
           columns = "".concat(columns).concat(fix);
-        } else {
-          columns = "";
         }
 
-        var front_query = "SELECT ".concat(columns, " ").concat(containsIdWithSpace(columns) ? "" : fix, " FROM ").concat(bucket);
+        var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket);
         var conditions = [];
 
         if (_this15.use_bucket_name) {

package/package.json

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

package/src/index.js

@@ -402,7 +402,7 @@ module.exports = class Database {
 
   async search(
     type,
-    columns,
+    columns = "",
     query,
     limit = 0,
     offset = 0,
@@ -417,23 +417,20 @@ module.exports = class Database {
     }\``;
 
     function containsIdWithSpace(str) {
-      return /\b\.?id\b/i.test(str); // Updated regex to match "id" as a separate word or preceded by a dot (".id")
+      return /(?<=\W|^)(?!`)(?:(?:\w+`?\.)*)(?:\w+`?\.)?id(?<!`)(?!\w)/i.test(
+        str
+      );
     }
 
     try {
       const fix = `, META(${bucket}).id AS id`;
 
       if (columns === "*" || !columns) {
-        columns = `(${bucket}).*`;
-      } else if (columns !== "id") {
+        columns = `(${bucket}).* ${fix}`;
+      } else if (!containsIdWithSpace(columns)) {
         columns = `${columns}${fix}`;
-      } else {
-        columns = "";
       }
-
-      const front_query = `SELECT ${columns} ${
-        containsIdWithSpace(columns) ? "" : fix
-      } FROM ${bucket}`;
+      const front_query = `SELECT ${columns} FROM ${bucket}`;
       const conditions = [];
 
       if (this.use_bucket_name) {