@@ -327,11 +327,11 @@ export function parseOrderOptions(orderOptions: OrderOption[], groupResults: boo
327 327 328 328
const completer = new TokenCompleter(qd);
329 329
var sto = SubTokensOptions.CanElement | (groupResults ? SubTokensOptions.CanAggregate : 0);
330 -
orderOptions.forEach(a => completer.request(a.token, sto));
330 +
orderOptions.forEach(a => completer.request(a.token.toString(), sto));
331 331 332 332
return completer.finished()
333 333
.then(() => orderOptions.map(oo => ({
334 -
token: completer.get(oo.token),
334 +
token: completer.get(oo.token.toString()),
335 335
orderType: oo.orderType || "Ascending",
336 336
}) as OrderOptionParsed));
337 337
}
@@ -340,12 +340,12 @@ export function parseColumnOptions(columnOptions: ColumnOption[], groupResults:
340 340 341 341
const completer = new TokenCompleter(qd);
342 342
var sto = SubTokensOptions.CanElement | (groupResults ? SubTokensOptions.CanAggregate : 0);
343 -
columnOptions.forEach(a => completer.request(a.token, sto));
343 +
columnOptions.forEach(a => completer.request(a.token.toString(), sto));
344 344 345 345
return completer.finished()
346 346
.then(() => columnOptions.map(co => ({
347 -
token: completer.get(co.token),
348 -
displayName: co.displayName || completer.get(co.token).niceName,
347 +
token: completer.get(co.token.toString()),
348 +
displayName: co.displayName || completer.get(co.token.toString()).niceName,
349 349
}) as ColumnOptionParsed));
350 350
}
351 351
@@ -496,10 +496,10 @@ export function parseFindOptions(findOptions: FindOptions, qd: QueryDescription)
496 496
fo.filterOptions.forEach(fo => completer.requestFilter(fo, SubTokensOptions.CanElement | SubTokensOptions.CanAnyAll | canAggregate));
497 497 498 498
if (fo.orderOptions)
499 -
fo.orderOptions.forEach(oo => completer.request(oo.token, SubTokensOptions.CanElement | canAggregate));
499 +
fo.orderOptions.forEach(oo => completer.request(oo.token.toString(), SubTokensOptions.CanElement | canAggregate));
500 500 501 501
if (fo.columnOptions)
502 -
fo.columnOptions.forEach(co => completer.request(co.token, SubTokensOptions.CanElement | canAggregate));
502 +
fo.columnOptions.forEach(co => completer.request(co.token.toString(), SubTokensOptions.CanElement | canAggregate));
503 503 504 504
return completer.finished().then(() => {
505 505
@@ -510,12 +510,12 @@ export function parseFindOptions(findOptions: FindOptions, qd: QueryDescription)
510 510
systemTime: fo.systemTime,
511 511 512 512
columnOptions: (fo.columnOptions || []).map(co => ({
513 -
token: completer.get(co.token),
514 -
displayName: co.displayName || completer.get(co.token).niceName
513 +
token: completer.get(co.token.toString()),
514 +
displayName: co.displayName || completer.get(co.token.toString()).niceName
515 515
}) as ColumnOptionParsed),
516 516 517 517
orderOptions: (fo.orderOptions || []).map(oo => ({
518 -
token: completer.get(oo.token),
518 +
token: completer.get(oo.token.toString()),
519 519
orderType: oo.orderType,
520 520
}) as OrderOptionParsed),
521 521
@@ -642,7 +642,7 @@ export function expandParentColumn(fo: FindOptions): FindOptions {
642 642
...(fo.filterOptions || [])
643 643
];
644 644 645 -
if (!fo.parentToken.contains(".") && (fo.columnOptionsMode == undefined || fo.columnOptionsMode == "Remove")) {
645 +
if (!fo.parentToken.toString().contains(".") && (fo.columnOptionsMode == undefined || fo.columnOptionsMode == "Remove")) {
646 646
fo.columnOptions = [
647 647
{ token: fo.parentToken },
648 648
...(fo.columnOptions || [])
@@ -680,12 +680,12 @@ export class TokenCompleter {
680 680
requestFilter(fo: FilterOption, options: SubTokensOptions) {
681 681 682 682
if (isFilterGroupOption(fo)) {
683 -
fo.token && this.request(fo.token, options);
683 +
fo.token && this.request(fo.token.toString(), options);
684 684 685 685
fo.filters.forEach(f => this.requestFilter(f, options));
686 686
} else {
687 687 688 -
this.request(fo.token, options);
688 +
this.request(fo.token.toString(), options);
689 689
}
690 690
}
691 691
@@ -735,13 +735,13 @@ export class TokenCompleter {
735 735
toFilterOptionParsed(fo: FilterOption): FilterOptionParsed {
736 736
if (isFilterGroupOption(fo))
737 737
return ({
738 -
token: fo.token && this.get(fo.token),
738 +
token: fo.token && this.get(fo.token.toString()),
739 739
groupOperation: fo.groupOperation,
740 740
filters: fo.filters.map(f => this.toFilterOptionParsed(f))
741 741
} as FilterGroupOptionParsed);
742 742
else
743 743
return ({
744 -
token: this.get(fo.token),
744 +
token: this.get(fo.token.toString()),
745 745
operation: fo.operation || "EqualTo",
746 746
value: fo.value,
747 747
frozen: fo.frozen || false,
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4