@cloudbase/database 1.4.3 → 1.5.1

package/dist/commonjs/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/commonjs/ObjectId/index.js

@@ -1,19 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const symbol_1 = require("../helper/symbol");
-class ObjectId {
-    constructor({ id = '' } = {}) {
+exports.ObjectIdConstructor = exports.ObjectId = void 0;
+var symbol_1 = require("../helper/symbol");
+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_1.SYMBOL_OBJECTID;
-    }
-    parse() {
+    Object.defineProperty(ObjectId.prototype, "_internalType", {
+        get: function () {
+            return symbol_1.SYMBOL_OBJECTID;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ObjectId.prototype.parse = function () {
         return {
             $oid: this.id
         };
-    }
-}
+    };
+    return ObjectId;
+}());
 exports.ObjectId = ObjectId;
 function ObjectIdConstructor(opt) {
     return new ObjectId(opt);

package/dist/commonjs/aggregate.js

@@ -1,81 +1,131 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("./index");
-const bson_1 = require("bson");
-const query_1 = require("./serializer/query");
-const utils_1 = require("./utils/utils");
-const type_1 = require("./utils/type");
-const validate_1 = require("./validate");
-const point_1 = require("./geo/point");
-class Aggregation {
-    constructor(db, collectionName, rawPipeline) {
+var index_1 = require("./index");
+var bson_1 = require("bson");
+var query_1 = require("./serializer/query");
+var utils_1 = require("./utils/utils");
+var type_1 = require("./utils/type");
+var validate_1 = require("./validate");
+var point_1 = require("./geo/point");
+var Aggregation = (function () {
+    function Aggregation(db, collectionName, rawPipeline) {
+        var _this = this;
         this._stages = [];
         if (db && collectionName) {
             this._db = db;
-            this._request = new index_1.Db.reqClass(this._db.config);
+            this._request = index_1.Db.createRequest(this._db.config);
             this._collectionName = collectionName;
             if (rawPipeline && rawPipeline.length > 0) {
-                rawPipeline.forEach((stage) => {
+                rawPipeline.forEach(function (stage) {
                     validate_1.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(bson_1.EJSON.parse)
+                                }];
+                        }
+                        return [2, result];
+                }
+            });
         });
-        if (result && result.data && result.data.list) {
-            return {
-                requestId: result.requestId,
-                data: result.data.list.map(bson_1.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 = '';
-        if (type_1.getType(param) === 'object') {
-            transformParam = utils_1.stringifyByEJSON(param);
+    };
+    Aggregation.prototype._pipe = function (stage, param, raw) {
+        if (raw === void 0) { raw = false; }
+        var transformParam = '';
+        if ((0, type_1.getType)(param) === 'object') {
+            transformParam = (0, utils_1.stringifyByEJSON)(param);
         }
         else {
             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 = query_1.QuerySerializer.encode(param.query);
         }
@@ -86,39 +136,40 @@ class Aggregation {
             param.near = new point_1.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', query_1.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;
+}());
 exports.default = Aggregation;

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

package/dist/commonjs/collection.js

@@ -1,72 +1,145 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const document_1 = require("./document");
-const query_1 = require("./query");
-const aggregate_1 = require("./aggregate");
-const datatype_1 = require("./serializer/datatype");
-const utils_1 = require("./utils/utils");
-const validate_1 = require("./validate");
-const type_1 = require("./utils/type");
-class CollectionReference extends query_1.Query {
-    constructor(db, coll, apiOptions, transactionId) {
-        super(db, coll, '', apiOptions, transactionId);
+exports.CollectionReference = void 0;
+var document_1 = require("./document");
+var query_1 = require("./query");
+var aggregate_1 = require("./aggregate");
+var datatype_1 = require("./serializer/datatype");
+var utils_1 = require("./utils/utils");
+var validate_1 = require("./validate");
+var type_1 = require("./utils/type");
+var CollectionReference = (function (_super) {
+    __extends(CollectionReference, _super);
+    function CollectionReference(db, coll, apiOptions, transactionId) {
+        var _this = _super.call(this, db, coll, '', apiOptions, transactionId) || this;
         if (transactionId) {
-            this._transactionId = transactionId;
+            _this._transactionId = transactionId;
         }
+        return _this;
     }
-    get name() {
-        return this._coll;
-    }
-    doc(docID) {
+    Object.defineProperty(CollectionReference.prototype, "name", {
+        get: function () {
+            return this._coll;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CollectionReference.prototype.doc = function (docID) {
         if (typeof docID !== 'string' && typeof docID !== 'number') {
             throw new Error('docId必须为字符串或数字');
         }
         return new document_1.DocumentReference(this._db, this._coll, this._apiOptions, docID, this._transactionId);
-    }
-    async add(data) {
-        let transformData = data;
-        if (!type_1.isArray(data)) {
-            transformData = [data];
-        }
-        transformData = transformData.map(item => {
-            return utils_1.stringifyByEJSON(datatype_1.serialize(item));
+    };
+    CollectionReference.prototype.add = function (data, callback) {
+        return (0, utils_1.withCallback)(this._add(data), callback);
+    };
+    CollectionReference.prototype._add = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var transformData, params, res;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        transformData = data;
+                        if (!(0, type_1.isArray)(data)) {
+                            transformData = [data];
+                        }
+                        transformData = transformData.map(function (item) {
+                            return (0, utils_1.stringifyByEJSON)((0, datatype_1.serialize)(item));
+                        });
+                        params = {
+                            collectionName: this._coll,
+                            data: transformData
+                        };
+                        if (this._transactionId) {
+                            params.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 (!(0, type_1.isArray)(data)) {
+                            if (this._transactionId) {
+                                return [2, {
+                                        inserted: 1,
+                                        ok: 1,
+                                        id: res.data.insertedIds[0],
+                                        requestId: res.requestId
+                                    }];
+                            }
+                            return [2, {
+                                    id: res.data.insertedIds[0],
+                                    requestId: res.requestId
+                                }];
+                        }
+                        return [2, {
+                                ids: res.data.insertedIds,
+                                requestId: res.requestId
+                            }];
+                }
+            });
         });
-        let params = {
-            collectionName: this._coll,
-            data: transformData
-        };
-        if (this._transactionId) {
-            params.transactionId = this._transactionId;
-        }
-        const res = await this._request.send('database.insertDocument', params, utils_1.getReqOpts(this._apiOptions));
-        if (res.code) {
-            return res;
-        }
-        if (!type_1.isArray(data)) {
-            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
-            };
-        }
-        return {
-            ids: res.data.insertedIds,
-            requestId: res.requestId
-        };
-    }
-    aggregate(rawPipeline = []) {
+    };
+    CollectionReference.prototype.aggregate = function (rawPipeline) {
+        if (rawPipeline === void 0) { rawPipeline = []; }
         return new aggregate_1.default(this._db, this._coll, (this._apiOptions.raw || false) ? rawPipeline : []);
-    }
-    options(apiOptions) {
+    };
+    CollectionReference.prototype.options = function (apiOptions) {
         validate_1.Validate.isValidOptions(apiOptions);
         return new CollectionReference(this._db, this._coll, apiOptions, this._transactionId);
-    }
-}
+    };
+    return CollectionReference;
+}(query_1.Query));
 exports.CollectionReference = CollectionReference;

package/dist/commonjs/command.d.ts

@@ -2,7 +2,7 @@ import { QueryCommand } from './commands/query';
 import { LogicCommand } from './commands/logic';
 import { UpdateCommand } from './commands/update';
 import Aggregation from './aggregate';
-export declare type IQueryCondition = Record<string, any> | LogicCommand;
+export type IQueryCondition = Record<string, any> | LogicCommand;
 export declare const Command: {
     eq(val: any): QueryCommand;
     neq(val: any): QueryCommand;
@@ -20,10 +20,10 @@ export declare const Command: {
     geoNear(val: any): QueryCommand;
     geoWithin(val: any): QueryCommand;
     geoIntersects(val: any): QueryCommand;
-    and(...__expressions__: import("./serializer/datatype").IQueryCondition[]): LogicCommand;
-    nor(...__expressions__: import("./serializer/datatype").IQueryCondition[]): LogicCommand;
-    or(...__expressions__: import("./serializer/datatype").IQueryCondition[]): LogicCommand;
-    not(...__expressions__: import("./serializer/datatype").IQueryCondition[]): LogicCommand;
+    and(...__expressions__: IQueryCondition[]): LogicCommand;
+    nor(...__expressions__: IQueryCondition[]): LogicCommand;
+    or(...__expressions__: IQueryCondition[]): LogicCommand;
+    not(...__expressions__: IQueryCondition[]): LogicCommand;
     set(val: any): UpdateCommand;
     remove(): UpdateCommand;
     inc(val: number): UpdateCommand;