@cloudbase/database 1.4.3-alpha.0 → 1.5.0

package/dist/commonjs/serverDate/index.js

@@ -1,21 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const symbol_1 = require("../helper/symbol");
-class ServerDate {
-    constructor({ offset = 0 } = {}) {
+exports.ServerDateConstructor = exports.ServerDate = void 0;
+var symbol_1 = require("../helper/symbol");
+var ServerDate = (function () {
+    function ServerDate(_a) {
+        var _b = _a === void 0 ? {} : _a, _c = _b.offset, offset = _c === void 0 ? 0 : _c;
         this.offset = offset;
     }
-    get _internalType() {
-        return symbol_1.SYMBOL_SERVER_DATE;
-    }
-    parse() {
+    Object.defineProperty(ServerDate.prototype, "_internalType", {
+        get: function () {
+            return symbol_1.SYMBOL_SERVER_DATE;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ServerDate.prototype.parse = function () {
         return {
             $tcb_server_date: {
                 offset: this.offset
             }
         };
-    }
-}
+    };
+    return ServerDate;
+}());
 exports.ServerDate = ServerDate;
 function ServerDateConstructor(opt) {
     return new ServerDate(opt);

package/dist/commonjs/transaction/collection.d.ts

@@ -1,7 +1,7 @@
 import { DocumentReference } from './document';
 import { Query } from './query';
 export declare class CollectionReference extends Query {
-    readonly name: string;
+    get name(): string;
     doc(docID?: string | number): DocumentReference;
     add(data: any): Promise<any>;
 }

package/dist/commonjs/transaction/collection.js

@@ -3,16 +3,19 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionReference = void 0;
 var document_1 = require("./document");
 var query_1 = require("./query");
 var CollectionReference = (function (_super) {
@@ -24,7 +27,7 @@ var CollectionReference = (function (_super) {
         get: function () {
             return this._coll;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     CollectionReference.prototype.doc = function (docID) {

package/dist/commonjs/transaction/document.d.ts

@@ -6,7 +6,7 @@ interface UpdateResult {
     requestId: string;
     updated: number;
 }
-declare type JsonString = string;
+type JsonString = string;
 interface SetResult extends UpdateResult {
     upserted: JsonString;
 }

package/dist/commonjs/transaction/document.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -47,6 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentReference = void 0;
 var bson_1 = require("bson");
 var code_1 = require("../const/code");
 var update_1 = require("../serializer/update");
@@ -73,7 +74,7 @@ var DocumentReference = (function () {
                         params = {
                             collectionName: this._coll,
                             transactionId: this._transactionId,
-                            data: bson_1.EJSON.stringify(datatype_1.serialize(data), { relaxed: false })
+                            data: bson_1.EJSON.stringify((0, datatype_1.serialize)(data), { relaxed: false })
                         };
                         if (this.id) {
                             params['_id'] = this.id;
@@ -87,8 +88,7 @@ var DocumentReference = (function () {
                         inserted = bson_1.EJSON.parse(res.inserted);
                         ok = bson_1.EJSON.parse(res.ok);
                         if (ok == 1 && inserted == 1) {
-                            return [2, __assign(__assign({}, res), { ok: ok,
-                                    inserted: inserted })];
+                            return [2, __assign(__assign({}, res), { ok: ok, inserted: inserted })];
                         }
                         else {
                             throw new Error(code_1.ERRORS.INSERT_DOC_FAIL.message);
@@ -136,7 +136,7 @@ var DocumentReference = (function () {
                             query: {
                                 _id: { $eq: this.id }
                             },
-                            data: bson_1.EJSON.stringify(datatype_1.serialize(data), { relaxed: false }),
+                            data: bson_1.EJSON.stringify((0, datatype_1.serialize)(data), { relaxed: false }),
                             upsert: true
                         };
                         return [4, this._request.send(UPDATE_DOC, param)];

package/dist/commonjs/transaction/index.js

@@ -1,105 +1,215 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const collection_1 = require("../collection");
-const code_1 = require("../const/code");
-const START = 'database.startTransaction';
-const COMMIT = 'database.commitTransaction';
-const ABORT = 'database.abortTransaction';
-class Transaction {
-    constructor(db) {
+exports.runTransaction = exports.startTransaction = exports.Transaction = void 0;
+var index_1 = require("../index");
+var collection_1 = require("../collection");
+var code_1 = require("../const/code");
+var START = 'database.startTransaction';
+var COMMIT = 'database.commitTransaction';
+var ABORT = 'database.abortTransaction';
+var Transaction = (function () {
+    function Transaction(db) {
         this._db = db;
-        this._request = new index_1.Db.reqClass(this._db.config);
+        this._request = index_1.Db.createRequest(this._db.config);
         this.aborted = false;
         this.commited = false;
         this.inited = false;
     }
-    async init() {
-        const res = await this._request.send(START);
-        if (res.code) {
-            throw res;
-        }
-        this.inited = true;
-        this._id = res.transactionId;
-    }
-    collection(collName) {
+    Transaction.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this._request.send(START)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            throw res;
+                        }
+                        this.inited = true;
+                        this._id = res.transactionId;
+                        return [2];
+                }
+            });
+        });
+    };
+    Transaction.prototype.collection = function (collName) {
         if (!collName) {
             throw new Error('Collection name is required');
         }
         return new collection_1.CollectionReference(this._db, collName, {}, this._id);
-    }
-    getTransactionId() {
+    };
+    Transaction.prototype.getTransactionId = function () {
         return this._id;
-    }
-    getRequestMethod() {
+    };
+    Transaction.prototype.getRequestMethod = function () {
         return this._request;
-    }
-    async commit() {
-        const param = {
-            transactionId: this._id
-        };
-        const res = await this._request.send(COMMIT, param);
-        if (res.code)
-            throw res;
-        this.commited = true;
-        return res;
-    }
-    async rollback(customRollbackRes) {
-        const param = {
-            transactionId: this._id
-        };
-        const res = await this._request.send(ABORT, param);
-        if (res.code)
-            throw res;
-        this.aborted = true;
-        this.abortReason = customRollbackRes;
-        return res;
-    }
-}
-exports.Transaction = Transaction;
-async function startTransaction() {
-    const transaction = new Transaction(this);
-    await transaction.init();
-    return transaction;
-}
-exports.startTransaction = startTransaction;
-async function runTransaction(callback, times = 3) {
-    let transaction;
-    try {
-        transaction = new Transaction(this);
-        await transaction.init();
-        const callbackRes = await callback(transaction);
-        if (transaction.aborted === true) {
-            throw transaction.abortReason;
-        }
-        await transaction.commit();
-        return callbackRes;
-    }
-    catch (error) {
-        if (transaction.inited === false) {
-            throw error;
-        }
-        const throwWithRollback = async (error) => {
-            if (!transaction.aborted && !transaction.commited) {
-                try {
-                    await transaction.rollback();
+    };
+    Transaction.prototype.commit = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        param = {
+                            transactionId: this._id
+                        };
+                        return [4, this._request.send(COMMIT, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        this.commited = true;
+                        return [2, res];
                 }
-                catch (err) {
+            });
+        });
+    };
+    Transaction.prototype.rollback = function (customRollbackRes) {
+        return __awaiter(this, void 0, void 0, function () {
+            var param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        param = {
+                            transactionId: this._id
+                        };
+                        return [4, this._request.send(ABORT, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        this.aborted = true;
+                        this.abortReason = customRollbackRes;
+                        return [2, res];
                 }
-                throw error;
+            });
+        });
+    };
+    return Transaction;
+}());
+exports.Transaction = Transaction;
+function startTransaction() {
+    return __awaiter(this, void 0, void 0, function () {
+        var transaction;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    transaction = new Transaction(this);
+                    return [4, transaction.init()];
+                case 1:
+                    _a.sent();
+                    return [2, transaction];
             }
-            if (transaction.aborted === true) {
-                throw transaction.abortReason;
+        });
+    });
+}
+exports.startTransaction = startTransaction;
+function runTransaction(callback, times) {
+    if (times === void 0) { times = 3; }
+    return __awaiter(this, void 0, void 0, function () {
+        var transaction, callbackRes, error_1, throwWithRollback;
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 4, , 10]);
+                    transaction = new Transaction(this);
+                    return [4, transaction.init()];
+                case 1:
+                    _a.sent();
+                    return [4, callback(transaction)];
+                case 2:
+                    callbackRes = _a.sent();
+                    if (transaction.aborted === true) {
+                        throw transaction.abortReason;
+                    }
+                    return [4, transaction.commit()];
+                case 3:
+                    _a.sent();
+                    return [2, callbackRes];
+                case 4:
+                    error_1 = _a.sent();
+                    if (transaction.inited === false) {
+                        throw error_1;
+                    }
+                    throwWithRollback = function (error) { return __awaiter(_this, void 0, void 0, function () {
+                        var err_1;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if (!(!transaction.aborted && !transaction.commited)) return [3, 5];
+                                    _a.label = 1;
+                                case 1:
+                                    _a.trys.push([1, 3, , 4]);
+                                    return [4, transaction.rollback()];
+                                case 2:
+                                    _a.sent();
+                                    return [3, 4];
+                                case 3:
+                                    err_1 = _a.sent();
+                                    return [3, 4];
+                                case 4: throw error;
+                                case 5:
+                                    if (transaction.aborted === true) {
+                                        throw transaction.abortReason;
+                                    }
+                                    throw error;
+                            }
+                        });
+                    }); };
+                    if (!(times <= 0)) return [3, 6];
+                    return [4, throwWithRollback(error_1)];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    if (!(error_1 && error_1.code === code_1.ERRORS.DATABASE_TRANSACTION_CONFLICT.code)) return [3, 8];
+                    return [4, runTransaction.bind(this)(callback, --times)];
+                case 7: return [2, _a.sent()];
+                case 8: return [4, throwWithRollback(error_1)];
+                case 9:
+                    _a.sent();
+                    return [3, 10];
+                case 10: return [2];
             }
-            throw error;
-        };
-        if (times <= 0) {
-            await throwWithRollback(error);
-        }
-        if (error && error.code === code_1.ERRORS.DATABASE_TRANSACTION_CONFLICT.code) {
-            return await runTransaction.bind(this)(callback, --times);
-        }
-        await throwWithRollback(error);
-    }
+        });
+    });
 }
 exports.runTransaction = runTransaction;

package/dist/commonjs/transaction/query.d.ts

@@ -1,5 +1,43 @@
 import { Transaction } from './index';
+import { OrderByDirection } from '../constant';
+interface QueryOrder {
+    field?: string;
+    direction?: 'asc' | 'desc';
+}
+interface QueryOption {
+    limit?: number;
+    offset?: number;
+    projection?: Object;
+}
+interface GetResult {
+    data: any[];
+    requestId: string;
+    total?: number;
+    limit?: number;
+    offset?: number;
+}
+interface UpdateResult {
+    requestId: string;
+    updated: number;
+}
+interface DeleteResult {
+    requestId: string;
+    deleted: number | string;
+}
 export declare class Query {
     protected _transaction: Transaction;
-    constructor(transaction: Transaction, coll: string);
+    constructor(transaction: Transaction, coll: string, fieldFilters?: Object, fieldOrders?: QueryOrder[], queryOptions?: QueryOption);
+    where(query: object): Query;
+    orderBy(fieldPath: string, directionStr: OrderByDirection): Query;
+    limit(limit: number): Query;
+    skip(offset: number): Query;
+    field(projection: any): Query;
+    get(): Promise<GetResult>;
+    count(): Promise<{
+        requestId: string;
+        total: number;
+    }>;
+    update(data: Object): Promise<UpdateResult>;
+    remove(): Promise<DeleteResult>;
 }
+export {};