couchbase 3.2.3 → 3.2.4

package/deps/lcb/tests/mocksupport/procutil.c

@@ -20,8 +20,6 @@
 #include <stdio.h>
 
 #ifndef _WIN32
-#define _XOPEN_SOURCE
-#include <stdlib.h>
 #include <string.h>
 #include <wordexp.h>
 #include <fcntl.h>  /* O_* */
@@ -51,6 +49,7 @@ static char **clisplit(const char *s)
         ret[ii] = strdup(p.we_wordv[ii]);
     }
     ret[ii] = NULL;
+    wordfree(&p);
     return ret;
 }
 
@@ -59,39 +58,44 @@ static int spawn_process_impl(child_process_t *proc)
     int rv;
     char **argv;
 
-    proc->pid = fork();
-    if (proc->pid < 0) {
+    argv = clisplit(proc->name);
+    if (argv == NULL) {
+        fprintf(stderr, "Couldn't split arguments: %s\n", proc->name);
         return -1;
     }
-    if (proc->pid > 0) {
-        return 0;
-    }
-
-    /** In Child */
-    argv = clisplit(proc->name);
-    if (!argv) {
-        fprintf(stderr, "Couldn't split arguments\n");
-        exit(EXIT_FAILURE);
+    proc->pid = vfork();
+    if (proc->pid < 0) {
+        for (int i = 0; argv[i] != NULL; ++i) {
+            free(argv[i]);
+        }
+        free(argv);
+        return -1;
     }
-    if (proc->redirect) {
-        int fd = open(proc->redirect, O_RDWR | O_CREAT | O_APPEND, 0644);
-        if (fd < 0) {
-            perror(proc->redirect);
-            exit(EXIT_FAILURE);
+    if (proc->pid == 0) {
+        /** In Child */
+        if (proc->redirect) {
+            int fd = open(proc->redirect, O_RDWR | O_CREAT | O_APPEND, 0644);
+            if (fd < 0) {
+                perror(proc->redirect);
+                exit(EXIT_FAILURE);
+            }
+            if (dup2(fd, fileno(stderr)) < 0 || dup2(fd, fileno(stdout)) < 0) {
+                perror("dup2");
+                exit(EXIT_FAILURE);
+            }
+            setvbuf(stderr, NULL, _IOLBF, 0);
         }
-        if (dup2(fd, fileno(stderr)) < 0 || dup2(fd, fileno(stdout)) < 0) {
-            perror("dup2");
-            exit(EXIT_FAILURE);
+        rv = execvp(argv[0], argv);
+        if (rv < 0) {
+            perror(argv[0]);
+            return -1;
         }
-        setvbuf(stderr, NULL, _IOLBF, 0);
     }
-    rv = execvp(argv[0], argv);
-    if (rv < 0) {
-        perror(argv[0]);
-        exit(EXIT_FAILURE);
+    for (int i = 0; argv[i] != NULL; ++i) {
+        free(argv[i]);
     }
-    abort();
-    return 0; /* make things happy */
+    free(argv);
+    return 0;
 }
 
 void kill_process(child_process_t *process, int force)

package/deps/lcb/tests/mocksupport/server.c

@@ -296,7 +296,6 @@ static int start_mock_server(struct test_server_info *info, char **cmdline)
 
     start_mock_process(info, argv);
     negotiate_mock_connection(info);
-    sleep(1); /* give it a bit time to initialize itself */
     return 1;
 }
 

package/deps/lcb/tools/cbc.cc

@@ -1273,6 +1273,13 @@ void VersionHandler::run()
 #endif
         printf("  SSL Headers: %s\n", OPENSSL_VERSION_TEXT);
 #endif
+        printf("  HAVE_PKCS5_PBKDF2_HMAC: "
+#ifdef HAVE_PKCS5_PBKDF2_HMAC
+               "yes"
+#else
+               "no"
+#endif
+               "\n");
     } else {
         printf("  SSL: NOT SUPPORTED\n");
     }

package/dist/analyticsindexmanager.js

@@ -786,7 +786,7 @@ class AnalyticsIndexManager {
      */
     async createLink(link, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[0];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -830,7 +830,7 @@ class AnalyticsIndexManager {
      */
     async replaceLink(link, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[0];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -875,7 +875,7 @@ class AnalyticsIndexManager {
      */
     async dropLink(linkName, dataverseName, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[0];
+            callback = arguments[2];
             options = undefined;
         }
         if (!options) {

package/dist/binding.d.ts

@@ -184,6 +184,8 @@ export interface CppBinding {
     LCB_ERR_SCOPE_NOT_FOUND: CppErrType;
     LCB_ERR_INDEX_NOT_FOUND: CppErrType;
     LCB_ERR_INDEX_EXISTS: CppErrType;
+    LCB_ERR_RATE_LIMITED: CppErrType;
+    LCB_ERR_QUOTA_LIMITED: CppErrType;
     LCB_ERR_DOCUMENT_NOT_FOUND: CppErrType;
     LCB_ERR_DOCUMENT_UNRETRIEVABLE: CppErrType;
     LCB_ERR_DOCUMENT_LOCKED: CppErrType;

package/dist/bindingutilities.js

@@ -214,6 +214,10 @@ function translateCppError(err) {
             return new errs.IndexNotFoundError(codeErr, context);
         case binding_1.default.LCB_ERR_INDEX_EXISTS:
             return new errs.IndexExistsError(codeErr, context);
+        case binding_1.default.LCB_ERR_RATE_LIMITED:
+            return new errs.RateLimitedError(codeErr, context);
+        case binding_1.default.LCB_ERR_QUOTA_LIMITED:
+            return new errs.QuotaLimitedError(codeErr, context);
         /* KeyValue Error Definitions */
         case binding_1.default.LCB_ERR_DOCUMENT_NOT_FOUND:
             return new errs.DocumentNotFoundError(codeErr, context);

package/dist/bucketmanager.d.ts

@@ -18,7 +18,14 @@ export declare enum ConflictResolutionType {
     /**
      * Indicates that the seqno of the document should be used for conflict resolution.
      */
-    SequenceNumber = "seqno"
+    SequenceNumber = "seqno",
+    /**
+     * Indicates that custom conflict resolution should be used.
+     *
+     * @experimental This mode is only available in Couchbase Server 7.1 with the
+     * "developer-preview" mode enabled.
+     */
+    Custom = "custom"
 }
 /**
  * Represents the type of a bucket.
@@ -39,6 +46,21 @@ export declare enum BucketType {
      */
     Ephemeral = "ephemeral"
 }
+/**
+ * Represents the storage backend to use for a bucket.
+ *
+ * @category Management
+ */
+export declare enum StorageBackend {
+    /**
+     * Indicates the bucket should use the Couchstore storage engine.
+     */
+    Couchstore = "couchstore",
+    /**
+     * Indicates the bucket should use the Magma storage engine.
+     */
+    Magma = "magma"
+}
 /**
  * Represents the eviction policy that should be used for a bucket.
  *
@@ -117,6 +139,10 @@ export interface IBucketSettings {
      * Specifies the type of bucket that should be used.
      */
     bucketType: BucketType | string;
+    /**
+     * Specifies the storage backend to use for the bucket.
+     */
+    storageBackend: StorageBackend | string;
     /**
      * Specifies the ejection method that should be used.
      */
@@ -189,6 +215,10 @@ export declare class BucketSettings implements IBucketSettings {
      * Specifies the type of bucket that should be used.
      */
     bucketType: BucketType;
+    /**
+     * Specifies the storage backend to use for the bucket.
+     */
+    storageBackend: StorageBackend | string;
     /**
      * Specifies the ejection method that should be used.
      */

package/dist/bucketmanager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BucketManager = exports.BucketSettings = exports.CompressionMode = exports.EvictionPolicy = exports.BucketType = exports.ConflictResolutionType = void 0;
+exports.BucketManager = exports.BucketSettings = exports.CompressionMode = exports.EvictionPolicy = exports.StorageBackend = exports.BucketType = exports.ConflictResolutionType = void 0;
 const errors_1 = require("./errors");
 const httpexecutor_1 = require("./httpexecutor");
 const utilities_1 = require("./utilities");
@@ -22,6 +22,13 @@ var ConflictResolutionType;
      * Indicates that the seqno of the document should be used for conflict resolution.
      */
     ConflictResolutionType["SequenceNumber"] = "seqno";
+    /**
+     * Indicates that custom conflict resolution should be used.
+     *
+     * @experimental This mode is only available in Couchbase Server 7.1 with the
+     * "developer-preview" mode enabled.
+     */
+    ConflictResolutionType["Custom"] = "custom";
 })(ConflictResolutionType = exports.ConflictResolutionType || (exports.ConflictResolutionType = {}));
 /**
  * Represents the type of a bucket.
@@ -43,6 +50,22 @@ var BucketType;
      */
     BucketType["Ephemeral"] = "ephemeral";
 })(BucketType = exports.BucketType || (exports.BucketType = {}));
+/**
+ * Represents the storage backend to use for a bucket.
+ *
+ * @category Management
+ */
+var StorageBackend;
+(function (StorageBackend) {
+    /**
+     * Indicates the bucket should use the Couchstore storage engine.
+     */
+    StorageBackend["Couchstore"] = "couchstore";
+    /**
+     * Indicates the bucket should use the Magma storage engine.
+     */
+    StorageBackend["Magma"] = "magma";
+})(StorageBackend = exports.StorageBackend || (exports.StorageBackend = {}));
 /**
  * Represents the eviction policy that should be used for a bucket.
  *
@@ -106,6 +129,7 @@ class BucketSettings {
         this.numReplicas = data.numReplicas;
         this.replicaIndexes = data.replicaIndexes;
         this.bucketType = data.bucketType;
+        this.storageBackend = data.storageBackend;
         this.evictionPolicy = data.evictionPolicy;
         this.maxExpiry = data.maxExpiry;
         this.compressionMode = data.compressionMode;
@@ -153,6 +177,7 @@ class BucketSettings {
             replicaNumber: data.numReplicas,
             replicaIndexes: data.replicaIndexes,
             bucketType: data.bucketType,
+            storageBackend: data.storageBackend,
             evictionPolicy: data.evictionPolicy,
             maxTTL: data.maxTTL || data.maxExpiry,
             compressionMode: data.compressionMode,
@@ -171,6 +196,7 @@ class BucketSettings {
             numReplicas: data.replicaNumber,
             replicaIndexes: data.replicaIndexes,
             bucketType: data.bucketType,
+            storageBackend: data.storageBackend,
             evictionPolicy: data.evictionPolicy,
             maxExpiry: data.maxTTL,
             compressionMode: data.compressionMode,
@@ -378,7 +404,7 @@ class BucketManager {
      */
     async getAllBuckets(options, callback) {
         if (options instanceof Function) {
-            callback = arguments[1];
+            callback = arguments[0];
             options = undefined;
         }
         if (!options) {

package/dist/collection.js

@@ -336,7 +336,7 @@ class Collection {
      */
     touch(key, expiry, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[1];
+            callback = arguments[2];
             options = undefined;
         }
         if (!options) {
@@ -586,7 +586,7 @@ class Collection {
     }
     _getReplica(mode, key, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[1];
+            callback = arguments[2];
             options = undefined;
         }
         if (!options) {

package/dist/collectionmanager.js

@@ -142,7 +142,7 @@ class CollectionManager {
             callback = arguments[3];
         }
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -277,7 +277,7 @@ class CollectionManager {
      */
     async dropScope(scopeName, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {

package/dist/connection.js

@@ -50,6 +50,9 @@ class Connection {
         if (options.kvConnectTimeout) {
             lcbDsnObj.options.config_total_timeout = fmtTmt(options.kvConnectTimeout);
         }
+        else {
+            lcbDsnObj.options.config_total_timeout = '30s';
+        }
         if (options.kvTimeout) {
             lcbDsnObj.options.timeout = fmtTmt(options.kvTimeout);
         }

package/dist/errors.d.ts

@@ -217,6 +217,24 @@ export declare class ScopeNotFoundError extends CouchbaseError {
 export declare class IndexNotFoundError extends CouchbaseError {
     constructor(cause?: Error, context?: ErrorContext);
 }
+/**
+ * Indicates that a rate limit was exceeded while attempting to
+ * execute the operation.
+ *
+ * @category Error Handling
+ */
+export declare class RateLimitedError extends CouchbaseError {
+    constructor(cause?: Error, context?: ErrorContext);
+}
+/**
+ * Indicates that a quota limit was exceeded while attempting to
+ * execute the operation.
+ *
+ * @category Error Handling
+ */
+export declare class QuotaLimitedError extends CouchbaseError {
+    constructor(cause?: Error, context?: ErrorContext);
+}
 /**
  * Indicates that the referenced index already existed, but was expected
  * to not yet exist for the operation.

package/dist/errors.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexFailureError = exports.PlanningFailureError = exports.PathExistsError = exports.DeltaInvalidError = exports.NumberTooBigError = exports.DocumentNotJsonError = exports.ValueInvalidError = exports.ValueTooDeepError = exports.PathTooDeepError = exports.PathTooBigError = exports.PathInvalidError = exports.PathMismatchError = exports.PathNotFoundError = exports.MutationLostError = exports.DurableWriteReCommitInProgressError = exports.DurableWriteInProgressError = exports.DurabilityAmbiguousError = exports.DurabilityImpossibleError = exports.DurabilityLevelNotAvailableError = exports.ValueNotJsonError = exports.DocumentExistsError = exports.ValueTooLargeError = exports.DocumentLockedError = exports.DocumentUnretrievableError = exports.DocumentNotFoundError = exports.IndexExistsError = exports.IndexNotFoundError = exports.ScopeNotFoundError = exports.FeatureNotAvailableError = exports.UnambiguousTimeoutError = exports.AmbiguousTimeoutError = exports.UnsupportedOperationError = exports.DecodingFailureError = exports.EncodingFailureError = exports.CollectionNotFoundError = exports.BucketNotFoundError = exports.CasMismatchError = exports.ParsingFailureError = exports.TemporaryFailureError = exports.AuthenticationFailureError = exports.InternalServerFailureError = exports.ServiceNotAvailableError = exports.InvalidArgumentError = exports.RequestCanceledError = exports.TimeoutError = exports.InvalidDurabilityLevel = exports.NeedOpenBucketError = exports.ClusterClosedError = exports.ConnectionClosedError = exports.CouchbaseError = void 0;
-exports.EventingFunctionDeployedError = exports.EventingFunctionNotBootstrappedError = exports.EventingFunctionIdenticalKeyspaceError = exports.EventingFunctionCompilationFailureError = exports.EventingFunctionNotDeployedError = exports.EventingFunctionNotFoundError = exports.BucketNotFlushableError = exports.UserExistsError = exports.BucketExistsError = exports.GroupNotFoundError = exports.UserNotFoundError = exports.ScopeExistsError = exports.CollectionExistsError = exports.DesignDocumentNotFoundError = exports.ViewNotFoundError = exports.LinkExistsError = exports.LinkNotFoundError = exports.DataverseExistsError = exports.DatasetExistsError = exports.DataverseNotFoundError = exports.DatasetNotFoundError = exports.JobQueueFullError = exports.CompilationFailureError = exports.PreparedStatementFailureError = void 0;
+exports.PathExistsError = exports.DeltaInvalidError = exports.NumberTooBigError = exports.DocumentNotJsonError = exports.ValueInvalidError = exports.ValueTooDeepError = exports.PathTooDeepError = exports.PathTooBigError = exports.PathInvalidError = exports.PathMismatchError = exports.PathNotFoundError = exports.MutationLostError = exports.DurableWriteReCommitInProgressError = exports.DurableWriteInProgressError = exports.DurabilityAmbiguousError = exports.DurabilityImpossibleError = exports.DurabilityLevelNotAvailableError = exports.ValueNotJsonError = exports.DocumentExistsError = exports.ValueTooLargeError = exports.DocumentLockedError = exports.DocumentUnretrievableError = exports.DocumentNotFoundError = exports.IndexExistsError = exports.QuotaLimitedError = exports.RateLimitedError = exports.IndexNotFoundError = exports.ScopeNotFoundError = exports.FeatureNotAvailableError = exports.UnambiguousTimeoutError = exports.AmbiguousTimeoutError = exports.UnsupportedOperationError = exports.DecodingFailureError = exports.EncodingFailureError = exports.CollectionNotFoundError = exports.BucketNotFoundError = exports.CasMismatchError = exports.ParsingFailureError = exports.TemporaryFailureError = exports.AuthenticationFailureError = exports.InternalServerFailureError = exports.ServiceNotAvailableError = exports.InvalidArgumentError = exports.RequestCanceledError = exports.TimeoutError = exports.InvalidDurabilityLevel = exports.NeedOpenBucketError = exports.ClusterClosedError = exports.ConnectionClosedError = exports.CouchbaseError = void 0;
+exports.EventingFunctionDeployedError = exports.EventingFunctionNotBootstrappedError = exports.EventingFunctionIdenticalKeyspaceError = exports.EventingFunctionCompilationFailureError = exports.EventingFunctionNotDeployedError = exports.EventingFunctionNotFoundError = exports.BucketNotFlushableError = exports.UserExistsError = exports.BucketExistsError = exports.GroupNotFoundError = exports.UserNotFoundError = exports.ScopeExistsError = exports.CollectionExistsError = exports.DesignDocumentNotFoundError = exports.ViewNotFoundError = exports.LinkExistsError = exports.LinkNotFoundError = exports.DataverseExistsError = exports.DatasetExistsError = exports.DataverseNotFoundError = exports.DatasetNotFoundError = exports.JobQueueFullError = exports.CompilationFailureError = exports.PreparedStatementFailureError = exports.IndexFailureError = exports.PlanningFailureError = void 0;
 require("./errorcontexts");
 /**
  * A generic base error that all errors inherit.  Exposes the cause and
@@ -288,6 +288,30 @@ class IndexNotFoundError extends CouchbaseError {
     }
 }
 exports.IndexNotFoundError = IndexNotFoundError;
+/**
+ * Indicates that a rate limit was exceeded while attempting to
+ * execute the operation.
+ *
+ * @category Error Handling
+ */
+class RateLimitedError extends CouchbaseError {
+    constructor(cause, context) {
+        super('operation was rate limited', cause, context);
+    }
+}
+exports.RateLimitedError = RateLimitedError;
+/**
+ * Indicates that a quota limit was exceeded while attempting to
+ * execute the operation.
+ *
+ * @category Error Handling
+ */
+class QuotaLimitedError extends CouchbaseError {
+    constructor(cause, context) {
+        super('operation was quota limited', cause, context);
+    }
+}
+exports.QuotaLimitedError = QuotaLimitedError;
 /**
  * Indicates that the referenced index already existed, but was expected
  * to not yet exist for the operation.

package/dist/eventingfunctionmanager.js

@@ -652,7 +652,7 @@ class EventingFunctionManager {
      */
     async upsertFunction(functionDefinition, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -697,7 +697,7 @@ class EventingFunctionManager {
      */
     async dropFunction(name, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -810,7 +810,7 @@ class EventingFunctionManager {
      */
     async deployFunction(name, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -849,7 +849,7 @@ class EventingFunctionManager {
      */
     async undeployFunction(name, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -888,7 +888,7 @@ class EventingFunctionManager {
      */
     async pauseFunction(name, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -927,7 +927,7 @@ class EventingFunctionManager {
      */
     async resumeFunction(name, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {

package/dist/queryindexmanager.js

@@ -101,7 +101,7 @@ class QueryIndexManager {
      */
     async createIndex(bucketName, indexName, fields, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[3];
             options = undefined;
         }
         if (!options) {
@@ -126,7 +126,7 @@ class QueryIndexManager {
      */
     async createPrimaryIndex(bucketName, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[0];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {
@@ -198,7 +198,7 @@ class QueryIndexManager {
      */
     async dropPrimaryIndex(bucketName, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[0];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {

package/dist/searchexecutor.js

@@ -50,6 +50,9 @@ class SearchExecutor {
         if (options.disableScoring) {
             queryObj.score = 'none';
         }
+        if (options.includeLocations !== undefined) {
+            queryObj.includeLocations = options.includeLocations;
+        }
         if (options.consistency) {
             queryObjCtl.consistency = {
                 level: options.consistency,

package/dist/searchindexmanager.js

@@ -105,7 +105,7 @@ class SearchIndexManager {
      */
     async upsertIndex(indexDefinition, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {

package/dist/searchquery.d.ts

@@ -1,3 +1,19 @@
+/**
+ * Specifies how the individual match terms should be logically concatenated.
+ *
+ * @experimental This API is subject to change without notice.
+ * @category Full Text Search
+ */
+export declare enum MatchOperator {
+    /**
+     * Specifies that individual match terms are concatenated with a logical OR - this is the default if not provided.
+     */
+    Or = "or",
+    /**
+     * Specifies that individual match terms are concatenated with a logical AND.
+     */
+    And = "and"
+}
 /**
  * GeoPoint represents a specific coordinate on earth.  We support
  * a number of different variants of geopoints being specified.
@@ -86,6 +102,7 @@ export declare class MatchSearchQuery extends SearchQuery {
      * @internal
      */
     constructor(match: string);
+    operator(op: MatchOperator): MatchSearchQuery;
     field(field: string): MatchSearchQuery;
     analyzer(analyzer: string): MatchSearchQuery;
     prefixLength(prefixLength: number): MatchSearchQuery;

package/dist/searchquery.js

@@ -1,7 +1,24 @@
 "use strict";
 /* eslint jsdoc/require-jsdoc: off */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoPolygonSearchQuery = exports.GeoBoundingBoxSearchQuery = exports.GeoDistanceSearchQuery = exports.MatchNoneSearchQuery = exports.MatchAllSearchQuery = exports.PrefixSearchQuery = exports.PhraseSearchQuery = exports.TermSearchQuery = exports.BooleanFieldSearchQuery = exports.DocIdSearchQuery = exports.WildcardSearchQuery = exports.BooleanSearchQuery = exports.DisjunctionSearchQuery = exports.ConjunctionSearchQuery = exports.DateRangeSearchQuery = exports.NumericRangeSearchQuery = exports.QueryStringSearchQuery = exports.RegexpSearchQuery = exports.MatchPhraseSearchQuery = exports.MatchSearchQuery = exports.SearchQuery = void 0;
+exports.GeoPolygonSearchQuery = exports.GeoBoundingBoxSearchQuery = exports.GeoDistanceSearchQuery = exports.MatchNoneSearchQuery = exports.MatchAllSearchQuery = exports.PrefixSearchQuery = exports.PhraseSearchQuery = exports.TermSearchQuery = exports.BooleanFieldSearchQuery = exports.DocIdSearchQuery = exports.WildcardSearchQuery = exports.BooleanSearchQuery = exports.DisjunctionSearchQuery = exports.ConjunctionSearchQuery = exports.DateRangeSearchQuery = exports.NumericRangeSearchQuery = exports.QueryStringSearchQuery = exports.RegexpSearchQuery = exports.MatchPhraseSearchQuery = exports.MatchSearchQuery = exports.SearchQuery = exports.MatchOperator = void 0;
+/**
+ * Specifies how the individual match terms should be logically concatenated.
+ *
+ * @experimental This API is subject to change without notice.
+ * @category Full Text Search
+ */
+var MatchOperator;
+(function (MatchOperator) {
+    /**
+     * Specifies that individual match terms are concatenated with a logical OR - this is the default if not provided.
+     */
+    MatchOperator["Or"] = "or";
+    /**
+     * Specifies that individual match terms are concatenated with a logical AND.
+     */
+    MatchOperator["And"] = "and";
+})(MatchOperator = exports.MatchOperator || (exports.MatchOperator = {}));
 function _parseGeoPoint(v) {
     if (Array.isArray(v)) {
         return v;
@@ -145,6 +162,10 @@ class MatchSearchQuery extends SearchQuery {
             match: match,
         });
     }
+    operator(op) {
+        this._data.operator = op;
+        return this;
+    }
     field(field) {
         this._data.field = field;
         return this;

package/dist/searchtypes.d.ts

@@ -44,7 +44,7 @@ export declare class SearchResult {
  *
  * @category Full Text Search
  */
-declare enum HighlightStyle {
+export declare enum HighlightStyle {
     /**
      * Indicates that matches should be highlighted using HTML tags in the result text.
      */
@@ -123,6 +123,12 @@ export interface SearchQueryOptions {
      * impossible to sort based on how well a particular result scored.
      */
     disableScoring?: boolean;
+    /**
+     * If set to true, will include the locations in the search result.
+     *
+     * @experimental This API is subject to change without notice.
+     */
+    includeLocations?: boolean;
     /**
      * Specifies the consistency requirements when executing the query.
      *
@@ -151,4 +157,3 @@ export interface SearchQueryOptions {
      */
     timeout?: number;
 }
-export {};

package/dist/searchtypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SearchScanConsistency = exports.SearchResult = exports.SearchRow = exports.SearchMetaData = void 0;
+exports.SearchScanConsistency = exports.HighlightStyle = exports.SearchResult = exports.SearchRow = exports.SearchMetaData = void 0;
 /**
  * SearchMetaData represents the meta-data available from a search query.
  * This class is currently incomplete and must be casted to `any` in
@@ -51,7 +51,7 @@ var HighlightStyle;
      * Indicates that matches should be highlighted using ASCII coding in the result test.
      */
     HighlightStyle["ANSI"] = "ansi";
-})(HighlightStyle || (HighlightStyle = {}));
+})(HighlightStyle = exports.HighlightStyle || (exports.HighlightStyle = {}));
 /**
  * Represents the various scan consistency options that are available when
  * querying against the query service.

package/dist/usermanager.js

@@ -459,7 +459,7 @@ class UserManager {
      */
     async getRoles(options, callback) {
         if (options instanceof Function) {
-            callback = arguments[1];
+            callback = arguments[0];
             options = undefined;
         }
         if (!options) {

package/dist/viewindexmanager.js

@@ -174,7 +174,7 @@ class ViewIndexManager {
      */
     async upsertDesignDocument(designDoc, options, callback) {
         if (options instanceof Function) {
-            callback = arguments[2];
+            callback = arguments[1];
             options = undefined;
         }
         if (!options) {