@shko.online/dataverse-odata 0.1.1 → 0.1.3

package/src/getTopFromParser.ts

@@ -1,27 +1,31 @@
-import type { ODataQuery } from './OData.types';
+import type { ODataQuery, ODataTop } from './OData.types';
+import { validateNotEmpty } from './validateNotEmpty';
 
 /**
- * Parses the $top query
- * @returns Returns true when the parse has an error
+ * Parses the {@link ODataTop.$top $top} query
+ * @returns Returns `false` when the parse has an error
  */
 export const getTopFromParser = (parser: URLSearchParams, result: ODataQuery): boolean => {
     const $topValue = parser.get('$top');
     if ($topValue !== null) {
-        let $top;
+        if (!validateNotEmpty('$orderby', $topValue, result)) {
+            return false;
+        }
+        let $top: number;
         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;
+            return false;
         } else if ($top === 0) {
             result.error = {
                 code: '0x0',
                 message: `Invalid value for $top query option.`,
             };
-            return true;
+            return false;
         }
         result.$top = $top;
     }
-    return false;
+    return true;
 };

package/src/getXQueryFromParser.ts

@@ -0,0 +1,34 @@
+import type { ODataQuery, ODataSavedQuery, ODataUserQuery } from './OData.types';
+
+const guidRegex = /[0-9A-F]{8}\-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/gi;
+
+/**
+ * Parses the {@link ODataSavedQuery.savedQuery savedQuery} or
+ * {@link ODataUserQuery.userQuery userQuery} query
+ * @returns Returns `false` when the parse has an error
+ */
+export const getXQueryFromParser = (
+    X: 'savedQuery' | 'userQuery',
+    parser: URLSearchParams,
+    result: ODataQuery,
+): boolean => {
+    const xQuery = parser.get(X);
+    if (xQuery !== null) {
+        if (!xQuery.trim()) {
+            result.error = {
+                code: '0x0',
+                message: 'Unrecognized Guid format.',
+            };
+            return false;
+        }
+        if (!xQuery.match(guidRegex)) {
+            result.error = {
+                code: '0x0',
+                message: 'Guid should contain 32 digits with 4 dashes (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).',
+            };
+            return false;
+        }
+        result[X] = xQuery;
+    }
+    return true;
+};

package/src/index.ts

@@ -12,6 +12,13 @@ export type {
     StandardOperators,
 } from './OData.types';
 
+export { getExpandFromParser } from './getExpandFromParser';
+export { getFetchXmlFromParser } from './getFetchXmlFromParser';
+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;

package/src/parseOData.ts

@@ -4,6 +4,7 @@ import { getTopFromParser } from './getTopFromParser';
 import { getSelectFromParser } from './getSelectFromParser';
 import { getExpandFromParser } from './getExpandFromParser';
 import { getFetchXmlFromParser } from './getFetchXmlFromParser';
+import { getXQueryFromParser } from './getXQueryFromParser';
 
 /**
  * parses the OData query and applies some Dataverse validations
@@ -13,16 +14,22 @@ import { getFetchXmlFromParser } from './getFetchXmlFromParser';
 export const parseOData = (query: string) => {
     const parser = new URLSearchParams(query);
     const result = {} as ODataQuery;
-    if (getExpandFromParser(parser, result)) {
+    if (!getExpandFromParser(parser, result)) {
         return result;
     }
-    if (getSelectFromParser(parser, result)) {
+    if (!getSelectFromParser(parser, result)) {
         return result;
     }
-    if (getTopFromParser(parser, result)) {
+    if (!getTopFromParser(parser, result)) {
         return result;
     }
-    if (getFetchXmlFromParser(parser, result)) {
+    if (!getFetchXmlFromParser(parser, result)) {
+        return result;
+    }
+    if (!getXQueryFromParser('savedQuery', parser, result)) {
+        return result;
+    }
+    if (!getXQueryFromParser('userQuery', parser, result)) {
         return result;
     }
     return result;

package/src/validateNotEmpty.ts

@@ -0,0 +1,12 @@
+import type { ODataQuery } from './OData.types';
+
+export const validateNotEmpty = (query: string, value: string, result: ODataQuery) => {
+    if (!value.trim()) {
+        result.error = {
+            code: '0x0',
+            message: `The value for OData query '${query}' cannot be empty.`,
+        };
+        return false;
+    }
+    return true;
+};

package/tsconfig.build.json

@@ -1,5 +1,8 @@
 {
     "extends": "./tsconfig.json",
+    "include": [
+        "src"
+    ],
     "exclude": [
         "tests",
         "lib",

package/tsconfig.json

@@ -16,11 +16,8 @@
         "resolveJsonModule": true,
         "declaration": true,
         "declarationMap": true,
-        "sourceMap": true,       
-        "baseUrl": ".",       
-        "typeRoots": [
-            "./node_modules/@types"
-        ]
+        "sourceMap": true,
+        "baseUrl": "."
     },
     "exclude": [
         "node_modules",

package/jest.config.ts

@@ -1,12 +0,0 @@
-import { JestConfigWithTsJest } from 'ts-jest';
-
-export default {
-  testMatch: [' **/tests/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[tj]s?(x)'],
-  clearMocks: true,
-  collectCoverage: true,
-  coverageDirectory: 'coverage',
-  coverageProvider: 'v8',
-  preset: 'ts-jest',
-  testEnvironment: 'jsdom',
-  coverageReporters: ['cobertura', 'text', 'html']
-} as JestConfigWithTsJest;

package/lib/getExpandFromParser.d.ts

@@ -1,7 +0,0 @@
-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/getExpandFromParser.d.ts.map

@@ -1 +0,0 @@
-{"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/getExpandFromParser.js

@@ -1,97 +0,0 @@
-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

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

package/lib/getFetchXmlFromParser.d.ts

@@ -1,7 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,41 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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

@@ -1,7 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,12 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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

@@ -1,7 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,27 +0,0 @@
-/**
- * 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

@@ -1 +0,0 @@
-{"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

@@ -1,5 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

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

package/lib/index.js.map

@@ -1 +0,0 @@
-{"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/parseOData.d.ts

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

package/lib/parseOData.d.ts.map

@@ -1 +0,0 @@
-{"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

@@ -1,22 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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/tests/OData-Parser.$expand.test.ts

@@ -1,39 +0,0 @@
-import { describe, expect, test } from '@jest/globals';
-import { parseOData } from '../src';
-
-describe('parseOData $expand', () => {
-    test('parse $expand Account_Leads', () => {
-        const result = parseOData('?$expand=Account_Leads');
-        expect(result.error).toBeUndefined();
-        expect(result.$expand).not.toBeNull();
-        expect(result.$expand).not.toBeUndefined();
-        expect(result.$expand?.Account_Leads.$select).toEqual([]);
-    });
-
-    test('parse $expand Account_Leads and business_unit_accounts', () => {
-        const result = parseOData('?$expand=Account_Leads,business_unit_accounts');
-        expect(result.error).toBeUndefined();
-        expect(result.$expand).not.toBeNull();
-        expect(result.$expand).not.toBeUndefined();
-        expect(result.$expand?.Account_Leads.$select).toEqual([]);
-        expect(result.$expand?.business_unit_accounts.$select).toEqual([]);
-    });
-
-    test('parse $expand throws on Account_Leads without details', () => {
-        const result = parseOData('?$expand=Account_Leads()');
-        expect(result.error).not.toBeUndefined();
-        expect(result.error?.message).toEqual('Empty expand');
-    });
-
-    test('parse $expand Account_Leads with $select', () => {
-        const result = parseOData('?$expand=Account_Leads($select=name)');
-        expect(result.error).toBeUndefined();
-        expect(result.$expand).not.toBeNull();
-        expect(result.$expand).not.toBeUndefined();
-        expect(result.$expand?.Account_Leads).not.toBeNull();
-        expect(result.$expand?.Account_Leads).not.toBeUndefined();
-        expect(result.$expand?.Account_Leads.$select).not.toBeNull();
-        expect(result.$expand?.Account_Leads.$select).not.toBeUndefined();
-        expect(result.$expand?.Account_Leads.$select).toContain('name');
-    });
-});

package/tests/OData-Parser.$top.test.ts

@@ -1,36 +0,0 @@
-import { describe, expect, test } from '@jest/globals';
-import { parseOData } from '../src';
-
-describe('parseOData $top', () => {
-    test('parse $top 5', () => {
-        const result = parseOData('?$top=5');
-        console.log(result);
-        expect(result.$top).toEqual(5);
-    });
-
-    test('parse $top errors for 1,0', () => {
-        const result = parseOData('?$select=name,numberofemployees&$top=1,0');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x0');
-        expect(result.error?.message).toEqual(
-            `Invalid value '1,0' for $top query option found. The $top query option requires a non-negative integer value.`,
-        );
-    });
-
-    test('parse $top errors for negative value', () => {
-        const result = parseOData('?$select=name,numberofemployees&$top=-2');
-        expect(result.error).not.toBeNull();
-        expect(result.error?.code).toEqual('0x0');
-        expect(result.error?.message).toEqual(
-            `Invalid value '-2' for $top query option found. The $top query option requires a non-negative integer value.`,
-        );
-    });
-
-    test('parse $top errors for 0', () => {
-        const result = parseOData('?$select=name,numberofemployees&$top=0');
-        expect(result.error).not.toBeNull();
-        expect(result.error?.code).toEqual('0x0');
-        expect(result.error?.message).toEqual(`Invalid value for $top query option.`);
-    });
-});

package/tests/OData-Parser.fetchXml.test.ts

@@ -1,62 +0,0 @@
-import { describe, expect, test } from '@jest/globals';
-import { parseOData } from '../src';
-
-describe('parseOData fetchXml', () => {
-    test('parse fetchXml account', () => {
-        const result = parseOData(
-            '?fetchXml=%3Cfetch%20mapping%3D%27logical%27%3E%3Centity%20name%3D%27account%27%3E%3Cattribute%20name%3D%27accountid%27%2F%3E%3Cattribute%20name%3D%27name%27%2F%3E%3Cattribute%20name%3D%27accountnumber%27%2F%3E%3C%2Fentity%3E%3C%2Ffetch%3E',
-        );
-        console.log(result);
-        expect(result.fetchXml?.documentElement.outerHTML).toEqual(
-            `<fetch mapping="logical"><entity name="account"><attribute name="accountid"/><attribute name="name"/><attribute name="accountnumber"/></entity></fetch>`,
-        );
-    });
-
-    test('parse fetchXml fails if invalid XML', () => {
-        const result = parseOData('?fetchXml=invalid');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x80040201');
-        expect(result.error?.message).toEqual('Invalid XML.');
-    });
-
-    test('parse fetchXml fails if EntityName not specified', () => {
-        const result = parseOData('?fetchXml=<fetch><entity name=""></entity></fetch>');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x80041102');
-        expect(result.error?.message).toEqual('Entity Name was not specified in FetchXml String.');
-    });
-
-    test('parse fetchXml fails if EntityName not specified', () => {
-        const result = parseOData('?fetchXml=<fetch><entity></entity></fetch>');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x80041102');
-        expect(result.error?.message).toEqual('Entity Name was not specified in FetchXml String.');
-    });
-
-    test('parse fetchXml fails if EntityName not specified', () => {
-        const result = parseOData('?fetchXml=<entity></entity>');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x80041102');
-        expect(result.error?.message).toEqual('Entity Name was not specified in FetchXml String.');
-    });
-
-    test('parse fetchXml fails if EntityName not specified', () => {
-        const result = parseOData('?fetchXml=<fetch></fetch>');
-        expect(result.error).not.toBeNull();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x80041102');
-        expect(result.error?.message).toEqual('Entity Name was not specified in FetchXml String.');
-    });
-
-    test('parse fetchXml fails if invalid attribute specified', () => {
-        const result = parseOData('?fetchXml=<fetch><entity%20name="systemuser"><n%20/></entity></fetch>');
-        expect(result.error).not.toBeUndefined();
-        console.log(result.error);
-        expect(result.error?.code).toEqual('0x8004111c');
-        expect(result.error?.message).toEqual('Invalid Child Node, valid nodes are filter, order, link-entity, attribute, all-attributes, no-attrs. NodeName = n NodeXml = <n/>');
-    });
-});

package/tests/OData-Parser.test.ts

@@ -1,17 +0,0 @@
-import { describe, expect, test } from '@jest/globals';
-import { parseOData } from '../src';
-
-describe('parse odata', () => {
-    test('parse $select', () => {
-        const result = parseOData('?$select=name,numberofemployees$top=5');
-        expect(result.$select).not.toBeNull();
-        expect(result.$select).toContain('name');
-    });
-
-    test('$select and $expand', () => {
-        const result = parseOData('?$select2=name,numberofemployees&$expand=Account_Leads($select=name)');
-        expect(result.$select).not.toBeNull();
-        expect(result.$expand).not.toBeNull();
-        expect(result.$expand?.Account_Leads).not.toBeNull();
-    });
-});