@allgemein/expressions 1.1.1 → 1.2.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2019 Robert Kania
+Copyright (c) 2018 Robert Kania
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

package/browser.js

@@ -45,3 +45,4 @@ var Expressions_1 = require("./libs/expressions/Expressions");
 Object.defineProperty(exports, "Expressions", { enumerable: true, get: function () { return Expressions_1.Expressions; } });
 var ExpressionValidationError_1 = require("./libs/exceptions/ExpressionValidationError");
 Object.defineProperty(exports, "ExpressionValidationError", { enumerable: true, get: function () { return ExpressionValidationError_1.ExpressionValidationError; } });
+//# sourceMappingURL=browser.js.map

package/browser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/browser.ts"],"names":[],"mappings":";;;AAEA,wDAAqD;AAA7C,oGAAA,QAAQ,OAAA;AAChB,oDAAiD;AAAzC,gGAAA,MAAM,OAAA;AACd,oDAAqD;AAA7C,4FAAA,EAAE,OAAA;AAAE,gGAAA,MAAM,OAAA;AAClB,sDAAwD;AAAhD,8FAAA,GAAG,OAAA;AAAE,kGAAA,OAAO,OAAA;AACpB,oDAAqD;AAA7C,4FAAA,EAAE,OAAA;AAAE,gGAAA,MAAM,OAAA;AAClB,oDAAqD;AAA7C,4FAAA,EAAE,OAAA;AAAE,gGAAA,MAAM,OAAA;AAClB,oDAAqD;AAA7C,4FAAA,EAAE,OAAA;AAAE,gGAAA,MAAM,OAAA;AAClB,0DAAuD;AAA/C,sGAAA,SAAS,OAAA;AACjB,sDAAwD;AAAhD,8FAAA,GAAG,OAAA;AAAE,kGAAA,OAAO,OAAA;AACpB,oDAAqD;AAA7C,4FAAA,EAAE,OAAA;AAAE,gGAAA,MAAM,OAAA;AAClB,wDAA2D;AAAnD,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AACtB,sDAAwD;AAAhD,8FAAA,GAAG,OAAA;AAAE,kGAAA,OAAO,OAAA;AACpB,wDAAqD;AAA7C,oGAAA,QAAQ,OAAA;AAChB,0DAA8D;AAAtD,kGAAA,KAAK,OAAA;AAAE,sGAAA,SAAS,OAAA;AAExB,kFAA+E;AAAvE,8HAAA,qBAAqB,OAAA;AAC7B,8DAA2D;AAAnD,0GAAA,WAAW,OAAA;AAEnB,yFAAsF;AAA9E,sIAAA,yBAAyB,OAAA"}

package/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./browser"), exports);
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B"}

package/libs/descriptors/AndDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.And = exports.AndDesc = void 0;
+exports.AndDesc = void 0;
+exports.And = And;
 const _ = require("lodash");
 const GroupDesc_1 = require("./GroupDesc");
 class AndDesc extends GroupDesc_1.GroupDesc {
@@ -30,4 +31,4 @@ exports.AndDesc = AndDesc;
 function And(...values) {
     return new AndDesc(...values);
 }
-exports.And = And;
+//# sourceMappingURL=AndDesc.js.map

package/libs/descriptors/AndDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AndDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/AndDesc.ts"],"names":[],"mappings":";;;AAsCA,kBAEC;AAxCD,4BAA4B;AAC5B,2CAAsC;AAKtC,MAAa,OAAQ,SAAQ,qBAAS;IAKpC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAJV,SAAI,GAAU,KAAK,CAAC;IAK7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,UAAU,MAAW;YAC1B,KAAK,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAA;IACH,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,SAAc,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAQ,EAAE,CAAC;QAChB,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;QACnB,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AA5BD,0BA4BC;AAID,SAAgB,GAAG,CAAC,GAAG,MAAkB;IACvC,OAAO,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/EqDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Eq = exports.EqDesc = void 0;
+exports.EqDesc = void 0;
+exports.Eq = Eq;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -28,4 +29,4 @@ exports.EqDesc = EqDesc;
 function Eq(key, value) {
     return new EqDesc(key, value);
 }
-exports.Eq = Eq;
+//# sourceMappingURL=EqDesc.js.map

package/libs/descriptors/EqDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/EqDesc.ts"],"names":[],"mappings":";;;AAiCA,gBAEC;AAnCD,4BAA4B;AAI5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAEhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,GAAU,IAAI,CAAC;IAG5B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;QAC/B,CAAC,CAAA;IACH,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,SAAc,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAQ,EAAE,CAAC;QAChB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAtBD,wBAsBC;AAED,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/ExprDesc.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprDesc = void 0;
-const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const base_1 = require("@allgemein/base");
 const ValueDesc_1 = require("./ValueDesc");
 const ExpressionValidationError_1 = require("../exceptions/ExpressionValidationError");
+const lodash_1 = require("lodash");
 class ExprDesc {
     constructor() {
         this.type = 'cond';
@@ -28,14 +28,14 @@ class ExprDesc {
             keys.push(this.key);
             /*
             let childKeys = this.value.getSourceKeys();
-            if(!_.isEmpty(childKeys)){
-              keys = _.concat(keys, childKeys);
+            if(!isEmpty(childKeys)){
+              keys = concat(keys, childKeys);
             }*/
         }
         else if (this.isGroup()) {
-            keys = _.concat(keys, ..._.map(this.values, v => v.getSourceKeys()));
+            keys = (0, lodash_1.concat)(keys, ...(0, lodash_1.map)(this.values, v => v.getSourceKeys()));
         }
-        return _.uniq(keys);
+        return (0, lodash_1.uniq)(keys);
     }
     getTargetKeys() {
         let keys = [];
@@ -45,13 +45,13 @@ class ExprDesc {
             }
         }
         else if (this.isGroup()) {
-            keys = _.concat(keys, ..._.map(this.values, v => v.getTargetKeys()));
+            keys = (0, lodash_1.concat)(keys, ...(0, lodash_1.map)(this.values, v => v.getTargetKeys()));
         }
-        return _.uniq(keys);
+        return (0, lodash_1.uniq)(keys);
     }
     applyOn(target, source, force = false) {
         if (this.type == 'eq') {
-            if (!_.has(target, this.key) || false) {
+            if (!(0, lodash_1.has)(target, this.key) || false) {
                 if (this.value instanceof ValueDesc_1.ValueDesc) {
                     // @ts-ignore
                     target[this.key] = this.value.value;
@@ -66,10 +66,10 @@ class ExprDesc {
             }
         }
         else if (this.type == 'and') {
-            _.map(this.values, v => v.applyOn(target, source, force));
+            (0, lodash_1.map)(this.values, v => v.applyOn(target, source, force));
         }
         else if (this.type == 'or') {
-            _.map(this.values, v => v.applyOn(target, source, force));
+            (0, lodash_1.map)(this.values, v => v.applyOn(target, source, force));
         }
         else {
             throw new base_1.NotYetImplementedError();
@@ -77,7 +77,7 @@ class ExprDesc {
     }
     applyReverseOn(target, source, force = false) {
         if (this.type == 'eq') {
-            if (!_.has(target, this.key) || false) {
+            if (!(0, lodash_1.has)(target, this.key) || false) {
                 if (this.value instanceof KeyDesc_1.KeyDesc) {
                     // @ts-ignore
                     target[this.value.key] = source[this.key];
@@ -88,10 +88,10 @@ class ExprDesc {
             }
         }
         else if (this.type == 'and') {
-            _.map(this.values, v => v.applyReverseOn(target, source, force));
+            (0, lodash_1.map)(this.values, v => v.applyReverseOn(target, source, force));
         }
         else if (this.type == 'or') {
-            _.map(this.values, v => v.applyReverseOn(target, source, force));
+            (0, lodash_1.map)(this.values, v => v.applyReverseOn(target, source, force));
         }
         else {
             throw new base_1.NotYetImplementedError();
@@ -115,10 +115,10 @@ class ExprDesc {
             }
         }
         else if (this.type == 'and') {
-            _.merge(map, ..._.map(this.values, v => v.getMap()));
+            (0, lodash_1.merge)(map, ...this.values.map((v) => v.getMap()));
         }
         else if (this.type == 'or') {
-            _.merge(map, ..._.map(this.values, v => v.getMap()));
+            (0, lodash_1.merge)(map, ...this.values.map((v) => v.getMap()));
         }
         else {
             throw new base_1.NotYetImplementedError();
@@ -181,7 +181,7 @@ class ExprDesc {
     toJson() {
         if (this.isGroup()) {
             let res = {};
-            res['$' + this.type] = _.map(this.values, x => x.toJson());
+            res['$' + this.type] = (0, lodash_1.map)(this.values, x => x.toJson());
             return res;
         }
         else if (this.isOp()) {
@@ -196,3 +196,4 @@ class ExprDesc {
     }
 }
 exports.ExprDesc = ExprDesc;
+//# sourceMappingURL=ExprDesc.js.map

package/libs/descriptors/ExprDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExprDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ExprDesc.ts"],"names":[],"mappings":"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"}

package/libs/descriptors/GeDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ge = exports.GeDesc = void 0;
+exports.GeDesc = void 0;
+exports.Ge = Ge;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.GeDesc = GeDesc;
 function Ge(key, value) {
     return new GeDesc(key, value);
 }
-exports.Ge = Ge;
+//# sourceMappingURL=GeDesc.js.map

package/libs/descriptors/GeDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GeDesc.ts"],"names":[],"mappings":";;;AAyBA,gBAEC;AA3BD,4BAA4B;AAG5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAA;IACH,CAAC;CACF;AAdD,wBAcC;AAGD,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/GroupDesc.js

@@ -17,3 +17,4 @@ class GroupDesc extends ExprDesc_1.ExprDesc {
     }
 }
 exports.GroupDesc = GroupDesc;
+//# sourceMappingURL=GroupDesc.js.map

package/libs/descriptors/GroupDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GroupDesc.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AAEpC,MAAa,SAAU,SAAQ,mBAAQ;IAQrC,YAAY,GAAG,MAAkB;QAC/B,KAAK,EAAE,CAAC;QAPD,SAAI,GAAU,OAAO,CAAC;QAE/B,WAAM,GAAe,EAAE,CAAC;QAMtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAGD,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC;IACd,CAAC;CAEF;AAtBD,8BAsBC"}

package/libs/descriptors/GtDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Gt = exports.GtDesc = void 0;
+exports.GtDesc = void 0;
+exports.Gt = Gt;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.GtDesc = GtDesc;
 function Gt(key, value) {
     return new GtDesc(key, value);
 }
-exports.Gt = Gt;
+//# sourceMappingURL=GtDesc.js.map

package/libs/descriptors/GtDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/GtDesc.ts"],"names":[],"mappings":";;;AAyBA,gBAEC;AA3BD,4BAA4B;AAG5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAA;IACH,CAAC;CACF;AAdD,wBAcC;AAGD,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/IExpr.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IExpr.js.map

package/libs/descriptors/IExpr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IExpr.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/IExpr.ts"],"names":[],"mappings":""}

package/libs/descriptors/InDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.In = exports.InDesc = void 0;
+exports.InDesc = void 0;
+exports.In = In;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.InDesc = InDesc;
 function In(key, value) {
     return new InDesc(key, value);
 }
-exports.In = In;
+//# sourceMappingURL=InDesc.js.map

package/libs/descriptors/InDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/InDesc.ts"],"names":[],"mappings":";;;AAyBA,gBAEC;AA3BD,4BAA4B;AAG5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;QACnE,CAAC,CAAA;IACH,CAAC;CACF;AAdD,wBAcC;AAGD,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/KeyDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Key = exports.KeyDesc = void 0;
+exports.KeyDesc = void 0;
+exports.Key = Key;
 const Selector_1 = require("./Selector");
 class KeyDesc extends Selector_1.Selector {
     constructor(key) {
@@ -19,4 +20,4 @@ exports.KeyDesc = KeyDesc;
 function Key(k) {
     return new KeyDesc(k);
 }
-exports.Key = Key;
+//# sourceMappingURL=KeyDesc.js.map

package/libs/descriptors/KeyDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/KeyDesc.ts"],"names":[],"mappings":";;;AAqBA,kBAEC;AAvBD,yCAAoC;AAGpC,MAAa,OAAQ,SAAQ,mBAAQ;IAInC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAC;QAJD,SAAI,GAAW,KAAK,CAAC;QAK5B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,MAAM;QACJ,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAC,CAAC;IAC1B,CAAC;CAEF;AAbD,0BAaC;AAED;;GAEG;AACH,SAAgB,GAAG,CAAC,CAAS;IAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AACxB,CAAC"}

package/libs/descriptors/LeDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Le = exports.LeDesc = void 0;
+exports.LeDesc = void 0;
+exports.Le = Le;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.LeDesc = LeDesc;
 function Le(key, value) {
     return new LeDesc(key, value);
 }
-exports.Le = Le;
+//# sourceMappingURL=LeDesc.js.map

package/libs/descriptors/LeDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LeDesc.ts"],"names":[],"mappings":";;;AAyBA,gBAEC;AA3BD,4BAA4B;AAK5B,uCAAkC;AAClC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAA;IACH,CAAC;CACF;AAdD,wBAcC;AAED,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/LikeDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Like = exports.LikeDesc = void 0;
+exports.LikeDesc = void 0;
+exports.Like = Like;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -28,4 +29,4 @@ exports.LikeDesc = LikeDesc;
 function Like(key, value) {
     return new LikeDesc(key, value);
 }
-exports.Like = Like;
+//# sourceMappingURL=LikeDesc.js.map

package/libs/descriptors/LikeDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LikeDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LikeDesc.ts"],"names":[],"mappings":";;;AAkCA,oBAEC;AApCD,4BAA4B;AAI5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,QAAS,SAAQ,eAAM;IAGlC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,MAAM,CAAC;IAI/B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC,CAAA;IACH,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,SAAc,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAQ,EAAE,CAAC;QAChB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACf,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAvBD,4BAuBC;AAED,SAAgB,IAAI,CAAC,GAAqB,EAAE,KAAe;IACzD,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC"}

package/libs/descriptors/LtDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lt = exports.LtDesc = void 0;
+exports.LtDesc = void 0;
+exports.Lt = Lt;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.LtDesc = LtDesc;
 function Lt(key, value) {
     return new LtDesc(key, value);
 }
-exports.Lt = Lt;
+//# sourceMappingURL=LtDesc.js.map

package/libs/descriptors/LtDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LtDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/LtDesc.ts"],"names":[],"mappings":";;;AAyBA,gBAEC;AA3BD,4BAA4B;AAK5B,uCAAkC;AAClC,qCAAgC;AAGhC,MAAa,MAAO,SAAQ,eAAM;IAGhC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAHX,SAAI,GAAW,IAAI,CAAC;IAI7B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAA;IACH,CAAC;CACF;AAdD,wBAcC;AAED,SAAgB,EAAE,CAAC,GAAqB,EAAE,KAAe;IACvD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC"}

package/libs/descriptors/NeqDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Neq = exports.NeqDesc = void 0;
+exports.NeqDesc = void 0;
+exports.Neq = Neq;
 const _ = require("lodash");
 const KeyDesc_1 = require("./KeyDesc");
 const OpDesc_1 = require("./OpDesc");
@@ -21,4 +22,4 @@ exports.NeqDesc = NeqDesc;
 function Neq(key, value) {
     return new NeqDesc(key, value);
 }
-exports.Neq = Neq;
+//# sourceMappingURL=NeqDesc.js.map

package/libs/descriptors/NeqDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NeqDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/NeqDesc.ts"],"names":[],"mappings":";;;AAyBA,kBAEC;AA3BD,4BAA4B;AAI5B,uCAAkC;AAElC,qCAAgC;AAGhC,MAAa,OAAQ,SAAQ,eAAM;IAEjC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAFX,SAAI,GAAU,IAAI,CAAC;IAG5B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,YAAY,iBAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAa,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,OAAO,UAAU,MAAW;YAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAA;IACH,CAAC;CAEF;AAdD,0BAcC;AAED,SAAgB,GAAG,CAAC,GAAqB,EAAE,KAAe;IACxD,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACjC,CAAC"}

package/libs/descriptors/OpDesc.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpDesc = void 0;
-const _ = require("lodash");
 const ExprDesc_1 = require("./ExprDesc");
+const lodash_1 = require("lodash");
 class OpDesc extends ExprDesc_1.ExprDesc {
     constructor(key, value) {
         super();
@@ -11,7 +11,7 @@ class OpDesc extends ExprDesc_1.ExprDesc {
         this.value = value;
     }
     get key() {
-        return _.isString(this._key) ? this._key : this._key.key;
+        return (0, lodash_1.isString)(this._key) ? this._key : this._key.key;
     }
     isOp() {
         return true;
@@ -21,3 +21,4 @@ class OpDesc extends ExprDesc_1.ExprDesc {
     }
 }
 exports.OpDesc = OpDesc;
+//# sourceMappingURL=OpDesc.js.map

package/libs/descriptors/OpDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OpDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/OpDesc.ts"],"names":[],"mappings":";;;AAGA,yCAAoC;AAEpC,mCAAgC;AAGhC,MAAa,MAAO,SAAQ,mBAAQ;IAQlC,YAAY,GAAqB,EAAE,KAAe;QAChD,KAAK,EAAE,CAAC;QAPD,SAAI,GAAW,IAAI,CAAC;QAQ3B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAA,iBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;AA3BD,wBA2BC"}

package/libs/descriptors/OrDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Or = exports.OrDesc = void 0;
+exports.OrDesc = void 0;
+exports.Or = Or;
 const _ = require("lodash");
 const GroupDesc_1 = require("./GroupDesc");
 class OrDesc extends GroupDesc_1.GroupDesc {
@@ -30,4 +31,4 @@ exports.OrDesc = OrDesc;
 function Or(...values) {
     return new OrDesc(...values);
 }
-exports.Or = Or;
+//# sourceMappingURL=OrDesc.js.map

package/libs/descriptors/OrDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/OrDesc.ts"],"names":[],"mappings":";;;AAiCA,gBAEC;AAnCD,4BAA4B;AAC5B,2CAAsC;AAKtC,MAAa,MAAO,SAAQ,qBAAS;IAEnC,YAAY,GAAG,MAAkB;QAC/B,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAFV,SAAI,GAAU,IAAI,CAAC;IAG5B,CAAC;IAED,MAAM,CAAC,MAAW;QAChB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,UAAU,MAAW;YAC1B,KAAK,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;gBACtB,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBACf,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAA;IACH,CAAC;IAED,GAAG,CAAC,MAAW,EAAE,SAAc,EAAE;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAQ,EAAE,CAAC;QAChB,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QAClB,OAAO,CAAC,CAAC;IACX,CAAC;CAEF;AAzBD,wBAyBC;AAED,SAAgB,EAAE,CAAC,GAAG,MAAkB;IACtC,OAAO,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;AAC/B,CAAC"}

package/libs/descriptors/Selector.js

@@ -7,3 +7,4 @@ class Selector {
     }
 }
 exports.Selector = Selector;
+//# sourceMappingURL=Selector.js.map

package/libs/descriptors/Selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Selector.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/Selector.ts"],"names":[],"mappings":";;;AAEA,MAAa,QAAQ;IAArB;QACW,SAAI,GAAU,UAAU,CAAC;IACpC,CAAC;CAAA;AAFD,4BAEC"}

package/libs/descriptors/ValueDesc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Value = exports.ValueDesc = void 0;
+exports.ValueDesc = void 0;
+exports.Value = Value;
 const Selector_1 = require("./Selector");
 class ValueDesc extends Selector_1.Selector {
     constructor(value) {
@@ -20,4 +21,4 @@ exports.ValueDesc = ValueDesc;
 function Value(v) {
     return new ValueDesc(v);
 }
-exports.Value = Value;
+//# sourceMappingURL=ValueDesc.js.map

package/libs/descriptors/ValueDesc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValueDesc.js","sourceRoot":"","sources":["../../../../src/libs/descriptors/ValueDesc.ts"],"names":[],"mappings":";;;AAsBA,sBAEC;AAxBD,yCAAoC;AAEpC,MAAa,SAAU,SAAQ,mBAAQ;IAIrC,YAAY,KAAsB;QAChC,KAAK,EAAE,CAAC;QAJD,SAAI,GAAU,OAAO,CAAC;QAK7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CAEF;AAbD,8BAaC;AAGD;;;GAGG;AACH,SAAgB,KAAK,CAAC,CAAkB;IACtC,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC"}

package/libs/exceptions/ExpressionValidationError.js

@@ -8,3 +8,4 @@ class ExpressionValidationError extends Error {
     }
 }
 exports.ExpressionValidationError = ExpressionValidationError;
+//# sourceMappingURL=ExpressionValidationError.js.map

package/libs/exceptions/ExpressionValidationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpressionValidationError.js","sourceRoot":"","sources":["../../../../src/libs/exceptions/ExpressionValidationError.ts"],"names":[],"mappings":";;;AAEA,MAAa,yBAA0B,SAAQ,KAAK;IAElD,YAAY,GAAU;QACpB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;CAEF;AAPD,8DAOC"}

package/libs/expressions/ExpressionInterpreter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionInterpreter = void 0;
-const _ = require("lodash");
 const LikeDesc_1 = require("../descriptors/LikeDesc");
 const LtDesc_1 = require("../descriptors/LtDesc");
 const GtDesc_1 = require("../descriptors/GtDesc");
@@ -15,6 +14,7 @@ const GeDesc_1 = require("../descriptors/GeDesc");
 const GroupDesc_1 = require("../descriptors/GroupDesc");
 const AndDesc_1 = require("../descriptors/AndDesc");
 const OrDesc_1 = require("../descriptors/OrDesc");
+const lodash_1 = require("lodash");
 class ExpressionInterpreter {
     constructor() {
         //rootEntityDef:EntityDef;
@@ -70,16 +70,16 @@ class ExpressionInterpreter {
     }
     interprete(str) {
         this.fragmentize(str);
-        return _.first(this.res);
+        return (0, lodash_1.first)(this.res);
     }
     fragmentize(str) {
-        let lastState = _.last(this.queue);
+        let lastState = (0, lodash_1.last)(this.queue);
         let currentOps = this.ops.filter(x => {
             let _true = true;
             if (x.condition) {
                 _true = x.condition();
             }
-            if (_.isEmpty(x.after)) {
+            if ((0, lodash_1.isEmpty)(x.after)) {
                 return _true;
             }
             if (!lastState) {
@@ -99,14 +99,15 @@ class ExpressionInterpreter {
         const regex = new RegExp('^\\s*' + currentOps.map(x => '(' + x.regex.source + ')').join('|'), 'gim');
         let arr = regex.exec(str);
         if (arr) {
-            let index = _.findIndex(arr, x => !_.isUndefined(x), 1) - 1;
+            // let index = arr.findIndex(x => !isUndefined(x));
+            let index = (0, lodash_1.findIndex)(arr, x => !(0, lodash_1.isUndefined)(x), 1) - 1;
             if (index > -1) {
                 let opId = map[index];
                 let op = currentOps[opId];
                 // console.log(map, regex, arr, regex.lastIndex,op.name);
                 op.method.apply(this, [arr[index + 1], str]);
                 const nextStr = str.substring(regex.lastIndex);
-                if (!_.isEmpty(nextStr)) {
+                if (!(0, lodash_1.isEmpty)(nextStr)) {
                     this.fragmentize(nextStr);
                 }
             }
@@ -214,7 +215,7 @@ class ExpressionInterpreter {
             key: key,
             desc: erg
         });
-        let res = _.last(this.res);
+        let res = (0, lodash_1.last)(this.res);
         if (res instanceof GroupDesc_1.GroupDesc) {
             res.values.push(erg);
         }
@@ -234,12 +235,12 @@ class ExpressionInterpreter {
         });
     }
     leaveGroup() {
-        let group = _.find(this.res, g => g instanceof GroupDesc_1.GroupDesc ? g.id == this.groupLevel : false);
+        let group = this.res.find(g => g instanceof GroupDesc_1.GroupDesc ? g.id == this.groupLevel : false);
         if (group && group.type == 'group') {
-            _.remove(this.res, g => g instanceof GroupDesc_1.GroupDesc ? g.id == this.groupLevel : false);
+            (0, lodash_1.remove)(this.res, g => g instanceof GroupDesc_1.GroupDesc ? g.id == this.groupLevel : false);
             // embedded withotu bool
             let prevGid = this.groupLevel - 1;
-            let prevGroup = _.find(this.res, g => g instanceof GroupDesc_1.GroupDesc ? g.id == prevGid : false);
+            let prevGroup = this.res.find(g => g instanceof GroupDesc_1.GroupDesc ? g.id == prevGid : false);
             if (prevGroup) {
                 group.values.forEach((v) => prevGroup.values.push(v));
                 group.values = [];
@@ -299,3 +300,4 @@ class ExpressionInterpreter {
     }
 }
 exports.ExpressionInterpreter = ExpressionInterpreter;
+//# sourceMappingURL=ExpressionInterpreter.js.map

package/libs/expressions/ExpressionInterpreter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpressionInterpreter.js","sourceRoot":"","sources":["../../../../src/libs/expressions/ExpressionInterpreter.ts"],"names":[],"mappings":"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"}

package/libs/expressions/Expressions.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expressions = void 0;
-const _ = require("lodash");
 const base_1 = require("@allgemein/base");
 const InDesc_1 = require("../descriptors/InDesc");
 const NeqDesc_1 = require("../descriptors/NeqDesc");
@@ -17,6 +16,7 @@ const ValueDesc_1 = require("../descriptors/ValueDesc");
 const GroupDesc_1 = require("../descriptors/GroupDesc");
 const ExpressionInterpreter_1 = require("./ExpressionInterpreter");
 const LikeDesc_1 = require("../descriptors/LikeDesc");
+const lodash_1 = require("lodash");
 const REGEX_ID = /^(([\w_]+)=((\d+)|(\d+(\.|\,)\d+)|\'([^\']*)\'),?)$/;
 const REGEX_ID_G = /^(([\w_]+)=((\d+)|(\d+(\.|\,)\d+)|\'([^\']*)\'),?)$ /g;
 const REGEX_ID_K = /^((\d+)|(\d+(\.|\,)\d+),?)+$/;
@@ -24,7 +24,7 @@ const REGEX_ID_KG = /^((\d+)|(\d+(\.|\,)\d+),?)+$/g;
 const REGEX_ID_W = /^(\'([^\']*)\',?)+$/;
 class Expressions {
     static parse(str) {
-        if (_.isString(str)) {
+        if ((0, lodash_1.isString)(str)) {
             // check if JSON string
             try {
                 let obj = JSON.parse(str.trim());
@@ -40,7 +40,7 @@ class Expressions {
                 }
             }
         }
-        else if (_.isPlainObject(str)) {
+        else if ((0, lodash_1.isPlainObject)(str)) {
             return this.fromJson(str);
         }
         else {
@@ -55,7 +55,7 @@ class Expressions {
         Helper.walk(object, (data: WalkValues) => {
           console.log(data)
           let op: CondDesc = null;
-          if (/^(\$and|\$or)$/.test(data.key) && _.isArray(data.value)) {
+          if (/^(\$and|\$or)$/.test(data.key) && isArray(data.value)) {
             console.log(data.key);
   
             if (data.key == '$and') {
@@ -64,11 +64,11 @@ class Expressions {
               op = Or()
             }
             (<any>data).cond = op;
-          } else if (data.key.startsWith('$') && !_.isPlainObject(data.value)) {
+          } else if (data.key.startsWith('$') && !isPlainObject(data.value)) {
             if (data.key == '$eq') {
               let value = null;
-              if (_.isPlainObject(data.value)) {
-                if (_.has(data.value, '$key')) {
+              if (isPlainObject(data.value)) {
+                if (has(data.value, '$key')) {
                   value = Key(data.value.key);
                 } else {
                   // ???
@@ -81,7 +81,7 @@ class Expressions {
   
             }
           } else if (!data.key.startsWith('$')) {
-            if (_.isPlainObject(data.value)) {
+            if (isPlainObject(data.value)) {
   
             } else {
               // eq k = v
@@ -103,7 +103,7 @@ class Expressions {
         return Object.keys(this.EXPR_REGISTRY);
     }
     static fromJson(object, srcKey = null, parent = null) {
-        if (_.isArray(object)) {
+        if ((0, lodash_1.isArray)(object)) {
             if (!parent || !(parent instanceof GroupDesc_1.GroupDesc)) {
                 parent = (0, OrDesc_1.Or)();
             }
@@ -115,13 +115,13 @@ class Expressions {
             }
             return parent;
         }
-        else if (_.isPlainObject(object)) {
-            let keys = _.keys(object);
+        else if ((0, lodash_1.isPlainObject)(object)) {
+            let keys = Object.keys(object);
             let operator = keys.filter(k => k.startsWith('$'));
             if (keys.length == 1 && operator.length == 1) {
                 let op = operator.shift();
                 if (op == '$or' || op == '$and') {
-                    if (_.isArray(object[op])) {
+                    if ((0, lodash_1.isArray)(object[op])) {
                         let desc = op == '$or' ? (0, OrDesc_1.Or)() : (0, AndDesc_1.And)();
                         if (parent instanceof GroupDesc_1.GroupDesc) {
                             parent.values.push(desc);
@@ -135,11 +135,11 @@ class Expressions {
                 else if (this.exprKeys().indexOf(op) > -1) {
                     let key = (0, KeyDesc_1.Key)(srcKey);
                     let value = null;
-                    if (_.isArray(object[op])) {
+                    if ((0, lodash_1.isArray)(object[op])) {
                         value = (0, ValueDesc_1.Value)(object[op]);
                     }
-                    else if (_.isPlainObject(object[op])) {
-                        if (_.has(object[op], '$key')) {
+                    else if ((0, lodash_1.isPlainObject)(object[op])) {
+                        if ((0, lodash_1.has)(object[op], '$key')) {
                             value = (0, KeyDesc_1.Key)(object[op].$key);
                         }
                         else {
@@ -150,6 +150,7 @@ class Expressions {
                     else {
                         value = (0, ValueDesc_1.Value)(object[op]);
                     }
+                    // @ts-ignore
                     return this.EXPR_REGISTRY[op](key, value);
                 }
                 else {
@@ -183,7 +184,7 @@ class Expressions {
         let idProps = ref.getPropertyRefs().filter(p => p.isIdentifier());
         if (/^\(.*(\)\s*,\s*\()?.*\)$/.test(id)) {
             let ids = id.replace(/^\(|\)$/g, '').split(/\)\s*,\s*\(/);
-            return _.map(ids, _id => this.parseLookupConditions(ref, _id));
+            return ids.map((_id) => this.parseLookupConditions(ref, _id));
         }
         else if (REGEX_ID.test(id)) {
             let cond = {};
@@ -201,7 +202,7 @@ class Expressions {
         }
         else if (/^\d+(,\d+)+$/.test(id)) {
             let ids = id.split(',');
-            return _.map(ids, _id => this.parseLookupConditions(ref, _.isString(_id) ? parseInt(_id, 0) : _id));
+            return ids.map((_id) => this.parseLookupConditions(ref, (0, lodash_1.isString)(_id) ? parseInt(_id, 0) : _id));
         }
         else if (REGEX_ID_K.test(id)) {
             if (/^\'.*\'$/.test(id)) {
@@ -217,7 +218,7 @@ class Expressions {
                 c += 1;
                 cond[p.name] = p.convert(v);
                 if (c >= idProps.length) {
-                    conds.push(_.clone(cond));
+                    conds.push((0, lodash_1.clone)(cond));
                     cond = {};
                     c = 0;
                 }
@@ -226,7 +227,7 @@ class Expressions {
         }
         else {
             if (idProps.length == 1) {
-                const prop = _.first(idProps);
+                const prop = (0, lodash_1.first)(idProps);
                 const ids = id.split(',').map((x) => x.trim());
                 const conds = [];
                 for (const _id of ids) {
@@ -243,7 +244,7 @@ class Expressions {
     }
     static buildLookupConditions(ref, data) {
         let idProps = ref.getPropertyRefs().filter(p => p.isIdentifier());
-        if (_.isArray(data)) {
+        if ((0, lodash_1.isArray)(data)) {
             let collect = [];
             data.forEach(d => {
                 collect.push(this._buildLookupconditions(idProps, d));
@@ -263,7 +264,7 @@ class Expressions {
         let idPk = [];
         idProps.forEach(id => {
             let v = id.get(data);
-            if (_.isString(v)) {
+            if ((0, lodash_1.isString)(v)) {
                 idPk.push('\'' + v + '\'');
             }
             else {
@@ -284,3 +285,4 @@ Expressions.EXPR_REGISTRY = {
     '$like': (k, v) => (0, LikeDesc_1.Like)(k, v),
     '$in': (k, v) => (0, InDesc_1.In)(k, v)
 };
+//# sourceMappingURL=Expressions.js.map

package/libs/expressions/Expressions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../../src/libs/expressions/Expressions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,11 @@
 {
   "name": "@allgemein/expressions",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Library for mango expressions",
   "main": "index.js",
-  "private": false,
   "directories": {
     "doc": "docs/de"
   },
-  "scripts": {
-    "test": "nyc mocha test/functional/*.spec.ts",
-    "posttest": "nyc report --reporter=json && codecov -f coverage/*.json"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/allgemein-node/expressions.git"
@@ -30,41 +25,15 @@
   },
   "homepage": "https://github.com/allgemein-node/expressions#readme",
   "devDependencies": {
-    "@allgemein/base": "^1.6.14",
-    "@allgemein/packaging": "^1.2.20",
-    "@allgemein/schema-api": "^1.5.34",
-    "@testdeck/mocha": "^0.3.3",
-    "@types/chai": "^4.2.16",
-    "@types/glob": "^7.1.3",
+    "@allgemein/base": "^1.8.0",
+    "@allgemein/schema-api": "^1.6.0",
     "@types/json-schema": "^7.0.7",
-    "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^14.14.41",
-    "@typescript-eslint/eslint-plugin": "^4.29.0",
-    "@typescript-eslint/parser": "^4.29.0",
-    "chai": "^4.3.4",
-    "codecov": "^3.8.1",
-    "codelyzer": "^5.2.0",
-    "del": "^6.0.0",
-    "eslint": "^7.32.0",
-    "glob": "^7.1.6",
-    "gulp": "^4.0.2",
-    "gulp-bump": "^3.2.0",
-    "gulp-clean": "^0.4.0",
-    "gulp-replace": "^1.1.1",
-    "gulp-shell": "^0.8.0",
-    "gulp-sourcemaps": "^3.0.0",
-    "gulp-typescript": "^5.0.1",
-    "merge-stream": "^2.0.0",
-    "mocha": "^8.3.2",
-    "nyc": "^15.1.0",
-    "reflect-metadata": "^0.1.13",
-    "ts-node": "^10.9.2",
-    "tslint": "^5.20.1",
-    "typescript": "^4.9.5"
+    "glob": "^11.0.0",
+    "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {
-    "@allgemein/base": "^1.5.0",
-    "@allgemein/schema-api": "^1.2.0"
-  }
-}
+    "@allgemein/base": "*",
+    "@allgemein/schema-api": "*"
+  },
+  "browser": "browser.js"
+}