@shko.online/dataverse-odata 0.1.2 → 0.1.4

package/lib/modern/getOrderByFromParser.js

@@ -1,4 +1,6 @@
-import { validateNotEmpty } from './validateNotEmpty';
+import { atMostOnce } from './validators/atMostOnce';
+import { hasContent } from './validators/hasContent';
+const option = '$orderby';
 const edmProperty = /\w{1-255}/gi;
 
 /**
@@ -6,33 +8,34 @@ const edmProperty = /\w{1-255}/gi;
  * @returns Returns `false` when the parse has an error
  */
 export const getOrderByFromParser = (parser, result) => {
-  let $orderby = parser.get('$orderby');
-  if ($orderby !== null) {
-    if (!validateNotEmpty('$orderby', $orderby, result)) {
+  let value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!atMostOnce(option, value, result) || !hasContent(option, value, result)) {
+    return false;
+  }
+  let $orderby = value[0].trimEnd();
+  const orderByArray = [];
+  for (let i = 0; i < $orderby.length; i++) {
+    if (false /* syntax error */) {
+      result.error = {
+        code: '0x0',
+        message: `Syntax error at position ${i} in '${$orderby}'.`
+      };
       return false;
     }
-    $orderby = $orderby.trimEnd();
-    const orderByArray = [];
-    for (let i = 0; i < $orderby.length; i++) {
-      if (false /* syntax error */) {
-        result.error = {
-          code: '0x0',
-          message: `Syntax error at position ${i} in '${$orderby}'.`
-        };
-        return false;
-      }
-    }
-    orderByArray.forEach(orderBy => {
-      var _orderBy$column;
-      if (!((_orderBy$column = orderBy.column) !== null && _orderBy$column !== void 0 && _orderBy$column.match(edmProperty))) {
-        result.error = {
-          code: '0x80060888',
-          message: 'Order By Property must be of type EdmProperty'
-        };
-        return false;
-      }
-    });
-    result.$orderby = orderByArray;
   }
+  orderByArray.forEach(orderBy => {
+    var _orderBy$column;
+    if (!((_orderBy$column = orderBy.column) !== null && _orderBy$column !== void 0 && _orderBy$column.match(edmProperty))) {
+      result.error = {
+        code: '0x80060888',
+        message: 'Order By Property must be of type EdmProperty'
+      };
+      return false;
+    }
+  });
+  result.$orderby = orderByArray;
   return true;
 };

package/lib/modern/getSelectFromParser.js

@@ -1,11 +1,20 @@
+import { atMostOnce } from './validators/atMostOnce';
+const option = '$select';
+
 /**
  * Parses the {@link ODataSelect.$select $select} query
- * @returns Returns `false` when the parse has an error
+ * @returns {boolean} Returns `false` when the parse has an error
  */
 export const getSelectFromParser = (parser, result) => {
-  const $select = parser.get('$select');
-  if ($select !== null) {
-    result.$select = $select.split(',');
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!atMostOnce(option, value, result)) {
+    return false;
+  }
+  if (value.length > 0) {
+    result.$select = value[0].split(',');
   }
   return true;
 };

package/lib/modern/getTopFromParser.js

@@ -1,30 +1,33 @@
-import { validateNotEmpty } from './validateNotEmpty';
+import { atMostOnce } from './validators/atMostOnce';
+import { hasContent } from './validators/hasContent';
+const option = '$top';
 
 /**
  * Parses the {@link ODataTop.$top $top} query
  * @returns Returns `false` when the parse has an error
  */
 export const getTopFromParser = (parser, result) => {
-  const $topValue = parser.get('$top');
-  if ($topValue !== null) {
-    if (!validateNotEmpty('$orderby', $topValue, result)) {
-      return false;
-    }
-    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 false;
-    } else if ($top === 0) {
-      result.error = {
-        code: '0x0',
-        message: `Invalid value for $top query option.`
-      };
-      return false;
-    }
-    result.$top = $top;
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
   }
+  if (!atMostOnce(option, value, result) || !hasContent(option, value, result)) {
+    return false;
+  }
+  let $top;
+  if (!value[0].match(/^\d+$/) || ($top = parseInt(value[0])) < 0) {
+    result.error = {
+      code: '0x0',
+      message: `Invalid value '${value}' for $top query option found. The $top query option requires a non-negative integer value.`
+    };
+    return false;
+  } else if ($top === 0) {
+    result.error = {
+      code: '0x0',
+      message: `Invalid value for $top query option.`
+    };
+    return false;
+  }
+  result.$top = $top;
   return true;
 };

package/lib/modern/getXQueryFromParser.js

@@ -1,4 +1,5 @@
-const guidRegex = /[0-9A-F]{8}\-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/gi;
+import { isGuid } from './validators/isGuid';
+import { recognizedGuid } from './validators/recognizedGuid';
 
 /**
  * Parses the {@link ODataSavedQuery.savedQuery savedQuery} or
@@ -6,23 +7,13 @@ const guidRegex = /[0-9A-F]{8}\-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}
  * @returns Returns `false` when the parse has an error
  */
 export const getXQueryFromParser = (X, parser, result) => {
-  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;
+  const value = parser.getAll(X);
+  if (value.length === 0) {
+    return true;
   }
+  if (!recognizedGuid(value, result) || !isGuid(value, result)) {
+    return false;
+  }
+  result[X] = value[0];
   return true;
 };

package/lib/modern/parseOData.js

@@ -3,6 +3,7 @@ import { getSelectFromParser } from './getSelectFromParser';
 import { getExpandFromParser } from './getExpandFromParser';
 import { getFetchXmlFromParser } from './getFetchXmlFromParser';
 import { getXQueryFromParser } from './getXQueryFromParser';
+import { getOrderByFromParser } from './getOrderByFromParser';
 
 /**
  * parses the OData query and applies some Dataverse validations
@@ -12,23 +13,6 @@ import { getXQueryFromParser } from './getXQueryFromParser';
 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;
-  }
-  if (!getXQueryFromParser('savedQuery', parser, result)) {
-    return result;
-  }
-  if (!getXQueryFromParser('userQuery', parser, result)) {
-    return result;
-  }
+  getExpandFromParser(parser, result) && getSelectFromParser(parser, result) && getTopFromParser(parser, result) && getFetchXmlFromParser(parser, result) && getXQueryFromParser('savedQuery', parser, result) && getXQueryFromParser('userQuery', parser, result) && getOrderByFromParser(parser, result);
   return result;
 };

package/lib/modern/validators/atMostOnce.js

@@ -0,0 +1,17 @@
+/**
+ * Options of this type must be specified at most once.
+ * @param option The option being validated (ex. $top)
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export const atMostOnce = (option, value, result) => {
+  if (value.length > 1) {
+    result.error = {
+      code: '0x0',
+      message: `Query option '${option}' was specified more than once, but it must be specified at most once.`
+    };
+    return false;
+  }
+  return true;
+};

package/lib/modern/validators/differentFromEmptyString.js

@@ -0,0 +1,16 @@
+/**
+ * 
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export const differentFromEmptyString = (value, result) => {
+  if (value[0] === '') {
+    result.error = {
+      code: '0x80040203',
+      message: 'Expected non-empty string.'
+    };
+    return false;
+  }
+  return true;
+};

package/lib/modern/validators/hasContent.js

@@ -0,0 +1,17 @@
+/**
+ * Options of this type must be specified at most once.
+ * @param option The option being validated (ex. $top)
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export const hasContent = (query, value, result) => {
+  if (!value[0].trim()) {
+    result.error = {
+      code: '0x0',
+      message: `The value for OData query '${query}' cannot be empty.`
+    };
+    return false;
+  }
+  return true;
+};

package/lib/modern/validators/isGuid.js

@@ -0,0 +1,18 @@
+const guidRegex = /[0-9A-F]{8}\-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/gi;
+
+/**
+ * 
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export const isGuid = (value, result) => {
+  if (!value[0].match(guidRegex)) {
+    result.error = {
+      code: '0x0',
+      message: 'Guid should contain 32 digits with 4 dashes (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).'
+    };
+    return false;
+  }
+  return true;
+};

package/lib/modern/validators/recognizedGuid.js

@@ -0,0 +1,16 @@
+/**
+ * 
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export const recognizedGuid = (value, result) => {
+  if (!value[0].trim()) {
+    result.error = {
+      code: '0x0',
+      message: 'Unrecognized Guid format.'
+    };
+    return false;
+  }
+  return true;
+};

package/lib/ts3.4/OData.types.d.ts

@@ -0,0 +1,118 @@
+interface ODataError {
+    error?: {
+        code: string;
+        message: string;
+    };
+}
+interface ODataExpand {
+    /**
+     * Use the {@link ODataExpand.$expand $expand} system query option in the navigation properties
+     * to control what data from related entities is returned.
+     * There are two types of navigation properties:
+     * * Single-valued navigation properties correspond to Lookup attributes that support many-to-one
+     * relationships and allow setting a reference to another entity.
+     * * Collection-valued navigation properties correspond to one-to-many or many-to-many relationships.
+     *
+     * If you include only the name of the navigation property, you'll receive all the properties for
+     * related records. You can limit the properties returned for related records using the
+     * {@link ODataSelect.$select $select} system query option in parentheses after the navigation
+     * property name. Use this for both single-valued and collection-valued navigation properties.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/retrieve-related-entities-query?WT.mc_id=DX-MVP-5004767 Retrieve related table records with a query }
+     */
+    $expand?: {
+        [relationship: string]: ODataExpandQuery;
+    };
+}
+type ODataExpandQuery = ODataSelect & ODataExpand;
+interface ODataFilter {
+    /**
+     * Use the {@link ODataFilter.$filter $filter} system query option to set criteria for which rows will be returned.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#filter-results Filter results }
+     */
+    $filter?: StandardOperator;
+}
+interface ODataFetch {
+    /**
+     * You can compose a FetchXML query for a specific table.
+     * Then, URL-encode the XML and pass it to the entity set
+     * using the {@link ODataFetch.fetchXml fetchXml} query string parameter.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/use-fetchxml-web-api?WT.mc_id=DX-MVP-5004767 Use FetchXml with Web API }
+     */
+    fetchXml?: XMLDocument;
+}
+interface ODataOrderBy {
+    /**
+     * Specify the order in which items are returned using the {@link ODataOrderBy.$orderby $orderby}
+     * system query option. Use the asc or desc suffix to specify ascending or descending order
+     * respectively. The default is ascending if the suffix isn't applied.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#order-results Order results }
+     */
+    $orderby?: {
+        column: string;
+        asc: boolean;
+    }[];
+}
+interface ODataSavedQuery {
+    /**
+     * You can use the `savedqueryid` value and pass it as the value to the {@link ODataSavedQuery.savedQuery savedQuery}
+     * parameter to the entity set that matches the corresponding `returnedtypecode` of the saved query.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/retrieve-and-execute-predefined-queries?WT.mc_id=DX-MVP-5004767#predefined-queries Retrieve and execute predefined queries }
+     */
+    savedQuery?: string;
+}
+interface ODataSelect {
+    /**
+     * Use the {@link ODataSelect.$select $select} system query option to limit the properties returned.
+     *
+     * This is a performance best practice. If properties aren't specified using
+     * {@link ODataSelect.$select $select}, all properties will be returned.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#request-specific-properties Request specific properties }
+     */
+    $select?: string[];
+}
+interface ODataTop {
+    /**
+     * You can limit the number of results returned by using the {@link ODataTop.$top $top} system query option.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#use-top-query-option Use $top query option }
+     */
+    $top?: number;
+}
+interface ODataUserQuery {
+    /**
+     * You can use the `userqueryid` value and pass it as the value to the {@link OdataUserQuery.userQuery userQuery}
+     * parameter to the entity set that matches the corresponding `returnedtypecode` of the user query.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/retrieve-and-execute-predefined-queries?WT.mc_id=DX-MVP-5004767#predefined-queries Retrieve and execute predefined queries }
+     */
+    userQuery?: string;
+}
+type StandardOperators = 'eq' | 'ne' | 'gt' | 'ge' | 'lt' | 'le';
+interface StandardOperator {
+    operator: StandardOperators;
+    /**
+     * The left side of the 'X' operator must be a property of the entity.
+     */
+    left: string;
+    /**
+     * The right side of the 'X' operator must be a constant value.
+     */
+    right: string | number;
+}
+interface UnaryOperator {
+    operator: 'not';
+    right: StandardOperator;
+}
+interface BinaryOperator {
+    operator: 'and' | 'or';
+    left: StandardOperator;
+    right: StandardOperator;
+}
+type ODataQuery = ODataError & ODataExpand & ODataFetch & ODataFilter & ODataOrderBy & ODataSavedQuery & ODataSelect & ODataTop & ODataUserQuery;
+export { BinaryOperator, ODataError, ODataExpand, ODataExpandQuery, ODataFetch, ODataFilter, ODataOrderBy, ODataQuery, ODataSavedQuery, ODataSelect, ODataTop, ODataUserQuery, StandardOperator, StandardOperators, UnaryOperator, };

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

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

package/lib/ts3.4/validators/atMostOnce.d.ts

@@ -0,0 +1,10 @@
+import { ODataQuery } from '../OData.types';
+/**
+ * Options of this type must be specified at most once.
+ * @param option The option being validated (ex. $top)
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export declare const atMostOnce: (option: string, value: string[], result: ODataQuery) => boolean;
+//# sourceMappingURL=atMostOnce.d.ts.map

package/lib/ts3.4/validators/differentFromEmptyString.d.ts

@@ -0,0 +1,9 @@
+import { ODataQuery } from '../OData.types';
+/**
+ *
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export declare const differentFromEmptyString: (value: string[], result: ODataQuery) => boolean;
+//# sourceMappingURL=differentFromEmptyString.d.ts.map

package/lib/ts3.4/validators/hasContent.d.ts

@@ -0,0 +1,10 @@
+import { ODataQuery } from '../OData.types';
+/**
+ * Options of this type must be specified at most once.
+ * @param option The option being validated (ex. $top)
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export declare const hasContent: (query: string, value: string[], result: ODataQuery) => boolean;
+//# sourceMappingURL=hasContent.d.ts.map

package/lib/ts3.4/validators/isGuid.d.ts

@@ -0,0 +1,9 @@
+import { ODataQuery } from '../OData.types';
+/**
+ *
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export declare const isGuid: (value: string[], result: ODataQuery) => boolean;
+//# sourceMappingURL=isGuid.d.ts.map

package/lib/ts3.4/validators/recognizedGuid.d.ts

@@ -0,0 +1,9 @@
+import { ODataQuery } from '../OData.types';
+/**
+ *
+ * @param value The result of {@link URLSearchParams.getAll getAll}
+ * @param result The {@link ODataQuery} to append the error to
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+export declare const recognizedGuid: (value: string[], result: ODataQuery) => boolean;
+//# sourceMappingURL=recognizedGuid.d.ts.map

package/lib/ts3.9/OData.types.d.ts

@@ -0,0 +1,154 @@
+interface ODataError {
+    error?: {
+        code: string;
+        message: string;
+    };
+}
+
+interface ODataExpand {
+    /**
+     * Use the {@link ODataExpand.$expand $expand} system query option in the navigation properties
+     * to control what data from related entities is returned.
+     * There are two types of navigation properties:
+     * * Single-valued navigation properties correspond to Lookup attributes that support many-to-one
+     * relationships and allow setting a reference to another entity.
+     * * Collection-valued navigation properties correspond to one-to-many or many-to-many relationships.
+     *
+     * If you include only the name of the navigation property, you'll receive all the properties for
+     * related records. You can limit the properties returned for related records using the
+     * {@link ODataSelect.$select $select} system query option in parentheses after the navigation
+     * property name. Use this for both single-valued and collection-valued navigation properties.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/retrieve-related-entities-query?WT.mc_id=DX-MVP-5004767 Retrieve related table records with a query }
+     */
+    $expand?: {
+        [relationship: string]: ODataExpandQuery;
+    };
+}
+
+type ODataExpandQuery = ODataSelect & ODataExpand;
+
+interface ODataFilter {
+    /**
+     * Use the {@link ODataFilter.$filter $filter} system query option to set criteria for which rows will be returned.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#filter-results Filter results }
+     */
+    $filter?: StandardOperator;
+}
+
+interface ODataFetch {
+    /**
+     * You can compose a FetchXML query for a specific table.
+     * Then, URL-encode the XML and pass it to the entity set
+     * using the {@link ODataFetch.fetchXml fetchXml} query string parameter.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/use-fetchxml-web-api?WT.mc_id=DX-MVP-5004767 Use FetchXml with Web API }
+     */
+    fetchXml?: XMLDocument;
+}
+
+interface ODataOrderBy {
+    /**
+     * Specify the order in which items are returned using the {@link ODataOrderBy.$orderby $orderby}
+     * system query option. Use the asc or desc suffix to specify ascending or descending order
+     * respectively. The default is ascending if the suffix isn't applied.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#order-results Order results }
+     */
+    $orderby?: { column: string; asc: boolean }[];
+}
+
+interface ODataSavedQuery {
+    /**
+     * You can use the `savedqueryid` value and pass it as the value to the {@link ODataSavedQuery.savedQuery savedQuery}
+     * parameter to the entity set that matches the corresponding `returnedtypecode` of the saved query.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/retrieve-and-execute-predefined-queries?WT.mc_id=DX-MVP-5004767#predefined-queries Retrieve and execute predefined queries }
+     */
+    savedQuery?: string;
+}
+
+interface ODataSelect {
+    /**
+     * Use the {@link ODataSelect.$select $select} system query option to limit the properties returned.
+     *
+     * This is a performance best practice. If properties aren't specified using
+     * {@link ODataSelect.$select $select}, all properties will be returned.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#request-specific-properties Request specific properties }
+     */
+    $select?: string[];
+}
+
+interface ODataTop {
+    /**
+     * You can limit the number of results returned by using the {@link ODataTop.$top $top} system query option.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/power-apps/developer/data-platform/webapi/query-data-web-api?WT.mc_id=DX-MVP-5004767#use-top-query-option Use $top query option }
+     */
+    $top?: number;
+}
+
+interface ODataUserQuery {
+    /**
+     * You can use the `userqueryid` value and pass it as the value to the {@link OdataUserQuery.userQuery userQuery}
+     * parameter to the entity set that matches the corresponding `returnedtypecode` of the user query.
+     *
+     * * Microsoft Docs: {@link https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/retrieve-and-execute-predefined-queries?WT.mc_id=DX-MVP-5004767#predefined-queries Retrieve and execute predefined queries }
+     */
+    userQuery?: string;
+}
+
+type StandardOperators = 'eq' | 'ne' | 'gt' | 'ge' | 'lt' | 'le';
+
+interface StandardOperator {
+    operator: StandardOperators;
+    /**
+     * The left side of the 'X' operator must be a property of the entity.
+     */
+    left: string;
+    /**
+     * The right side of the 'X' operator must be a constant value.
+     */
+    right: string | number;
+}
+
+interface UnaryOperator {
+    operator: 'not';
+    right: StandardOperator;
+}
+
+interface BinaryOperator {
+    operator: 'and' | 'or';
+    left: StandardOperator;
+    right: StandardOperator;
+}
+
+type ODataQuery = ODataError &
+    ODataExpand &
+    ODataFetch &
+    ODataFilter &
+    ODataOrderBy &
+    ODataSavedQuery &
+    ODataSelect &
+    ODataTop &
+    ODataUserQuery;
+
+export type {
+    BinaryOperator,
+    ODataError,
+    ODataExpand,
+    ODataExpandQuery,
+    ODataFetch,
+    ODataFilter,
+    ODataOrderBy,
+    ODataQuery,
+    ODataSavedQuery,
+    ODataSelect,
+    ODataTop,
+    ODataUserQuery,
+    StandardOperator,
+    StandardOperators,
+    UnaryOperator,    
+};

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"getOrderByFromParser.d.ts","sourceRoot":"","sources":["../../src/getOrderByFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AAK9D;;;GAGG;AACH,eAAO,MAAM,oBAAoB,WAAY,eAAe,UAAU,UAAU,KAAG,OAgClF,CAAC"}
+{"version":3,"file":"getOrderByFromParser.d.ts","sourceRoot":"","sources":["../../src/getOrderByFromParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AAO9D;;;GAGG;AACH,eAAO,MAAM,oBAAoB,WAAY,eAAe,UAAU,UAAU,KAAG,OAkClF,CAAC"}