@cloudbase/database 1.4.3 → 1.5.0

package/dist/commonjs/transaction/query.js

@@ -0,0 +1,261 @@
+"use strict";
+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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Query = void 0;
+var bson_1 = require("bson");
+var constant_1 = require("../constant");
+var validate_1 = require("../validate");
+var query_1 = require("../serializer/query");
+var update_1 = require("../serializer/update");
+var util_1 = require("../util");
+var GET_DOC = 'database.getInTransaction';
+var UPDATE_DOC = 'database.updateDocInTransaction';
+var DELETE_DOC = 'database.deleteDocInTransaction';
+var Query = (function () {
+    function Query(transaction, coll, fieldFilters, fieldOrders, queryOptions) {
+        this._coll = coll;
+        this._transaction = transaction;
+        this._fieldFilters = fieldFilters;
+        this._fieldOrders = fieldOrders || [];
+        this._queryOptions = queryOptions || {};
+        this._request = this._transaction.getRequestMethod();
+        this._transactionId = this._transaction.getTransactionId();
+    }
+    Query.prototype.where = function (query) {
+        if (Object.prototype.toString.call(query).slice(8, -1) !== 'Object') {
+            throw Error(constant_1.ErrorCode.QueryParamTypeError);
+        }
+        var keys = Object.keys(query);
+        var checkFlag = keys.some(function (item) {
+            return query[item] !== undefined;
+        });
+        if (keys.length && !checkFlag) {
+            throw Error(constant_1.ErrorCode.QueryParamValueError);
+        }
+        return new Query(this._transaction, this._coll, query_1.QuerySerializer.encode(query), this._fieldOrders, this._queryOptions);
+    };
+    Query.prototype.orderBy = function (fieldPath, directionStr) {
+        validate_1.Validate.isFieldPath(fieldPath);
+        validate_1.Validate.isFieldOrder(directionStr);
+        var newOrder = {
+            field: fieldPath,
+            direction: directionStr
+        };
+        var combinedOrders = this._fieldOrders.concat(newOrder);
+        return new Query(this._transaction, this._coll, this._fieldFilters, combinedOrders, this._queryOptions);
+    };
+    Query.prototype.limit = function (limit) {
+        validate_1.Validate.isInteger('limit', limit);
+        var option = __assign({}, this._queryOptions);
+        option.limit = limit;
+        return new Query(this._transaction, this._coll, this._fieldFilters, this._fieldOrders, option);
+    };
+    Query.prototype.skip = function (offset) {
+        validate_1.Validate.isInteger('offset', offset);
+        var option = __assign({}, this._queryOptions);
+        option.offset = offset;
+        return new Query(this._transaction, this._coll, this._fieldFilters, this._fieldOrders, option);
+    };
+    Query.prototype.field = function (projection) {
+        for (var k in projection) {
+            if (projection[k]) {
+                if (typeof projection[k] !== 'object') {
+                    projection[k] = 1;
+                }
+            }
+            else {
+                projection[k] = 0;
+            }
+        }
+        var option = __assign({}, this._queryOptions);
+        option.projection = projection;
+        return new Query(this._transaction, this._coll, this._fieldFilters, this._fieldOrders, option);
+    };
+    Query.prototype.get = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var newOrder, param, res, data, documents, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        newOrder = [];
+                        if (this._fieldOrders) {
+                            this._fieldOrders.forEach(function (order) {
+                                newOrder.push(order);
+                            });
+                        }
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId
+                        };
+                        if (this._fieldFilters) {
+                            param.query = this._fieldFilters;
+                        }
+                        if (newOrder.length > 0) {
+                            param.order = newOrder;
+                        }
+                        if (this._queryOptions.offset) {
+                            param.offset = this._queryOptions.offset;
+                        }
+                        if (this._queryOptions.limit) {
+                            param.limit = this._queryOptions.limit < 1000 ? this._queryOptions.limit : 1000;
+                        }
+                        else {
+                            param.limit = 100;
+                        }
+                        if (this._queryOptions.projection) {
+                            param.projection = this._queryOptions.projection;
+                        }
+                        return [4, this._request.send(GET_DOC, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        data = res.data !== 'null' ? bson_1.EJSON.parse(res.data) : null;
+                        documents = data ? (Array.isArray(data) ? util_1.Util.formatResDocumentData(data) : [util_1.Util.formatField(data)]) : [];
+                        result = {
+                            data: documents,
+                            requestId: res.requestId
+                        };
+                        if (res.total !== undefined)
+                            result.total = res.total;
+                        if (res.limit !== undefined)
+                            result.limit = res.limit;
+                        if (res.offset !== undefined)
+                            result.offset = res.offset;
+                        return [2, result];
+                }
+            });
+        });
+    };
+    Query.prototype.count = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var param, res, data, total;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId
+                        };
+                        if (this._fieldFilters) {
+                            param.query = this._fieldFilters;
+                        }
+                        return [4, this._request.send(GET_DOC, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        data = res.data !== 'null' ? bson_1.EJSON.parse(res.data) : null;
+                        total = Array.isArray(data) ? data.length : (data ? 1 : 0);
+                        return [2, {
+                                requestId: res.requestId,
+                                total: res.total !== undefined ? res.total : total
+                            }];
+                }
+            });
+        });
+    };
+    Query.prototype.update = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!data || typeof data !== 'object') {
+                            throw new Error('参数必需是非空对象');
+                        }
+                        if (data.hasOwnProperty('_id')) {
+                            throw new Error('不能更新_id的值');
+                        }
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            query: this._fieldFilters,
+                            data: bson_1.EJSON.stringify(update_1.UpdateSerializer.encode(data), { relaxed: false })
+                        };
+                        return [4, this._request.send(UPDATE_DOC, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        return [2, __assign(__assign({}, res), { updated: bson_1.EJSON.parse(res.updated) })];
+                }
+            });
+        });
+    };
+    Query.prototype.remove = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var param, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (Object.keys(this._queryOptions).length > 0) {
+                            console.warn('`offset`, `limit` and `projection` are not supported in remove() operation');
+                        }
+                        if (this._fieldOrders.length > 0) {
+                            console.warn('`orderBy` is not supported in remove() operation');
+                        }
+                        param = {
+                            collectionName: this._coll,
+                            transactionId: this._transactionId,
+                            query: this._fieldFilters
+                        };
+                        return [4, this._request.send(DELETE_DOC, param)];
+                    case 1:
+                        res = _a.sent();
+                        if (res.code)
+                            throw res;
+                        return [2, __assign(__assign({}, res), { deleted: bson_1.EJSON.parse(res.deleted) })];
+                }
+            });
+        });
+    };
+    return Query;
+}());
+exports.Query = Query;

package/dist/commonjs/typings/index.d.ts

@@ -1,6 +1,6 @@
 import { Point } from '../geo/index';
-export declare type DataType = 'init' | 'update' | 'add' | 'remove' | 'replace' | 'limit';
-export declare type QueueType = 'init' | 'enqueue' | 'dequeue' | 'update';
+export type DataType = 'init' | 'update' | 'add' | 'remove' | 'replace' | 'limit';
+export type QueueType = 'init' | 'enqueue' | 'dequeue' | 'update';
 export interface IDatabaseServiceContext extends IServiceContext {
     appConfig: IAppConfig;
     ws?: any;
@@ -30,7 +30,7 @@ export interface ISingleDBEvent {
     updatedFields?: any;
     removedFields?: any;
 }
-export declare type SnapshotType = 'init';
+export type SnapshotType = 'init';
 export interface DBRealtimeListener {
     close: () => void;
 }
@@ -42,4 +42,4 @@ export interface IServiceContext {
 export interface IReqOpts {
     timeout: number;
 }
-export declare type CenterSphere = [Point, number] | [[number, number], number];
+export type CenterSphere = [Point, number] | [[number, number], number];

package/dist/commonjs/typings/realtime.d.ts

@@ -1,14 +1,14 @@
 import { DataType, QueueType } from './index';
-export declare type IRequestMsgType = 'LOGIN' | 'INIT_WATCH' | 'REBUILD_WATCH' | 'CHECK_LAST' | 'CLOSE_WATCH' | 'PING';
-export declare type IResponseMsgType = 'LOGIN_RES' | 'INIT_EVENT' | 'NEXT_EVENT' | 'CHECK_EVENT' | 'PONG' | 'ERROR';
+export type IRequestMsgType = 'LOGIN' | 'INIT_WATCH' | 'REBUILD_WATCH' | 'CHECK_LAST' | 'CLOSE_WATCH' | 'PING';
+export type IResponseMsgType = 'LOGIN_RES' | 'INIT_EVENT' | 'NEXT_EVENT' | 'CHECK_EVENT' | 'PONG' | 'ERROR';
 export interface IRequestMessageBase<W extends boolean = true> {
     watchId: W extends true ? string : undefined;
     requestId: string;
     msgType: IRequestMsgType;
     msgData: IRequestMessageMsgData;
 }
-export declare type IRequestMessageMsgData = IRequestMessageInitWatchData | IRequestMessageLoginData | IRequestMessageRebuildWatchData | IRequestMessageCheckLastData | IRequestMessageCloseWatchData | IRequestMessagePingData;
-export declare type IRequestMessage = IRequestMessageInitWatchMsg | IRequestMessageLoginMsg | IRequestMessageRebuildWatchMsg | IRequestMessageCheckLastMsg | IRequestMessageCloseWatchMsg | IRequestMessagePingMsg;
+export type IRequestMessageMsgData = IRequestMessageInitWatchData | IRequestMessageLoginData | IRequestMessageRebuildWatchData | IRequestMessageCheckLastData | IRequestMessageCloseWatchData | IRequestMessagePingData;
+export type IRequestMessage = IRequestMessageInitWatchMsg | IRequestMessageLoginMsg | IRequestMessageRebuildWatchMsg | IRequestMessageCheckLastMsg | IRequestMessageCloseWatchMsg | IRequestMessagePingMsg;
 export interface IRequestMessageLoginData {
     envId: string;
     accessToken: string;
@@ -55,12 +55,12 @@ export interface IRequestMessageCheckLastMsg extends IRequestMessageBase {
     msgType: 'CHECK_LAST';
     msgData: IRequestMessageCheckLastData;
 }
-export declare type IRequestMessageCloseWatchData = null;
+export type IRequestMessageCloseWatchData = null;
 export interface IRequestMessageCloseWatchMsg extends IRequestMessageBase {
     msgType: 'CLOSE_WATCH';
     msgData: IRequestMessageCloseWatchData;
 }
-export declare type IRequestMessagePingData = null;
+export type IRequestMessagePingData = null;
 export interface IRequestMessagePingMsg extends IRequestMessageBase<false> {
     msgType: 'PING';
     msgData: IRequestMessagePingData;
@@ -71,9 +71,9 @@ export interface IResponseMessageBase<W extends boolean = true> {
     msgType: IResponseMsgType;
     msgData: IResponseMessageMsgData;
 }
-export declare type IResponseMessageMsgData = IResponseMessageLoginResData | IResponseMessageInitEventData | IResponseMessageNextEventData | IResponseMessageCheckEventData | IResponseMessagePongData | IResponseMessageErrorData;
-export declare type IResponseMessage = IResponseMessageLoginResMsg | IResponseMessageInitEventMsg | IResponseMessageNextEventMsg | IResponseMessageCheckEventMsg | IResponseMessagePongMsg | IResponseMessageErrorMsg;
-export declare type IResponseMessageLoginResData = {
+export type IResponseMessageMsgData = IResponseMessageLoginResData | IResponseMessageInitEventData | IResponseMessageNextEventData | IResponseMessageCheckEventData | IResponseMessagePongData | IResponseMessageErrorData;
+export type IResponseMessage = IResponseMessageLoginResMsg | IResponseMessageInitEventMsg | IResponseMessageNextEventMsg | IResponseMessageCheckEventMsg | IResponseMessagePongMsg | IResponseMessageErrorMsg;
+export type IResponseMessageLoginResData = {
     envId: string;
 } & Partial<IResponseMessageErrorData>;
 export interface IResponseMessageLoginResMsg extends IResponseMessageBase<false> {
@@ -106,12 +106,12 @@ export interface IResponseMessageCheckEventMsg extends IResponseMessageBase {
     msgType: 'CHECK_EVENT';
     msgData: IResponseMessageCheckEventData;
 }
-export declare type IResponseMessagePongData = null;
+export type IResponseMessagePongData = null;
 export interface IResponseMessagePongMsg extends IResponseMessageBase {
     msgType: 'PONG';
     msgData: IResponseMessagePongData;
 }
-export declare type IResponseMessageErrorData = {
+export type IResponseMessageErrorData = {
     message: string;
 } & ({
     code: 'SYS_ERR';
@@ -134,7 +134,7 @@ export interface IResponseMessageErrorMsg extends IResponseMessageBase {
     msgType: 'ERROR';
     msgData: IResponseMessageErrorData;
 }
-export declare type IDBEvent = IDBInitEvent | IDBNextEvent;
+export type IDBEvent = IDBInitEvent | IDBNextEvent;
 export interface IDBEventBase {
     ID: number;
     DataType: DataType;
@@ -148,10 +148,10 @@ export interface IDBInitEvent extends IDBEventBase {
     UpdatedFields?: any;
     removedFields?: any;
 }
-export declare type IDBNextEvent = IDBNextEventDataUpdate | IDBNextEventDataReplace | IDBNextEventDataAdd | IDBNextEventDataRemove | IDBNextEventDataLimit;
-export declare type IDBNextEventDataUpdate = IDBNextEventDataUpdateQueueUpdate | IDBNextEventDataUpdateQueueEnqueue | IDBNextEventDataUpdateQueueDequeue;
-export declare type IDBNextEventDataReplace = IDBNextEventDataReplaceQueueUpdate | IDBNextEventDataReplaceQueueEnqueue | IDBNextEventDataReplaceQueueDequeue;
-export declare type IDBNextEventDataLimit = IDBNextEventDataLimitQueueEnqueue | IDBNextEventDataLimitQueueDequeue;
+export type IDBNextEvent = IDBNextEventDataUpdate | IDBNextEventDataReplace | IDBNextEventDataAdd | IDBNextEventDataRemove | IDBNextEventDataLimit;
+export type IDBNextEventDataUpdate = IDBNextEventDataUpdateQueueUpdate | IDBNextEventDataUpdateQueueEnqueue | IDBNextEventDataUpdateQueueDequeue;
+export type IDBNextEventDataReplace = IDBNextEventDataReplaceQueueUpdate | IDBNextEventDataReplaceQueueEnqueue | IDBNextEventDataReplaceQueueDequeue;
+export type IDBNextEventDataLimit = IDBNextEventDataLimitQueueEnqueue | IDBNextEventDataLimitQueueDequeue;
 export interface IDBNextEventDataUpdateQueueUpdate extends IDBEventBase {
     DataType: 'update';
     QueueType: 'update';

package/dist/commonjs/util.js

@@ -1,101 +1,132 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const constant_1 = require("./constant");
-const index_1 = require("./geo/index");
-class Util {
-}
-exports.Util = Util;
-Util.formatResDocumentData = (documents) => {
-    return documents.map(document => {
-        return Util.formatField(document);
-    });
-};
-Util.formatField = document => {
-    const keys = Object.keys(document);
-    let protoField = {};
-    if (Array.isArray(document)) {
-        protoField = [];
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
     }
-    keys.forEach(key => {
-        const item = document[key];
-        const type = Util.whichType(item);
-        let realValue;
-        switch (type) {
-            case constant_1.FieldType.GeoPoint:
-                realValue = new index_1.Point(item.coordinates[0], item.coordinates[1]);
-                break;
-            case constant_1.FieldType.GeoLineString:
-                realValue = new index_1.LineString(item.coordinates.map(point => new index_1.Point(point[0], point[1])));
-                break;
-            case constant_1.FieldType.GeoPolygon:
-                realValue = new index_1.Polygon(item.coordinates.map(line => new index_1.LineString(line.map(([lng, lat]) => new index_1.Point(lng, lat)))));
-                break;
-            case constant_1.FieldType.GeoMultiPoint:
-                realValue = new index_1.MultiPoint(item.coordinates.map(point => new index_1.Point(point[0], point[1])));
-                break;
-            case constant_1.FieldType.GeoMultiLineString:
-                realValue = new index_1.MultiLineString(item.coordinates.map(line => new index_1.LineString(line.map(([lng, lat]) => new index_1.Point(lng, lat)))));
-                break;
-            case constant_1.FieldType.GeoMultiPolygon:
-                realValue = new index_1.MultiPolygon(item.coordinates.map(polygon => new index_1.Polygon(polygon.map(line => new index_1.LineString(line.map(([lng, lat]) => new index_1.Point(lng, lat)))))));
-                break;
-            case constant_1.FieldType.Date:
-                realValue = item;
-                break;
-            case constant_1.FieldType.Object:
-            case constant_1.FieldType.Array:
-                realValue = Util.formatField(item);
-                break;
-            case constant_1.FieldType.ServerDate:
-                realValue = new Date(item.$date);
-                break;
-            default:
-                realValue = item;
-        }
-        if (Array.isArray(protoField)) {
-            protoField.push(realValue);
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
         }
-        else {
-            protoField[key] = realValue;
-        }
-    });
-    return protoField;
+        finally { if (e) throw e.error; }
+    }
+    return ar;
 };
-Util.whichType = (obj) => {
-    let type = Object.prototype.toString.call(obj).slice(8, -1);
-    if (type === constant_1.FieldType.Date) {
-        return constant_1.FieldType.Date;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Util = void 0;
+var constant_1 = require("./constant");
+var index_1 = require("./geo/index");
+var Util = (function () {
+    function Util() {
     }
-    if (type === constant_1.FieldType.Object) {
-        if (obj.$date) {
-            type = constant_1.FieldType.ServerDate;
-        }
-        else if (index_1.Point.validate(obj)) {
-            type = constant_1.FieldType.GeoPoint;
+    Util.formatResDocumentData = function (documents) {
+        return documents.map(function (document) {
+            return Util.formatField(document);
+        });
+    };
+    Util.formatField = function (document) {
+        var keys = Object.keys(document);
+        var protoField = {};
+        if (Array.isArray(document)) {
+            protoField = [];
         }
-        else if (index_1.LineString.validate(obj)) {
-            type = constant_1.FieldType.GeoLineString;
+        keys.forEach(function (key) {
+            var item = document[key];
+            var type = Util.whichType(item);
+            var realValue;
+            switch (type) {
+                case constant_1.FieldType.GeoPoint:
+                    realValue = new index_1.Point(item.coordinates[0], item.coordinates[1]);
+                    break;
+                case constant_1.FieldType.GeoLineString:
+                    realValue = new index_1.LineString(item.coordinates.map(function (point) { return new index_1.Point(point[0], point[1]); }));
+                    break;
+                case constant_1.FieldType.GeoPolygon:
+                    realValue = new index_1.Polygon(item.coordinates.map(function (line) { return new index_1.LineString(line.map(function (_a) {
+                        var _b = __read(_a, 2), lng = _b[0], lat = _b[1];
+                        return new index_1.Point(lng, lat);
+                    })); }));
+                    break;
+                case constant_1.FieldType.GeoMultiPoint:
+                    realValue = new index_1.MultiPoint(item.coordinates.map(function (point) { return new index_1.Point(point[0], point[1]); }));
+                    break;
+                case constant_1.FieldType.GeoMultiLineString:
+                    realValue = new index_1.MultiLineString(item.coordinates.map(function (line) { return new index_1.LineString(line.map(function (_a) {
+                        var _b = __read(_a, 2), lng = _b[0], lat = _b[1];
+                        return new index_1.Point(lng, lat);
+                    })); }));
+                    break;
+                case constant_1.FieldType.GeoMultiPolygon:
+                    realValue = new index_1.MultiPolygon(item.coordinates.map(function (polygon) {
+                        return new index_1.Polygon(polygon.map(function (line) { return new index_1.LineString(line.map(function (_a) {
+                            var _b = __read(_a, 2), lng = _b[0], lat = _b[1];
+                            return new index_1.Point(lng, lat);
+                        })); }));
+                    }));
+                    break;
+                case constant_1.FieldType.Date:
+                    realValue = item;
+                    break;
+                case constant_1.FieldType.Object:
+                case constant_1.FieldType.Array:
+                    realValue = Util.formatField(item);
+                    break;
+                case constant_1.FieldType.ServerDate:
+                    realValue = new Date(item.$date);
+                    break;
+                default:
+                    realValue = item;
+            }
+            if (Array.isArray(protoField)) {
+                protoField.push(realValue);
+            }
+            else {
+                protoField[key] = realValue;
+            }
+        });
+        return protoField;
+    };
+    Util.whichType = function (obj) {
+        var type = Object.prototype.toString.call(obj).slice(8, -1);
+        if (type === constant_1.FieldType.Date) {
+            return constant_1.FieldType.Date;
         }
-        else if (index_1.Polygon.validate(obj)) {
-            type = constant_1.FieldType.GeoPolygon;
+        if (type === constant_1.FieldType.Object) {
+            if (obj.$date) {
+                type = constant_1.FieldType.ServerDate;
+            }
+            else if (index_1.Point.validate(obj)) {
+                type = constant_1.FieldType.GeoPoint;
+            }
+            else if (index_1.LineString.validate(obj)) {
+                type = constant_1.FieldType.GeoLineString;
+            }
+            else if (index_1.Polygon.validate(obj)) {
+                type = constant_1.FieldType.GeoPolygon;
+            }
+            else if (index_1.MultiPoint.validate(obj)) {
+                type = constant_1.FieldType.GeoMultiPoint;
+            }
+            else if (index_1.MultiLineString.validate(obj)) {
+                type = constant_1.FieldType.GeoMultiLineString;
+            }
+            else if (index_1.MultiPolygon.validate(obj)) {
+                type = constant_1.FieldType.GeoMultiPolygon;
+            }
         }
-        else if (index_1.MultiPoint.validate(obj)) {
-            type = constant_1.FieldType.GeoMultiPoint;
+        return type;
+    };
+    Util.generateDocId = function () {
+        var chars = 'ABCDEFabcdef0123456789';
+        var autoId = '';
+        for (var i = 0; i < 24; i++) {
+            autoId += chars.charAt(Math.floor(Math.random() * chars.length));
         }
-        else if (index_1.MultiLineString.validate(obj)) {
-            type = constant_1.FieldType.GeoMultiLineString;
-        }
-        else if (index_1.MultiPolygon.validate(obj)) {
-            type = constant_1.FieldType.GeoMultiPolygon;
-        }
-    }
-    return type;
-};
-Util.generateDocId = () => {
-    let chars = 'ABCDEFabcdef0123456789';
-    let autoId = '';
-    for (let i = 0; i < 24; i++) {
-        autoId += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return autoId;
-};
+        return autoId;
+    };
+    return Util;
+}());
+exports.Util = Util;

package/dist/commonjs/utils/error.d.ts

@@ -7,7 +7,8 @@ export declare class CloudSDKError extends Error {
     errMsg: string;
     requestID?: string;
     constructor(options: IErrorConstructorOptions);
-    message: string;
+    get message(): string;
+    set message(msg: string);
 }
 interface IErrorConstructorOptions {
     errCode?: string;