From 3344ee14de5666f495361c124f54aa9554434b2b Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Fri, 18 Dec 2015 10:49:38 -0500 Subject: [PATCH] Update to Flow 0.20 --- package.json | 2 +- src/main/GA4GHAlignment.js | 2 +- src/main/VisualizationWrapper.js | 4 ++-- src/main/data/formats/helpers.js | 2 +- src/main/viz/CoverageCache.js | 2 +- src/main/viz/CoverageTrack.js | 3 ++- src/main/viz/GeneTrack.js | 3 ++- src/main/viz/GenomeTrack.js | 3 ++- src/main/viz/LocationTrack.js | 3 ++- src/main/viz/PileupTrack.js | 3 ++- src/main/viz/ScaleTrack.js | 3 ++- src/main/viz/VariantTrack.js | 3 ++- src/main/viz/d3utils.js | 2 ++ 13 files changed, 22 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 82b8dbae..9b8016c0 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "coveralls": "2.10.x", "envify": "^3.4.0", "exorcist": "^0.4.0", - "flow-bin": "^0.19.0", + "flow-bin": "^0.20.0", "http-server": "^0.8.0", "istanbul": "^0.3.17", "jsxhint": "git://github.com/strml/JSXHint.git", diff --git a/src/main/GA4GHAlignment.js b/src/main/GA4GHAlignment.js index b3f3eec2..abdc0adf 100644 --- a/src/main/GA4GHAlignment.js +++ b/src/main/GA4GHAlignment.js @@ -94,7 +94,7 @@ class GA4GHAlignment /* implements Alignment */ { var start1 = this._interval.start(), stop1 = this._interval.stop(), start2 = m.pos, - stop2 = start2 + this.getSequence.length(); + stop2 = start2 + this.getSequence().length; return Math.max(stop1, stop2) - Math.min(start1, start2); } else { return 0; diff --git a/src/main/VisualizationWrapper.js b/src/main/VisualizationWrapper.js index 918c1e95..95044d45 100644 --- a/src/main/VisualizationWrapper.js +++ b/src/main/VisualizationWrapper.js @@ -136,8 +136,8 @@ class VisualizationWrapper extends React.Component { VisualizationWrapper.displayName = 'VisualizationWrapper'; -class EmptyTrack extends React.Component { - props: {className: string}; +type EmptyTrackProps = {className: string}; +class EmptyTrack extends React.Component { render() { var className = this.props.className + ' empty'; return
; diff --git a/src/main/data/formats/helpers.js b/src/main/data/formats/helpers.js index 5a0a9c2d..3f4f0b46 100644 --- a/src/main/data/formats/helpers.js +++ b/src/main/data/formats/helpers.js @@ -7,7 +7,7 @@ import jBinary from 'jbinary'; // Read a jBinary type at an offset in the buffer specified by another field. -function typeAtOffset(baseType: any, offsetFieldName: string) { +function typeAtOffset(baseType: any, offsetFieldName: string): any { return jBinary.Template({ baseType: baseType, read: function(context) { diff --git a/src/main/viz/CoverageCache.js b/src/main/viz/CoverageCache.js index 6433b9d7..3c66d182 100644 --- a/src/main/viz/CoverageCache.js +++ b/src/main/viz/CoverageCache.js @@ -116,7 +116,7 @@ class CoverageCache { } // Returns whichever form of the ref ("chr17", "17") has been seen. - _canonicalRef(ref: string) { + _canonicalRef(ref: string): string { if (this.refToCounts[ref]) return ref; var alt = utils.altContigName(ref); if (this.refToCounts[alt]) return alt; diff --git a/src/main/viz/CoverageTrack.js b/src/main/viz/CoverageTrack.js index 4309e777..7b4a2dcc 100644 --- a/src/main/viz/CoverageTrack.js +++ b/src/main/viz/CoverageTrack.js @@ -9,6 +9,7 @@ import type Interval from '../Interval'; import type {TwoBitSource} from '../sources/TwoBitDataSource'; import type {DataCanvasRenderingContext2D} from 'data-canvas'; import type {BinSummary} from './CoverageCache'; +import type {Scale} from './d3utils'; import React from 'react'; import scale from '../scale'; @@ -195,7 +196,7 @@ class CoverageTrack extends React.Component { return ; } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/GeneTrack.js b/src/main/viz/GeneTrack.js index 55f9a240..8f06c8f7 100644 --- a/src/main/viz/GeneTrack.js +++ b/src/main/viz/GeneTrack.js @@ -7,6 +7,7 @@ import type {Strand} from '../Alignment'; import type {Gene, BigBedSource} from '../sources/BigBedDataSource'; import type {VizProps} from '../VisualizationWrapper'; +import type {Scale} from './d3utils'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -95,7 +96,7 @@ class GeneTrack extends React.Component { this.updateVisualization(); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/GenomeTrack.js b/src/main/viz/GenomeTrack.js index a191fdc1..12d570a0 100644 --- a/src/main/viz/GenomeTrack.js +++ b/src/main/viz/GenomeTrack.js @@ -7,6 +7,7 @@ import type {VizProps} from '../VisualizationWrapper'; import type {TwoBitSource} from '../sources/TwoBitDataSource'; import type {DataCanvasRenderingContext2D} from 'data-canvas'; +import type {Scale} from './d3utils'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -131,7 +132,7 @@ class GenomeTrack extends React.Component { this.updateVisualization(); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/LocationTrack.js b/src/main/viz/LocationTrack.js index 3279d2da..4953ad8b 100644 --- a/src/main/viz/LocationTrack.js +++ b/src/main/viz/LocationTrack.js @@ -5,6 +5,7 @@ 'use strict'; import type {VizProps} from '../VisualizationWrapper'; +import type {Scale} from './d3utils'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -23,7 +24,7 @@ class LocationTrack extends React.Component { super(props); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/PileupTrack.js b/src/main/viz/PileupTrack.js index 6bcd5d7d..b293f922 100644 --- a/src/main/viz/PileupTrack.js +++ b/src/main/viz/PileupTrack.js @@ -11,6 +11,7 @@ import type {VisualAlignment, VisualGroup, InsertStats} from './PileupCache'; import type {DataCanvasRenderingContext2D} from 'data-canvas'; import type Interval from '../Interval'; import type {VizProps} from '../VisualizationWrapper'; +import type {Scale} from './d3utils'; import React from 'react'; import shallowEquals from 'shallow-equals'; @@ -322,7 +323,7 @@ class PileupTrack extends React.Component { this.updateVisualization(); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/ScaleTrack.js b/src/main/viz/ScaleTrack.js index 784c025a..f46edfa0 100644 --- a/src/main/viz/ScaleTrack.js +++ b/src/main/viz/ScaleTrack.js @@ -11,6 +11,7 @@ 'use strict'; import type {VizProps} from '../VisualizationWrapper'; +import type {Scale} from './d3utils'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -29,7 +30,7 @@ class ScaleTrack extends React.Component { super(props); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/VariantTrack.js b/src/main/viz/VariantTrack.js index af309a61..45ebe2c6 100644 --- a/src/main/viz/VariantTrack.js +++ b/src/main/viz/VariantTrack.js @@ -8,6 +8,7 @@ import type {VcfDataSource} from '../sources/VcfDataSource'; import type {Variant} from '../data/vcf'; import type {DataCanvasRenderingContext2D} from 'data-canvas'; import type {VizProps} from '../VisualizationWrapper'; +import type {Scale} from './d3utils'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -40,7 +41,7 @@ class VariantTrack extends React.Component { }); } - getScale() { + getScale(): Scale { return d3utils.getTrackScale(this.props.range, this.props.width); } diff --git a/src/main/viz/d3utils.js b/src/main/viz/d3utils.js index 00ecf634..9c9b04cf 100644 --- a/src/main/viz/d3utils.js +++ b/src/main/viz/d3utils.js @@ -12,6 +12,8 @@ type Range = { stop: number; }; +export type Scale = (num: number) => number; + /** * Shared x-axis scaling logic for tracks */