@cloudbase/database 1.3.0 → 1.4.1

package/dist/esm/serializer/common.js

@@ -1,82 +1,82 @@
-import { getType, isObject, isArray, isDate, isRegExp, isInternalObject } from '../utils/type';
-import { serialize as serializeInternalDataType, deserialize as deserializeInternalDataType } from './datatype';
-function flatten(query, shouldPreserverObject, parents, visited) {
-    const cloned = Object.assign({}, query);
-    for (const key in query) {
-        if (/^\$/.test(key))
-            continue;
-        const value = query[key];
-        if (value === undefined) {
-            delete cloned[key];
-            continue;
-        }
-        if (!value)
-            continue;
-        if (isObject(value) && !shouldPreserverObject(value)) {
-            if (visited.indexOf(value) > -1) {
-                throw new Error('Cannot convert circular structure to JSON');
-            }
-            const newParents = [...parents, key];
-            const newVisited = [...visited, value];
-            const flattenedChild = flatten(value, shouldPreserverObject, newParents, newVisited);
-            cloned[key] = flattenedChild;
-            let hasKeyNotCombined = false;
-            for (const childKey in flattenedChild) {
-                if (!/^\$/.test(childKey)) {
-                    cloned[`${key}.${childKey}`] = flattenedChild[childKey];
-                    delete cloned[key][childKey];
-                }
-                else {
-                    hasKeyNotCombined = true;
-                }
-            }
-            if (!hasKeyNotCombined) {
-                delete cloned[key];
-            }
-        }
-    }
-    return cloned;
-}
-export function flattenQueryObject(query) {
-    return flatten(query, isConversionRequired, [], [query]);
-}
-export function flattenObject(object) {
-    return flatten(object, (_) => false, [], [object]);
-}
-export function mergeConditionAfterEncode(query, condition, key) {
-    if (!condition[key]) {
-        delete query[key];
-    }
-    for (const conditionKey in condition) {
-        if (query[conditionKey]) {
-            if (isArray(query[conditionKey])) {
-                query[conditionKey].push(condition[conditionKey]);
-            }
-            else if (isObject(query[conditionKey])) {
-                if (isObject(condition[conditionKey])) {
-                    Object.assign(query[conditionKey], condition[conditionKey]);
-                }
-                else {
-                    console.warn(`unmergable condition, query is object but condition is ${getType(condition)}, can only overwrite`, condition, key);
-                    query[conditionKey] = condition[conditionKey];
-                }
-            }
-            else {
-                console.warn(`to-merge query is of type ${getType(query)}, can only overwrite`, query, condition, key);
-                query[conditionKey] = condition[conditionKey];
-            }
-        }
-        else {
-            query[conditionKey] = condition[conditionKey];
-        }
-    }
-}
-export function isConversionRequired(val) {
-    return isInternalObject(val) || isDate(val) || isRegExp(val);
-}
-export function encodeInternalDataType(val) {
-    return serializeInternalDataType(val);
-}
-export function decodeInternalDataType(object) {
-    return deserializeInternalDataType(object);
-}
+import { getType, isObject, isArray, isDate, isRegExp, isInternalObject } from '../utils/type';
+import { serialize as serializeInternalDataType, deserialize as deserializeInternalDataType } from './datatype';
+function flatten(query, shouldPreserverObject, parents, visited) {
+    const cloned = Object.assign({}, query);
+    for (const key in query) {
+        if (/^\$/.test(key))
+            continue;
+        const value = query[key];
+        if (value === undefined) {
+            delete cloned[key];
+            continue;
+        }
+        if (!value)
+            continue;
+        if (isObject(value) && !shouldPreserverObject(value)) {
+            if (visited.indexOf(value) > -1) {
+                throw new Error('Cannot convert circular structure to JSON');
+            }
+            const newParents = [...parents, key];
+            const newVisited = [...visited, value];
+            const flattenedChild = flatten(value, shouldPreserverObject, newParents, newVisited);
+            cloned[key] = flattenedChild;
+            let hasKeyNotCombined = false;
+            for (const childKey in flattenedChild) {
+                if (!/^\$/.test(childKey)) {
+                    cloned[`${key}.${childKey}`] = flattenedChild[childKey];
+                    delete cloned[key][childKey];
+                }
+                else {
+                    hasKeyNotCombined = true;
+                }
+            }
+            if (!hasKeyNotCombined) {
+                delete cloned[key];
+            }
+        }
+    }
+    return cloned;
+}
+export function flattenQueryObject(query) {
+    return flatten(query, isConversionRequired, [], [query]);
+}
+export function flattenObject(object) {
+    return flatten(object, (_) => false, [], [object]);
+}
+export function mergeConditionAfterEncode(query, condition, key) {
+    if (!condition[key]) {
+        delete query[key];
+    }
+    for (const conditionKey in condition) {
+        if (query[conditionKey]) {
+            if (isArray(query[conditionKey])) {
+                query[conditionKey].push(condition[conditionKey]);
+            }
+            else if (isObject(query[conditionKey])) {
+                if (isObject(condition[conditionKey])) {
+                    Object.assign(query[conditionKey], condition[conditionKey]);
+                }
+                else {
+                    console.warn(`unmergable condition, query is object but condition is ${getType(condition)}, can only overwrite`, condition, key);
+                    query[conditionKey] = condition[conditionKey];
+                }
+            }
+            else {
+                console.warn(`to-merge query is of type ${getType(query)}, can only overwrite`, query, condition, key);
+                query[conditionKey] = condition[conditionKey];
+            }
+        }
+        else {
+            query[conditionKey] = condition[conditionKey];
+        }
+    }
+}
+export function isConversionRequired(val) {
+    return isInternalObject(val) || isDate(val) || isRegExp(val);
+}
+export function encodeInternalDataType(val) {
+    return serializeInternalDataType(val);
+}
+export function decodeInternalDataType(object) {
+    return deserializeInternalDataType(object);
+}

package/dist/esm/serializer/datatype.d.ts

@@ -1,7 +1,7 @@
-import { LogicCommand } from '../commands/logic';
-export declare type IQueryCondition = Record<string, any> | LogicCommand;
-export declare type AnyObject = {
-    [x: string]: any;
-};
-export declare function serialize(val: any): IQueryCondition;
-export declare function deserialize(object: AnyObject): any;
+import { LogicCommand } from '../commands/logic';
+export declare type IQueryCondition = Record<string, any> | LogicCommand;
+export declare type AnyObject = {
+    [x: string]: any;
+};
+export declare function serialize(val: any): IQueryCondition;
+export declare function deserialize(object: AnyObject): any;

package/dist/esm/serializer/datatype.js

@@ -1,92 +1,95 @@
-import { SYMBOL_GEO_POINT, SYMBOL_SERVER_DATE, SYMBOL_REGEXP } from '../helper/symbol';
-import { getType, isObject, isArray, isDate, isNumber, isInternalObject, isRegExp } from '../utils/type';
-import { Point } from '../geo/index';
-import { ServerDate } from '../serverDate/index';
-export function serialize(val) {
-    return serializeHelper(val, [val]);
-}
-function serializeHelper(val, visited) {
-    if (isInternalObject(val)) {
-        switch (val._internalType) {
-            case SYMBOL_GEO_POINT: {
-                return val.toJSON();
-            }
-            case SYMBOL_SERVER_DATE: {
-                return val.parse();
-            }
-            case SYMBOL_REGEXP: {
-                return val.parse();
-            }
-            default: {
-                return val.toJSON ? val.toJSON() : val;
-            }
-        }
-    }
-    else if (isDate(val)) {
-        return val;
-    }
-    else if (isRegExp(val)) {
-        return {
-            $regularExpression: {
-                pattern: val.source,
-                options: val.flags
-            }
-        };
-    }
-    else if (isArray(val)) {
-        return val.map(item => {
-            if (visited.indexOf(item) > -1) {
-                throw new Error('Cannot convert circular structure to JSON');
-            }
-            return serializeHelper(item, [...visited, item]);
-        });
-    }
-    else if (isObject(val)) {
-        const rawRet = Object.assign({}, val);
-        const finalRet = {};
-        for (const key in rawRet) {
-            if (visited.indexOf(rawRet[key]) > -1) {
-                throw new Error('Cannot convert circular structure to JSON');
-            }
-            if (rawRet[key] !== undefined) {
-                finalRet[key] = serializeHelper(rawRet[key], [...visited, rawRet[key]]);
-            }
-        }
-        return finalRet;
-    }
-    else {
-        return val;
-    }
-}
-export function deserialize(object) {
-    const ret = Object.assign({}, object);
-    for (const key in ret) {
-        switch (key) {
-            case '$date': {
-                switch (getType(ret[key])) {
-                    case 'number': {
-                        return new Date(ret[key]);
-                    }
-                    case 'object': {
-                        return new ServerDate(ret[key]);
-                    }
-                }
-                break;
-            }
-            case 'type': {
-                switch (ret.type) {
-                    case 'Point': {
-                        if (isArray(ret.coordinates) &&
-                            isNumber(ret.coordinates[0]) &&
-                            isNumber(ret.coordinates[1])) {
-                            return new Point(ret.coordinates[0], ret.coordinates[1]);
-                        }
-                        break;
-                    }
-                }
-                break;
-            }
-        }
-    }
-    return object;
-}
+import { SYMBOL_GEO_POINT, SYMBOL_SERVER_DATE, SYMBOL_OBJECTID, SYMBOL_REGEXP } from '../helper/symbol';
+import { getType, isObject, isArray, isDate, isNumber, isInternalObject, isRegExp } from '../utils/type';
+import { Point } from '../geo/index';
+import { ServerDate } from '../serverDate/index';
+export function serialize(val) {
+    return serializeHelper(val, [val]);
+}
+function serializeHelper(val, visited) {
+    if (isInternalObject(val)) {
+        switch (val._internalType) {
+            case SYMBOL_GEO_POINT: {
+                return val.toJSON();
+            }
+            case SYMBOL_SERVER_DATE: {
+                return val.parse();
+            }
+            case SYMBOL_REGEXP: {
+                return val.parse();
+            }
+            case SYMBOL_OBJECTID: {
+                return val.parse();
+            }
+            default: {
+                return val.toJSON ? val.toJSON() : val;
+            }
+        }
+    }
+    else if (isDate(val)) {
+        return val;
+    }
+    else if (isRegExp(val)) {
+        return {
+            $regularExpression: {
+                pattern: val.source,
+                options: val.flags
+            }
+        };
+    }
+    else if (isArray(val)) {
+        return val.map(item => {
+            if (visited.indexOf(item) > -1) {
+                throw new Error('Cannot convert circular structure to JSON');
+            }
+            return serializeHelper(item, [...visited, item]);
+        });
+    }
+    else if (isObject(val)) {
+        const rawRet = Object.assign({}, val);
+        const finalRet = {};
+        for (const key in rawRet) {
+            if (visited.indexOf(rawRet[key]) > -1) {
+                throw new Error('Cannot convert circular structure to JSON');
+            }
+            if (rawRet[key] !== undefined) {
+                finalRet[key] = serializeHelper(rawRet[key], [...visited, rawRet[key]]);
+            }
+        }
+        return finalRet;
+    }
+    else {
+        return val;
+    }
+}
+export function deserialize(object) {
+    const ret = Object.assign({}, object);
+    for (const key in ret) {
+        switch (key) {
+            case '$date': {
+                switch (getType(ret[key])) {
+                    case 'number': {
+                        return new Date(ret[key]);
+                    }
+                    case 'object': {
+                        return new ServerDate(ret[key]);
+                    }
+                }
+                break;
+            }
+            case 'type': {
+                switch (ret.type) {
+                    case 'Point': {
+                        if (isArray(ret.coordinates) &&
+                            isNumber(ret.coordinates[0]) &&
+                            isNumber(ret.coordinates[1])) {
+                            return new Point(ret.coordinates[0], ret.coordinates[1]);
+                        }
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return object;
+}

package/dist/esm/serializer/query.d.ts

@@ -1,8 +1,8 @@
-import { QueryCommand } from '../commands/query';
-import { LogicCommand } from '../commands/logic';
-export declare type IQueryCondition = Record<string, any> | LogicCommand;
-export declare class QuerySerializer {
-    constructor();
-    static encode(query: IQueryCondition | QueryCommand | LogicCommand): IQueryCondition;
-    static encodeEJSON(query: IQueryCondition | QueryCommand | LogicCommand, raw: boolean): string;
-}
+import { QueryCommand } from '../commands/query';
+import { LogicCommand } from '../commands/logic';
+export declare type IQueryCondition = Record<string, any> | LogicCommand;
+export declare class QuerySerializer {
+    constructor();
+    static encode(query: IQueryCondition | QueryCommand | LogicCommand): IQueryCondition;
+    static encodeEJSON(query: IQueryCondition | QueryCommand | LogicCommand, raw: boolean): string;
+}