couchbase 4.2.10 → 4.2.11

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.2.10",
+  "version": "4.2.11",
   "config": {
     "native": false
   },
@@ -79,12 +79,12 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.2.10",
-    "@couchbase/couchbase-darwin-x64-napi": "4.2.10",
-    "@couchbase/couchbase-linux-arm64-napi": "4.2.10",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.2.10",
-    "@couchbase/couchbase-linux-x64-napi": "4.2.10",
-    "@couchbase/couchbase-win32-x64-napi": "4.2.10"
+    "@couchbase/couchbase-darwin-arm64-napi": "4.2.11",
+    "@couchbase/couchbase-darwin-x64-napi": "4.2.11",
+    "@couchbase/couchbase-linux-arm64-napi": "4.2.11",
+    "@couchbase/couchbase-linuxmusl-x64-napi": "4.2.11",
+    "@couchbase/couchbase-linux-x64-napi": "4.2.11",
+    "@couchbase/couchbase-win32-x64-napi": "4.2.11"
   },
   "files": [
     "LICENSE",

package/src/constants.cpp

@@ -865,6 +865,7 @@ void Constants::InitAutogen(Napi::Env env, Napi::Object exports)
                  couchbase::key_value_status_code::opaque_no_match},
                 {"locked", couchbase::key_value_status_code::locked},
                 {"not_locked", couchbase::key_value_status_code::not_locked},
+                {"config_only", couchbase::key_value_status_code::config_only},
                 {"auth_stale", couchbase::key_value_status_code::auth_stale},
                 {"auth_error", couchbase::key_value_status_code::auth_error},
                 {"auth_continue",

package/src/jstocbpp_autogen.hpp

@@ -19,7 +19,6 @@
 #include <core/operations/management/user.hxx>
 #include <core/operations/management/view.hxx>
 #include <core/range_scan_orchestrator_options.hxx>
-#include <core/scan_options.hxx>
 
 namespace couchnode
 {
@@ -411,7 +410,7 @@ struct js_to_cbpp_t<couchbase::core::management::views::design_document> {
     {
         auto jsObj = jsVal.ToObject();
         couchbase::core::management::views::design_document cppObj;
-        js_to_cbpp<std::string>(cppObj.rev, jsObj.Get("rev"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.rev, jsObj.Get("rev"));
         js_to_cbpp<std::string>(cppObj.name, jsObj.Get("name"));
         js_to_cbpp<couchbase::core::design_document_namespace>(cppObj.ns,
                                                                jsObj.Get("ns"));
@@ -425,7 +424,8 @@ struct js_to_cbpp_t<couchbase::core::management::views::design_document> {
           const couchbase::core::management::views::design_document &cppObj)
     {
         auto resObj = Napi::Object::New(env);
-        resObj.Set("rev", cbpp_to_js<std::string>(env, cppObj.rev));
+        resObj.Set("rev",
+                   cbpp_to_js<std::optional<std::string>>(env, cppObj.rev));
         resObj.Set("name", cbpp_to_js<std::string>(env, cppObj.name));
         resObj.Set("ns", cbpp_to_js<couchbase::core::design_document_namespace>(
                              env, cppObj.ns));
@@ -3874,6 +3874,10 @@ struct js_to_cbpp_t<couchbase::core::operations::search_request> {
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
         js_to_cbpp<couchbase::core::json_string>(cppObj.query,
                                                  jsObj.Get("query"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<bool>>(cppObj.show_request,
                                         jsObj.Get("show_request"));
         js_to_cbpp<std::optional<couchbase::core::json_string>>(
@@ -3925,6 +3929,10 @@ struct js_to_cbpp_t<couchbase::core::operations::search_request> {
                    cbpp_to_js<std::string>(env, cppObj.index_name));
         resObj.Set("query",
                    cbpp_to_js<couchbase::core::json_string>(env, cppObj.query));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("show_request",
                    cbpp_to_js<std::optional<bool>>(env, cppObj.show_request));
         resObj.Set("vector_search",
@@ -4315,6 +4323,7 @@ struct js_to_cbpp_t<couchbase::core::operations::document_view_request> {
         js_to_cbpp<bool>(cppObj.debug, jsObj.Get("debug"));
         js_to_cbpp<std::map<std::string, std::string>>(cppObj.raw,
                                                        jsObj.Get("raw"));
+        js_to_cbpp<std::optional<bool>>(cppObj.full_set, jsObj.Get("full_set"));
         js_to_cbpp<std::optional<couchbase::core::view_sort_order>>(
             cppObj.order, jsObj.Get("order"));
         js_to_cbpp<std::optional<couchbase::core::view_on_error>>(
@@ -4371,6 +4380,8 @@ struct js_to_cbpp_t<couchbase::core::operations::document_view_request> {
         resObj.Set("debug", cbpp_to_js<bool>(env, cppObj.debug));
         resObj.Set("raw", cbpp_to_js<std::map<std::string, std::string>>(
                               env, cppObj.raw));
+        resObj.Set("full_set",
+                   cbpp_to_js<std::optional<bool>>(env, cppObj.full_set));
         resObj.Set("order",
                    cbpp_to_js<std::optional<couchbase::core::view_sort_order>>(
                        env, cppObj.order));
@@ -5807,6 +5818,10 @@ struct js_to_cbpp_t<
         auto jsObj = jsVal.ToObject();
         couchbase::core::operations::management::search_index_get_all_request
             cppObj;
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -5818,6 +5833,10 @@ struct js_to_cbpp_t<
                              search_index_get_all_request &cppObj)
     {
         auto resObj = Napi::Object::New(env);
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -5869,6 +5888,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
         js_to_cbpp<std::string>(cppObj.encoded_document,
                                 jsObj.Get("encoded_document"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -5884,6 +5907,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
                    cbpp_to_js<std::string>(env, cppObj.index_name));
         resObj.Set("encoded_document",
                    cbpp_to_js<std::string>(env, cppObj.encoded_document));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -6292,8 +6319,7 @@ struct js_to_cbpp_t<
         js_to_cbpp<std::string>(cppObj.collection_name,
                                 jsObj.Get("collection_name"));
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
-        js_to_cbpp<std::vector<std::string>>(cppObj.fields,
-                                             jsObj.Get("fields"));
+        js_to_cbpp<std::vector<std::string>>(cppObj.keys, jsObj.Get("keys"));
         js_to_cbpp<couchbase::core::query_context>(cppObj.query_ctx,
                                                    jsObj.Get("query_ctx"));
         js_to_cbpp<bool>(cppObj.is_primary, jsObj.Get("is_primary"));
@@ -6323,8 +6349,8 @@ struct js_to_cbpp_t<
                    cbpp_to_js<std::string>(env, cppObj.collection_name));
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
-        resObj.Set("fields",
-                   cbpp_to_js<std::vector<std::string>>(env, cppObj.fields));
+        resObj.Set("keys",
+                   cbpp_to_js<std::vector<std::string>>(env, cppObj.keys));
         resObj.Set("query_ctx", cbpp_to_js<couchbase::core::query_context>(
                                     env, cppObj.query_ctx));
         resObj.Set("is_primary", cbpp_to_js<bool>(env, cppObj.is_primary));
@@ -6388,6 +6414,10 @@ struct js_to_cbpp_t<
             cppObj;
         js_to_cbpp<couchbase::core::management::search::index>(
             cppObj.index, jsObj.Get("index"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -6402,6 +6432,10 @@ struct js_to_cbpp_t<
         resObj.Set("index",
                    cbpp_to_js<couchbase::core::management::search::index>(
                        env, cppObj.index));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -8618,6 +8652,10 @@ struct js_to_cbpp_t<
         couchbase::core::operations::management::search_index_drop_request
             cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -8632,6 +8670,10 @@ struct js_to_cbpp_t<
         auto resObj = Napi::Object::New(env);
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -8680,6 +8722,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
             search_index_control_plan_freeze_request cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
         js_to_cbpp<bool>(cppObj.freeze, jsObj.Get("freeze"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -8694,6 +8740,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
         resObj.Set("freeze", cbpp_to_js<bool>(env, cppObj.freeze));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -8928,6 +8978,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
             search_index_control_query_request cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
         js_to_cbpp<bool>(cppObj.allow, jsObj.Get("allow"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -8942,6 +8996,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
         resObj.Set("allow", cbpp_to_js<bool>(env, cppObj.allow));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -9319,6 +9377,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
             search_index_control_ingest_request cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
         js_to_cbpp<bool>(cppObj.pause, jsObj.Get("pause"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -9333,6 +9395,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
         resObj.Set("pause", cbpp_to_js<bool>(env, cppObj.pause));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -9766,6 +9832,10 @@ struct js_to_cbpp_t<
         couchbase::core::operations::management::search_index_get_request
             cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -9780,6 +9850,10 @@ struct js_to_cbpp_t<
         auto resObj = Napi::Object::New(env);
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",
@@ -10073,6 +10147,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         couchbase::core::operations::management::
             search_index_get_documents_count_request cppObj;
         js_to_cbpp<std::string>(cppObj.index_name, jsObj.Get("index_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket_name,
+                                               jsObj.Get("bucket_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope_name,
+                                               jsObj.Get("scope_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -10086,6 +10164,10 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
         auto resObj = Napi::Object::New(env);
         resObj.Set("index_name",
                    cbpp_to_js<std::string>(env, cppObj.index_name));
+        resObj.Set("bucket_name", cbpp_to_js<std::optional<std::string>>(
+                                      env, cppObj.bucket_name));
+        resObj.Set("scope_name", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.scope_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",

package/deps/couchbase-cxx-client/core/scan_options.hxx

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 2022-Present Couchbase, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- * ANY KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#pragma once
-
-#include "range_scan_options.hxx"
-
-#include <couchbase/mutation_token.hxx>
-#include <couchbase/retry_strategy.hxx>
-
-#include <cinttypes>
-#include <memory>
-#include <optional>
-#include <system_error>
-#include <variant>
-#include <vector>
-
-namespace couchbase
-{
-class retry_strategy;
-namespace tracing
-{
-class request_span;
-} // namespace tracing
-} // namespace couchbase
-
-namespace couchbase::core
-{
-struct mutation_state {
-    std::vector<couchbase::mutation_token> tokens;
-};
-} // namespace couchbase::core