spice-couchbase 2.0.42 → 2.0.43

package/build/index.js

@@ -483,19 +483,46 @@ module.exports = class Database {
       var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
       var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
 
-      function containsIdWithSpace(str) {
-        return /(?<=\W|^)(?!`)(?:(?:\w+`?\.)*)(?:\w+`?\.)?id(?<!`)(?!\w)/i.test(str);
-      }
+      function processColumns(columnsStr) {
+        // If columns is empty or *, return default
+        if (columnsStr === "*" || !columnsStr) {
+          return "(".concat(bucket, ").*, META(").concat(bucket, ").id AS id");
+        } // Split by comma and process each column
+
+
+        var columnList = columnsStr.split(",").map(col => col.trim());
+        var hasId = false;
+        var processedColumns = columnList.map(col => {
+          // Check if this column is an id field in various formats
+          // Patterns: `collection`.`id`, collection.id, `id`, id
+          var idPattern = /^(?:`?(\w+)`?\.)?`?id`?$/i;
+          var match = col.match(idPattern);
+
+          if (match) {
+            hasId = true; // match[1] contains the collection name if present
+
+            if (match[1]) {
+              // Has collection prefix: `collection`.`id` or collection.id
+              return "META(`".concat(match[1], "`).id AS id");
+            } else {
+              // Just id without collection prefix
+              return "META(".concat(bucket, ").id AS id");
+            }
+          } // Return the column as-is
 
-      try {
-        var fix = ", META(".concat(bucket, ").id AS id");
 
-        if (columns === "*" || !columns) {
-          columns = "(".concat(bucket, ").* ").concat(fix);
-        } else if (!containsIdWithSpace(columns)) {
-          columns = "".concat(columns).concat(fix);
+          return col;
+        }); // If no id column was provided, add it automatically
+
+        if (!hasId) {
+          processedColumns.push("META(".concat(bucket, ").id AS id"));
         }
 
+        return processedColumns.join(", ");
+      }
+
+      try {
+        columns = processColumns(columns);
         var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket, " ").concat(join);
         var conditions = [];
 

package/package.json

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

package/src/index.js

@@ -268,9 +268,8 @@ module.exports = class Database {
   async get(doc_id) {
     try {
       let response = await (
-        this.use_bucket_name ?
-          this.connection
-        : this.collection).get(doc_id);
+        this.use_bucket_name ? this.connection : this.collection
+      ).get(doc_id);
 
       return { id: doc_id, ...response.content };
     } catch (e) {
@@ -303,9 +302,8 @@ module.exports = class Database {
 
   async count(doc_id, adjustment, initial_value) {
     let res = await (
-      this.use_bucket_name ?
-        this.connection
-      : this.collection).counter(doc_id, adjustment, {
+      this.use_bucket_name ? this.connection : this.collection
+    ).counter(doc_id, adjustment, {
       initial: initial_value,
     });
     return res.value;
@@ -313,9 +311,8 @@ module.exports = class Database {
 
   async update(doc_id, document, expiry) {
     let res = await (
-      this.use_bucket_name ?
-        this.connection
-      : this.collection).replace(doc_id, document, {
+      this.use_bucket_name ? this.connection : this.collection
+    ).replace(doc_id, document, {
       expiry: expiry,
     });
     return res.value;
@@ -323,9 +320,8 @@ module.exports = class Database {
 
   async delete(doc_id) {
     let res = await (
-      this.use_bucket_name ?
-        this.connection
-      : this.collection).remove(doc_id);
+      this.use_bucket_name ? this.connection : this.collection
+    ).remove(doc_id);
     return res.value;
   }
 
@@ -428,20 +424,48 @@ module.exports = class Database {
       this.use_bucket_name ? this.bucket : this.collection_name
     }\``;
 
-    function containsIdWithSpace(str) {
-      return /(?<=\W|^)(?!`)(?:(?:\w+`?\.)*)(?:\w+`?\.)?id(?<!`)(?!\w)/i.test(
-        str
-      );
-    }
+    function processColumns(columnsStr) {
+      // If columns is empty or *, return default
+      if (columnsStr === "*" || !columnsStr) {
+        return `(${bucket}).*, META(${bucket}).id AS id`;
+      }
 
-    try {
-      const fix = `, META(${bucket}).id AS id`;
+      // Split by comma and process each column
+      const columnList = columnsStr.split(",").map((col) => col.trim());
+      let hasId = false;
+
+      const processedColumns = columnList.map((col) => {
+        // Check if this column is an id field in various formats
+        // Patterns: `collection`.`id`, collection.id, `id`, id
+        const idPattern = /^(?:`?(\w+)`?\.)?`?id`?$/i;
+        const match = col.match(idPattern);
+
+        if (match) {
+          hasId = true;
+          // match[1] contains the collection name if present
+          if (match[1]) {
+            // Has collection prefix: `collection`.`id` or collection.id
+            return `META(\`${match[1]}\`).id AS id`;
+          } else {
+            // Just id without collection prefix
+            return `META(${bucket}).id AS id`;
+          }
+        }
 
-      if (columns === "*" || !columns) {
-        columns = `(${bucket}).* ${fix}`;
-      } else if (!containsIdWithSpace(columns)) {
-        columns = `${columns}${fix}`;
+        // Return the column as-is
+        return col;
+      });
+
+      // If no id column was provided, add it automatically
+      if (!hasId) {
+        processedColumns.push(`META(${bucket}).id AS id`);
       }
+
+      return processedColumns.join(", ");
+    }
+
+    try {
+      columns = processColumns(columns);
       const front_query = `SELECT ${columns} FROM ${bucket} ${join}`;
       const conditions = [];