prepend functions with the class name they operate on

Author: Feiyang1

packages/database/src/api/Query.ts

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

packages/database/src/core/ReadonlyRestClient.ts

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

packages/database/src/core/view/QueryParams.ts

@@ -203,7 +203,7 @@ export class QueryParams {
   }
 }
 
-export function getNodeFilter(queryParams: QueryParams): NodeFilter {
+export function queryParamsGetNodeFilter(queryParams: QueryParams): NodeFilter {
   if (queryParams.loadsAllData()) {
     return new IndexedFilter(queryParams.getIndex());
   } else if (queryParams.hasLimit()) {
@@ -213,15 +213,18 @@ export function getNodeFilter(queryParams: QueryParams): NodeFilter {
   }
 }
 
-export function limit(queryParams: QueryParams, newLimit: number): QueryParams {
+export function queryParamsLimit(
+  queryParams: QueryParams,
+  newLimit: number
+): QueryParams {
   const newParams = queryParams.copy();
   newParams.limitSet_ = true;
   newParams.limit_ = newLimit;
   newParams.viewFrom_ = '';
   return newParams;
 }
 
-export function limitToFirst(
+export function queryParamsLimitToFirst(
   queryParams: QueryParams,
   newLimit: number
 ): QueryParams {
@@ -232,7 +235,7 @@ export function limitToFirst(
   return newParams;
 }
 
-export function limitToLast(
+export function queryParamsLimitToLast(
   queryParams: QueryParams,
   newLimit: number
 ): QueryParams {
@@ -243,7 +246,7 @@ export function limitToLast(
   return newParams;
 }
 
-export function startAt(
+export function queryParamsStartAt(
   queryParams: QueryParams,
   indexValue: unknown,
   key?: string | null
@@ -264,7 +267,7 @@ export function startAt(
   return newParams;
 }
 
-export function startAfter(
+export function queryParamsStartAfter(
   queryParams: QueryParams,
   indexValue: unknown,
   key?: string | null
@@ -274,21 +277,21 @@ export function startAfter(
     if (typeof indexValue === 'string') {
       indexValue = successor(indexValue as string);
     }
-    params = startAt(queryParams, indexValue, key);
+    params = queryParamsStartAt(queryParams, indexValue, key);
   } else {
     let childKey: string;
     if (key == null) {
       childKey = MAX_NAME;
     } else {
       childKey = successor(key);
     }
-    params = startAt(queryParams, indexValue, childKey);
+    params = queryParamsStartAt(queryParams, indexValue, childKey);
   }
   params.startAfterSet_ = true;
   return params;
 }
 
-export function endAt(
+export function queryParamsEndAt(
   queryParams: QueryParams,
   indexValue: unknown,
   key?: string | null
@@ -309,7 +312,7 @@ export function endAt(
   return newParams;
 }
 
-export function endBefore(
+export function queryParamsEndBefore(
   queryParams: QueryParams,
   indexValue: unknown,
   key?: string | null
@@ -320,20 +323,23 @@ export function endBefore(
     if (typeof indexValue === 'string') {
       indexValue = predecessor(indexValue as string);
     }
-    params = endAt(queryParams, indexValue, key);
+    params = queryParamsEndAt(queryParams, indexValue, key);
   } else {
     if (key == null) {
       childKey = MIN_NAME;
     } else {
       childKey = predecessor(key);
     }
-    params = endAt(queryParams, indexValue, childKey);
+    params = queryParamsEndAt(queryParams, indexValue, childKey);
   }
   params.endBeforeSet_ = true;
   return params;
 }
 
-export function orderBy(queryParams: QueryParams, index: Index): QueryParams {
+export function queryParamsOrderBy(
+  queryParams: QueryParams,
+  index: Index
+): QueryParams {
   const newParams = queryParams.copy();
   newParams.index_ = index;
   return newParams;
@@ -344,7 +350,7 @@ export function orderBy(queryParams: QueryParams, index: Index): QueryParams {
  *
  * @return query string parameters
  */
-export function toRestQueryStringParameters(
+export function queryParamsToRestQueryStringParameters(
   queryParams: QueryParams
 ): Record<string, string | number> {
   const qs: Record<string, string | number> = {};
@@ -393,7 +399,7 @@ export function toRestQueryStringParameters(
   return qs;
 }
 
-export function getQueryObject(
+export function queryParamsGetQueryObject(
   queryParams: QueryParams
 ): Record<string, unknown> {
   const obj: Record<string, unknown> = {};

packages/database/src/core/view/View.ts

@@ -34,7 +34,7 @@ import { Node } from '../snap/Node';
 import { Path, pathGetFront, pathIsEmpty } from '../util/Path';
 import { WriteTreeRef } from '../WriteTree';
 import { CancelEvent, Event } from './Event';
-import { getNodeFilter } from './QueryParams';
+import { queryParamsGetNodeFilter } from './QueryParams';
 
 /**
  * A view represents a specific location and query that has 1 or more event registrations.
@@ -55,7 +55,7 @@ export class View {
     const params = this.query_.getQueryParams();
 
     const indexFilter = new IndexedFilter(params.getIndex());
-    const filter = getNodeFilter(params);
+    const filter = queryParamsGetNodeFilter(params);
 
     this.processor_ = new ViewProcessor(filter);