@cloudbase/database 1.4.3 → 1.5.1

package/dist/commonjs/validate.js

@@ -1,18 +1,32 @@
 "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);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const constant_1 = require("./constant");
-const util_1 = require("./util");
-const code_1 = require("./const/code");
-const utils_1 = require("./utils/utils");
-const type_1 = require("./utils/type");
-const symbol_1 = require("./helper/symbol");
-const validOptionsKeys = ['limit', 'offset', 'projection', 'order', 'multiple', 'timeout', 'raw'];
-class Validate {
-    static isGeopoint(point, degree) {
+exports.Validate = void 0;
+var constant_1 = require("./constant");
+var util_1 = require("./util");
+var code_1 = require("./const/code");
+var utils_1 = require("./utils/utils");
+var type_1 = require("./utils/type");
+var symbol_1 = require("./helper/symbol");
+var validOptionsKeys = ['limit', 'offset', 'projection', 'order', 'multiple', 'timeout', 'raw'];
+var Validate = (function () {
+    function Validate() {
+    }
+    Validate.isGeopoint = function (point, degree) {
         if (util_1.Util.whichType(degree) !== constant_1.FieldType.Number) {
             throw new Error('Geo Point must be number type');
         }
-        const degreeAbs = Math.abs(degree);
+        var degreeAbs = Math.abs(degree);
         if (point === 'latitude' && degreeAbs > 90) {
             throw new Error('latitude should be a number ranges from -90 to 90');
         }
@@ -20,92 +34,93 @@ class Validate {
             throw new Error('longitude should be a number ranges from -180 to 180');
         }
         return true;
-    }
-    static isInteger(param, num) {
+    };
+    Validate.isInteger = function (param, num) {
         if (!Number.isInteger(num)) {
             throw new Error(param + constant_1.ErrorCode.IntergerError);
         }
         return true;
-    }
-    static mustBeBoolean(param, bool) {
+    };
+    Validate.mustBeBoolean = function (param, bool) {
         if (typeof bool !== 'boolean') {
             throw new Error(param + constant_1.ErrorCode.BooleanError);
         }
         return true;
-    }
-    static isProjection(param, value) {
-        if (type_1.getType(value) !== 'object') {
-            throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `${param} projection must be an object` }));
-        }
-        for (const key in value) {
-            const subValue = value[key];
-            if (type_1.getType(subValue) === 'number') {
+    };
+    Validate.isProjection = function (param, value) {
+        if ((0, type_1.getType)(value) !== 'object') {
+            throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "".concat(param, " projection must be an object") }));
+        }
+        for (var key in value) {
+            var subValue = value[key];
+            if ((0, type_1.getType)(subValue) === 'number') {
                 if (subValue !== 0 && subValue !== 1) {
-                    throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `if the value in projection is of number, it must be 0 or 1` }));
+                    throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "if the value in projection is of number, it must be 0 or 1" }));
                 }
             }
-            else if (type_1.getType(subValue) === 'object') {
+            else if ((0, type_1.getType)(subValue) === 'object') {
             }
             else {
-                throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: 'invalid projection' }));
+                throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: 'invalid projection' }));
             }
         }
         return true;
-    }
-    static isOrder(param, value) {
-        if (type_1.getType(value) !== 'object') {
-            throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `${param} order must be an object` }));
+    };
+    Validate.isOrder = function (param, value) {
+        if ((0, type_1.getType)(value) !== 'object') {
+            throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "".concat(param, " order must be an object") }));
         }
-        for (let key in value) {
-            const subValue = value[key];
+        for (var key in value) {
+            var subValue = value[key];
             if (subValue !== 1 && subValue !== -1) {
-                throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `order value must be 1 or -1` }));
+                throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "order value must be 1 or -1" }));
             }
         }
         return true;
-    }
-    static isFieldOrder(direction) {
+    };
+    Validate.isFieldOrder = function (direction) {
         if (constant_1.OrderDirectionList.indexOf(direction) === -1) {
             throw new Error(constant_1.ErrorCode.DirectionError);
         }
         return true;
-    }
-    static isFieldPath(path) {
+    };
+    Validate.isFieldPath = function (path) {
         if (!/^[a-zA-Z0-9-_\.]/.test(path)) {
             throw new Error();
         }
         return true;
-    }
-    static isOperator(op) {
+    };
+    Validate.isOperator = function (op) {
         if (constant_1.WhereFilterOpList.indexOf(op) === -1) {
             throw new Error(constant_1.ErrorCode.OpStrError);
         }
         return true;
-    }
-    static isCollName(name) {
+    };
+    Validate.isCollName = function (name) {
         if (!/^[a-zA-Z0-9]([a-zA-Z0-9-_]){1,32}$/.test(name)) {
             throw new Error(constant_1.ErrorCode.CollNameError);
         }
         return true;
-    }
-    static isDocID(docId) {
+    };
+    Validate.isDocID = function (docId) {
         if (!/^([a-fA-F0-9]){24}$/.test(docId)) {
             throw new Error(constant_1.ErrorCode.DocIDError);
         }
         return true;
-    }
-    static isValidOptions(options = {}) {
-        if (type_1.getType(options) !== 'object') {
-            throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `options must be an object` }));
-        }
-        const keys = Object.keys(options);
-        for (const index in keys) {
+    };
+    Validate.isValidOptions = function (options) {
+        if (options === void 0) { options = {}; }
+        if ((0, type_1.getType)(options) !== 'object') {
+            throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "options must be an object" }));
+        }
+        var keys = Object.keys(options);
+        for (var index in keys) {
             if (validOptionsKeys.indexOf(keys[index]) < 0) {
-                throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `${keys[index]} is invalid options key` }));
+                throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "".concat(keys[index], " is invalid options key") }));
             }
         }
-        const { limit, offset, projection, order } = options;
-        const { multiple } = options;
+        var _a = options, limit = _a.limit, offset = _a.offset, projection = _a.projection, order = _a.order;
+        var multiple = options.multiple;
         if (limit !== undefined) {
             Validate.isInteger('limit', limit);
         }
@@ -125,23 +140,23 @@ class Validate {
             Validate.isInteger('timeout', options.timeout);
         }
         return true;
-    }
-    static isValidAggregation(stage) {
+    };
+    Validate.isValidAggregation = function (stage) {
         if (Object.keys(stage).length !== 1) {
-            throw utils_1.E(Object.assign(Object.assign({}, code_1.ERRORS.INVALID_PARAM), { message: `aggregation stage must have one key` }));
+            throw (0, utils_1.E)(__assign(__assign({}, code_1.ERRORS.INVALID_PARAM), { message: "aggregation stage must have one key" }));
         }
         return true;
-    }
-    static isCentersPhere(param) {
+    };
+    Validate.isCentersPhere = function (param) {
         if (Array.isArray(param) && param.length === 2) {
-            if (type_1.getType(param[0]) === 'object' &&
+            if ((0, type_1.getType)(param[0]) === 'object' &&
                 param[0]._internalType === symbol_1.SYMBOL_GEO_POINT &&
                 typeof param[1] === 'number') {
                 return true;
             }
             if (Array.isArray(param[0]) && param[0].length === 2) {
-                const longitude = param[0][0];
-                const latitude = param[0][1];
+                var longitude = param[0][0];
+                var latitude = param[0][1];
                 Validate.isGeopoint('longitude', longitude);
                 Validate.isGeopoint('latitude', latitude);
                 if (typeof param[1] === 'number') {
@@ -149,7 +164,8 @@ class Validate {
                 }
             }
         }
-        throw new Error(`${constant_1.ErrorCode.CentersPhereError}`);
-    }
-}
+        throw new Error("".concat(constant_1.ErrorCode.CentersPhereError));
+    };
+    return Validate;
+}());
 exports.Validate = Validate;

package/dist/esm/ObjectId/index.d.ts

@@ -3,7 +3,7 @@ export declare class ObjectId {
     constructor({ id }?: {
         id?: string;
     });
-    readonly _internalType: import("../utils/symbol").InternalSymbol;
+    get _internalType(): import("../utils/symbol").InternalSymbol;
     parse(): {
         $oid: string;
     };

package/dist/esm/ObjectId/index.js

@@ -1,17 +1,24 @@
 import { SYMBOL_OBJECTID } from '../helper/symbol';
-export class ObjectId {
-    constructor({ id = '' } = {}) {
+var ObjectId = (function () {
+    function ObjectId(_a) {
+        var _b = _a === void 0 ? {} : _a, _c = _b.id, id = _c === void 0 ? '' : _c;
         this.id = id;
     }
-    get _internalType() {
-        return SYMBOL_OBJECTID;
-    }
-    parse() {
+    Object.defineProperty(ObjectId.prototype, "_internalType", {
+        get: function () {
+            return SYMBOL_OBJECTID;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ObjectId.prototype.parse = function () {
         return {
             $oid: this.id
         };
-    }
-}
+    };
+    return ObjectId;
+}());
+export { ObjectId };
 export function ObjectIdConstructor(opt) {
     return new ObjectId(opt);
 }

package/dist/esm/aggregate.js

@@ -1,3 +1,39 @@
+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 { EJSON } from 'bson';
 import { QuerySerializer } from './serializer/query';
@@ -5,50 +41,64 @@ import { stringifyByEJSON } from './utils/utils';
 import { getType } from './utils/type';
 import { Validate } from './validate';
 import { Point } from './geo/point';
-export default class Aggregation {
-    constructor(db, collectionName, rawPipeline) {
+var Aggregation = (function () {
+    function Aggregation(db, collectionName, rawPipeline) {
+        var _this = this;
         this._stages = [];
         if (db && collectionName) {
             this._db = db;
-            this._request = new Db.reqClass(this._db.config);
+            this._request = Db.createRequest(this._db.config);
             this._collectionName = collectionName;
             if (rawPipeline && rawPipeline.length > 0) {
-                rawPipeline.forEach((stage) => {
+                rawPipeline.forEach(function (stage) {
                     Validate.isValidAggregation(stage);
-                    const stageName = Object.keys(stage)[0];
-                    this._pipe(stageName, stage[stageName], true);
+                    var stageName = Object.keys(stage)[0];
+                    _this._pipe(stageName, stage[stageName], true);
                 });
             }
         }
     }
-    async end() {
-        if (!this._collectionName || !this._db) {
-            throw new Error('Aggregation pipeline cannot send request');
-        }
-        const result = await this._request.send('database.aggregateDocuments', {
-            collectionName: this._collectionName,
-            stages: this._stages
+    Aggregation.prototype.end = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this._collectionName || !this._db) {
+                            throw new Error('Aggregation pipeline cannot send request');
+                        }
+                        return [4, this._request.send('database.aggregateDocuments', {
+                                collectionName: this._collectionName,
+                                stages: this._stages
+                            })];
+                    case 1:
+                        result = _a.sent();
+                        if (result && result.data && result.data.list) {
+                            return [2, {
+                                    requestId: result.requestId,
+                                    data: result.data.list.map(EJSON.parse)
+                                }];
+                        }
+                        return [2, result];
+                }
+            });
         });
-        if (result && result.data && result.data.list) {
-            return {
-                requestId: result.requestId,
-                data: result.data.list.map(EJSON.parse)
-            };
-        }
-        return result;
-    }
-    unwrap() {
+    };
+    Aggregation.prototype.unwrap = function () {
         return this._stages;
-    }
-    done() {
-        return this._stages.map(({ stageKey, stageValue }) => {
-            return {
-                [stageKey]: JSON.parse(stageValue)
-            };
+    };
+    Aggregation.prototype.done = function () {
+        return this._stages.map(function (_a) {
+            var _b;
+            var stageKey = _a.stageKey, stageValue = _a.stageValue;
+            return _b = {},
+                _b[stageKey] = JSON.parse(stageValue),
+                _b;
         });
-    }
-    _pipe(stage, param, raw = false) {
-        let transformParam = '';
+    };
+    Aggregation.prototype._pipe = function (stage, param, raw) {
+        if (raw === void 0) { raw = false; }
+        var transformParam = '';
         if (getType(param) === 'object') {
             transformParam = stringifyByEJSON(param);
         }
@@ -56,24 +106,24 @@ export default class Aggregation {
             transformParam = JSON.stringify(param);
         }
         this._stages.push({
-            stageKey: raw ? stage : `$${stage}`,
+            stageKey: raw ? stage : "$".concat(stage),
             stageValue: transformParam
         });
         return this;
-    }
-    addFields(param) {
+    };
+    Aggregation.prototype.addFields = function (param) {
         return this._pipe('addFields', param);
-    }
-    bucket(param) {
+    };
+    Aggregation.prototype.bucket = function (param) {
         return this._pipe('bucket', param);
-    }
-    bucketAuto(param) {
+    };
+    Aggregation.prototype.bucketAuto = function (param) {
         return this._pipe('bucketAuto', param);
-    }
-    count(param) {
+    };
+    Aggregation.prototype.count = function (param) {
         return this._pipe('count', param);
-    }
-    geoNear(param) {
+    };
+    Aggregation.prototype.geoNear = function (param) {
         if (param.query) {
             param.query = QuerySerializer.encode(param.query);
         }
@@ -84,38 +134,40 @@ export default class Aggregation {
             param.near = new Point(param.near.longitude, param.near.latitude).toJSON();
         }
         return this._pipe('geoNear', param);
-    }
-    group(param) {
+    };
+    Aggregation.prototype.group = function (param) {
         return this._pipe('group', param);
-    }
-    limit(param) {
+    };
+    Aggregation.prototype.limit = function (param) {
         return this._pipe('limit', param);
-    }
-    match(param) {
+    };
+    Aggregation.prototype.match = function (param) {
         return this._pipe('match', QuerySerializer.encode(param));
-    }
-    project(param) {
+    };
+    Aggregation.prototype.project = function (param) {
         return this._pipe('project', param);
-    }
-    lookup(param) {
+    };
+    Aggregation.prototype.lookup = function (param) {
         return this._pipe('lookup', param);
-    }
-    replaceRoot(param) {
+    };
+    Aggregation.prototype.replaceRoot = function (param) {
         return this._pipe('replaceRoot', param);
-    }
-    sample(param) {
+    };
+    Aggregation.prototype.sample = function (param) {
         return this._pipe('sample', param);
-    }
-    skip(param) {
+    };
+    Aggregation.prototype.skip = function (param) {
         return this._pipe('skip', param);
-    }
-    sort(param) {
+    };
+    Aggregation.prototype.sort = function (param) {
         return this._pipe('sort', param);
-    }
-    sortByCount(param) {
+    };
+    Aggregation.prototype.sortByCount = function (param) {
         return this._pipe('sortByCount', param);
-    }
-    unwind(param) {
+    };
+    Aggregation.prototype.unwind = function (param) {
         return this._pipe('unwind', param);
-    }
-}
+    };
+    return Aggregation;
+}());
+export default Aggregation;

package/dist/esm/collection.d.ts

@@ -3,15 +3,16 @@ import { Query, QueryOption, UpdateOption } from './query';
 import Aggregation from './aggregate';
 export declare class CollectionReference extends Query {
     protected _transactionId: string;
-    readonly name: string;
+    get name(): string;
     doc(docID: string | number): DocumentReference;
-    add(data: any): Promise<{
+    add(data: any, callback?: any): Promise<{
         ids?: string[];
         id?: string;
         inserted?: number;
         ok?: number;
         requestId: string;
     }>;
+    private _add;
     aggregate(rawPipeline?: object[]): Aggregation;
     options(apiOptions: QueryOption | UpdateOption): CollectionReference;
 }