@allgemein/mango-expressions 1.1.1 → 1.3.1

package/ast/PAst.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/PAst.ts"],"names":[],"mappings":";;;AAEA,uCAAkC;AAElC,MAAsB,IAAI;IAWxB,YAAY,CAAkB,EAAE,CAAO,EAAE,IAAc;QAH9C,YAAO,GAAY,IAAI,iBAAO,EAAE,CAAC;QAIxC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;IACH,CAAC;IAGD,IAAI;QACF,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAGD;;;;;OAKG;IACH,YAAY,CAAC,EAAwB,EAAE,OAAgB,IAAI;QACzD,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAGD;;;;;OAKG;IACH,WAAW,CAAC,IAAY,EAAE,YAAqB,IAAI;QACjD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC5C;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAOF;AAjED,oBAiEC","file":"PAst.js","sourcesContent":["import {MangoExpression} from '../MangoExpression';\nimport {IMangoWalker} from '../IMangoWalker';\nimport {Context} from './Context';\n\nexport abstract class PAst {\n\n  readonly base: MangoExpression;\n\n  readonly parent: PAst;\n\n  readonly key: string | number;\n\n  readonly context: Context = new Context();\n\n\n  constructor(e: MangoExpression, p: PAst, ctxt?: Context) {\n    this.base = e;\n    this.parent = p;\n    if (ctxt) {\n      this.key = ctxt.key;\n      this.context.merge(ctxt);\n    }\n  }\n\n\n  keys() {\n    const keys = [this.key];\n    return keys;\n  }\n\n\n  /**\n   * function execute on self and parents\n   *\n   * @param fn\n   * @param self\n   */\n  backwardCall(fn: (x: PAst) => boolean, self: boolean = true): any {\n    if (self && fn(this)) {\n      return true;\n    }\n    if (this.parent) {\n      return this.parent.backwardCall(fn, true);\n    }\n    return null;\n  }\n\n\n  /**\n   * check if the self or nodes branch is in some sublying context\n   *\n   * @param ctxt\n   * @param selfCheck\n   */\n  isInContext(ctxt: string, selfCheck: boolean = true): boolean {\n    if (this.context.has(ctxt) && selfCheck) {\n      return true;\n    }\n    if (this.parent) {\n      return this.parent.isInContext(ctxt, true);\n    }\n    return false;\n  }\n\n  abstract getKey(key: string): PAst;\n\n\n  abstract visit(o: IMangoWalker): any;\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"PAst.js","sourceRoot":"","sources":["../../../src/ast/PAst.ts"],"names":[],"mappings":"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"}

package/ast/PObject.d.ts

@@ -1,16 +1,17 @@
 import { PAst } from './PAst';
-import { MangoExpression } from '../MangoExpression';
 import { IMangoWalker } from '../IMangoWalker';
 import { Context } from './Context';
-export declare class PObject extends PAst {
-    children: {
-        [k: string]: PAst;
-    };
+import { MangoExpression } from '../MangoExpression';
+export declare class PObject extends PAst<{
+    [k: string]: PAst<any>;
+}> {
     _keys: string[];
-    constructor(e: MangoExpression, kv: any, p?: PAst, ctxt?: Context);
-    getKey(key: string): PAst;
+    getByKey(key: string): PAst<any>;
     keys(): string[];
     visit(o: IMangoWalker): any;
-    getValues(): PAst[];
-    interprete(kv: any): void;
+    getValues(): PAst<any>[];
+    interprete(e: MangoExpression, value: {
+        [k: string]: any;
+    }, p?: PAst<any>, ctxt?: Context): void;
+    toJson(): any;
 }

package/ast/PObject.js

@@ -1,32 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PObject = void 0;
-const _ = require("lodash");
+const lodash_1 = require("lodash");
 const PAst_1 = require("./PAst");
 const ValueRef_1 = require("./ValueRef");
 const Unset_1 = require("./Unset");
-const Equal_1 = require("../operators/compare/Equal");
 const Context_1 = require("./Context");
 const Constants_1 = require("../Constants");
 class PObject extends PAst_1.PAst {
-    constructor(e, kv, p, ctxt) {
-        super(e, p, ctxt);
-        this.children = {};
-        this.interprete(kv);
-    }
-    getKey(key) {
-        if (this.children[key]) {
-            return this.children[key];
+    // constructor(e: MangoExpression, kv: any, p?: PAst, ctxt?: Context) {
+    //   super(e, p, ctxt);
+    //   this.interprete(kv);
+    // }
+    // create(){
+    //
+    // }
+    getByKey(key) {
+        if (this.getValue()[key]) {
+            return this.getValue()[key];
         }
         return null;
         // throw new NotYetImplementedError();
     }
     keys() {
-        const prefix = (this.key && _.isString(this.key) ? this.key + '.' : '');
+        const prefix = (this.getKeyString() && (0, lodash_1.isString)(this.getKeyString()) ? this.getKeyString() + '.' : '');
         const keys = [];
         for (const k of this._keys) {
-            const subkey = this.children[k].keys();
-            subkey.forEach(x => {
+            // @ts-ignore
+            const subkey = this.getValues()[k].keys();
+            subkey.forEach((x) => {
                 keys.push(prefix + x);
             });
         }
@@ -34,51 +36,74 @@ class PObject extends PAst_1.PAst {
     }
     visit(o) {
         const state = {};
-        const r = o.visitObject(this, state);
+        let r = {};
+        if (o.visitObject) {
+            r = o.visitObject(this, state);
+        }
         if (state && state.abort) {
             return r;
         }
         for (const k of this._keys) {
-            r[k] = this.children[k].visit(o);
+            r[k] = this.value[k].visit(o);
+        }
+        if (o.leaveObject) {
+            return o.leaveObject(r, this);
         }
-        return o.leaveObject(r, this);
+        return r;
     }
     getValues() {
-        return _.values(this.children);
+        return (0, lodash_1.values)(this.value);
     }
-    interprete(kv) {
-        this._keys = _.keys(kv);
-        const autoEqualSupport = !!this.context.get(Constants_1.AUTO_EQUAL_CONV_SUPPORT);
-        const numberProjectSupport = !!this.context.get(Constants_1.NUMBER_PROJECT_SUPPORT);
+    interprete(e, value, p, ctxt) {
+        // do not pass and interprete value
+        this.enviroment(e, p, ctxt);
+        this.value = {};
+        this._keys = (0, lodash_1.keys)(value);
+        const autoEqualSupport = !!this.getContext().get(Constants_1.AUTO_EQUAL_CONV_SUPPORT);
+        const numberProjectSupport = !!this.getContext().get(Constants_1.NUMBER_PROJECT_SUPPORT);
         for (const k of this._keys) {
             const ctxt = new Context_1.Context(k);
-            const v = kv[k];
+            const v = value[k];
             if (!autoEqualSupport) {
-                if (numberProjectSupport && _.isNumber(v) && (v === 1 || v === 0)) {
+                if (numberProjectSupport && (0, lodash_1.isNumber)(v) && (v === 1 || v === 0)) {
                     if (v === 1) {
-                        this.children[k] = new ValueRef_1.ValueRef(this.base, k, this, ctxt);
+                        this.value[k] = this.getRootExpression().create(ValueRef_1.ValueRef, k, this, ctxt);
                     }
                     else {
-                        this.children[k] = new Unset_1.Unset(this.base, k, this, ctxt);
+                        this.value[k] = this.getRootExpression().create(Unset_1.Unset, k, this, ctxt);
                     }
                 }
                 else {
-                    this.children[k] = this.base.interprete(v, this, ctxt);
+                    this.value[k] = this.getRootExpression().interprete(v, this, ctxt);
                 }
             }
             else {
-                if (_.isObjectLike(v) || _.isArray(v)) {
-                    this.children[k] = this.base.interprete(v, this, ctxt);
+                const isPrimative = (0, lodash_1.isDate)(v) || (0, lodash_1.isNumber)(v) || (0, lodash_1.isString)(v) || (0, lodash_1.isBoolean)() || (0, lodash_1.isNull)(v);
+                if (!isPrimative && ((0, lodash_1.isObjectLike)(v) || (0, lodash_1.isArray)(v))) {
+                    this.value[k] = this.getRootExpression().interprete(v, this, ctxt);
                 }
                 else {
-                    const eq = new Equal_1.Equal(this.base, this, ctxt);
-                    this.children[k] = eq;
-                    eq.validate(v);
+                    const eq = this.getRootExpression().getOperator('$eq', v, value, this, ctxt);
+                    this.value[k] = eq;
+                    // eq.validate(v);
                 }
             }
         }
     }
+    toJson() {
+        let obj = {};
+        for (const k of this._keys) {
+            if (this.value[k] instanceof PAst_1.PAst) {
+                // @ts-ignore
+                obj[k] = this.value[k].toJson();
+            }
+            else {
+                // @ts-ignore
+                obj[k] = this.value[k];
+            }
+        }
+        return obj;
+    }
 }
 exports.PObject = PObject;
-
-//# sourceMappingURL=PObject.js.map
+//# sourceMappingURL=PObject.js.map

package/ast/PObject.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/PObject.ts"],"names":[],"mappings":"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","file":"PObject.js","sourcesContent":["import * as _ from 'lodash';\nimport {PAst} from './PAst';\nimport {ValueRef} from './ValueRef';\nimport {Unset} from './Unset';\nimport {MangoExpression} from '../MangoExpression';\nimport {IMangoWalker, IMangoWalkerControl} from '../IMangoWalker';\nimport {Equal} from '../operators/compare/Equal';\nimport {Context} from './Context';\nimport {AUTO_EQUAL_CONV_SUPPORT, NUMBER_PROJECT_SUPPORT} from '../Constants';\n\nexport class PObject extends PAst {\n\n  children: { [k: string]: PAst } = {};\n\n  _keys: string[];\n\n\n  constructor(e: MangoExpression, kv: any, p?: PAst, ctxt?: Context) {\n    super(e, p, ctxt);\n    this.interprete(kv);\n  }\n\n  getKey(key: string): PAst {\n    if (this.children[key]) {\n      return this.children[key];\n    }\n    return null;\n    // throw new NotYetImplementedError();\n  }\n\n  keys() {\n    const prefix = (this.key && _.isString(this.key) ? this.key + '.' : '');\n    const keys: string[] = [];\n    for (const k of this._keys) {\n      const subkey = this.children[k].keys();\n      subkey.forEach(x => {\n        keys.push(prefix + x);\n      });\n    }\n    return keys;\n  }\n\n\n  visit(o: IMangoWalker): any {\n    const state: IMangoWalkerControl = {};\n    const r = o.visitObject(this, state);\n    if (state && state.abort) {\n      return r;\n    }\n\n    for (const k of this._keys) {\n      r[k] = this.children[k].visit(o);\n    }\n    return o.leaveObject(r, this);\n  }\n\n\n  getValues() {\n    return _.values(this.children);\n  }\n\n\n  interprete(kv: any) {\n    this._keys = _.keys(kv);\n\n    const autoEqualSupport = !!this.context.get(AUTO_EQUAL_CONV_SUPPORT);\n    const numberProjectSupport = !!this.context.get(NUMBER_PROJECT_SUPPORT);\n\n    for (const k of this._keys) {\n      const ctxt = new Context(k);\n      const v = kv[k];\n      if (!autoEqualSupport) {\n        if (numberProjectSupport && _.isNumber(v) && (v === 1 || v === 0)) {\n          if (v === 1) {\n            this.children[k] = new ValueRef(this.base, k, this, ctxt);\n          } else {\n            this.children[k] = new Unset(this.base, k, this, ctxt);\n          }\n        } else {\n          this.children[k] = this.base.interprete(v, this, ctxt);\n        }\n      } else {\n        if (_.isObjectLike(v) || _.isArray(v)) {\n          this.children[k] = this.base.interprete(v, this, ctxt);\n        } else {\n          const eq = new Equal(this.base, this, ctxt);\n          this.children[k] = eq;\n          eq.validate(v);\n        }\n      }\n    }\n  }\n\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"PObject.js","sourceRoot":"","sources":["../../../src/ast/PObject.ts"],"names":[],"mappings":"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"}

package/ast/PValue.d.ts

@@ -2,9 +2,9 @@ import { PAst } from './PAst';
 import { MangoExpression } from '../MangoExpression';
 import { IMangoWalker } from '../IMangoWalker';
 import { Context } from './Context';
-export declare abstract class PValue extends PAst {
-    value: any;
-    constructor(e: MangoExpression, value: any, p?: PAst, ctxt?: Context);
-    getKey(key: string): PAst;
+export declare abstract class PValue extends PAst<any> {
+    interprete(e: MangoExpression, value: any, p?: PAst<any>, ctxt?: Context): void;
+    getByKey(key: string): PAst<any>;
     visit(o: IMangoWalker): any;
+    toJson(): any;
 }

package/ast/PValue.js

@@ -4,17 +4,19 @@ exports.PValue = void 0;
 const PAst_1 = require("./PAst");
 const browser_1 = require("@allgemein/base/browser");
 class PValue extends PAst_1.PAst {
-    constructor(e, value, p, ctxt) {
-        super(e, p, ctxt);
+    interprete(e, value, p, ctxt) {
+        this.enviroment(e, p, ctxt);
         this.value = value;
     }
-    getKey(key) {
+    getByKey(key) {
         throw new browser_1.NotYetImplementedError();
     }
     visit(o) {
         return o.onValue(this);
     }
+    toJson() {
+        return this.value;
+    }
 }
 exports.PValue = PValue;
-
-//# sourceMappingURL=PValue.js.map
+//# sourceMappingURL=PValue.js.map

package/ast/PValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/PValue.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B,qDAA+D;AAG/D,MAAsB,MAAO,SAAQ,WAAI;IAIvC,YAAY,CAAkB,EAAE,KAAU,EAAE,CAAQ,EAAE,IAAc;QAClE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,IAAI,gCAAsB,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,CAAe;QACnB,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;CACF;AAhBD,wBAgBC","file":"PValue.js","sourcesContent":["import {PAst} from './PAst';\nimport {MangoExpression} from '../MangoExpression';\nimport {IMangoWalker} from '../IMangoWalker';\nimport {NotYetImplementedError} from '@allgemein/base/browser';\nimport {Context} from './Context';\n\nexport abstract class PValue extends PAst {\n\n  value: any;\n\n  constructor(e: MangoExpression, value: any, p?: PAst, ctxt?: Context) {\n    super(e, p, ctxt);\n    this.value = value;\n  }\n\n  getKey(key: string): PAst {\n    throw new NotYetImplementedError();\n  }\n\n  visit(o: IMangoWalker): any {\n    return o.onValue(this);\n  }\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"PValue.js","sourceRoot":"","sources":["../../../src/ast/PValue.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B,qDAA+D;AAG/D,MAAsB,MAAO,SAAQ,WAAS;IAE5C,UAAU,CAAC,CAAkB,EAAE,KAAU,EAAE,CAAa,EAAE,IAAc;QACtE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,MAAM,IAAI,gCAAsB,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,CAAe;QACnB,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAlBD,wBAkBC"}

package/ast/Selector.d.ts

@@ -0,0 +1,6 @@
+import { PAst } from './PAst';
+import { IMangoWalker } from '../IMangoWalker';
+export declare class Selector extends PAst<string> {
+    getByKey(key: string): PAst<any>;
+    visit(o: IMangoWalker): any;
+}

package/ast/Selector.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Selector = void 0;
+const PAst_1 = require("./PAst");
+class Selector extends PAst_1.PAst {
+    getByKey(key) {
+        return undefined;
+    }
+    visit(o) {
+    }
+}
+exports.Selector = Selector;
+//# sourceMappingURL=Selector.js.map

package/ast/Selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Selector.js","sourceRoot":"","sources":["../../../src/ast/Selector.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B,MAAa,QAAS,SAAQ,WAAY;IAExC,QAAQ,CAAC,GAAW;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,CAAe;IACrB,CAAC;CAGF;AAVD,4BAUC"}

package/ast/Unset.js

@@ -5,5 +5,4 @@ const PValue_1 = require("./PValue");
 class Unset extends PValue_1.PValue {
 }
 exports.Unset = Unset;
-
-//# sourceMappingURL=Unset.js.map
+//# sourceMappingURL=Unset.js.map

package/ast/Unset.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/Unset.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,KAAM,SAAQ,eAAM;CAEhC;AAFD,sBAEC","file":"Unset.js","sourcesContent":["import {PValue} from './PValue';\n\nexport class Unset extends PValue {\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"Unset.js","sourceRoot":"","sources":["../../../src/ast/Unset.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,KAAM,SAAQ,eAAM;CAEhC;AAFD,sBAEC"}

package/ast/Value.js

@@ -5,5 +5,4 @@ const PValue_1 = require("./PValue");
 class Value extends PValue_1.PValue {
 }
 exports.Value = Value;
-
-//# sourceMappingURL=Value.js.map
+//# sourceMappingURL=Value.js.map

package/ast/Value.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/Value.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,KAAM,SAAQ,eAAM;CAEhC;AAFD,sBAEC","file":"Value.js","sourcesContent":["import {PValue} from './PValue';\n\nexport class Value extends PValue {\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"Value.js","sourceRoot":"","sources":["../../../src/ast/Value.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,KAAM,SAAQ,eAAM;CAEhC;AAFD,sBAEC"}

package/ast/ValueRef.d.ts

@@ -1,3 +1,4 @@
 import { PValue } from './PValue';
 export declare class ValueRef extends PValue {
+    toJson(): any;
 }

package/ast/ValueRef.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueRef = void 0;
 const PValue_1 = require("./PValue");
 class ValueRef extends PValue_1.PValue {
+    toJson() {
+        return '$' + this.value;
+    }
 }
 exports.ValueRef = ValueRef;
-
-//# sourceMappingURL=ValueRef.js.map
+//# sourceMappingURL=ValueRef.js.map

package/ast/ValueRef.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/ast/ValueRef.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,QAAS,SAAQ,eAAM;CAEnC;AAFD,4BAEC","file":"ValueRef.js","sourcesContent":["import {PValue} from './PValue';\n\nexport class ValueRef extends PValue {\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"ValueRef.js","sourceRoot":"","sources":["../../../src/ast/ValueRef.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAEhC,MAAa,QAAS,SAAQ,eAAM;IAClC,MAAM;QACJ,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;IAC1B,CAAC;CAEF;AALD,4BAKC"}

package/browser.d.ts

@@ -8,7 +8,7 @@ export { Unset } from './ast/Unset';
 export { Value } from './ast/Value';
 export { ValueRef } from './ast/ValueRef';
 export { AUTO_EQUAL_CONV_SUPPORT, NUMBER_PROJECT_SUPPORT } from './Constants';
-export { IMangoWalker } from './IMangoWalker';
+export { IMangoWalker, IMangoWalkerControl } from './IMangoWalker';
 export { MangoExpression } from './MangoExpression';
 export { AbstractOperator } from './operators/AbstractOperator';
 export { Avg } from './operators/arithmetic/Avg';
@@ -21,7 +21,7 @@ export { First } from './operators/array/First';
 export { Last } from './operators/array/Last';
 export { Map } from './operators/array/Map';
 export { AbstractCompare } from './operators/compare/AbstractCompare';
-export { Equal } from './operators/compare/Equal';
+export { EqualDesc } from './operators/compare/EqualDesc';
 export { GreaterThen } from './operators/compare/GreaterThen';
 export { GreaterThenEqual } from './operators/compare/GreaterThenEqual';
 export { In } from './operators/compare/In';
@@ -38,11 +38,11 @@ export { DateToString } from './operators/date/DateToString';
 export { Day } from './operators/date/Day';
 export { Month } from './operators/date/Month';
 export { Year } from './operators/date/Year';
-export { And } from './operators/logic/And';
+export { AndDesc, And } from './operators/logic/AndDesc';
 export { Not } from './operators/logic/Not';
-export { Or } from './operators/logic/Or';
+export { OrDesc, Or } from './operators/logic/OrDesc';
 export { Operators } from './operators/Operators';
-export { Group } from './operators/stage/Group';
+export { Group, GROUP_ID } from './operators/stage/Group';
 export { Limit } from './operators/stage/Limit';
 export { Match } from './operators/stage/Match';
 export { Project } from './operators/stage/Project';

package/browser.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sort = exports.Skip = exports.Project = exports.Match = exports.Limit = exports.Group = exports.Operators = exports.Or = exports.Not = exports.And = exports.Year = exports.Month = exports.Day = exports.DateToString = exports.Date = exports.Regex = exports.NotIn = exports.NotEqual = exports.Like = exports.LessThenEqual = exports.LessThen = exports.IsNull = exports.IsNotNull = exports.In = exports.GreaterThenEqual = exports.GreaterThen = exports.Equal = exports.AbstractCompare = exports.Map = exports.Last = exports.First = exports.Sum = exports.Multiply = exports.Min = exports.Max = exports.Count = exports.Avg = exports.AbstractOperator = exports.MangoExpression = exports.NUMBER_PROJECT_SUPPORT = exports.AUTO_EQUAL_CONV_SUPPORT = exports.ValueRef = exports.Value = exports.Unset = exports.PValue = exports.PObject = exports.PAst = exports.PArray = exports.MultiArgs = exports.Context = void 0;
-exports.ToUpper = exports.ToLower = exports.ToInt = exports.ToFloat = exports.Substr = void 0;
+exports.Match = exports.Limit = exports.GROUP_ID = exports.Group = exports.Operators = exports.Or = exports.OrDesc = exports.Not = exports.And = exports.AndDesc = exports.Year = exports.Month = exports.Day = exports.DateToString = exports.Date = exports.Regex = exports.NotIn = exports.NotEqual = exports.Like = exports.LessThenEqual = exports.LessThen = exports.IsNull = exports.IsNotNull = exports.In = exports.GreaterThenEqual = exports.GreaterThen = exports.EqualDesc = exports.AbstractCompare = exports.Map = exports.Last = exports.First = exports.Sum = exports.Multiply = exports.Min = exports.Max = exports.Count = exports.Avg = exports.AbstractOperator = exports.MangoExpression = exports.NUMBER_PROJECT_SUPPORT = exports.AUTO_EQUAL_CONV_SUPPORT = exports.ValueRef = exports.Value = exports.Unset = exports.PValue = exports.PObject = exports.PAst = exports.PArray = exports.MultiArgs = exports.Context = void 0;
+exports.ToUpper = exports.ToLower = exports.ToInt = exports.ToFloat = exports.Substr = exports.Sort = exports.Skip = exports.Project = void 0;
 var Context_1 = require("./ast/Context");
 Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return Context_1.Context; } });
 var MultiArgs_1 = require("./ast/MultiArgs");
@@ -47,8 +47,8 @@ var Map_1 = require("./operators/array/Map");
 Object.defineProperty(exports, "Map", { enumerable: true, get: function () { return Map_1.Map; } });
 var AbstractCompare_1 = require("./operators/compare/AbstractCompare");
 Object.defineProperty(exports, "AbstractCompare", { enumerable: true, get: function () { return AbstractCompare_1.AbstractCompare; } });
-var Equal_1 = require("./operators/compare/Equal");
-Object.defineProperty(exports, "Equal", { enumerable: true, get: function () { return Equal_1.Equal; } });
+var EqualDesc_1 = require("./operators/compare/EqualDesc");
+Object.defineProperty(exports, "EqualDesc", { enumerable: true, get: function () { return EqualDesc_1.EqualDesc; } });
 var GreaterThen_1 = require("./operators/compare/GreaterThen");
 Object.defineProperty(exports, "GreaterThen", { enumerable: true, get: function () { return GreaterThen_1.GreaterThen; } });
 var GreaterThenEqual_1 = require("./operators/compare/GreaterThenEqual");
@@ -81,16 +81,19 @@ var Month_1 = require("./operators/date/Month");
 Object.defineProperty(exports, "Month", { enumerable: true, get: function () { return Month_1.Month; } });
 var Year_1 = require("./operators/date/Year");
 Object.defineProperty(exports, "Year", { enumerable: true, get: function () { return Year_1.Year; } });
-var And_1 = require("./operators/logic/And");
-Object.defineProperty(exports, "And", { enumerable: true, get: function () { return And_1.And; } });
+var AndDesc_1 = require("./operators/logic/AndDesc");
+Object.defineProperty(exports, "AndDesc", { enumerable: true, get: function () { return AndDesc_1.AndDesc; } });
+Object.defineProperty(exports, "And", { enumerable: true, get: function () { return AndDesc_1.And; } });
 var Not_1 = require("./operators/logic/Not");
 Object.defineProperty(exports, "Not", { enumerable: true, get: function () { return Not_1.Not; } });
-var Or_1 = require("./operators/logic/Or");
-Object.defineProperty(exports, "Or", { enumerable: true, get: function () { return Or_1.Or; } });
+var OrDesc_1 = require("./operators/logic/OrDesc");
+Object.defineProperty(exports, "OrDesc", { enumerable: true, get: function () { return OrDesc_1.OrDesc; } });
+Object.defineProperty(exports, "Or", { enumerable: true, get: function () { return OrDesc_1.Or; } });
 var Operators_1 = require("./operators/Operators");
 Object.defineProperty(exports, "Operators", { enumerable: true, get: function () { return Operators_1.Operators; } });
 var Group_1 = require("./operators/stage/Group");
 Object.defineProperty(exports, "Group", { enumerable: true, get: function () { return Group_1.Group; } });
+Object.defineProperty(exports, "GROUP_ID", { enumerable: true, get: function () { return Group_1.GROUP_ID; } });
 var Limit_1 = require("./operators/stage/Limit");
 Object.defineProperty(exports, "Limit", { enumerable: true, get: function () { return Limit_1.Limit; } });
 var Match_1 = require("./operators/stage/Match");
@@ -111,5 +114,4 @@ var ToLower_1 = require("./operators/string/ToLower");
 Object.defineProperty(exports, "ToLower", { enumerable: true, get: function () { return ToLower_1.ToLower; } });
 var ToUpper_1 = require("./operators/string/ToUpper");
 Object.defineProperty(exports, "ToUpper", { enumerable: true, get: function () { return ToUpper_1.ToUpper; } });
-
-//# sourceMappingURL=browser.js.map
+//# sourceMappingURL=browser.js.map

package/browser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/browser.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AAA9B,kGAAA,OAAO,OAAA;AACf,6CAA0C;AAAlC,sGAAA,SAAS,OAAA;AACjB,uCAAoC;AAA5B,gGAAA,MAAM,OAAA;AACd,mCAAgC;AAAxB,4FAAA,IAAI,OAAA;AACZ,yCAAsC;AAA9B,kGAAA,OAAO,OAAA;AACf,uCAAoC;AAA5B,gGAAA,MAAM,OAAA;AACd,qCAAkC;AAA1B,8FAAA,KAAK,OAAA;AACb,qCAAkC;AAA1B,8FAAA,KAAK,OAAA;AACb,2CAAwC;AAAhC,oGAAA,QAAQ,OAAA;AAChB,yCAA4E;AAApE,oHAAA,uBAAuB,OAAA;AAAE,mHAAA,sBAAsB,OAAA;AAEvD,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,iEAA8D;AAAtD,oHAAA,gBAAgB,OAAA;AACxB,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,sDAAmD;AAA3C,8FAAA,KAAK,OAAA;AACb,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,4DAAyD;AAAjD,oGAAA,QAAQ,OAAA;AAChB,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,6CAA0C;AAAlC,0FAAA,GAAG,OAAA;AACX,uEAAoE;AAA5D,kHAAA,eAAe,OAAA;AACvB,mDAAgD;AAAxC,8FAAA,KAAK,OAAA;AACb,+DAA4D;AAApD,0GAAA,WAAW,OAAA;AACnB,yEAAsE;AAA9D,oHAAA,gBAAgB,OAAA;AACxB,6CAA0C;AAAlC,wFAAA,EAAE,OAAA;AACV,2DAAwD;AAAhD,sGAAA,SAAS,OAAA;AACjB,qDAAkD;AAA1C,gGAAA,MAAM,OAAA;AACd,yDAAsD;AAA9C,oGAAA,QAAQ,OAAA;AAChB,mEAAgE;AAAxD,8GAAA,aAAa,OAAA;AACrB,iDAA8C;AAAtC,4FAAA,IAAI,OAAA;AACZ,yDAAsD;AAA9C,oGAAA,QAAQ,OAAA;AAChB,mDAAgD;AAAxC,8FAAA,KAAK,OAAA;AACb,mDAAgD;AAAxC,8FAAA,KAAK,OAAA;AACb,8CAA2C;AAAnC,4FAAA,IAAI,OAAA;AACZ,8DAA2D;AAAnD,4GAAA,YAAY,OAAA;AACpB,4CAAyC;AAAjC,0FAAA,GAAG,OAAA;AACX,gDAA6C;AAArC,8FAAA,KAAK,OAAA;AACb,8CAA2C;AAAnC,4FAAA,IAAI,OAAA;AACZ,6CAA0C;AAAlC,0FAAA,GAAG,OAAA;AACX,6CAA0C;AAAlC,0FAAA,GAAG,OAAA;AACX,2CAAwC;AAAhC,wFAAA,EAAE,OAAA;AACV,mDAAgD;AAAxC,sGAAA,SAAS,OAAA;AACjB,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,qDAAkD;AAA1C,kGAAA,OAAO,OAAA;AACf,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,oDAAiD;AAAzC,gGAAA,MAAM,OAAA;AACd,sDAAmD;AAA3C,kGAAA,OAAO,OAAA;AACf,kDAA+C;AAAvC,8FAAA,KAAK,OAAA;AACb,sDAAmD;AAA3C,kGAAA,OAAO,OAAA;AACf,sDAAmD;AAA3C,kGAAA,OAAO,OAAA","file":"browser.js","sourcesContent":["export {Context} from './ast/Context';\nexport {MultiArgs} from './ast/MultiArgs';\nexport {PArray} from './ast/PArray';\nexport {PAst} from './ast/PAst';\nexport {PObject} from './ast/PObject';\nexport {PValue} from './ast/PValue';\nexport {Unset} from './ast/Unset';\nexport {Value} from './ast/Value';\nexport {ValueRef} from './ast/ValueRef';\nexport {AUTO_EQUAL_CONV_SUPPORT, NUMBER_PROJECT_SUPPORT} from './Constants';\nexport {IMangoWalker} from './IMangoWalker';\nexport {MangoExpression} from './MangoExpression';\nexport {AbstractOperator} from './operators/AbstractOperator';\nexport {Avg} from './operators/arithmetic/Avg';\nexport {Count} from './operators/arithmetic/Count';\nexport {Max} from './operators/arithmetic/Max';\nexport {Min} from './operators/arithmetic/Min';\nexport {Multiply} from './operators/arithmetic/Multiply';\nexport {Sum} from './operators/arithmetic/Sum';\nexport {First} from './operators/array/First';\nexport {Last} from './operators/array/Last';\nexport {Map} from './operators/array/Map';\nexport {AbstractCompare} from './operators/compare/AbstractCompare';\nexport {Equal} from './operators/compare/Equal';\nexport {GreaterThen} from './operators/compare/GreaterThen';\nexport {GreaterThenEqual} from './operators/compare/GreaterThenEqual';\nexport {In} from './operators/compare/In';\nexport {IsNotNull} from './operators/compare/IsNotNull';\nexport {IsNull} from './operators/compare/IsNull';\nexport {LessThen} from './operators/compare/LessThen';\nexport {LessThenEqual} from './operators/compare/LessThenEqual';\nexport {Like} from './operators/compare/Like';\nexport {NotEqual} from './operators/compare/NotEqual';\nexport {NotIn} from './operators/compare/NotIn';\nexport {Regex} from './operators/compare/Regex';\nexport {Date} from './operators/date/Date';\nexport {DateToString} from './operators/date/DateToString';\nexport {Day} from './operators/date/Day';\nexport {Month} from './operators/date/Month';\nexport {Year} from './operators/date/Year';\nexport {And} from './operators/logic/And';\nexport {Not} from './operators/logic/Not';\nexport {Or} from './operators/logic/Or';\nexport {Operators} from './operators/Operators';\nexport {Group} from './operators/stage/Group';\nexport {Limit} from './operators/stage/Limit';\nexport {Match} from './operators/stage/Match';\nexport {Project} from './operators/stage/Project';\nexport {Skip} from './operators/stage/Skip';\nexport {Sort} from './operators/stage/Sort';\nexport {Substr} from './operators/string/Substr';\nexport {ToFloat} from './operators/string/ToFloat';\nexport {ToInt} from './operators/string/ToInt';\nexport {ToLower} from './operators/string/ToLower';\nexport {ToUpper} from './operators/string/ToUpper';\n"],"sourceRoot":"."}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/browser.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AAA9B,kGAAA,OAAO,OAAA;AACf,6CAA0C;AAAlC,sGAAA,SAAS,OAAA;AACjB,uCAAoC;AAA5B,gGAAA,MAAM,OAAA;AACd,mCAAgC;AAAxB,4FAAA,IAAI,OAAA;AACZ,yCAAsC;AAA9B,kGAAA,OAAO,OAAA;AACf,uCAAoC;AAA5B,gGAAA,MAAM,OAAA;AACd,qCAAkC;AAA1B,8FAAA,KAAK,OAAA;AACb,qCAAkC;AAA1B,8FAAA,KAAK,OAAA;AACb,2CAAwC;AAAhC,oGAAA,QAAQ,OAAA;AAChB,yCAA4E;AAApE,oHAAA,uBAAuB,OAAA;AAAE,mHAAA,sBAAsB,OAAA;AAEvD,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,iEAA8D;AAAtD,oHAAA,gBAAgB,OAAA;AACxB,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,sDAAmD;AAA3C,8FAAA,KAAK,OAAA;AACb,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,4DAAyD;AAAjD,oGAAA,QAAQ,OAAA;AAChB,kDAA+C;AAAvC,0FAAA,GAAG,OAAA;AACX,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,6CAA0C;AAAlC,0FAAA,GAAG,OAAA;AACX,uEAAoE;AAA5D,kHAAA,eAAe,OAAA;AACvB,2DAAwD;AAAhD,sGAAA,SAAS,OAAA;AACjB,+DAA4D;AAApD,0GAAA,WAAW,OAAA;AACnB,yEAAsE;AAA9D,oHAAA,gBAAgB,OAAA;AACxB,6CAA0C;AAAlC,wFAAA,EAAE,OAAA;AACV,2DAAwD;AAAhD,sGAAA,SAAS,OAAA;AACjB,qDAAkD;AAA1C,gGAAA,MAAM,OAAA;AACd,yDAAsD;AAA9C,oGAAA,QAAQ,OAAA;AAChB,mEAAgE;AAAxD,8GAAA,aAAa,OAAA;AACrB,iDAA8C;AAAtC,4FAAA,IAAI,OAAA;AACZ,yDAAsD;AAA9C,oGAAA,QAAQ,OAAA;AAChB,mDAAgD;AAAxC,8FAAA,KAAK,OAAA;AACb,mDAAgD;AAAxC,8FAAA,KAAK,OAAA;AACb,8CAA2C;AAAnC,4FAAA,IAAI,OAAA;AACZ,8DAA2D;AAAnD,4GAAA,YAAY,OAAA;AACpB,4CAAyC;AAAjC,0FAAA,GAAG,OAAA;AACX,gDAA6C;AAArC,8FAAA,KAAK,OAAA;AACb,8CAA2C;AAAnC,4FAAA,IAAI,OAAA;AACZ,qDAAuD;AAA/C,kGAAA,OAAO,OAAA;AAAE,8FAAA,GAAG,OAAA;AACpB,6CAA0C;AAAlC,0FAAA,GAAG,OAAA;AACX,mDAAoD;AAA5C,gGAAA,MAAM,OAAA;AAAE,4FAAA,EAAE,OAAA;AAClB,mDAAgD;AAAxC,sGAAA,SAAS,OAAA;AACjB,iDAAwD;AAAhD,8FAAA,KAAK,OAAA;AAAE,iGAAA,QAAQ,OAAA;AACvB,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,iDAA8C;AAAtC,8FAAA,KAAK,OAAA;AACb,qDAAkD;AAA1C,kGAAA,OAAO,OAAA;AACf,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,+CAA4C;AAApC,4FAAA,IAAI,OAAA;AACZ,oDAAiD;AAAzC,gGAAA,MAAM,OAAA;AACd,sDAAmD;AAA3C,kGAAA,OAAO,OAAA;AACf,kDAA+C;AAAvC,8FAAA,KAAK,OAAA;AACb,sDAAmD;AAA3C,kGAAA,OAAO,OAAA;AACf,sDAAmD;AAA3C,kGAAA,OAAO,OAAA"}

package/index.d.ts

@@ -1 +1 @@
-export { NUMBER_PROJECT_SUPPORT, AUTO_EQUAL_CONV_SUPPORT, Context, MangoExpression, Like, In, And, Date, PAst, Not, PValue, AbstractCompare, PObject, AbstractOperator, Avg, Count, DateToString, Day, Equal, First, GreaterThen, GreaterThenEqual, Group, IMangoWalker, IsNotNull, IsNull, Last, LessThen, LessThenEqual, Limit, Map, Match, Max, Min, Month, MultiArgs, Multiply, NotEqual, NotIn, Operators, Or, PArray, Project, Regex, Skip, Sort, Substr, Sum, ToFloat, ToInt, ToLower, ToUpper, Unset, Value, ValueRef, Year } from './browser';
+export { NUMBER_PROJECT_SUPPORT, AUTO_EQUAL_CONV_SUPPORT, Context, MangoExpression, Like, In, AndDesc, Date, PAst, Not, PValue, AbstractCompare, PObject, AbstractOperator, Avg, Count, DateToString, Day, EqualDesc, First, GreaterThen, GreaterThenEqual, Group, IMangoWalker, IsNotNull, IsNull, Last, LessThen, LessThenEqual, Limit, Map, Match, Max, Min, Month, MultiArgs, Multiply, NotEqual, NotIn, Operators, OrDesc, PArray, Project, Regex, Skip, Sort, Substr, Sum, ToFloat, ToInt, ToLower, ToUpper, Unset, Value, ValueRef, Year, IMangoWalkerControl } from './browser';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToLower = exports.ToInt = exports.ToFloat = exports.Sum = exports.Substr = exports.Sort = exports.Skip = exports.Regex = exports.Project = exports.PArray = exports.Or = exports.Operators = exports.NotIn = exports.NotEqual = exports.Multiply = exports.MultiArgs = exports.Month = exports.Min = exports.Max = exports.Match = exports.Map = exports.Limit = exports.LessThenEqual = exports.LessThen = exports.Last = exports.IsNull = exports.IsNotNull = exports.Group = exports.GreaterThenEqual = exports.GreaterThen = exports.First = exports.Equal = exports.Day = exports.DateToString = exports.Count = exports.Avg = exports.AbstractOperator = exports.PObject = exports.AbstractCompare = exports.PValue = exports.Not = exports.PAst = exports.Date = exports.And = exports.In = exports.Like = exports.MangoExpression = exports.Context = exports.AUTO_EQUAL_CONV_SUPPORT = exports.NUMBER_PROJECT_SUPPORT = void 0;
+exports.ToLower = exports.ToInt = exports.ToFloat = exports.Sum = exports.Substr = exports.Sort = exports.Skip = exports.Regex = exports.Project = exports.PArray = exports.OrDesc = exports.Operators = exports.NotIn = exports.NotEqual = exports.Multiply = exports.MultiArgs = exports.Month = exports.Min = exports.Max = exports.Match = exports.Map = exports.Limit = exports.LessThenEqual = exports.LessThen = exports.Last = exports.IsNull = exports.IsNotNull = exports.Group = exports.GreaterThenEqual = exports.GreaterThen = exports.First = exports.EqualDesc = exports.Day = exports.DateToString = exports.Count = exports.Avg = exports.AbstractOperator = exports.PObject = exports.AbstractCompare = exports.PValue = exports.Not = exports.PAst = exports.Date = exports.AndDesc = exports.In = exports.Like = exports.MangoExpression = exports.Context = exports.AUTO_EQUAL_CONV_SUPPORT = exports.NUMBER_PROJECT_SUPPORT = void 0;
 exports.Year = exports.ValueRef = exports.Value = exports.Unset = exports.ToUpper = void 0;
 // ---- Generated by gulp taskRef ----
 var browser_1 = require("./browser");
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "Context", { enumerable: true, get: function () {
 Object.defineProperty(exports, "MangoExpression", { enumerable: true, get: function () { return browser_1.MangoExpression; } });
 Object.defineProperty(exports, "Like", { enumerable: true, get: function () { return browser_1.Like; } });
 Object.defineProperty(exports, "In", { enumerable: true, get: function () { return browser_1.In; } });
-Object.defineProperty(exports, "And", { enumerable: true, get: function () { return browser_1.And; } });
+Object.defineProperty(exports, "AndDesc", { enumerable: true, get: function () { return browser_1.AndDesc; } });
 Object.defineProperty(exports, "Date", { enumerable: true, get: function () { return browser_1.Date; } });
 Object.defineProperty(exports, "PAst", { enumerable: true, get: function () { return browser_1.PAst; } });
 Object.defineProperty(exports, "Not", { enumerable: true, get: function () { return browser_1.Not; } });
@@ -22,7 +22,7 @@ Object.defineProperty(exports, "Avg", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "Count", { enumerable: true, get: function () { return browser_1.Count; } });
 Object.defineProperty(exports, "DateToString", { enumerable: true, get: function () { return browser_1.DateToString; } });
 Object.defineProperty(exports, "Day", { enumerable: true, get: function () { return browser_1.Day; } });
-Object.defineProperty(exports, "Equal", { enumerable: true, get: function () { return browser_1.Equal; } });
+Object.defineProperty(exports, "EqualDesc", { enumerable: true, get: function () { return browser_1.EqualDesc; } });
 Object.defineProperty(exports, "First", { enumerable: true, get: function () { return browser_1.First; } });
 Object.defineProperty(exports, "GreaterThen", { enumerable: true, get: function () { return browser_1.GreaterThen; } });
 Object.defineProperty(exports, "GreaterThenEqual", { enumerable: true, get: function () { return browser_1.GreaterThenEqual; } });
@@ -43,7 +43,7 @@ Object.defineProperty(exports, "Multiply", { enumerable: true, get: function ()
 Object.defineProperty(exports, "NotEqual", { enumerable: true, get: function () { return browser_1.NotEqual; } });
 Object.defineProperty(exports, "NotIn", { enumerable: true, get: function () { return browser_1.NotIn; } });
 Object.defineProperty(exports, "Operators", { enumerable: true, get: function () { return browser_1.Operators; } });
-Object.defineProperty(exports, "Or", { enumerable: true, get: function () { return browser_1.Or; } });
+Object.defineProperty(exports, "OrDesc", { enumerable: true, get: function () { return browser_1.OrDesc; } });
 Object.defineProperty(exports, "PArray", { enumerable: true, get: function () { return browser_1.PArray; } });
 Object.defineProperty(exports, "Project", { enumerable: true, get: function () { return browser_1.Project; } });
 Object.defineProperty(exports, "Regex", { enumerable: true, get: function () { return browser_1.Regex; } });
@@ -59,5 +59,4 @@ Object.defineProperty(exports, "Unset", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "Value", { enumerable: true, get: function () { return browser_1.Value; } });
 Object.defineProperty(exports, "ValueRef", { enumerable: true, get: function () { return browser_1.ValueRef; } });
 Object.defineProperty(exports, "Year", { enumerable: true, get: function () { return browser_1.Year; } });
-
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/index.ts"],"names":[],"mappings":";;;;AAAA,sCAAsC;AACtC,qCAmDmB;AAlDjB,iHAAA,sBAAsB,OAAA;AACtB,kHAAA,uBAAuB,OAAA;AACvB,kGAAA,OAAO,OAAA;AACP,0GAAA,eAAe,OAAA;AACf,+FAAA,IAAI,OAAA;AACJ,6FAAA,EAAE,OAAA;AACF,8FAAA,GAAG,OAAA;AACH,+FAAA,IAAI,OAAA;AACJ,+FAAA,IAAI,OAAA;AACJ,8FAAA,GAAG,OAAA;AACH,iGAAA,MAAM,OAAA;AACN,0GAAA,eAAe,OAAA;AACf,kGAAA,OAAO,OAAA;AACP,2GAAA,gBAAgB,OAAA;AAChB,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,uGAAA,YAAY,OAAA;AACZ,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,gGAAA,KAAK,OAAA;AACL,sGAAA,WAAW,OAAA;AACX,2GAAA,gBAAgB,OAAA;AAChB,gGAAA,KAAK,OAAA;AAEL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,+FAAA,IAAI,OAAA;AACJ,mGAAA,QAAQ,OAAA;AACR,wGAAA,aAAa,OAAA;AACb,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,mGAAA,QAAQ,OAAA;AACR,mGAAA,QAAQ,OAAA;AACR,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,6FAAA,EAAE,OAAA;AACF,iGAAA,MAAM,OAAA;AACN,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,+FAAA,IAAI,OAAA;AACJ,+FAAA,IAAI,OAAA;AACJ,iGAAA,MAAM,OAAA;AACN,8FAAA,GAAG,OAAA;AACH,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AAAE,kGAAA,OAAO,OAAA;AAAE,kGAAA,OAAO,OAAA;AAAE,gGAAA,KAAK,OAAA;AAAE,gGAAA,KAAK,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,+FAAA,IAAI,OAAA","file":"index.js","sourcesContent":["// ---- Generated by gulp taskRef ----\nexport {\n  NUMBER_PROJECT_SUPPORT,\n  AUTO_EQUAL_CONV_SUPPORT,\n  Context,\n  MangoExpression,\n  Like,\n  In,\n  And,\n  Date,\n  PAst,\n  Not,\n  PValue,\n  AbstractCompare,\n  PObject,\n  AbstractOperator,\n  Avg,\n  Count,\n  DateToString,\n  Day,\n  Equal,\n  First,\n  GreaterThen,\n  GreaterThenEqual,\n  Group,\n  IMangoWalker,\n  IsNotNull,\n  IsNull,\n  Last,\n  LessThen,\n  LessThenEqual,\n  Limit,\n  Map,\n  Match,\n  Max,\n  Min,\n  Month,\n  MultiArgs,\n  Multiply,\n  NotEqual,\n  NotIn,\n  Operators,\n  Or,\n  PArray,\n  Project,\n  Regex,\n  Skip,\n  Sort,\n  Substr,\n  Sum,\n  ToFloat,\n  ToInt, ToLower, ToUpper, Unset, Value, ValueRef, Year\n} from './browser';\n"],"sourceRoot":"."}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,sCAAsC;AACtC,qCAmDmB;AAlDjB,iHAAA,sBAAsB,OAAA;AACtB,kHAAA,uBAAuB,OAAA;AACvB,kGAAA,OAAO,OAAA;AACP,0GAAA,eAAe,OAAA;AACf,+FAAA,IAAI,OAAA;AACJ,6FAAA,EAAE,OAAA;AACF,kGAAA,OAAO,OAAA;AACP,+FAAA,IAAI,OAAA;AACJ,+FAAA,IAAI,OAAA;AACJ,8FAAA,GAAG,OAAA;AACH,iGAAA,MAAM,OAAA;AACN,0GAAA,eAAe,OAAA;AACf,kGAAA,OAAO,OAAA;AACP,2GAAA,gBAAgB,OAAA;AAChB,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,uGAAA,YAAY,OAAA;AACZ,8FAAA,GAAG,OAAA;AACH,oGAAA,SAAS,OAAA;AACT,gGAAA,KAAK,OAAA;AACL,sGAAA,WAAW,OAAA;AACX,2GAAA,gBAAgB,OAAA;AAChB,gGAAA,KAAK,OAAA;AAEL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,+FAAA,IAAI,OAAA;AACJ,mGAAA,QAAQ,OAAA;AACR,wGAAA,aAAa,OAAA;AACb,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,mGAAA,QAAQ,OAAA;AACR,mGAAA,QAAQ,OAAA;AACR,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,iGAAA,MAAM,OAAA;AACN,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,+FAAA,IAAI,OAAA;AACJ,+FAAA,IAAI,OAAA;AACJ,iGAAA,MAAM,OAAA;AACN,8FAAA,GAAG,OAAA;AACH,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AAAE,kGAAA,OAAO,OAAA;AAAE,kGAAA,OAAO,OAAA;AAAE,gGAAA,KAAK,OAAA;AAAE,gGAAA,KAAK,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,+FAAA,IAAI,OAAA"}

package/operators/AbstractOperator.d.ts

@@ -1,12 +1,8 @@
 import { PAst } from '../ast/PAst';
-import { MangoExpression } from '../MangoExpression';
 import { IMangoWalker } from '../IMangoWalker';
-import { Context } from '../ast/Context';
-export declare abstract class AbstractOperator extends PAst {
+export declare abstract class AbstractOperator<X> extends PAst<X> {
     readonly name: string;
-    value: PAst;
-    constructor(e: MangoExpression, p?: PAst, ctxt?: Context);
-    getKey(key: string): PAst;
-    validate(def: any, full?: any): boolean;
+    getByKey(key: string): PAst<any>;
     visit(o: IMangoWalker): any;
+    toJson(): any;
 }

package/operators/AbstractOperator.js

@@ -2,29 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractOperator = void 0;
 const PAst_1 = require("../ast/PAst");
-const Context_1 = require("../ast/Context");
 class AbstractOperator extends PAst_1.PAst {
-    constructor(e, p, ctxt) {
-        super(e, p, ctxt);
-    }
-    getKey(key) {
-        if (key === this.name || key.replace(/^\$/, '') === this.name || this.key === key) {
+    getByKey(key) {
+        if (key === this.name || key.replace(/^\$/, '') === this.name || this.getKeyString() === key) {
             return this;
         }
         return null;
     }
-    validate(def, full) {
-        const ctxt = new Context_1.Context(this.key);
-        this.value = this.base.interprete(def, this, ctxt);
-        return true;
-    }
+    // validate(def: any, full?: any): boolean {
+    //   // const ctxt = new Context(this.getKeyString());
+    //   // this.setValue(this.getRootExpression().interprete(def, this, ctxt) as any as X);
+    //   return true;
+    // }
     visit(o) {
-        if (this.value) {
-            return o.onOperator(this, this.value.visit(o));
+        if (this.getValue()) {
+            return o.onOperator(this, this.getValue().visit(o));
         }
         return o.onOperator(this, null);
     }
+    toJson() {
+        const v = this.getValue();
+        if (v instanceof PAst_1.PAst) {
+            const res = v.toJson();
+            return {
+                ['$' + this.name]: res
+            };
+        }
+        else {
+            return {
+                ['$' + this.name]: v
+            };
+        }
+    }
 }
 exports.AbstractOperator = AbstractOperator;
-
-//# sourceMappingURL=AbstractOperator.js.map
+//# sourceMappingURL=AbstractOperator.js.map

package/operators/AbstractOperator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/operators/AbstractOperator.ts"],"names":[],"mappings":";;;AAAA,sCAAiC;AAGjC,4CAAuC;AAEvC,MAAsB,gBAAiB,SAAQ,WAAI;IAMjD,YAAY,CAAkB,EAAE,CAAQ,EAAE,IAAc;QACtD,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE;YACjF,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,QAAQ,CAAC,GAAQ,EAAE,IAAU;QAC3B,MAAM,IAAI,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,CAAe;QACnB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;CAEF;AA/BD,4CA+BC","file":"AbstractOperator.js","sourcesContent":["import {PAst} from '../ast/PAst';\nimport {MangoExpression} from '../MangoExpression';\nimport {IMangoWalker} from '../IMangoWalker';\nimport {Context} from '../ast/Context';\n\nexport abstract class AbstractOperator extends PAst {\n\n  readonly name: string;\n\n  value: PAst;\n\n  constructor(e: MangoExpression, p?: PAst, ctxt?: Context) {\n    super(e, p, ctxt);\n  }\n\n  getKey(key: string): PAst {\n    if (key === this.name || key.replace(/^\\$/, '') === this.name || this.key === key) {\n      return this;\n    }\n    return null;\n  }\n\n\n  validate(def: any, full?: any): boolean {\n    const ctxt = new Context(this.key);\n    this.value = this.base.interprete(def, this, ctxt);\n    return true;\n  }\n\n  visit(o: IMangoWalker): any {\n    if (this.value) {\n      return o.onOperator(this, this.value.visit(o));\n    }\n    return o.onOperator(this, null);\n  }\n\n}\n"],"sourceRoot":".."}
+{"version":3,"file":"AbstractOperator.js","sourceRoot":"","sources":["../../../src/operators/AbstractOperator.ts"],"names":[],"mappings":";;;AAAA,sCAAiC;AAKjC,MAAsB,gBAAoB,SAAQ,WAAO;IAIvD,QAAQ,CAAC,GAAW;QAClB,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,EAAE,CAAC;YAC7F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,4CAA4C;IAC5C,sDAAsD;IACtD,wFAAwF;IACxF,iBAAiB;IACjB,IAAI;IAEJ,KAAK,CAAC,CAAe;QACnB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,EAAG,IAAI,CAAC,QAAQ,EAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAGD,MAAM;QACJ,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAG,CAAC,YAAY,WAAI,EAAC,CAAC;YACpB,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO;gBACL,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG;aACvB,CAAA;QACH,CAAC;aAAI,CAAC;YACJ,OAAO;gBACL,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aACrB,CAAA;QACH,CAAC;IACH,CAAC;CAEF;AAxCD,4CAwCC"}