couchbase 4.0.0 → 4.1.2

package/dist/sdspecs.js

@@ -124,10 +124,12 @@ class LookupInSpec {
         let flags = 0;
         if (path instanceof LookupInMacro) {
             path = path._value;
-            flags |= binding_1.default.lookup_in_path_flag.xattr;
+            flags |=
+                binding_1.default.protocol_lookup_in_request_body_lookup_in_specs_path_flag.xattr;
         }
         if (options.xattr) {
-            flags |= binding_1.default.lookup_in_path_flag.xattr;
+            flags |=
+                binding_1.default.protocol_lookup_in_request_body_lookup_in_specs_path_flag.xattr;
         }
         return new LookupInSpec(op, path, flags);
     }
@@ -142,9 +144,9 @@ class LookupInSpec {
      */
     static get(path, options) {
         if (!path) {
-            return this._create(binding_1.default.subdoc_opcode.get_doc, '', options);
+            return this._create(binding_1.default.protocol_subdoc_opcode.get_doc, '', options);
         }
-        return this._create(binding_1.default.subdoc_opcode.get, path, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.get, path, options);
     }
     /**
      * Returns whether a specific field exists in the document.
@@ -156,7 +158,7 @@ class LookupInSpec {
      * attributes data for the document.
      */
     static exists(path, options) {
-        return this._create(binding_1.default.subdoc_opcode.exists, path, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.exists, path, options);
     }
     /**
      * Returns the number of elements in the array reference by the path.
@@ -168,7 +170,7 @@ class LookupInSpec {
      * attributes data for the document.
      */
     static count(path, options) {
-        return this._create(binding_1.default.subdoc_opcode.get_count, path, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.get_count, path, options);
     }
 }
 exports.LookupInSpec = LookupInSpec;
@@ -200,13 +202,18 @@ class MutateInSpec {
         let flags = 0;
         if (value instanceof MutateInMacro) {
             value = value._value;
-            flags |= binding_1.default.mutate_in_path_flag.expand_macros;
+            flags |=
+                binding_1.default.protocol_mutate_in_request_body_mutate_in_specs_path_flag
+                    .expand_macros;
         }
         if (options.createPath) {
-            flags |= binding_1.default.mutate_in_path_flag.create_parents;
+            flags |=
+                binding_1.default.protocol_mutate_in_request_body_mutate_in_specs_path_flag
+                    .create_parents;
         }
         if (options.xattr) {
-            flags |= binding_1.default.mutate_in_path_flag.xattr;
+            flags |=
+                binding_1.default.protocol_mutate_in_request_body_mutate_in_specs_path_flag.xattr;
         }
         if (value !== undefined) {
             // BUG(JSCBC-755): As a solution to our oversight of not accepting arrays of
@@ -239,7 +246,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static insert(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.dict_add, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.dict_add, path, value, options);
     }
     /**
      * Creates a MutateInSpec for upserting a field on a document.  This updates
@@ -257,9 +264,9 @@ class MutateInSpec {
      */
     static upsert(path, value, options) {
         if (!path) {
-            return this._create(binding_1.default.subdoc_opcode.set_doc, '', value, options);
+            return this._create(binding_1.default.protocol_subdoc_opcode.set_doc, '', value, options);
         }
-        return this._create(binding_1.default.subdoc_opcode.dict_upsert, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.dict_upsert, path, value, options);
     }
     /**
      * Creates a MutateInSpec for replacing a field on a document.  This updates
@@ -273,7 +280,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static replace(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.replace, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.replace, path, value, options);
     }
     /**
      * Creates a MutateInSpec for remove a field from a document.
@@ -286,9 +293,9 @@ class MutateInSpec {
      */
     static remove(path, options) {
         if (!path) {
-            return this._create(binding_1.default.subdoc_opcode.remove_doc, '', undefined, options);
+            return this._create(binding_1.default.protocol_subdoc_opcode.remove_doc, '', undefined, options);
         }
-        return this._create(binding_1.default.subdoc_opcode.remove, path, undefined, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.remove, path, undefined, options);
     }
     /**
      * Creates a MutateInSpec for adding a value to the end of an array in a document.
@@ -307,7 +314,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static arrayAppend(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.array_push_last, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.array_push_last, path, value, options);
     }
     /**
      * Creates a MutateInSpec for adding a value to the beginning of an array in a document.
@@ -326,7 +333,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static arrayPrepend(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.array_push_first, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.array_push_first, path, value, options);
     }
     /**
      * Creates a MutateInSpec for adding a value to a specified location in an array in a
@@ -347,7 +354,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static arrayInsert(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.array_insert, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.array_insert, path, value, options);
     }
     /**
      * Creates a MutateInSpec for adding unique values to an array in a document.  This
@@ -367,7 +374,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static arrayAddUnique(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.array_add_unique, path, value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.array_add_unique, path, value, options);
     }
     /**
      * Creates a MutateInSpec for incrementing the value of a field in a document.
@@ -383,7 +390,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static increment(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.counter, path, +value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.counter, path, +value, options);
     }
     /**
      * Creates a MutateInSpec for decrementing the value of a field in a document.
@@ -399,7 +406,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static decrement(path, value, options) {
-        return this._create(binding_1.default.subdoc_opcode.counter, path, +value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.counter, path, +value, options);
     }
 }
 exports.MutateInSpec = MutateInSpec;

package/dist/searchexecutor.js

@@ -26,41 +26,43 @@ class SearchExecutor {
             });
         });
         const timeout = options.timeout || this._cluster.searchTimeout;
-        this._cluster.conn.searchQuery({
+        this._cluster.conn.search({
             timeout,
             index_name: indexName,
             query: JSON.stringify(query),
             limit: options.limit,
             skip: options.skip,
-            explain: options.explain,
-            disable_scoring: options.disableScoring,
-            include_locations: options.includeLocations,
+            explain: options.explain || false,
+            disable_scoring: options.disableScoring || false,
+            include_locations: options.includeLocations || false,
             highlight_style: options.highlight
                 ? (0, bindingutilities_1.searchHighlightStyleToCpp)(options.highlight.style)
                 : undefined,
-            highlight_fields: options.highlight
+            highlight_fields: options.highlight && options.highlight.fields
                 ? options.highlight.fields
-                : undefined,
-            fields: options.fields,
-            collections: options.collections,
+                : [],
+            fields: options.fields || [],
+            collections: options.collections || [],
             scan_consistency: (0, bindingutilities_1.searchScanConsistencyToCpp)(options.consistency),
             mutation_state: (0, bindingutilities_1.mutationStateToCpp)(options.consistentWith),
             sort_specs: options.sort
                 ? options.sort.map((sort) => JSON.stringify(sort))
-                : undefined,
+                : [],
             facets: options.facets
                 ? Object.fromEntries(Object.entries(options.facets).map(([k, v]) => [
                     k,
                     JSON.stringify(v),
                 ]))
-                : undefined,
+                : {},
             raw: options.raw
                 ? Object.fromEntries(Object.entries(options.raw).map(([k, v]) => [
                     k,
                     JSON.stringify(v),
                 ]))
-                : undefined,
-        }, (err, resp) => {
+                : {},
+            body_str: '',
+        }, (cppErr, resp) => {
+            const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
             if (err) {
                 emitter.emit('error', err);
                 emitter.emit('end');
@@ -71,7 +73,10 @@ class SearchExecutor {
             });
             {
                 const metaData = resp.meta;
-                emitter.emit('row', metaData);
+                emitter.emit('meta', {
+                    facets: Object.fromEntries(Object.values(resp.facets).map((v) => [v.name, v])),
+                    ...metaData
+                });
             }
             emitter.emit('end');
             return;

package/dist/searchindexmanager.d.ts

@@ -7,10 +7,49 @@ import { NodeCallback } from './utilities';
  * @category Management
  */
 export interface ISearchIndex {
+    /**
+     * The UUID of the search index.  Used for updates to ensure consistency.
+     */
+    uuid?: string;
     /**
      * The name of the search index.
      */
     name: string;
+    /**
+     * Name of the source of the data (ie: the bucket name).
+     */
+    sourceName: string;
+    /**
+     * The type of index to use (fulltext-index or fulltext-alias).
+     */
+    type: string;
+    /**
+     * Parameters to specify such as the store type and mappins.
+     */
+    params: {
+        [key: string]: any;
+    };
+    /**
+     * The UUID of the data source.
+     */
+    sourceUuid: string;
+    /**
+     * Extra parameters for the source.  These are usually things like advanced
+     * connection options and tuning parameters.
+     */
+    sourceParams: {
+        [key: string]: any;
+    };
+    /**
+     * The type of the source (couchbase or nil).
+     */
+    sourceType: string;
+    /**
+     * Plan properties such as the number of replicas and number of partitions.
+     */
+    planParams: {
+        [key: string]: any;
+    };
 }
 /**
  * This class is currently incomplete and must be casted to `any` in
@@ -156,7 +195,7 @@ export declare class SearchIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    getIndex(indexName: string, options?: GetSearchIndexOptions, callback?: NodeCallback<void>): Promise<void>;
+    getIndex(indexName: string, options?: GetSearchIndexOptions, callback?: NodeCallback<SearchIndex>): Promise<SearchIndex>;
     /**
      * Returns a list of all existing indexes.
      *

package/dist/searchindexmanager.js

@@ -61,7 +61,8 @@ class SearchIndexManager {
             if (res.statusCode !== 200) {
                 throw new errors_1.IndexNotFoundError();
             }
-            return JSON.parse(res.body.toString());
+            const idxData = JSON.parse(res.body.toString());
+            return idxData.indexDef;
         }, callback);
     }
     /**
@@ -89,7 +90,8 @@ class SearchIndexManager {
             if (res.statusCode !== 200) {
                 throw new Error('failed to fetch search indices');
             }
-            return JSON.parse(res.body.toString());
+            const idxsData = JSON.parse(res.body.toString());
+            return Object.values(idxsData.indexDefs.indexDefs);
         }, callback);
     }
     /**

package/dist/transactions.js

@@ -79,7 +79,7 @@ function translateGetResult(cppRes) {
     }
     return new TransactionGetResult({
         id: cppRes.id,
-        content: cppRes.content,
+        content: cppRes.content ? JSON.parse(cppRes.content) : undefined,
         cas: cppRes.cas,
         _links: cppRes.links,
         _metadata: cppRes.metadata,
@@ -153,7 +153,7 @@ class TransactionAttemptContext {
             const id = collection._cppDocId(key);
             this._impl.insert({
                 id,
-                content,
+                content: JSON.stringify(content),
             }, (cppErr, cppRes) => {
                 const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
                 if (err) {
@@ -174,12 +174,12 @@ class TransactionAttemptContext {
             this._impl.replace({
                 doc: {
                     id: doc.id,
-                    content: doc.content,
+                    content: '',
                     cas: doc.cas,
                     links: doc._links,
                     metadata: doc._metadata,
                 },
-                content,
+                content: JSON.stringify(content),
             }, (cppErr, cppRes) => {
                 const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
                 if (err) {
@@ -199,7 +199,7 @@ class TransactionAttemptContext {
             this._impl.remove({
                 doc: {
                     id: doc.id,
-                    content: doc.content,
+                    content: '',
                     cas: doc.cas,
                     links: doc._links,
                     metadata: doc._metadata,
@@ -224,12 +224,6 @@ class TransactionAttemptContext {
                 options = {};
             }
             this._impl.query(statement, {
-                positional_parameters: options.parameters && Array.isArray(options.parameters)
-                    ? options.parameters
-                    : undefined,
-                named_parameters: options.parameters && !Array.isArray(options.parameters)
-                    ? options.parameters
-                    : undefined,
                 scan_consistency: (0, bindingutilities_1.queryScanConsistencyToCpp)(options.scanConsistency),
                 ad_hoc: options.adhoc,
                 client_context_id: options.clientContextId,
@@ -243,9 +237,20 @@ class TransactionAttemptContext {
                 metrics: options.metrics,
                 bucket_name: options.scope ? options.scope.bucket.name : undefined,
                 scope_name: options.scope ? options.scope.name : undefined,
-                raw: options.raw,
+                raw: options.raw
+                    ? Object.fromEntries(Object.entries(options.raw).map(([k, v]) => [
+                        k,
+                        JSON.stringify(v),
+                    ]))
+                    : {},
+                positional_parameters: options.parameters && Array.isArray(options.parameters)
+                    ? options.parameters.map((v) => JSON.stringify(v))
+                    : [],
+                named_parameters: options.parameters && !Array.isArray(options.parameters)
+                    ? Object.fromEntries(Object.entries(options.parameters).map(([k, v]) => [k, JSON.stringify(v)]))
+                    : {},
             }, (cppErr, resp) => {
-                callback((0, bindingutilities_1.errorFromCpp)(cppErr), resp);
+                callback(cppErr, resp);
             });
         });
         return new TransactionQueryResult({
@@ -303,7 +308,7 @@ class Transactions {
         if (!config.queryConfig) {
             config.queryConfig = {};
         }
-        const connImpl = cluster.conn.inst;
+        const connImpl = cluster.conn;
         const txnsImpl = new binding_1.default.Transactions(connImpl, {
             durability_level: (0, bindingutilities_1.durabilityToCpp)(config.durabilityLevel),
             kv_timeout: config.kvTimeout,

package/dist/utilities.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/viewexecutor.js

@@ -36,18 +36,16 @@ class ViewExecutor {
             });
         });
         const timeout = options.timeout || this._cluster.viewTimeout;
-        this._cluster.conn.viewQuery({
+        this._cluster.conn.documentView({
             timeout: timeout,
             bucket_name: this._bucket.name,
             document_name: designDoc,
             view_name: viewName,
-            name_space: binding_1.default.view_name_space.production,
+            ns: binding_1.default.design_document_namespace.production,
             limit: options.limit,
             skip: options.skip,
             consistency: (0, bindingutilities_1.viewScanConsistencyToCpp)(options.scanConsistency),
-            keys: options.keys
-                ? options.keys.map((k) => JSON.stringify(k))
-                : undefined,
+            keys: options.keys ? options.keys.map((k) => JSON.stringify(k)) : [],
             key: JSON.stringify(options.key),
             start_key: options.range && options.range.start
                 ? JSON.stringify(options.range.start)
@@ -66,7 +64,11 @@ class ViewExecutor {
             group: options.group,
             group_level: options.groupLevel,
             order: (0, bindingutilities_1.viewOrderingToCpp)(options.order),
-        }, (err, resp) => {
+            debug: false,
+            query_string: [],
+            raw: {},
+        }, (cppErr, resp) => {
+            const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
             if (err) {
                 emitter.emit('error', err);
                 emitter.emit('end');

package/package.json

@@ -1 +1 @@
-{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=12.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","cmake-js":"^6.3.0","node-addon-api":"^4.3.0","prebuild-install":"^7.0.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^3.2.0","@tsconfig/node12":"^1.0.9","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^17.0.18","@typescript-eslint/eslint-plugin":"^5.12.0","@typescript-eslint/parser":"^5.12.0","chai":"^4.3.6","eslint":"^8.9.0","eslint-config-prettier":"^8.3.0","eslint-plugin-jsdoc":"^37.9.4","eslint-plugin-mocha":"^10.0.3","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^9.2.0","npm-check-updates":"^12.3.1","nyc":"^15.1.0","prebuild":"^11.0.3","prettier":"^2.5.1","segfault-handler":"^1.3.0","semver":"^7.3.5","ts-mocha":"^9.0.2","ts-node":"^10.5.0","typedoc":"^0.22.11","typescript":"^4.5.5","uuid":"^8.3.2"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"4.0.0","config":{"native":false},"scripts":{"install":"prebuild-install || cmake-js compile","build":"cmake-js build && tsc","rebuild":"cmake-js rebuild && tsc","prebuild":"prebuild --backend cmake-js --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"}}
+{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=12.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","cmake-js":"^6.3.2","node-addon-api":"^5.0.0","prebuild-install":"^7.1.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^3.3.0","@tsconfig/node12":"^1.0.11","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^18.6.3","@typescript-eslint/eslint-plugin":"^5.32.0","@typescript-eslint/parser":"^5.32.0","chai":"^4.3.6","eslint":"^8.21.0","eslint-config-prettier":"^8.5.0","eslint-plugin-jsdoc":"^39.3.4","eslint-plugin-mocha":"^10.1.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^10.0.0","npm-check-updates":"^16.0.5","nyc":"^15.1.0","prebuild":"^11.0.4","prettier":"^2.7.1","segfault-handler":"^1.3.0","semver":"^7.3.7","ts-mocha":"^10.0.0","ts-node":"^10.9.1","typedoc":"^0.23.10","typescript":"^4.7.4","uuid":"^8.3.2"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"4.1.2","config":{"native":false},"scripts":{"install":"prebuild-install -r napi || cmake-js compile","build":"cmake-js build && tsc","rebuild":"cmake-js rebuild && tsc","prebuild":"prebuild --backend cmake-js --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"},"binary":{"napi_versions":[6]}}

package/src/cas.hpp

@@ -1,11 +1,11 @@
 #pragma once
 #include "addondata.hpp"
 #include "napi.h"
-#include <couchbase/protocol/cas.hxx>
+#include <couchbase/cas.hxx>
 
 namespace couchbase
 {
-typedef couchbase::protocol::cas cas;
+typedef couchbase::cas cas;
 }
 
 namespace couchnode