From 757e34642b6b462805bff8e2fd1283c675fcf9bd Mon Sep 17 00:00:00 2001
From: Victor Adossi <vadossi@cosmonic.com>
Date: Mon, 1 Jul 2024 21:09:29 +0900
Subject: [PATCH] fix: add tx-document-get-result for use insid transactions

Signed-off-by: Victor Adossi <vadossi@cosmonic.com>
---
 wit/couchbase/transactions.wit      | 38 +++++++++++++++++++++++------
 wit/deps.lock                       |  4 +--
 wit/deps/couchbase/transactions.wit | 38 +++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/wit/couchbase/transactions.wit b/wit/couchbase/transactions.wit
index 9db564a..0fa1dc1 100644
--- a/wit/couchbase/transactions.wit
+++ b/wit/couchbase/transactions.wit
@@ -8,9 +8,8 @@ package wasmcloud:couchbase@0.1.0-draft;
 interface transactions {
   use types.{
     document-id, request-span, document, subdocument-path, document-error, retry-strategy, mutation-metadata,
-    query-scan-consistency, query-profile-mode, collection
+    query-scan-consistency, query-profile-mode, collection, time
   };
-  use document.{document-get-result};
   use sqlpp.{sqlpp-value, sqlpp-query-status, sqlpp-query-metrics, sqlpp-query-warning};
 
   /// A token representing a transaction (pseudo resource)
@@ -42,31 +41,56 @@ interface transactions {
     unexpected(string),
   }
 
+  /// Result of a successfully executed document get
+  record tx-document-get-result {
+    /// Document that was retrieved
+    document: document,
+
+    /// CAS revision of the document
+    cas: u64,
+
+    /// When the document should expire (nanoseconds)
+    ///
+    /// Deprecated: use expires-at instead
+    expires-in-ns: option<u64>,
+
+    /// Time when the document expires
+    ///
+    /// This field may not be present if `document-get-options.with-expiry` is not set
+    expires-at: option<time>,
+
+    /// ID for metadata related to the operation
+    ///
+    /// This ID is provided by and used by the implementer to manage in-tx metadata,
+    /// and should not be manipulated by callers but rather passed verbatim.
+    tx-metadata-id: string,
+  }
+
   /// Retrieve a document, inside a transaction
   tx-document-get: func(
     tx: tx-token,
     collection: collection,
     id: document-id
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Insert a document, inside a transaction
   tx-document-insert: func(
     tx: tx-token,
     id: document-id,
     document: document,
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Replace a document, inside a transaction
   tx-document-replace: func(
     tx: tx-token,
-    old: document-get-result,
+    old: tx-document-get-result,
     new: document,
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Remove a document, inside a transaction
   tx-document-remove: func(
     tx: tx-token,
-    doc: document,
+    doc: tx-document-get-result,
   ) -> result<_, tx-error>;
 
   /// Options to perform a query inside a transaction
diff --git a/wit/deps.lock b/wit/deps.lock
index 6667e92..3cccefd 100644
--- a/wit/deps.lock
+++ b/wit/deps.lock
@@ -1,7 +1,7 @@
 [couchbase]
 path = "couchbase"
-sha256 = "3d40df73562805e07f6a2aa5f618fa7fa022717cab4aadd065bd2749275b243a"
-sha512 = "2458459dd253299a3aa32594ae6bbd09aac5f740cdf4b6bef6b49bd0f99c3d42f2e5bc92d8b91ae53fe6bfd42403a87c3e683fb6aef51a840cfdb63cff74badf"
+sha256 = "1c4502722fe222e4c4ca9fe94afde60e10e90808b615a2d11c6380c28bda4a1f"
+sha512 = "d530a661e4727a36de87dd354cc82e9f32b3dc2ca985c946afe618930a9b2794e9ed344c0142592a16ad4a0e10d7916b2c5741d935ff49deef5f4cf8bf3735c9"
 
 [keyvalue]
 path = "keyvalue"
diff --git a/wit/deps/couchbase/transactions.wit b/wit/deps/couchbase/transactions.wit
index 9db564a..0fa1dc1 100644
--- a/wit/deps/couchbase/transactions.wit
+++ b/wit/deps/couchbase/transactions.wit
@@ -8,9 +8,8 @@ package wasmcloud:couchbase@0.1.0-draft;
 interface transactions {
   use types.{
     document-id, request-span, document, subdocument-path, document-error, retry-strategy, mutation-metadata,
-    query-scan-consistency, query-profile-mode, collection
+    query-scan-consistency, query-profile-mode, collection, time
   };
-  use document.{document-get-result};
   use sqlpp.{sqlpp-value, sqlpp-query-status, sqlpp-query-metrics, sqlpp-query-warning};
 
   /// A token representing a transaction (pseudo resource)
@@ -42,31 +41,56 @@ interface transactions {
     unexpected(string),
   }
 
+  /// Result of a successfully executed document get
+  record tx-document-get-result {
+    /// Document that was retrieved
+    document: document,
+
+    /// CAS revision of the document
+    cas: u64,
+
+    /// When the document should expire (nanoseconds)
+    ///
+    /// Deprecated: use expires-at instead
+    expires-in-ns: option<u64>,
+
+    /// Time when the document expires
+    ///
+    /// This field may not be present if `document-get-options.with-expiry` is not set
+    expires-at: option<time>,
+
+    /// ID for metadata related to the operation
+    ///
+    /// This ID is provided by and used by the implementer to manage in-tx metadata,
+    /// and should not be manipulated by callers but rather passed verbatim.
+    tx-metadata-id: string,
+  }
+
   /// Retrieve a document, inside a transaction
   tx-document-get: func(
     tx: tx-token,
     collection: collection,
     id: document-id
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Insert a document, inside a transaction
   tx-document-insert: func(
     tx: tx-token,
     id: document-id,
     document: document,
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Replace a document, inside a transaction
   tx-document-replace: func(
     tx: tx-token,
-    old: document-get-result,
+    old: tx-document-get-result,
     new: document,
-  ) -> result<document-get-result, tx-error>;
+  ) -> result<tx-document-get-result, tx-error>;
 
   /// Remove a document, inside a transaction
   tx-document-remove: func(
     tx: tx-token,
-    doc: document,
+    doc: tx-document-get-result,
   ) -> result<_, tx-error>;
 
   /// Options to perform a query inside a transaction