diff --git a/packages/sp/spqueryable.ts b/packages/sp/spqueryable.ts index f6733b92a..14d8421c7 100644 --- a/packages/sp/spqueryable.ts +++ b/packages/sp/spqueryable.ts @@ -358,7 +358,7 @@ class InitialFieldQuery extends QueryableFields public or(): QueryableFields; public or(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): ComparisonResult; public or(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): (ComparisonResult | QueryableFields) { - if (queries == null || queries.length == 0) + if (queries == null || queries.length == 0) return new QueryableFields([...this.query, FilterJoinOperator.Or]); return new ComparisonResult([...this.query, `(${queries.map(x => x.toString()).join(FilterJoinOperator.OrWithSpace)})`]); } @@ -536,22 +536,27 @@ class DateField extends NumericField { class ComparisonResult extends BaseQuery { public and(): QueryableAndResult; + // eslint-disable-next-line @typescript-eslint/semi public and(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): ComparisonResult + // eslint-disable-next-line max-len public and(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): (ComparisonResult | QueryableAndResult) { - if (queries == null || queries.length == 0) + if (queries == null || queries.length === 0) { return new QueryableAndResult([...this.query, FilterJoinOperator.And]); + } return new ComparisonResult([...this.query, FilterJoinOperator.And, `(${queries.map(x => x.toString()).join(FilterJoinOperator.AndWithSpace)})`]); } public or(): QueryableOrResult; public or(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): ComparisonResult; + // eslint-disable-next-line max-len public or(...queries: (ComparisonResult | ((f: QueryableFields) => ComparisonResult))[]): (ComparisonResult | QueryableOrResult) { - if (queries == null || queries.length == 0) + if (queries == null || queries.length === 0) { return new QueryableOrResult([...this.query, FilterJoinOperator.Or]); + } return new ComparisonResult([...this.query, FilterJoinOperator.Or, `(${queries.map(x => x.toString()).join(FilterJoinOperator.OrWithSpace)})`]); } public toString(): string { return this.query.join(" "); } -} \ No newline at end of file +}