spice-couchbase 2.0.42 → 2.0.44

package/build/index.js

@@ -299,12 +299,30 @@ module.exports = class Database {
   get(doc_id) {
     var _this8 = this;
 
+    var {
+      columns = []
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return _asyncToGenerator(function* () {
       try {
-        var response = yield (_this8.use_bucket_name ? _this8.connection : _this8.collection).get(doc_id);
-        return _objectSpread({
-          id: doc_id
-        }, response.content);
+        var useLookupIn = columns.length > 0;
+        var response = yield useLookupIn ? (_this8.use_bucket_name ? _this8.connection : _this8.collection).lookupIn(doc_id, columns.map(col => couchbase.LookupInSpec.get(col))) : (_this8.use_bucket_name ? _this8.connection : _this8.collection).get(doc_id);
+
+        if (useLookupIn) {
+          // lookupIn returns content array with each spec result
+          var value = {
+            id: doc_id
+          };
+          columns.forEach((col, colIndex) => {
+            if (response.content && response.content[colIndex]) {
+              value[col] = response.content[colIndex].value;
+            }
+          });
+          return value;
+        } else {
+          return _objectSpread({
+            id: doc_id
+          }, response.content);
+        }
       } catch (e) {
         console.error(e);
       }
@@ -368,16 +386,22 @@ module.exports = class Database {
     })();
   }
 
-  multi_get(keys, keep_type) {
+  multi_get(keys) {
     var _this14 = this;
 
+    var {
+      keep_type = true,
+      columns = []
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return _asyncToGenerator(function* () {
       if (keys.length == 0) {
         return [];
       }
 
       if (_.isArray(keys) && keys.length > 0) {
-        var functions = _.map(keys, key => (_this14.use_bucket_name ? _this14.connection : _this14.collection).get(key));
+        var useLookupIn = columns.length > 0;
+
+        var functions = _.map(keys, key => useLookupIn ? (_this14.use_bucket_name ? _this14.connection : _this14.collection).lookupIn(key, columns.map(col => couchbase.LookupInSpec.get(col))) : (_this14.use_bucket_name ? _this14.connection : _this14.collection).get(key));
 
         var returned_all = yield Promise.allSettled(functions);
 
@@ -385,16 +409,36 @@ module.exports = class Database {
           return returned_obj === null || returned_obj === void 0 ? void 0 : returned_obj.value;
         }));
 
-        return _.compact(_.map(responses, (res, index) => {
+        var final_responses = _.compact(_.map(responses, (res, index) => {
           if (res) {
-            if (!keep_type) {
-              delete res.value.type;
+            var value;
+
+            if (useLookupIn) {
+              // lookupIn returns content array with each spec result
+              value = {};
+              columns.forEach((col, colIndex) => {
+                if (res.content && res.content[colIndex]) {
+                  value[col] = res.content[colIndex].value;
+                }
+              });
+            } else {
+              // regular get returns the full document in value
+              value = res.value;
+            }
+
+            if (!keep_type && value) {
+              delete value.type;
             }
 
-            res.value.id = keys[index];
-            return res.value;
+            if (value) {
+              value.id = keys[index];
+            }
+
+            return value;
           }
         }));
+
+        return final_responses;
       } else {
         return [];
       }
@@ -483,19 +527,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
 
-      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);
+        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
+
+
+          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.44",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.26.1",
-    "couchbase": "^4.2.7",
+    "couchbase": "^4.6.0",
     "lodash": "^4.17.15",
     "qs": "^6.10.3"
   },

package/src/index.js

@@ -265,14 +265,30 @@ module.exports = class Database {
     }
   }
 
-  async get(doc_id) {
+  async get(doc_id, { columns = [] } = {}) {
     try {
+      const useLookupIn = columns.length > 0;
       let response = await (
-        this.use_bucket_name ?
-          this.connection
-        : this.collection).get(doc_id);
+        useLookupIn ?
+          (this.use_bucket_name ? this.connection : this.collection).lookupIn(
+            doc_id,
+            columns.map((col) => couchbase.LookupInSpec.get(col))
+          )
+        : (this.use_bucket_name ? this.connection : this.collection).get(doc_id)
+      );
 
-      return { id: doc_id, ...response.content };
+      if (useLookupIn) {
+        // lookupIn returns content array with each spec result
+        let value = { id: doc_id };
+        columns.forEach((col, colIndex) => {
+          if (response.content && response.content[colIndex]) {
+            value[col] = response.content[colIndex].value;
+          }
+        });
+        return value;
+      } else {
+        return { id: doc_id, ...response.content };
+      }
     } catch (e) {
       console.error(e);
     }
@@ -329,33 +345,60 @@ module.exports = class Database {
     return res.value;
   }
 
-  async multi_get(keys, keep_type) {
+  async multi_get(keys, { keep_type = true, columns = [] } = {}) {
     if (keys.length == 0) {
       return [];
     }
     if (_.isArray(keys) && keys.length > 0) {
+      const useLookupIn = columns.length > 0;
       let functions = _.map(keys, (key) =>
-        (this.use_bucket_name ? this.connection : this.collection).get(key)
+        useLookupIn ?
+          (this.use_bucket_name ? this.connection : this.collection).lookupIn(
+            key,
+            columns.map((col) => couchbase.LookupInSpec.get(col))
+          )
+        : (this.use_bucket_name ? this.connection : this.collection).get(key)
       );
       let returned_all = await Promise.allSettled(functions);
 
+      
+
       let responses = _.flatten(
         _.map(returned_all, (returned_obj) => {
           return returned_obj?.value;
         })
       );
 
-      return _.compact(
+
+      let final_responses = _.compact(
         _.map(responses, (res, index) => {
           if (res) {
-            if (!keep_type) {
-              delete res.value.type;
+            let value;
+            if (useLookupIn) {
+              // lookupIn returns content array with each spec result
+              value = {};
+              columns.forEach((col, colIndex) => {
+                if (res.content && res.content[colIndex]) {
+                  value[col] = res.content[colIndex].value;
+                }
+              });
+            } else {
+              // regular get returns the full document in value
+              value = res.value;
+            }
+
+            if (!keep_type && value) {
+              delete value.type;
+            }
+            if (value) {
+              value.id = keys[index];
             }
-            res.value.id = keys[index];
-            return res.value;
+            return value;
           }
         })
       );
+
+      return final_responses;
     } else {
       return [];
     }
@@ -428,20 +471,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 = [];