couchbase 4.1.1 → 4.1.3

package/src/connection_autogen.cpp

@@ -12,7 +12,21 @@ Napi::Value Connection::jsPrepend(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("prepend",
-              jsToCbpp<couchbase::operations::prepend_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::prepend_request>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value
+Connection::jsPrependWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("prependWithLegacyDurability",
+              jsToCbpp<couchbase::core::operations::
+                           prepend_request_with_legacy_durability>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -24,7 +38,7 @@ Napi::Value Connection::jsExists(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("exists",
-              jsToCbpp<couchbase::operations::exists_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::exists_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -35,9 +49,10 @@ Napi::Value Connection::jsHttpNoop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("httpNoop",
-              jsToCbpp<couchbase::operations::http_noop_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "httpNoop",
+        jsToCbpp<couchbase::core::operations::http_noop_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -48,7 +63,20 @@ Napi::Value Connection::jsUnlock(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("unlock",
-              jsToCbpp<couchbase::operations::unlock_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::unlock_request>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsGetAllReplicas(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("getAllReplicas",
+              jsToCbpp<couchbase::core::operations::get_all_replicas_request>(
+                  optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -60,7 +88,36 @@ Napi::Value Connection::jsUpsert(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("upsert",
-              jsToCbpp<couchbase::operations::upsert_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::upsert_request>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value
+Connection::jsUpsertWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "upsertWithLegacyDurability",
+        jsToCbpp<
+            couchbase::core::operations::upsert_request_with_legacy_durability>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsGetAnyReplica(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("getAnyReplica",
+              jsToCbpp<couchbase::core::operations::get_any_replica_request>(
+                  optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -72,19 +129,35 @@ Napi::Value Connection::jsAppend(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("append",
-              jsToCbpp<couchbase::operations::append_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::append_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
+Napi::Value
+Connection::jsAppendWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "appendWithLegacyDurability",
+        jsToCbpp<
+            couchbase::core::operations::append_request_with_legacy_durability>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value Connection::jsQuery(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("query",
-              jsToCbpp<couchbase::operations::query_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::query_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -96,42 +169,74 @@ Napi::Value Connection::jsReplace(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("replace",
-              jsToCbpp<couchbase::operations::replace_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::replace_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
-Napi::Value Connection::jsGetAndTouch(const Napi::CallbackInfo &info)
+Napi::Value
+Connection::jsReplaceWithLegacyDurability(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("getAndTouch",
-              jsToCbpp<couchbase::operations::get_and_touch_request>(optsJsObj),
+    executeOp("replaceWithLegacyDurability",
+              jsToCbpp<couchbase::core::operations::
+                           replace_request_with_legacy_durability>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
+Napi::Value Connection::jsGetAndTouch(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "getAndTouch",
+        jsToCbpp<couchbase::core::operations::get_and_touch_request>(optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value Connection::jsRemove(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("remove",
-              jsToCbpp<couchbase::operations::remove_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::remove_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
+Napi::Value
+Connection::jsRemoveWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "removeWithLegacyDurability",
+        jsToCbpp<
+            couchbase::core::operations::remove_request_with_legacy_durability>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value Connection::jsGet(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("get", jsToCbpp<couchbase::operations::get_request>(optsJsObj),
+    executeOp("get",
+              jsToCbpp<couchbase::core::operations::get_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -142,9 +247,10 @@ Napi::Value Connection::jsAnalytics(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("analytics",
-              jsToCbpp<couchbase::operations::analytics_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "analytics",
+        jsToCbpp<couchbase::core::operations::analytics_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -154,9 +260,10 @@ Napi::Value Connection::jsGetProjected(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("getProjected",
-              jsToCbpp<couchbase::operations::get_projected_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "getProjected",
+        jsToCbpp<couchbase::core::operations::get_projected_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -166,8 +273,23 @@ Napi::Value Connection::jsDecrement(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("decrement",
-              jsToCbpp<couchbase::operations::decrement_request>(optsJsObj),
+    executeOp(
+        "decrement",
+        jsToCbpp<couchbase::core::operations::decrement_request>(optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value
+Connection::jsDecrementWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("decrementWithLegacyDurability",
+              jsToCbpp<couchbase::core::operations::
+                           decrement_request_with_legacy_durability>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -179,7 +301,7 @@ Napi::Value Connection::jsSearch(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("search",
-              jsToCbpp<couchbase::operations::search_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::search_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -191,7 +313,7 @@ Napi::Value Connection::jsTouch(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("touch",
-              jsToCbpp<couchbase::operations::touch_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::touch_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -202,9 +324,10 @@ Napi::Value Connection::jsLookupIn(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("lookupIn",
-              jsToCbpp<couchbase::operations::lookup_in_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "lookupIn",
+        jsToCbpp<couchbase::core::operations::lookup_in_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -214,9 +337,10 @@ Napi::Value Connection::jsDocumentView(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("documentView",
-              jsToCbpp<couchbase::operations::document_view_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "documentView",
+        jsToCbpp<couchbase::core::operations::document_view_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -226,9 +350,10 @@ Napi::Value Connection::jsGetAndLock(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("getAndLock",
-              jsToCbpp<couchbase::operations::get_and_lock_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "getAndLock",
+        jsToCbpp<couchbase::core::operations::get_and_lock_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -239,19 +364,50 @@ Napi::Value Connection::jsInsert(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("insert",
-              jsToCbpp<couchbase::operations::insert_request>(optsJsObj),
+              jsToCbpp<couchbase::core::operations::insert_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
+Napi::Value
+Connection::jsInsertWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "insertWithLegacyDurability",
+        jsToCbpp<
+            couchbase::core::operations::insert_request_with_legacy_durability>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value Connection::jsMutateIn(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("mutateIn",
-              jsToCbpp<couchbase::operations::mutate_in_request>(optsJsObj),
+    executeOp(
+        "mutateIn",
+        jsToCbpp<couchbase::core::operations::mutate_in_request>(optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value
+Connection::jsMutateInWithLegacyDurability(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("mutateInWithLegacyDurability",
+              jsToCbpp<couchbase::core::operations::
+                           mutate_in_request_with_legacy_durability>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
@@ -262,54 +418,66 @@ Napi::Value Connection::jsIncrement(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("increment",
-              jsToCbpp<couchbase::operations::increment_request>(optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "increment",
+        jsToCbpp<couchbase::core::operations::increment_request>(optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
 
-Napi::Value Connection::jsManagementGroupUpsert(const Napi::CallbackInfo &info)
+Napi::Value
+Connection::jsIncrementWithLegacyDurability(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementGroupUpsert",
-              jsToCbpp<couchbase::operations::management::group_upsert_request>(
-                  optsJsObj),
+    executeOp("incrementWithLegacyDurability",
+              jsToCbpp<couchbase::core::operations::
+                           increment_request_with_legacy_durability>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
-Napi::Value
-Connection::jsManagementEventingPauseFunction(const Napi::CallbackInfo &info)
+Napi::Value Connection::jsManagementGroupUpsert(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp(
-        "managementEventingPauseFunction",
-        jsToCbpp<
-            couchbase::operations::management::eventing_pause_function_request>(
+        "managementGroupUpsert",
+        jsToCbpp<couchbase::core::operations::management::group_upsert_request>(
             optsJsObj),
         callbackJsFn);
 
     return info.Env().Null();
 }
 
+Napi::Value
+Connection::jsManagementEventingPauseFunction(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("managementEventingPauseFunction",
+              jsToCbpp<couchbase::core::operations::management::
+                           eventing_pause_function_request>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value
 Connection::jsManagementQueryIndexGetAll(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementQueryIndexGetAll",
-        jsToCbpp<
-            couchbase::operations::management::query_index_get_all_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementQueryIndexGetAll",
+              jsToCbpp<couchbase::core::operations::management::
+                           query_index_get_all_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -322,7 +490,8 @@ Connection::jsManagementCollectionCreate(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementCollectionCreate",
-        jsToCbpp<couchbase::operations::management::collection_create_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::collection_create_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -336,7 +505,7 @@ Connection::jsManagementEventingResumeFunction(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementEventingResumeFunction",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            eventing_resume_function_request>(optsJsObj),
               callbackJsFn);
 
@@ -349,12 +518,10 @@ Connection::jsManagementSearchIndexGetStats(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementSearchIndexGetStats",
-        jsToCbpp<
-            couchbase::operations::management::search_index_get_stats_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementSearchIndexGetStats",
+              jsToCbpp<couchbase::core::operations::management::
+                           search_index_get_stats_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -366,7 +533,8 @@ Napi::Value Connection::jsManagementBucketGetAll(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementBucketGetAll",
-        jsToCbpp<couchbase::operations::management::bucket_get_all_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::bucket_get_all_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -380,7 +548,7 @@ Connection::jsManagementQueryIndexBuildDeferred(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementQueryIndexBuildDeferred",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            query_index_build_deferred_request>(optsJsObj),
               callbackJsFn);
 
@@ -395,7 +563,8 @@ Connection::jsManagementClusterDescribe(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementClusterDescribe",
-        jsToCbpp<couchbase::operations::management::cluster_describe_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::cluster_describe_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -408,12 +577,10 @@ Connection::jsManagementSearchIndexGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementSearchIndexGetAll",
-        jsToCbpp<
-            couchbase::operations::management::search_index_get_all_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementSearchIndexGetAll",
+              jsToCbpp<couchbase::core::operations::management::
+                           search_index_get_all_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -425,7 +592,7 @@ Napi::Value Connection::jsManagementSearchIndexAnalyzeDocument(
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementSearchIndexAnalyzeDocument",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            search_index_analyze_document_request>(optsJsObj),
               callbackJsFn);
 
@@ -440,7 +607,8 @@ Connection::jsManagementQueryIndexDrop(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementQueryIndexDrop",
-        jsToCbpp<couchbase::operations::management::query_index_drop_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::query_index_drop_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -454,7 +622,7 @@ Connection::jsManagementAnalyticsDatasetCreate(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsDatasetCreate",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_dataset_create_request>(optsJsObj),
               callbackJsFn);
 
@@ -466,10 +634,11 @@ Napi::Value Connection::jsManagementBucketFlush(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementBucketFlush",
-              jsToCbpp<couchbase::operations::management::bucket_flush_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementBucketFlush",
+        jsToCbpp<couchbase::core::operations::management::bucket_flush_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -480,12 +649,10 @@ Connection::jsManagementAnalyticsIndexDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsIndexDrop",
-        jsToCbpp<
-            couchbase::operations::management::analytics_index_drop_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsIndexDrop",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_index_drop_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -496,11 +663,10 @@ Connection::jsManagementQueryIndexCreate(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementQueryIndexCreate",
-        jsToCbpp<couchbase::operations::management::query_index_create_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementQueryIndexCreate",
+              jsToCbpp<couchbase::core::operations::management::
+                           query_index_create_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -511,12 +677,10 @@ Connection::jsManagementSearchIndexUpsert(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementSearchIndexUpsert",
-        jsToCbpp<
-            couchbase::operations::management::search_index_upsert_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementSearchIndexUpsert",
+              jsToCbpp<couchbase::core::operations::management::
+                           search_index_upsert_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -528,7 +692,7 @@ Connection::jsManagementAnalyticsDatasetGetAll(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsDatasetGetAll",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_dataset_get_all_request>(optsJsObj),
               callbackJsFn);
 
@@ -541,12 +705,10 @@ Connection::jsManagementAnalyticsIndexGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsIndexGetAll",
-        jsToCbpp<
-            couchbase::operations::management::analytics_index_get_all_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsIndexGetAll",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_index_get_all_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -558,7 +720,7 @@ Napi::Value Connection::jsManagementAnalyticsGetPendingMutations(
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsGetPendingMutations",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_get_pending_mutations_request>(optsJsObj),
               callbackJsFn);
 
@@ -572,7 +734,7 @@ Connection::jsManagementAnalyticsDataverseDrop(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsDataverseDrop",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_dataverse_drop_request>(optsJsObj),
               callbackJsFn);
 
@@ -585,12 +747,10 @@ Connection::jsManagementAnalyticsLinkConnect(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsLinkConnect",
-        jsToCbpp<
-            couchbase::operations::management::analytics_link_connect_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsLinkConnect",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_connect_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -602,7 +762,7 @@ Connection::jsManagementCollectionsManifestGet(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementCollectionsManifestGet",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            collections_manifest_get_request>(optsJsObj),
               callbackJsFn);
 
@@ -616,7 +776,7 @@ Napi::Value Connection::jsManagementClusterDeveloperPreviewEnable(
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementClusterDeveloperPreviewEnable",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            cluster_developer_preview_enable_request>(optsJsObj),
               callbackJsFn);
 
@@ -629,12 +789,10 @@ Connection::jsManagementAnalyticsLinkDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsLinkDrop",
-        jsToCbpp<
-            couchbase::operations::management::analytics_link_drop_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsLinkDrop",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_drop_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -647,7 +805,8 @@ Connection::jsManagementBucketDescribe(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementBucketDescribe",
-        jsToCbpp<couchbase::operations::management::bucket_describe_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::bucket_describe_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -661,7 +820,7 @@ Connection::jsManagementEventingUpsertFunction(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementEventingUpsertFunction",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            eventing_upsert_function_request>(optsJsObj),
               callbackJsFn);
 
@@ -674,11 +833,10 @@ Connection::jsManagementViewIndexGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementViewIndexGetAll",
-        jsToCbpp<couchbase::operations::management::view_index_get_all_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementViewIndexGetAll",
+              jsToCbpp<couchbase::core::operations::management::
+                           view_index_get_all_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -688,10 +846,11 @@ Napi::Value Connection::jsManagementBucketGet(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementBucketGet",
-              jsToCbpp<couchbase::operations::management::bucket_get_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementBucketGet",
+        jsToCbpp<couchbase::core::operations::management::bucket_get_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -703,7 +862,8 @@ Napi::Value Connection::jsManagementBucketUpdate(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementBucketUpdate",
-        jsToCbpp<couchbase::operations::management::bucket_update_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::bucket_update_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -715,10 +875,11 @@ Napi::Value Connection::jsManagementBucketDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementBucketDrop",
-              jsToCbpp<couchbase::operations::management::bucket_drop_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementBucketDrop",
+        jsToCbpp<couchbase::core::operations::management::bucket_drop_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -728,10 +889,11 @@ Napi::Value Connection::jsManagementFreeform(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementFreeform",
-              jsToCbpp<couchbase::operations::management::freeform_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementFreeform",
+        jsToCbpp<couchbase::core::operations::management::freeform_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -741,10 +903,11 @@ Napi::Value Connection::jsManagementScopeDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementScopeDrop",
-              jsToCbpp<couchbase::operations::management::scope_drop_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementScopeDrop",
+        jsToCbpp<couchbase::core::operations::management::scope_drop_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -757,7 +920,8 @@ Connection::jsManagementViewIndexUpsert(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementViewIndexUpsert",
-        jsToCbpp<couchbase::operations::management::view_index_upsert_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::view_index_upsert_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -769,10 +933,11 @@ Napi::Value Connection::jsManagementUserGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementUserGetAll",
-              jsToCbpp<couchbase::operations::management::user_get_all_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementUserGetAll",
+        jsToCbpp<couchbase::core::operations::management::user_get_all_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -782,10 +947,11 @@ Napi::Value Connection::jsManagementScopeCreate(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementScopeCreate",
-              jsToCbpp<couchbase::operations::management::scope_create_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementScopeCreate",
+        jsToCbpp<couchbase::core::operations::management::scope_create_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -796,12 +962,10 @@ Connection::jsManagementEventingGetFunction(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementEventingGetFunction",
-        jsToCbpp<
-            couchbase::operations::management::eventing_get_function_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementEventingGetFunction",
+              jsToCbpp<couchbase::core::operations::management::
+                           eventing_get_function_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -814,7 +978,8 @@ Connection::jsManagementViewIndexDrop(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementViewIndexDrop",
-        jsToCbpp<couchbase::operations::management::view_index_drop_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::view_index_drop_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -828,7 +993,7 @@ Connection::jsManagementAnalyticsLinkDisconnect(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsLinkDisconnect",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_link_disconnect_request>(optsJsObj),
               callbackJsFn);
 
@@ -840,10 +1005,11 @@ Napi::Value Connection::jsManagementUserUpsert(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementUserUpsert",
-              jsToCbpp<couchbase::operations::management::user_upsert_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementUserUpsert",
+        jsToCbpp<couchbase::core::operations::management::user_upsert_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -854,12 +1020,10 @@ Connection::jsManagementEventingGetStatus(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementEventingGetStatus",
-        jsToCbpp<
-            couchbase::operations::management::eventing_get_status_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementEventingGetStatus",
+              jsToCbpp<couchbase::core::operations::management::
+                           eventing_get_status_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -871,7 +1035,7 @@ Connection::jsManagementEventingGetAllFunctions(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementEventingGetAllFunctions",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            eventing_get_all_functions_request>(optsJsObj),
               callbackJsFn);
 
@@ -884,12 +1048,10 @@ Connection::jsManagementAnalyticsIndexCreate(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsIndexCreate",
-        jsToCbpp<
-            couchbase::operations::management::analytics_index_create_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsIndexCreate",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_index_create_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -901,7 +1063,8 @@ Napi::Value Connection::jsManagementScopeGetAll(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementScopeGetAll",
-        jsToCbpp<couchbase::operations::management::scope_get_all_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::scope_get_all_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -913,10 +1076,11 @@ Napi::Value Connection::jsManagementUserGet(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementUserGet",
-              jsToCbpp<couchbase::operations::management::user_get_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementUserGet",
+        jsToCbpp<couchbase::core::operations::management::user_get_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -929,7 +1093,8 @@ Connection::jsManagementSearchIndexDrop(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementSearchIndexDrop",
-        jsToCbpp<couchbase::operations::management::search_index_drop_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::search_index_drop_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -943,7 +1108,7 @@ Napi::Value Connection::jsManagementSearchIndexControlPlanFreeze(
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementSearchIndexControlPlanFreeze",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            search_index_control_plan_freeze_request>(optsJsObj),
               callbackJsFn);
 
@@ -956,11 +1121,10 @@ Connection::jsManagementSearchIndexStats(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementSearchIndexStats",
-        jsToCbpp<couchbase::operations::management::search_index_stats_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementSearchIndexStats",
+              jsToCbpp<couchbase::core::operations::management::
+                           search_index_stats_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -970,10 +1134,11 @@ Napi::Value Connection::jsManagementUserDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementUserDrop",
-              jsToCbpp<couchbase::operations::management::user_drop_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementUserDrop",
+        jsToCbpp<couchbase::core::operations::management::user_drop_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -985,7 +1150,7 @@ Connection::jsManagementAnalyticsDataverseCreate(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementAnalyticsDataverseCreate",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            analytics_dataverse_create_request>(optsJsObj),
               callbackJsFn);
 
@@ -999,7 +1164,7 @@ Connection::jsManagementSearchIndexControlQuery(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementSearchIndexControlQuery",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            search_index_control_query_request>(optsJsObj),
               callbackJsFn);
 
@@ -1011,10 +1176,11 @@ Napi::Value Connection::jsManagementRoleGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementRoleGetAll",
-              jsToCbpp<couchbase::operations::management::role_get_all_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementRoleGetAll",
+        jsToCbpp<couchbase::core::operations::management::role_get_all_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -1026,7 +1192,8 @@ Napi::Value Connection::jsManagementGroupGetAll(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementGroupGetAll",
-        jsToCbpp<couchbase::operations::management::group_get_all_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::group_get_all_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -1039,12 +1206,10 @@ Connection::jsManagementEventingDropFunction(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementEventingDropFunction",
-        jsToCbpp<
-            couchbase::operations::management::eventing_drop_function_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementEventingDropFunction",
+              jsToCbpp<couchbase::core::operations::management::
+                           eventing_drop_function_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }
@@ -1057,7 +1222,8 @@ Connection::jsManagementCollectionDrop(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementCollectionDrop",
-        jsToCbpp<couchbase::operations::management::collection_drop_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::collection_drop_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -1071,7 +1237,7 @@ Connection::jsManagementSearchIndexControlIngest(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementSearchIndexControlIngest",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            search_index_control_ingest_request>(optsJsObj),
               callbackJsFn);
 
@@ -1085,7 +1251,7 @@ Connection::jsManagementEventingDeployFunction(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementEventingDeployFunction",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            eventing_deploy_function_request>(optsJsObj),
               callbackJsFn);
 
@@ -1097,10 +1263,11 @@ Napi::Value Connection::jsManagementGroupGet(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementGroupGet",
-              jsToCbpp<couchbase::operations::management::group_get_request>(
-                  optsJsObj),
-              callbackJsFn);
+    executeOp(
+        "managementGroupGet",
+        jsToCbpp<couchbase::core::operations::management::group_get_request>(
+            optsJsObj),
+        callbackJsFn);
 
     return info.Env().Null();
 }
@@ -1112,7 +1279,8 @@ Napi::Value Connection::jsManagementViewIndexGet(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementViewIndexGet",
-        jsToCbpp<couchbase::operations::management::view_index_get_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::view_index_get_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -1126,7 +1294,8 @@ Napi::Value Connection::jsManagementBucketCreate(const Napi::CallbackInfo &info)
 
     executeOp(
         "managementBucketCreate",
-        jsToCbpp<couchbase::operations::management::bucket_create_request>(
+        jsToCbpp<
+            couchbase::core::operations::management::bucket_create_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -1139,38 +1308,68 @@ Connection::jsManagementAnalyticsDatasetDrop(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
+    executeOp("managementAnalyticsDatasetDrop",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_dataset_drop_request>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsManagementGroupDrop(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "managementGroupDrop",
+        jsToCbpp<couchbase::core::operations::management::group_drop_request>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value
+Connection::jsManagementSearchIndexGet(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
     executeOp(
-        "managementAnalyticsDatasetDrop",
+        "managementSearchIndexGet",
         jsToCbpp<
-            couchbase::operations::management::analytics_dataset_drop_request>(
+            couchbase::core::operations::management::search_index_get_request>(
             optsJsObj),
         callbackJsFn);
 
     return info.Env().Null();
 }
 
-Napi::Value Connection::jsManagementGroupDrop(const Napi::CallbackInfo &info)
+Napi::Value
+Connection::jsManagementQueryIndexGetAllDeferred(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp("managementGroupDrop",
-              jsToCbpp<couchbase::operations::management::group_drop_request>(
-                  optsJsObj),
+    executeOp("managementQueryIndexGetAllDeferred",
+              jsToCbpp<couchbase::core::operations::management::
+                           query_index_get_all_deferred_request>(optsJsObj),
               callbackJsFn);
 
     return info.Env().Null();
 }
 
 Napi::Value
-Connection::jsManagementSearchIndexGet(const Napi::CallbackInfo &info)
+Connection::jsManagementQueryIndexBuild(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp(
-        "managementSearchIndexGet",
-        jsToCbpp<couchbase::operations::management::search_index_get_request>(
+        "managementQueryIndexBuild",
+        jsToCbpp<
+            couchbase::core::operations::management::query_index_build_request>(
             optsJsObj),
         callbackJsFn);
 
@@ -1184,7 +1383,7 @@ Connection::jsManagementEventingUndeployFunction(const Napi::CallbackInfo &info)
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementEventingUndeployFunction",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            eventing_undeploy_function_request>(optsJsObj),
               callbackJsFn);
 
@@ -1198,7 +1397,7 @@ Napi::Value Connection::jsManagementSearchIndexGetDocumentsCount(
     auto callbackJsFn = info[1].As<Napi::Function>();
 
     executeOp("managementSearchIndexGetDocumentsCount",
-              jsToCbpp<couchbase::operations::management::
+              jsToCbpp<couchbase::core::operations::management::
                            search_index_get_documents_count_request>(optsJsObj),
               callbackJsFn);
 
@@ -1211,12 +1410,10 @@ Connection::jsManagementAnalyticsLinkGetAll(const Napi::CallbackInfo &info)
     auto optsJsObj = info[0].As<Napi::Object>();
     auto callbackJsFn = info[1].As<Napi::Function>();
 
-    executeOp(
-        "managementAnalyticsLinkGetAll",
-        jsToCbpp<
-            couchbase::operations::management::analytics_link_get_all_request>(
-            optsJsObj),
-        callbackJsFn);
+    executeOp("managementAnalyticsLinkGetAll",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_get_all_request>(optsJsObj),
+              callbackJsFn);
 
     return info.Env().Null();
 }