@slickgrid-universal/odata 5.11.0 → 5.12.0

package/dist/types/services/grid-odata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-odata.service.d.ts","sourceRoot":"","sources":["../../../src/services/grid-odata.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid-odata.service.d.ts","sourceRoot":"","sources":["../../../src/services/grid-odata.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slickgrid-universal/odata",
-  "version": "5.11.0",
+  "version": "5.12.0",
   "description": "Grid OData Service to sync a grid with an OData backend server",
   "main": "./dist/cjs/index.js",
   "types": "./dist/types/index.d.ts",
@@ -38,12 +38,12 @@
     "not dead"
   ],
   "dependencies": {
-    "@slickgrid-universal/common": "~5.11.0",
-    "@slickgrid-universal/utils": "~5.10.2"
+    "@slickgrid-universal/common": "~5.12.0",
+    "@slickgrid-universal/utils": "~5.12.0"
   },
   "funding": {
     "type": "ko_fi",
     "url": "https://ko-fi.com/ghiscoding"
   },
-  "gitHead": "894ab0a2783d6f7c4cb9d28d4b81421eb9e05a89"
+  "gitHead": "d7e892ebc1727d7c83cc1e5cc80db8302eef4f63"
 }

package/src/services/grid-odata.service.ts

@@ -21,14 +21,7 @@ import type {
   SingleColumnSort,
   SlickGrid,
 } from '@slickgrid-universal/common';
-import {
-  CaseType,
-  FieldType,
-  mapOperatorByFieldType,
-  OperatorType,
-  parseUtcDate,
-  SortDirection,
-} from '@slickgrid-universal/common';
+import { CaseType, FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
 import { getHtmlStringOutput, stripTags, titleCase } from '@slickgrid-universal/utils';
 import { OdataQueryBuilderService } from './odataQueryBuilder.service.js';
 import type { OdataOption, OdataSortingOption } from '../interfaces/index.js';
@@ -48,7 +41,7 @@ export class GridOdataService implements BackendService {
   defaultOptions: OdataOption = {
     top: DEFAULT_ITEMS_PER_PAGE,
     orderBy: '',
-    caseType: CaseType.pascalCase
+    caseType: CaseType.pascalCase,
   };
 
   /** Getter for the Column Definitions */
@@ -63,7 +56,7 @@ export class GridOdataService implements BackendService {
 
   /** Getter for the Grid Options pulled through the Grid Object */
   protected get _gridOptions(): GridOption {
-    return this._grid?.getOptions() ?? {} as GridOption;
+    return this._grid?.getOptions() ?? ({} as GridOption);
   }
 
   constructor() {
@@ -80,11 +73,12 @@ export class GridOdataService implements BackendService {
       this._odataService.options = { ...mergedOptions, top: undefined };
       this._currentPagination = null;
     } else {
-      const topOption = (mergedOptions.infiniteScroll as InfiniteScrollOption)?.fetchSize ?? pagination?.pageSize ?? this.defaultOptions.top;
+      const topOption =
+        (mergedOptions.infiniteScroll as InfiniteScrollOption)?.fetchSize ?? pagination?.pageSize ?? this.defaultOptions.top;
       this._odataService.options = { ...mergedOptions, top: topOption };
       this._currentPagination = {
         pageNumber: 1,
-        pageSize: this._odataService.options.top || this.defaultOptions.top || DEFAULT_PAGE_SIZE
+        pageSize: this._odataService.options.top || this.defaultOptions.top || DEFAULT_PAGE_SIZE,
       };
     }
 
@@ -108,10 +102,12 @@ export class GridOdataService implements BackendService {
     const odataVersion = this._odataService.options.version ?? 2;
 
     if (this.pagination && this._odataService.options.enableCount) {
-      const countExtractor = this._odataService.options.countExtractor ??
-        odataVersion >= 4 ? (r: any) => r?.['@odata.count'] :
-        odataVersion === 3 ? (r: any) => r?.['__count'] :
-          (r: any) => r?.d?.['__count'];
+      const countExtractor =
+        (this._odataService.options.countExtractor ?? odataVersion >= 4)
+          ? (r: any) => r?.['@odata.count']
+          : odataVersion === 3
+            ? (r: any) => r?.['__count']
+            : (r: any) => r?.d?.['__count'];
       const count = countExtractor(processResult);
       if (typeof count === 'number') {
         this.pagination.totalItems = count;
@@ -119,15 +115,17 @@ export class GridOdataService implements BackendService {
     }
 
     if (this._odataService.options.enableExpand) {
-      const datasetExtractor = this._odataService.options.datasetExtractor ??
-        odataVersion >= 4 ? (r: any) => r?.value :
-        odataVersion === 3 ? (r: any) => r?.results :
-          (r: any) => r?.d?.results;
+      const datasetExtractor =
+        (this._odataService.options.datasetExtractor ?? odataVersion >= 4)
+          ? (r: any) => r?.value
+          : odataVersion === 3
+            ? (r: any) => r?.results
+            : (r: any) => r?.d?.results;
       const dataset = datasetExtractor(processResult);
       if (Array.isArray(dataset)) {
         // Flatten navigation fields (fields containing /) in the dataset (regardless of enableExpand).
         // E.g. given columndefinition 'product/name' and dataset [{id: 1,product:{'name':'flowers'}}], then flattens to [{id:1,'product/name':'flowers'}]
-        const navigationFields = new Set(this._columnDefinitions.flatMap(x => x.fields ?? [x.field]).filter(x => x.includes('/')));
+        const navigationFields = new Set(this._columnDefinitions.flatMap((x) => x.fields ?? [x.field]).filter((x) => x.includes('/')));
         if (navigationFields.size > 0) {
           const navigations = new Set<string>();
           for (const item of dataset) {
@@ -232,7 +230,7 @@ export class GridOdataService implements BackendService {
    */
   resetPaginationOptions(): void {
     this._odataService.updateOptions({
-      skip: 0
+      skip: 0,
     });
   }
 
@@ -269,7 +267,11 @@ export class GridOdataService implements BackendService {
    * PAGINATION
    */
   processOnPaginationChanged(_event: Event | undefined, args: PaginationChangedArgs): string {
-    const pageSize = +((this.options?.infiniteScroll as InfiniteScrollOption)?.fetchSize || args.pageSize || ((this.pagination) ? this.pagination.pageSize : DEFAULT_PAGE_SIZE));
+    const pageSize = +(
+      (this.options?.infiniteScroll as InfiniteScrollOption)?.fetchSize ||
+      args.pageSize ||
+      (this.pagination ? this.pagination.pageSize : DEFAULT_PAGE_SIZE)
+    );
     this.updatePagination(args.newPage, pageSize);
 
     // build the OData query which we will use in the WebAPI callback
@@ -280,7 +282,13 @@ export class GridOdataService implements BackendService {
    * SORTING
    */
   processOnSortChanged(_event: Event | undefined, args: SingleColumnSort | MultiColumnSort): string {
-    const sortColumns = (args.multiColumnSort) ? (args as MultiColumnSort).sortCols : new Array({ columnId: (args as ColumnSort).sortCol?.id ?? '', sortCol: (args as ColumnSort).sortCol, sortAsc: (args as ColumnSort).sortAsc });
+    const sortColumns = args.multiColumnSort
+      ? (args as MultiColumnSort).sortCols
+      : new Array({
+          columnId: (args as ColumnSort).sortCol?.id ?? '',
+          sortCol: (args as ColumnSort).sortCol,
+          sortAsc: (args as ColumnSort).sortAsc,
+        });
 
     // loop through all columns to inspect sorters & set the query
     this.updateSorters(sortColumns);
@@ -321,22 +329,27 @@ export class GridOdataService implements BackendService {
           columnDef = columnFilter.columnDef;
         }
         if (!columnDef) {
-          throw new Error('[GridOData Service]: Something went wrong in trying to get the column definition of the specified filter (or preset filters). Did you make a typo on the filter columnId?');
+          throw new Error(
+            '[GridOData Service]: Something went wrong in trying to get the column definition of the specified filter (or preset filters). Did you make a typo on the filter columnId?'
+          );
         }
 
-        let fieldName = columnDef.filter?.queryField || columnDef.queryFieldFilter || columnDef.queryField || columnDef.field || columnDef.name || '';
+        let fieldName =
+          columnDef.filter?.queryField || columnDef.queryFieldFilter || columnDef.queryField || columnDef.field || columnDef.name || '';
         if (fieldName instanceof HTMLElement) {
           fieldName = stripTags(fieldName.innerHTML);
         }
         const fieldType = columnDef.type || FieldType.string;
         let searchTerms = (columnFilter?.searchTerms ? [...columnFilter.searchTerms] : null) || [];
-        let fieldSearchValue = (Array.isArray(searchTerms) && searchTerms.length === 1) ? searchTerms[0] : '';
+        let fieldSearchValue = Array.isArray(searchTerms) && searchTerms.length === 1 ? searchTerms[0] : '';
         if (typeof fieldSearchValue === 'undefined') {
           fieldSearchValue = '';
         }
 
         if (!fieldName) {
-          throw new Error(`GridOData filter could not find the field name to query the search, your column definition must include a valid "field" or "name" (optionally you can also use the "queryfield").`);
+          throw new Error(
+            `GridOData filter could not find the field name to query the search, your column definition must include a valid "field" or "name" (optionally you can also use the "queryfield").`
+          );
         }
 
         if (this._odataService.options.useVerbatimSearchTerms || columnFilter.verbatimSearchTerms) {
@@ -344,21 +357,22 @@ export class GridOdataService implements BackendService {
           continue;
         }
 
-        fieldSearchValue = (fieldSearchValue === undefined || fieldSearchValue === null) ? '' : `${fieldSearchValue}`; // make sure it's a string
+        fieldSearchValue = fieldSearchValue === undefined || fieldSearchValue === null ? '' : `${fieldSearchValue}`; // make sure it's a string
 
         // run regex to find possible filter operators unless the user disabled the feature
         const autoParseInputFilterOperator = columnDef.autoParseInputFilterOperator ?? this._gridOptions.autoParseInputFilterOperator;
 
         // group (2): comboStartsWith, (3): comboEndsWith, (4): Operator, (1 or 5): searchValue, (6): last char is '*' (meaning starts with, ex.: abc*)
-        const matches = autoParseInputFilterOperator !== false
-          ? fieldSearchValue.match(/^((.*[^\\*\r\n])[*]{1}(.*[^*\r\n]))|^([<>!=*]{0,2})(.*[^<>!=*])([*]?)$/) || []
-          : [fieldSearchValue, '', '', '', '', fieldSearchValue, ''];
+        const matches =
+          autoParseInputFilterOperator !== false
+            ? fieldSearchValue.match(/^((.*[^\\*\r\n])[*]{1}(.*[^*\r\n]))|^([<>!=*]{0,2})(.*[^<>!=*])([*]?)$/) || []
+            : [fieldSearchValue, '', '', '', '', fieldSearchValue, ''];
 
         const comboStartsWith = matches?.[2] || '';
         const comboEndsWith = matches?.[3] || '';
         let operator = columnFilter.operator || matches?.[4];
         let searchValue = matches?.[1] || matches?.[5] || '';
-        const lastValueChar = matches?.[6] || (operator === '*z' || operator === OperatorType.endsWith) ? '*' : '';
+        const lastValueChar = matches?.[6] || operator === '*z' || operator === OperatorType.endsWith ? '*' : '';
         const bypassOdataQuery = columnFilter.bypassBackendQuery || false;
 
         // no need to query if search value is empty
@@ -371,7 +385,12 @@ export class GridOdataService implements BackendService {
         if (comboStartsWith && comboEndsWith) {
           searchTerms = [comboStartsWith, comboEndsWith];
           operator = OperatorType.startsWithEndsWith;
-        } else if (Array.isArray(searchTerms) && searchTerms.length === 1 && typeof searchTerms[0] === 'string' && searchTerms[0].indexOf('..') >= 0) {
+        } else if (
+          Array.isArray(searchTerms) &&
+          searchTerms.length === 1 &&
+          typeof searchTerms[0] === 'string' &&
+          searchTerms[0].indexOf('..') >= 0
+        ) {
           // range filter
           if (operator !== OperatorType.rangeInclusive && operator !== OperatorType.rangeExclusive) {
             operator = this._gridOptions.defaultFilterRangeOperator ?? OperatorType.rangeInclusive;
@@ -401,7 +420,12 @@ export class GridOdataService implements BackendService {
         }
 
         // Range with 1 searchterm should lead to equals for a date field.
-        if ((operator === OperatorType.rangeInclusive || operator === OperatorType.rangeExclusive) && Array.isArray(searchTerms) && searchTerms.length === 1 && fieldType === FieldType.date) {
+        if (
+          (operator === OperatorType.rangeInclusive || operator === OperatorType.rangeExclusive) &&
+          Array.isArray(searchTerms) &&
+          searchTerms.length === 1 &&
+          fieldType === FieldType.date
+        ) {
           operator = OperatorType.equal;
         }
 
@@ -440,7 +464,7 @@ export class GridOdataService implements BackendService {
               operator,
               columnFilterOperator: columnFilter.operator,
               searchValues: searchTerms,
-              grid: this._grid
+              grid: this._grid,
             });
           }
 
@@ -454,7 +478,10 @@ export class GridOdataService implements BackendService {
             tmpSearchTerms.push(`startswith(${fieldName}, ${sw})`);
             tmpSearchTerms.push(`endswith(${fieldName}, ${ew})`);
             searchBy = tmpSearchTerms.join(' and ');
-          } else if (searchTerms?.length > 1 && (operator === 'IN' || operator === 'NIN' || operator === 'NOTIN' || operator === 'NOT IN' || operator === 'NOT_IN')) {
+          } else if (
+            searchTerms?.length > 1 &&
+            (operator === 'IN' || operator === 'NIN' || operator === 'NOTIN' || operator === 'NOT IN' || operator === 'NOT_IN')
+          ) {
             // when having more than 1 search term (then check if we have a "IN" or "NOT IN" filter search)
             const tmpSearchTerms: string[] = [];
             if (operator === 'IN') {
@@ -473,14 +500,26 @@ export class GridOdataService implements BackendService {
             if (!(typeof searchBy === 'string' && searchBy[0] === '(' && searchBy.slice(-1) === ')')) {
               searchBy = `(${searchBy})`;
             }
-          } else if (operator === '*' || operator === 'a*' || operator === '*z' || lastValueChar === '*' || operator === OperatorType.startsWith || operator === OperatorType.endsWith) {
+          } else if (
+            operator === '*' ||
+            operator === 'a*' ||
+            operator === '*z' ||
+            lastValueChar === '*' ||
+            operator === OperatorType.startsWith ||
+            operator === OperatorType.endsWith
+          ) {
             // first/last character is a '*' will be a startsWith or endsWith
-            searchBy = (operator === '*' || operator === '*z' || operator === OperatorType.endsWith) ? `endswith(${fieldName}, ${searchValue})` : `startswith(${fieldName}, ${searchValue})`;
+            searchBy =
+              operator === '*' || operator === '*z' || operator === OperatorType.endsWith
+                ? `endswith(${fieldName}, ${searchValue})`
+                : `startswith(${fieldName}, ${searchValue})`;
           } else if (operator === OperatorType.rangeExclusive || operator === OperatorType.rangeInclusive) {
             // example:: (Name >= 'Bob' and Name <= 'Jane')
             searchBy = this.filterBySearchTermRange(getHtmlStringOutput(fieldName), operator, searchTerms);
-          } else if ((operator === '' || operator === OperatorType.contains || operator === OperatorType.notContains) &&
-            (fieldType === FieldType.string || fieldType === FieldType.text || fieldType === FieldType.readonly)) {
+          } else if (
+            (operator === '' || operator === OperatorType.contains || operator === OperatorType.notContains) &&
+            (fieldType === FieldType.string || fieldType === FieldType.text || fieldType === FieldType.readonly)
+          ) {
             searchBy = odataVersion >= 4 ? `contains(${fieldName}, ${searchValue})` : `substringof(${searchValue}, ${fieldName})`;
             if (operator === OperatorType.notContains) {
               searchBy = `not ${searchBy}`;
@@ -501,8 +540,8 @@ export class GridOdataService implements BackendService {
 
     // update the service options with filters for the buildQuery() to work later
     this._odataService.updateOptions({
-      filter: (searchByArray.length > 0) ? searchByArray.join(' and ') : '',
-      skip: undefined
+      filter: searchByArray.length > 0 ? searchByArray.join(' and ') : '',
+      skip: undefined,
     });
   }
 
@@ -518,10 +557,13 @@ export class GridOdataService implements BackendService {
     };
 
     // unless user specifically set "enablePagination" to False, we'll update pagination options in every other cases
-    if (this._gridOptions && (this._gridOptions.enablePagination || !this._gridOptions.hasOwnProperty('enablePagination') || this.options?.infiniteScroll)) {
+    if (
+      this._gridOptions &&
+      (this._gridOptions.enablePagination || !this._gridOptions.hasOwnProperty('enablePagination') || this.options?.infiniteScroll)
+    ) {
       this._odataService.updateOptions({
         top: pageSize,
-        skip: (newPage - 1) * pageSize
+        skip: (newPage - 1) * pageSize,
       });
     }
   }
@@ -537,26 +579,26 @@ export class GridOdataService implements BackendService {
     if (!sortColumns && presetSorters) {
       // make the presets the current sorters, also make sure that all direction are in lowercase for OData
       currentSorters = presetSorters;
-      currentSorters.forEach((sorter) => sorter.direction = sorter.direction.toLowerCase() as SortDirectionString);
+      currentSorters.forEach((sorter) => (sorter.direction = sorter.direction.toLowerCase() as SortDirectionString));
 
       // display the correct sorting icons on the UI, for that it requires (columnId, sortAsc) properties
       const tmpSorterArray = currentSorters.map((sorter) => {
         const columnDef = this._columnDefinitions.find((column: Column) => column.id === sorter.columnId);
 
         odataSorters.push({
-          field: columnDef ? ((columnDef.queryFieldSorter || columnDef.queryField || columnDef.field) + '') : (sorter.columnId + ''),
-          direction: sorter.direction
+          field: columnDef ? (columnDef.queryFieldSorter || columnDef.queryField || columnDef.field) + '' : sorter.columnId + '',
+          direction: sorter.direction,
         });
 
         // return only the column(s) found in the Column Definitions ELSE null
         if (columnDef) {
           return {
             columnId: sorter.columnId,
-            sortAsc: sorter.direction.toUpperCase() === SortDirection.ASC
+            sortAsc: sorter.direction.toUpperCase() === SortDirection.ASC,
           };
         }
         return null;
-      }) as { columnId: string | number; sortAsc: boolean; }[] | null;
+      }) as { columnId: string | number; sortAsc: boolean }[] | null;
 
       // set the sort icons, but also make sure to filter out null values (that happens when columnDef is not found)
       if (Array.isArray(tmpSorterArray) && this._grid) {
@@ -582,13 +624,13 @@ export class GridOdataService implements BackendService {
 
               currentSorters.push({
                 columnId: columnDef.sortCol.id,
-                direction: columnDef.sortAsc ? SortDirection.asc : SortDirection.desc
+                direction: columnDef.sortAsc ? SortDirection.asc : SortDirection.desc,
               });
 
               if (queryField !== '') {
                 odataSorters.push({
                   field: queryField,
-                  direction: columnDef.sortAsc ? SortDirection.ASC : SortDirection.DESC
+                  direction: columnDef.sortAsc ? SortDirection.ASC : SortDirection.DESC,
                 });
               }
             }
@@ -598,18 +640,20 @@ export class GridOdataService implements BackendService {
     }
 
     // transform the sortby array into a CSV string for OData
-    currentSorters = currentSorters || [] as CurrentSorter[];
-    const csvString = odataSorters.map((sorter) => {
-      let str = '';
-      if (sorter && sorter.field) {
-        const sortField = (this._odataService.options.caseType === CaseType.pascalCase) ? titleCase(sorter.field) : sorter.field;
-        str = `${sortField} ${sorter && sorter.direction && sorter.direction.toLowerCase() || ''}`;
-      }
-      return str;
-    }).join(',');
+    currentSorters = currentSorters || ([] as CurrentSorter[]);
+    const csvString = odataSorters
+      .map((sorter) => {
+        let str = '';
+        if (sorter && sorter.field) {
+          const sortField = this._odataService.options.caseType === CaseType.pascalCase ? titleCase(sorter.field) : sorter.field;
+          str = `${sortField} ${(sorter && sorter.direction && sorter.direction.toLowerCase()) || ''}`;
+        }
+        return str;
+      })
+      .join(',');
 
     this._odataService.updateOptions({
-      orderBy: csvString
+      orderBy: csvString,
     });
 
     // keep current Sorters and update the service options with the new sorting
@@ -628,7 +672,8 @@ export class GridOdataService implements BackendService {
    */
   protected castFilterToColumnFilters(columnFilters: ColumnFilters | CurrentFilter[]): CurrentFilter[] {
     // keep current filters & always save it as an array (columnFilters can be an object when it is dealt by SlickGrid Filter)
-    const filtersArray: ColumnFilter[] = (typeof columnFilters === 'object') ? Object.keys(columnFilters).map(key => (columnFilters as any)[key]) : columnFilters;
+    const filtersArray: ColumnFilter[] =
+      typeof columnFilters === 'object' ? Object.keys(columnFilters).map((key) => (columnFilters as any)[key]) : columnFilters;
 
     if (!Array.isArray(filtersArray)) {
       return [];
@@ -677,7 +722,7 @@ export class GridOdataService implements BackendService {
   /**
    * Normalizes the search value according to field type and oData version.
    */
-  protected normalizeSearchValue(fieldType: typeof FieldType[keyof typeof FieldType], searchValue: any, version: number): any {
+  protected normalizeSearchValue(fieldType: (typeof FieldType)[keyof typeof FieldType], searchValue: any, version: number): any {
     switch (fieldType) {
       case FieldType.date:
         searchValue = parseUtcDate(searchValue as string);

package/src/services/odataQueryBuilder.service.ts

@@ -21,16 +21,16 @@ export class OdataQueryBuilderService {
   constructor() {
     this._odataOptions = {
       filterQueue: [],
-      orderBy: ''
+      orderBy: '',
     };
     this._defaultSortBy = '';
     this._columnFilters = {};
   }
 
   /*
-    * Build the OData query string from all the options provided
-    * @return string OData query
-    */
+   * Build the OData query string from all the options provided
+   * @return string OData query
+   */
   buildQuery(): string {
     if (!this._odataOptions) {
       throw new Error('Odata Service requires certain options like "top" for it to work');
@@ -40,7 +40,7 @@ export class OdataQueryBuilderService {
 
     // When enableCount is set, add it to the OData query
     if (this._odataOptions?.enableCount === true) {
-      const countQuery = (this._odataOptions.version && this._odataOptions.version >= 4) ? '$count=true' : '$inlinecount=allpages';
+      const countQuery = this._odataOptions.version && this._odataOptions.version >= 4 ? '$count=true' : '$inlinecount=allpages';
       queryTmpArray.push(countQuery);
     }
 
@@ -86,7 +86,7 @@ export class OdataQueryBuilderService {
     }
 
     if (this._odataOptions.enableSelect || this._odataOptions.enableExpand) {
-      const fields = this._columnDefinitions.flatMap(x => x.fields ?? [x.field]);
+      const fields = this._columnDefinitions.flatMap((x) => x.fields ?? [x.field]);
       fields.unshift(this._datasetIdPropName);
       const selectExpand = this.buildSelectExpand([...new Set(fields)]);
       if (this._odataOptions.enableSelect) {
@@ -128,7 +128,7 @@ export class OdataQueryBuilderService {
   saveColumnFilter(fieldName: string, value: any, searchTerms?: any[]): void {
     this._columnFilters[fieldName] = {
       search: searchTerms,
-      value
+      value,
     };
   }
 
@@ -177,8 +177,8 @@ export class OdataQueryBuilderService {
   // private functions
   // -------------------
 
-  private buildSelectExpand(selectFields: string[]): { selectParts: string[]; expandParts: string[]; } {
-    const navigations: { [navigation: string]: string[]; } = {};
+  private buildSelectExpand(selectFields: string[]): { selectParts: string[]; expandParts: string[] } {
+    const navigations: { [navigation: string]: string[] } = {};
     const selectItems = new Set<string>();
 
     for (const field of selectFields) {
@@ -203,11 +203,11 @@ export class OdataQueryBuilderService {
 
     return {
       selectParts: [...selectItems],
-      expandParts: this._odataOptions.enableExpand ? this.buildExpand(navigations) : []
+      expandParts: this._odataOptions.enableExpand ? this.buildExpand(navigations) : [],
     };
   }
 
-  private buildExpand(navigations: { [navigation: string]: string[]; }): string[] {
+  private buildExpand(navigations: { [navigation: string]: string[] }): string[] {
     const expandParts = [];
     for (const navigation of Object.keys(navigations)) {
       if (this._odataOptions.enableSelect && this._odataOptions.version && this._odataOptions.version >= 4) {