@cloudbase/database 0.9.18-next → 0.9.19

package/dist/esm/utils/type.d.ts

@@ -1,13 +1,13 @@
-export declare const getType: (x: any) => string;
-export declare const isObject: <T extends object>(x: any) => x is T;
-export declare const isString: (x: any) => x is string;
-export declare const isNumber: (x: any) => x is number;
-export declare const isPromise: <T extends Promise<any> = Promise<any>>(x: any) => x is T;
-declare type AnyFn = (...args: any[]) => any;
-export declare const isFunction: <T extends AnyFn = AnyFn>(x: any) => x is T;
-export declare const isArray: <T extends any[] = any[]>(x: any) => x is T;
-export declare const isDate: (x: any) => x is Date;
-export declare const isRegExp: (x: any) => x is RegExp;
-export declare const isInternalObject: (x: any) => boolean;
-export declare const isPlainObject: (obj: any) => obj is object;
-export {};
+export declare const getType: (x: any) => string;
+export declare const isObject: <T extends object>(x: any) => x is T;
+export declare const isString: (x: any) => x is string;
+export declare const isNumber: (x: any) => x is number;
+export declare const isPromise: <T extends Promise<any> = Promise<any>>(x: any) => x is T;
+declare type AnyFn = (...args: any[]) => any;
+export declare const isFunction: <T extends AnyFn = AnyFn>(x: any) => x is T;
+export declare const isArray: <T extends any[] = any[]>(x: any) => x is T;
+export declare const isDate: (x: any) => x is Date;
+export declare const isRegExp: (x: any) => x is RegExp;
+export declare const isInternalObject: (x: any) => boolean;
+export declare const isPlainObject: (obj: any) => obj is object;
+export {};

package/dist/esm/utils/type.js

@@ -1,20 +1,20 @@
-import { InternalSymbol } from './symbol';
-export var getType = function (x) { return Object.prototype.toString.call(x).slice(8, -1).toLowerCase(); };
-export var isObject = function (x) { return getType(x) === 'object'; };
-export var isString = function (x) { return getType(x) === 'string'; };
-export var isNumber = function (x) { return getType(x) === 'number'; };
-export var isPromise = function (x) { return getType(x) === 'promise'; };
-export var isFunction = function (x) { return typeof x === 'function'; };
-export var isArray = function (x) { return Array.isArray(x); };
-export var isDate = function (x) { return getType(x) === 'date'; };
-export var isRegExp = function (x) { return getType(x) === 'regexp'; };
-export var isInternalObject = function (x) { return x && (x._internalType instanceof InternalSymbol); };
-export var isPlainObject = function (obj) {
-    if (typeof obj !== 'object' || obj === null)
-        return false;
-    var proto = obj;
-    while (Object.getPrototypeOf(proto) !== null) {
-        proto = Object.getPrototypeOf(proto);
-    }
-    return Object.getPrototypeOf(obj) === proto;
-};
+import { InternalSymbol } from './symbol';
+export var getType = function (x) { return Object.prototype.toString.call(x).slice(8, -1).toLowerCase(); };
+export var isObject = function (x) { return getType(x) === 'object'; };
+export var isString = function (x) { return getType(x) === 'string'; };
+export var isNumber = function (x) { return getType(x) === 'number'; };
+export var isPromise = function (x) { return getType(x) === 'promise'; };
+export var isFunction = function (x) { return typeof x === 'function'; };
+export var isArray = function (x) { return Array.isArray(x); };
+export var isDate = function (x) { return getType(x) === 'date'; };
+export var isRegExp = function (x) { return getType(x) === 'regexp'; };
+export var isInternalObject = function (x) { return x && (x._internalType instanceof InternalSymbol); };
+export var isPlainObject = function (obj) {
+    if (typeof obj !== 'object' || obj === null)
+        return false;
+    var proto = obj;
+    while (Object.getPrototypeOf(proto) !== null) {
+        proto = Object.getPrototypeOf(proto);
+    }
+    return Object.getPrototypeOf(obj) === proto;
+};

package/dist/esm/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { Db } from '../';
-export declare const sleep: (ms?: number) => Promise<unknown>;
-export declare const autoCount: (domain?: string) => number;
-export declare function getWsInstance(db: Db): any;
+import { Db } from '../';
+export declare const sleep: (ms?: number) => Promise<unknown>;
+export declare const autoCount: (domain?: string) => number;
+export declare function getWsInstance(db: Db): any;

package/dist/esm/utils/utils.js

@@ -1,33 +1,33 @@
-import { Db } from '../';
-export var sleep = function (ms) {
-    if (ms === void 0) { ms = 0; }
-    return new Promise(function (r) { return setTimeout(r, ms); });
-};
-var counters = {};
-export var autoCount = function (domain) {
-    if (domain === void 0) { domain = 'any'; }
-    if (!counters[domain]) {
-        counters[domain] = 0;
-    }
-    return counters[domain]++;
-};
-var wsList = {};
-export function getWsInstance(db) {
-    if (!Db.wsClientClass) {
-        throw new Error('to use realtime you must import realtime module first');
-    }
-    var env = db.config.env;
-    if (!wsList[env]) {
-        wsList[env] = new Db.wsClientClass({
-            context: {
-                appConfig: {
-                    docSizeLimit: 1000,
-                    realtimePingInterval: 10000,
-                    realtimePongWaitTimeout: 5000,
-                    request: new Db.reqClass(db.config)
-                }
-            }
-        });
-    }
-    return wsList[env];
-}
+import { Db } from '../';
+export var sleep = function (ms) {
+    if (ms === void 0) { ms = 0; }
+    return new Promise(function (r) { return setTimeout(r, ms); });
+};
+var counters = {};
+export var autoCount = function (domain) {
+    if (domain === void 0) { domain = 'any'; }
+    if (!counters[domain]) {
+        counters[domain] = 0;
+    }
+    return counters[domain]++;
+};
+var wsList = {};
+export function getWsInstance(db) {
+    if (!Db.wsClientClass) {
+        throw new Error('to use realtime you must import realtime module first');
+    }
+    var env = db.config.env;
+    if (!wsList[env]) {
+        wsList[env] = new Db.wsClientClass({
+            context: {
+                appConfig: {
+                    docSizeLimit: 1000,
+                    realtimePingInterval: 10000,
+                    realtimePongWaitTimeout: 5000,
+                    request: new Db.reqClass(db.config)
+                }
+            }
+        });
+    }
+    return wsList[env];
+}

package/dist/esm/validate.d.ts

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

package/dist/esm/validate.js

@@ -1,57 +1,57 @@
-import { ErrorCode, WhereFilterOpList, OrderDirectionList, FieldType } from './constant';
-import { Util } from './util';
-var Validate = (function () {
-    function Validate() {
-    }
-    Validate.isGeopoint = function (point, degree) {
-        if (Util.whichType(degree) !== FieldType.Number) {
-            throw new Error('Geo Point must be number type');
-        }
-        var degreeAbs = Math.abs(degree);
-        if (point === 'latitude' && degreeAbs > 90) {
-            throw new Error('latitude should be a number ranges from -90 to 90');
-        }
-        else if (point === 'longitude' && degreeAbs > 180) {
-            throw new Error('longitude should be a number ranges from -180 to 180');
-        }
-        return true;
-    };
-    Validate.isInteger = function (param, num) {
-        if (!Number.isInteger(num)) {
-            throw new Error(param + ErrorCode.IntergerError);
-        }
-        return true;
-    };
-    Validate.isFieldOrder = function (direction) {
-        if (OrderDirectionList.indexOf(direction) === -1) {
-            throw new Error(ErrorCode.DirectionError);
-        }
-        return true;
-    };
-    Validate.isFieldPath = function (path) {
-        if (!/^[a-zA-Z0-9-_\.]/.test(path)) {
-            throw new Error();
-        }
-        return true;
-    };
-    Validate.isOperator = function (op) {
-        if (WhereFilterOpList.indexOf(op) === -1) {
-            throw new Error(ErrorCode.OpStrError);
-        }
-        return true;
-    };
-    Validate.isCollName = function (name) {
-        if (!/^[a-zA-Z0-9]([a-zA-Z0-9-_]){1,32}$/.test(name)) {
-            throw new Error(ErrorCode.CollNameError);
-        }
-        return true;
-    };
-    Validate.isDocID = function (docId) {
-        if (!/^([a-fA-F0-9]){24}$/.test(docId)) {
-            throw new Error(ErrorCode.DocIDError);
-        }
-        return true;
-    };
-    return Validate;
-}());
-export { Validate };
+import { ErrorCode, WhereFilterOpList, OrderDirectionList, FieldType } from './constant';
+import { Util } from './util';
+var Validate = (function () {
+    function Validate() {
+    }
+    Validate.isGeopoint = function (point, degree) {
+        if (Util.whichType(degree) !== FieldType.Number) {
+            throw new Error('Geo Point must be number type');
+        }
+        var degreeAbs = Math.abs(degree);
+        if (point === 'latitude' && degreeAbs > 90) {
+            throw new Error('latitude should be a number ranges from -90 to 90');
+        }
+        else if (point === 'longitude' && degreeAbs > 180) {
+            throw new Error('longitude should be a number ranges from -180 to 180');
+        }
+        return true;
+    };
+    Validate.isInteger = function (param, num) {
+        if (!Number.isInteger(num)) {
+            throw new Error(param + ErrorCode.IntergerError);
+        }
+        return true;
+    };
+    Validate.isFieldOrder = function (direction) {
+        if (OrderDirectionList.indexOf(direction) === -1) {
+            throw new Error(ErrorCode.DirectionError);
+        }
+        return true;
+    };
+    Validate.isFieldPath = function (path) {
+        if (!/^[a-zA-Z0-9-_\.]/.test(path)) {
+            throw new Error();
+        }
+        return true;
+    };
+    Validate.isOperator = function (op) {
+        if (WhereFilterOpList.indexOf(op) === -1) {
+            throw new Error(ErrorCode.OpStrError);
+        }
+        return true;
+    };
+    Validate.isCollName = function (name) {
+        if (!/^[a-zA-Z0-9]([a-zA-Z0-9-_]){1,32}$/.test(name)) {
+            throw new Error(ErrorCode.CollNameError);
+        }
+        return true;
+    };
+    Validate.isDocID = function (docId) {
+        if (!/^([a-fA-F0-9]){24}$/.test(docId)) {
+            throw new Error(ErrorCode.DocIDError);
+        }
+        return true;
+    };
+    return Validate;
+}());
+export { Validate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/database",
-  "version": "0.9.18-next",
+  "version": "0.9.19",
   "description": "database for (node.)js sdk ",
   "main": "dist/commonjs/index.js",
   "module": "dist/esm/index.js",

package/src/aggregate.ts

@@ -1,6 +1,7 @@
 import { Db } from './index'
 import { EJSON } from 'bson'
 import { QuerySerializer } from './serializer/query'
+import { Point } from './geo'
 export default class Aggregation {
   _db: any
   _request: any
@@ -70,6 +71,16 @@ export default class Aggregation {
   }
 
   geoNear(param) {
+    if (param.query) {
+      param.query = QuerySerializer.encode(param.query)
+    }
+    if (param.distanceMultiplier && typeof (param.distanceMultiplier) === 'number') {
+      param.distanceMultiplier = param.distanceMultiplier
+    }
+    
+    if(param.near) {
+      param.near = new Point(param.near.longitude, param.near.latitude).toJSON()
+    }
     return this._pipe('geoNear', param)
   }