Fix the Client API

xtclang · Jun 8, 2022 · 018520b · 018520b
1 parent cfda10b
commit 018520b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/lib_jsondb/src/main/x/jsondb/Client.x b/lib_jsondb/src/main/x/jsondb/Client.x
@@ -1010,7 +1010,7 @@ service Client<Schema extends RootSchema>
             }
 
         @Override
-        <Result extends immutable Const> Result require(function Result(DBObject) test)
+        <Result extends immutable Const> Result require(function Result(DBObjectImpl) test)
             {
             Transaction tx = requireTransaction_("require()");
             return outer.txManager.registerRequirement(tx.id_, info_.id, test);
@@ -2437,4 +2437,4 @@ service Client<Schema extends RootSchema>
                 }
             }
         }
-    }
+    }
diff --git a/lib_jsondb/src/main/x/jsondb/TxManager.x b/lib_jsondb/src/main/x/jsondb/TxManager.x
@@ -157,6 +157,8 @@ service TxManager<Schema extends RootSchema>(Catalog<Schema> catalog)
         internalJsonSchema = catalog.internalJsonSchema;
         }
 
+    typedef Client<Schema>.DBObjectImpl as DBObjectImpl;
+
 
     // ----- properties ----------------------------------------------------------------------------
 
@@ -464,9 +466,9 @@ service TxManager<Schema extends RootSchema>(Catalog<Schema> catalog)
      */
     static const Requirement<Result extends immutable Const>
         (
-        Int                       dboId,
-        function Result(DBObject) test,
-        Result                    result,
+        Int                           dboId,
+        function Result(DBObjectImpl) test,
+        Result                        result,
         );
 
     /**
@@ -681,7 +683,7 @@ service TxManager<Schema extends RootSchema>(Catalog<Schema> catalog)
                             }
                         }
 
-                    closeLog();
+                    &result.thenDo(closeLog);
                     status = Disabled;
 
                     if (finalTermination())
@@ -808,7 +810,8 @@ service TxManager<Schema extends RootSchema>(Catalog<Schema> catalog)
      * @param writeId  the transaction id
      * @param req      the Requirement
      */
-    <Result extends immutable Const> Result registerRequirement(Int writeId, Int dboId, function Result(DBObject) test)
+    <Result extends immutable Const> Result
+            registerRequirement(Int writeId, Int dboId, function Result(DBObjectImpl) test)
         {
         checkEnabled();
 
@@ -3584,4 +3587,4 @@ service TxManager<Schema extends RootSchema>(Catalog<Schema> catalog)
         {
         return clientCache.reversed.add(client);
         }
-    }
+    }