@cloudbase/database 1.4.3 → 1.5.0

package/dist/commonjs/document.js

@@ -1,204 +1,315 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
-const util_1 = require("./util");
-const update_1 = require("./serializer/update");
-const datatype_1 = require("./serializer/datatype");
-const update_2 = require("./commands/update");
-const websocket_client_1 = require("./realtime/websocket-client");
-const constant_1 = require("./constant");
-const utils_1 = require("./utils/utils");
-const code_1 = require("./const/code");
-const bson_1 = require("bson");
-class DocumentReference {
-    constructor(db, coll, apiOptions, docID, transactionId) {
-        this.watch = (options) => {
-            if (!index_1.Db.ws) {
-                index_1.Db.ws = new websocket_client_1.RealtimeWebSocketClient({
-                    context: {
-                        appConfig: {
-                            docSizeLimit: 1000,
-                            realtimePingInterval: 10000,
-                            realtimePongWaitTimeout: 5000,
-                            request: this.request
-                        }
-                    }
-                });
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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;
             }
-            return index_1.Db.ws.watch(Object.assign(Object.assign({}, options), { envId: this._db.config.env, collectionName: this._coll, query: JSON.stringify({
-                    _id: this.id
+            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 });
+exports.DocumentReference = void 0;
+var index_1 = require("./index");
+var util_1 = require("./util");
+var update_1 = require("./serializer/update");
+var datatype_1 = require("./serializer/datatype");
+var update_2 = require("./commands/update");
+var constant_1 = require("./constant");
+var utils_1 = require("./utils/utils");
+var code_1 = require("./const/code");
+var bson_1 = require("bson");
+var DocumentReference = (function () {
+    function DocumentReference(db, coll, apiOptions, docID, transactionId) {
+        var _this = this;
+        this.watch = function (options) {
+            var ws = (0, utils_1.getWsInstance)(_this._db);
+            return ws.watch(__assign(__assign({}, options), { envId: _this._db.config.env, collectionName: _this._coll, query: JSON.stringify({
+                    _id: _this.id
                 }) }));
         };
         this._db = db;
         this._coll = coll;
         this.id = docID;
         this._transactionId = transactionId;
-        this.request = new index_1.Db.reqClass(this._db.config);
+        this.request = index_1.Db.createRequest(this._db.config);
         this._apiOptions = apiOptions;
     }
-    async create(data) {
-        if (this.id) {
-            data['_id'] = this.id;
-        }
-        let params = {
-            collectionName: this._coll,
-            data: [utils_1.stringifyByEJSON(datatype_1.serialize(data))],
-            transactionId: this._transactionId
-        };
-        const res = await this.request.send('database.insertDocument', params, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        if (this._transactionId) {
-            return {
-                inserted: 1,
-                ok: 1,
-                id: res.data.insertedIds[0],
-                requestId: res.requestId
-            };
-        }
-        return {
-            id: res.data.insertedIds[0],
-            requestId: res.requestId
-        };
-    }
-    async set(data) {
-        if (!this.id) {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: 'docId不能为空' }));
-        }
-        if (!data || typeof data !== 'object') {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }));
-        }
-        if (data.hasOwnProperty('_id')) {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }));
-        }
-        let hasOperator = false;
-        const checkMixed = objs => {
-            if (typeof objs === 'object') {
-                for (let key in objs) {
-                    if (objs[key] instanceof update_2.UpdateCommand) {
-                        hasOperator = true;
-                    }
-                    else if (typeof objs[key] === 'object') {
-                        checkMixed(objs[key]);
-                    }
+    DocumentReference.prototype.create = function (data, callback) {
+        return (0, utils_1.withCallback)(this._create(data), callback);
+    };
+    DocumentReference.prototype._create = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var isBatch, params, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        isBatch = Array.isArray(data);
+                        if (!isBatch && this.id) {
+                            data['_id'] = this.id;
+                        }
+                        params = {
+                            collectionName: this._coll,
+                            data: isBatch
+                                ? data.map(function (item) { return (0, utils_1.stringifyByEJSON)((0, datatype_1.serialize)(item)); })
+                                : [(0, utils_1.stringifyByEJSON)((0, datatype_1.serialize)(data))],
+                            transactionId: this._transactionId
+                        };
+                        return [4, this.request.send('database.insertDocument', params, (0, utils_1.getReqOpts)(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        if (this._transactionId) {
+                            return [2, {
+                                    inserted: 1,
+                                    ok: 1,
+                                    id: res.data.insertedIds[0],
+                                    requestId: res.requestId
+                                }];
+                        }
+                        if (isBatch) {
+                            return [2, {
+                                    ids: (res.data && res.data.insertedIds) || [],
+                                    requestId: res.requestId
+                                }];
+                        }
+                        return [2, {
+                                id: res.data.insertedIds[0],
+                                requestId: res.requestId
+                            }];
                 }
-            }
-        };
-        checkMixed(data);
-        if (hasOperator) {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.DATABASE_REQUEST_FAILED), { message: 'update operator complicit' }));
-        }
-        let param = {
-            collectionName: this._coll,
-            queryType: constant_1.QueryType.DOC,
-            data: utils_1.stringifyByEJSON(datatype_1.serialize(data)),
-            transactionId: this._transactionId,
-            multi: false,
-            merge: false,
-            upsert: true
-        };
-        if (this.id) {
-            param['query'] = utils_1.stringifyByEJSON({ _id: this.id });
-        }
-        const res = await this.request.send('database.modifyDocument', param, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        if (this._transactionId) {
-            return {
-                updated: res.data.updated,
-                upserted: [{ _id: res.data.upsert_id }],
-                requestId: res.requestId
-            };
-        }
-        return {
-            updated: res.data.updated,
-            upsertedId: res.data.upsert_id,
-            requestId: res.requestId
-        };
-    }
-    async update(data) {
-        if (!data || typeof data !== 'object') {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }));
-        }
-        if (data.hasOwnProperty('_id')) {
-            return utils_1.processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }));
-        }
-        const query = utils_1.stringifyByEJSON({ _id: this.id });
-        const param = {
-            collectionName: this._coll,
-            transactionId: this._transactionId,
-            data: update_1.UpdateSerializer.encodeEJSON(data, this._apiOptions.raw || false),
-            query,
-            queryType: constant_1.QueryType.DOC,
-            multi: false,
-            merge: true,
-            upsert: false
-        };
-        const res = await this.request.send('database.modifyDocument', param, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        return {
-            updated: res.data.updated,
-            requestId: res.requestId
-        };
-    }
-    async delete() {
-        return this.remove();
-    }
-    async remove() {
-        const query = utils_1.stringifyByEJSON({ _id: this.id });
-        const param = {
-            collectionName: this._coll,
-            transactionId: this._transactionId,
-            query: query,
-            queryType: constant_1.QueryType.DOC,
-            multi: false
-        };
-        const res = await this.request.send('database.removeDocument', param, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        return {
-            deleted: res.data.deleted,
-            requestId: res.requestId
-        };
-    }
-    async get() {
-        const query = utils_1.stringifyByEJSON({ _id: this.id });
-        const { projection } = this._apiOptions;
-        const param = {
-            collectionName: this._coll,
-            query,
-            transactionId: this._transactionId,
-            queryType: constant_1.QueryType.DOC,
-            multi: false
-        };
-        if (projection) {
-            param.projection = utils_1.stringifyByEJSON(projection);
-        }
-        const res = await this.request.send('database.getDocument', param, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        const list = res.data.list.map(item => bson_1.EJSON.parse(item));
-        const documents = util_1.Util.formatResDocumentData(list);
-        if (this._transactionId) {
-            return {
-                data: documents[0] || null,
-                requestId: res.requestId
-            };
-        }
-        return {
-            data: documents,
-            requestId: res.requestId
-        };
-    }
-    field(projection) {
-        let transformProjection = {};
-        for (let k in projection) {
+            });
+        });
+    };
+    DocumentReference.prototype.set = function (data, callback) {
+        return (0, utils_1.withCallback)(this._set(data), callback);
+    };
+    DocumentReference.prototype._set = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var hasOperator, checkMixed, param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.id) {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: 'docId不能为空' }))];
+                        }
+                        if (!data || typeof data !== 'object') {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }))];
+                        }
+                        if (data.hasOwnProperty('_id')) {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }))];
+                        }
+                        hasOperator = false;
+                        checkMixed = function (objs) {
+                            if (typeof objs === 'object') {
+                                for (var key in objs) {
+                                    if (objs[key] instanceof update_2.UpdateCommand) {
+                                        hasOperator = true;
+                                    }
+                                    else if (typeof objs[key] === 'object') {
+                                        checkMixed(objs[key]);
+                                    }
+                                }
+                            }
+                        };
+                        checkMixed(data);
+                        if (hasOperator) {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.DATABASE_REQUEST_FAILED), { message: 'update operator complicit' }))];
+                        }
+                        param = {
+                            collectionName: this._coll,
+                            queryType: constant_1.QueryType.DOC,
+                            data: (0, utils_1.stringifyByEJSON)((0, datatype_1.serialize)(data)),
+                            transactionId: this._transactionId,
+                            multi: false,
+                            merge: false,
+                            upsert: true
+                        };
+                        if (this.id) {
+                            param['query'] = (0, utils_1.stringifyByEJSON)({ _id: this.id });
+                        }
+                        return [4, this.request.send('database.modifyDocument', param, (0, utils_1.getReqOpts)(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        if (this._transactionId) {
+                            return [2, {
+                                    updated: res.data.updated,
+                                    upserted: [{ _id: res.data.upsert_id }],
+                                    requestId: res.requestId
+                                }];
+                        }
+                        return [2, {
+                                updated: res.data.updated,
+                                upsertedId: res.data.upsert_id,
+                                requestId: res.requestId
+                            }];
+                }
+            });
+        });
+    };
+    DocumentReference.prototype.update = function (data, callback) {
+        return (0, utils_1.withCallback)(this._update(data), callback);
+    };
+    DocumentReference.prototype._update = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var query, param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!data || typeof data !== 'object') {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }))];
+                        }
+                        if (data.hasOwnProperty('_id')) {
+                            return [2, (0, utils_1.processReturn)(this._db.config.throwOnCode, __assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }))];
+                        }
+                        query = (0, utils_1.stringifyByEJSON)({ _id: this.id });
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            data: update_1.UpdateSerializer.encodeEJSON(data, this._apiOptions.raw || false),
+                            query: query,
+                            queryType: constant_1.QueryType.DOC,
+                            multi: false,
+                            merge: true,
+                            upsert: false
+                        };
+                        return [4, this.request.send('database.modifyDocument', param, (0, utils_1.getReqOpts)(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        return [2, {
+                                updated: res.data.updated,
+                                requestId: res.requestId
+                            }];
+                }
+            });
+        });
+    };
+    DocumentReference.prototype.delete = function (callback) {
+        return this.remove(callback);
+    };
+    DocumentReference.prototype.remove = function (callback) {
+        return (0, utils_1.withCallback)(this._remove(), callback);
+    };
+    DocumentReference.prototype._remove = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var query, param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        query = (0, utils_1.stringifyByEJSON)({ _id: this.id });
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            query: query,
+                            queryType: constant_1.QueryType.DOC,
+                            multi: false
+                        };
+                        return [4, this.request.send('database.removeDocument', param, (0, utils_1.getReqOpts)(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        return [2, {
+                                deleted: res.data.deleted,
+                                requestId: res.requestId
+                            }];
+                }
+            });
+        });
+    };
+    DocumentReference.prototype.get = function (callback) {
+        return (0, utils_1.withCallback)(this._get(), callback);
+    };
+    DocumentReference.prototype._get = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var query, projection, param, res, list, documents;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        query = (0, utils_1.stringifyByEJSON)({ _id: this.id });
+                        projection = this._apiOptions.projection;
+                        param = {
+                            collectionName: this._coll,
+                            query: query,
+                            transactionId: this._transactionId,
+                            queryType: constant_1.QueryType.DOC,
+                            multi: false
+                        };
+                        if (projection) {
+                            param.projection = (0, utils_1.stringifyByEJSON)(projection);
+                        }
+                        return [4, this.request.send('database.getDocument', param, (0, utils_1.getReqOpts)(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        list = res.data.list.map(function (item) { return bson_1.EJSON.parse(item); });
+                        documents = util_1.Util.formatResDocumentData(list);
+                        if (this._transactionId) {
+                            return [2, {
+                                    data: documents[0] || null,
+                                    requestId: res.requestId
+                                }];
+                        }
+                        return [2, {
+                                data: documents,
+                                requestId: res.requestId
+                            }];
+                }
+            });
+        });
+    };
+    DocumentReference.prototype.field = function (projection) {
+        var transformProjection = {};
+        for (var k in projection) {
             if (typeof projection[k] === 'boolean') {
                 transformProjection[k] = projection[k] === true ? 1 : 0;
             }
@@ -209,9 +320,10 @@ class DocumentReference {
                 transformProjection[k] = projection[k];
             }
         }
-        let newApiOption = Object.assign({}, this._apiOptions);
+        var newApiOption = __assign({}, this._apiOptions);
         newApiOption.projection = transformProjection;
         return new DocumentReference(this._db, this._coll, newApiOption, this.id, this._transactionId);
-    }
-}
+    };
+    return DocumentReference;
+}());
 exports.DocumentReference = DocumentReference;

package/dist/commonjs/geo/index.js

@@ -1,11 +1,22 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./point"));
-__export(require("./lineString"));
-__export(require("./polygon"));
-__export(require("./multiPoint"));
-__export(require("./multiLineString"));
-__export(require("./multiPolygon"));
+__exportStar(require("./point"), exports);
+__exportStar(require("./lineString"), exports);
+__exportStar(require("./polygon"), exports);
+__exportStar(require("./multiPoint"), exports);
+__exportStar(require("./multiLineString"), exports);
+__exportStar(require("./multiPolygon"), exports);

package/dist/commonjs/geo/lineString.d.ts

@@ -15,5 +15,5 @@ export declare class LineString {
     };
     static validate(lineString: ISerializedLineString): boolean;
     static isClosed(lineString: LineString): boolean;
-    readonly _internalType: import("../utils/symbol").InternalSymbol;
+    get _internalType(): import("../utils/symbol").InternalSymbol;
 }