@slickgrid-universal/odata 9.13.0 → 10.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/README.md +0 -1
  2. package/dist/interfaces/odataServiceApi.interface.d.ts +1 -1
  3. package/dist/interfaces/odataServiceApi.interface.d.ts.map +1 -1
  4. package/dist/interfaces/odataSortingOption.interface.d.ts +2 -2
  5. package/dist/interfaces/odataSortingOption.interface.d.ts.map +1 -1
  6. package/dist/services/grid-odata.service.d.ts +5 -5
  7. package/dist/services/grid-odata.service.d.ts.map +1 -1
  8. package/dist/services/grid-odata.service.js +32 -32
  9. package/dist/services/grid-odata.service.js.map +1 -1
  10. package/package.json +4 -4
  11. package/src/interfaces/odataServiceApi.interface.ts +1 -1
  12. package/src/interfaces/odataSortingOption.interface.ts +2 -2
  13. package/src/services/grid-odata.service.ts +37 -39
package/README.md CHANGED
@@ -3,7 +3,6 @@
3
3
  [![lerna--lite](https://img.shields.io/badge/maintained%20with-lerna--lite-e137ff)](https://github.com/ghiscoding/lerna-lite)
4
4
  [![npm](https://img.shields.io/npm/v/@slickgrid-universal/odata.svg)](https://www.npmjs.com/package/@slickgrid-universal/odata)
5
5
  [![npm](https://img.shields.io/npm/dy/@slickgrid-universal/odata)](https://www.npmjs.com/package/@slickgrid-universal/odata)
6
- [![npm bundle size](https://img.shields.io/bundlephobia/minzip/@slickgrid-universal/odata?color=success&label=gzip)](https://bundlephobia.com/result?p=@slickgrid-universal/odata)
7
6
 
8
7
  ## Grid OData Service
9
8
  #### @slickgrid-universal/odata
package/dist/interfaces/odataServiceApi.interface.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { BackendServiceApi } from '@slickgrid-universal/common';
2
2
  import type { GridOdataService } from '../services/index.js';
3
3
  import type { OdataOption } from './odataOption.interface.js';
4
- export interface OdataServiceApi extends BackendServiceApi {
4
+ export interface OdataServiceApi<T = any> extends BackendServiceApi<T> {
5
5
  /** Backend Service Options */
6
6
  options?: Partial<OdataOption>;
7
7
  /** Backend Service instance (could be OData or GraphQL Service) */
package/dist/interfaces/odataServiceApi.interface.d.ts.map CHANGED
@@ -1 +1 @@
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,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,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"}
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,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IACpE,8BAA8B;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/B,mEAAmE;IACnE,OAAO,EAAE,gBAAgB,CAAC;CAC3B"}
package/dist/interfaces/odataSortingOption.interface.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import type { SortDirection, SortDirectionString } from '@slickgrid-universal/common';
1
+ import type { SortDirection } from '@slickgrid-universal/common';
2
2
  export interface OdataSortingOption {
3
3
  field: string;
4
- direction: SortDirection | SortDirectionString;
4
+ direction: SortDirection;
5
5
  }
6
6
  //# sourceMappingURL=odataSortingOption.interface.d.ts.map
package/dist/interfaces/odataSortingOption.interface.d.ts.map CHANGED
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"odataSortingOption.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/odataSortingOption.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,CAAC;CAC1B"}
package/dist/services/grid-odata.service.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import type { BackendService, Column, ColumnFilters, ColumnSort, CurrentFilter, CurrentPagination, CurrentSorter, FilterChangedArgs, GridOption, MultiColumnSort, OperatorString, Pagination, PaginationChangedArgs, SearchTerm, SharedService, SingleColumnSort, SlickGrid } from '@slickgrid-universal/common';
2
- import { FieldType, OperatorType } from '@slickgrid-universal/common';
1
+ import type { BackendService, Column, ColumnFilters, ColumnSort, CurrentFilter, CurrentPagination, CurrentSorter, FilterChangedArgs, GridOption, MultiColumnSort, OperatorType, Pagination, PaginationChangedArgs, SearchTerm, SingleColumnSort, SlickGrid } from '@slickgrid-universal/common';
2
+ import { type FieldType } from '@slickgrid-universal/common';
3
3
  import type { OdataOption } from '../interfaces/index.js';
4
4
  import { OdataQueryBuilderService } from './odataQueryBuilder.service.js';
5
5
  export declare class GridOdataService implements BackendService {
@@ -19,7 +19,7 @@ export declare class GridOdataService implements BackendService {
19
19
  /** Getter for the Grid Options pulled through the Grid Object */
20
20
  protected get _gridOptions(): GridOption;
21
21
  constructor();
22
- init(serviceOptions?: Partial<OdataOption>, pagination?: Pagination, grid?: SlickGrid, sharedService?: SharedService): void;
22
+ init(serviceOptions?: Partial<OdataOption>, pagination?: Pagination, grid?: SlickGrid): void;
23
23
  buildQuery(): string;
24
24
  postProcess(processResult: any): void;
25
25
  clearFilters(): void;
@@ -67,10 +67,10 @@ export declare class GridOdataService implements BackendService {
67
67
  /**
68
68
  * Filter by a range of searchTerms (2 searchTerms OR 1 string separated by 2 dots "value1..value2")
69
69
  */
70
- protected filterBySearchTermRange(fieldName: string, operator: OperatorType | OperatorString, searchTerms: SearchTerm[]): string;
70
+ protected filterBySearchTermRange(fieldName: string, operator: OperatorType, searchTerms: SearchTerm[]): string;
71
71
  /**
72
72
  * Normalizes the search value according to field type and oData version.
73
73
  */
74
- protected normalizeSearchValue(fieldType: (typeof FieldType)[keyof typeof FieldType], searchValue: any, version: number): any;
74
+ protected normalizeSearchValue(fieldType: FieldType, searchValue: any, version: number): any;
75
75
  }
76
76
  //# sourceMappingURL=grid-odata.service.d.ts.map
package/dist/services/grid-odata.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grid-odata.service.d.ts","sourceRoot":"","sources":["../../src/services/grid-odata.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACd,MAAM,EAEN,aAAa,EACb,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,UAAU,EAEV,eAAe,EACf,cAAc,EACd,UAAU,EACV,qBAAqB,EACrB,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,SAAS,EAEV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAA0B,YAAY,EAA+B,MAAM,6BAA6B,CAAC;AAE3H,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAK1E,qBAAa,gBAAiB,YAAW,cAAc;IACrD,SAAS,CAAC,eAAe,EAAE,aAAa,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAC9D,SAAS,CAAC,eAAe,EAAE,aAAa,EAAE,CAAM;IAChD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAClD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,WAAW,CAIzB;IAEF,wCAAwC;IACxC,IAAI,iBAAiB,IAAI,MAAM,EAAE,CAEhC;IAED,mCAAmC;IACnC,IAAI,YAAY,IAAI,wBAAwB,CAE3C;IAED,iEAAiE;IACjE,SAAS,KAAK,YAAY,IAAI,UAAU,CAEvC;;IAMD,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI;IA+B3H,UAAU,IAAI,MAAM;IAIpB,WAAW,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI;IA2DrC,YAAY,IAAI,IAAI;IAKpB,YAAY,IAAI,IAAI;IAKpB,aAAa,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAK1D,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAI3C,0DAA0D;IAC1D,iBAAiB,IAAI,aAAa,EAAE;IAIpC,4DAA4D;IAC5D,oBAAoB,IAAI,iBAAiB,GAAG,IAAI;IAIhD,0DAA0D;IAC1D,iBAAiB,IAAI,aAAa,EAAE;IAIpC;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAgC1C,sBAAsB,IAAI,IAAI;IAM9B,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI;IAO9E,sBAAsB,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,MAAM;IAyBlF,0BAA0B,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,qBAAqB,GAAG,MAAM;IAe1F,oBAAoB,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,gBAAgB,GAAG,eAAe,GAAG,MAAM;IAqBjG;;;OAGG;IACH,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,EAAE,EAAE,8BAA8B,CAAC,EAAE,OAAO,GAAG,IAAI;IA+O7G;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkBzD;;;OAGG;IACH,aAAa,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,EAAE,aAAa,EAAE,GAAG,MAAM;IA8FlF;;;OAGG;IACH,SAAS,CAAC,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,EAAE,GAAG,aAAa,EAAE;IAwBpG;;OAEG;IACH,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM;IAsBhI;;OAEG;IACH,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG;CA6C9H"}
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/services/grid-odata.service.js CHANGED
@@ -1,4 +1,4 @@
1
- import { FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
1
+ import { mapOperatorByFieldType, parseUtcDate } from '@slickgrid-universal/common';
2
2
  import { getHtmlStringOutput, stripTags, titleCase } from '@slickgrid-universal/utils';
3
3
  import { OdataQueryBuilderService } from './odataQueryBuilder.service.js';
4
4
  const DEFAULT_ITEMS_PER_PAGE = 25;
@@ -28,7 +28,7 @@ export class GridOdataService {
28
28
  };
29
29
  this._odataService = new OdataQueryBuilderService();
30
30
  }
31
- init(serviceOptions, pagination, grid, sharedService) {
31
+ init(serviceOptions, pagination, grid) {
32
32
  this._grid = grid;
33
33
  const mergedOptions = { ...this.defaultOptions, ...serviceOptions };
34
34
  // unless user specifically set "enablePagination" to False, we'll add "top" property for the pagination in every other cases
@@ -48,7 +48,7 @@ export class GridOdataService {
48
48
  this.options = this._odataService.options;
49
49
  this.pagination = pagination;
50
50
  if (grid?.getColumns) {
51
- const tmpColumnDefinitions = sharedService?.allColumns ?? grid.getColumns() ?? [];
51
+ const tmpColumnDefinitions = grid.getColumns() ?? [];
52
52
  this._columns = tmpColumnDefinitions.filter((column) => !column.excludeFromQuery);
53
53
  }
54
54
  this._odataService.columnDefinitions = this._columns;
@@ -259,7 +259,7 @@ export class GridOdataService {
259
259
  if (fieldName instanceof HTMLElement) {
260
260
  fieldName = stripTags(fieldName.innerHTML);
261
261
  }
262
- const fieldType = columnDef.type || FieldType.string;
262
+ const fieldType = columnDef.type || 'string';
263
263
  let searchTerms = (columnFilter?.searchTerms ? [...columnFilter.searchTerms] : null) || [];
264
264
  let fieldSearchValue = Array.isArray(searchTerms) && searchTerms.length === 1 ? searchTerms[0] : '';
265
265
  if (typeof fieldSearchValue === 'undefined') {
@@ -283,7 +283,7 @@ export class GridOdataService {
283
283
  const comboEndsWith = matches?.[3] || '';
284
284
  let operator = columnFilter.operator || matches?.[4];
285
285
  let searchValue = matches?.[1] || matches?.[5] || '';
286
- const lastValueChar = matches?.[6] || operator === '*z' || operator === OperatorType.endsWith ? '*' : '';
286
+ const lastValueChar = matches?.[6] || operator === '*z' || operator === 'EndsWith' ? '*' : '';
287
287
  const bypassOdataQuery = columnFilter.bypassBackendQuery || false;
288
288
  // no need to query if search value is empty
289
289
  if (fieldName && searchValue === '' && searchTerms.length <= 1) {
@@ -293,24 +293,24 @@ export class GridOdataService {
293
293
  // StartsWith + EndsWith combo
294
294
  if (comboStartsWith && comboEndsWith) {
295
295
  searchTerms = [comboStartsWith, comboEndsWith];
296
- operator = OperatorType.startsWithEndsWith;
296
+ operator = 'StartsWithEndsWith';
297
297
  }
298
298
  else if (Array.isArray(searchTerms) &&
299
299
  searchTerms.length === 1 &&
300
300
  typeof searchTerms[0] === 'string' &&
301
301
  searchTerms[0].indexOf('..') >= 0) {
302
302
  // range filter
303
- if (operator !== OperatorType.rangeInclusive && operator !== OperatorType.rangeExclusive) {
304
- operator = this._gridOptions.defaultFilterRangeOperator ?? OperatorType.rangeInclusive;
303
+ if (operator !== 'RangeInclusive' && operator !== 'RangeExclusive') {
304
+ operator = this._gridOptions.defaultFilterRangeOperator ?? 'RangeInclusive';
305
305
  }
306
306
  searchTerms = searchTerms[0].split('..', 2);
307
307
  if (searchTerms[0] === '') {
308
- operator = operator === OperatorType.rangeInclusive ? '<=' : operator === OperatorType.rangeExclusive ? '<' : operator;
308
+ operator = operator === 'RangeInclusive' ? '<=' : operator === 'RangeExclusive' ? '<' : operator;
309
309
  searchTerms = searchTerms.slice(1);
310
310
  searchValue = searchTerms[0];
311
311
  }
312
312
  else if (searchTerms[1] === '') {
313
- operator = operator === OperatorType.rangeInclusive ? '>=' : operator === OperatorType.rangeExclusive ? '>' : operator;
313
+ operator = operator === 'RangeInclusive' ? '>=' : operator === 'RangeExclusive' ? '>' : operator;
314
314
  searchTerms = searchTerms.slice(0, 1);
315
315
  searchValue = searchTerms[0];
316
316
  }
@@ -328,8 +328,8 @@ export class GridOdataService {
328
328
  if ((operator === 'RangeInclusive' || operator === 'RangeExclusive') &&
329
329
  Array.isArray(searchTerms) &&
330
330
  searchTerms.length === 1 &&
331
- fieldType === FieldType.date) {
332
- operator = OperatorType.equal;
331
+ fieldType === 'date') {
332
+ operator = 'EQ';
333
333
  }
334
334
  // if we still don't have an operator find the proper Operator to use according to field type
335
335
  if (!operator) {
@@ -369,7 +369,7 @@ export class GridOdataService {
369
369
  if (filterQueryOverride !== undefined) {
370
370
  searchBy = filterQueryOverride;
371
371
  }
372
- else if (operator === OperatorType.startsWithEndsWith && Array.isArray(searchTerms) && searchTerms.length === 2) {
372
+ else if (operator === 'StartsWithEndsWith' && Array.isArray(searchTerms) && searchTerms.length === 2) {
373
373
  const tmpSearchTerms = [];
374
374
  const [sw, ew] = searchTerms;
375
375
  // add 2 conditions (StartsWith A + EndsWith B) to the search array
@@ -403,22 +403,22 @@ export class GridOdataService {
403
403
  operator === 'a*' ||
404
404
  operator === '*z' ||
405
405
  lastValueChar === '*' ||
406
- operator === OperatorType.startsWith ||
407
- operator === OperatorType.endsWith) {
406
+ operator === 'StartsWith' ||
407
+ operator === 'EndsWith') {
408
408
  // first/last character is a '*' will be a startsWith or endsWith
409
409
  searchBy =
410
- operator === '*' || operator === '*z' || operator === OperatorType.endsWith
410
+ operator === '*' || operator === '*z' || operator === 'EndsWith'
411
411
  ? `endswith(${fieldName}, ${searchValue})`
412
412
  : `startswith(${fieldName}, ${searchValue})`;
413
413
  }
414
- else if (operator === OperatorType.rangeExclusive || operator === OperatorType.rangeInclusive) {
414
+ else if (operator === 'RangeExclusive' || operator === 'RangeInclusive') {
415
415
  // example:: (Name >= 'Bob' and Name <= 'Jane')
416
416
  searchBy = this.filterBySearchTermRange(getHtmlStringOutput(fieldName), operator, searchTerms);
417
417
  }
418
- else if ((operator === '' || operator === OperatorType.contains || operator === OperatorType.notContains) &&
419
- (fieldType === FieldType.string || fieldType === FieldType.text || fieldType === FieldType.readonly)) {
418
+ else if ((operator === '' || operator === 'Contains' || operator === 'Not_Contains') &&
419
+ (fieldType === 'string' || fieldType === 'text' || fieldType === 'readonly')) {
420
420
  searchBy = odataVersion >= 4 ? `contains(${fieldName}, ${searchValue})` : `substringof(${searchValue}, ${fieldName})`;
421
- if (operator === OperatorType.notContains) {
421
+ if (operator === 'Not_Contains') {
422
422
  searchBy = `not ${searchBy}`;
423
423
  }
424
424
  }
@@ -481,7 +481,7 @@ export class GridOdataService {
481
481
  if (columnDef) {
482
482
  return {
483
483
  columnId: sorter.columnId,
484
- sortAsc: sorter.direction.toUpperCase() === SortDirection.ASC,
484
+ sortAsc: sorter.direction.toUpperCase() === 'ASC',
485
485
  };
486
486
  }
487
487
  return null;
@@ -511,12 +511,12 @@ export class GridOdataService {
511
511
  }
512
512
  currentSorters.push({
513
513
  columnId: columnDef.sortCol.id,
514
- direction: columnDef.sortAsc ? SortDirection.asc : SortDirection.desc,
514
+ direction: columnDef.sortAsc ? 'asc' : 'desc',
515
515
  });
516
516
  if (queryField !== '') {
517
517
  odataSorters.push({
518
518
  field: queryField,
519
- direction: columnDef.sortAsc ? SortDirection.ASC : SortDirection.DESC,
519
+ direction: columnDef.sortAsc ? 'ASC' : 'DESC',
520
520
  });
521
521
  }
522
522
  }
@@ -577,7 +577,7 @@ export class GridOdataService {
577
577
  filterBySearchTermRange(fieldName, operator, searchTerms) {
578
578
  let query = '';
579
579
  if (Array.isArray(searchTerms) && searchTerms.length === 2) {
580
- if (operator === OperatorType.rangeInclusive) {
580
+ if (operator === 'RangeInclusive') {
581
581
  // example:: (Duration >= 5 and Duration <= 10)
582
582
  query = `(${fieldName} ge ${searchTerms[0]}`;
583
583
  if (searchTerms[1] !== '') {
@@ -585,7 +585,7 @@ export class GridOdataService {
585
585
  }
586
586
  query += ')';
587
587
  }
588
- else if (operator === OperatorType.rangeExclusive) {
588
+ else if (operator === 'RangeExclusive') {
589
589
  // example:: (Duration > 5 and Duration < 10)
590
590
  query = `(${fieldName} gt ${searchTerms[0]}`;
591
591
  if (searchTerms[1] !== '') {
@@ -601,13 +601,13 @@ export class GridOdataService {
601
601
  */
602
602
  normalizeSearchValue(fieldType, searchValue, version) {
603
603
  switch (fieldType) {
604
- case FieldType.date:
604
+ case 'date':
605
605
  searchValue = parseUtcDate(searchValue);
606
606
  searchValue = version >= 4 ? searchValue : `DateTime'${searchValue}'`;
607
607
  break;
608
- case FieldType.string:
609
- case FieldType.text:
610
- case FieldType.readonly:
608
+ case 'string':
609
+ case 'text':
610
+ case 'readonly':
611
611
  if (typeof searchValue === 'string') {
612
612
  // escape single quotes by doubling them
613
613
  searchValue = searchValue.replace(/'/g, `''`);
@@ -617,9 +617,9 @@ export class GridOdataService {
617
617
  searchValue = `'${searchValue}'`;
618
618
  }
619
619
  break;
620
- case FieldType.integer:
621
- case FieldType.number:
622
- case FieldType.float:
620
+ case 'integer':
621
+ case 'number':
622
+ case 'float':
623
623
  if (typeof searchValue === 'string') {
624
624
  // Parse a valid decimal from the string.
625
625
  // Replace double dots with single dots
package/dist/services/grid-odata.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grid-odata.service.js","sourceRoot":"","sources":["../../src/services/grid-odata.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grid-odata.service.js","sourceRoot":"","sources":["../../src/services/grid-odata.service.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAkB,MAAM,6BAA6B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAClC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAE7B,MAAM,OAAO,gBAAgB;IAe3B,wCAAwC;IACxC,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,mCAAmC;IACnC,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,iEAAiE;IACjE,IAAc,YAAY;QACxB,OAAO,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,IAAK,EAAiB,CAAC;IACxD,CAAC;IAED;QA7BU,oBAAe,GAAoB,EAAE,CAAC;QACtC,uBAAkB,GAA6B,IAAI,CAAC;QACpD,oBAAe,GAAoB,EAAE,CAAC;QACtC,aAAQ,GAAa,EAAE,CAAC;QAKlC,mBAAc,GAAgB;YAC5B,GAAG,EAAE,sBAAsB;YAC3B,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,YAAY;SACvB,CAAC;QAkBA,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAwB,EAAE,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,cAAqC,EAAE,UAAuB,EAAE,IAAgB;QACnF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,GAAG,cAAc,EAAE,CAAC;QAEpE,6HAA6H;QAC7H,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC;YAC1E,2DAA2D;YAC3D,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YAClE,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GACZ,aAAa,CAAC,cAAuC,EAAE,SAAS,IAAI,UAAU,EAAE,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YACvH,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;YAClE,IAAI,CAAC,kBAAkB,GAAG;gBACxB,UAAU,EAAE,CAAC;gBACb,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,iBAAiB;aACzF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,IAAI,EAAE,UAAU,EAAE,CAAC;YACrB,MAAM,oBAAoB,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,qBAAqB,IAAI,IAAI,CAAC;IACzF,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,aAAkB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QAE7D,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC9D,MAAM,cAAc,GAClB,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,IAAI,YAAY,IAAI,CAAC,CAAC;gBAC9D,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;gBACjC,CAAC,CAAC,YAAY,KAAK,CAAC;oBAClB,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC;oBAC5B,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;YAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAI,CAAC,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC;YACrC,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,gBAAgB,GACpB,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,gBAAgB,IAAI,YAAY,IAAI,CAAC,CAAC;gBAChE,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK;gBACtB,CAAC,CAAC,YAAY,KAAK,CAAC;oBAClB,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO;oBACxB,CAAC,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC;YAClC,MAAM,OAAO,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,+FAA+F;gBAC/F,kJAAkJ;gBAClJ,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrH,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;oBACtC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;wBAC3B,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;4BACrC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;4BAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;4BAC5B,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BAE5B,IAAI,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;4BAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gCACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCAC5B,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;oCACxD,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;gCACxB,CAAC;4BACH,CAAC;4BAED,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;wBACpB,CAAC;wBAED,mGAAmG;wBACnG,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;4BACrC,IAAI,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,QAAQ,EAAE,CAAC;gCACzC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;4BAC1B,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,YAAY;QACV,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,YAAY;QACV,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,aAAa,CAAC,cAAqC;QACjD,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,cAAc,EAAE,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC5C,CAAC;IAED,kBAAkB,CAAC,SAAiB;QAClC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,0DAA0D;IAC1D,iBAAiB;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,4DAA4D;IAC5D,oBAAoB;QAClB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED,0DAA0D;IAC1D,iBAAiB;QACf,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,QAAgB;QAC/B,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,GAAG;gBACN,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,KAAK,IAAI;gBACP,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,KAAK,GAAG;gBACN,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,KAAK,IAAI;gBACP,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,KAAK,IAAI,CAAC;YACV,KAAK,IAAI;gBACP,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,IAAI,CAAC;YACV;gBACE,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;QACV,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,sBAAsB;QACpB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;YAC/B,IAAI,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,SAAiB,EAAE,KAAa,EAAE,KAAoB;QACrE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACH,sBAAsB,CAAC,MAAyB,EAAE,IAAuB;QACvE,MAAM,WAAW,GAAe,IAAI,CAAC,YAAY,CAAC;QAClD,MAAM,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC;QAEjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAC;QAC1G,CAAC;QAED,0HAA0H;QAC1H,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE1E,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;QACnI,CAAC;QAED,8DAA8D;QAC9D,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEvC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,0BAA0B,CAAC,MAAyB,EAAE,IAA2B;QAC/E,MAAM,QAAQ,GAAG,CAAC,CACf,IAAI,CAAC,OAAO,EAAE,cAAuC,EAAE,SAAS;YACjE,IAAI,CAAC,QAAQ;YACb,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CACjE,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE9C,iEAAiE;QACjE,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,MAAyB,EAAE,IAAwC;QACtF,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe;YACtC,CAAC,CAAE,IAAwB,CAAC,QAAQ;YACpC,CAAC,CAAC,IAAI,KAAK,CAAC;gBACR,QAAQ,EAAG,IAAmB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE;gBAChD,OAAO,EAAG,IAAmB,CAAC,OAAO;gBACrC,OAAO,EAAG,IAAmB,CAAC,OAAO;aACtC,CAAC,CAAC;QAEP,8DAA8D;QAC9D,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAEhC,6DAA6D;QAC7D,IAAI,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,CAAC;QAED,iEAAiE;QACjE,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,aAA8C,EAAE,8BAAwC;QACpG,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;QAE7D,yDAAyD;QACzD,IAAI,8BAA8B,EAAE,CAAC;YACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC;QAED,8CAA8C;QAC9C,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,IAAI,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,MAAM,YAAY,GAAI,aAAqB,CAAC,QAAQ,CAAC,CAAC;gBAEtD,uGAAuG;gBACvG,IAAI,SAA6B,CAAC;gBAClC,IAAI,8BAA8B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACnE,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC1F,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;gBACrC,CAAC;gBACD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CACb,2KAA2K,CAC5K,CAAC;gBACJ,CAAC;gBAED,IAAI,SAAS,GACX,SAAS,CAAC,MAAM,EAAE,UAAU,IAAI,SAAS,CAAC,gBAAgB,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC;gBAChI,IAAI,SAAS,YAAY,WAAW,EAAE,CAAC;oBACrC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC7C,CAAC;gBACD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,IAAI,QAAQ,CAAC;gBAC7C,IAAI,WAAW,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC3F,IAAI,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpG,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE,CAAC;oBAC5C,gBAAgB,GAAG,EAAE,CAAC;gBACxB,CAAC;gBAED,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CACb,mLAAmL,CACpL,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,sBAAsB,IAAI,YAAY,CAAC,mBAAmB,EAAE,CAAC;oBAC1F,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,IAAI,YAAY,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/G,SAAS;gBACX,CAAC;gBAED,gBAAgB,GAAG,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,gBAAgB,EAAE,CAAC,CAAC,0BAA0B;gBAEvI,mFAAmF;gBACnF,MAAM,4BAA4B,GAAG,SAAS,CAAC,4BAA4B,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC;gBAE9H,+IAA+I;gBAC/I,MAAM,OAAO,GACX,4BAA4B,KAAK,KAAK;oBACpC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,wEAAwE,CAAC,IAAI,EAAE;oBACxG,CAAC,CAAC,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;gBAE/D,MAAM,eAAe,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACzC,IAAI,QAAQ,GAAG,YAAY,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;gBACrD,IAAI,WAAW,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACrD,MAAM,aAAa,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9F,MAAM,gBAAgB,GAAG,YAAY,CAAC,kBAAkB,IAAI,KAAK,CAAC;gBAElE,4CAA4C;gBAC5C,IAAI,SAAS,IAAI,WAAW,KAAK,EAAE,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBAC/D,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;oBACxD,SAAS;gBACX,CAAC;gBAED,8BAA8B;gBAC9B,IAAI,eAAe,IAAI,aAAa,EAAE,CAAC;oBACrC,WAAW,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;oBAC/C,QAAQ,GAAG,oBAAoB,CAAC;gBAClC,CAAC;qBAAM,IACL,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC1B,WAAW,CAAC,MAAM,KAAK,CAAC;oBACxB,OAAO,WAAW,CAAC,CAAC,CAAC,KAAK,QAAQ;oBAClC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EACjC,CAAC;oBACD,eAAe;oBACf,IAAI,QAAQ,KAAK,gBAAgB,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;wBACnE,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,0BAA0B,IAAI,gBAAgB,CAAC;oBAC9E,CAAC;oBAED,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC5C,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;wBAC1B,QAAQ,GAAG,QAAQ,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACjG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACnC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC/B,CAAC;yBAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;wBACjC,QAAQ,GAAG,QAAQ,KAAK,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACjG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACtC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC;gBAED,kIAAkI;gBAClI,kFAAkF;gBAClF,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;oBAClC,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACvC,CAAC;gBAED,wEAAwE;gBACxE,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5G,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC;gBAC1D,CAAC;gBAED,kEAAkE;gBAClE,IACE,CAAC,QAAQ,KAAK,gBAAgB,IAAI,QAAQ,KAAK,gBAAgB,CAAC;oBAChE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;oBAC1B,WAAW,CAAC,MAAM,KAAK,CAAC;oBACxB,SAAS,KAAK,MAAM,EACpB,CAAC;oBACD,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;gBAED,6FAA6F;gBAC7F,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,QAAQ,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;gBAC/C,CAAC;gBAED,wBAAwB;gBACxB,IAAI,gBAAgB,EAAE,CAAC;oBACrB,oDAAoD;oBACpD,IAAI,SAAS,EAAE,CAAC;wBACd,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;oBACvF,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,8BAA8B;oBAC9B,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;oBAC9E,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC/B,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BACnC,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,CAAC;wBAC9F,CAAC,CAAC,CAAC;oBACL,CAAC;oBAED,QAAQ,GAAG,EAAE,CAAC;oBAEd,8DAA8D;oBAC9D,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;wBACzD,SAAS,GAAG,SAAS,CAAC,mBAAmB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC9D,CAAC;oBAED,IAAI,mBAAmB,GAAuB,SAAS,CAAC;oBACxD,IAAI,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;wBACzE,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAAC;4BACnE,SAAS,EAAE,mBAAmB,CAAC,SAAS,CAAC;4BACzC,SAAS;4BACT,QAAQ;4BACR,oBAAoB,EAAE,YAAY,CAAC,QAAQ;4BAC3C,YAAY,EAAE,WAAW;4BACzB,IAAI,EAAE,IAAI,CAAC,KAAK;yBACjB,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;wBACtC,QAAQ,GAAG,mBAAmB,CAAC;oBACjC,CAAC;yBAAM,IAAI,QAAQ,KAAK,oBAAoB,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACvG,MAAM,cAAc,GAAa,EAAE,CAAC;wBACpC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,WAAW,CAAC;wBAE7B,mEAAmE;wBACnE,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,KAAK,EAAE,GAAG,CAAC,CAAC;wBACvD,cAAc,CAAC,IAAI,CAAC,YAAY,SAAS,KAAK,EAAE,GAAG,CAAC,CAAC;wBACrD,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC1C,CAAC;yBAAM,IACL,WAAW,EAAE,MAAM,GAAG,CAAC;wBACvB,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,CAAC,EACnH,CAAC;wBACD,+FAA+F;wBAC/F,MAAM,cAAc,GAAa,EAAE,CAAC;wBACpC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;4BACtB,uDAAuD;4BACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;gCACvD,cAAc,CAAC,IAAI,CAAC,GAAG,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BAC3D,CAAC;4BACD,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBACzC,CAAC;6BAAM,CAAC;4BACN,wDAAwD;4BACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;gCACvD,cAAc,CAAC,IAAI,CAAC,GAAG,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BAC3D,CAAC;4BACD,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAC1C,CAAC;wBACD,IAAI,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;4BACzF,QAAQ,GAAG,IAAI,QAAQ,GAAG,CAAC;wBAC7B,CAAC;oBACH,CAAC;yBAAM,IACL,QAAQ,KAAK,GAAG;wBAChB,QAAQ,KAAK,IAAI;wBACjB,QAAQ,KAAK,IAAI;wBACjB,aAAa,KAAK,GAAG;wBACrB,QAAQ,KAAK,YAAY;wBACzB,QAAQ,KAAK,UAAU,EACvB,CAAC;wBACD,iEAAiE;wBACjE,QAAQ;4BACN,QAAQ,KAAK,GAAG,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,UAAU;gCAC9D,CAAC,CAAC,YAAY,SAAS,KAAK,WAAW,GAAG;gCAC1C,CAAC,CAAC,cAAc,SAAS,KAAK,WAAW,GAAG,CAAC;oBACnD,CAAC;yBAAM,IAAI,QAAQ,KAAK,gBAAgB,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;wBAC1E,+CAA+C;wBAC/C,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;oBACjG,CAAC;yBAAM,IACL,CAAC,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,cAAc,CAAC;wBAC3E,CAAC,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,UAAU,CAAC,EAC5E,CAAC;wBACD,QAAQ,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,SAAS,KAAK,WAAW,GAAG,CAAC,CAAC,CAAC,eAAe,WAAW,KAAK,SAAS,GAAG,CAAC;wBACtH,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;4BAChC,QAAQ,GAAG,OAAO,QAAQ,EAAE,CAAC;wBAC/B,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,2CAA2C;wBAC3C,QAAQ,GAAG,GAAG,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE,CAAC;oBAC9E,CAAC;oBAED,oDAAoD;oBACpD,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;wBACpB,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;wBACpC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;oBAC7F,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,6EAA6E;QAC7E,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;YAC/B,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;YACnE,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,OAAe,EAAE,QAAgB;QAChD,IAAI,CAAC,kBAAkB,GAAG;YACxB,UAAU,EAAE,OAAO;YACnB,QAAQ;SACT,CAAC;QAEF,iHAAiH;QACjH,IACE,IAAI,CAAC,YAAY;YACjB,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAC7H,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;gBAC/B,GAAG,EAAE,QAAQ;gBACb,IAAI,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,QAAQ;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,WAA0B,EAAE,aAA+B;QACvE,IAAI,cAAc,GAAoB,EAAE,CAAC;QACzC,MAAM,YAAY,GAAyB,EAAE,CAAC;QAE9C,IAAI,CAAC,WAAW,IAAI,aAAa,EAAE,CAAC;YAClC,qGAAqG;YACrG,cAAc,GAAG,aAAa,CAAC;YAC/B,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,EAAmB,CAAC,CAAC,CAAC;YAEzG,mGAAmG;YACnG,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACnD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAExF,YAAY,CAAC,IAAI,CAAC;oBAChB,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE;oBACtH,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B,CAAC,CAAC;gBAEH,sEAAsE;gBACtE,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO;wBACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,KAAK;qBAClD,CAAC;gBACJ,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAA6D,CAAC;YAE/D,8GAA8G;YAC9G,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAChD,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,IAAI,CAAC,aAAa,EAAE,CAAC;YACzC,8FAA8F;YAC9F,IAAI,WAAW,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,qBAAqB;gBACrB,+FAA+F;YACjG,CAAC;iBAAM,CAAC;gBACN,IAAI,WAAW,EAAE,CAAC;oBAChB,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;wBACpC,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;4BACtB,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;4BACrH,IAAI,eAAe,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BAC7E,IAAI,UAAU,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC;4BAC5H,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;gCACzD,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;gCACjC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;gCAC7C,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;4BACrC,CAAC;4BAED,cAAc,CAAC,IAAI,CAAC;gCAClB,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;gCAC9B,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;6BAC9C,CAAC,CAAC;4BAEH,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;gCACtB,YAAY,CAAC,IAAI,CAAC;oCAChB,KAAK,EAAE,UAAU;oCACjB,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;iCAC9C,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,yDAAyD;QACzD,cAAc,GAAG,cAAc,IAAK,EAAsB,CAAC;QAC3D,MAAM,SAAS,GAAG,YAAY;aAC3B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAChH,GAAG,GAAG,GAAG,SAAS,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/F,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;YAC/B,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QAEH,2EAA2E;QAC3E,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QAEtC,iEAAiE;QACjE,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,EAAE;IACF,sBAAsB;IACtB,sBAAsB;IACtB;;;OAGG;IACO,yBAAyB,CAAC,aAA8C;QAChF,0HAA0H;QAC1H,MAAM,YAAY,GAChB,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,aAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAE3H,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,MAAM,SAAS,GAAkB,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YACrE,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACvC,CAAC;YACD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC1B,SAAS,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;YACnD,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAC7C,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACO,uBAAuB,CAAC,SAAiB,EAAE,QAAsB,EAAE,WAAyB;QACpG,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBAClC,+CAA+C;gBAC/C,KAAK,GAAG,IAAI,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC1B,KAAK,IAAI,QAAQ,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,CAAC;gBACD,KAAK,IAAI,GAAG,CAAC;YACf,CAAC;iBAAM,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBACzC,6CAA6C;gBAC7C,KAAK,GAAG,IAAI,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC1B,KAAK,IAAI,QAAQ,SAAS,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,CAAC;gBACD,KAAK,IAAI,GAAG,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACO,oBAAoB,CAAC,SAAoB,EAAE,WAAgB,EAAE,OAAe;QACpF,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,MAAM;gBACT,WAAW,GAAG,YAAY,CAAC,WAAqB,CAAC,CAAC;gBAClD,WAAW,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,WAAW,GAAG,CAAC;gBACtE,MAAM;YACR,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,UAAU;gBACb,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;oBACpC,wCAAwC;oBACxC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC9C,uCAAuC;oBACvC,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;oBAC9C,6BAA6B;oBAC7B,WAAW,GAAG,IAAI,WAAW,GAAG,CAAC;gBACnC,CAAC;gBACD,MAAM;YACR,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,OAAO;gBACV,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;oBACpC,yCAAyC;oBAEzC,uCAAuC;oBACvC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBAChD,wBAAwB;oBACxB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBAC/C,8BAA8B;oBAC9B,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACjD,mCAAmC;oBACnC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBACpD,iEAAiE;oBACjE,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;oBAEvD,gCAAgC;oBAChC,IAAI,WAAW,KAAK,EAAE,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;wBAC9C,WAAW,GAAG,GAAG,CAAC;oBACpB,CAAC;gBACH,CAAC;gBACD,MAAM;QACV,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@slickgrid-universal/odata",
3
- "version": "9.13.0",
3
+ "version": "10.0.0",
4
4
  "description": "Grid OData Service to sync a grid with an OData backend server",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -31,12 +31,12 @@
31
31
  "url": "https://github.com/ghiscoding/slickgrid-universal/issues"
32
32
  },
33
33
  "dependencies": {
34
- "@slickgrid-universal/common": "9.13.0",
35
- "@slickgrid-universal/utils": "9.13.0"
34
+ "@slickgrid-universal/common": "10.0.0",
35
+ "@slickgrid-universal/utils": "10.0.0"
36
36
  },
37
37
  "funding": {
38
38
  "type": "ko_fi",
39
39
  "url": "https://ko-fi.com/ghiscoding"
40
40
  },
41
- "gitHead": "2f8344e34f8c8409895ab1827036f8c5701acd63"
41
+ "gitHead": "2da6d300a326e4fffe97c0240e0c311cc1dde2cd"
42
42
  }
package/src/interfaces/odataServiceApi.interface.ts CHANGED
@@ -2,7 +2,7 @@ import type { BackendServiceApi } from '@slickgrid-universal/common';
2
2
  import type { GridOdataService } from '../services/index.js';
3
3
  import type { OdataOption } from './odataOption.interface.js';
4
4
 
5
- export interface OdataServiceApi extends BackendServiceApi {
5
+ export interface OdataServiceApi<T = any> extends BackendServiceApi<T> {
6
6
  /** Backend Service Options */
7
7
  options?: Partial<OdataOption>;
8
8
 
package/src/interfaces/odataSortingOption.interface.ts CHANGED
@@ -1,6 +1,6 @@
1
- import type { SortDirection, SortDirectionString } from '@slickgrid-universal/common';
1
+ import type { SortDirection } from '@slickgrid-universal/common';
2
2
 
3
3
  export interface OdataSortingOption {
4
4
  field: string;
5
- direction: SortDirection | SortDirectionString;
5
+ direction: SortDirection;
6
6
  }
package/src/services/grid-odata.service.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import type {
2
- // enums/interfaces
3
2
  BackendService,
4
3
  Column,
5
4
  ColumnFilter,
@@ -12,16 +11,15 @@ import type {
12
11
  GridOption,
13
12
  InfiniteScrollOption,
14
13
  MultiColumnSort,
15
- OperatorString,
14
+ OperatorType,
16
15
  Pagination,
17
16
  PaginationChangedArgs,
18
17
  SearchTerm,
19
- SharedService,
20
18
  SingleColumnSort,
21
19
  SlickGrid,
22
- SortDirectionString,
20
+ SortDirection,
23
21
  } from '@slickgrid-universal/common';
24
- import { FieldType, mapOperatorByFieldType, OperatorType, parseUtcDate, SortDirection } from '@slickgrid-universal/common';
22
+ import { mapOperatorByFieldType, parseUtcDate, type FieldType } from '@slickgrid-universal/common';
25
23
  import { getHtmlStringOutput, stripTags, titleCase } from '@slickgrid-universal/utils';
26
24
  import type { OdataOption, OdataSortingOption } from '../interfaces/index.js';
27
25
  import { OdataQueryBuilderService } from './odataQueryBuilder.service.js';
@@ -63,7 +61,7 @@ export class GridOdataService implements BackendService {
63
61
  this._odataService = new OdataQueryBuilderService();
64
62
  }
65
63
 
66
- init(serviceOptions?: Partial<OdataOption>, pagination?: Pagination, grid?: SlickGrid, sharedService?: SharedService): void {
64
+ init(serviceOptions?: Partial<OdataOption>, pagination?: Pagination, grid?: SlickGrid): void {
67
65
  this._grid = grid;
68
66
  const mergedOptions = { ...this.defaultOptions, ...serviceOptions };
69
67
 
@@ -86,7 +84,7 @@ export class GridOdataService implements BackendService {
86
84
  this.pagination = pagination;
87
85
 
88
86
  if (grid?.getColumns) {
89
- const tmpColumnDefinitions = sharedService?.allColumns ?? grid.getColumns() ?? [];
87
+ const tmpColumnDefinitions = grid.getColumns() ?? [];
90
88
  this._columns = tmpColumnDefinitions.filter((column: Column) => !column.excludeFromQuery);
91
89
  }
92
90
 
@@ -339,7 +337,7 @@ export class GridOdataService implements BackendService {
339
337
  if (fieldName instanceof HTMLElement) {
340
338
  fieldName = stripTags(fieldName.innerHTML);
341
339
  }
342
- const fieldType = columnDef.type || FieldType.string;
340
+ const fieldType = columnDef.type || 'string';
343
341
  let searchTerms = (columnFilter?.searchTerms ? [...columnFilter.searchTerms] : null) || [];
344
342
  let fieldSearchValue = Array.isArray(searchTerms) && searchTerms.length === 1 ? searchTerms[0] : '';
345
343
  if (typeof fieldSearchValue === 'undefined') {
@@ -372,7 +370,7 @@ export class GridOdataService implements BackendService {
372
370
  const comboEndsWith = matches?.[3] || '';
373
371
  let operator = columnFilter.operator || matches?.[4];
374
372
  let searchValue = matches?.[1] || matches?.[5] || '';
375
- const lastValueChar = matches?.[6] || operator === '*z' || operator === OperatorType.endsWith ? '*' : '';
373
+ const lastValueChar = matches?.[6] || operator === '*z' || operator === 'EndsWith' ? '*' : '';
376
374
  const bypassOdataQuery = columnFilter.bypassBackendQuery || false;
377
375
 
378
376
  // no need to query if search value is empty
@@ -384,7 +382,7 @@ export class GridOdataService implements BackendService {
384
382
  // StartsWith + EndsWith combo
385
383
  if (comboStartsWith && comboEndsWith) {
386
384
  searchTerms = [comboStartsWith, comboEndsWith];
387
- operator = OperatorType.startsWithEndsWith;
385
+ operator = 'StartsWithEndsWith';
388
386
  } else if (
389
387
  Array.isArray(searchTerms) &&
390
388
  searchTerms.length === 1 &&
@@ -392,17 +390,17 @@ export class GridOdataService implements BackendService {
392
390
  searchTerms[0].indexOf('..') >= 0
393
391
  ) {
394
392
  // range filter
395
- if (operator !== OperatorType.rangeInclusive && operator !== OperatorType.rangeExclusive) {
396
- operator = this._gridOptions.defaultFilterRangeOperator ?? OperatorType.rangeInclusive;
393
+ if (operator !== 'RangeInclusive' && operator !== 'RangeExclusive') {
394
+ operator = this._gridOptions.defaultFilterRangeOperator ?? 'RangeInclusive';
397
395
  }
398
396
 
399
397
  searchTerms = searchTerms[0].split('..', 2);
400
398
  if (searchTerms[0] === '') {
401
- operator = operator === OperatorType.rangeInclusive ? '<=' : operator === OperatorType.rangeExclusive ? '<' : operator;
399
+ operator = operator === 'RangeInclusive' ? '<=' : operator === 'RangeExclusive' ? '<' : operator;
402
400
  searchTerms = searchTerms.slice(1);
403
401
  searchValue = searchTerms[0];
404
402
  } else if (searchTerms[1] === '') {
405
- operator = operator === OperatorType.rangeInclusive ? '>=' : operator === OperatorType.rangeExclusive ? '>' : operator;
403
+ operator = operator === 'RangeInclusive' ? '>=' : operator === 'RangeExclusive' ? '>' : operator;
406
404
  searchTerms = searchTerms.slice(0, 1);
407
405
  searchValue = searchTerms[0];
408
406
  }
@@ -424,9 +422,9 @@ export class GridOdataService implements BackendService {
424
422
  (operator === 'RangeInclusive' || operator === 'RangeExclusive') &&
425
423
  Array.isArray(searchTerms) &&
426
424
  searchTerms.length === 1 &&
427
- fieldType === FieldType.date
425
+ fieldType === 'date'
428
426
  ) {
429
- operator = OperatorType.equal;
427
+ operator = 'EQ';
430
428
  }
431
429
 
432
430
  // if we still don't have an operator find the proper Operator to use according to field type
@@ -470,7 +468,7 @@ export class GridOdataService implements BackendService {
470
468
 
471
469
  if (filterQueryOverride !== undefined) {
472
470
  searchBy = filterQueryOverride;
473
- } else if (operator === OperatorType.startsWithEndsWith && Array.isArray(searchTerms) && searchTerms.length === 2) {
471
+ } else if (operator === 'StartsWithEndsWith' && Array.isArray(searchTerms) && searchTerms.length === 2) {
474
472
  const tmpSearchTerms: string[] = [];
475
473
  const [sw, ew] = searchTerms;
476
474
 
@@ -505,23 +503,23 @@ export class GridOdataService implements BackendService {
505
503
  operator === 'a*' ||
506
504
  operator === '*z' ||
507
505
  lastValueChar === '*' ||
508
- operator === OperatorType.startsWith ||
509
- operator === OperatorType.endsWith
506
+ operator === 'StartsWith' ||
507
+ operator === 'EndsWith'
510
508
  ) {
511
509
  // first/last character is a '*' will be a startsWith or endsWith
512
510
  searchBy =
513
- operator === '*' || operator === '*z' || operator === OperatorType.endsWith
511
+ operator === '*' || operator === '*z' || operator === 'EndsWith'
514
512
  ? `endswith(${fieldName}, ${searchValue})`
515
513
  : `startswith(${fieldName}, ${searchValue})`;
516
- } else if (operator === OperatorType.rangeExclusive || operator === OperatorType.rangeInclusive) {
514
+ } else if (operator === 'RangeExclusive' || operator === 'RangeInclusive') {
517
515
  // example:: (Name >= 'Bob' and Name <= 'Jane')
518
516
  searchBy = this.filterBySearchTermRange(getHtmlStringOutput(fieldName), operator, searchTerms);
519
517
  } else if (
520
- (operator === '' || operator === OperatorType.contains || operator === OperatorType.notContains) &&
521
- (fieldType === FieldType.string || fieldType === FieldType.text || fieldType === FieldType.readonly)
518
+ (operator === '' || operator === 'Contains' || operator === 'Not_Contains') &&
519
+ (fieldType === 'string' || fieldType === 'text' || fieldType === 'readonly')
522
520
  ) {
523
521
  searchBy = odataVersion >= 4 ? `contains(${fieldName}, ${searchValue})` : `substringof(${searchValue}, ${fieldName})`;
524
- if (operator === OperatorType.notContains) {
522
+ if (operator === 'Not_Contains') {
525
523
  searchBy = `not ${searchBy}`;
526
524
  }
527
525
  } else {
@@ -579,7 +577,7 @@ export class GridOdataService implements BackendService {
579
577
  if (!sortColumns && presetSorters) {
580
578
  // make the presets the current sorters, also make sure that all direction are in lowercase for OData
581
579
  currentSorters = presetSorters;
582
- currentSorters.forEach((sorter) => (sorter.direction = sorter.direction.toLowerCase() as SortDirectionString));
580
+ currentSorters.forEach((sorter) => (sorter.direction = sorter.direction.toLowerCase() as SortDirection));
583
581
 
584
582
  // display the correct sorting icons on the UI, for that it requires (columnId, sortAsc) properties
585
583
  const tmpSorterArray = currentSorters.map((sorter) => {
@@ -594,7 +592,7 @@ export class GridOdataService implements BackendService {
594
592
  if (columnDef) {
595
593
  return {
596
594
  columnId: sorter.columnId,
597
- sortAsc: sorter.direction.toUpperCase() === SortDirection.ASC,
595
+ sortAsc: sorter.direction.toUpperCase() === 'ASC',
598
596
  };
599
597
  }
600
598
  return null;
@@ -624,13 +622,13 @@ export class GridOdataService implements BackendService {
624
622
 
625
623
  currentSorters.push({
626
624
  columnId: columnDef.sortCol.id,
627
- direction: columnDef.sortAsc ? SortDirection.asc : SortDirection.desc,
625
+ direction: columnDef.sortAsc ? 'asc' : 'desc',
628
626
  });
629
627
 
630
628
  if (queryField !== '') {
631
629
  odataSorters.push({
632
630
  field: queryField,
633
- direction: columnDef.sortAsc ? SortDirection.ASC : SortDirection.DESC,
631
+ direction: columnDef.sortAsc ? 'ASC' : 'DESC',
634
632
  });
635
633
  }
636
634
  }
@@ -697,17 +695,17 @@ export class GridOdataService implements BackendService {
697
695
  /**
698
696
  * Filter by a range of searchTerms (2 searchTerms OR 1 string separated by 2 dots "value1..value2")
699
697
  */
700
- protected filterBySearchTermRange(fieldName: string, operator: OperatorType | OperatorString, searchTerms: SearchTerm[]): string {
698
+ protected filterBySearchTermRange(fieldName: string, operator: OperatorType, searchTerms: SearchTerm[]): string {
701
699
  let query = '';
702
700
  if (Array.isArray(searchTerms) && searchTerms.length === 2) {
703
- if (operator === OperatorType.rangeInclusive) {
701
+ if (operator === 'RangeInclusive') {
704
702
  // example:: (Duration >= 5 and Duration <= 10)
705
703
  query = `(${fieldName} ge ${searchTerms[0]}`;
706
704
  if (searchTerms[1] !== '') {
707
705
  query += ` and ${fieldName} le ${searchTerms[1]}`;
708
706
  }
709
707
  query += ')';
710
- } else if (operator === OperatorType.rangeExclusive) {
708
+ } else if (operator === 'RangeExclusive') {
711
709
  // example:: (Duration > 5 and Duration < 10)
712
710
  query = `(${fieldName} gt ${searchTerms[0]}`;
713
711
  if (searchTerms[1] !== '') {
@@ -722,15 +720,15 @@ export class GridOdataService implements BackendService {
722
720
  /**
723
721
  * Normalizes the search value according to field type and oData version.
724
722
  */
725
- protected normalizeSearchValue(fieldType: (typeof FieldType)[keyof typeof FieldType], searchValue: any, version: number): any {
723
+ protected normalizeSearchValue(fieldType: FieldType, searchValue: any, version: number): any {
726
724
  switch (fieldType) {
727
- case FieldType.date:
725
+ case 'date':
728
726
  searchValue = parseUtcDate(searchValue as string);
729
727
  searchValue = version >= 4 ? searchValue : `DateTime'${searchValue}'`;
730
728
  break;
731
- case FieldType.string:
732
- case FieldType.text:
733
- case FieldType.readonly:
729
+ case 'string':
730
+ case 'text':
731
+ case 'readonly':
734
732
  if (typeof searchValue === 'string') {
735
733
  // escape single quotes by doubling them
736
734
  searchValue = searchValue.replace(/'/g, `''`);
@@ -740,9 +738,9 @@ export class GridOdataService implements BackendService {
740
738
  searchValue = `'${searchValue}'`;
741
739
  }
742
740
  break;
743
- case FieldType.integer:
744
- case FieldType.number:
745
- case FieldType.float:
741
+ case 'integer':
742
+ case 'number':
743
+ case 'float':
746
744
  if (typeof searchValue === 'string') {
747
745
  // Parse a valid decimal from the string.
748
746