npm - @entity-access/entity-access - Versions diffs - 1.0.198 → 1.0.200 - Mend

@entity-access/entity-access 1.0.198 → 1.0.200

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist/entity-query/EntityType.js +2 -2
package/dist/entity-query/EntityType.js.map +1 -1
package/dist/model/SourceExpression.js +2 -2
package/dist/model/SourceExpression.js.map +1 -1
package/dist/query/ast/ExpressionToSql.d.ts +0 -1
package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
package/dist/query/ast/ExpressionToSql.js +4 -64
package/dist/query/ast/ExpressionToSql.js.map +1 -1
package/dist/query/ast/Expressions.d.ts +4 -1
package/dist/query/ast/Expressions.d.ts.map +1 -1
package/dist/query/ast/Expressions.js +11 -2
package/dist/query/ast/Expressions.js.map +1 -1
package/dist/query/expander/QueryExpander.js +2 -2
package/dist/query/expander/QueryExpander.js.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/workflows/WorkflowStorage.d.ts.map +1 -1
package/dist/workflows/WorkflowStorage.js +11 -4
package/dist/workflows/WorkflowStorage.js.map +1 -1
package/package.json +1 -1
package/src/entity-query/EntityType.ts +2 -2
package/src/model/SourceExpression.ts +2 -2
package/src/query/ast/ExpressionToSql.ts +78 -76
package/src/query/ast/Expressions.ts +14 -2
package/src/query/expander/QueryExpander.ts +2 -2
package/src/workflows/WorkflowStorage.ts +18 -6

package/dist/entity-query/EntityType.js CHANGED Viewed

@@ -119,7 +119,7 @@ export default class EntityType {
         //     return { ... this.selectAll };
         // }
         const source = this.fullyQualifiedName;
-        const as = Expression.parameter(this.name[0] + "1");
+        const as = Expression.parameter(this.name[0] + "1", this);
         as.model = this;
         const fields = this.columns.map((c) => Expression.member(as, c.columnName));
         this.selectAll = SelectStatement.create({
@@ -135,7 +135,7 @@ export default class EntityType {
         //     return { ... this.selectOne };
         // }
         const source = this.fullyQualifiedName;
-        const as = Expression.parameter(this.name[0] + "1");
+        const as = Expression.parameter(this.name[0] + "1", this);
         as.model = this;
         const fields = [
             NumberLiteral.one

package/dist/entity-query/EntityType.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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~~QACpD~~,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC;YACpC,MAAM;YACN,KAAK,EAAE,IAAI;YACX,eAAe,EAAE,EAAE;YACnB,MAAM;SACT,CAAC,CAAC;QACH,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IAEM,eAAe;QAClB,wBAAwB;QACxB,qCAAqC;QACrC,IAAI;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACvC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;~~QACpD~~,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;QAChB,MAAM,MAAM,GAAG;YACX,aAAa,CAAC,GAAG;SACpB,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC;YACpC,MAAM;YACN,KAAK,EAAE,IAAI;YACX,eAAe,EAAE,EAAE;YACnB,MAAM;SACT,CAAC,CAAC;QACH,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IAEM,GAAG,CAAC,GAAQ;QACf,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACvC,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;gBAClB,SAAS;aACZ;YACD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SAC5B;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ;AAxKG;IAAC,aAAa;;;oDAQb"}
1	+ {"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}

package/dist/model/SourceExpression.js CHANGED Viewed

@@ -38,7 +38,7 @@ export class SourceExpression {
             }
         }
         const column = relation.relation.fkColumn;
-        const parameter = ParameterExpression.create({ name: this.parameter + "." + property });
+        const parameter = ParameterExpression.create({ name: this.parameter + "." + property, model });
         const source = this.addSource(model, parameter);
         const join = JoinExpression.create({
             as: source.alias,
@@ -70,7 +70,7 @@ export class SourceExpression {
                 break;
             }
         } while (true);
-        source.alias = ParameterExpression.create({ name: alias });
+        source.alias = ParameterExpression.create({ name: alias, model });
         this.map.set(alias, source);
         this.paramMap.set(parameter.name, source);
         return source;

package/dist/model/SourceExpression.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SourceExpression.js","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,mBAAmB,EAAmB,MAAM,6BAA6B,CAAC;AAC/G,OAAO,EAAsB,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGxF,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEtC,MAAM,OAAO,gBAAgB;IAElB,MAAM,CAAC,MAAM,CAAC,CAA4B;QAC7C,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAaD,YAAoB,CAA4B;QAC5C,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAqB,CAAC;QAChC,IAAI,CAAC,CAAC,MAAM,EAAE;YACV,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACrB,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClC;aAAM;YACH,CAAC,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;YACvB,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;SACrB;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAI;QACA,MAAM,CAAC,GAAG,EAAE,GAAI,IAAI,EAAsB,CAAC;QAC3C,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC;IACb,CAAC;IAED,OAAO,CAAC,QAAgB;QACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,CAAC;QAE3F,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,KAAK,EAAE;YACjC,IAAI,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE;gBAC1B,OAAO,QAAQ,CAAC,YAAY,CAAqB,CAAC;aACrD;SACJ;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1C,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,QAAQ,~~EAAC~~,CAAC,CAAC;~~QACvF~~,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;YAC/B,EAAE,EAAE,MAAM,CAAC,KAAK;YAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;YAC5C,KAAK;YACL,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;YACzC,KAAK,EAAE,UAAU,CAAC,UAAU,CACxB,UAAU,CAAC,MAAM,CACb,IAAI,CAAC,KAAK,EACV,MAAM,CAAC,UAAU,CAAC,EACtB,UAAU,CAAC,MAAM,CACb,MAAM,CAAC,KAAK,EACZ,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAChC;SACJ,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;QAC5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,KAAiB,EAAE,SAA8B;QAEvD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACnC,KAAK;YACL,SAAS;YACT,OAAO;YACP,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACtB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEhC,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,IAAI,KAAa,CAAC;QAClB,GAAG;YACC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,KAAK,CAAC,EAAE;gBACtC,MAAM;aACT;SACJ,QAAO,IAAI,EAAE;QACd,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;~~QAC3D~~,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,KAAe;QACnB,MAAM,CAAC,KAAK,EAAE,GAAI,MAAM,CAAE,GAAG,KAAK,CAAC;QACnC,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;YAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACpC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACtC;QACD,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,CAAC,QAAQ,EAAG,GAAI,MAAM,CAAW;QAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,GAAI,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;SACnF;QAED,+BAA+B;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;CACJ"}
1	+ {"version":3,"file":"SourceExpression.js","sourceRoot":"","sources":["../../src/model/SourceExpression.ts"],"names":[],"mappings":"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"}

package/dist/query/ast/ExpressionToSql.d.ts CHANGED Viewed

@@ -60,6 +60,5 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
      * @returns Property Chain
      */
     private getPropertyChain;
-    private flatten;
 }
 //# sourceMappingURL=ExpressionToSql.d.ts.map

package/dist/query/ast/ExpressionToSql.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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~~IAqEzB~~;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;~~IAqDxB,OAAO,CAAC,OAAO;CA2ElB~~"}
1	+ {"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}

package/dist/query/ast/ExpressionToSql.js CHANGED Viewed

@@ -567,8 +567,10 @@ export default class ExpressionToSql extends Visitor {
                                 return join.as;
                             }
                             const joinType = select.preferLeftJoins ? "LEFT" : (fkColumn.nullable ? "LEFT" : "INNER");
-                            const joinParameter = ParameterExpression.create({ name: relation.relatedEntity.name[0] });
-                            joinParameter.model = relation.relatedEntity;
+                            const joinParameter = ParameterExpression.create({
+                                name: relation.relatedEntity.name[0],
+                                model: relation.relatedEntity
+                            });
                             join = JoinExpression.create({
                                 as: joinParameter,
                                 joinType,
@@ -640,67 +642,5 @@ export default class ExpressionToSql extends Visitor {
         //         : void 0;
         // };
     }
-    flatten(pc) {
-        if (!pc) {
-            return pc;
-        }
-        // check if we have parameter..
-        let { parameter } = pc;
-        if (!parameter) {
-            return pc;
-        }
-        if (pc.chain.length <= 1) {
-            return pc;
-        }
-        const chain = [...pc.chain];
-        const scope = this.scope.get(parameter);
-        const select = scope?.selectStatement ?? this.source?.selectStatement;
-        if (!select) {
-            return pc;
-        }
-        let type = select.model;
-        select.joins ??= [];
-        while (chain.length > 1) {
-            const property = chain.shift();
-            const propertyInfo = type.getProperty(property);
-            if (!propertyInfo.relation || propertyInfo.relation.isInverseRelation) {
-                return pc;
-            }
-            const relation = propertyInfo.relation;
-            // check if relation is optional...
-            if (!relation.fkColumn) {
-                return pc;
-            }
-            const { fkColumn } = relation;
-            const join = select.joins.find((x) => x.model === relation.relatedEntity);
-            if (!join) {
-                const joinType = fkColumn.nullable ? "LEFT" : "INNER";
-                const joinParameter = ParameterExpression.create({ name: relation.relatedEntity.name[0] });
-                joinParameter.model = relation.relatedEntity;
-                select.joins.push(JoinExpression.create({
-                    as: joinParameter,
-                    joinType,
-                    model: joinParameter.model,
-                    source: Expression.identifier(relation.relatedEntity.name),
-                    where: Expression.equal(Expression.member(parameter, fkColumn.columnName), Expression.member(joinParameter, relation.relatedEntity.keys[0].columnName))
-                }));
-                parameter = joinParameter;
-                type = relation.relatedEntity;
-                this.scope.create({ parameter, model: type, selectStatement: select });
-                pc.parameter = parameter;
-                pc.chain = [...chain];
-            }
-            else {
-                // we will add parameter in scope in case if it is not there
-                // this is the case when query is composed over already existing
-                // there is still an error on this one...
-                pc.parameter = parameter = join.as;
-                type = join.model;
-                pc.chain = [...chain];
-                this.scope.create({ parameter, model: type, selectStatement: select });
-            }
-        }
-        return pc;
-    }
 }
 //# sourceMappingURL=ExpressionToSql.js.map

package/dist/query/ast/ExpressionToSql.js.map CHANGED Viewed

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

package/dist/query/ast/Expressions.d.ts CHANGED Viewed

@@ -22,11 +22,14 @@ export declare abstract class Expression {
     static as(expression: Expression, alias: Identifier | string): ExpressionAs;
     static templateLiteral(value: Expression[]): TemplateLiteral;
     static constant(value: string): Constant;
-    static parameter(name: string): ParameterExpression;
+    static parameter(name: string, model?: EntityType): ParameterExpression;
     static identifier(name: string): Identifier;
     static logicalAnd(left: Expression, right: Expression): BinaryExpression;
+    static logicalOr(left: Expression, right: Expression): BinaryExpression;
     static member(target: Expression, identifier: string | Expression): MemberExpression;
     static equal(left: Expression, right: Expression): BinaryExpression;
+    static less(left: Expression, right: Expression): BinaryExpression;
+    static lessOrEqual(left: Expression, right: Expression): BinaryExpression;
     static assign(left: Expression, right: Expression): BinaryExpression;
     static create<T extends Expression>(this: IClassOf<T>, p: Partial<Omit<T, "type">>): T;
     static clone<T extends Expression>(expression: T): T;

package/dist/query/ast/Expressions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Expressions.d.ts","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAM/D;;;;;;;;;;;;;;;GAeG;AAEH,8BAAsB,UAAU;IAE5B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,GAAI,IAAI,EAAE,UAAU,EAAE;IAUzE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,EAAE;IAInC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM;IAU5D,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE;IAK1C,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAI7B,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM;~~IAI7B~~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"}
1	+ {"version":3,"file":"Expressions.d.ts","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"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"}

package/dist/query/ast/Expressions.js CHANGED Viewed

@@ -44,8 +44,8 @@ export class Expression {
     static constant(value) {
         return Constant.create({ value });
     }
-    static parameter(name) {
-        return ParameterExpression.create({ name });
+    static parameter(name, model) {
+        return ParameterExpression.create({ name, model });
     }
     static identifier(name) {
         return Identifier.create({ value: name });
@@ -53,6 +53,9 @@ export class Expression {
     static logicalAnd(left, right) {
         return BinaryExpression.create({ left, operator: "AND", right });
     }
+    static logicalOr(left, right) {
+        return BinaryExpression.create({ left, operator: "OR", right });
+    }
     static member(target, identifier) {
         return MemberExpression.create({
             target,
@@ -64,6 +67,12 @@ export class Expression {
     static equal(left, right) {
         return BinaryExpression.create({ left, right, operator: "=" });
     }
+    static less(left, right) {
+        return BinaryExpression.create({ left, right, operator: "<" });
+    }
+    static lessOrEqual(left, right) {
+        return BinaryExpression.create({ left, right, operator: "<=" });
+    }
     static assign(left, right) {
         return BinaryExpression.create({ left, right, operator: "=" });
     }

package/dist/query/ast/Expressions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAE9C;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,OAAgB,UAAU;IAE5B,MAAM,CAAC,cAAc,CAAC,MAA2B,EAAE,GAAI,IAAkB;QACrE,IAAG,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC3B,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SAC1C;QACD,OAAO,cAAc,CAAC,MAAM,CAAC;YACzB,MAAM;YACN,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAsB;QAC/B,OAAO,eAAe,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,UAAsB,EAAE,KAA0B;QACxD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACxC;QACD,OAAO,YAAY,CAAC,MAAM,CAAC;YACvB,UAAU;YACV,KAAK;SACR,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,KAAmB;QACtC,OAAO,eAAe,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IAGD,MAAM,CAAC,QAAQ,CAAC,KAAa;QACzB,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,IAAY;~~QACzB~~,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;~~IAChD~~,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAY;QAC1B,OAAO,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAgB,EAAE,KAAiB;QACjD,OAAO,gBAAgB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,MAAkB,EAAE,UAA8B;QAC5D,OAAO,gBAAgB,CAAC,MAAM,CAAC;YAC3B,MAAM;YACN,QAAQ,EAAE,OAAO,UAAU,KAAK,QAAQ;gBACpC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;gBAC7B,CAAC,CAAC,UAAU;SACnB,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAgB,EAAE,KAAiB;QAC5C,OAAO,gBAAgB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,IAAgB,EAAE,KAAiB;QAC7C,OAAO,gBAAgB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,MAAM,CAA0C,CAA2B;QAC7E,CAAS,CAAC,IAAI,GAAI,IAAY,CAAC,IAAI,CAAC;QACrC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,EAAE;YAClC,GAAG;gBACC,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACvD,CAAC;YACD,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,OAAO,CAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,KAAK,CAAuB,UAAa;QAC5C,MAAM,CAAC,GAAG,EAAS,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC1B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE;gBACvD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBAChC,IAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACvB,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9C;qBAAM;oBACH,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;iBACpB;aACJ;SACJ;QACD,OAAO,CAAM,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,SAAuB;QAC1D,MAAM,IAAI,GAAG,EAAS,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC1B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE;gBACvD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBAChC,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;oBAChC,SAAS;iBACZ;gBACD,IAAI,OAAO,YAAY,QAAQ,EAAE;oBAC7B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC3B;gBACD,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;aACvB;SACJ;QACD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IAChB,CAAC;CAIJ;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAEtC,CAAC;CAAA;AAED,sDAAsD;AACtD,2CAA2C;AAC3C,yBAAyB;AACzB,IAAI;AAEJ,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAAhD;;QAEa,SAAI,GAAG,kBAAkB,CAAC;IAKvC,CAAC;CAAA;AAED,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IAAlD;;QACa,SAAI,GAAG,oBAAoB,CAAC;IAGzC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAItC,CAAC;CAAA;AAED,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAAjD;;QACa,SAAI,GAAG,mBAAmB,CAAC;IAGxC,CAAC;CAAA;AAED,MAAM,OAAO,QAAS,SAAQ,UAAU;IAAxC;;QACa,SAAI,GAAG,WAAW,CAAC;IAEhC,CAAC;CAAA;AAED,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAAhD;;QACa,SAAI,GAAG,kBAAkB,CAAC;IAEvC,CAAC;CAAA;AAED,MAAM,OAAO,cAAe,SAAQ,UAAU;IAA9C;;QACa,SAAI,GAAG,gBAAgB,CAAC;IAGrC,CAAC;CAAA;AAED,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IAAnD;;QACa,SAAI,GAAG,qBAAqB,CAAC;IAiB1C,CAAC;IAHG,QAAQ;QACJ,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;IACxD,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAAhD;;QACa,SAAI,GAAG,kBAAkB,CAAC;IAIvC,CAAC;CAAA;AAED,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAAvD;;QACa,SAAI,GAAG,yBAAyB,CAAC;IAG9C,CAAC;CAAA;AAMD,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QAEa,SAAI,GAAG,iBAAiB,CAAC;QAsBlC,2BAA2B;QAC3B,8BAA8B;IAElC,CAAC;CAAA;AAED,MAAM,OAAO,mBAAoB,SAAQ,UAAU;IAAnD;;QACa,SAAI,GAAG,qBAAqB,CAAC;IAE1C,CAAC;CAAA;AAED,MAAM,OAAO,qBAAsB,SAAQ,UAAU;IAArD;;QACa,SAAI,GAAG,uBAAuB,CAAC;IAI5C,CAAC;CAAA;AAED,MAAM,OAAO,cAAe,SAAQ,UAAU;IAA9C;;QACa,SAAI,GAAG,gBAAgB,CAAC;IAMrC,CAAC;CAAA;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IAA7C;;QACa,SAAI,GAAG,eAAe,CAAC;IAKpC,CAAC;CAAA;AAED,MAAM,OAAO,QAAS,SAAQ,UAAU;IAAxC;;QACa,SAAI,GAAG,UAAU,CAAC;IAE/B,CAAC;CAAA;AAED,MAAM,OAAO,UAAW,SAAQ,UAAU;IAA1C;;QACa,SAAI,GAAG,YAAY,CAAC;IAEjC,CAAC;CAAA;AAED,MAAM,OAAO,cAAe,SAAQ,UAAU;IAA9C;;QACa,SAAI,GAAG,gBAAgB,CAAC;IACrC,CAAC;CAAA;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IAA7C;;QACa,SAAI,GAAG,eAAe,CAAC;IAEpC,CAAC;CAAA;AAED,MAAM,OAAO,cAAe,SAAQ,UAAU;IAA9C;;QACa,SAAI,GAAG,gBAAgB,CAAC;IAErC,CAAC;CAAA;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IAA7C;;QAKa,SAAI,GAAG,eAAe,CAAC;IAEpC,CAAC;;AALU,iBAAG,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,AAArC,CAAsC;AACzC,kBAAI,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,AAArC,CAAsC;AAMrD,MAAM,OAAO,aAAc,SAAQ,UAAU;IAA7C;;QACa,SAAI,GAAG,eAAe,CAAC;IAEpC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAKtC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAGtC,CAAC;CAAA;AAED,kDAAkD;AAElD,mEAAmE;AACnE,4CAA4C;AAC5C,8DAA8D;AAC9D,yCAAyC;AACzC,+BAA+B;AAC/B,YAAY;AACZ,2CAA2C;AAC3C,mEAAmE;AACnE,uBAAuB;AACvB,cAAc;AACd,QAAQ;AAER,uCAAuC;AACvC,8BAA8B;AAC9B,IAAI;AAEJ,MAAM,OAAO,YAAa,SAAQ,UAAU;IAA5C;;QACa,SAAI,GAAG,cAAc,CAAC;IAGnC,CAAC;CAAA;AAED,MAAM,OAAO,YAAa,SAAQ,UAAU;IAA5C;;QACa,SAAI,GAAG,cAAc,CAAC;IAInC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAOtC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QAEa,SAAI,GAAG,iBAAiB,CAAC;IAQtC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAMtC,CAAC;CAAA;AAED,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAAjD;;QACa,SAAI,GAAG,mBAAmB,CAAC;IAExC,CAAC;CAAA;AAED,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAA/C;;QACa,SAAI,GAAG,iBAAiB,CAAC;IAGtC,CAAC;CAAA"}
1	+ {"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"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"}

package/dist/query/expander/QueryExpander.js CHANGED Viewed

@@ -82,7 +82,7 @@ export class QueryExpander {
                 columnName = select.model.keys[0].columnName;
             }
             const joins = (select.joins ??= []);
-            const joinParameter = Expression.parameter(parent.sourceParameter.name);
+            const joinParameter = Expression.parameter(parent.sourceParameter.name, parent.model);
             // This join has to be INNER JOIN as we are only interested
             // in the results that matches parent query exactly
             joins.push(JoinExpression.create({
@@ -128,7 +128,7 @@ export class QueryExpander {
         //     ? Expression.logicalAnd(select.where, existsWhere)
         //     : existsWhere;
         const selectJoins = (select.joins ??= []);
-        const selectJoinParameter = Expression.parameter(parent.sourceParameter.name);
+        const selectJoinParameter = Expression.parameter(parent.sourceParameter.name, parent.model);
         // This join has to be INNER JOIN as we are only interested
         // in the results that matches parent query exactly
         selectJoins.push(JoinExpression.create({

package/dist/query/expander/QueryExpander.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryExpander.js","sourceRoot":"","sources":["../../../src/query/expander/QueryExpander.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAA6C,UAAU,EAAkB,cAAc,EAAoE,MAAM,uBAAuB,CAAC;AAEhM,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,MAAM,OAAO,aAAa;IACtB,MAAM,CAAC,MAAM,CAAC,OAAsB,EAAE,MAAuB,EAAE,CAAC,EAAE,MAAe;QAC7E,MAAM,EAAE,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,+BAA+B,CAAC,EAAS,CAAC,CAAC;QAC1F,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAsB,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtB,CAAC;IAID,YACY,OAAsB,EACtB,MAAuB,EACvB,MAAe;QAFf,YAAO,GAAP,OAAO,CAAe;QACtB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAS;QALnB,YAAO,GAAsB,EAAE,CAAC;IAQxC,CAAC;IAED,UAAU,CAAC,MAAuB,EAAE,KAAiB,EAAE,IAAoB;QAEvE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE;YACjC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAG,QAA0B,CAAC,CAAC;aAC/D;YACD,OAAO;SACV;QAED,IAAG,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAwB,CAAC;YAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE;gBACpC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC5C;YACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA0B,CAAC;YACnD,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE;gBAChC,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aAC9C;YACD,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE;gBAC9B,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC/C;YACD,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAwB,CAAC,CAAC;YAEvG,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB,EAAE;gBACpD,MAAM,IAAI,iBAAiB,CAAC,KAAK,EAAE,IAAI,IAAI,kBAAkB,CAAC,CAAC;aAClE;YACD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,EAAG,KAAiC,CAAC,IAAsB,CAAC,CAAC;YACzG,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE;YAClC,MAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,QAA0B,CAAC;QAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE;YACzB,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACvC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAwB,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE;YACpC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,GAAG,SAAS,CAAC;YACnB,KAAK,GAAG,OAAO,CAAC;SACnB;QAED,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACd,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SAChF;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;QACxB,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAEpD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QACzF,qBAAqB;QACjB,8DAA8D;QAC9D,gBAAgB;QAChB,oEAAoE;QACpE,IAAI;QACR,IAAI;QACJ,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAE,KAAqB,CAAC,eAAe,CAAC,CAAC;QAEpE,yBAAyB;QACzB,6BAA6B;QAE7B,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC;QAGlE,IAAG,QAAQ,CAAC,iBAAiB,EAAE;YAE3B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC3C,IAAI,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;YAC/B,mCAAmC;YACnC,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACxB,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aAChD;YAGD,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;YACpC,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;~~YAExE~~,2DAA2D;YAC3D,mDAAmD;YAEnD,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBAC7B,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,EAAE,GAAI,MAAM,EAAE;gBACtB,EAAE,EAAE,aAAa;gBACjB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,UAAU,CAAC,KAAK,CACnB,UAAU,CAAC,MAAM,CACb,aAAa,EACb,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CACnC,EACD,UAAU,CAAC,MAAM,CACb,MAAM,CAAC,eAAe,EACtB,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CACpC,CACJ;aACJ,CAAC,CAAC,CAAC;YAEJ,sBAAsB;YACtB,kCAAkC;YAClC,8DAA8D;YAC9D,0BAA0B;YAC1B,IAAI;YAEJ,8BAA8B;YAC9B,qCAAqC;YACrC,IAAI;YACJ,4DAA4D;YAC5D,8DAA8D;YAC9D,qBAAqB;YACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;SAC3C;QAED,gDAAgD;QAEhD,gCAAgC;QAChC,yBAAyB;QACzB,kCAAkC;QAClC,+CAA+C;QAC/C,SAAS;QACT,yBAAyB;QACzB,kCAAkC;QAClC,2EAA2E;QAC3E,QAAQ;QACR,KAAK;QAEL,uEAAuE;QAEvE,8BAA8B;QAC9B,uDAAuD;QACvD,mBAAmB;QAEnB,gDAAgD;QAChD,qBAAqB;QACrB,MAAM;QAEN,8BAA8B;QAC9B,yDAAyD;QACzD,qBAAqB;QAErB,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC1C,MAAM,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;~~QAE9E~~,2DAA2D;QAC3D,mDAAmD;QAEnD,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,EAAE,GAAI,MAAM,EAAE;YACtB,EAAE,EAAE,mBAAmB;YACvB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS;YACT,KAAK,EAAE,UAAU,CAAC,KAAK,CACnB,UAAU,CAAC,MAAM,CACb,mBAAmB,EACnB,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,CACvC,EACD,UAAU,CAAC,MAAM,CACb,MAAM,CAAC,eAAe,EACtB,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CACnE,CACJ;SACJ,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1B,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;CACJ"}
1	+ {"version":3,"file":"QueryExpander.js","sourceRoot":"","sources":["../../../src/query/expander/QueryExpander.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAA6C,UAAU,EAAkB,cAAc,EAAoE,MAAM,uBAAuB,CAAC;AAEhM,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,MAAM,OAAO,aAAa;IACtB,MAAM,CAAC,MAAM,CAAC,OAAsB,EAAE,MAAuB,EAAE,CAAC,EAAE,MAAe;QAC7E,MAAM,EAAE,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,+BAA+B,CAAC,EAAS,CAAC,CAAC;QAC1F,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAsB,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC,OAAO,CAAC;IACtB,CAAC;IAID,YACY,OAAsB,EACtB,MAAuB,EACvB,MAAe;QAFf,YAAO,GAAP,OAAO,CAAe;QACtB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAS;QALnB,YAAO,GAAsB,EAAE,CAAC;IAQxC,CAAC;IAED,UAAU,CAAC,MAAuB,EAAE,KAAiB,EAAE,IAAoB;QAEvE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE;YACjC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAG,QAA0B,CAAC,CAAC;aAC/D;YACD,OAAO;SACV;QAED,IAAG,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;YAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAwB,CAAC;YAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE;gBACpC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC5C;YACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA0B,CAAC;YACnD,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE;gBAChC,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aAC9C;YACD,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE;gBAC9B,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC/C;YACD,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAwB,CAAC,CAAC;YAEvG,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB,EAAE;gBACpD,MAAM,IAAI,iBAAiB,CAAC,KAAK,EAAE,IAAI,IAAI,kBAAkB,CAAC,CAAC;aAClE;YACD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,EAAG,KAAiC,CAAC,IAAsB,CAAC,CAAC;YACzG,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE;YAClC,MAAM,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,QAA0B,CAAC;QAC1C,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE;YACzB,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACvC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAwB,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE;YACpC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,GAAG,SAAS,CAAC;YACnB,KAAK,GAAG,OAAO,CAAC;SACnB;QAED,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE;YACd,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;SAChF;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;QACxB,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAEpD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QACzF,qBAAqB;QACjB,8DAA8D;QAC9D,gBAAgB;QAChB,oEAAoE;QACpE,IAAI;QACR,IAAI;QACJ,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAE,KAAqB,CAAC,eAAe,CAAC,CAAC;QAEpE,yBAAyB;QACzB,6BAA6B;QAE7B,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC;QAGlE,IAAG,QAAQ,CAAC,iBAAiB,EAAE;YAE3B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC3C,IAAI,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;YAC/B,mCAAmC;YACnC,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACxB,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aAChD;YAGD,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;YACpC,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAEtF,2DAA2D;YAC3D,mDAAmD;YAEnD,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBAC7B,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,EAAE,GAAI,MAAM,EAAE;gBACtB,EAAE,EAAE,aAAa;gBACjB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,UAAU,CAAC,KAAK,CACnB,UAAU,CAAC,MAAM,CACb,aAAa,EACb,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CACnC,EACD,UAAU,CAAC,MAAM,CACb,MAAM,CAAC,eAAe,EACtB,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CACpC,CACJ;aACJ,CAAC,CAAC,CAAC;YAEJ,sBAAsB;YACtB,kCAAkC;YAClC,8DAA8D;YAC9D,0BAA0B;YAC1B,IAAI;YAEJ,8BAA8B;YAC9B,qCAAqC;YACrC,IAAI;YACJ,4DAA4D;YAC5D,8DAA8D;YAC9D,qBAAqB;YACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;SAC3C;QAED,gDAAgD;QAEhD,gCAAgC;QAChC,yBAAyB;QACzB,kCAAkC;QAClC,+CAA+C;QAC/C,SAAS;QACT,yBAAyB;QACzB,kCAAkC;QAClC,2EAA2E;QAC3E,QAAQ;QACR,KAAK;QAEL,uEAAuE;QAEvE,8BAA8B;QAC9B,uDAAuD;QACvD,mBAAmB;QAEnB,gDAAgD;QAChD,qBAAqB;QACrB,MAAM;QAEN,8BAA8B;QAC9B,yDAAyD;QACzD,qBAAqB;QAErB,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC1C,MAAM,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAE5F,2DAA2D;QAC3D,mDAAmD;QAEnD,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,EAAE,GAAI,MAAM,EAAE;YACtB,EAAE,EAAE,mBAAmB;YACvB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS;YACT,KAAK,EAAE,UAAU,CAAC,KAAK,CACnB,UAAU,CAAC,MAAM,CACb,mBAAmB,EACnB,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,CACvC,EACD,UAAU,CAAC,MAAM,CACb,MAAM,CAAC,eAAe,EACtB,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CACnE,CACJ;SACJ,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1B,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;CACJ"}