Skip to content

Commit 022d6bd

Browse files
authored
Deprecate Old and Stabilize New Result Transformer Aliases (#1287)
1 parent e6e2055 commit 022d6bd

File tree

5 files changed

+17
-33
lines changed

5 files changed

+17
-33
lines changed

packages/core/src/driver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ class Driver {
561561
* 'MATCH (p:Person{ name: $name }) RETURN p',
562562
* { name: 'Person1'},
563563
* {
564-
* resultTransformer: neo4j.resultTransformers.mappedResultTransformer({
564+
* resultTransformer: neo4j.resultTransformers.mapped({
565565
* map(record) {
566566
* const p = record.get('p')
567567
* return [p.elementId, p]
@@ -613,7 +613,7 @@ class Driver {
613613
*/
614614
async executeQuery<T = EagerResult> (query: Query, parameters?: any, config: QueryConfig<T> = {}): Promise<T> {
615615
const bookmarkManager = config.bookmarkManager === null ? undefined : (config.bookmarkManager ?? this.executeQueryBookmarkManager)
616-
const resultTransformer = (config.resultTransformer ?? resultTransformers.eagerResultTransformer()) as ResultTransformer<T>
616+
const resultTransformer = (config.resultTransformer ?? resultTransformers.eager()) as ResultTransformer<T>
617617
const routingConfig: string = config.routing ?? routing.WRITE
618618

619619
if (routingConfig !== routing.READ && routingConfig !== routing.WRITE) {

packages/core/src/result-transformers.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ResultTransformers {
5252
* const { keys, records, summary } = await driver.executeQuery('CREATE (p:Person{ name: $name }) RETURN p', { name: 'Person1'})
5353
*
5454
* @returns {ResultTransformer<EagerResult<Entries>>} The result transformer
55-
* @alias {@link ResultTransformers#eager}
55+
* @deprecated This is deprecated as of 6.0, use drop-in replacement {@link ResultTransformers#eager} instead.
5656
*/
5757
eagerResultTransformer<Entries extends RecordShape = RecordShape>(): ResultTransformer<EagerResult<Entries>> {
5858
return createEagerResultFromResult
@@ -62,8 +62,7 @@ class ResultTransformers {
6262
* Creates a {@link ResultTransformer} which transforms {@link Result} to {@link EagerResult}
6363
* by consuming the whole stream.
6464
*
65-
* This is the default implementation used in {@link Driver#executeQuery} and a alias to
66-
* {@link resultTransformers.eagerResultTransformer}
65+
* This is the default implementation used in {@link Driver#executeQuery}
6766
*
6867
* @example
6968
* // This:
@@ -74,9 +73,7 @@ class ResultTransformers {
7473
* const { keys, records, summary } = await driver.executeQuery('CREATE (p:Person{ name: $name }) RETURN p', { name: 'Person1'})
7574
*
7675
* @returns {ResultTransformer<EagerResult<Entries>>} The result transformer
77-
* @experimental this is a preview
7876
* @since 5.22.0
79-
* @alias {@link ResultTransformers#eagerResultTransformer}
8077
*/
8178
eager<Entries extends RecordShape = RecordShape>(): ResultTransformer<EagerResult<Entries>> {
8279
return createEagerResultFromResult
@@ -143,6 +140,7 @@ class ResultTransformers {
143140
* the result data to the transformer output.
144141
* @returns {ResultTransformer<T>} The result transformer
145142
* @see {@link Driver#executeQuery}
143+
* @deprecated This is deprecated as of 6.0, use drop-in replacement {@link ResultTransformers#mapped} instead.
146144
*/
147145
mappedResultTransformer <
148146
R = Record, T = { records: R[], keys: string[], summary: ResultSummary }
@@ -156,9 +154,6 @@ class ResultTransformers {
156154
*
157155
* NOTE: The config object requires map or/and collect to be valid.
158156
*
159-
* This method is a alias to {@link ResultTransformers#mappedResultTransformer}
160-
*
161-
*
162157
* @example
163158
* // Mapping the records
164159
* const { keys, records, summary } = await driver.executeQuery('MATCH (p:Person{ age: $age }) RETURN p.name as name', { age: 25 }, {
@@ -213,10 +208,8 @@ class ResultTransformers {
213208
* @param {function(records:R[], summary:ResultSummary, keys:string[]):T} [config.collect=function(records, summary, keys) { return { records, summary, keys }}] Method called for mapping
214209
* the result data to the transformer output.
215210
* @returns {ResultTransformer<T>} The result transformer
216-
* @experimental This is a preview feature
217-
* @alias {@link ResultTransformers#mappedResultTransformer}
218-
* @since 5.22.0
219211
* @see {@link Driver#executeQuery}
212+
* @since 5.22.0
220213
*/
221214
mapped <
222215
R = Record, T = { records: R[], keys: string[], summary: ResultSummary }
@@ -242,7 +235,6 @@ class ResultTransformers {
242235
* @template Entries The shape of the record.
243236
* @returns {ResultTransformer<Record<Entries>|undefined>} The result transformer
244237
* @see {@link Driver#executeQuery}
245-
* @experimental This is a preview feature.
246238
* @since 5.22.0
247239
*/
248240
first<Entries extends RecordShape = RecordShape>(): ResultTransformer<Record<Entries> | undefined> {
@@ -261,7 +253,7 @@ class ResultTransformers {
261253
*
262254
* @returns {ResultTransformer<ResultSummary<T>>} The result transformer
263255
* @see {@link Driver#executeQuery}
264-
* @experimental This is a preview feature
256+
* @since 5.22.0
265257
*/
266258
summary <T extends NumberOrInteger = Integer> (): ResultTransformer<ResultSummary<T>> {
267259
return summary

packages/core/test/driver.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ describe('Driver', () => {
394394

395395
expect(eagerResult).toEqual(expected)
396396
expect(spiedExecute).toBeCalledWith({
397-
resultTransformer: resultTransformers.eagerResultTransformer(),
397+
resultTransformer: resultTransformers.eager(),
398398
bookmarkManager: driver?.executeQueryBookmarkManager,
399399
routing: routing.WRITE,
400400
database: undefined,
@@ -420,7 +420,7 @@ describe('Driver', () => {
420420
expect(keys).toEqual(expected.keys)
421421
expect(summary).toEqual(expected.summary)
422422
expect(spiedExecute).toBeCalledWith({
423-
resultTransformer: resultTransformers.eagerResultTransformer(),
423+
resultTransformer: resultTransformers.eager(),
424424
bookmarkManager: driver?.executeQueryBookmarkManager,
425425
routing: routing.WRITE,
426426
database: undefined,
@@ -555,7 +555,7 @@ describe('Driver', () => {
555555
function extendsDefaultWith<T = EagerResult<RecordShape>> (config: QueryConfig<T>) {
556556
return () => {
557557
const defaultConfig = {
558-
resultTransformer: resultTransformers.eagerResultTransformer(),
558+
resultTransformer: resultTransformers.eager(),
559559
bookmarkManager: driver?.executeQueryBookmarkManager,
560560
routing: routing.WRITE,
561561
database: undefined,

packages/neo4j-driver-deno/lib/core/driver.ts

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/neo4j-driver-deno/lib/core/result-transformers.ts

Lines changed: 5 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)