@cubicweb/client 1.9.0 → 2.1.0

package/lib/api/Api.d.ts

@@ -1,13 +1,15 @@
 import { RawSchema } from "../schema/raw/Schema";
+import { TransactionResult, Transaction } from "./Transaction";
 /**
  * Type representing an RQL request and its associated parameters.
  */
 export type RQLQuery = [string, RQLParams];
+export type RQLParamValue = string | number | boolean | null;
 /**
  * Type representing RQL parameters to send along a request.
  */
 export interface RQLParams {
-    [key: string]: string | number;
+    [key: string]: RQLParamValue;
 }
 /**
  * Type representing a row returned in a result set.
@@ -96,33 +98,7 @@ export default class Api {
      * @returns A promise resolving to the current user
      */
     currentUser(): Promise<CurrentUser>;
-    /**
-     * Starts a new transaction.
-     *
-     * @returns A promise with the transaction uuid
-     */
-    transactionBegin(): Promise<string>;
-    /**
-     * Executes a RQL request as part of a transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     * @param query The RQL query to send
-     * @param params The additional parameters for the request
-     * @returns A promise with the request's result set
-     */
-    transactionExecute(uuid: string, query: string, params: RQLParams): Promise<ResultSet | null>;
-    /**
-     * Commits the transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     */
-    transactionCommit(uuid: string): Promise<null>;
-    /**
-     * Rollbacks the transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     */
-    transactionRollback(uuid: string): Promise<null>;
+    executeTransaction(transaction: Transaction): Promise<TransactionResult>;
     private handleUserErrors;
 }
 export {};

package/lib/api/Api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,KAAK,QAAQ,GAAG;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,QAAQ,CAAC;AAEb;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,kBAAkB,CAKxB;IAEF;;;;;;;;;OASG;gBACS,MAAM,EAAE,MAAM;IAa1B,IAAI,MAAM,WAET;IAED,OAAO,CAAC,WAAW;IAInB;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IAYnE;;;;OAIG;IACG,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAOlC;;;;;;OAMG;IACG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB9D;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAOzC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAOzC;;;;;;;OAOG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAY5B;;;;OAIG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD;;;;OAIG;IACG,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD,OAAO,CAAC,gBAAgB;CAgBzB"}
+{"version":3,"file":"Api.d.ts","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,WAAW,EAEZ,MAAM,eAAe,CAAC;AAEvB;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AAC7D;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,KAAK,QAAQ,GAAG;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,QAAQ,CAAC;AAEb;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,GAAG;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;;;;;;;;OASG;gBACS,MAAM,EAAE,MAAM;IAS1B,IAAI,MAAM,WAET;IAED,OAAO,CAAC,WAAW;IAInB;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IAYnE;;;;OAIG;IACG,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAOlC;;;;;;OAMG;IACG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB9D;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAOnC,kBAAkB,CACtB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,iBAAiB,CAAC;IA2B7B,OAAO,CAAC,gBAAgB;CAgBzB"}

package/lib/api/Api.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Errors_1 = require("../Errors");
+const Transaction_1 = require("./Transaction");
 /**
  * Class used to handle requests to the CubicWeb API.
  *
@@ -31,19 +32,12 @@ class Api {
      */
     constructor(apiUrl) {
         this._version = "v1";
-        this._transactionApiUrl = {
-            begin: "",
-            execute: "",
-            commit: "",
-            rollback: "",
-        };
         this._apiUrl = apiUrl;
         this._rqlApiUrl = this.getApiRoute("rql");
         this._schemaApiUrl = this.getApiRoute("schema");
         this._loginApiUrl = this.getApiRoute("login");
         this._currentUserApiUrl = this.getApiRoute("current-user");
-        Object.keys(this._transactionApiUrl).forEach((k) => (this._transactionApiUrl[k] =
-            this.getApiRoute(`transaction/${k}`)));
+        this._transactionApiUrl = this.getApiRoute("transaction");
     }
     get apiUrl() {
         return this._apiUrl;
@@ -123,72 +117,27 @@ class Api {
             });
         });
     }
-    /**
-     * Starts a new transaction.
-     *
-     * @returns A promise with the transaction uuid
-     */
-    transactionBegin() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return nonNullFetchApi(this._transactionApiUrl.begin, {
-                method: "POST",
-                credentials: "include",
-            });
-        });
-    }
-    /**
-     * Executes a RQL request as part of a transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     * @param query The RQL query to send
-     * @param params The additional parameters for the request
-     * @returns A promise with the request's result set
-     */
-    transactionExecute(uuid, query, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield fetchApi(this._transactionApiUrl.execute, {
-                    method: "POST",
-                    body: JSON.stringify({ uuid, query, params }),
-                    credentials: "include",
-                });
-            }
-            catch (e) {
-                this.handleUserErrors(e);
-            }
-        });
-    }
-    /**
-     * Commits the transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     */
-    transactionCommit(uuid) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield fetchApi(this._transactionApiUrl.commit, {
-                    method: "POST",
-                    body: JSON.stringify({ uuid }),
-                    credentials: "include",
-                });
-            }
-            catch (e) {
-                this.handleUserErrors(e);
-            }
-        });
-    }
-    /**
-     * Rollbacks the transaction identified by the given uuid.
-     *
-     * @param uuid The transaction's uuid
-     */
-    transactionRollback(uuid) {
+    executeTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            return fetchApi(this._transactionApiUrl.rollback, {
+            const data = transaction.queries.map((transactionQuery) => ({
+                query: transactionQuery.query,
+                params: Object.fromEntries(Object.entries(transactionQuery.params).map(([key, value]) => [
+                    key,
+                    (0, Transaction_1.isTransactionQueryRef)(value)
+                        ? {
+                            queryIndex: value.queryIndex,
+                            row: value.row,
+                            column: value.column,
+                        }
+                        : value,
+                ])),
+            }));
+            const resultSets = yield nonNullFetchApi(this._transactionApiUrl, {
                 method: "POST",
-                body: JSON.stringify({ uuid }),
                 credentials: "include",
+                body: JSON.stringify(data),
             });
+            return new Transaction_1.TransactionResult(resultSets);
         });
     }
     handleUserErrors(error) {

package/lib/api/Api.js.map

@@ -1 +1 @@
-{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/api/Api.ts"],"names":[],"mappings":"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"}

package/lib/api/Client.d.ts

@@ -1,11 +1,12 @@
 import { Schema } from "../schema/classes/Schema";
 import { RQLParams, ResultSet, CurrentUser } from "./Api";
-import Transaction from "./Transaction";
+import { Transaction, TransactionBackend, TransactionResult } from "./Transaction";
 /**
  * Class used to communicate with a CubicWeb instance's API.
  */
 export default class Client {
     private api;
+    private transactionBackend;
     /**
      * Class used to communicate with a CubicWeb instance's API.
      *
@@ -13,7 +14,9 @@ export default class Client {
      * Example: if you can retrieve the schema with https://example.com/api/v1/schema,
      * use https://example.com/api as `apiUrl`.
      */
-    constructor(apiUrl: string);
+    constructor(apiUrl: string, options?: {
+        transactionBackend?: TransactionBackend;
+    });
     get apiUrl(): string;
     /**
      * Executes the given query and waits for the response.
@@ -44,15 +47,9 @@ export default class Client {
      */
     currentUser(): Promise<CurrentUser>;
     /**
-     * Creates a new transaction and exposes the Transaction object in the given callback.
-     * Use this callback to execute RQL requests as part of the transaction.
-     * Once the callback's end is reached, the transaction is automatically committed.
-     * Note that any exception thrown by the callback will lead to the
-     * transaction being rolled back.
-     *
-     * @param callback Function to execute transaction requests in.
-     * @returns The promise returned by the callback
+     * @param transaction Transaction to execute
+     * @returns A promise fulfilled when the transaction is completed
      */
-    transaction<T>(callback: (tr: Transaction) => Promise<T>): Promise<T>;
+    executeTransaction(transaction: Transaction): Promise<TransactionResult>;
 }
 //# sourceMappingURL=Client.d.ts.map

package/lib/api/Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/api/Client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAY,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,OAAO,CAAC,GAAG,CAAM;IAEjB;;;;;;OAMG;gBACS,MAAM,EAAE,MAAM;IAI1B,IAAI,MAAM,WAET;IAED;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,SAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAIxE;;;;OAIG;IACG,MAAM;IAKZ;;;;;;OAMG;IACG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI3C;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAIzC;;;;;;;;;OASG;IACG,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAkB5E"}
+{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/api/Client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAY,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAEL,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAEvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,kBAAkB,CAAqB;IAE/C;;;;;;OAMG;gBAED,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;QAAE,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAO;IAW3D,IAAI,MAAM,WAET;IAED;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,SAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAIxE;;;;OAIG;IACG,MAAM;IAKZ;;;;;;OAMG;IACG,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI3C;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAIzC;;;OAGG;IACG,kBAAkB,CACtB,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,iBAAiB,CAAC;CAG9B"}

package/lib/api/Client.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Schema_1 = require("../schema/classes/Schema");
 const Api_1 = __importDefault(require("./Api"));
-const Transaction_1 = __importDefault(require("./Transaction"));
+const Transaction_1 = require("./Transaction");
 /**
  * Class used to communicate with a CubicWeb instance's API.
  */
@@ -26,8 +26,15 @@ class Client {
      * Example: if you can retrieve the schema with https://example.com/api/v1/schema,
      * use https://example.com/api as `apiUrl`.
      */
-    constructor(apiUrl) {
+    constructor(apiUrl, options = {}) {
         this.api = new Api_1.default(apiUrl);
+        const { transactionBackend } = options;
+        if (transactionBackend === undefined) {
+            this.transactionBackend = new Transaction_1.NativeTransactionBackend(this.api);
+        }
+        else {
+            this.transactionBackend = transactionBackend;
+        }
     }
     get apiUrl() {
         return this.api.apiUrl;
@@ -78,33 +85,12 @@ class Client {
         });
     }
     /**
-     * Creates a new transaction and exposes the Transaction object in the given callback.
-     * Use this callback to execute RQL requests as part of the transaction.
-     * Once the callback's end is reached, the transaction is automatically committed.
-     * Note that any exception thrown by the callback will lead to the
-     * transaction being rolled back.
-     *
-     * @param callback Function to execute transaction requests in.
-     * @returns The promise returned by the callback
+     * @param transaction Transaction to execute
+     * @returns A promise fulfilled when the transaction is completed
      */
-    transaction(callback) {
+    executeTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const transaction = new Transaction_1.default(this.api);
-            yield transaction.begin();
-            let result;
-            try {
-                result = yield callback(transaction);
-            }
-            catch (error) {
-                if (!transaction.isClosed()) {
-                    yield transaction.rollback();
-                }
-                throw error;
-            }
-            if (!transaction.isClosed()) {
-                yield transaction.commit();
-            }
-            return result;
+            return yield this.transactionBackend.execute(transaction);
         });
     }
 }

package/lib/api/Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/api/Client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qDAAkD;AAClD,gDAA+D;AAC/D,gEAAwC;AAExC;;GAEG;AACH,MAAqB,MAAM;IAGzB;;;;;;OAMG;IACH,YAAY,MAAc;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACG,OAAO,CAAC,KAAa,EAAE,SAAoB,EAAE;;YACjD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM;;YACV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;KAAA;IAED;;;;;;OAMG;IACG,KAAK,CAAC,KAAa,EAAE,QAAgB;;YACzC,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;KAAA;IAED;;;;OAIG;IACG,WAAW;;YACf,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACtC,CAAC;KAAA;IAED;;;;;;;;;OASG;IACG,WAAW,CAAI,QAAyC;;YAC5D,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;YAE1B,IAAI,MAAS,CAAC;YACd,IAAI;gBACF,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;aACtC;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE;oBAC3B,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;iBAC9B;gBACD,MAAM,KAAK,CAAC;aACb;YACD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE;gBAC3B,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;aAC5B;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF;AAvFD,yBAuFC"}
+{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/api/Client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qDAAkD;AAClD,gDAA+D;AAC/D,+CAKuB;AAEvB;;GAEG;AACH,MAAqB,MAAM;IAIzB;;;;;;OAMG;IACH,YACE,MAAc,EACd,UAAuD,EAAE;QAEzD,IAAI,CAAC,GAAG,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;QACvC,IAAI,kBAAkB,KAAK,SAAS,EAAE;YACpC,IAAI,CAAC,kBAAkB,GAAG,IAAI,sCAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAClE;aAAM;YACL,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;SAC9C;IACH,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACG,OAAO,CAAC,KAAa,EAAE,SAAoB,EAAE;;YACjD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;KAAA;IAED;;;;OAIG;IACG,MAAM;;YACV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;KAAA;IAED;;;;;;OAMG;IACG,KAAK,CAAC,KAAa,EAAE,QAAgB;;YACzC,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;KAAA;IAED;;;;OAIG;IACG,WAAW;;YACf,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACtC,CAAC;KAAA;IAED;;;OAGG;IACG,kBAAkB,CACtB,WAAwB;;YAExB,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5D,CAAC;KAAA;CACF;AA9ED,yBA8EC"}

package/lib/api/Transaction.d.ts

@@ -1,57 +1,33 @@
-import Api, { RQLParams } from "./Api";
-/**
- * Class used to handle CubicWeb's transactions.
- * A transaction allows to execute several RQL requests without altering the database until all
- * changes are committed.
- *
- * You should never have to create this object yourself.
- * Instead, retrieve this object from the methods in the `Client` class.
- */
-export default class Transaction {
-    private api;
-    private _uuid;
-    private _closed;
-    /**
-     * Class used to handle CubicWeb's transactions.
-     * A transaction allows to execute several RQL requests without altering the database until all
-     * changes are committed.
-     *
-     * You should never have to create this object yourself.
-     * Instead, retrieve this object from the methods in the `Client` class.
-     *
-     * @param api The API object used to communicate with the CubicWeb backend.
-     */
-    constructor(api: Api);
-    /**
-     * @returns True if the connection is closed.
-     */
-    isClosed(): boolean;
-    /**
-     * This transaction unique identifier.
-     */
-    get uuid(): string | null;
-    /**
-     * Begins a new transaction an retrieves the associated uuid.
-     */
-    begin(): Promise<void>;
-    /**
-     * Executes the given query and waits for the response.
-     * Make sure you called `begin` before using this method.
-     * As this is a transaction changes will only be applied when you call the `commit` method.
-     *
-     * @param query The RQL query to send
-     * @param params The additional parameters for the request
-     * @returns A promise with the request's result set
-     */
-    execute(query: string, params?: RQLParams): Promise<import("./Api").ResultSet | null>;
-    /**
-     * Commits the transaction to apply all the RQL queries sent with `execute`.
-     */
-    commit(): Promise<void>;
-    /**
-     * Rollbacks all the queries sent with `execute` and closes the transaction.
-     */
-    rollback(): Promise<void>;
-    private preventUsageIfClosed;
+import Api, { ResultSet, RQLParamValue } from "./Api";
+export declare class Transaction {
+    private _queries;
+    push(query: string, params: Record<string, RQLParamValue | TransactionQueryRef>): TransactionQuery;
+    get queries(): ReadonlyArray<TransactionQuery>;
+}
+export declare class TransactionResult {
+    private resultSets;
+    constructor(resultSets: ReadonlyArray<ResultSet>);
+    resolve(ref: TransactionQueryRef): string | number | boolean | null;
+}
+export interface TransactionQueryRef {
+    queryIndex: number;
+    row: number;
+    column: number;
+}
+export declare class TransactionQuery {
+    readonly query: string;
+    readonly params: Record<string, RQLParamValue | TransactionQueryRef>;
+    readonly index: number;
+    constructor(query: string, params: Record<string, RQLParamValue | TransactionQueryRef>, index: number);
+    ref(row?: number, column?: number): TransactionQueryRef;
+}
+export declare function isTransactionQueryRef(value: RQLParamValue | TransactionQueryRef): value is TransactionQueryRef;
+export interface TransactionBackend {
+    execute(transaction: Transaction): Promise<TransactionResult>;
+}
+export declare class NativeTransactionBackend implements TransactionBackend {
+    private _api;
+    constructor(_api: Api);
+    execute(transaction: Transaction): Promise<TransactionResult>;
 }
 //# sourceMappingURL=Transaction.d.ts.map

package/lib/api/Transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../src/api/Transaction.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW;IAclB,OAAO,CAAC,GAAG;IAbvB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,OAAO,CAAS;IAExB;;;;;;;;;OASG;gBACiB,GAAG,EAAE,GAAG;IAE5B;;OAEG;IACH,QAAQ;IAIR;;OAEG;IACH,IAAI,IAAI,kBAEP;IAED;;OAEG;IACG,KAAK;IAKX;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,SAAc;IAKnD;;OAEG;IACG,MAAM;IAMZ;;OAEG;IACG,QAAQ;IAMd,OAAO,CAAC,oBAAoB;CAK7B"}
+{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../src/api/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAA+B;IAE/C,IAAI,CACF,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,mBAAmB,CAAC,GAC1D,gBAAgB;IAUnB,IAAI,OAAO,IAAI,aAAa,CAAC,gBAAgB,CAAC,CAE7C;CACF;AAED,qBAAa,iBAAiB;IAChB,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC;IAExD,OAAO,CAAC,GAAG,EAAE,mBAAmB;CAGjC;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;aAET,KAAK,EAAE,MAAM;aACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,mBAAmB,CAAC;aAC3D,KAAK,EAAE,MAAM;gBAFb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,mBAAmB,CAAC,EAC3D,KAAK,EAAE,MAAM;IAG/B,GAAG,CAAC,GAAG,SAAI,EAAE,MAAM,SAAI,GAAG,mBAAmB;CAO9C;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GACzC,KAAK,IAAI,mBAAmB,CAQ9B;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC/D;AAED,qBAAa,wBAAyB,YAAW,kBAAkB;IACrD,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,GAAG;IACvB,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAGpE"}

package/lib/api/Transaction.js

@@ -9,92 +9,60 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Errors_1 = require("../Errors");
-/**
- * Class used to handle CubicWeb's transactions.
- * A transaction allows to execute several RQL requests without altering the database until all
- * changes are committed.
- *
- * You should never have to create this object yourself.
- * Instead, retrieve this object from the methods in the `Client` class.
- */
+exports.NativeTransactionBackend = exports.isTransactionQueryRef = exports.TransactionQuery = exports.TransactionResult = exports.Transaction = void 0;
 class Transaction {
-    /**
-     * Class used to handle CubicWeb's transactions.
-     * A transaction allows to execute several RQL requests without altering the database until all
-     * changes are committed.
-     *
-     * You should never have to create this object yourself.
-     * Instead, retrieve this object from the methods in the `Client` class.
-     *
-     * @param api The API object used to communicate with the CubicWeb backend.
-     */
-    constructor(api) {
-        this.api = api;
-        this._uuid = null;
-        this._closed = false;
+    constructor() {
+        this._queries = [];
     }
-    /**
-     * @returns True if the connection is closed.
-     */
-    isClosed() {
-        return this._closed;
+    push(query, params) {
+        const stackedQuery = new TransactionQuery(query, params, this._queries.length);
+        this._queries.push(stackedQuery);
+        return stackedQuery;
     }
-    /**
-     * This transaction unique identifier.
-     */
-    get uuid() {
-        return this._uuid;
+    get queries() {
+        return this._queries;
     }
-    /**
-     * Begins a new transaction an retrieves the associated uuid.
-     */
-    begin() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._closed = false;
-            this._uuid = yield this.api.transactionBegin();
-        });
+}
+exports.Transaction = Transaction;
+class TransactionResult {
+    constructor(resultSets) {
+        this.resultSets = resultSets;
     }
-    /**
-     * Executes the given query and waits for the response.
-     * Make sure you called `begin` before using this method.
-     * As this is a transaction changes will only be applied when you call the `commit` method.
-     *
-     * @param query The RQL query to send
-     * @param params The additional parameters for the request
-     * @returns A promise with the request's result set
-     */
-    execute(query, params = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.preventUsageIfClosed();
-            return yield this.api.transactionExecute(this.uuid, query, params);
-        });
+    resolve(ref) {
+        return this.resultSets[ref.queryIndex][ref.row][ref.column];
     }
-    /**
-     * Commits the transaction to apply all the RQL queries sent with `execute`.
-     */
-    commit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.preventUsageIfClosed();
-            yield this.api.transactionCommit(this.uuid);
-            this._closed = true;
-        });
+}
+exports.TransactionResult = TransactionResult;
+class TransactionQuery {
+    constructor(query, params, index) {
+        this.query = query;
+        this.params = params;
+        this.index = index;
+    }
+    ref(row = 0, column = 0) {
+        return {
+            queryIndex: this.index,
+            row,
+            column,
+        };
+    }
+}
+exports.TransactionQuery = TransactionQuery;
+function isTransactionQueryRef(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        ["queryIndex", "row", "column"].every((key) => Object.keys(value).includes(key)));
+}
+exports.isTransactionQueryRef = isTransactionQueryRef;
+class NativeTransactionBackend {
+    constructor(_api) {
+        this._api = _api;
     }
-    /**
-     * Rollbacks all the queries sent with `execute` and closes the transaction.
-     */
-    rollback() {
+    execute(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.preventUsageIfClosed();
-            yield this.api.transactionRollback(this.uuid);
-            this._closed = true;
+            return this._api.executeTransaction(transaction);
         });
     }
-    preventUsageIfClosed() {
-        if (this.isClosed()) {
-            throw new Errors_1.TransactionClosedError();
-        }
-    }
 }
-exports.default = Transaction;
+exports.NativeTransactionBackend = NativeTransactionBackend;
 //# sourceMappingURL=Transaction.js.map

package/lib/api/Transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../src/api/Transaction.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAmD;AAGnD;;;;;;;GAOG;AACH,MAAqB,WAAW;IAI9B;;;;;;;;;OASG;IACH,YAAoB,GAAQ;QAAR,QAAG,GAAH,GAAG,CAAK;QAbpB,UAAK,GAAkB,IAAI,CAAC;QAC5B,YAAO,GAAG,KAAK,CAAC;IAYO,CAAC;IAEhC;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACG,KAAK;;YACT,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACjD,CAAC;KAAA;IAED;;;;;;;;OAQG;IACG,OAAO,CAAC,KAAa,EAAE,SAAoB,EAAE;;YACjD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACrE,CAAC;KAAA;IAED;;OAEG;IACG,MAAM;;YACV,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;KAAA;IAED;;OAEG;IACG,QAAQ;;YACZ,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;KAAA;IAEO,oBAAoB;QAC1B,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,IAAI,+BAAsB,EAAE,CAAC;SACpC;IACH,CAAC;CACF;AA3ED,8BA2EC"}
+{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../src/api/Transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,WAAW;IAAxB;QACU,aAAQ,GAA4B,EAAE,CAAC;IAkBjD,CAAC;IAhBC,IAAI,CACF,KAAa,EACb,MAA2D;QAE3D,MAAM,YAAY,GAAG,IAAI,gBAAgB,CACvC,KAAK,EACL,MAAM,EACN,IAAI,CAAC,QAAQ,CAAC,MAAM,CACrB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAnBD,kCAmBC;AAED,MAAa,iBAAiB;IAC5B,YAAoB,UAAoC;QAApC,eAAU,GAAV,UAAU,CAA0B;IAAG,CAAC;IAE5D,OAAO,CAAC,GAAwB;QAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;CACF;AAND,8CAMC;AAQD,MAAa,gBAAgB;IAC3B,YACkB,KAAa,EACb,MAA2D,EAC3D,KAAa;QAFb,UAAK,GAAL,KAAK,CAAQ;QACb,WAAM,GAAN,MAAM,CAAqD;QAC3D,UAAK,GAAL,KAAK,CAAQ;IAC5B,CAAC;IAEJ,GAAG,CAAC,GAAG,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC;QACrB,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,KAAK;YACtB,GAAG;YACH,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AAdD,4CAcC;AAED,SAAgB,qBAAqB,CACnC,KAA0C;IAE1C,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CACjC,CACF,CAAC;AACJ,CAAC;AAVD,sDAUC;AAMD,MAAa,wBAAwB;IACnC,YAAoB,IAAS;QAAT,SAAI,GAAJ,IAAI,CAAK;IAAG,CAAC;IAC3B,OAAO,CAAC,WAAwB;;YACpC,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AALD,4DAKC"}

package/lib/index.d.ts

@@ -9,6 +9,6 @@ export * from "./schema/classes/Schema";
 export * from "./schema/classes/Utils";
 export * from "./Errors";
 export { default as Client } from "./api/Client";
-export { default as Transaction } from "./api/Transaction";
+export * from "./api/Transaction";
 export { RQLQuery, RQLParams, RqlRow, ResultSet, ApiErrorResponse, } from "./api/Api";
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AAEvC,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACL,QAAQ,EACR,SAAS,EACT,MAAM,EACN,SAAS,EACT,gBAAgB,GACjB,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AAEvC,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,QAAQ,EACR,SAAS,EACT,MAAM,EACN,SAAS,EACT,gBAAgB,GACjB,MAAM,WAAW,CAAC"}

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = exports.Client = void 0;
+exports.Client = void 0;
 // Raw Schema
 __exportStar(require("./schema/raw/Constraints"), exports);
 __exportStar(require("./schema/raw/Entities"), exports);
@@ -33,6 +33,5 @@ __exportStar(require("./Errors"), exports);
 // API
 var Client_1 = require("./api/Client");
 Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return __importDefault(Client_1).default; } });
-var Transaction_1 = require("./api/Transaction");
-Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return __importDefault(Transaction_1).default; } });
+__exportStar(require("./api/Transaction"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,aAAa;AACb,2DAAyC;AACzC,wDAAsC;AACtC,mEAAiD;AACjD,sDAAoC;AACpC,qDAAmC;AAEnC,2BAA2B;AAC3B,gEAA8C;AAC9C,4EAA0D;AAC1D,0DAAwC;AACxC,yDAAuC;AAEvC,2CAAyB;AAEzB,MAAM;AACN,uCAAiD;AAAxC,iHAAA,OAAO,OAAU;AAC1B,iDAA2D;AAAlD,2HAAA,OAAO,OAAe"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,aAAa;AACb,2DAAyC;AACzC,wDAAsC;AACtC,mEAAiD;AACjD,sDAAoC;AACpC,qDAAmC;AAEnC,2BAA2B;AAC3B,gEAA8C;AAC9C,4EAA0D;AAC1D,0DAAwC;AACxC,yDAAuC;AAEvC,2CAAyB;AAEzB,MAAM;AACN,uCAAiD;AAAxC,iHAAA,OAAO,OAAU;AAC1B,oDAAkC"}

package/lib/schema/raw/Constraints.d.ts

@@ -5,10 +5,6 @@ type ConstraintBase<T extends string, V extends Record<string, unknown> | null>
     type: T;
     value: V;
 };
-/**
- * All the possible operators inside a constraint.
- */
-export type ConstraintOperator = ">" | ">=" | "<" | "<=";
 /**
  * THe type of a constraint message when one is present.
  */
@@ -26,8 +22,51 @@ export type RegexpConstraint = ConstraintBase<"RegexpConstraint", {
     flags: number;
     msg: ConstraintMessage;
 }>;
+/**
+ * Reference to an attribute used in constraints.
+ *
+ * @property \_\_attribute\_\_ name of the attribute in the same entity
+ */
+export interface Attribute {
+    __attribute__: string;
+}
+export interface TimeDelta {
+    days: number;
+    seconds: number;
+    microseconds: number;
+}
+/**
+ * Represents a date relative to the current date at the time of the check.
+ *
+ * @property \_\_today\_\_ always true
+ * @property offset delta to current date at the time of the check
+ * @property type name of the Python class used to do the comparison
+ */
+export interface Today {
+    __today__: true;
+    offset: TimeDelta | null;
+    type: "Datetime" | "TZDatetime" | "Date";
+}
+/**
+ * Represents a datetime relative to the current datetime at the time of the check.
+ *
+ * @property \_\_now\_\_ always true
+ * @property offset delta to current date at the time of the check
+ */
+export interface Now {
+    __now__: true;
+    offset: TimeDelta;
+}
+/**
+ * All the possible operators inside a constraint.
+ */
+export type ConstraintOperator = ">" | ">=" | "<" | "<=";
+/**
+ * @property value.boundary boudary value to compare the attribut
+ *
+ */
 export type BoundaryConstraint = ConstraintBase<"BoundaryConstraint", {
-    boundary: number | null;
+    boundary: Attribute | Today | Now | number | null;
     op: ConstraintOperator;
     msg: ConstraintMessage;
 }>;

package/lib/schema/raw/Constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Constraints.d.ts","sourceRoot":"","sources":["../../../src/schema/raw/Constraints.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,KAAK,cAAc,CACjB,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,IACtC;IACF,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;AAEzD;;GAEG;AACH,KAAK,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAAC;AAEvC,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAC3C,kBAAkB,EAClB;IAAE,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,cAAc,CACzC,gBAAgB,EAChB;IAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CACnE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAC3C,kBAAkB,EAClB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAC1D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAC7C,oBAAoB,EACpB;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,EAAE,EAAE,kBAAkB,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAC5E,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,cAAc,CAClD,yBAAyB,EACzB;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAC7E,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,cAAc,CACrD,4BAA4B,EAC5B;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CAC7C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAC3C,kBAAkB,EAClB;IACE,MAAM,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAClE,GAAG,EAAE,iBAAiB,CAAC;CACxB,CACF,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,cAAc,CAClD,yBAAyB,EACzB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAC3C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,cAAc,CACxC,eAAe,EACf;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,iBAAiB,CAAA;CAAE,CACnE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CACtC,gBAAgB,GAChB,cAAc,GACd,gBAAgB,GAChB,kBAAkB,GAClB,uBAAuB,GACvB,0BAA0B,GAC1B,gBAAgB,GAChB,aAAa,CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACvC,uBAAuB,GAAG,aAAa,CACxC,CAAC"}
+{"version":3,"file":"Constraints.d.ts","sourceRoot":"","sources":["../../../src/schema/raw/Constraints.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubicweb/client",
   "description": "Official JS client for CubicWeb API",
   "author": "Logilab",
-  "version": "1.9.0",
+  "version": "2.1.0",
   "license": "LGPL-3.0-or-later",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/Api.ts

@@ -1,16 +1,22 @@
 import { ValidationError } from "../Errors";
 import { RawSchema } from "../schema/raw/Schema";
+import {
+  TransactionResult,
+  Transaction,
+  isTransactionQueryRef,
+} from "./Transaction";
 
 /**
  * Type representing an RQL request and its associated parameters.
  */
 export type RQLQuery = [string, RQLParams];
 
+export type RQLParamValue = string | number | boolean | null;
 /**
  * Type representing RQL parameters to send along a request.
  */
 export interface RQLParams {
-  [key: string]: string | number;
+  [key: string]: RQLParamValue;
 }
 
 /**
@@ -63,12 +69,7 @@ export default class Api {
   private _schemaApiUrl: string;
   private _loginApiUrl: string;
   private _currentUserApiUrl: string;
-  private _transactionApiUrl = {
-    begin: "",
-    execute: "",
-    commit: "",
-    rollback: "",
-  };
+  private _transactionApiUrl: string;
 
   /**
    * Class used to handle requests to the CubicWeb API.
@@ -86,11 +87,7 @@ export default class Api {
     this._schemaApiUrl = this.getApiRoute("schema");
     this._loginApiUrl = this.getApiRoute("login");
     this._currentUserApiUrl = this.getApiRoute("current-user");
-    Object.keys(this._transactionApiUrl).forEach(
-      (k) =>
-        (this._transactionApiUrl[k as keyof typeof this._transactionApiUrl] =
-          this.getApiRoute(`transaction/${k}`))
-    );
+    this._transactionApiUrl = this.getApiRoute("transaction");
   }
 
   get apiUrl() {
@@ -167,70 +164,33 @@ export default class Api {
     });
   }
 
-  /**
-   * Starts a new transaction.
-   *
-   * @returns A promise with the transaction uuid
-   */
-  async transactionBegin(): Promise<string> {
-    return nonNullFetchApi<string>(this._transactionApiUrl.begin, {
-      method: "POST",
-      credentials: "include",
-    });
-  }
-
-  /**
-   * Executes a RQL request as part of a transaction identified by the given uuid.
-   *
-   * @param uuid The transaction's uuid
-   * @param query The RQL query to send
-   * @param params The additional parameters for the request
-   * @returns A promise with the request's result set
-   */
-  async transactionExecute(
-    uuid: string,
-    query: string,
-    params: RQLParams
-  ): Promise<ResultSet | null> {
-    try {
-      return await fetchApi<ResultSet>(this._transactionApiUrl.execute, {
-        method: "POST",
-        body: JSON.stringify({ uuid, query, params }),
-        credentials: "include",
-      });
-    } catch (e) {
-      this.handleUserErrors(e);
-    }
-  }
-
-  /**
-   * Commits the transaction identified by the given uuid.
-   *
-   * @param uuid The transaction's uuid
-   */
-  async transactionCommit(uuid: string): Promise<null> {
-    try {
-      return await fetchApi<null>(this._transactionApiUrl.commit, {
+  async executeTransaction(
+    transaction: Transaction
+  ): Promise<TransactionResult> {
+    const data = transaction.queries.map((transactionQuery) => ({
+      query: transactionQuery.query,
+      params: Object.fromEntries(
+        Object.entries(transactionQuery.params).map(([key, value]) => [
+          key,
+          isTransactionQueryRef(value)
+            ? {
+                queryIndex: value.queryIndex,
+                row: value.row,
+                column: value.column,
+              }
+            : value,
+        ])
+      ),
+    }));
+    const resultSets = await nonNullFetchApi<ReadonlyArray<ResultSet>>(
+      this._transactionApiUrl,
+      {
         method: "POST",
-        body: JSON.stringify({ uuid }),
         credentials: "include",
-      });
-    } catch (e) {
-      this.handleUserErrors(e);
-    }
-  }
-
-  /**
-   * Rollbacks the transaction identified by the given uuid.
-   *
-   * @param uuid The transaction's uuid
-   */
-  async transactionRollback(uuid: string): Promise<null> {
-    return fetchApi<null>(this._transactionApiUrl.rollback, {
-      method: "POST",
-      body: JSON.stringify({ uuid }),
-      credentials: "include",
-    });
+        body: JSON.stringify(data),
+      }
+    );
+    return new TransactionResult(resultSets);
   }
 
   private handleUserErrors(error: unknown): never {

package/src/api/Client.ts

@@ -1,12 +1,18 @@
 import { Schema } from "../schema/classes/Schema";
 import Api, { RQLParams, ResultSet, CurrentUser } from "./Api";
-import Transaction from "./Transaction";
+import {
+  NativeTransactionBackend,
+  Transaction,
+  TransactionBackend,
+  TransactionResult,
+} from "./Transaction";
 
 /**
  * Class used to communicate with a CubicWeb instance's API.
  */
 export default class Client {
   private api: Api;
+  private transactionBackend: TransactionBackend;
 
   /**
    * Class used to communicate with a CubicWeb instance's API.
@@ -15,8 +21,17 @@ export default class Client {
    * Example: if you can retrieve the schema with https://example.com/api/v1/schema,
    * use https://example.com/api as `apiUrl`.
    */
-  constructor(apiUrl: string) {
+  constructor(
+    apiUrl: string,
+    options: { transactionBackend?: TransactionBackend } = {}
+  ) {
     this.api = new Api(apiUrl);
+    const { transactionBackend } = options;
+    if (transactionBackend === undefined) {
+      this.transactionBackend = new NativeTransactionBackend(this.api);
+    } else {
+      this.transactionBackend = transactionBackend;
+    }
   }
 
   get apiUrl() {
@@ -65,31 +80,12 @@ export default class Client {
   }
 
   /**
-   * Creates a new transaction and exposes the Transaction object in the given callback.
-   * Use this callback to execute RQL requests as part of the transaction.
-   * Once the callback's end is reached, the transaction is automatically committed.
-   * Note that any exception thrown by the callback will lead to the
-   * transaction being rolled back.
-   *
-   * @param callback Function to execute transaction requests in.
-   * @returns The promise returned by the callback
+   * @param transaction Transaction to execute
+   * @returns A promise fulfilled when the transaction is completed
    */
-  async transaction<T>(callback: (tr: Transaction) => Promise<T>): Promise<T> {
-    const transaction = new Transaction(this.api);
-    await transaction.begin();
-
-    let result: T;
-    try {
-      result = await callback(transaction);
-    } catch (error) {
-      if (!transaction.isClosed()) {
-        await transaction.rollback();
-      }
-      throw error;
-    }
-    if (!transaction.isClosed()) {
-      await transaction.commit();
-    }
-    return result;
+  async executeTransaction(
+    transaction: Transaction
+  ): Promise<TransactionResult> {
+    return await this.transactionBackend.execute(transaction);
   }
 }

package/src/api/Transaction.ts

@@ -1,87 +1,75 @@
-import { TransactionClosedError } from "../Errors";
-import Api, { RQLParams } from "./Api";
+import Api, { ResultSet, RQLParamValue } from "./Api";
 
-/**
- * Class used to handle CubicWeb's transactions.
- * A transaction allows to execute several RQL requests without altering the database until all
- * changes are committed.
- *
- * You should never have to create this object yourself.
- * Instead, retrieve this object from the methods in the `Client` class.
- */
-export default class Transaction {
-  private _uuid: string | null = null;
-  private _closed = false;
+export class Transaction {
+  private _queries: Array<TransactionQuery> = [];
 
-  /**
-   * Class used to handle CubicWeb's transactions.
-   * A transaction allows to execute several RQL requests without altering the database until all
-   * changes are committed.
-   *
-   * You should never have to create this object yourself.
-   * Instead, retrieve this object from the methods in the `Client` class.
-   *
-   * @param api The API object used to communicate with the CubicWeb backend.
-   */
-  constructor(private api: Api) {}
-
-  /**
-   * @returns True if the connection is closed.
-   */
-  isClosed() {
-    return this._closed;
+  push(
+    query: string,
+    params: Record<string, RQLParamValue | TransactionQueryRef>
+  ): TransactionQuery {
+    const stackedQuery = new TransactionQuery(
+      query,
+      params,
+      this._queries.length
+    );
+    this._queries.push(stackedQuery);
+    return stackedQuery;
   }
 
-  /**
-   * This transaction unique identifier.
-   */
-  get uuid() {
-    return this._uuid;
+  get queries(): ReadonlyArray<TransactionQuery> {
+    return this._queries;
   }
+}
 
-  /**
-   * Begins a new transaction an retrieves the associated uuid.
-   */
-  async begin() {
-    this._closed = false;
-    this._uuid = await this.api.transactionBegin();
-  }
+export class TransactionResult {
+  constructor(private resultSets: ReadonlyArray<ResultSet>) {}
 
-  /**
-   * Executes the given query and waits for the response.
-   * Make sure you called `begin` before using this method.
-   * As this is a transaction changes will only be applied when you call the `commit` method.
-   *
-   * @param query The RQL query to send
-   * @param params The additional parameters for the request
-   * @returns A promise with the request's result set
-   */
-  async execute(query: string, params: RQLParams = {}) {
-    this.preventUsageIfClosed();
-    return await this.api.transactionExecute(this.uuid, query, params);
+  resolve(ref: TransactionQueryRef) {
+    return this.resultSets[ref.queryIndex][ref.row][ref.column];
   }
+}
 
-  /**
-   * Commits the transaction to apply all the RQL queries sent with `execute`.
-   */
-  async commit() {
-    this.preventUsageIfClosed();
-    await this.api.transactionCommit(this.uuid);
-    this._closed = true;
-  }
+export interface TransactionQueryRef {
+  queryIndex: number;
+  row: number;
+  column: number;
+}
 
-  /**
-   * Rollbacks all the queries sent with `execute` and closes the transaction.
-   */
-  async rollback() {
-    this.preventUsageIfClosed();
-    await this.api.transactionRollback(this.uuid);
-    this._closed = true;
+export class TransactionQuery {
+  constructor(
+    public readonly query: string,
+    public readonly params: Record<string, RQLParamValue | TransactionQueryRef>,
+    public readonly index: number
+  ) {}
+
+  ref(row = 0, column = 0): TransactionQueryRef {
+    return {
+      queryIndex: this.index,
+      row,
+      column,
+    };
   }
+}
+
+export function isTransactionQueryRef(
+  value: RQLParamValue | TransactionQueryRef
+): value is TransactionQueryRef {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    ["queryIndex", "row", "column"].every((key) =>
+      Object.keys(value).includes(key)
+    )
+  );
+}
+
+export interface TransactionBackend {
+  execute(transaction: Transaction): Promise<TransactionResult>;
+}
 
-  private preventUsageIfClosed(): asserts this is { uuid: string } {
-    if (this.isClosed()) {
-      throw new TransactionClosedError();
-    }
+export class NativeTransactionBackend implements TransactionBackend {
+  constructor(private _api: Api) {}
+  async execute(transaction: Transaction): Promise<TransactionResult> {
+    return this._api.executeTransaction(transaction);
   }
 }

package/src/index.ts

@@ -15,7 +15,7 @@ export * from "./Errors";
 
 // API
 export { default as Client } from "./api/Client";
-export { default as Transaction } from "./api/Transaction";
+export * from "./api/Transaction";
 export {
   RQLQuery,
   RQLParams,

package/src/schema/raw/Constraints.ts

@@ -9,11 +9,6 @@ type ConstraintBase<
   value: V;
 };
 
-/**
- * All the possible operators inside a constraint.
- */
-export type ConstraintOperator = ">" | ">=" | "<" | "<=";
-
 /**
  * THe type of a constraint message when one is present.
  */
@@ -34,9 +29,61 @@ export type RegexpConstraint = ConstraintBase<
   { regexp: string; flags: number; msg: ConstraintMessage }
 >;
 
+/**
+ * Reference to an attribute used in constraints.
+ *
+ * @property \_\_attribute\_\_ name of the attribute in the same entity
+ */
+export interface Attribute {
+  __attribute__: string;
+}
+
+export interface TimeDelta {
+  days: number;
+  seconds: number;
+  microseconds: number;
+}
+
+/**
+ * Represents a date relative to the current date at the time of the check.
+ *
+ * @property \_\_today\_\_ always true
+ * @property offset delta to current date at the time of the check
+ * @property type name of the Python class used to do the comparison
+ */
+export interface Today {
+  __today__: true;
+  offset: TimeDelta | null;
+  type: "Datetime" | "TZDatetime" | "Date";
+}
+
+/**
+ * Represents a datetime relative to the current datetime at the time of the check.
+ *
+ * @property \_\_now\_\_ always true
+ * @property offset delta to current date at the time of the check
+ */
+export interface Now {
+  __now__: true;
+  offset: TimeDelta;
+}
+
+/**
+ * All the possible operators inside a constraint.
+ */
+export type ConstraintOperator = ">" | ">=" | "<" | "<=";
+
+/**
+ * @property value.boundary boudary value to compare the attribut
+ *
+ */
 export type BoundaryConstraint = ConstraintBase<
   "BoundaryConstraint",
-  { boundary: number | null; op: ConstraintOperator; msg: ConstraintMessage }
+  {
+    boundary: Attribute | Today | Now | number | null;
+    op: ConstraintOperator;
+    msg: ConstraintMessage;
+  }
 >;
 export type IntervalBoundConstraint = ConstraintBase<
   "IntervalBoundConstraint",