@shko.online/dataverse-odata 0.2.0 → 0.2.1

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "js/ts.tsdk.path": "node_modules\\typescript\\lib"
+}

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.2.1](https://github.com/Shko-Online/dataverse-odata/compare/v0.2.0...v0.2.1) (2026-05-13)
+
+
+### Bug Fixes
+
+* Fixed exports for index ([d623a40](https://github.com/Shko-Online/dataverse-odata/commit/d623a40515dec7888997634cbf5d043ebbf91461))
+
 # [0.2.0](https://github.com/Shko-Online/dataverse-odata/compare/v0.1.6...v0.2.0) (2026-04-11)
 
 

package/azure-pipelines.yml

@@ -2,9 +2,9 @@ pool:
   vmImage: ubuntu-latest
 
 steps:
-- task: NodeTool@1
+- task: UseNode@1
   inputs:
-    versionSpec: '24.x'
+    version: '24.x'
   displayName: 'Install Node.js'
 
 - task: Npm@1

package/lib/cjs/getFetchXmlFromParser.js

@@ -31,7 +31,7 @@ const getFetchXmlFromParser = (parser, result) => {
     return false;
   }
   const entity = fetchXmlDocument.evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null).iterateNext();
-  if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+  if (fetchXmlDocument.documentElement.children.length != 1 || !entity?.getAttribute('name')) {
     result.error = {
       code: '0x80041102',
       message: 'Entity Name was not specified in FetchXml String.'

package/lib/cjs/getFilterFromParser.js

@@ -67,7 +67,7 @@ function tokenize(input) {
         value: input.slice(i, i + 36)
       });
       i += 36;
-    } else if (/[0-9]/.test(input[i]) || input[i] === '-' && /[0-9]/.test(input[i + 1] ?? '')) {
+    } else if (/\d/.test(input[i]) || input[i] === '-' && /\d/.test(input[i + 1] ?? '')) {
       let j = i;
       if (input[j] === '-') j++;
       while (j < input.length && /[0-9.]/.test(input[j])) j++;
@@ -78,7 +78,7 @@ function tokenize(input) {
       i = j;
     } else if (/[a-zA-Z_]/.test(input[i])) {
       let j = i;
-      while (j < input.length && /[a-zA-Z0-9_]/.test(input[j])) j++;
+      while (j < input.length && /\w/.test(input[j])) j++;
       tokens.push({
         type: 'word',
         value: input.slice(i, j)
@@ -101,13 +101,15 @@ class FilterParser {
   }
   consume(expected) {
     const token = this.tokens[this.pos++];
-    if (!token) throw new Error(`Unexpected end of filter expression${expected ? `, expected ${expected}` : ''}`);
+    const expectedString = expected ? `, expected ${expected}` : '';
+    if (!token) throw new Error(`Unexpected end of filter expression${expectedString}`);
     return token;
   }
   expect(type, value) {
-    const token = this.consume(`${type}${value ? ` '${value}'` : ''}`);
+    const valueString = value ? ` '${value}'` : '';
+    const token = this.consume(`${type}${valueString}`);
     if (token.type !== type || value !== undefined && token.value !== value) {
-      throw new Error(`Expected ${type}${value ? ` '${value}'` : ''} but got ${token.type} '${token.value}'`);
+      throw new Error(`Expected ${type}${valueString} but got ${token.type} '${token.value}'`);
     }
     return token;
   }

package/lib/cjs/index.js

@@ -3,7 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _parseOData.parseOData;
+  }
+});
+Object.defineProperty(exports, "getAliasedProperty", {
+  enumerable: true,
+  get: function () {
+    return _getAliasedProperty.getAliasedProperty;
+  }
+});
 Object.defineProperty(exports, "getExpandFromParser", {
   enumerable: true,
   get: function () {
@@ -16,6 +27,12 @@ Object.defineProperty(exports, "getFetchXmlFromParser", {
     return _getFetchXmlFromParser.getFetchXmlFromParser;
   }
 });
+Object.defineProperty(exports, "getFilterFromParser", {
+  enumerable: true,
+  get: function () {
+    return _getFilterFromParser.getFilterFromParser;
+  }
+});
 Object.defineProperty(exports, "getOrderByFromParser", {
   enumerable: true,
   get: function () {
@@ -46,11 +63,12 @@ Object.defineProperty(exports, "parseOData", {
     return _parseOData.parseOData;
   }
 });
+var _getAliasedProperty = require("./getAliasedProperty");
 var _getExpandFromParser = require("./getExpandFromParser");
 var _getFetchXmlFromParser = require("./getFetchXmlFromParser");
+var _getFilterFromParser = require("./getFilterFromParser");
 var _getOrderByFromParser = require("./getOrderByFromParser");
 var _getSelectFromParser = require("./getSelectFromParser");
 var _getTopFromParser = require("./getTopFromParser");
 var _getXQueryFromParser = require("./getXQueryFromParser");
-var _parseOData = require("./parseOData");
-var _default = exports.default = _parseOData.parseOData;
+var _parseOData = require("./parseOData");

package/lib/esm/getFetchXmlFromParser.js

@@ -25,7 +25,7 @@ export const getFetchXmlFromParser = (parser, result) => {
     return false;
   }
   const entity = fetchXmlDocument.evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null).iterateNext();
-  if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+  if (fetchXmlDocument.documentElement.children.length != 1 || !entity?.getAttribute('name')) {
     result.error = {
       code: '0x80041102',
       message: 'Entity Name was not specified in FetchXml String.'

package/lib/esm/getFilterFromParser.js

@@ -61,7 +61,7 @@ function tokenize(input) {
         value: input.slice(i, i + 36)
       });
       i += 36;
-    } else if (/[0-9]/.test(input[i]) || input[i] === '-' && /[0-9]/.test(input[i + 1] ?? '')) {
+    } else if (/\d/.test(input[i]) || input[i] === '-' && /\d/.test(input[i + 1] ?? '')) {
       let j = i;
       if (input[j] === '-') j++;
       while (j < input.length && /[0-9.]/.test(input[j])) j++;
@@ -72,7 +72,7 @@ function tokenize(input) {
       i = j;
     } else if (/[a-zA-Z_]/.test(input[i])) {
       let j = i;
-      while (j < input.length && /[a-zA-Z0-9_]/.test(input[j])) j++;
+      while (j < input.length && /\w/.test(input[j])) j++;
       tokens.push({
         type: 'word',
         value: input.slice(i, j)
@@ -95,13 +95,15 @@ class FilterParser {
   }
   consume(expected) {
     const token = this.tokens[this.pos++];
-    if (!token) throw new Error(`Unexpected end of filter expression${expected ? `, expected ${expected}` : ''}`);
+    const expectedString = expected ? `, expected ${expected}` : '';
+    if (!token) throw new Error(`Unexpected end of filter expression${expectedString}`);
     return token;
   }
   expect(type, value) {
-    const token = this.consume(`${type}${value ? ` '${value}'` : ''}`);
+    const valueString = value ? ` '${value}'` : '';
+    const token = this.consume(`${type}${valueString}`);
     if (token.type !== type || value !== undefined && token.value !== value) {
-      throw new Error(`Expected ${type}${value ? ` '${value}'` : ''} but got ${token.type} '${token.value}'`);
+      throw new Error(`Expected ${type}${valueString} but got ${token.type} '${token.value}'`);
     }
     return token;
   }

package/lib/esm/index.js

@@ -1,9 +1,9 @@
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';

package/lib/modern/getFetchXmlFromParser.js

@@ -25,7 +25,7 @@ export const getFetchXmlFromParser = (parser, result) => {
     return false;
   }
   const entity = fetchXmlDocument.evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null).iterateNext();
-  if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+  if (fetchXmlDocument.documentElement.children.length != 1 || !(entity !== null && entity !== void 0 && entity.getAttribute('name'))) {
     result.error = {
       code: '0x80041102',
       message: 'Entity Name was not specified in FetchXml String.'

package/lib/modern/getFilterFromParser.js

@@ -62,7 +62,7 @@ function tokenize(input) {
         value: input.slice(i, i + 36)
       });
       i += 36;
-    } else if (/[0-9]/.test(input[i]) || input[i] === '-' && /[0-9]/.test((_input = input[i + 1]) !== null && _input !== void 0 ? _input : '')) {
+    } else if (/\d/.test(input[i]) || input[i] === '-' && /\d/.test((_input = input[i + 1]) !== null && _input !== void 0 ? _input : '')) {
       let j = i;
       if (input[j] === '-') j++;
       while (j < input.length && /[0-9.]/.test(input[j])) j++;
@@ -73,7 +73,7 @@ function tokenize(input) {
       i = j;
     } else if (/[a-zA-Z_]/.test(input[i])) {
       let j = i;
-      while (j < input.length && /[a-zA-Z0-9_]/.test(input[j])) j++;
+      while (j < input.length && /\w/.test(input[j])) j++;
       tokens.push({
         type: 'word',
         value: input.slice(i, j)
@@ -97,13 +97,15 @@ class FilterParser {
   }
   consume(expected) {
     const token = this.tokens[this.pos++];
-    if (!token) throw new Error(`Unexpected end of filter expression${expected ? `, expected ${expected}` : ''}`);
+    const expectedString = expected ? `, expected ${expected}` : '';
+    if (!token) throw new Error(`Unexpected end of filter expression${expectedString}`);
     return token;
   }
   expect(type, value) {
-    const token = this.consume(`${type}${value ? ` '${value}'` : ''}`);
+    const valueString = value ? ` '${value}'` : '';
+    const token = this.consume(`${type}${valueString}`);
     if (token.type !== type || value !== undefined && token.value !== value) {
-      throw new Error(`Expected ${type}${value ? ` '${value}'` : ''} but got ${token.type} '${token.value}'`);
+      throw new Error(`Expected ${type}${valueString} but got ${token.type} '${token.value}'`);
     }
     return token;
   }

package/lib/modern/index.js

@@ -1,9 +1,9 @@
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';

package/lib/ts3.4/index.d.ts

@@ -1,11 +1,11 @@
-export { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export { BinaryOperator, ColumnOperator, FilterOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataOrderBy, ODataQuery, ODataSavedQuery, ODataSelect, ODataTop, ODataUserQuery, QueryFunctionOperator, QueryFunctionOperators, StandardOperator, StandardOperators, UnaryOperator, } from './OData.types';
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';
 //# sourceMappingURL=index.d.ts.map

package/lib/ts3.9/index.d.ts

@@ -1,11 +1,11 @@
-export type { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export type { BinaryOperator, ColumnOperator, FilterOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataOrderBy, ODataQuery, ODataSavedQuery, ODataSelect, ODataTop, ODataUserQuery, QueryFunctionOperator, QueryFunctionOperators, StandardOperator, StandardOperators, UnaryOperator, } from './OData.types';
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';
 //# sourceMappingURL=index.d.ts.map

package/lib/ts4.2/getFilterFromParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilterFromParser.d.ts","sourceRoot":"","sources":["../../src/getFilterFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,eAAe,CAAC;AAuMhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,eAAe,EAAE,QAAQ,UAAU,KAAG,OAoBjF,CAAC"}
+{"version":3,"file":"getFilterFromParser.d.ts","sourceRoot":"","sources":["../../src/getFilterFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,eAAe,CAAC;AAyMhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,eAAe,EAAE,QAAQ,UAAU,KAAG,OAoBjF,CAAC"}

package/lib/ts4.2/index.d.ts

@@ -1,11 +1,11 @@
-export type { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export type { BinaryOperator, ColumnOperator, FilterOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataOrderBy, ODataQuery, ODataSavedQuery, ODataSelect, ODataTop, ODataUserQuery, QueryFunctionOperator, QueryFunctionOperators, StandardOperator, StandardOperators, UnaryOperator, } from './OData.types';
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';
 //# sourceMappingURL=index.d.ts.map

package/lib/ts4.2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,UAAU,EACV,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,GACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,cAAc,EACd,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,WAAW,EACX,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,GAChB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shko.online/dataverse-odata",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "This package will help parse OData strings (only the Microsoft Dataverse subset). It can be used as a validator, or you can build some javascript library which consumes the output of this library.",
   "scripts": {
     "build": "npm run lint && build-npm-package",
@@ -43,8 +43,8 @@
   },
   "homepage": "https://github.com/shko-online/dataverse-odata#readme",
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
+    "@babel/cli": "^7.28.6",
+    "@babel/core": "^7.29.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/plugin-proposal-export-default-from": "^7.18.10",
@@ -53,11 +53,11 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.20.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-flow": "^7.18.6",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@emotion/babel-plugin": "^11.10.5",
+    "@babel/preset-env": "^7.29.2",
+    "@babel/preset-flow": "^7.27.1",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
+    "@emotion/babel-plugin": "^11.13.5",
     "@jest/globals": "^29.4.2",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^13.0.1",

package/src/getFetchXmlFromParser.ts

@@ -30,7 +30,7 @@ export const getFetchXmlFromParser = (parser: URLSearchParams, result: ODataQuer
     const entity = fetchXmlDocument
         .evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null)
         .iterateNext() as Element;
-    if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+    if (fetchXmlDocument.documentElement.children.length != 1 || !entity?.getAttribute('name')) {
         result.error = {
             code: '0x80041102',
             message: 'Entity Name was not specified in FetchXml String.',

package/src/getFilterFromParser.ts

@@ -63,7 +63,7 @@ function tokenize(input: string): Token[] {
         } else if (/[0-9a-fA-F]/.test(input[i]) && GUID_REGEX.test(input.slice(i))) {
             tokens.push({ type: 'string', value: input.slice(i, i + 36) });
             i += 36;
-        } else if (/[0-9]/.test(input[i]) || (input[i] === '-' && /[0-9]/.test(input[i + 1] ?? ''))) {
+        } else if (/\d/.test(input[i]) || (input[i] === '-' && /\d/.test(input[i + 1] ?? ''))) {
             let j = i;
             if (input[j] === '-') j++;
             while (j < input.length && /[0-9.]/.test(input[j])) j++;
@@ -71,7 +71,7 @@ function tokenize(input: string): Token[] {
             i = j;
         } else if (/[a-zA-Z_]/.test(input[i])) {
             let j = i;
-            while (j < input.length && /[a-zA-Z0-9_]/.test(input[j])) j++;
+            while (j < input.length && /\w/.test(input[j])) j++;
             tokens.push({ type: 'word', value: input.slice(i, j) });
             i = j;
         } else {
@@ -82,7 +82,7 @@ function tokenize(input: string): Token[] {
 }
 
 class FilterParser {
-    private tokens: Token[];
+    private readonly tokens: Token[];
     private pos = 0;
 
     constructor(tokens: Token[]) {
@@ -95,15 +95,17 @@ class FilterParser {
 
     private consume(expected?: string): Token {
         const token = this.tokens[this.pos++];
-        if (!token) throw new Error(`Unexpected end of filter expression${expected ? `, expected ${expected}` : ''}`);
+        const expectedString = expected ? `, expected ${expected}` : '';
+        if (!token) throw new Error(`Unexpected end of filter expression${expectedString}`);
         return token;
     }
 
     private expect(type: TokenType, value?: string): Token {
-        const token = this.consume(`${type}${value ? ` '${value}'` : ''}`);
+      const valueString = value ? ` '${value}'` : '';
+        const token = this.consume(`${type}${valueString}`);
         if (token.type !== type || (value !== undefined && token.value !== value)) {
             throw new Error(
-                `Expected ${type}${value ? ` '${value}'` : ''} but got ${token.type} '${token.value}'`,
+                `Expected ${type}${valueString} but got ${token.type} '${token.value}'`,
             );
         }
         return token;

package/src/index.ts

@@ -1,24 +1,32 @@
 export type {
     BinaryOperator,
+    ColumnOperator,
+    FilterOperator,
     ODataError,
     ODataExpand,
     ODataExpandQuery,
     ODataFetch,
     ODataFilter,
+    ODataOrderBy,
     ODataQuery,
+    ODataSavedQuery,
     ODataSelect,
     ODataTop,
+    ODataUserQuery,
+    QueryFunctionOperator,
+    QueryFunctionOperators,
     StandardOperator,
     StandardOperators,
+    UnaryOperator,
 } from './OData.types';
 
+export { getAliasedProperty } from './getAliasedProperty';
 export { getExpandFromParser } from './getExpandFromParser';
 export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export { getFilterFromParser } from './getFilterFromParser';
 export { getOrderByFromParser } from './getOrderByFromParser';
 export { getSelectFromParser } from './getSelectFromParser';
 export { getTopFromParser } from './getTopFromParser';
 export { getXQueryFromParser } from './getXQueryFromParser';
 
-export { parseOData } from './parseOData';
-import { parseOData } from './parseOData';
-export default parseOData;
+export { parseOData, parseOData as default } from './parseOData';