diff --git a/d3/d3.d.ts b/d3/d3.d.ts index f4ef9f3ba4..a451a0de5d 100644 --- a/d3/d3.d.ts +++ b/d3/d3.d.ts @@ -417,7 +417,7 @@ declare module D3 { /* * The array of built-in interpolator factories */ - interpolators: Array; + interpolators: Transition.InterpolateFactory[]; /** * Layouts */ @@ -525,11 +525,11 @@ declare module D3 { /** * gets the mouse position relative to a specified container. */ - mouse(container: any): Array; + mouse(container: any): number[]; /** * gets the touch positions relative to a specified container. */ - touches(container: any): Array>; + touches(container: any): number[][]; /** * If the specified value is a function, returns the specified value. @@ -542,8 +542,8 @@ declare module D3 { set(): Set; map(object: {[key: string]: T; }): Map; set(array: T[]): Set; - dispatch(...types: Array): Dispatch; - rebind(target: any, source: any, ...names: Array): any; + dispatch(...types: string[]): Dispatch; + rebind(target: any, source: any, ...names: any[]): any; requote(str: string): string; timer: { (funct: () => boolean, delay?: number, mark?: number): void; @@ -1134,11 +1134,11 @@ declare module D3 { /** * Runs the tree layout */ - nodes(root: GraphNode): Array; + nodes(root: GraphNode): GraphNode[]; /** * Given the specified array of nodes, such as those returned by nodes, returns an array of objects representing the links from parent to child for each node */ - links(nodes: Array): Array; + links(nodes: GraphNode[]): GraphLink[]; /** * If separation is specified, uses the specified function to compute separation between neighboring nodes. If separation is not specified, returns the current separation function */ @@ -1159,11 +1159,11 @@ declare module D3 { /** * Gets the available layout size */ - (): Array; + (): number[]; /** * Sets the available layout size */ - (size: Array): TreeLayout; + (size: number[]): TreeLayout; }; /** * Gets or sets the available node size @@ -1172,11 +1172,11 @@ declare module D3 { /** * Gets the available node size */ - (): Array; + (): number[]; /** * Sets the available node size */ - (size: Array): TreeLayout; + (size: number[]): TreeLayout; }; } @@ -1323,13 +1323,13 @@ declare module D3 { } export interface BundleLayout{ - (links: Array): Array>; + (links: GraphLink[]): GraphNode[][]; } export interface ChordLayout { matrix: { - (): Array>; - (matrix: Array>): ChordLayout; + (): number[][]; + (matrix: number[][]): ChordLayout; } padding: { (): number; @@ -1347,8 +1347,8 @@ declare module D3 { (): (a: number, b: number) => number; (comparator: (a: number, b: number) => number): ChordLayout; } - chords(): Array; - groups(): Array; + chords(): GraphLink[]; + groups(): ArcDescriptor[]; } export interface ClusterLayout{ @@ -1357,18 +1357,18 @@ declare module D3 { (comparator: (a: GraphNode, b: GraphNode) => number): ClusterLayout; } children: { - (): (d: any, i?: number) => Array; - (children: (d: any, i?: number) => Array): ClusterLayout; + (): (d: any, i?: number) => GraphNode[]; + (children: (d: any, i?: number) => GraphNode[]): ClusterLayout; } - nodes(root: GraphNode): Array; - links(nodes: Array): Array; + nodes(root: GraphNode): GraphNode[]; + links(nodes: GraphNode[]): GraphLink[]; seperation: { (): (a: GraphNode, b: GraphNode) => number; (seperation: (a: GraphNode, b: GraphNode) => number): ClusterLayout; } size: { - (): Array; - (size: Array): ClusterLayout; + (): number[]; + (size: number[]): ClusterLayout; } value: { (): (node: GraphNode) => number; @@ -1382,11 +1382,11 @@ declare module D3 { (comparator: (a: GraphNode, b: GraphNode) => number): HierarchyLayout; } children: { - (): (d: any, i?: number) => Array; - (children: (d: any, i?: number) => Array): HierarchyLayout; + (): (d: any, i?: number) => GraphNode[]; + (children: (d: any, i?: number) => GraphNode[]): HierarchyLayout; } - nodes(root: GraphNode): Array; - links(nodes: Array): Array; + nodes(root: GraphNode): GraphNode[]; + links(nodes: GraphNode[]): GraphLink[]; value: { (): (node: GraphNode) => number; (value: (node: GraphNode) => number): HierarchyLayout; @@ -1401,21 +1401,21 @@ declare module D3 { } export interface HistogramLayout { - (values: Array, index?: number): Array; + (values: any[], index?: number): Bin[]; value: { (): (value: any) => any; (accessor: (value: any) => any): HistogramLayout } range: { - (): (value: any, index: number) => Array; - (range: (value: any, index: number) => Array): HistogramLayout; - (range: Array): HistogramLayout; + (): (value: any, index: number) => number[]; + (range: (value: any, index: number) => number[]): HistogramLayout; + (range: number[]): HistogramLayout; } bins: { - (): (range: Array, index: number) => Array; - (bins: (range: Array, index: number) => Array): HistogramLayout; + (): (range: any[], index: number) => number[]; + (bins: (range: any[], index: number) => number[]): HistogramLayout; (bins: number): HistogramLayout; - (bins: Array): HistogramLayout; + (bins: number[]): HistogramLayout; } frequency: { (): boolean; @@ -1429,18 +1429,18 @@ declare module D3 { (comparator: (a: GraphNode, b: GraphNode) => number): PackLayout; } children: { - (): (d: any, i?: number) => Array; - (children: (d: any, i?: number) => Array): PackLayout; + (): (d: any, i?: number) => GraphNode[]; + (children: (d: any, i?: number) => GraphNode[]): PackLayout; } - nodes(root: GraphNode): Array; - links(nodes: Array): Array; + nodes(root: GraphNode): GraphNode[]; + links(nodes: GraphNode[]): GraphLink[]; value: { (): (node: GraphNode) => number; (value: (node: GraphNode) => number): PackLayout; } size: { - (): Array; - (size: Array): PackLayout; + (): number[]; + (size: number[]): PackLayout; } padding: { (): number; @@ -1454,18 +1454,18 @@ declare module D3 { (comparator: (a: GraphNode, b: GraphNode) => number): PackLayout; } children: { - (): (d: any, i?: number) => Array; - (children: (d: any, i?: number) => Array): PackLayout; + (): (d: any, i?: number) => GraphNode[]; + (children: (d: any, i?: number) => GraphNode[]): PackLayout; } - nodes(root: GraphNode): Array; - links(nodes: Array): Array; + nodes(root: GraphNode): GraphNode[]; + links(nodes: GraphNode[]): GraphLink[]; value: { (): (node: GraphNode) => number; (value: (node: GraphNode) => number): PackLayout; } size: { - (): Array; - (size: Array): PackLayout; + (): number[]; + (size: number[]): PackLayout; } } @@ -1475,18 +1475,18 @@ declare module D3 { (comparator: (a: GraphNode, b: GraphNode) => number): TreeMapLayout; } children: { - (): (d: any, i?: number) => Array; - (children: (d: any, i?: number) => Array): TreeMapLayout; + (): (d: any, i?: number) => GraphNode[]; + (children: (d: any, i?: number) => GraphNode[]): TreeMapLayout; } - nodes(root: GraphNode): Array; - links(nodes: Array): Array; + nodes(root: GraphNode): GraphNode[]; + links(nodes: GraphNode[]): GraphLink[]; value: { (): (node: GraphNode) => number; (value: (node: GraphNode) => number): TreeMapLayout; } size: { - (): Array; - (size: Array): TreeMapLayout; + (): number[]; + (size: number[]): TreeMapLayout; } padding: { (): number; @@ -1648,7 +1648,7 @@ declare module D3 { /** * The array of supported symbol types. */ - symbolTypes: Array; + symbolTypes: string[]; } export interface Symbol { @@ -2463,9 +2463,9 @@ declare module D3 { export interface Diagonal { (datum: any, index?: number): string; projection: { - (): (datum: any, index?: number) => Array; - (proj: (datum: any) => Array): Diagonal; - (proj: (datum: any, index: number) => Array): Diagonal; + (): (datum: any, index?: number) => number[]; + (proj: (datum: any) => number[]): Diagonal; + (proj: (datum: any, index: number) => number[]): Diagonal; }; source: { (): (datum: any, index?: number) => any; @@ -2842,19 +2842,19 @@ declare module D3 { /** * compute the latitude-longitude bounding box for a given feature. */ - bounds(feature: any): Array>; + bounds(feature: any): number[][]; /** * compute the spherical centroid of a given feature. */ - centroid(feature: any): Array; + centroid(feature: any): number[]; /** * compute the great-arc distance between two points. */ - distance(a: Array, b: Array): number; + distance(a: number[], b: number[]): number; /** * interpolate between two points along a great arc. */ - interpolate(a: Array, b: Array): (t: number) => Array; + interpolate(a: number[], b: number[]): (t: number) => number[]; /** * compute the length of a line string or the circumference of a polygon. */ @@ -2967,7 +2967,7 @@ declare module D3 { /** * */ - rotation(rotation: Array): Rotation; + rotation(rotation: number[]): Rotation; } export interface Path { @@ -3041,11 +3041,11 @@ declare module D3 { } export interface Circle { - (...args: Array): GeoJSON; + (...args: any[]): GeoJSON; origin: { - (): Array; - (origin: Array): Circle; - (origin: (...args: Array) => Array): Circle; + (): number[]; + (origin: number[]): Circle; + (origin: (...args: any[]) => number[]): Circle; } angle: { (): number; @@ -3059,31 +3059,31 @@ declare module D3 { export interface Graticule{ (): GeoJSON; - lines(): Array; + lines(): GeoJSON[]; outline(): GeoJSON; extent: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } minorExtent: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } majorExtent: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } step: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } minorStep: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } majorStep: { - (): Array>; - (extent: Array>): Graticule; + (): number[][]; + (extent: number[][]): Graticule; } precision: { (): number; @@ -3109,33 +3109,33 @@ declare module D3 { } export interface GeoJSON { - coordinates: Array>; + coordinates: number[][]; type: string; } export interface RawProjection { - (lambda: number, phi: number): Array; - invert?(x: number, y: number): Array; + (lambda: number, phi: number): number[]; + invert?(x: number, y: number): number[]; } export interface Projection { - (coordinates: Array): Array; - invert?(point: Array): Array; + (coordinates: number[]): number[]; + invert?(point: number[]): number[]; rotate: { - (): Array; - (rotation: Array): Projection; + (): number[]; + (rotation: number[]): Projection; }; center: { - (): Array; - (location: Array): Projection; + (): number[]; + (location: number[]): Projection; }; parallels: { - (): Array; - (location: Array): Projection; + (): number[]; + (location: number[]): Projection; }; translate: { - (): Array; - (point: Array): Projection; + (): number[]; + (point: number[]): Projection; }; scale: { (): number; @@ -3146,8 +3146,8 @@ declare module D3 { (angle: number): Projection; }; clipExtent: { - (): Array>; - (extent: Array>): Projection; + (): number[][]; + (extent: number[][]): Projection; }; precision: { (): number; @@ -3166,8 +3166,8 @@ declare module D3 { } export interface Rotation extends Array { - (location: Array): Rotation; - invert(location: Array): Rotation; + (location: number[]): Rotation; + invert(location: number[]): Rotation; } export interface ProjectionMutator { @@ -3182,11 +3182,11 @@ declare module D3 { /** * compute the Voronoi diagram for the specified points. */ - voronoi(vertices: Array): Array; + voronoi(vertices: Vertice[]): Polygon[]; /** * compute the Delaunay triangulation for the specified points. */ - delaunay(vertices?: Array): Array; + delaunay(vertices?: Vertice[]): Polygon[]; /** * constructs a quadtree for an array of points. */ @@ -3194,21 +3194,21 @@ declare module D3 { /** * Constructs a new quadtree for the specified array of points. */ - quadtree(points: Array, x1: number, y1: number, x2: number, y2: number): Quadtree; + quadtree(points: Point[], x1: number, y1: number, x2: number, y2: number): Quadtree; /** * Constructs a new quadtree for the specified array of points. */ - quadtree(points: Array, width: number, height: number): Quadtree; + quadtree(points: Point[], width: number, height: number): Quadtree; /** * Returns the input array of vertices with additional methods attached */ - polygon(vertices:Array): Polygon; + polygon(vertices:Vertice[]): Polygon; /** * creates a new hull layout with the default settings. */ hull(): Hull; - hull(vertices:Array): Array; + hull(vertices:Vertice[]): Vertice[]; } export interface Vertice extends Array { @@ -3226,7 +3226,7 @@ declare module D3 { /** * Returns a two-element array representing the centroid of this polygon. */ - centroid(): Array; + centroid(): number[]; /** * Clips the subject polygon against this polygon */ @@ -3241,11 +3241,11 @@ declare module D3 { /** * Constructs a new quadtree for the specified array of points. */ - (points: Array, x1: number, y1: number, x2: number, y2: number): Quadtree; + (points: Point[], x1: number, y1: number, x2: number, y2: number): Quadtree; /** * Constructs a new quadtree for the specified array of points. */ - (points: Array, width: number, height: number): Quadtree; + (points: Point[], width: number, height: number): Quadtree; x: { (): (d: any) => any; @@ -3257,10 +3257,10 @@ declare module D3 { (accesor: (d: any) => any): QuadtreeFactory; } - size(): Array; - size(size: Array): QuadtreeFactory; - extent(): Array>; - extent(points: Array>): QuadtreeFactory; + size(): number[]; + size(size: number[]): QuadtreeFactory; + extent(): number[][]; + extent(points: number[][]): QuadtreeFactory; } export interface Quadtree { @@ -3280,15 +3280,15 @@ declare module D3 { /** * Compute the Voronoi diagram for the specified data. */ - (data: Array): Array; + (data: T[]): Polygon[]; /** * Compute the graph links for the Voronoi diagram for the specified data. */ - links(data: Array): Array; + links(data: T[]): Layout.GraphLink[]; /** * Compute the triangles for the Voronoi diagram for the specified data. */ - triangles(data: Array): Array>; + triangles(data: T[]): number[][]; x: { /** * Get the x-coordinate accessor. @@ -3333,30 +3333,30 @@ declare module D3 { /** * Get the clip extent. */ - (): Array>; + (): number[][]; /** * Set the clip extent. * * @param extent The new clip extent. */ - (extent: Array>): Voronoi; + (extent: number[][]): Voronoi; } size: { /** * Get the size. */ - (): Array; + (): number[]; /** * Set the size, equivalent to a clip extent starting from (0,0). * * @param size The new size. */ - (size: Array): Voronoi; + (size: number[]): Voronoi; } } export interface Hull { - (vertices: Array): Array; + (vertices: Vertice[]): Vertice[]; x: { (): (d: any) => any; (accesor: (d: any) => any): any;