@slickgrid-universal/odata 5.14.0 → 9.0.0

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,mBAAmB,uBAAuB,CAAC"}

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC"}

package/dist/interfaces/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,4BAA4B,CAAC;AAChD,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,mCAAmC,CAAC"}

package/dist/{esm/interfaces → interfaces}/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":""}

package/dist/interfaces/odataOption.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataOption.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/odataOption.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEzH,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD,4GAA4G;IAC5G,QAAQ,EAAE,QAAQ,CAAC;IAEnB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3B,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAEjC,mBAAmB;IACnB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;IAEpB,kFAAkF;IAClF,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,qCAAqC,KAAK,MAAM,GAAG,SAAS,CAAC;IAE1F,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE5B,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,4JAA4J;IAC5J,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;IAE3C,uJAAuJ;IACvJ,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;CAC9C"}

package/dist/interfaces/odataOption.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataOption.interface.js","sourceRoot":"","sources":["../../src/interfaces/odataOption.interface.ts"],"names":[],"mappings":""}

package/dist/interfaces/odataServiceApi.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataServiceApi.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/odataServiceApi.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,8BAA8B;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/B,mEAAmE;IACnE,OAAO,EAAE,gBAAgB,CAAC;CAC3B"}

package/dist/interfaces/odataServiceApi.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataServiceApi.interface.js","sourceRoot":"","sources":["../../src/interfaces/odataServiceApi.interface.ts"],"names":[],"mappings":""}

package/dist/interfaces/odataSortingOption.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataSortingOption.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/odataSortingOption.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,GAAG,mBAAmB,CAAC;CAChD"}

package/dist/interfaces/odataSortingOption.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataSortingOption.interface.js","sourceRoot":"","sources":["../../src/interfaces/odataSortingOption.interface.ts"],"names":[],"mappings":""}

package/dist/{types/services → services}/grid-odata.service.d.ts

@@ -6,7 +6,7 @@ export declare class GridOdataService implements BackendService {
     protected _currentFilters: CurrentFilter[];
     protected _currentPagination: CurrentPagination | null;
     protected _currentSorters: CurrentSorter[];
-    protected _columnDefinitions: Column[];
+    protected _columns: Column[];
     protected _grid: SlickGrid | undefined;
     protected _odataService: OdataQueryBuilderService;
     options?: Partial<OdataOption>;

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

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

package/dist/{esm/services → services}/grid-odata.service.js

@@ -1,4 +1,4 @@
-import { CaseType, FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
+import { FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
 import { getHtmlStringOutput, stripTags, titleCase } from '@slickgrid-universal/utils';
 import { OdataQueryBuilderService } from './odataQueryBuilder.service.js';
 const DEFAULT_ITEMS_PER_PAGE = 25;
@@ -6,7 +6,7 @@ const DEFAULT_PAGE_SIZE = 20;
 export class GridOdataService {
     /** Getter for the Column Definitions */
     get columnDefinitions() {
-        return this._columnDefinitions;
+        return this._columns;
     }
     /** Getter for the Odata Service */
     get odataService() {
@@ -20,11 +20,11 @@ export class GridOdataService {
         this._currentFilters = [];
         this._currentPagination = null;
         this._currentSorters = [];
-        this._columnDefinitions = [];
+        this._columns = [];
         this.defaultOptions = {
             top: DEFAULT_ITEMS_PER_PAGE,
             orderBy: '',
-            caseType: CaseType.pascalCase,
+            caseType: 'pascalCase',
         };
         this._odataService = new OdataQueryBuilderService();
     }
@@ -49,9 +49,9 @@ export class GridOdataService {
         this.pagination = pagination;
         if (grid?.getColumns) {
             const tmpColumnDefinitions = sharedService?.allColumns ?? grid.getColumns() ?? [];
-            this._columnDefinitions = tmpColumnDefinitions.filter((column) => !column.excludeFromQuery);
+            this._columns = tmpColumnDefinitions.filter((column) => !column.excludeFromQuery);
         }
-        this._odataService.columnDefinitions = this._columnDefinitions;
+        this._odataService.columnDefinitions = this._columns;
         this._odataService.datasetIdPropName = this._gridOptions.datasetIdPropertyName || 'id';
     }
     buildQuery() {
@@ -80,7 +80,7 @@ export class GridOdataService {
             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._columns.flatMap((x) => x.fields ?? [x.field]).filter((x) => x.includes('/')));
                 if (navigationFields.size > 0) {
                     const navigations = new Set();
                     for (const item of dataset) {
@@ -246,8 +246,8 @@ export class GridOdataService {
                 const columnFilter = columnFilters[columnId];
                 // if user defined some "presets", then we need to find the filters from the column definitions instead
                 let columnDef;
-                if (isUpdatedByPresetOrDynamically && Array.isArray(this._columnDefinitions)) {
-                    columnDef = this._columnDefinitions.find((column) => column.id === columnFilter.columnId);
+                if (isUpdatedByPresetOrDynamically && Array.isArray(this._columns)) {
+                    columnDef = this._columns.find((column) => column.id === columnFilter.columnId);
                 }
                 else {
                     columnDef = columnFilter.columnDef;
@@ -325,7 +325,7 @@ export class GridOdataService {
                     operator = this._gridOptions.defaultFilterRangeOperator;
                 }
                 // Range with 1 searchterm should lead to equals for a date field.
-                if ((operator === OperatorType.rangeInclusive || operator === OperatorType.rangeExclusive) &&
+                if ((operator === 'RangeInclusive' || operator === 'RangeExclusive') &&
                     Array.isArray(searchTerms) &&
                     searchTerms.length === 1 &&
                     fieldType === FieldType.date) {
@@ -352,7 +352,7 @@ export class GridOdataService {
                     }
                     searchBy = '';
                     // titleCase the fieldName so that it matches the WebApi names
-                    if (this._odataService.options.caseType === CaseType.pascalCase) {
+                    if (this._odataService.options.caseType === 'pascalCase') {
                         fieldName = titleCase(getHtmlStringOutput(fieldName || ''));
                     }
                     let filterQueryOverride = undefined;
@@ -472,7 +472,7 @@ export class GridOdataService {
             currentSorters.forEach((sorter) => (sorter.direction = sorter.direction.toLowerCase()));
             // 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.id === sorter.columnId);
+                const columnDef = this._columns.find((column) => column.id === sorter.columnId);
                 odataSorters.push({
                     field: columnDef ? (columnDef.queryFieldSorter || columnDef.queryField || columnDef.field) + '' : sorter.columnId + '',
                     direction: sorter.direction,
@@ -504,7 +504,7 @@ export class GridOdataService {
                             let fieldName = (columnDef.sortCol.queryFieldSorter || columnDef.sortCol.queryField || columnDef.sortCol.field) + '';
                             let columnFieldName = (columnDef.sortCol.field || columnDef.sortCol.id) + '';
                             let queryField = (columnDef.sortCol.queryFieldSorter || columnDef.sortCol.queryField || columnDef.sortCol.field || '') + '';
-                            if (this._odataService.options.caseType === CaseType.pascalCase) {
+                            if (this._odataService.options.caseType === 'pascalCase') {
                                 fieldName = titleCase(fieldName);
                                 columnFieldName = titleCase(columnFieldName);
                                 queryField = titleCase(queryField);
@@ -530,7 +530,7 @@ export class GridOdataService {
             .map((sorter) => {
             let str = '';
             if (sorter && sorter.field) {
-                const sortField = this._odataService.options.caseType === CaseType.pascalCase ? titleCase(sorter.field) : sorter.field;
+                const sortField = this._odataService.options.caseType === 'pascalCase' ? titleCase(sorter.field) : sorter.field;
                 str = `${sortField} ${(sorter && sorter.direction && sorter.direction.toLowerCase()) || ''}`;
             }
             return str;

package/dist/services/grid-odata.service.js.map

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

package/dist/services/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC"}

package/dist/services/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC"}

package/dist/services/odataQueryBuilder.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"odataQueryBuilder.service.d.ts","sourceRoot":"","sources":["../../src/services/odataQueryBuilder.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E,qBAAa,wBAAwB;IACnC,cAAc,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,SAAK;IACjB,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAEpC,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAC5C,IAAW,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAEvD;IAED,SAAS,CAAC,kBAAkB,SAAQ;IACpC,IAAW,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,EAErD;;IAeD,UAAU,IAAI,MAAM;IAwEpB,cAAc,IAAI,MAAM;IAIxB,IAAI,aAAa,IAAI,GAAG,EAAE,CAEzB;IAED,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAElC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAExC;IAED,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAM3C,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAO1E;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IA+BlD,SAAS,CAAC,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAUhE,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,WAAW;CAuBpB"}

package/dist/{esm/services → services}/odataQueryBuilder.service.js

@@ -1,4 +1,4 @@
-import { CaseType } from '@slickgrid-universal/common';
+import {} from '@slickgrid-universal/common';
 import { titleCase } from '@slickgrid-universal/utils';
 export class OdataQueryBuilderService {
     set columnDefinitions(columnDefinitions) {
@@ -127,7 +127,7 @@ export class OdataQueryBuilderService {
             if (property === 'orderBy' || property === 'sortBy') {
                 let sortBy = options[property];
                 // make sure first char of each orderBy field is capitalize
-                if (this._odataOptions.caseType === CaseType.pascalCase) {
+                if (this._odataOptions.caseType === 'pascalCase') {
                     if (Array.isArray(sortBy)) {
                         sortBy.forEach((field, index, inputArray) => {
                             inputArray[index] = titleCase(field);

package/dist/services/odataQueryBuilder.service.js.map

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

package/package.json

@@ -1,19 +1,17 @@
 {
   "name": "@slickgrid-universal/odata",
-  "version": "5.14.0",
+  "version": "9.0.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",
+  "type": "module",
+  "main": "./dist/index.js",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "default": "./dist/esm/index.js"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
-  "module": "./dist/esm/index.js",
+  "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -38,12 +36,12 @@
     "not dead"
   ],
   "dependencies": {
-    "@slickgrid-universal/common": "5.14.0",
-    "@slickgrid-universal/utils": "5.12.0"
+    "@slickgrid-universal/common": "9.0.0",
+    "@slickgrid-universal/utils": "9.0.0"
   },
   "funding": {
     "type": "ko_fi",
     "url": "https://ko-fi.com/ghiscoding"
   },
-  "gitHead": "a80f07fbdfb4292b1ccf7b89008d74f16a40b89f"
+  "gitHead": "6433a9acf9fa1e5f723a83d5f12e3eff5a455251"
 }

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

@@ -21,7 +21,7 @@ import type {
   SingleColumnSort,
   SlickGrid,
 } from '@slickgrid-universal/common';
-import { CaseType, FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
+import { 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';
@@ -33,7 +33,7 @@ export class GridOdataService implements BackendService {
   protected _currentFilters: CurrentFilter[] = [];
   protected _currentPagination: CurrentPagination | null = null;
   protected _currentSorters: CurrentSorter[] = [];
-  protected _columnDefinitions: Column[] = [];
+  protected _columns: Column[] = [];
   protected _grid: SlickGrid | undefined;
   protected _odataService: OdataQueryBuilderService;
   options?: Partial<OdataOption>;
@@ -41,12 +41,12 @@ export class GridOdataService implements BackendService {
   defaultOptions: OdataOption = {
     top: DEFAULT_ITEMS_PER_PAGE,
     orderBy: '',
-    caseType: CaseType.pascalCase,
+    caseType: 'pascalCase',
   };
 
   /** Getter for the Column Definitions */
   get columnDefinitions(): Column[] {
-    return this._columnDefinitions;
+    return this._columns;
   }
 
   /** Getter for the Odata Service */
@@ -87,10 +87,10 @@ export class GridOdataService implements BackendService {
 
     if (grid?.getColumns) {
       const tmpColumnDefinitions = sharedService?.allColumns ?? grid.getColumns() ?? [];
-      this._columnDefinitions = tmpColumnDefinitions.filter((column: Column) => !column.excludeFromQuery);
+      this._columns = tmpColumnDefinitions.filter((column: Column) => !column.excludeFromQuery);
     }
 
-    this._odataService.columnDefinitions = this._columnDefinitions;
+    this._odataService.columnDefinitions = this._columns;
     this._odataService.datasetIdPropName = this._gridOptions.datasetIdPropertyName || 'id';
   }
 
@@ -125,7 +125,7 @@ export class GridOdataService implements BackendService {
       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._columns.flatMap((x) => x.fields ?? [x.field]).filter((x) => x.includes('/')));
         if (navigationFields.size > 0) {
           const navigations = new Set<string>();
           for (const item of dataset) {
@@ -323,8 +323,8 @@ export class GridOdataService implements BackendService {
 
         // if user defined some "presets", then we need to find the filters from the column definitions instead
         let columnDef: Column | undefined;
-        if (isUpdatedByPresetOrDynamically && Array.isArray(this._columnDefinitions)) {
-          columnDef = this._columnDefinitions.find((column: Column) => column.id === columnFilter.columnId);
+        if (isUpdatedByPresetOrDynamically && Array.isArray(this._columns)) {
+          columnDef = this._columns.find((column: Column) => column.id === columnFilter.columnId);
         } else {
           columnDef = columnFilter.columnDef;
         }
@@ -421,7 +421,7 @@ export class GridOdataService implements BackendService {
 
         // Range with 1 searchterm should lead to equals for a date field.
         if (
-          (operator === OperatorType.rangeInclusive || operator === OperatorType.rangeExclusive) &&
+          (operator === 'RangeInclusive' || operator === 'RangeExclusive') &&
           Array.isArray(searchTerms) &&
           searchTerms.length === 1 &&
           fieldType === FieldType.date
@@ -452,7 +452,7 @@ export class GridOdataService implements BackendService {
           searchBy = '';
 
           // titleCase the fieldName so that it matches the WebApi names
-          if (this._odataService.options.caseType === CaseType.pascalCase) {
+          if (this._odataService.options.caseType === 'pascalCase') {
             fieldName = titleCase(getHtmlStringOutput(fieldName || ''));
           }
 
@@ -583,7 +583,7 @@ export class GridOdataService implements BackendService {
 
       // 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);
+        const columnDef = this._columns.find((column: Column) => column.id === sorter.columnId);
 
         odataSorters.push({
           field: columnDef ? (columnDef.queryFieldSorter || columnDef.queryField || columnDef.field) + '' : sorter.columnId + '',
@@ -616,7 +616,7 @@ export class GridOdataService implements BackendService {
               let fieldName = (columnDef.sortCol.queryFieldSorter || columnDef.sortCol.queryField || columnDef.sortCol.field) + '';
               let columnFieldName = (columnDef.sortCol.field || columnDef.sortCol.id) + '';
               let queryField = (columnDef.sortCol.queryFieldSorter || columnDef.sortCol.queryField || columnDef.sortCol.field || '') + '';
-              if (this._odataService.options.caseType === CaseType.pascalCase) {
+              if (this._odataService.options.caseType === 'pascalCase') {
                 fieldName = titleCase(fieldName);
                 columnFieldName = titleCase(columnFieldName);
                 queryField = titleCase(queryField);
@@ -645,7 +645,7 @@ export class GridOdataService implements BackendService {
       .map((sorter) => {
         let str = '';
         if (sorter && sorter.field) {
-          const sortField = this._odataService.options.caseType === CaseType.pascalCase ? titleCase(sorter.field) : sorter.field;
+          const sortField = this._odataService.options.caseType === 'pascalCase' ? titleCase(sorter.field) : sorter.field;
           str = `${sortField} ${(sorter && sorter.direction && sorter.direction.toLowerCase()) || ''}`;
         }
         return str;

package/src/services/odataQueryBuilder.service.ts

@@ -1,4 +1,4 @@
-import { CaseType, type Column } from '@slickgrid-universal/common';
+import { type Column } from '@slickgrid-universal/common';
 import { titleCase } from '@slickgrid-universal/utils';
 import type { OdataOption } from '../interfaces/odataOption.interface.js';
 
@@ -148,7 +148,7 @@ export class OdataQueryBuilderService {
         let sortBy = options[property as keyof OdataOption];
 
         // make sure first char of each orderBy field is capitalize
-        if (this._odataOptions.caseType === CaseType.pascalCase) {
+        if (this._odataOptions.caseType === 'pascalCase') {
           if (Array.isArray(sortBy)) {
             sortBy.forEach((field, index, inputArray) => {
               inputArray[index] = titleCase(field);

package/dist/cjs/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OdataQueryBuilderService = exports.GridOdataService = void 0;
-var grid_odata_service_js_1 = require("./services/grid-odata.service.js");
-Object.defineProperty(exports, "GridOdataService", { enumerable: true, get: function () { return grid_odata_service_js_1.GridOdataService; } });
-var odataQueryBuilder_service_js_1 = require("./services/odataQueryBuilder.service.js");
-Object.defineProperty(exports, "OdataQueryBuilderService", { enumerable: true, get: function () { return odataQueryBuilder_service_js_1.OdataQueryBuilderService; } });
-//# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,0EAAoE;AAA3D,yHAAA,gBAAgB,OAAA;AACzB,wFAAmF;AAA1E,wIAAA,wBAAwB,OAAA"}

package/dist/cjs/interfaces/index.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/dist/cjs/interfaces/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":""}

package/dist/cjs/interfaces/odataOption.interface.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=odataOption.interface.js.map

package/dist/cjs/interfaces/odataOption.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"odataOption.interface.js","sourceRoot":"","sources":["../../../src/interfaces/odataOption.interface.ts"],"names":[],"mappings":""}

package/dist/cjs/interfaces/odataServiceApi.interface.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=odataServiceApi.interface.js.map

package/dist/cjs/interfaces/odataServiceApi.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"odataServiceApi.interface.js","sourceRoot":"","sources":["../../../src/interfaces/odataServiceApi.interface.ts"],"names":[],"mappings":""}

package/dist/cjs/interfaces/odataSortingOption.interface.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=odataSortingOption.interface.js.map

package/dist/cjs/interfaces/odataSortingOption.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"odataSortingOption.interface.js","sourceRoot":"","sources":["../../../src/interfaces/odataSortingOption.interface.ts"],"names":[],"mappings":""}