@steedos/odata-v4-parser 3.0.13-beta.8 → 3.0.13

package/lib/query.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
-var utils_1 = require("./utils");
-var lexer_1 = require("./lexer");
-var primitiveLiteral_1 = require("./primitiveLiteral");
-var nameOrIdentifier_1 = require("./nameOrIdentifier");
-var expressions_1 = require("./expressions");
+const utils_1 = require("./utils");
+const lexer_1 = require("./lexer");
+const primitiveLiteral_1 = require("./primitiveLiteral");
+const nameOrIdentifier_1 = require("./nameOrIdentifier");
+const expressions_1 = require("./expressions");
 var Query;
 (function (Query) {
     function queryOptions(value, index, metadataContext) {
-        var token = Query.queryOption(value, index, metadataContext);
+        let token = Query.queryOption(value, index, metadataContext);
         if (!token)
             return;
-        var start = index;
+        let start = index;
         index = token.next;
-        var options = [];
+        let options = [];
         while (token) {
             options.push(token);
             if (value[index] !== 0x26)
@@ -25,7 +25,7 @@ var Query;
                 return;
             index = token.next;
         }
-        return lexer_1.default.tokenize(value, start, index, { options: options }, lexer_1.default.TokenType.QueryOptions);
+        return lexer_1.default.tokenize(value, start, index, { options }, lexer_1.default.TokenType.QueryOptions);
     }
     Query.queryOptions = queryOptions;
     function queryOption(value, index, metadataContext) {
@@ -49,12 +49,12 @@ var Query;
     }
     Query.systemQueryOption = systemQueryOption;
     function customQueryOption(value, index) {
-        var key = nameOrIdentifier_1.default.odataIdentifier(value, index);
+        let key = nameOrIdentifier_1.default.odataIdentifier(value, index);
         if (!key)
             return;
-        var start = index;
+        let start = index;
         index = key.next;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
@@ -66,7 +66,7 @@ var Query;
     }
     Query.customQueryOption = customQueryOption;
     function id(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24id")) {
             index += 5;
         }
@@ -75,7 +75,7 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
@@ -87,7 +87,7 @@ var Query;
     }
     Query.id = id;
     function expand(value, index, metadataContext) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24expand")) {
             index += 9;
         }
@@ -96,18 +96,18 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var items = [];
-        var token = Query.expandItem(value, index, metadataContext);
+        let items = [];
+        let token = Query.expandItem(value, index, metadataContext);
         if (!token)
             return;
         index = token.next;
         while (token) {
             items.push(token);
-            var comma = lexer_1.default.COMMA(value, index);
+            let comma = lexer_1.default.COMMA(value, index);
             if (comma) {
                 index = comma;
                 token = Query.expandItem(value, index, metadataContext);
@@ -118,28 +118,28 @@ var Query;
             else
                 break;
         }
-        return lexer_1.default.tokenize(value, start, index, { items: items }, lexer_1.default.TokenType.Expand);
+        return lexer_1.default.tokenize(value, start, index, { items }, lexer_1.default.TokenType.Expand);
     }
     Query.expand = expand;
     function expandItem(value, index, metadataContext) {
-        var start = index;
-        var star = lexer_1.default.STAR(value, index);
+        let start = index;
+        let star = lexer_1.default.STAR(value, index);
         if (star) {
             index = star;
-            var ref_1 = expressions_1.default.refExpr(value, index);
-            if (ref_1) {
-                index = ref_1.next;
-                return lexer_1.default.tokenize(value, start, index, { path: "*", ref: ref_1 }, lexer_1.default.TokenType.ExpandItem);
+            let ref = expressions_1.default.refExpr(value, index);
+            if (ref) {
+                index = ref.next;
+                return lexer_1.default.tokenize(value, start, index, { path: "*", ref }, lexer_1.default.TokenType.ExpandItem);
             }
             else {
-                var open = lexer_1.default.OPEN(value, index);
+                let open = lexer_1.default.OPEN(value, index);
                 if (open) {
                     index = open;
-                    var token = Query.levels(value, index);
+                    let token = Query.levels(value, index);
                     if (!token)
                         return;
                     index = token.next;
-                    var close = lexer_1.default.CLOSE(value, index);
+                    let close = lexer_1.default.CLOSE(value, index);
                     if (!close)
                         return;
                     index = close;
@@ -147,26 +147,26 @@ var Query;
                 }
             }
         }
-        var path = Query.expandPath(value, index, metadataContext);
+        let path = Query.expandPath(value, index, metadataContext);
         if (!path)
             return;
         index = path.next;
-        var tokenValue = { path: path };
-        var ref = expressions_1.default.refExpr(value, index);
+        let tokenValue = { path };
+        let ref = expressions_1.default.refExpr(value, index);
         if (ref) {
             index = ref.next;
             tokenValue.ref = ref;
-            var open = lexer_1.default.OPEN(value, index);
+            let open = lexer_1.default.OPEN(value, index);
             if (open) {
                 index = open;
-                var option = Query.expandRefOption(value, index);
+                let option = Query.expandRefOption(value, index);
                 if (!option)
                     return;
-                var refOptions = [];
+                let refOptions = [];
                 while (option) {
                     refOptions.push(option);
                     index = option.next;
-                    var semi = lexer_1.default.SEMI(value, index);
+                    let semi = lexer_1.default.SEMI(value, index);
                     if (semi) {
                         index = semi;
                         option = Query.expandRefOption(value, index);
@@ -176,7 +176,7 @@ var Query;
                     else
                         break;
                 }
-                var close = lexer_1.default.CLOSE(value, index);
+                let close = lexer_1.default.CLOSE(value, index);
                 if (!close)
                     return;
                 index = close;
@@ -184,21 +184,21 @@ var Query;
             }
         }
         else {
-            var count = expressions_1.default.countExpr(value, index);
+            let count = expressions_1.default.countExpr(value, index);
             if (count) {
                 index = count.next;
                 tokenValue.count = count;
-                var open = lexer_1.default.OPEN(value, index);
+                let open = lexer_1.default.OPEN(value, index);
                 if (open) {
                     index = open;
-                    var option = Query.expandCountOption(value, index);
+                    let option = Query.expandCountOption(value, index);
                     if (!option)
                         return;
-                    var countOptions = [];
+                    let countOptions = [];
                     while (option) {
                         countOptions.push(option);
                         index = option.next;
-                        var semi = lexer_1.default.SEMI(value, index);
+                        let semi = lexer_1.default.SEMI(value, index);
                         if (semi) {
                             index = semi;
                             option = Query.expandCountOption(value, index);
@@ -208,7 +208,7 @@ var Query;
                         else
                             break;
                     }
-                    var close = lexer_1.default.CLOSE(value, index);
+                    let close = lexer_1.default.CLOSE(value, index);
                     if (!close)
                         return;
                     index = close;
@@ -216,17 +216,17 @@ var Query;
                 }
             }
             else {
-                var open = lexer_1.default.OPEN(value, index);
+                let open = lexer_1.default.OPEN(value, index);
                 if (open) {
                     index = open;
-                    var option = Query.expandOption(value, index);
+                    let option = Query.expandOption(value, index);
                     if (!option)
                         return;
-                    var options = [];
+                    let options = [];
                     while (option) {
                         options.push(option);
                         index = option.next;
-                        var semi = lexer_1.default.SEMI(value, index);
+                        let semi = lexer_1.default.SEMI(value, index);
                         if (semi) {
                             index = semi;
                             option = Query.expandOption(value, index);
@@ -236,7 +236,7 @@ var Query;
                         else
                             break;
                     }
-                    var close = lexer_1.default.CLOSE(value, index);
+                    let close = lexer_1.default.CLOSE(value, index);
                     if (!close)
                         return;
                     index = close;
@@ -268,9 +268,9 @@ var Query;
     }
     Query.expandOption = expandOption;
     function expandPath(value, index, metadataContext) {
-        var start = index;
-        var path = [];
-        var token = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index, metadataContext) ||
+        let start = index;
+        let path = [];
+        let token = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index, metadataContext) ||
             nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index, metadataContext);
         if (token) {
             index = token.next;
@@ -281,13 +281,13 @@ var Query;
             metadataContext = token.value.metadata;
             delete token.value.metadata;
         }
-        var complex = nameOrIdentifier_1.default.complexProperty(value, index, metadataContext) ||
+        let complex = nameOrIdentifier_1.default.complexProperty(value, index, metadataContext) ||
             nameOrIdentifier_1.default.complexColProperty(value, index, metadataContext);
         while (complex) {
             if (value[complex.next] === 0x2f) {
                 index = complex.next + 1;
                 path.push(complex);
-                var complexTypeName = nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index, metadataContext);
+                let complexTypeName = nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index, metadataContext);
                 if (complexTypeName) {
                     if (value[complexTypeName.next] === 0x2f) {
                         index = complexTypeName.next + 1;
@@ -302,7 +302,7 @@ var Query;
             else
                 break;
         }
-        var nav = nameOrIdentifier_1.default.navigationProperty(value, index, metadataContext);
+        let nav = nameOrIdentifier_1.default.navigationProperty(value, index, metadataContext);
         if (!nav)
             return;
         index = nav.next;
@@ -310,7 +310,7 @@ var Query;
         metadataContext = nav.metadata;
         delete nav.metadata;
         if (value[index] === 0x2f) {
-            var typeName = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index + 1, metadataContext);
+            let typeName = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index + 1, metadataContext);
             if (typeName) {
                 index = typeName.next;
                 path.push(typeName);
@@ -322,7 +322,7 @@ var Query;
     }
     Query.expandPath = expandPath;
     function search(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24search")) {
             index += 9;
         }
@@ -331,11 +331,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var expr = Query.searchExpr(value, index);
+        let expr = Query.searchExpr(value, index);
         if (!expr)
             return;
         index = expr.next;
@@ -343,15 +343,15 @@ var Query;
     }
     Query.search = search;
     function searchExpr(value, index) {
-        var token = Query.searchParenExpr(value, index) ||
+        let token = Query.searchParenExpr(value, index) ||
             Query.searchTerm(value, index);
         if (!token)
             return;
         index = token.next;
-        var expr = Query.searchAndExpr(value, index) ||
+        let expr = Query.searchAndExpr(value, index) ||
             Query.searchOrExpr(value, index);
         if (expr) {
-            var left = lexer_1.default.clone(token);
+            const left = lexer_1.default.clone(token);
             token.next = expr.value.next;
             token.value = {
                 left: left,
@@ -378,16 +378,16 @@ var Query;
     }
     Query.searchTerm = searchTerm;
     function searchNotExpr(value, index) {
-        var rws = lexer_1.default.RWS(value, index);
+        let rws = lexer_1.default.RWS(value, index);
         if (!utils_1.default.equals(value, rws, "NOT"))
             return;
-        var start = index;
+        let start = index;
         index = rws + 3;
         rws = lexer_1.default.RWS(value, index);
         if (rws === index)
             return;
         index = rws;
-        var expr = Query.searchPhrase(value, index) ||
+        let expr = Query.searchPhrase(value, index) ||
             Query.searchWord(value, index);
         if (!expr)
             return;
@@ -396,16 +396,16 @@ var Query;
     }
     Query.searchNotExpr = searchNotExpr;
     function searchOrExpr(value, index) {
-        var rws = lexer_1.default.RWS(value, index);
+        let rws = lexer_1.default.RWS(value, index);
         if (rws === index || !utils_1.default.equals(value, rws, "OR"))
             return;
-        var start = index;
+        let start = index;
         index = rws + 2;
         rws = lexer_1.default.RWS(value, index);
         if (rws === index)
             return;
         index = rws;
-        var token = Query.searchExpr(value, index);
+        let token = Query.searchExpr(value, index);
         if (!token)
             return;
         index = token.next;
@@ -413,16 +413,16 @@ var Query;
     }
     Query.searchOrExpr = searchOrExpr;
     function searchAndExpr(value, index) {
-        var rws = lexer_1.default.RWS(value, index);
+        let rws = lexer_1.default.RWS(value, index);
         if (rws === index || !utils_1.default.equals(value, rws, "AND"))
             return;
-        var start = index;
+        let start = index;
         index = rws + 3;
         rws = lexer_1.default.RWS(value, index);
         if (rws === index)
             return;
         index = rws;
-        var token = Query.searchExpr(value, index);
+        let token = Query.searchExpr(value, index);
         if (!token)
             return;
         index = token.next;
@@ -430,18 +430,18 @@ var Query;
     }
     Query.searchAndExpr = searchAndExpr;
     function searchPhrase(value, index) {
-        var mark = lexer_1.default.quotationMark(value, index);
+        let mark = lexer_1.default.quotationMark(value, index);
         if (mark === index)
             return;
-        var start = index;
+        let start = index;
         index = mark;
-        var valueStart = index;
-        var ch = lexer_1.default.qcharNoAMPDQUOTE(value, index);
+        let valueStart = index;
+        let ch = lexer_1.default.qcharNoAMPDQUOTE(value, index);
         while (ch > index && !lexer_1.default.OPEN(value, index) && !lexer_1.default.CLOSE(value, index)) {
             index = ch;
             ch = lexer_1.default.qcharNoAMPDQUOTE(value, index);
         }
-        var valueEnd = index;
+        let valueEnd = index;
         mark = lexer_1.default.quotationMark(value, index);
         if (!mark)
             return;
@@ -450,29 +450,29 @@ var Query;
     }
     Query.searchPhrase = searchPhrase;
     function searchWord(value, index) {
-        var next = utils_1.default.required(value, index, lexer_1.default.ALPHA, 1);
+        let next = utils_1.default.required(value, index, lexer_1.default.ALPHA, 1);
         if (!next)
             return;
-        var start = index;
+        let start = index;
         index = next;
-        var token = lexer_1.default.tokenize(value, start, index, null, lexer_1.default.TokenType.SearchWord);
+        let token = lexer_1.default.tokenize(value, start, index, null, lexer_1.default.TokenType.SearchWord);
         token.value = token.raw;
         return token;
     }
     Query.searchWord = searchWord;
     function searchParenExpr(value, index) {
-        var open = lexer_1.default.OPEN(value, index);
+        let open = lexer_1.default.OPEN(value, index);
         if (!open)
             return;
-        var start = index;
+        let start = index;
         index = open;
         index = lexer_1.default.BWS(value, index);
-        var expr = Query.searchExpr(value, index);
+        let expr = Query.searchExpr(value, index);
         if (!expr)
             return;
         index = expr.next;
         index = lexer_1.default.BWS(value, index);
-        var close = lexer_1.default.CLOSE(value, index);
+        let close = lexer_1.default.CLOSE(value, index);
         if (!close)
             return;
         index = close;
@@ -480,7 +480,7 @@ var Query;
     }
     Query.searchParenExpr = searchParenExpr;
     function levels(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24levels")) {
             index += 9;
         }
@@ -489,17 +489,17 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var level;
+        let level;
         if (utils_1.default.equals(value, index, "max")) {
             level = "max";
             index += 3;
         }
         else {
-            var token = primitiveLiteral_1.default.int32Value(value, index);
+            let token = primitiveLiteral_1.default.int32Value(value, index);
             if (!token)
                 return;
             level = token.raw;
@@ -509,7 +509,7 @@ var Query;
     }
     Query.levels = levels;
     function filter(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24filter")) {
             index += 9;
         }
@@ -518,11 +518,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var expr = expressions_1.default.boolCommonExpr(value, index);
+        let expr = expressions_1.default.boolCommonExpr(value, index);
         if (!expr)
             return;
         index = expr.next;
@@ -530,7 +530,7 @@ var Query;
     }
     Query.filter = filter;
     function orderby(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24orderby")) {
             index += 10;
         }
@@ -539,18 +539,18 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var items = [];
-        var token = Query.orderbyItem(value, index);
+        let items = [];
+        let token = Query.orderbyItem(value, index);
         if (!token)
             return;
         index = token.next;
         while (token) {
             items.push(token);
-            var comma = lexer_1.default.COMMA(value, index);
+            let comma = lexer_1.default.COMMA(value, index);
             if (comma) {
                 index = comma;
                 token = Query.orderbyItem(value, index);
@@ -561,17 +561,17 @@ var Query;
             else
                 break;
         }
-        return lexer_1.default.tokenize(value, start, index, { items: items }, lexer_1.default.TokenType.OrderBy);
+        return lexer_1.default.tokenize(value, start, index, { items }, lexer_1.default.TokenType.OrderBy);
     }
     Query.orderby = orderby;
     function orderbyItem(value, index) {
-        var expr = expressions_1.default.commonExpr(value, index);
+        let expr = expressions_1.default.commonExpr(value, index);
         if (!expr)
             return;
-        var start = index;
+        let start = index;
         index = expr.next;
-        var direction = 1;
-        var rws = lexer_1.default.RWS(value, index);
+        let direction = 1;
+        let rws = lexer_1.default.RWS(value, index);
         if (rws > index) {
             index = rws;
             if (utils_1.default.equals(value, index, "asc"))
@@ -583,11 +583,11 @@ var Query;
             else
                 return;
         }
-        return lexer_1.default.tokenize(value, start, index, { expr: expr, direction: direction }, lexer_1.default.TokenType.OrderByItem);
+        return lexer_1.default.tokenize(value, start, index, { expr, direction }, lexer_1.default.TokenType.OrderByItem);
     }
     Query.orderbyItem = orderbyItem;
     function skip(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24skip")) {
             index += 7;
         }
@@ -596,11 +596,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var token = primitiveLiteral_1.default.int32Value(value, index);
+        let token = primitiveLiteral_1.default.int32Value(value, index);
         if (!token)
             return;
         index = token.next;
@@ -608,7 +608,7 @@ var Query;
     }
     Query.skip = skip;
     function top(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24top")) {
             index += 6;
         }
@@ -617,11 +617,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var token = primitiveLiteral_1.default.int32Value(value, index);
+        let token = primitiveLiteral_1.default.int32Value(value, index);
         if (!token)
             return;
         index = token.next;
@@ -629,7 +629,7 @@ var Query;
     }
     Query.top = top;
     function format(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24format")) {
             index += 9;
         }
@@ -638,11 +638,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var format;
+        let format;
         if (utils_1.default.equals(value, index, "atom")) {
             format = "atom";
             index += 4;
@@ -656,11 +656,11 @@ var Query;
             index += 3;
         }
         if (format)
-            return lexer_1.default.tokenize(value, start, index, { format: format }, lexer_1.default.TokenType.Format);
+            return lexer_1.default.tokenize(value, start, index, { format }, lexer_1.default.TokenType.Format);
     }
     Query.format = format;
     function inlinecount(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24count")) {
             index += 8;
         }
@@ -669,11 +669,11 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var token = primitiveLiteral_1.default.booleanValue(value, index);
+        let token = primitiveLiteral_1.default.booleanValue(value, index);
         if (!token)
             return;
         index = token.next;
@@ -681,7 +681,7 @@ var Query;
     }
     Query.inlinecount = inlinecount;
     function select(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24select")) {
             index += 9;
         }
@@ -690,18 +690,18 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var items = [];
-        var token = Query.selectItem(value, index);
+        let items = [];
+        let token = Query.selectItem(value, index);
         if (!token)
             return;
         while (token) {
             items.push(token);
             index = token.next;
-            var comma = lexer_1.default.COMMA(value, index);
+            let comma = lexer_1.default.COMMA(value, index);
             if (comma) {
                 index = comma;
                 token = Query.selectItem(value, index);
@@ -711,14 +711,14 @@ var Query;
             else
                 break;
         }
-        return lexer_1.default.tokenize(value, start, index, { items: items }, lexer_1.default.TokenType.Select);
+        return lexer_1.default.tokenize(value, start, index, { items }, lexer_1.default.TokenType.Select);
     }
     Query.select = select;
     function selectItem(value, index) {
-        var start = index;
-        var item;
-        var op = Query.allOperationsInSchema(value, index);
-        var star = lexer_1.default.STAR(value, index);
+        let start = index;
+        let item;
+        let op = Query.allOperationsInSchema(value, index);
+        let star = lexer_1.default.STAR(value, index);
         if (op > index) {
             item = { namespace: utils_1.default.stringify(value, index, op - 2), value: "*" };
             index = op;
@@ -729,7 +729,7 @@ var Query;
         }
         else {
             item = {};
-            var name = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index) ||
+            let name = nameOrIdentifier_1.default.qualifiedEntityTypeName(value, index) ||
                 nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index);
             if (name && value[name.next] !== 0x2f)
                 return;
@@ -737,75 +737,75 @@ var Query;
                 index++;
                 item.name = name;
             }
-            var select_1 = Query.selectProperty(value, index) ||
+            let select = Query.selectProperty(value, index) ||
                 Query.qualifiedActionName(value, index) ||
                 Query.qualifiedFunctionName(value, index);
-            if (!select_1)
+            if (!select)
                 return;
-            index = select_1.next;
-            item = name ? { name: name, select: select_1 } : select_1;
+            index = select.next;
+            item = name ? { name, select } : select;
         }
         if (index > start)
             return lexer_1.default.tokenize(value, start, index, item, lexer_1.default.TokenType.SelectItem);
     }
     Query.selectItem = selectItem;
     function allOperationsInSchema(value, index) {
-        var namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
-        var star = lexer_1.default.STAR(value, namespaceNext + 1);
+        let namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
+        let star = lexer_1.default.STAR(value, namespaceNext + 1);
         if (namespaceNext > index && value[namespaceNext] === 0x2e && star)
             return star;
         return index;
     }
     Query.allOperationsInSchema = allOperationsInSchema;
     function selectProperty(value, index) {
-        var token = Query.selectPath(value, index) ||
+        let token = Query.selectPath(value, index) ||
             nameOrIdentifier_1.default.primitiveProperty(value, index) ||
             nameOrIdentifier_1.default.primitiveColProperty(value, index) ||
             nameOrIdentifier_1.default.navigationProperty(value, index);
         if (!token)
             return;
-        var start = index;
+        let start = index;
         index = token.next;
         if (token.type === lexer_1.default.TokenType.SelectPath) {
             if (value[index] === 0x2f) {
                 index++;
-                var prop = Query.selectProperty(value, index);
+                let prop = Query.selectProperty(value, index);
                 if (!prop)
                     return;
-                var path = lexer_1.default.clone(token);
+                let path = lexer_1.default.clone(token);
                 token.next = prop.next;
                 token.raw = utils_1.default.stringify(value, start, token.next);
-                token.value = { path: path, next: prop };
+                token.value = { path, next: prop };
             }
         }
         return token;
     }
     Query.selectProperty = selectProperty;
     function selectPath(value, index) {
-        var token = nameOrIdentifier_1.default.complexProperty(value, index) ||
+        let token = nameOrIdentifier_1.default.complexProperty(value, index) ||
             nameOrIdentifier_1.default.complexColProperty(value, index);
         if (!token)
             return;
-        var start = index;
+        let start = index;
         index = token.next;
-        var tokenValue = token;
+        let tokenValue = token;
         if (value[index] === 0x2f) {
-            var name = nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index + 1);
+            let name = nameOrIdentifier_1.default.qualifiedComplexTypeName(value, index + 1);
             if (name) {
                 index = name.next;
-                tokenValue = { prop: token, name: name };
+                tokenValue = { prop: token, name };
             }
         }
         return lexer_1.default.tokenize(value, start, index, tokenValue, lexer_1.default.TokenType.SelectPath);
     }
     Query.selectPath = selectPath;
     function qualifiedActionName(value, index) {
-        var namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
+        let namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
         if (namespaceNext === index || value[namespaceNext] !== 0x2e)
             return;
-        var start = index;
+        let start = index;
         index = namespaceNext + 1;
-        var action = nameOrIdentifier_1.default.action(value, index);
+        let action = nameOrIdentifier_1.default.action(value, index);
         if (!action)
             return;
         action.value.namespace = utils_1.default.stringify(value, start, namespaceNext);
@@ -813,38 +813,38 @@ var Query;
     }
     Query.qualifiedActionName = qualifiedActionName;
     function qualifiedFunctionName(value, index) {
-        var namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
+        let namespaceNext = nameOrIdentifier_1.default.namespace(value, index);
         if (namespaceNext === index || value[namespaceNext] !== 0x2e)
             return;
-        var start = index;
+        let start = index;
         index = namespaceNext + 1;
-        var fn = nameOrIdentifier_1.default.odataFunction(value, index);
+        let fn = nameOrIdentifier_1.default.odataFunction(value, index);
         if (!fn)
             return;
         fn.value.namespace = utils_1.default.stringify(value, start, namespaceNext);
         index = fn.next;
-        var tokenValue = { name: fn };
-        var open = lexer_1.default.OPEN(value, index);
+        let tokenValue = { name: fn };
+        let open = lexer_1.default.OPEN(value, index);
         if (open) {
             index = open;
             tokenValue.parameters = [];
-            var param = expressions_1.default.parameterName(value, index);
+            let param = expressions_1.default.parameterName(value, index);
             if (!param)
                 return;
             while (param) {
                 index = param.next;
                 tokenValue.parameters.push(param);
-                var comma = lexer_1.default.COMMA(value, index);
+                let comma = lexer_1.default.COMMA(value, index);
                 if (comma) {
                     index = comma;
-                    var param_1 = expressions_1.default.parameterName(value, index);
-                    if (!param_1)
+                    let param = expressions_1.default.parameterName(value, index);
+                    if (!param)
                         return;
                 }
                 else
                     break;
             }
-            var close = lexer_1.default.CLOSE(value, index);
+            let close = lexer_1.default.CLOSE(value, index);
             if (!close)
                 return;
             index = close;
@@ -853,7 +853,7 @@ var Query;
     }
     Query.qualifiedFunctionName = qualifiedFunctionName;
     function skiptoken(value, index) {
-        var start = index;
+        let start = index;
         if (utils_1.default.equals(value, index, "%24skiptoken")) {
             index += 12;
         }
@@ -862,14 +862,14 @@ var Query;
         }
         else
             return;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var ch = lexer_1.default.qcharNoAMP(value, index);
+        let ch = lexer_1.default.qcharNoAMP(value, index);
         if (!ch)
             return;
-        var valueStart = index;
+        let valueStart = index;
         while (ch > index) {
             index = ch;
             ch = lexer_1.default.qcharNoAMP(value, index);
@@ -878,21 +878,21 @@ var Query;
     }
     Query.skiptoken = skiptoken;
     function aliasAndValue(value, index) {
-        var alias = expressions_1.default.parameterAlias(value, index);
+        let alias = expressions_1.default.parameterAlias(value, index);
         if (!alias)
             return;
-        var start = index;
+        let start = index;
         index = alias.next;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index = eq;
-        var paramValue = expressions_1.default.parameterValue(value, index);
+        let paramValue = expressions_1.default.parameterValue(value, index);
         if (!paramValue)
             return;
         index = paramValue.next;
         return lexer_1.default.tokenize(value, start, index, {
-            alias: alias,
+            alias,
             value: paramValue
         }, lexer_1.default.TokenType.AliasAndValue);
     }