Skip to content

Commit 63b8854

Browse files
committed
Fix build. Finish rename. Rename useFirestorePipelines to useFluentPipelines.
1 parent ecd931d commit 63b8854

File tree

17 files changed

+403
-314
lines changed

17 files changed

+403
-314
lines changed

common/api-review/firestore-lite.api.md

Lines changed: 144 additions & 124 deletions
Large diffs are not rendered by default.

common/api-review/firestore.api.md

Lines changed: 132 additions & 102 deletions
Large diffs are not rendered by default.

packages/firestore/lite/index.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ export { PipelineSource } from '../src/lite-api/pipeline-source';
3131

3232
export { PipelineResult } from '../src/lite-api/pipeline-result';
3333

34-
export { Pipeline, pipeline } from '../src/lite-api/pipeline';
34+
export { Pipeline } from '../src/lite-api/pipeline';
3535

36-
export { useFirestorePipelines } from '../src/lite-api/database_augmentation';
37-
38-
export { execute } from '../src/lite-api/pipeline_impl';
36+
export {
37+
useFluentPipelines,
38+
pipeline,
39+
execute
40+
} from '../src/lite-api/pipeline_impl';
3941

4042
export {
4143
Stage,
@@ -73,13 +75,13 @@ export {
7375
arrayContainsAny,
7476
arrayContainsAll,
7577
arrayLength,
76-
inAny,
77-
notInAny,
78+
eqAny,
79+
notEqAny,
7880
xor,
79-
ifFunction,
81+
cond,
8082
not,
81-
logicalMax,
82-
logicalMin,
83+
logicalMaximum,
84+
logicalMinimum,
8385
exists,
8486
isNan,
8587
reverse,
@@ -99,8 +101,8 @@ export {
99101
strConcat,
100102
mapGet,
101103
countAll,
102-
min,
103-
max,
104+
minimum,
105+
maximum,
104106
cosineDistance,
105107
dotProduct,
106108
euclideanDistance,
@@ -139,16 +141,16 @@ export {
139141
ArrayContainsAny,
140142
ArrayLength,
141143
ArrayElement,
142-
In,
144+
EqAny,
143145
IsNan,
144146
Exists,
145147
Not,
146148
And,
147149
Or,
148150
Xor,
149-
If,
150-
LogicalMax,
151-
LogicalMin,
151+
Cond,
152+
LogicalMaximum,
153+
LogicalMinimum,
152154
Reverse,
153155
ReplaceFirst,
154156
ReplaceAll,
@@ -168,8 +170,8 @@ export {
168170
Count,
169171
Sum,
170172
Avg,
171-
Min,
172-
Max,
173+
Minimum,
174+
Maximum,
173175
CosineDistance,
174176
DotProduct,
175177
EuclideanDistance,

packages/firestore/src/api.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ export { PipelineResult } from './lite-api/pipeline-result';
2121

2222
export { Pipeline } from './api/pipeline';
2323

24-
export { useFirestorePipelines, pipeline } from './api/pipeline_impl';
25-
26-
export { execute } from './lite-api/pipeline_impl';
24+
export { useFluentPipelines, pipeline, execute } from './api/pipeline_impl';
2725

2826
export {
2927
Stage,

packages/firestore/src/api/database.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export class Firestore extends LiteFirestore {
135135
*/
136136
pipeline(): PipelineSource {
137137
throw new Error(
138-
'Pipelines not initialized. Your application must call `useFirestorePipelines()` before using Firestore Pipeline features.'
138+
'Pipelines not initialized. Your application must call `useFluentPipelines()` before using Firestore Pipeline features.'
139139
);
140140
}
141141
}

packages/firestore/src/api/database_augmentation.ts

Whitespace-only changes.

packages/firestore/src/api/pipeline-source.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,61 +39,61 @@ export class PipelineSource extends LitePipelineSoure {
3939
/**
4040
* @internal
4141
* @private
42-
* @param db
43-
* @param userDataReader
44-
* @param userDataWriter
45-
* @param documentReferenceFactory
42+
* @param _db
43+
* @param _userDataReader
44+
* @param _userDataWriter
45+
* @param _documentReferenceFactory
4646
*/
4747
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
4848
constructor(
49-
db: Firestore,
50-
userDataReader: UserDataReader,
51-
userDataWriter: AbstractUserDataWriter,
52-
documentReferenceFactory: (id: DocumentKey) => DocumentReference
49+
_db: Firestore,
50+
_userDataReader: UserDataReader,
51+
_userDataWriter: AbstractUserDataWriter,
52+
_documentReferenceFactory: (id: DocumentKey) => DocumentReference
5353
) {
54-
super(db, userDataReader, userDataWriter, documentReferenceFactory);
54+
super(_db, _userDataReader, _userDataWriter, _documentReferenceFactory);
5555
}
5656

5757
collection(collectionPath: string): Pipeline {
58-
const db = cast<Firestore>(this.db, Firestore);
58+
const _db = cast<Firestore>(this._db, Firestore);
5959
return new Pipeline(
60-
db,
61-
this.userDataReader,
62-
this.userDataWriter,
63-
this.documentReferenceFactory,
60+
_db,
61+
this._userDataReader,
62+
this._userDataWriter,
63+
this._documentReferenceFactory,
6464
[new CollectionSource(collectionPath)]
6565
);
6666
}
6767

6868
collectionGroup(collectionId: string): Pipeline {
69-
const db = cast<Firestore>(this.db, Firestore);
69+
const _db = cast<Firestore>(this._db, Firestore);
7070
return new Pipeline(
71-
db,
72-
this.userDataReader,
73-
this.userDataWriter,
74-
this.documentReferenceFactory,
71+
_db,
72+
this._userDataReader,
73+
this._userDataWriter,
74+
this._documentReferenceFactory,
7575
[new CollectionGroupSource(collectionId)]
7676
);
7777
}
7878

7979
database(): Pipeline {
80-
const db = cast<Firestore>(this.db, Firestore);
80+
const _db = cast<Firestore>(this._db, Firestore);
8181
return new Pipeline(
82-
db,
83-
this.userDataReader,
84-
this.userDataWriter,
85-
this.documentReferenceFactory,
82+
_db,
83+
this._userDataReader,
84+
this._userDataWriter,
85+
this._documentReferenceFactory,
8686
[new DatabaseSource()]
8787
);
8888
}
8989

9090
documents(docs: DocumentReference[]): Pipeline {
91-
const db = cast<Firestore>(this.db, Firestore);
91+
const _db = cast<Firestore>(this._db, Firestore);
9292
return new Pipeline(
93-
db,
94-
this.userDataReader,
95-
this.userDataWriter,
96-
this.documentReferenceFactory,
93+
_db,
94+
this._userDataReader,
95+
this._userDataWriter,
96+
this._documentReferenceFactory,
9797
[DocumentsSource.of(docs)]
9898
);
9999
}

packages/firestore/src/api/pipeline.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,17 @@ export class Pipeline<
5858
);
5959
}
6060

61+
/**
62+
* @internal
63+
* @private
64+
* @param db
65+
* @param userDataReader
66+
* @param userDataWriter
67+
* @param documentReferenceFactory
68+
* @param stages
69+
* @param converter
70+
* @protected
71+
*/
6172
protected newPipeline(
6273
db: Firestore,
6374
userDataReader: UserDataReader,
@@ -109,7 +120,7 @@ export class Pipeline<
109120
*/
110121
execute(): Promise<Array<PipelineResult<AppModelType>>> {
111122
throw new Error(
112-
'Pipelines not initialized. Your application must call `useFirestorePipelines()` before using Firestore Pipeline features.'
123+
'Pipelines not initialized. Your application must call `useFluentPipelines()` before using Firestore Pipeline features.'
113124
);
114125
}
115126
}

packages/firestore/src/api/pipeline_impl.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
import { Pipeline } from '../api/pipeline';
1919
import { PipelineSource } from '../api/pipeline-source';
20-
import { PipelineResult } from '../api_pipelines';
2120
import { firestoreClientExecutePipeline } from '../core/firestore_client';
21+
import { Pipeline as LitePipeline } from '../lite-api/pipeline';
22+
import { PipelineResult } from '../lite-api/pipeline-result';
2223
import { newUserDataReader } from '../lite-api/user_data_reader';
2324
import { DocumentKey } from '../model/document_key';
2425
import { cast } from '../util/input_validation';
@@ -68,7 +69,7 @@ export function pipeline(
6869
return result;
6970
}
7071
}
71-
export function useFirestorePipelines(): void {
72+
export function useFluentPipelines(): void {
7273
Firestore.prototype.pipeline = function (): PipelineSource {
7374
return pipeline(this);
7475
};
@@ -83,7 +84,7 @@ export function useFirestorePipelines(): void {
8384
}
8485

8586
export function execute<AppModelType>(
86-
pipeline: Pipeline
87+
pipeline: LitePipeline
8788
): Promise<Array<PipelineResult<AppModelType>>> {
8889
const firestore = cast(pipeline._db, Firestore);
8990
const client = ensureFirestoreConfigured(firestore);

packages/firestore/src/api_pipelines.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export { PipelineResult } from './lite-api/pipeline-result';
2020

2121
export { Pipeline } from './lite-api/pipeline';
2222

23-
export { useFirestorePipelines } from './api/database_augmentation';
23+
export { useFluentPipelines, execute, pipeline } from './api/pipeline_impl';
2424

2525
export {
2626
Stage,

0 commit comments

Comments
 (0)