@shko.online/dataverse-odata 0.1.5 → 0.2.0

package/.github/workflows/publish.yml

@@ -29,12 +29,12 @@ jobs:
         with:
           node-version: "lts/*"
 
-      - name: Update npm
-        run: npm install -g npm@latest
-
       - name: Install dependencies
         run: npm ci
 
+      - name: Build
+        run: npm run build
+
       - name: Run tests
         run: npm test
 

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [0.2.0](https://github.com/Shko-Online/dataverse-odata/compare/v0.1.6...v0.2.0) (2026-04-11)
+
+
+### Bug Fixes
+
+* column comparison uses no keyword prefix, e.g. firstname eq lastname ([34727d5](https://github.com/Shko-Online/dataverse-odata/commit/34727d5ce8698b4d0ec822ee226637169c881028))
+* distinguish between null, boolean and column operators ([62511ef](https://github.com/Shko-Online/dataverse-odata/commit/62511ef624ebbd06aa6a7732b9693e7f50dbbbce))
+
+
+### Features
+
+* implement $filter parser and add sample tests for each operator ([e2f5387](https://github.com/Shko-Online/dataverse-odata/commit/e2f538740422ba51c13ff13ecb9222606a19ce17))
+
+## [0.1.6](https://github.com/Shko-Online/dataverse-odata/compare/v0.1.5...v0.1.6) (2026-03-15)
+
+
+### Bug Fixes
+
+* build before publish ([abf325d](https://github.com/Shko-Online/dataverse-odata/commit/abf325da1f8f7ee2d1ba44f35f0b182de9d9cb6a))
+
 ## [0.1.5](https://github.com/Shko-Online/dataverse-odata/compare/v0.1.4...v0.1.5) (2026-03-15)
 
 

package/azure-pipelines.yml

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

package/lib/cjs/OData.types.d.js

@@ -0,0 +1 @@
+"use strict";

package/lib/cjs/getAliasedProperty.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAliasedProperty = void 0;
+/**
+ * Recursively gets the value of an aliased property. For example, if the query is `$orderby=@p1` and `@p1=name`, this function will return `name`
+ * @param parser The URLSearchParams object containing the query parameters
+ * @param result Will contain the error details in case there is any
+ * @param property The property to expand
+ * @returns The expanded property or null when there is an error
+ */
+const getAliasedProperty = (parser, result, property) => {
+  let propertyName = parser.get(property);
+  if (!propertyName) {
+    result.error = {
+      code: '0x80060888',
+      message: 'Order By Property must be of type EdmProperty'
+    };
+    return null;
+  }
+  if (!/^[@a-zA-Z]\w+/gi.test(propertyName)) {
+    const position = propertyName.length;
+    result.error = {
+      code: '0x80060888',
+      message: `Syntax error at position ${position} in '${propertyName}'.`
+    };
+    return null;
+  }
+  if (propertyName.startsWith('@')) {
+    return getAliasedProperty(parser, result, propertyName);
+  }
+  return propertyName;
+};
+exports.getAliasedProperty = getAliasedProperty;

package/lib/cjs/getExpandFromParser.js

@@ -0,0 +1,122 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getExpandFromParser = void 0;
+var _getSelectFromParser = require("./getSelectFromParser");
+var _atMostOnce = require("./validators/atMostOnce");
+const option = '$expand';
+
+/**
+ * Parses the {@link ODataExpand.$expand $expand} query
+ * @returns Returns `false` when the parse has an error
+ */
+const getExpandFromParser = (parser, result) => {
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result)) {
+    return false;
+  }
+  result.$expand = {};
+  if (!extractExpand(value[0], result)) {
+    return false;
+  }
+  return true;
+};
+exports.getExpandFromParser = getExpandFromParser;
+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: `Term '${value}' is not valid in a $select or $expand expression.`
+    };
+    return false;
+  }
+  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 false;
+    }
+    if ($expand.$expand !== undefined) {
+      const innerExpand = {};
+      const parser = new URLSearchParams('?' + value.substring(matchLength, matchLength + index));
+      if (!(0, _getSelectFromParser.getSelectFromParser)(parser, innerExpand)) {
+        $expand.error = innerExpand.error;
+        return false;
+      }
+      if (!getExpandFromParser(parser, innerExpand)) {
+        $expand.error = innerExpand.error;
+        return false;
+      }
+      if (innerExpand.$expand === undefined && innerExpand.$select === undefined) {
+        $expand.error = {
+          code: '0x0',
+          message: `Missing expand option on navigation property '${match[1]}'. If a parenthesis expression follows an expanded navigation property, then at least one expand option must be provided.`
+        };
+        return false;
+      }
+      $expand.$expand[match[1]] = innerExpand;
+    }
+    matchLength = matchLength + index;
+    const secondMatch = new RegExp(/\s*(,?)\s*d/).exec(value.substring(matchLength + 1));
+    if (secondMatch !== null) {
+      matchLength = matchLength + secondMatch[0].length;
+      if (secondMatch[1] !== null) {
+        matchSeparator = ',';
+      }
+    }
+  }
+  if (matchSeparator === ',') {
+    if (!extractExpand(value.substring(matchLength), $expand)) {
+      return false;
+    }
+  }
+  return true;
+};
+const getClosingBracket = value => {
+  let depth = 1;
+  let startAt = 0;
+  while (depth > 0) {
+    const match = value.substring(startAt).match(/\(|\)/);
+    if (match === null) {
+      return {
+        error: 'Found an unbalanced bracket expression.',
+        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: 'Found an unbalanced bracket expression.',
+    index: -1
+  };
+};

package/lib/cjs/getFetchXmlFromParser.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFetchXmlFromParser = void 0;
+var _atMostOnce = require("./validators/atMostOnce");
+var _differentFromEmptyString = require("./validators/differentFromEmptyString");
+const option = 'fetchXml';
+
+/**
+ * Parses the {@link ODataFetch.fetchXml fetchXml} query
+ * @returns Returns `false` when the parse has an error
+ */
+const getFetchXmlFromParser = (parser, result) => {
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result) || !(0, _differentFromEmptyString.differentFromEmptyString)(value, result)) {
+    return false;
+  }
+  const fetchXml = value[0];
+  const serializer = new DOMParser();
+  const fetchXmlDocument = serializer.parseFromString(fetchXml, 'text/xml');
+  if (fetchXmlDocument.documentElement.tagName === 'parsererror') {
+    result.error = {
+      code: '0x80040201',
+      message: 'Invalid XML.'
+    };
+    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')) {
+    result.error = {
+      code: '0x80041102',
+      message: 'Entity Name was not specified in FetchXml String.'
+    };
+    return false;
+  }
+  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 false;
+  }
+  result.fetchXml = fetchXmlDocument;
+  return true;
+};
+exports.getFetchXmlFromParser = getFetchXmlFromParser;

package/lib/cjs/getFilterFromParser.js

@@ -0,0 +1,257 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFilterFromParser = void 0;
+var _atMostOnce = require("./validators/atMostOnce");
+var _hasContent = require("./validators/hasContent");
+const option = '$filter';
+const STANDARD_OPERATORS = ['eq', 'ne', 'gt', 'ge', 'lt', 'le'];
+const QUERY_FUNCTION_OPERATORS = ['contains', 'endswith', 'startswith'];
+function isStandardOperator(s) {
+  return STANDARD_OPERATORS.includes(s);
+}
+function isQueryFunctionOperator(s) {
+  return QUERY_FUNCTION_OPERATORS.includes(s);
+}
+const GUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/;
+function tokenize(input) {
+  const tokens = [];
+  let i = 0;
+  while (i < input.length) {
+    if (/\s/.test(input[i])) {
+      i++;
+      continue;
+    }
+    if (input[i] === '(') {
+      tokens.push({
+        type: 'lparen',
+        value: '('
+      });
+      i++;
+    } else if (input[i] === ')') {
+      tokens.push({
+        type: 'rparen',
+        value: ')'
+      });
+      i++;
+    } else if (input[i] === ',') {
+      tokens.push({
+        type: 'comma',
+        value: ','
+      });
+      i++;
+    } else if (input[i] === "'") {
+      let j = i + 1;
+      let str = '';
+      while (j < input.length) {
+        if (input[j] === "'" && j + 1 < input.length && input[j + 1] === "'") {
+          str += "'";
+          j += 2;
+        } else if (input[j] === "'") {
+          break;
+        } else {
+          str += input[j];
+          j++;
+        }
+      }
+      tokens.push({
+        type: 'string',
+        value: str
+      });
+      i = j + 1;
+    } 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] ?? '')) {
+      let j = i;
+      if (input[j] === '-') j++;
+      while (j < input.length && /[0-9.]/.test(input[j])) j++;
+      tokens.push({
+        type: 'number',
+        value: input.slice(i, j)
+      });
+      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++;
+      tokens.push({
+        type: 'word',
+        value: input.slice(i, j)
+      });
+      i = j;
+    } else {
+      i++;
+    }
+  }
+  return tokens;
+}
+class FilterParser {
+  constructor(tokens) {
+    this.tokens = void 0;
+    this.pos = 0;
+    this.tokens = tokens;
+  }
+  peek() {
+    return this.tokens[this.pos] ?? null;
+  }
+  consume(expected) {
+    const token = this.tokens[this.pos++];
+    if (!token) throw new Error(`Unexpected end of filter expression${expected ? `, expected ${expected}` : ''}`);
+    return token;
+  }
+  expect(type, value) {
+    const token = this.consume(`${type}${value ? ` '${value}'` : ''}`);
+    if (token.type !== type || value !== undefined && token.value !== value) {
+      throw new Error(`Expected ${type}${value ? ` '${value}'` : ''} but got ${token.type} '${token.value}'`);
+    }
+    return token;
+  }
+  parse() {
+    const expr = this.parseOr();
+    if (this.pos < this.tokens.length) {
+      throw new Error(`Unexpected token '${this.tokens[this.pos].value}'`);
+    }
+    return expr;
+  }
+  parseOr() {
+    let left = this.parseAnd();
+    while (this.peek()?.value === 'or') {
+      this.consume();
+      const right = this.parseAnd();
+      left = {
+        operator: 'or',
+        left,
+        right
+      };
+    }
+    return left;
+  }
+  parseAnd() {
+    let left = this.parseNot();
+    while (this.peek()?.value === 'and') {
+      this.consume();
+      const right = this.parseNot();
+      left = {
+        operator: 'and',
+        left,
+        right
+      };
+    }
+    return left;
+  }
+  parseNot() {
+    if (this.peek()?.value === 'not') {
+      this.consume();
+      const right = this.parseNot();
+      return {
+        operator: 'not',
+        right
+      };
+    }
+    return this.parsePrimary();
+  }
+  parsePrimary() {
+    const token = this.peek();
+    if (!token) throw new Error('Unexpected end of filter expression');
+    if (token.type === 'lparen') {
+      this.consume();
+      const expr = this.parseOr();
+      this.expect('rparen');
+      return expr;
+    }
+    if (token.type === 'word' && isQueryFunctionOperator(token.value.toLowerCase())) {
+      const func = this.consume().value.toLowerCase();
+      this.expect('lparen');
+      const left = this.expect('word').value;
+      this.expect('comma');
+      const right = this.expect('string').value;
+      this.expect('rparen');
+      return {
+        operator: func,
+        left,
+        right
+      };
+    }
+    if (token.type === 'word') {
+      const left = this.consume().value;
+      const opToken = this.consume(`a comparison operator`);
+      if (!isStandardOperator(opToken.value.toLowerCase())) {
+        throw new Error(`Invalid operator '${opToken.value}'`);
+      }
+      const operator = opToken.value.toLowerCase();
+      const right = this.consume(`a value or column name`);
+      if (right.type === 'string') {
+        return {
+          operator,
+          left,
+          right: right.value
+        };
+      } else if (right.type === 'number') {
+        return {
+          operator,
+          left,
+          right: Number(right.value)
+        };
+      } else if (right.type === 'word') {
+        // Constant keywords stay as StandardOperator; bare identifiers are column comparisons
+        const BOOL_CONSTANTS = ['true', 'false'];
+        if (BOOL_CONSTANTS.includes(right.value.toLowerCase())) {
+          return {
+            operator,
+            left,
+            isBooleanOperation: true,
+            right: right.value === 'true'
+          };
+        } else if (right.value.toLowerCase() === 'null') {
+          return {
+            operator,
+            left,
+            isNullOperation: true,
+            right: null
+          };
+        }
+        return {
+          left,
+          operator,
+          isColumnOperation: true,
+          right: right.value
+        };
+      } else {
+        throw new Error(`Invalid right-hand side value of type '${right.type}' in filter expression`);
+      }
+    }
+    throw new Error(`Unexpected token '${token.value}'`);
+  }
+}
+
+/**
+ * Parses the {@link ODataFilter.$filter $filter} query
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+const getFilterFromParser = (parser, result) => {
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result) || !(0, _hasContent.hasContent)(option, value, result)) {
+    return false;
+  }
+  try {
+    const tokens = tokenize(value[0]);
+    const p = new FilterParser(tokens);
+    result.$filter = p.parse();
+  } catch (e) {
+    result.error = {
+      code: '0x80060888',
+      message: `Syntax error in '$filter': ${e.message}`
+    };
+    return false;
+  }
+  return true;
+};
+exports.getFilterFromParser = getFilterFromParser;

package/lib/cjs/getOrderByFromParser.js

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOrderByFromParser = void 0;
+var _getAliasedProperty = require("./getAliasedProperty");
+var _atMostOnce = require("./validators/atMostOnce");
+var _hasContent = require("./validators/hasContent");
+const option = '$orderby';
+
+/**
+ * Parses the {@link ODataOrderBy.$orderby $orderby} query
+ * @returns Returns `false` when the parse has an error
+ */
+const getOrderByFromParser = (parser, result) => {
+  let value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result) || !(0, _hasContent.hasContent)(option, value, result)) {
+    return false;
+  }
+  let $orderby = value[0].trimEnd();
+  let $orderbyParts = $orderby.split(',');
+  const orderByArray = [];
+  let position = 0;
+  for (const element of $orderbyParts) {
+    const parts = Array.from(element.matchAll(/\s*(\S+)/gi));
+    if (parts.length > 2) {
+      position = position + parts[0][0].length + parts[1][0].length + parts[2][0].length;
+      result.error = {
+        code: '0x80060888',
+        message: `Syntax error at position ${position} in '${$orderby}'.`
+      };
+      return false;
+    }
+    if (!/^[@a-zA-Z]\w+/gi.test(parts[0][1])) {
+      position = position + parts[0][0].length;
+      result.error = {
+        code: '0x80060888',
+        message: `Syntax error at position ${position} in '${$orderby}'.`
+      };
+      return false;
+    }
+    const orderBy = {
+      column: parts[0][1],
+      asc: true // default is ascending
+    };
+    if (parts[0][1].startsWith('@')) {
+      orderBy.column = (0, _getAliasedProperty.getAliasedProperty)(parser, result, parts[0][1]);
+      if (!orderBy.column) {
+        return false;
+      }
+    }
+    if (parts.length === 1) {
+      orderByArray.push(orderBy);
+      continue;
+    }
+    if (parts[1][1].toLowerCase() === 'asc') {
+      orderBy.asc = true;
+      orderByArray.push(orderBy);
+    } else if (parts[1][1].toLowerCase() === 'desc') {
+      orderBy.asc = false;
+      orderByArray.push(orderBy);
+    } else {
+      position = position + parts[0][0].length + parts[1][0].length;
+      result.error = {
+        code: '0x80060888',
+        message: `Syntax error at position ${position} in '${$orderby}'.`
+      };
+      return false;
+    }
+  }
+  result.$orderby = orderByArray;
+  return true;
+};
+exports.getOrderByFromParser = getOrderByFromParser;

package/lib/cjs/getSelectFromParser.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSelectFromParser = void 0;
+var _atMostOnce = require("./validators/atMostOnce");
+const option = '$select';
+
+/**
+ * Parses the {@link ODataSelect.$select $select} query
+ * @returns {boolean} Returns `false` when the parse has an error
+ */
+const getSelectFromParser = (parser, result) => {
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result)) {
+    return false;
+  }
+  if (value.length > 0) {
+    result.$select = value[0].split(',');
+  }
+  return true;
+};
+exports.getSelectFromParser = getSelectFromParser;

package/lib/cjs/getTopFromParser.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTopFromParser = void 0;
+var _atMostOnce = require("./validators/atMostOnce");
+var _hasContent = require("./validators/hasContent");
+const option = '$top';
+
+/**
+ * Parses the {@link ODataTop.$top $top} query
+ * @returns Returns `false` when the parse has an error
+ */
+const getTopFromParser = (parser, result) => {
+  const value = parser.getAll(option);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _atMostOnce.atMostOnce)(option, value, result) || !(0, _hasContent.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;
+};
+exports.getTopFromParser = getTopFromParser;

package/lib/cjs/getXQueryFromParser.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getXQueryFromParser = void 0;
+var _isGuid = require("./validators/isGuid");
+var _recognizedGuid = require("./validators/recognizedGuid");
+/**
+ * Parses the {@link ODataSavedQuery.savedQuery savedQuery} or
+ * {@link ODataUserQuery.userQuery userQuery} query
+ * @returns Returns `false` when the parse has an error
+ */
+const getXQueryFromParser = (X, parser, result) => {
+  const value = parser.getAll(X);
+  if (value.length === 0) {
+    return true;
+  }
+  if (!(0, _recognizedGuid.recognizedGuid)(value, result) || !(0, _isGuid.isGuid)(value, result)) {
+    return false;
+  }
+  result[X] = value[0];
+  return true;
+};
+exports.getXQueryFromParser = getXQueryFromParser;