Corrected the implementation and documentation of

MarkDuckworth · MarkDuckworth · commit 2ddc06880eab · 2022-10-25T11:52:43.000-06:00
diff --git a/packages/firestore/src/core/target.ts b/packages/firestore/src/core/target.ts
@@ -786,13 +786,17 @@ export class CompositeFilter extends Filter {
   }
 }
 
-// TODO(orquery) move compositeFilterWithAddedFilters to filter.ts in future refactor
+/**
+ * Returns a new composite filter that contains all filter from
+ * `compositeFilter` plus all the given filters in `otherFilters`.
+ * TODO(orquery) move compositeFilterWithAddedFilters to filter.ts in future refactor
+ */
 export function compositeFilterWithAddedFilters(
   compositeFilter: CompositeFilter,
   otherFilters: Filter[]
 ): CompositeFilter {
   const mergedFilters = compositeFilter.filters.concat(otherFilters);
-  return CompositeFilter.create(mergedFilters, CompositeOperator.AND);
+  return CompositeFilter.create(mergedFilters, compositeFilter.op);
 }
 
 export function compositeFilterIsConjunction(

Original file line number	Diff line number	Diff line change
`@@ -786,13 +786,17 @@ export class CompositeFilter extends Filter {`
`786`	`786`	`}`
`787`	`787`	`}`
`788`	`788`
`789`		`-// TODO(orquery) move compositeFilterWithAddedFilters to filter.ts in future refactor`
	`789`	`+/**`
	`790`	`+ * Returns a new composite filter that contains all filter from`
	`791`	+ * `compositeFilter` plus all the given filters in `otherFilters`.
	`792`	`+ * TODO(orquery) move compositeFilterWithAddedFilters to filter.ts in future refactor`
	`793`	`+ */`
`790`	`794`	`export function compositeFilterWithAddedFilters(`
`791`	`795`	`compositeFilter: CompositeFilter,`
`792`	`796`	`otherFilters: Filter[]`
`793`	`797`	`): CompositeFilter {`
`794`	`798`	`const mergedFilters = compositeFilter.filters.concat(otherFilters);`
`795`		`- return CompositeFilter.create(mergedFilters, CompositeOperator.AND);`
	`799`	`+ return CompositeFilter.create(mergedFilters, compositeFilter.op);`
`796`	`800`	`}`
`797`	`801`
`798`	`802`	`export function compositeFilterIsConjunction(`