@cloudbase/database 1.4.3 → 1.5.0

package/dist/esm/document.js

@@ -1,202 +1,312 @@
+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;
+            }
+            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 };
+    }
+};
 import { Db } from './index';
 import { Util } from './util';
 import { UpdateSerializer } from './serializer/update';
 import { serialize } from './serializer/datatype';
 import { UpdateCommand } from './commands/update';
-import { RealtimeWebSocketClient } from './realtime/websocket-client';
 import { QueryType } from './constant';
-import { getReqOpts, stringifyByEJSON, processReturn } from './utils/utils';
+import { getWsInstance, getReqOpts, stringifyByEJSON, processReturn, withCallback } from './utils/utils';
 import { ERRORS } from './const/code';
 import { EJSON } from 'bson';
-export class DocumentReference {
-    constructor(db, coll, apiOptions, docID, transactionId) {
-        this.watch = (options) => {
-            if (!Db.ws) {
-                Db.ws = new RealtimeWebSocketClient({
-                    context: {
-                        appConfig: {
-                            docSizeLimit: 1000,
-                            realtimePingInterval: 10000,
-                            realtimePongWaitTimeout: 5000,
-                            request: this.request
-                        }
-                    }
-                });
-            }
-            return Db.ws.watch(Object.assign(Object.assign({}, options), { envId: this._db.config.env, collectionName: this._coll, query: JSON.stringify({
-                    _id: this.id
+var DocumentReference = (function () {
+    function DocumentReference(db, coll, apiOptions, docID, transactionId) {
+        var _this = this;
+        this.watch = function (options) {
+            var ws = 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 Db.reqClass(this._db.config);
+        this.request = Db.createRequest(this._db.config);
         this._apiOptions = apiOptions;
     }
-    async create(data) {
-        if (this.id) {
-            data['_id'] = this.id;
-        }
-        let params = {
-            collectionName: this._coll,
-            data: [stringifyByEJSON(serialize(data))],
-            transactionId: this._transactionId
-        };
-        const res = await this.request.send('database.insertDocument', params, 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 processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.INVALID_PARAM), { message: 'docId不能为空' }));
-        }
-        if (!data || typeof data !== 'object') {
-            return processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }));
-        }
-        if (data.hasOwnProperty('_id')) {
-            return processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }));
-        }
-        let hasOperator = false;
-        const checkMixed = objs => {
-            if (typeof objs === 'object') {
-                for (let key in objs) {
-                    if (objs[key] instanceof UpdateCommand) {
-                        hasOperator = true;
-                    }
-                    else if (typeof objs[key] === 'object') {
-                        checkMixed(objs[key]);
-                    }
+    DocumentReference.prototype.create = function (data, callback) {
+        return 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 stringifyByEJSON(serialize(item)); })
+                                : [stringifyByEJSON(serialize(data))],
+                            transactionId: this._transactionId
+                        };
+                        return [4, this.request.send('database.insertDocument', params, 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 processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.DATABASE_REQUEST_FAILED), { message: 'update operator complicit' }));
-        }
-        let param = {
-            collectionName: this._coll,
-            queryType: QueryType.DOC,
-            data: stringifyByEJSON(serialize(data)),
-            transactionId: this._transactionId,
-            multi: false,
-            merge: false,
-            upsert: true
-        };
-        if (this.id) {
-            param['query'] = stringifyByEJSON({ _id: this.id });
-        }
-        const res = await this.request.send('database.modifyDocument', param, 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 processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }));
-        }
-        if (data.hasOwnProperty('_id')) {
-            return processReturn(this._db.config.throwOnCode, Object.assign(Object.assign({}, ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }));
-        }
-        const query = stringifyByEJSON({ _id: this.id });
-        const param = {
-            collectionName: this._coll,
-            transactionId: this._transactionId,
-            data: UpdateSerializer.encodeEJSON(data, this._apiOptions.raw || false),
-            query,
-            queryType: QueryType.DOC,
-            multi: false,
-            merge: true,
-            upsert: false
-        };
-        const res = await this.request.send('database.modifyDocument', param, 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 = stringifyByEJSON({ _id: this.id });
-        const param = {
-            collectionName: this._coll,
-            transactionId: this._transactionId,
-            query: query,
-            queryType: QueryType.DOC,
-            multi: false
-        };
-        const res = await this.request.send('database.removeDocument', param, getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        return {
-            deleted: res.data.deleted,
-            requestId: res.requestId
-        };
-    }
-    async get() {
-        const query = stringifyByEJSON({ _id: this.id });
-        const { projection } = this._apiOptions;
-        const param = {
-            collectionName: this._coll,
-            query,
-            transactionId: this._transactionId,
-            queryType: QueryType.DOC,
-            multi: false
-        };
-        if (projection) {
-            param.projection = stringifyByEJSON(projection);
-        }
-        const res = await this.request.send('database.getDocument', param, getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        const list = res.data.list.map(item => EJSON.parse(item));
-        const documents = 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 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, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.INVALID_PARAM), { message: 'docId不能为空' }))];
+                        }
+                        if (!data || typeof data !== 'object') {
+                            return [2, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }))];
+                        }
+                        if (data.hasOwnProperty('_id')) {
+                            return [2, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }))];
+                        }
+                        hasOperator = false;
+                        checkMixed = function (objs) {
+                            if (typeof objs === 'object') {
+                                for (var key in objs) {
+                                    if (objs[key] instanceof UpdateCommand) {
+                                        hasOperator = true;
+                                    }
+                                    else if (typeof objs[key] === 'object') {
+                                        checkMixed(objs[key]);
+                                    }
+                                }
+                            }
+                        };
+                        checkMixed(data);
+                        if (hasOperator) {
+                            return [2, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.DATABASE_REQUEST_FAILED), { message: 'update operator complicit' }))];
+                        }
+                        param = {
+                            collectionName: this._coll,
+                            queryType: QueryType.DOC,
+                            data: stringifyByEJSON(serialize(data)),
+                            transactionId: this._transactionId,
+                            multi: false,
+                            merge: false,
+                            upsert: true
+                        };
+                        if (this.id) {
+                            param['query'] = stringifyByEJSON({ _id: this.id });
+                        }
+                        return [4, this.request.send('database.modifyDocument', param, 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 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, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.INVALID_PARAM), { message: '参数必需是非空对象' }))];
+                        }
+                        if (data.hasOwnProperty('_id')) {
+                            return [2, processReturn(this._db.config.throwOnCode, __assign(__assign({}, ERRORS.INVALID_PARAM), { message: '不能更新_id的值' }))];
+                        }
+                        query = stringifyByEJSON({ _id: this.id });
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            data: UpdateSerializer.encodeEJSON(data, this._apiOptions.raw || false),
+                            query: query,
+                            queryType: QueryType.DOC,
+                            multi: false,
+                            merge: true,
+                            upsert: false
+                        };
+                        return [4, this.request.send('database.modifyDocument', param, 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 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 = stringifyByEJSON({ _id: this.id });
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            query: query,
+                            queryType: QueryType.DOC,
+                            multi: false
+                        };
+                        return [4, this.request.send('database.removeDocument', param, 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 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 = stringifyByEJSON({ _id: this.id });
+                        projection = this._apiOptions.projection;
+                        param = {
+                            collectionName: this._coll,
+                            query: query,
+                            transactionId: this._transactionId,
+                            queryType: QueryType.DOC,
+                            multi: false
+                        };
+                        if (projection) {
+                            param.projection = stringifyByEJSON(projection);
+                        }
+                        return [4, this.request.send('database.getDocument', param, getReqOpts(this._apiOptions))];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code) {
+                            return [2, res];
+                        }
+                        list = res.data.list.map(function (item) { return EJSON.parse(item); });
+                        documents = 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;
             }
@@ -207,8 +317,10 @@ export 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;
+}());
+export { DocumentReference };

package/dist/esm/geo/interface.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/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;
 }

package/dist/esm/geo/lineString.js

@@ -1,54 +1,83 @@
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 import { SYMBOL_GEO_LINE_STRING } from '../helper/symbol';
 import { Point } from './point';
 import { isArray, isNumber } from '../utils/type';
-export class LineString {
-    constructor(points) {
+var LineString = (function () {
+    function LineString(points) {
         if (!isArray(points)) {
-            throw new TypeError(`"points" must be of type Point[]. Received type ${typeof points}`);
+            throw new TypeError("\"points\" must be of type Point[]. Received type ".concat(typeof points));
         }
         if (points.length < 2) {
             throw new Error('"points" must contain 2 points at least');
         }
-        points.forEach(point => {
+        points.forEach(function (point) {
             if (!(point instanceof Point)) {
-                throw new TypeError(`"points" must be of type Point[]. Received type ${typeof point}[]`);
+                throw new TypeError("\"points\" must be of type Point[]. Received type ".concat(typeof point, "[]"));
             }
         });
         this.points = points;
     }
-    parse(key) {
-        return {
-            [key]: {
+    LineString.prototype.parse = function (key) {
+        var _a;
+        return _a = {},
+            _a[key] = {
                 type: 'LineString',
-                coordinates: this.points.map(point => point.toJSON().coordinates)
-            }
-        };
-    }
-    toJSON() {
+                coordinates: this.points.map(function (point) { return point.toJSON().coordinates; })
+            },
+            _a;
+    };
+    LineString.prototype.toJSON = function () {
         return {
             type: 'LineString',
-            coordinates: this.points.map(point => point.toJSON().coordinates)
+            coordinates: this.points.map(function (point) { return point.toJSON().coordinates; })
         };
-    }
-    static validate(lineString) {
+    };
+    LineString.validate = function (lineString) {
+        var e_1, _a;
         if (lineString.type !== 'LineString' || !isArray(lineString.coordinates)) {
             return false;
         }
-        for (let point of lineString.coordinates) {
-            if (!isNumber(point[0]) || !isNumber(point[1])) {
-                return false;
+        try {
+            for (var _b = __values(lineString.coordinates), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var point = _c.value;
+                if (!isNumber(point[0]) || !isNumber(point[1])) {
+                    return false;
+                }
             }
         }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
         return true;
-    }
-    static isClosed(lineString) {
-        const firstPoint = lineString.points[0];
-        const lastPoint = lineString.points[lineString.points.length - 1];
+    };
+    LineString.isClosed = function (lineString) {
+        var firstPoint = lineString.points[0];
+        var lastPoint = lineString.points[lineString.points.length - 1];
         if (firstPoint.latitude === lastPoint.latitude && firstPoint.longitude === lastPoint.longitude) {
             return true;
         }
-    }
-    get _internalType() {
-        return SYMBOL_GEO_LINE_STRING;
-    }
-}
+    };
+    Object.defineProperty(LineString.prototype, "_internalType", {
+        get: function () {
+            return SYMBOL_GEO_LINE_STRING;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return LineString;
+}());
+export { LineString };

package/dist/esm/geo/multiLineString.d.ts

@@ -14,5 +14,5 @@ export declare class MultiLineString {
         coordinates: number[][][];
     };
     static validate(multiLineString: ISerializedMultiLineString): boolean;
-    readonly _internalType: import("../utils/symbol").InternalSymbol;
+    get _internalType(): import("../utils/symbol").InternalSymbol;
 }