@shko.online/dataverse-odata 0.1.0

package/lib/getExpandFromParser.js

@@ -0,0 +1,97 @@
+import { getSelectFromParser } from './getSelectFromParser';
+/**
+ * Parses the $expand query
+ * @returns Returns true when the parse has an error
+ */
+export var getExpandFromParser = function (parser, result) {
+    var $expand = parser.get('$expand');
+    if ($expand !== null) {
+        result.$expand = {};
+        if (extractExpand($expand, result)) {
+            return true;
+        }
+    }
+    return false;
+};
+var extractExpand = function (value, $expand) {
+    var match = value.match(/^\s*(\w(\w|\d|_)*)\s*(,|\()?\s*/);
+    if (match === null ||
+        (match[0].length < value.length && match[3] === null) ||
+        (match[0].length === value.length && match[3] !== undefined)) {
+        $expand.error = {
+            code: '0x0',
+            message: 'invalid expand expression',
+        };
+        return true;
+    }
+    var matchSeparator = match[3];
+    var matchLength = match[0].length;
+    if (matchSeparator !== '(') {
+        if ($expand.$expand !== undefined) {
+            $expand.$expand[match[1]] = { $select: [] };
+        }
+    }
+    else {
+        var _a = getClosingBracket(value.substring(matchLength)), index = _a.index, error = _a.error;
+        if (error) {
+            $expand.error = {
+                code: '0x0',
+                message: error,
+            };
+            return true;
+        }
+        if ($expand.$expand !== undefined) {
+            var innerExpand = {};
+            var parser = new URLSearchParams('?' + value.substring(matchLength, matchLength + index));
+            if (getSelectFromParser(parser, innerExpand)) {
+                $expand.error = innerExpand.error;
+                return true;
+            }
+            if (getExpandFromParser(parser, innerExpand)) {
+                $expand.error = innerExpand.error;
+                return true;
+            }
+            if (innerExpand.$expand === undefined && innerExpand.$select === undefined) {
+                $expand.error = { code: '0x0', message: 'Empty expand' };
+                return true;
+            }
+            $expand.$expand[match[1]] = innerExpand;
+        }
+        matchLength = matchLength + index;
+        var secondMatch = value.substring(matchLength + 1).match(/\s*(,?)\s*d/);
+        if (secondMatch !== null) {
+            matchLength = matchLength + secondMatch[0].length;
+            if (secondMatch[1] !== null) {
+                matchSeparator = ',';
+            }
+        }
+    }
+    if (matchSeparator === ',') {
+        if (extractExpand(value.substring(matchLength), $expand)) {
+            return true;
+        }
+    }
+    return false;
+};
+var getClosingBracket = function (value) {
+    var depth = 1;
+    var startAt = 0;
+    while (depth > 0) {
+        var match = value.substring(startAt).match(/\(|\)/);
+        if (match === null) {
+            return { error: 'no closing bracket found', index: -1 };
+        }
+        if (match[0] === ')') {
+            depth -= 1;
+            if (depth === 0) {
+                return { index: match.index || 0 };
+            }
+        }
+        else {
+            depth += 1;
+        }
+        startAt = (match.index || 0) + 1;
+    }
+    return { error: 'no closing bracket found', index: -1 };
+};
+//# sourceMappingURL=getExpandFromParser.js.map

package/lib/getExpandFromParser.js.map

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

package/lib/getFetchXmlFromParser.d.ts

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $fetchXml query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getFetchXmlFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getFetchXmlFromParser.d.ts.map

package/lib/getFetchXmlFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFetchXmlFromParser.d.ts","sourceRoot":"","sources":["../src/getFetchXmlFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,WAAY,eAAe,UAAU,UAAU,KAAG,OAyCnF,CAAC"}

package/lib/getFetchXmlFromParser.js

@@ -0,0 +1,41 @@
+/**
+ * Parses the $fetchXml query
+ * @returns Returns true when the parse has an error
+ */
+export var getFetchXmlFromParser = function (parser, result) {
+    var fetchXml = parser.get('fetchXml');
+    if (fetchXml !== null) {
+        var serializer = new DOMParser();
+        var fetchXmlDocument = serializer.parseFromString(fetchXml, 'text/xml');
+        if (fetchXmlDocument.documentElement.tagName === 'parsererror') {
+            result.error = {
+                code: '0x80040201',
+                message: 'Invalid XML.',
+            };
+            return true;
+        }
+        var entity = fetchXmlDocument
+            .evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null)
+            .iterateNext();
+        if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+            result.error = {
+                code: '0x80041102',
+                message: 'Entity Name was not specified in FetchXml String.',
+            };
+            return true;
+        }
+        var invalidAttribute = fetchXmlDocument
+            .evaluate('fetch/entity/*[not(self::filter or self::order or self::link-entity or self::attribute or self::all-attributes or self::no-attrs)]', fetchXmlDocument, null, XPathResult.ANY_TYPE, null)
+            .iterateNext();
+        if (invalidAttribute) {
+            result.error = {
+                code: '0x8004111c',
+                message: "Invalid Child Node, valid nodes are filter, order, link-entity, attribute, all-attributes, no-attrs. NodeName = ".concat(invalidAttribute.tagName, " NodeXml = ").concat(invalidAttribute.outerHTML),
+            };
+            return true;
+        }
+        result.fetchXml = fetchXmlDocument;
+    }
+    return false;
+};
+//# sourceMappingURL=getFetchXmlFromParser.js.map

package/lib/getFetchXmlFromParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFetchXmlFromParser.js","sourceRoot":"","sources":["../src/getFetchXmlFromParser.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,IAAM,qBAAqB,GAAG,UAAC,MAAuB,EAAE,MAAkB;IAC7E,IAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,IAAI,QAAQ,KAAK,IAAI,EAAE;QACnB,IAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAC;QACnC,IAAM,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1E,IAAI,gBAAgB,CAAC,eAAe,CAAC,OAAO,KAAK,aAAa,EAAE;YAC5D,MAAM,CAAC,KAAK,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,cAAc;aAC1B,CAAC;YACF,OAAO,IAAI,CAAC;SACf;QACD,IAAM,MAAM,GAAG,gBAAgB;aAC1B,QAAQ,CAAC,cAAc,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC;aAC5E,WAAW,EAAa,CAAC;QAC9B,IAAI,gBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YAClG,MAAM,CAAC,KAAK,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,mDAAmD;aAC/D,CAAC;YACF,OAAO,IAAI,CAAC;SACf;QACD,IAAM,gBAAgB,GAAG,gBAAgB;aACpC,QAAQ,CACL,oIAAoI,EACpI,gBAAgB,EAChB,IAAI,EACJ,WAAW,CAAC,QAAQ,EACpB,IAAI,CACP;aACA,WAAW,EAAa,CAAC;QAC9B,IAAI,gBAAgB,EAAE;YAClB,MAAM,CAAC,KAAK,GAAG;gBACX,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,0HAAmH,gBAAgB,CAAC,OAAO,wBAAc,gBAAgB,CAAC,SAAS,CAAE;aACjM,CAAC;YACF,OAAO,IAAI,CAAC;SACf;QACD,MAAM,CAAC,QAAQ,GAAG,gBAAgB,CAAC;KACtC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}

package/lib/getSelectFromParser.d.ts

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $select query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getSelectFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getSelectFromParser.d.ts.map

package/lib/getSelectFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSelectFromParser.d.ts","sourceRoot":"","sources":["../src/getSelectFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAY,eAAe,UAAU,UAAU,KAAG,OAMjF,CAAC"}

package/lib/getSelectFromParser.js

@@ -0,0 +1,12 @@
+/**
+ * Parses the $select query
+ * @returns Returns true when the parse has an error
+ */
+export var getSelectFromParser = function (parser, result) {
+    var $select = parser.get('$select');
+    if ($select !== null) {
+        result.$select = $select.split(',');
+    }
+    return false;
+};
+//# sourceMappingURL=getSelectFromParser.js.map

package/lib/getSelectFromParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSelectFromParser.js","sourceRoot":"","sources":["../src/getSelectFromParser.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAAC,MAAuB,EAAE,MAAkB;IAC3E,IAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,OAAO,KAAK,IAAI,EAAE;QAClB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACvC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}

package/lib/getTopFromParser.d.ts

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $top query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getTopFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getTopFromParser.d.ts.map

package/lib/getTopFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTopFromParser.d.ts","sourceRoot":"","sources":["../src/getTopFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WAAY,eAAe,UAAU,UAAU,KAAG,OAoB9E,CAAC"}

package/lib/getTopFromParser.js

@@ -0,0 +1,27 @@
+/**
+ * Parses the $top query
+ * @returns Returns true when the parse has an error
+ */
+export var getTopFromParser = function (parser, result) {
+    var $topValue = parser.get('$top');
+    if ($topValue !== null) {
+        var $top = void 0;
+        if (!$topValue.match(/^\d+$/) || ($top = parseInt($topValue)) < 0) {
+            result.error = {
+                code: '0x0',
+                message: "Invalid value '".concat($topValue, "' for $top query option found. The $top query option requires a non-negative integer value."),
+            };
+            return true;
+        }
+        else if ($top === 0) {
+            result.error = {
+                code: '0x0',
+                message: "Invalid value for $top query option.",
+            };
+            return true;
+        }
+        result.$top = $top;
+    }
+    return false;
+};
+//# sourceMappingURL=getTopFromParser.js.map

package/lib/getTopFromParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTopFromParser.js","sourceRoot":"","sources":["../src/getTopFromParser.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,MAAuB,EAAE,MAAkB;IACxE,IAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,SAAS,KAAK,IAAI,EAAE;QACpB,IAAI,IAAI,SAAA,CAAC;QACT,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE;YAC/D,MAAM,CAAC,KAAK,GAAG;gBACX,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,yBAAkB,SAAS,gGAA6F;aACpI,CAAC;YACF,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,KAAK,CAAC,EAAE;YACnB,MAAM,CAAC,KAAK,GAAG;gBACX,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,sCAAsC;aAClD,CAAC;YACF,OAAO,IAAI,CAAC;SACf;QACD,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;KACtB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}

package/lib/index.d.ts

@@ -0,0 +1,5 @@
+export type { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export { parseOData } from './parseOData';
+import { parseOData } from './parseOData';
+export default parseOData;
+//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -0,0 +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;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,eAAe,UAAU,CAAC"}

package/lib/index.js

@@ -0,0 +1,4 @@
+export { parseOData } from './parseOData';
+import { parseOData } from './parseOData';
+export default parseOData;
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,eAAe,UAAU,CAAC"}

package/lib/modern/getExpandFromParser.js

@@ -0,0 +1,109 @@
+import { getSelectFromParser } from './getSelectFromParser';
+
+/**
+ * Parses the $expand query
+ * @returns Returns true when the parse has an error
+ */
+export const getExpandFromParser = (parser, result) => {
+  const $expand = parser.get('$expand');
+  if ($expand !== null) {
+    result.$expand = {};
+    if (extractExpand($expand, result)) {
+      return true;
+    }
+  }
+  return false;
+};
+const extractExpand = (value, $expand) => {
+  const match = value.match(/^\s*(\w(\w|\d|_)*)\s*(,|\()?\s*/);
+  if (match === null || match[0].length < value.length && match[3] === null || match[0].length === value.length && match[3] !== undefined) {
+    $expand.error = {
+      code: '0x0',
+      message: 'invalid expand expression'
+    };
+    return true;
+  }
+  let matchSeparator = match[3];
+  let matchLength = match[0].length;
+  if (matchSeparator !== '(') {
+    if ($expand.$expand !== undefined) {
+      $expand.$expand[match[1]] = {
+        $select: []
+      };
+    }
+  } else {
+    const {
+      index,
+      error
+    } = getClosingBracket(value.substring(matchLength));
+    if (error) {
+      $expand.error = {
+        code: '0x0',
+        message: error
+      };
+      return true;
+    }
+    if ($expand.$expand !== undefined) {
+      const innerExpand = {};
+      const parser = new URLSearchParams('?' + value.substring(matchLength, matchLength + index));
+      if (getSelectFromParser(parser, innerExpand)) {
+        $expand.error = innerExpand.error;
+        return true;
+      }
+      if (getExpandFromParser(parser, innerExpand)) {
+        $expand.error = innerExpand.error;
+        return true;
+      }
+      if (innerExpand.$expand === undefined && innerExpand.$select === undefined) {
+        $expand.error = {
+          code: '0x0',
+          message: 'Empty expand'
+        };
+        return true;
+      }
+      $expand.$expand[match[1]] = innerExpand;
+    }
+    matchLength = matchLength + index;
+    const secondMatch = value.substring(matchLength + 1).match(/\s*(,?)\s*d/);
+    if (secondMatch !== null) {
+      matchLength = matchLength + secondMatch[0].length;
+      if (secondMatch[1] !== null) {
+        matchSeparator = ',';
+      }
+    }
+  }
+  if (matchSeparator === ',') {
+    if (extractExpand(value.substring(matchLength), $expand)) {
+      return true;
+    }
+  }
+  return false;
+};
+const getClosingBracket = value => {
+  let depth = 1;
+  let startAt = 0;
+  while (depth > 0) {
+    const match = value.substring(startAt).match(/\(|\)/);
+    if (match === null) {
+      return {
+        error: 'no closing bracket found',
+        index: -1
+      };
+    }
+    if (match[0] === ')') {
+      depth -= 1;
+      if (depth === 0) {
+        return {
+          index: match.index || 0
+        };
+      }
+    } else {
+      depth += 1;
+    }
+    startAt = (match.index || 0) + 1;
+  }
+  return {
+    error: 'no closing bracket found',
+    index: -1
+  };
+};

package/lib/modern/getFetchXmlFromParser.js

@@ -0,0 +1,36 @@
+/**
+ * Parses the $fetchXml query
+ * @returns Returns true when the parse has an error
+ */
+export const getFetchXmlFromParser = (parser, result) => {
+  const fetchXml = parser.get('fetchXml');
+  if (fetchXml !== null) {
+    const serializer = new DOMParser();
+    const fetchXmlDocument = serializer.parseFromString(fetchXml, 'text/xml');
+    if (fetchXmlDocument.documentElement.tagName === 'parsererror') {
+      result.error = {
+        code: '0x80040201',
+        message: 'Invalid XML.'
+      };
+      return true;
+    }
+    const entity = fetchXmlDocument.evaluate('fetch/entity', fetchXmlDocument, null, XPathResult.ANY_TYPE, null).iterateNext();
+    if (fetchXmlDocument.documentElement.children.length != 1 || !entity || !entity.getAttribute('name')) {
+      result.error = {
+        code: '0x80041102',
+        message: 'Entity Name was not specified in FetchXml String.'
+      };
+      return true;
+    }
+    const invalidAttribute = fetchXmlDocument.evaluate('fetch/entity/*[not(self::filter or self::order or self::link-entity or self::attribute or self::all-attributes or self::no-attrs)]', fetchXmlDocument, null, XPathResult.ANY_TYPE, null).iterateNext();
+    if (invalidAttribute) {
+      result.error = {
+        code: '0x8004111c',
+        message: `Invalid Child Node, valid nodes are filter, order, link-entity, attribute, all-attributes, no-attrs. NodeName = ${invalidAttribute.tagName} NodeXml = ${invalidAttribute.outerHTML}`
+      };
+      return true;
+    }
+    result.fetchXml = fetchXmlDocument;
+  }
+  return false;
+};

package/lib/modern/getSelectFromParser.js

@@ -0,0 +1,11 @@
+/**
+ * Parses the $select query
+ * @returns Returns true when the parse has an error
+ */
+export const getSelectFromParser = (parser, result) => {
+  const $select = parser.get('$select');
+  if ($select !== null) {
+    result.$select = $select.split(',');
+  }
+  return false;
+};

package/lib/modern/getTopFromParser.js

@@ -0,0 +1,25 @@
+/**
+ * Parses the $top query
+ * @returns Returns true when the parse has an error
+ */
+export const getTopFromParser = (parser, result) => {
+  const $topValue = parser.get('$top');
+  if ($topValue !== null) {
+    let $top;
+    if (!$topValue.match(/^\d+$/) || ($top = parseInt($topValue)) < 0) {
+      result.error = {
+        code: '0x0',
+        message: `Invalid value '${$topValue}' for $top query option found. The $top query option requires a non-negative integer value.`
+      };
+      return true;
+    } else if ($top === 0) {
+      result.error = {
+        code: '0x0',
+        message: `Invalid value for $top query option.`
+      };
+      return true;
+    }
+    result.$top = $top;
+  }
+  return false;
+};

package/lib/modern/index.js

@@ -0,0 +1,3 @@
+export { parseOData } from './parseOData';
+import { parseOData } from './parseOData';
+export default parseOData;

package/lib/modern/parseOData.js

@@ -0,0 +1,21 @@
+import { getTopFromParser } from './getTopFromParser';
+import { getSelectFromParser } from './getSelectFromParser';
+import { getExpandFromParser } from './getExpandFromParser';
+import { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export const parseOData = query => {
+  const parser = new URLSearchParams(query);
+  const result = {};
+  if (getExpandFromParser(parser, result)) {
+    return result;
+  }
+  if (getSelectFromParser(parser, result)) {
+    return result;
+  }
+  if (getTopFromParser(parser, result)) {
+    return result;
+  }
+  if (getFetchXmlFromParser(parser, result)) {
+    return result;
+  }
+  return result;
+};

package/lib/parseOData.d.ts

@@ -0,0 +1,3 @@
+import type { ODataQuery } from './OData.types';
+export declare const parseOData: (query: string) => ODataQuery;
+//# sourceMappingURL=parseOData.d.ts.map

package/lib/parseOData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseOData.d.ts","sourceRoot":"","sources":["../src/parseOData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,eAAO,MAAM,UAAU,UAAW,MAAM,eAgBvC,CAAC"}

package/lib/parseOData.js

@@ -0,0 +1,22 @@
+import { getTopFromParser } from './getTopFromParser';
+import { getSelectFromParser } from './getSelectFromParser';
+import { getExpandFromParser } from './getExpandFromParser';
+import { getFetchXmlFromParser } from './getFetchXmlFromParser';
+export var parseOData = function (query) {
+    var parser = new URLSearchParams(query);
+    var result = {};
+    if (getExpandFromParser(parser, result)) {
+        return result;
+    }
+    if (getSelectFromParser(parser, result)) {
+        return result;
+    }
+    if (getTopFromParser(parser, result)) {
+        return result;
+    }
+    if (getFetchXmlFromParser(parser, result)) {
+        return result;
+    }
+    return result;
+};
+//# sourceMappingURL=parseOData.js.map

package/lib/parseOData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseOData.js","sourceRoot":"","sources":["../src/parseOData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,KAAa;IACpC,IAAM,MAAM,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAM,MAAM,GAAG,EAAgB,CAAC;IAChC,IAAI,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACrC,OAAO,MAAM,CAAC;KACjB;IACD,IAAI,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACrC,OAAO,MAAM,CAAC;KACjB;IACD,IAAI,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QAClC,OAAO,MAAM,CAAC;KACjB;IACD,IAAI,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACvC,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}

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

@@ -0,0 +1,7 @@
+import { ODataQuery } from './OData.types';
+/**
+ * Parses the $expand query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getExpandFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getExpandFromParser.d.ts.map

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

@@ -0,0 +1,7 @@
+import { ODataQuery } from './OData.types';
+/**
+ * Parses the $fetchXml query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getFetchXmlFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getFetchXmlFromParser.d.ts.map

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

@@ -0,0 +1,7 @@
+import { ODataQuery } from './OData.types';
+/**
+ * Parses the $select query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getSelectFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getSelectFromParser.d.ts.map

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

@@ -0,0 +1,7 @@
+import { ODataQuery } from './OData.types';
+/**
+ * Parses the $top query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getTopFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getTopFromParser.d.ts.map

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

@@ -0,0 +1,5 @@
+export { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export { parseOData } from './parseOData';
+import { parseOData } from './parseOData';
+export default parseOData;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,3 @@
+import { ODataQuery } from './OData.types';
+export declare const parseOData: (query: string) => ODataQuery;
+//# sourceMappingURL=parseOData.d.ts.map

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

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $expand query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getExpandFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getExpandFromParser.d.ts.map

package/lib/ts3.9/getExpandFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getExpandFromParser.d.ts","sourceRoot":"","sources":["../../src/getExpandFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA6C,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3F;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAY,eAAe,UAAU,UAAU,KAAG,OAUjF,CAAC"}

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

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $fetchXml query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getFetchXmlFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getFetchXmlFromParser.d.ts.map

package/lib/ts3.9/getFetchXmlFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFetchXmlFromParser.d.ts","sourceRoot":"","sources":["../../src/getFetchXmlFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,WAAY,eAAe,UAAU,UAAU,KAAG,OAyCnF,CAAC"}

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

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $select query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getSelectFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getSelectFromParser.d.ts.map

package/lib/ts3.9/getSelectFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSelectFromParser.d.ts","sourceRoot":"","sources":["../../src/getSelectFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,WAAY,eAAe,UAAU,UAAU,KAAG,OAMjF,CAAC"}

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

@@ -0,0 +1,7 @@
+import type { ODataQuery } from './OData.types';
+/**
+ * Parses the $top query
+ * @returns Returns true when the parse has an error
+ */
+export declare const getTopFromParser: (parser: URLSearchParams, result: ODataQuery) => boolean;
+//# sourceMappingURL=getTopFromParser.d.ts.map

package/lib/ts3.9/getTopFromParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTopFromParser.d.ts","sourceRoot":"","sources":["../../src/getTopFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WAAY,eAAe,UAAU,UAAU,KAAG,OAoB9E,CAAC"}

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

@@ -0,0 +1,5 @@
+export type { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataQuery, ODataSelect, ODataTop, StandardOperator, StandardOperators, } from './OData.types';
+export { parseOData } from './parseOData';
+import { parseOData } from './parseOData';
+export default parseOData;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,eAAe,UAAU,CAAC"}

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

@@ -0,0 +1,3 @@
+import type { ODataQuery } from './OData.types';
+export declare const parseOData: (query: string) => ODataQuery;
+//# sourceMappingURL=parseOData.d.ts.map

package/lib/ts3.9/parseOData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseOData.d.ts","sourceRoot":"","sources":["../../src/parseOData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,eAAO,MAAM,UAAU,UAAW,MAAM,eAgBvC,CAAC"}