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

package/lib/primitiveLiteral.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrimitiveLiteral = void 0;
-var utils_1 = require("./utils");
-var lexer_1 = require("./lexer");
-var nameOrIdentifier_1 = require("./nameOrIdentifier");
+const utils_1 = require("./utils");
+const lexer_1 = require("./lexer");
+const nameOrIdentifier_1 = require("./nameOrIdentifier");
 var PrimitiveLiteral;
 (function (PrimitiveLiteral) {
     function nullValue(value, index) {
@@ -32,85 +32,85 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.guidValue = guidValue;
     function sbyteValue(value, index) {
-        var start = index;
-        var sign = lexer_1.default.SIGN(value, index);
+        let start = index;
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
-        var next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 3);
+        let next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 3);
         if (next) {
             if (lexer_1.default.DIGIT(value[next]))
                 return;
-            var val = parseInt(utils_1.default.stringify(value, start, next), 10);
+            let val = parseInt(utils_1.default.stringify(value, start, next), 10);
             if (val >= -128 && val <= 127)
                 return lexer_1.default.tokenize(value, start, next, "Edm.SByte", lexer_1.default.TokenType.Literal);
         }
     }
     PrimitiveLiteral.sbyteValue = sbyteValue;
     function byteValue(value, index) {
-        var next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 3);
+        let next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 3);
         if (next) {
             if (lexer_1.default.DIGIT(value[next]))
                 return;
-            var val = parseInt(utils_1.default.stringify(value, index, next), 10);
+            let val = parseInt(utils_1.default.stringify(value, index, next), 10);
             if (val >= 0 && val <= 255)
                 return lexer_1.default.tokenize(value, index, next, "Edm.Byte", lexer_1.default.TokenType.Literal);
         }
     }
     PrimitiveLiteral.byteValue = byteValue;
     function int16Value(value, index) {
-        var start = index;
-        var sign = lexer_1.default.SIGN(value, index);
+        let start = index;
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
-        var next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 5);
+        let next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 5);
         if (next) {
             if (lexer_1.default.DIGIT(value[next]))
                 return;
-            var val = parseInt(utils_1.default.stringify(value, start, next), 10);
+            let val = parseInt(utils_1.default.stringify(value, start, next), 10);
             if (val >= -32768 && val <= 32767)
                 return lexer_1.default.tokenize(value, start, next, "Edm.Int16", lexer_1.default.TokenType.Literal);
         }
     }
     PrimitiveLiteral.int16Value = int16Value;
     function int32Value(value, index) {
-        var start = index;
-        var sign = lexer_1.default.SIGN(value, index);
+        let start = index;
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
-        var next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 10);
+        let next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 10);
         if (next) {
             if (lexer_1.default.DIGIT(value[next]))
                 return;
-            var val = parseInt(utils_1.default.stringify(value, start, next), 10);
+            let val = parseInt(utils_1.default.stringify(value, start, next), 10);
             if (val >= -2147483648 && val <= 2147483647)
                 return lexer_1.default.tokenize(value, start, next, "Edm.Int32", lexer_1.default.TokenType.Literal);
         }
     }
     PrimitiveLiteral.int32Value = int32Value;
     function int64Value(value, index) {
-        var start = index;
-        var sign = lexer_1.default.SIGN(value, index);
+        let start = index;
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
-        var next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 19);
+        let next = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 19);
         if (next) {
             if (lexer_1.default.DIGIT(value[next]))
                 return;
-            var val = utils_1.default.stringify(value, index, next);
+            let val = utils_1.default.stringify(value, index, next);
             if (val >= "0" && val <= (value[start] === 0x2d ? "9223372036854775808" : "9223372036854775807"))
                 return lexer_1.default.tokenize(value, start, next, "Edm.Int64", lexer_1.default.TokenType.Literal);
         }
     }
     PrimitiveLiteral.int64Value = int64Value;
     function decimalValue(value, index) {
-        var start = index;
-        var sign = lexer_1.default.SIGN(value, index);
+        let start = index;
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
-        var intNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
+        let intNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
         if (!intNext)
             return;
-        var end = intNext;
+        let end = intNext;
         if (value[intNext] === 0x2e) {
             end = utils_1.default.required(value, intNext + 1, lexer_1.default.DIGIT, 1);
             if (!end || end === intNext + 1)
@@ -124,20 +124,20 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.decimalValue = decimalValue;
     function doubleValue(value, index) {
-        var start = index;
-        var end = index;
-        var nanInfLen = lexer_1.default.nanInfinity(value, index);
+        let start = index;
+        let end = index;
+        let nanInfLen = lexer_1.default.nanInfinity(value, index);
         if (nanInfLen) {
             end += nanInfLen;
         }
         else {
-            var sign = lexer_1.default.SIGN(value, index);
+            let sign = lexer_1.default.SIGN(value, index);
             if (sign)
                 index = sign;
-            var intNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
+            let intNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
             if (!intNext)
                 return;
-            var decimalNext = intNext;
+            let decimalNext = intNext;
             if (value[intNext] === 0x2e) {
                 decimalNext = utils_1.default.required(value, intNext + 1, lexer_1.default.DIGIT, 1);
                 if (decimalNext === intNext + 1)
@@ -146,11 +146,11 @@ var PrimitiveLiteral;
             else
                 return;
             if (value[decimalNext] === 0x65) {
-                var next = decimalNext + 1;
-                var sign_1 = lexer_1.default.SIGN(value, next);
-                if (sign_1)
-                    next = sign_1;
-                var digitNext = utils_1.default.required(value, next, lexer_1.default.DIGIT, 1);
+                let next = decimalNext + 1;
+                let sign = lexer_1.default.SIGN(value, next);
+                if (sign)
+                    next = sign;
+                let digitNext = utils_1.default.required(value, next, lexer_1.default.DIGIT, 1);
                 if (digitNext) {
                     end = digitNext;
                 }
@@ -162,7 +162,7 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.doubleValue = doubleValue;
     function singleValue(value, index) {
-        var token = PrimitiveLiteral.doubleValue(value, index);
+        let token = PrimitiveLiteral.doubleValue(value, index);
         if (token) {
             token.value = "Edm.Single";
         }
@@ -170,8 +170,8 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.singleValue = singleValue;
     function stringValue(value, index) {
-        var start = index;
-        var squote = lexer_1.default.SQUOTE(value, start);
+        let start = index;
+        let squote = lexer_1.default.SQUOTE(value, start);
         if (squote) {
             index = squote;
             while (index < value.length) {
@@ -180,9 +180,9 @@ var PrimitiveLiteral;
                     index = squote;
                     squote = lexer_1.default.SQUOTE(value, index);
                     if (!squote) {
-                        var close = lexer_1.default.CLOSE(value, index);
-                        var comma = lexer_1.default.COMMA(value, index);
-                        var amp = value[index] === 0x26;
+                        let close = lexer_1.default.CLOSE(value, index);
+                        let comma = lexer_1.default.COMMA(value, index);
+                        let amp = value[index] === 0x26;
                         if (lexer_1.default.pcharNoSQUOTE(value, index) > index && !amp && !close && !comma && lexer_1.default.RWS(value, index) === index)
                             return;
                         break;
@@ -192,7 +192,7 @@ var PrimitiveLiteral;
                     }
                 }
                 else {
-                    var nextIndex = Math.max(lexer_1.default.RWS(value, index), lexer_1.default.pcharNoSQUOTE(value, index));
+                    let nextIndex = Math.max(lexer_1.default.RWS(value, index), lexer_1.default.pcharNoSQUOTE(value, index));
                     if (nextIndex === index)
                         return;
                     index = nextIndex;
@@ -209,8 +209,8 @@ var PrimitiveLiteral;
     function arrayValue(value, index) {
         if (!utils_1.default.equals(value, index, "(") || !(utils_1.default.equals(value, index - 3, "in") || utils_1.default.equals(value, index - 3, "notin")))
             return;
-        var start = index;
-        var squote = lexer_1.default.OPEN(value, start);
+        let start = index;
+        let squote = lexer_1.default.OPEN(value, start);
         if (squote) {
             index = squote;
             while (index < value.length) {
@@ -219,9 +219,9 @@ var PrimitiveLiteral;
                     index = squote;
                     squote = lexer_1.default.OPEN(value, index);
                     if (!squote) {
-                        var close = lexer_1.default.CLOSE(value, index);
-                        var comma = lexer_1.default.COMMA(value, index);
-                        var amp = value[index] === 0x26;
+                        let close = lexer_1.default.CLOSE(value, index);
+                        let comma = lexer_1.default.COMMA(value, index);
+                        let amp = value[index] === 0x26;
                         if (lexer_1.default.pcharNoSQUOTE(value, index) > index && !amp && !close && !comma && lexer_1.default.RWS(value, index) === index)
                             return;
                         break;
@@ -231,7 +231,7 @@ var PrimitiveLiteral;
                     }
                 }
                 else {
-                    var nextIndex = index + 1;
+                    let nextIndex = index + 1;
                     if (nextIndex === index)
                         return;
                     index = nextIndex;
@@ -244,32 +244,32 @@ var PrimitiveLiteral;
     function durationValue(value, index) {
         if (!utils_1.default.equals(value, index, "duration"))
             return;
-        var start = index;
+        let start = index;
         index += 8;
-        var squote = lexer_1.default.SQUOTE(value, index);
+        let squote = lexer_1.default.SQUOTE(value, index);
         if (!squote)
             return;
         index = squote;
-        var sign = lexer_1.default.SIGN(value, index);
+        let sign = lexer_1.default.SIGN(value, index);
         if (sign)
             index = sign;
         if (value[index] !== 0x50)
             return;
         index++;
-        var dayNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
+        let dayNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
         if (dayNext === index && value[index + 1] !== 0x54)
             return;
         index = dayNext;
         if (value[index] === 0x44)
             index++;
-        var end = index;
+        let end = index;
         if (value[index] === 0x54) {
             index++;
-            var parseTimeFn_1 = function () {
-                var squote = lexer_1.default.SQUOTE(value, index);
+            const parseTimeFn = function () {
+                let squote = lexer_1.default.SQUOTE(value, index);
                 if (squote)
                     return index;
-                var digitNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
+                let digitNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
                 if (digitNext === index)
                     return;
                 index = digitNext;
@@ -279,7 +279,7 @@ var PrimitiveLiteral;
                 }
                 else if (value[index] === 0x2e) {
                     index++;
-                    var fractionalSecondsNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
+                    let fractionalSecondsNext = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1);
                     if (fractionalSecondsNext === index || value[fractionalSecondsNext] !== 0x53)
                         return;
                     end = fractionalSecondsNext + 1;
@@ -288,15 +288,15 @@ var PrimitiveLiteral;
                 else if (value[index] === 0x48) {
                     index++;
                     end = index;
-                    return parseTimeFn_1();
+                    return parseTimeFn();
                 }
                 else if (value[index] === 0x4d) {
                     index++;
                     end = index;
-                    return parseTimeFn_1();
+                    return parseTimeFn();
                 }
             };
-            var next = parseTimeFn_1();
+            let next = parseTimeFn();
             if (!next)
                 return;
         }
@@ -308,16 +308,16 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.durationValue = durationValue;
     function binaryValue(value, index) {
-        var start = index;
+        let start = index;
         if (!utils_1.default.equals(value, index, "binary"))
             return;
         index += 6;
-        var squote = lexer_1.default.SQUOTE(value, index);
+        let squote = lexer_1.default.SQUOTE(value, index);
         if (!squote)
             return;
         index = squote;
         while (index < value.length && !(squote = lexer_1.default.SQUOTE(value, index))) {
-            var end = Math.max(lexer_1.default.base64b16(value, index), lexer_1.default.base64b8(value, index));
+            let end = Math.max(lexer_1.default.base64b16(value, index), lexer_1.default.base64b8(value, index));
             if (end > index)
                 index = end;
             else if (lexer_1.default.base64char(value[index]) &&
@@ -333,43 +333,43 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.binaryValue = binaryValue;
     function dateValue(value, index) {
-        var yearNext = lexer_1.default.year(value, index);
+        let yearNext = lexer_1.default.year(value, index);
         if (yearNext === index || value[yearNext] !== 0x2d)
             return;
-        var monthNext = lexer_1.default.month(value, yearNext + 1);
+        let monthNext = lexer_1.default.month(value, yearNext + 1);
         if ((monthNext === yearNext + 1) || value[monthNext] !== 0x2d)
             return;
-        var dayNext = lexer_1.default.day(value, monthNext + 1);
+        let dayNext = lexer_1.default.day(value, monthNext + 1);
         if (dayNext === monthNext + 1 || value[dayNext] === 0x54)
             return;
         return lexer_1.default.tokenize(value, index, dayNext, "Edm.Date", lexer_1.default.TokenType.Literal);
     }
     PrimitiveLiteral.dateValue = dateValue;
     function dateTimeOffsetValue(value, index) {
-        var yearNext = lexer_1.default.year(value, index);
+        let yearNext = lexer_1.default.year(value, index);
         if (yearNext === index || value[yearNext] !== 0x2d)
             return;
-        var monthNext = lexer_1.default.month(value, yearNext + 1);
+        let monthNext = lexer_1.default.month(value, yearNext + 1);
         if ((monthNext === yearNext + 1) || value[monthNext] !== 0x2d)
             return;
-        var dayNext = lexer_1.default.day(value, monthNext + 1);
+        let dayNext = lexer_1.default.day(value, monthNext + 1);
         if (dayNext === monthNext + 1 || value[dayNext] !== 0x54)
             return;
-        var hourNext = lexer_1.default.hour(value, dayNext + 1);
-        var colon = lexer_1.default.COLON(value, hourNext);
+        let hourNext = lexer_1.default.hour(value, dayNext + 1);
+        let colon = lexer_1.default.COLON(value, hourNext);
         if (hourNext === colon || !colon)
             return;
-        var minuteNext = lexer_1.default.minute(value, hourNext + 1);
+        let minuteNext = lexer_1.default.minute(value, hourNext + 1);
         if (minuteNext === hourNext + 1)
             return;
-        var end = minuteNext;
+        let end = minuteNext;
         colon = lexer_1.default.COLON(value, minuteNext);
         if (colon) {
-            var secondNext = lexer_1.default.second(value, colon);
+            let secondNext = lexer_1.default.second(value, colon);
             if (secondNext === colon)
                 return;
             if (value[secondNext] === 0x2e) {
-                var fractionalSecondsNext = lexer_1.default.fractionalSeconds(value, secondNext + 1);
+                let fractionalSecondsNext = lexer_1.default.fractionalSeconds(value, secondNext + 1);
                 if (fractionalSecondsNext === secondNext + 1)
                     return;
                 end = fractionalSecondsNext;
@@ -377,17 +377,17 @@ var PrimitiveLiteral;
             else
                 end = secondNext;
         }
-        var sign = lexer_1.default.SIGN(value, end);
+        let sign = lexer_1.default.SIGN(value, end);
         if (value[end] === 0x5a) {
             end++;
         }
         else if (sign) {
-            var zHourNext = lexer_1.default.hour(value, sign);
-            var colon_1 = lexer_1.default.COLON(value, zHourNext);
-            if (zHourNext === sign || !colon_1)
+            let zHourNext = lexer_1.default.hour(value, sign);
+            let colon = lexer_1.default.COLON(value, zHourNext);
+            if (zHourNext === sign || !colon)
                 return;
-            var zMinuteNext = lexer_1.default.minute(value, colon_1);
-            if (zMinuteNext === colon_1)
+            let zMinuteNext = lexer_1.default.minute(value, colon);
+            if (zMinuteNext === colon)
                 return;
             end = zMinuteNext;
         }
@@ -397,21 +397,21 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.dateTimeOffsetValue = dateTimeOffsetValue;
     function timeOfDayValue(value, index) {
-        var hourNext = lexer_1.default.hour(value, index);
-        var colon = lexer_1.default.COLON(value, hourNext);
+        let hourNext = lexer_1.default.hour(value, index);
+        let colon = lexer_1.default.COLON(value, hourNext);
         if (hourNext === index || !colon)
             return;
-        var minuteNext = lexer_1.default.minute(value, colon);
+        let minuteNext = lexer_1.default.minute(value, colon);
         if (minuteNext === colon)
             return;
-        var end = minuteNext;
+        let end = minuteNext;
         colon = lexer_1.default.COLON(value, minuteNext);
         if (colon) {
-            var secondNext = lexer_1.default.second(value, colon);
+            let secondNext = lexer_1.default.second(value, colon);
             if (secondNext === colon)
                 return;
             if (value[secondNext] === 0x2e) {
-                var fractionalSecondsNext = lexer_1.default.fractionalSeconds(value, secondNext + 1);
+                let fractionalSecondsNext = lexer_1.default.fractionalSeconds(value, secondNext + 1);
                 if (fractionalSecondsNext === secondNext + 1)
                     return;
                 end = fractionalSecondsNext;
@@ -423,29 +423,29 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.timeOfDayValue = timeOfDayValue;
     function positionLiteral(value, index) {
-        var longitude = PrimitiveLiteral.doubleValue(value, index);
+        let longitude = PrimitiveLiteral.doubleValue(value, index);
         if (!longitude)
             return;
-        var next = lexer_1.default.RWS(value, longitude.next);
+        let next = lexer_1.default.RWS(value, longitude.next);
         if (next === longitude.next)
             return;
-        var latitude = PrimitiveLiteral.doubleValue(value, next);
+        let latitude = PrimitiveLiteral.doubleValue(value, next);
         if (!latitude)
             return;
-        return lexer_1.default.tokenize(value, index, latitude.next, { longitude: longitude, latitude: latitude }, lexer_1.default.TokenType.Literal);
+        return lexer_1.default.tokenize(value, index, latitude.next, { longitude, latitude }, lexer_1.default.TokenType.Literal);
     }
     PrimitiveLiteral.positionLiteral = positionLiteral;
     function pointData(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;
-        var position = PrimitiveLiteral.positionLiteral(value, index);
+        let position = PrimitiveLiteral.positionLiteral(value, index);
         if (!position)
             return;
         index = position.next;
-        var close = lexer_1.default.CLOSE(value, index);
+        let close = lexer_1.default.CLOSE(value, index);
         if (!close)
             return;
         index = close;
@@ -467,17 +467,17 @@ var PrimitiveLiteral;
     function sridLiteral(value, index) {
         if (!utils_1.default.equals(value, index, "SRID"))
             return;
-        var start = index;
+        let start = index;
         index += 4;
-        var eq = lexer_1.default.EQ(value, index);
+        let eq = lexer_1.default.EQ(value, index);
         if (!eq)
             return;
         index++;
-        var digit = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 5);
+        let digit = utils_1.default.required(value, index, lexer_1.default.DIGIT, 1, 5);
         if (!digit)
             return;
         index = digit;
-        var semi = lexer_1.default.SEMI(value, index);
+        let semi = lexer_1.default.SEMI(value, index);
         if (!semi)
             return;
         index = semi;
@@ -487,9 +487,9 @@ var PrimitiveLiteral;
     function pointLiteral(value, index) {
         if (!utils_1.default.equals(value, index, "Point"))
             return;
-        var start = index;
+        let start = index;
         index += 5;
-        var data = PrimitiveLiteral.pointData(value, index);
+        let data = PrimitiveLiteral.pointData(value, index);
         if (!data)
             return;
         return lexer_1.default.tokenize(value, start, data.next, data, lexer_1.default.TokenType.Literal);
@@ -498,9 +498,9 @@ var PrimitiveLiteral;
     function polygonLiteral(value, index) {
         if (!utils_1.default.equals(value, index, "Polygon"))
             return;
-        var start = index;
+        let start = index;
         index += 7;
-        var data = PrimitiveLiteral.polygonData(value, index);
+        let data = PrimitiveLiteral.polygonData(value, index);
         if (!data)
             return;
         return lexer_1.default.tokenize(value, start, data.next, data, lexer_1.default.TokenType.Literal);
@@ -513,9 +513,9 @@ var PrimitiveLiteral;
     function lineStringLiteral(value, index) {
         if (!utils_1.default.equals(value, index, "LineString"))
             return;
-        var start = index;
+        let start = index;
         index += 10;
-        var data = PrimitiveLiteral.lineStringData(value, index);
+        let data = PrimitiveLiteral.lineStringData(value, index);
         if (!data)
             return;
         index = data.next;
@@ -537,21 +537,21 @@ var PrimitiveLiteral;
     function multiGeoLiteralFactory(value, index, prefix, itemLiteral) {
         if (!utils_1.default.equals(value, index, prefix + "("))
             return;
-        var start = index;
+        let start = index;
         index += prefix.length + 1;
-        var items = [];
-        var geo = itemLiteral(value, index);
+        let items = [];
+        let geo = itemLiteral(value, index);
         if (!geo)
             return;
         index = geo.next;
         while (geo) {
             items.push(geo);
-            var close = lexer_1.default.CLOSE(value, index);
+            let close = lexer_1.default.CLOSE(value, index);
             if (close) {
                 index = close;
                 break;
             }
-            var comma = lexer_1.default.COMMA(value, index);
+            let comma = lexer_1.default.COMMA(value, index);
             if (!comma)
                 return;
             index = comma;
@@ -560,18 +560,18 @@ var PrimitiveLiteral;
                 return;
             index = geo.next;
         }
-        return lexer_1.default.tokenize(value, start, index, { items: items }, lexer_1.default.TokenType.Literal);
+        return lexer_1.default.tokenize(value, start, index, { items }, lexer_1.default.TokenType.Literal);
     }
     PrimitiveLiteral.multiGeoLiteralFactory = multiGeoLiteralFactory;
     function multiGeoLiteralOptionalFactory(value, index, prefix, itemLiteral) {
         if (!utils_1.default.equals(value, index, prefix + "("))
             return;
-        var start = index;
+        let start = index;
         index += prefix.length + 1;
-        var items = [];
-        var close = lexer_1.default.CLOSE(value, index);
+        let items = [];
+        let close = lexer_1.default.CLOSE(value, index);
         if (!close) {
-            var geo = itemLiteral(value, index);
+            let geo = itemLiteral(value, index);
             if (!geo)
                 return;
             index = geo.next;
@@ -582,7 +582,7 @@ var PrimitiveLiteral;
                     index = close;
                     break;
                 }
-                var comma = lexer_1.default.COMMA(value, index);
+                let comma = lexer_1.default.COMMA(value, index);
                 if (!comma)
                     return;
                 index = comma;
@@ -594,7 +594,7 @@ var PrimitiveLiteral;
         }
         else
             index++;
-        return lexer_1.default.tokenize(value, start, index, { items: items }, lexer_1.default.TokenType.Literal);
+        return lexer_1.default.tokenize(value, start, index, { items }, lexer_1.default.TokenType.Literal);
     }
     PrimitiveLiteral.multiGeoLiteralOptionalFactory = multiGeoLiteralOptionalFactory;
     function geoLiteral(value, index) {
@@ -636,26 +636,26 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.fullPolygonLiteral = fullPolygonLiteral;
     function fullGeoLiteralFactory(value, index, literal) {
-        var srid = PrimitiveLiteral.sridLiteral(value, index);
+        let srid = PrimitiveLiteral.sridLiteral(value, index);
         if (!srid)
             return;
-        var token = literal(value, srid.next);
+        let token = literal(value, srid.next);
         if (!token)
             return;
-        return lexer_1.default.tokenize(value, index, token.next, { srid: srid, value: token }, lexer_1.default.TokenType.Literal);
+        return lexer_1.default.tokenize(value, index, token.next, { srid, value: token }, lexer_1.default.TokenType.Literal);
     }
     PrimitiveLiteral.fullGeoLiteralFactory = fullGeoLiteralFactory;
     function geographyCollection(value, index) {
-        var prefix = lexer_1.default.geographyPrefix(value, index);
+        let prefix = lexer_1.default.geographyPrefix(value, index);
         if (prefix === index)
             return;
-        var start = index;
+        let start = index;
         index = prefix;
-        var squote = lexer_1.default.SQUOTE(value, index);
+        let squote = lexer_1.default.SQUOTE(value, index);
         if (!squote)
             return;
         index = squote;
-        var point = PrimitiveLiteral.fullCollectionLiteral(value, index);
+        let point = PrimitiveLiteral.fullCollectionLiteral(value, index);
         if (!point)
             return;
         index = point.next;
@@ -719,16 +719,16 @@ var PrimitiveLiteral;
     }
     PrimitiveLiteral.geometryPolygon = geometryPolygon;
     function geoLiteralFactory(value, index, type, prefix, literal) {
-        var prefixNext = prefix(value, index);
+        let prefixNext = prefix(value, index);
         if (prefixNext === index)
             return;
-        var start = index;
+        let start = index;
         index = prefixNext;
-        var squote = lexer_1.default.SQUOTE(value, index);
+        let squote = lexer_1.default.SQUOTE(value, index);
         if (!squote)
             return;
         index = squote;
-        var data = literal(value, index);
+        let data = literal(value, index);
         if (!data)
             return;
         index = data.next;