Skip to content

Commit 0fea83f

Browse files
1 parent 0ed1acb commit 0fea83f

3 files changed

Lines changed: 42 additions & 44 deletions

File tree

‎handwritten/firestore/dev/src/pipelines/expression.ts‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,7 @@ export abstract class Expression
24612461
*/
24622462
timestampDiff(
24632463
start: string | Expression,
2464-
unit: 'microsecond' | 'millisecond' | 'second' | 'minute' | 'hour' | 'day'
2464+
unit: 'microsecond' | 'millisecond' | 'second' | 'minute' | 'hour' | 'day',
24652465
): FunctionExpression;
24662466
timestampDiff(
24672467
start: string | Expression,
@@ -2472,12 +2472,13 @@ export abstract class Expression
24722472
| 'minute'
24732473
| 'hour'
24742474
| 'day'
2475-
| Expression
2475+
| Expression,
24762476
): FunctionExpression {
2477-
return new FunctionExpression(
2478-
'timestamp_diff',
2479-
[this, fieldOrExpression(start), valueToDefaultExpr(unit)],
2480-
);
2477+
return new FunctionExpression('timestamp_diff', [
2478+
this,
2479+
fieldOrExpression(start),
2480+
valueToDefaultExpr(unit),
2481+
]);
24812482
}
24822483

24832484
/**
@@ -2497,7 +2498,7 @@ export abstract class Expression
24972498
*/
24982499
timestampExtract(
24992500
part: firestore.Pipelines.TimePart,
2500-
timezone?: string | Expression
2501+
timezone?: string | Expression,
25012502
): FunctionExpression;
25022503

25032504
/**
@@ -2517,21 +2518,18 @@ export abstract class Expression
25172518
*/
25182519
timestampExtract(
25192520
part: Expression,
2520-
timezone?: string | Expression
2521+
timezone?: string | Expression,
25212522
): FunctionExpression;
25222523
timestampExtract(
25232524
part: firestore.Pipelines.TimePart | Expression,
2524-
timezone?: string | Expression
2525+
timezone?: string | Expression,
25252526
): FunctionExpression {
25262527
const internalPart = isString(part) ? part.toLowerCase() : part;
25272528
const args = [this, valueToDefaultExpr(internalPart)];
25282529
if (timezone) {
25292530
args.push(valueToDefaultExpr(timezone));
25302531
}
2531-
return new FunctionExpression(
2532-
'timestamp_extract',
2533-
args,
2534-
);
2532+
return new FunctionExpression('timestamp_extract', args);
25352533
}
25362534

25372535
/**
@@ -9667,7 +9665,7 @@ export function timestampDiff(
96679665
| 'minute'
96689666
| 'hour'
96699667
| 'day'
9670-
| Expression
9668+
| Expression,
96719669
): FunctionExpression;
96729670

96739671
/**
@@ -9695,7 +9693,7 @@ export function timestampDiff(
96959693
| 'minute'
96969694
| 'hour'
96979695
| 'day'
9698-
| Expression
9696+
| Expression,
96999697
): FunctionExpression;
97009698

97019699
/**
@@ -9723,7 +9721,7 @@ export function timestampDiff(
97239721
| 'minute'
97249722
| 'hour'
97259723
| 'day'
9726-
| Expression
9724+
| Expression,
97279725
): FunctionExpression;
97289726

97299727
/**
@@ -9751,7 +9749,7 @@ export function timestampDiff(
97519749
| 'minute'
97529750
| 'hour'
97539751
| 'day'
9754-
| Expression
9752+
| Expression,
97559753
): FunctionExpression;
97569754
export function timestampDiff(
97579755
endFieldNameOrExpression: string | Expression,
@@ -9763,7 +9761,7 @@ export function timestampDiff(
97639761
| 'minute'
97649762
| 'hour'
97659763
| 'day'
9766-
| Expression
9764+
| Expression,
97679765
): FunctionExpression {
97689766
const normalizedEnd = fieldOrExpression(endFieldNameOrExpression);
97699767
const normalizedStart = fieldOrExpression(startFieldNameOrExpression);
@@ -9790,7 +9788,7 @@ export function timestampDiff(
97909788
export function timestampExtract(
97919789
fieldName: string,
97929790
part: firestore.Pipelines.TimePart,
9793-
timezone?: string | Expression
9791+
timezone?: string | Expression,
97949792
): FunctionExpression;
97959793

97969794
/**
@@ -9812,7 +9810,7 @@ export function timestampExtract(
98129810
export function timestampExtract(
98139811
fieldName: string,
98149812
part: Expression,
9815-
timezone?: string | Expression
9813+
timezone?: string | Expression,
98169814
): FunctionExpression;
98179815

98189816
/**
@@ -9834,7 +9832,7 @@ export function timestampExtract(
98349832
export function timestampExtract(
98359833
timestampExpression: Expression,
98369834
part: firestore.Pipelines.TimePart,
9837-
timezone?: string | Expression
9835+
timezone?: string | Expression,
98389836
): FunctionExpression;
98399837

98409838
/**
@@ -9856,16 +9854,16 @@ export function timestampExtract(
98569854
export function timestampExtract(
98579855
timestampExpression: Expression,
98589856
part: Expression,
9859-
timezone?: string | Expression
9857+
timezone?: string | Expression,
98609858
): FunctionExpression;
98619859
export function timestampExtract(
98629860
fieldNameOrExpression: string | Expression,
98639861
part: firestore.Pipelines.TimePart | Expression,
9864-
timezone?: string | Expression
9862+
timezone?: string | Expression,
98659863
): FunctionExpression {
98669864
return fieldOrExpression(fieldNameOrExpression).timestampExtract(
98679865
valueToDefaultExpr(isString(part) ? part.toLowerCase() : part),
9868-
timezone
9866+
timezone,
98699867
);
98709868
}
98719869

‎handwritten/firestore/dev/system-test/pipeline.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5090,15 +5090,9 @@ describe.skipClassic('Pipeline class', () => {
50905090
)
50915091
.select(
50925092
timestampDiff(field('end'), field('start'), 'hour').as('diffHour'),
5093-
field('end')
5094-
.timestampDiff(field('start'), 'minute')
5095-
.as('diffMinute'),
5096-
field('end')
5097-
.timestampDiff(field('start'), 'second')
5098-
.as('diffSecond'),
5099-
field('start')
5100-
.timestampDiff(field('end'), 'hour')
5101-
.as('diffHourNeg'),
5093+
field('end').timestampDiff(field('start'), 'minute').as('diffMinute'),
5094+
field('end').timestampDiff(field('start'), 'second').as('diffSecond'),
5095+
field('start').timestampDiff(field('end'), 'hour').as('diffHourNeg'),
51025096
)
51035097
.execute();
51045098

‎handwritten/firestore/types/firestore.d.ts‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5604,7 +5604,13 @@ declare namespace FirebaseFirestore {
56045604
*/
56055605
timestampDiff(
56065606
start: string | Expression,
5607-
unit: 'microsecond' | 'millisecond' | 'second' | 'minute' | 'hour' | 'day'
5607+
unit:
5608+
| 'microsecond'
5609+
| 'millisecond'
5610+
| 'second'
5611+
| 'minute'
5612+
| 'hour'
5613+
| 'day',
56085614
): FunctionExpression;
56095615

56105616
/**
@@ -5624,7 +5630,7 @@ declare namespace FirebaseFirestore {
56245630
*/
56255631
timestampExtract(
56265632
part: TimePart,
5627-
timezone?: string | Expression
5633+
timezone?: string | Expression,
56285634
): FunctionExpression;
56295635

56305636
/**
@@ -5644,7 +5650,7 @@ declare namespace FirebaseFirestore {
56445650
*/
56455651
timestampExtract(
56465652
part: Expression,
5647-
timezone?: string | Expression
5653+
timezone?: string | Expression,
56485654
): FunctionExpression;
56495655

56505656
/**
@@ -11440,7 +11446,7 @@ declare namespace FirebaseFirestore {
1144011446
| 'minute'
1144111447
| 'hour'
1144211448
| 'day'
11443-
| Expression
11449+
| Expression,
1144411450
): FunctionExpression;
1144511451

1144611452
/**
@@ -11468,7 +11474,7 @@ declare namespace FirebaseFirestore {
1146811474
| 'minute'
1146911475
| 'hour'
1147011476
| 'day'
11471-
| Expression
11477+
| Expression,
1147211478
): FunctionExpression;
1147311479

1147411480
/**
@@ -11496,7 +11502,7 @@ declare namespace FirebaseFirestore {
1149611502
| 'minute'
1149711503
| 'hour'
1149811504
| 'day'
11499-
| Expression
11505+
| Expression,
1150011506
): FunctionExpression;
1150111507

1150211508
/**
@@ -11524,7 +11530,7 @@ declare namespace FirebaseFirestore {
1152411530
| 'minute'
1152511531
| 'hour'
1152611532
| 'day'
11527-
| Expression
11533+
| Expression,
1152811534
): FunctionExpression;
1152911535

1153011536
/**
@@ -11546,7 +11552,7 @@ declare namespace FirebaseFirestore {
1154611552
export function timestampExtract(
1154711553
fieldName: string,
1154811554
part: TimePart,
11549-
timezone?: string | Expression
11555+
timezone?: string | Expression,
1155011556
): FunctionExpression;
1155111557

1155211558
/**
@@ -11568,7 +11574,7 @@ declare namespace FirebaseFirestore {
1156811574
export function timestampExtract(
1156911575
fieldName: string,
1157011576
part: Expression,
11571-
timezone?: string | Expression
11577+
timezone?: string | Expression,
1157211578
): FunctionExpression;
1157311579

1157411580
/**
@@ -11590,7 +11596,7 @@ declare namespace FirebaseFirestore {
1159011596
export function timestampExtract(
1159111597
timestampExpression: Expression,
1159211598
part: TimePart,
11593-
timezone?: string | Expression
11599+
timezone?: string | Expression,
1159411600
): FunctionExpression;
1159511601

1159611602
/**
@@ -11612,7 +11618,7 @@ declare namespace FirebaseFirestore {
1161211618
export function timestampExtract(
1161311619
timestampExpression: Expression,
1161411620
part: Expression,
11615-
timezone?: string | Expression
11621+
timezone?: string | Expression,
1161611622
): FunctionExpression;
1161711623

1161811624
/**

0 commit comments

Comments
 (0)