couchbase 4.0.0 → 4.1.0

package/dist/httpexecutor.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Connection } from './connection';
+import { CppConnection } from './binding';
 import { HttpErrorContext } from './errorcontexts';
 import * as events from 'events';
 /**
@@ -52,7 +52,7 @@ export declare class HttpExecutor {
     /**
      * @internal
      */
-    constructor(conn: Connection);
+    constructor(conn: CppConnection);
     /**
      * @internal
      */

package/dist/httpexecutor.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];
@@ -25,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpExecutor = exports.HttpMethod = exports.HttpServiceType = void 0;
 /* eslint jsdoc/require-jsdoc: off */
 const binding_1 = __importDefault(require("./binding"));
+const bindingutilities_1 = require("./bindingutilities");
 const errorcontexts_1 = require("./errorcontexts");
 const events = __importStar(require("events"));
 /**
@@ -119,15 +124,16 @@ class HttpExecutor {
         else {
             throw new Error('unexpected http body type');
         }
-        this._conn.httpRequest({
+        this._conn.managementFreeform({
             type: cppHttpType,
             method: cppHttpMethod,
             path: options.path,
             headers: headers,
             body: body,
             timeout: options.timeout,
-        }, (err, res) => {
-            if (!res) {
+        }, (cppErr, res) => {
+            const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+            if (err) {
                 emitter.emit('error', err);
                 return;
             }

package/dist/queryexecutor.d.ts

@@ -1,4 +1,4 @@
-import { CppQueryResult } from './binding';
+import { CppError, CppQueryResponse } from './binding';
 import { Cluster } from './cluster';
 import { QueryMetaData, QueryOptions, QueryResult } from './querytypes';
 import { StreamableRowPromise } from './streamablepromises';
@@ -14,7 +14,7 @@ export declare class QueryExecutor {
     /**
      * @internal
      */
-    static execute<TRow = any>(exec: (callback: (err: Error | null, resp: CppQueryResult) => void) => void): StreamableRowPromise<QueryResult<TRow>, TRow, QueryMetaData>;
+    static execute<TRow = any>(exec: (callback: (err: CppError | null, resp: CppQueryResponse) => void) => void): StreamableRowPromise<QueryResult<TRow>, TRow, QueryMetaData>;
     /**
      * @internal
      */

package/dist/queryexecutor.js

@@ -24,7 +24,8 @@ class QueryExecutor {
                 meta: meta,
             });
         });
-        exec((err, resp) => {
+        exec((cppErr, resp) => {
+            const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
             if (err) {
                 emitter.emit('error', err);
                 emitter.emit('end');
@@ -89,11 +90,11 @@ class QueryExecutor {
             this._cluster.conn.query({
                 statement: query,
                 client_context_id: options.clientContextId,
-                adhoc: options.adhoc,
-                metrics: options.metrics,
-                readonly: options.readOnly,
-                flex_index: options.flexIndex,
-                preserve_expiry: options.preserveExpiry,
+                adhoc: options.adhoc || false,
+                metrics: options.metrics || false,
+                readonly: options.readOnly || false,
+                flex_index: options.flexIndex || false,
+                preserve_expiry: options.preserveExpiry || false,
                 max_parallelism: options.maxParallelism,
                 scan_cap: options.scanCap,
                 scan_wait: options.scanWait,
@@ -109,13 +110,14 @@ class QueryExecutor {
                         k,
                         JSON.stringify(v),
                     ]))
-                    : undefined,
+                    : {},
                 positional_parameters: options.parameters && Array.isArray(options.parameters)
-                    ? options.parameters
-                    : undefined,
+                    ? options.parameters.map((v) => JSON.stringify(v))
+                    : [],
                 named_parameters: options.parameters && !Array.isArray(options.parameters)
-                    ? options.parameters
-                    : undefined,
+                    ? Object.fromEntries(Object.entries(options.parameters).map(([k, v]) => [k, JSON.stringify(v)]))
+                    : {},
+                body_str: '',
             }, callback);
         });
     }

package/dist/queryindexmanager.d.ts

@@ -22,10 +22,6 @@ export declare class QueryIndex {
      * The current state of the index.
      */
     state: string;
-    /**
-     * The keyspace which this index covers.
-     */
-    keyspace: string;
     /**
      * The keys for this index.
      */
@@ -38,6 +34,18 @@ export declare class QueryIndex {
      * Information about the partitioning of this index.
      */
     partition?: string;
+    /**
+     * The collection that this index is for.
+     */
+    collectionName?: string;
+    /**
+     * The scope that this index is for.
+     */
+    scopeName?: string;
+    /**
+     * The bucket that this index is for.
+     */
+    bucketName?: string;
     /**
      * @internal
      */
@@ -47,6 +55,14 @@ export declare class QueryIndex {
  * @category Management
  */
 export interface CreateQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * Whether or not the call should ignore the index already existing when
      * determining whether the call was successful.
@@ -70,6 +86,14 @@ export interface CreateQueryIndexOptions {
  * @category Management
  */
 export interface CreatePrimaryQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * The name of this primary index.
      */
@@ -97,6 +121,14 @@ export interface CreatePrimaryQueryIndexOptions {
  * @category Management
  */
 export interface DropQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * Whether or not the call should ignore the index already existing when
      * determining whether the call was successful.
@@ -111,6 +143,14 @@ export interface DropQueryIndexOptions {
  * @category Management
  */
 export interface DropPrimaryQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * The name of the primary index to drop.
      */
@@ -129,6 +169,14 @@ export interface DropPrimaryQueryIndexOptions {
  * @category Management
  */
 export interface GetAllQueryIndexesOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * The timeout for this operation, represented in milliseconds.
      */
@@ -138,6 +186,14 @@ export interface GetAllQueryIndexesOptions {
  * @category Management
  */
 export interface BuildQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * The timeout for this operation, represented in milliseconds.
      */
@@ -147,6 +203,14 @@ export interface BuildQueryIndexOptions {
  * @category Management
  */
 export interface WatchQueryIndexOptions {
+    /**
+     * Specifies the collection of this index.
+     */
+    collectionName?: string;
+    /**
+     * Specifies the collection scope of this index.
+     */
+    scopeName?: string;
     /**
      * Specifies whether the primary indexes should be watched as well.
      */

package/dist/queryindexmanager.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryIndexManager = exports.QueryIndex = void 0;
+const bindingutilities_1 = require("./bindingutilities");
 const errors_1 = require("./errors");
 const httpexecutor_1 = require("./httpexecutor");
 const utilities_1 = require("./utilities");
@@ -18,10 +19,12 @@ class QueryIndex {
         this.isPrimary = data.isPrimary;
         this.type = data.type;
         this.state = data.state;
-        this.keyspace = data.keyspace;
         this.indexKey = data.indexKey;
         this.condition = data.condition;
         this.partition = data.partition;
+        this.collectionName = data.collectionName;
+        this.scopeName = data.scopeName;
+        this.bucketName = data.bucketName;
     }
 }
 exports.QueryIndex = QueryIndex;
@@ -41,53 +44,28 @@ class QueryIndexManager {
     get _http() {
         return new httpexecutor_1.HttpExecutor(this._cluster.conn);
     }
-    async _createIndex(bucketName, options, callback) {
+    async _createIndex(bucketName, isPrimary, options, callback) {
         const timeout = options.timeout || this._cluster.managementTimeout;
-        let qs = '';
-        if (!options.fields) {
-            qs += 'CREATE PRIMARY INDEX';
-        }
-        else {
-            qs += 'CREATE INDEX';
-        }
-        if (options.name) {
-            qs += ' `' + options.name + '`';
-        }
-        qs += ' ON `' + bucketName + '`';
-        if (options.fields && options.fields.length > 0) {
-            qs += '(';
-            for (let i = 0; i < options.fields.length; ++i) {
-                if (i > 0) {
-                    qs += ', ';
-                }
-                qs += '`' + options.fields[i] + '`';
-            }
-            qs += ')';
-        }
-        const withOpts = {};
-        if (options.deferred) {
-            withOpts.defer_build = true;
-        }
-        if (options.numReplicas) {
-            withOpts.num_replica = options.numReplicas;
-        }
-        if (Object.keys(withOpts).length > 0) {
-            qs += ' WITH ' + JSON.stringify(withOpts);
-        }
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            try {
-                await this._cluster.query(qs, {
-                    timeout: timeout,
-                });
-            }
-            catch (err) {
-                if (options.ignoreIfExists && err instanceof errors_1.IndexExistsError) {
-                    // swallow the error if the user wants us to
-                }
-                else {
-                    throw err;
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementQueryIndexCreate({
+                bucket_name: bucketName,
+                scope_name: options.scopeName || '',
+                collection_name: options.collectionName || '',
+                index_name: options.name || '',
+                fields: options.fields || [],
+                is_primary: isPrimary,
+                ignore_if_exists: options.ignoreIfExists || false,
+                deferred: options.deferred,
+                num_replicas: options.numReplicas,
+                timeout: timeout,
+                condition: undefined,
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-            }
+                wrapCallback(err);
+            });
         }, callback);
     }
     /**
@@ -107,7 +85,9 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
-        return this._createIndex(bucketName, {
+        return this._createIndex(bucketName, false, {
+            collectionName: options.collectionName,
+            scopeName: options.scopeName,
             name: indexName,
             fields: fields,
             ignoreIfExists: options.ignoreIfExists,
@@ -131,36 +111,37 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
-        return this._createIndex(bucketName, {
+        return this._createIndex(bucketName, true, {
+            collectionName: options.collectionName,
+            scopeName: options.scopeName,
             name: options.name,
             ignoreIfExists: options.ignoreIfExists,
             deferred: options.deferred,
             timeout: options.timeout,
         }, callback);
     }
-    async _dropIndex(bucketName, options, callback) {
+    async _dropIndex(bucketName, isPrimary, options, callback) {
         const timeout = options.timeout || this._cluster.managementTimeout;
-        let qs = '';
-        if (!options.name) {
-            qs += 'DROP PRIMARY INDEX `' + bucketName + '`';
-        }
-        else {
-            qs += 'DROP INDEX `' + bucketName + '`.`' + options.name + '`';
+        // BUG(JSCBC-1066): We need to use a normal drop index for named primary indexes.
+        if (options.name) {
+            isPrimary = false;
         }
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            try {
-                await this._cluster.query(qs, {
-                    timeout: timeout,
-                });
-            }
-            catch (err) {
-                if (options.ignoreIfNotExists && err instanceof errors_1.IndexNotFoundError) {
-                    // swallow the error if the user wants us to
-                }
-                else {
-                    throw err;
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementQueryIndexDrop({
+                bucket_name: bucketName,
+                scope_name: options.scopeName || '',
+                collection_name: options.collectionName || '',
+                index_name: options.name || '',
+                is_primary: isPrimary,
+                ignore_if_does_not_exist: options.ignoreIfNotExists || false,
+                timeout: timeout,
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-            }
+                wrapCallback(err);
+            });
         }, callback);
     }
     /**
@@ -179,7 +160,9 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
-        return this._dropIndex(bucketName, {
+        return this._dropIndex(bucketName, false, {
+            collectionName: options.collectionName,
+            scopeName: options.scopeName,
             name: indexName,
             ignoreIfNotExists: options.ignoreIfNotExists,
             timeout: options.timeout,
@@ -200,7 +183,9 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
-        return this._dropIndex(bucketName, {
+        return this._dropIndex(bucketName, true, {
+            collectionName: options.collectionName,
+            scopeName: options.scopeName,
             name: options.name,
             ignoreIfNotExists: options.ignoreIfNotExists,
             timeout: options.timeout,
@@ -221,27 +206,34 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
-        const qs = `SELECT idx.* FROM system:indexes AS idx
-              WHERE (
-                (\`bucket_id\` IS MISSING AND \`keyspace_id\`="${bucketName}")
-                OR \`bucket_id\`="${bucketName}"
-              ) AND \`using\`="gsi" ORDER BY is_primary DESC, name ASC`;
+        const collectionName = options.collectionName || '';
+        const scopeName = options.scopeName || '';
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._cluster.query(qs, {
-                timeout: timeout,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementQueryIndexGetAll({
+                bucket_name: bucketName,
+                scope_name: scopeName,
+                collection_name: collectionName,
+                timeout,
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                const indexes = resp.indexes.map((row) => new QueryIndex({
+                    isPrimary: row.is_primary,
+                    name: row.name,
+                    state: row.state,
+                    type: row.type,
+                    indexKey: row.index_key,
+                    partition: row.partition,
+                    condition: row.condition,
+                    bucketName: row.bucket_name,
+                    scopeName: row.scope_name,
+                    collectionName: row.collection_name,
+                }));
+                wrapCallback(null, indexes);
             });
-            const indexes = res.rows.map((row) => new QueryIndex({
-                name: row.name,
-                isPrimary: row.is_primary,
-                type: row.using,
-                state: row.state,
-                keyspace: row.keyspace_id,
-                indexKey: row.index_key,
-                condition: row.condition,
-                partition: row.partition,
-            }));
-            return indexes;
         }, callback);
     }
     /**
@@ -259,36 +251,22 @@ class QueryIndexManager {
         if (!options) {
             options = {};
         }
+        const collectionName = options.collectionName || '';
+        const scopeName = options.scopeName || '';
         const timeout = options.timeout || this._cluster.managementTimeout;
-        const timer = new utilities_1.CompoundTimeout(timeout);
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const indexes = await this.getAllIndexes(bucketName, {
-                timeout: timer.left(),
-            });
-            // Filter out the index names that need to be built
-            const deferredList = indexes
-                .filter((index) => index.state === 'deferred' || index.state === 'pending')
-                .map((index) => index.name);
-            // If there are no deferred indexes, we have nothing to do.
-            if (deferredList.length === 0) {
-                return [];
-            }
-            let qs = '';
-            qs += 'BUILD INDEX ON `' + bucketName + '` ';
-            qs += '(';
-            for (let j = 0; j < deferredList.length; ++j) {
-                if (j > 0) {
-                    qs += ', ';
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementQueryIndexBuildDeferred({
+                bucket_name: bucketName,
+                scope_name: scopeName,
+                collection_name: collectionName,
+                timeout: timeout,
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                qs += '`' + deferredList[j] + '`';
-            }
-            qs += ')';
-            // Run our deferred build query
-            await this._cluster.query(qs, {
-                timeout: timer.left(),
+                wrapCallback(null, null);
             });
-            // Return the list of indices that we built
-            return deferredList;
         }, callback);
     }
     /**

package/dist/scope.d.ts

@@ -1,8 +1,8 @@
 import { AnalyticsMetaData, AnalyticsQueryOptions, AnalyticsResult } from './analyticstypes';
+import { CppConnection } from './binding';
 import { Bucket } from './bucket';
 import { Cluster } from './cluster';
 import { Collection } from './collection';
-import { Connection } from './connection';
 import { QueryMetaData, QueryOptions, QueryResult } from './querytypes';
 import { StreamableRowPromise } from './streamablepromises';
 import { Transcoder } from './transcoders';
@@ -28,7 +28,7 @@ export declare class Scope {
     /**
     @internal
     */
-    get conn(): Connection;
+    get conn(): CppConnection;
     /**
     @internal
     */

package/dist/sdspecs.d.ts

@@ -1,4 +1,4 @@
-import { CppLookupInPathFlag, CppMutateInPathFlag, CppSubdocOpcode } from './binding';
+import { CppProtocolSubdocOpcode } from './binding';
 /**
  * Represents a macro that can be passed to a lookup-in operation to
  * fetch special values such as the expiry, cas, etc...
@@ -87,7 +87,7 @@ export declare class LookupInSpec {
     /**
      * @internal
      */
-    _op: CppSubdocOpcode;
+    _op: CppProtocolSubdocOpcode;
     /**
      * @internal
      */
@@ -95,7 +95,7 @@ export declare class LookupInSpec {
     /**
      * @internal
      */
-    _flags: CppLookupInPathFlag;
+    _flags: number;
     private constructor();
     private static _create;
     /**
@@ -151,7 +151,7 @@ export declare class MutateInSpec {
     /**
      * @internal
      */
-    _op: CppSubdocOpcode;
+    _op: CppProtocolSubdocOpcode;
     /**
      * @internal
      */
@@ -159,7 +159,7 @@ export declare class MutateInSpec {
     /**
      * @internal
      */
-    _flags: CppMutateInPathFlag;
+    _flags: number;
     /**
      * @internal
      */