Skip to content

Commit 7cc68d8

Browse files
committed
Extract NumberOrInteger type in TS declarations
To deduplicate and reuse `(number | Integer)` generic type declaration.
1 parent 8edd2f6 commit 7cc68d8

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

types/v1/graph-types.d.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020
import Integer from "./integer";
2121

22-
declare class Node<T extends (Integer | number) = Integer> {
22+
declare type NumberOrInteger = number | Integer;
23+
24+
declare class Node<T extends NumberOrInteger = Integer> {
2325
identity: T;
2426
labels: string[];
2527
properties: object;
@@ -31,7 +33,7 @@ declare class Node<T extends (Integer | number) = Integer> {
3133
toString(): string;
3234
}
3335

34-
declare class Relationship<T extends (Integer | number) = Integer> {
36+
declare class Relationship<T extends NumberOrInteger = Integer> {
3537
identity: T;
3638
start: T;
3739
end: T;
@@ -47,7 +49,7 @@ declare class Relationship<T extends (Integer | number) = Integer> {
4749
toString(): string;
4850
}
4951

50-
declare class UnboundRelationship<T extends (Integer | number) = Integer> {
52+
declare class UnboundRelationship<T extends NumberOrInteger = Integer> {
5153
identity: T;
5254
type: string;
5355
properties: object;
@@ -61,7 +63,7 @@ declare class UnboundRelationship<T extends (Integer | number) = Integer> {
6163
toString(): string;
6264
}
6365

64-
declare class PathSegment<T extends (Integer | number) = Integer> {
66+
declare class PathSegment<T extends NumberOrInteger = Integer> {
6567
start: Node<T>;
6668
relationship: Relationship<T>;
6769
end: Node<T>;
@@ -71,7 +73,7 @@ declare class PathSegment<T extends (Integer | number) = Integer> {
7173
end: Node<T>);
7274
}
7375

74-
declare class Path<T extends (Integer | number) = Integer> {
76+
declare class Path<T extends NumberOrInteger = Integer> {
7577
start: Node<T>;
7678
end: Node<T>;
7779
segments: PathSegment<T>[];
@@ -87,5 +89,6 @@ export {
8789
Relationship,
8890
UnboundRelationship,
8991
Path,
90-
PathSegment
92+
PathSegment,
93+
NumberOrInteger
9194
}

types/v1/result-summary.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
*/
1919

2020
import Integer from "./integer";
21+
import {NumberOrInteger} from "./graph-types";
2122

22-
declare interface ResultSummary<T extends (Integer | number) = Integer> {
23+
declare interface ResultSummary<T extends NumberOrInteger = Integer> {
2324
statement: { text: string, parameters: { [key: string]: any } };
2425
statementType: string;
2526
counters: StatementStatistic;

0 commit comments

Comments
 (0)