Merge 2327106 into 1a90c06

Author: Feiyang1

packages/database/src/api/Query.ts

@@ -49,7 +49,17 @@ import {
 } from '../core/view/EventRegistration';
 
 import { Repo } from '../core/Repo';
-import { QueryParams } from '../core/view/QueryParams';
+import {
+  QueryParams,
+  queryParamsLimitToFirst,
+  queryParamsLimitToLast,
+  queryParamsStartAfter,
+  queryParamsStartAt,
+  queryParamsEndAt,
+  queryParamsEndBefore,
+  queryParamsGetQueryObject,
+  queryParamsOrderBy
+} from '../core/view/QueryParams';
 import { Reference } from './Reference';
 import { DataSnapshot } from './DataSnapshot';
 
@@ -355,7 +365,7 @@ export class Query {
     return new Query(
       this.repo,
       this.path,
-      this.queryParams_.limitToFirst(limit),
+      queryParamsLimitToFirst(this.queryParams_, limit),
       this.orderByCalled_
     );
   }
@@ -384,7 +394,7 @@ export class Query {
     return new Query(
       this.repo,
       this.path,
-      this.queryParams_.limitToLast(limit),
+      queryParamsLimitToLast(this.queryParams_, limit),
       this.orderByCalled_
     );
   }
@@ -416,7 +426,7 @@ export class Query {
       );
     }
     const index = new PathIndex(parsedPath);
-    const newParams = this.queryParams_.orderBy(index);
+    const newParams = queryParamsOrderBy(this.queryParams_, index);
     Query.validateQueryEndpoints_(newParams);
 
     return new Query(this.repo, this.path, newParams, /*orderByCalled=*/ true);
@@ -428,7 +438,7 @@ export class Query {
   orderByKey(): Query {
     validateArgCount('Query.orderByKey', 0, 0, arguments.length);
     this.validateNoPreviousOrderByCall_('Query.orderByKey');
-    const newParams = this.queryParams_.orderBy(KEY_INDEX);
+    const newParams = queryParamsOrderBy(this.queryParams_, KEY_INDEX);
     Query.validateQueryEndpoints_(newParams);
     return new Query(this.repo, this.path, newParams, /*orderByCalled=*/ true);
   }
@@ -439,7 +449,7 @@ export class Query {
   orderByPriority(): Query {
     validateArgCount('Query.orderByPriority', 0, 0, arguments.length);
     this.validateNoPreviousOrderByCall_('Query.orderByPriority');
-    const newParams = this.queryParams_.orderBy(PRIORITY_INDEX);
+    const newParams = queryParamsOrderBy(this.queryParams_, PRIORITY_INDEX);
     Query.validateQueryEndpoints_(newParams);
     return new Query(this.repo, this.path, newParams, /*orderByCalled=*/ true);
   }
@@ -450,7 +460,7 @@ export class Query {
   orderByValue(): Query {
     validateArgCount('Query.orderByValue', 0, 0, arguments.length);
     this.validateNoPreviousOrderByCall_('Query.orderByValue');
-    const newParams = this.queryParams_.orderBy(VALUE_INDEX);
+    const newParams = queryParamsOrderBy(this.queryParams_, VALUE_INDEX);
     Query.validateQueryEndpoints_(newParams);
     return new Query(this.repo, this.path, newParams, /*orderByCalled=*/ true);
   }
@@ -463,7 +473,7 @@ export class Query {
     validateFirebaseDataArg('Query.startAt', 1, value, this.path, true);
     validateKey('Query.startAt', 2, name, true);
 
-    const newParams = this.queryParams_.startAt(value, name);
+    const newParams = queryParamsStartAt(this.queryParams_, value, name);
     Query.validateLimit_(newParams);
     Query.validateQueryEndpoints_(newParams);
     if (this.queryParams_.hasStart()) {
@@ -490,7 +500,7 @@ export class Query {
     validateFirebaseDataArg('Query.startAfter', 1, value, this.path, false);
     validateKey('Query.startAfter', 2, name, true);
 
-    const newParams = this.queryParams_.startAfter(value, name);
+    const newParams = queryParamsStartAfter(this.queryParams_, value, name);
     Query.validateLimit_(newParams);
     Query.validateQueryEndpoints_(newParams);
     if (this.queryParams_.hasStart()) {
@@ -511,7 +521,7 @@ export class Query {
     validateFirebaseDataArg('Query.endAt', 1, value, this.path, true);
     validateKey('Query.endAt', 2, name, true);
 
-    const newParams = this.queryParams_.endAt(value, name);
+    const newParams = queryParamsEndAt(this.queryParams_, value, name);
     Query.validateLimit_(newParams);
     Query.validateQueryEndpoints_(newParams);
     if (this.queryParams_.hasEnd()) {
@@ -532,7 +542,7 @@ export class Query {
     validateFirebaseDataArg('Query.endBefore', 1, value, this.path, false);
     validateKey('Query.endBefore', 2, name, true);
 
-    const newParams = this.queryParams_.endBefore(value, name);
+    const newParams = queryParamsEndBefore(this.queryParams_, value, name);
     Query.validateLimit_(newParams);
     Query.validateQueryEndpoints_(newParams);
     if (this.queryParams_.hasEnd()) {
@@ -589,7 +599,7 @@ export class Query {
    * An object representation of the query parameters used by this Query.
    */
   queryObject(): object {
-    return this.queryParams_.getQueryObject();
+    return queryParamsGetQueryObject(this.queryParams_);
   }
 
   queryIdentifier(): string {

packages/database/src/core/ReadonlyRestClient.ts

@@ -28,6 +28,7 @@ import { ServerActions } from './ServerActions';
 import { RepoInfo } from './RepoInfo';
 import { AuthTokenProvider } from './AuthTokenProvider';
 import { Query } from '../api/Query';
+import { queryParamsToRestQueryStringParameters } from './view/QueryParams';
 
 /**
  * An implementation of ServerActions that communicates with the server via REST requests.
@@ -94,9 +95,9 @@ export class ReadonlyRestClient extends ServerActions {
     const thisListen = {};
     this.listens_[listenId] = thisListen;
 
-    const queryStringParameters = query
-      .getQueryParams()
-      .toRestQueryStringParameters();
+    const queryStringParameters = queryParamsToRestQueryStringParameters(
+      query.getQueryParams()
+    );
 
     this.restRequest_(
       pathString + '.json',
@@ -136,9 +137,9 @@ export class ReadonlyRestClient extends ServerActions {
   }
 
   get(query: Query): Promise<string> {
-    const queryStringParameters = query
-      .getQueryParams()
-      .toRestQueryStringParameters();
+    const queryStringParameters = queryParamsToRestQueryStringParameters(
+      query.getQueryParams()
+    );
 
     const pathString = query.path.toString();