Tighten flow types (#5838)

Author: jasonLaster

src/actions/preview.js

@@ -24,7 +24,7 @@ import { getMappedExpression } from "./expressions";
 import { isEqual } from "lodash";
 
 import type { ThunkArgs } from "./types";
-import type { Frame, Range, Position } from "../types";
+import type { Frame, Range, ColumnPosition } from "../types";
 
 async function getReactProps(evaluate) {
   const reactDisplayName = await evaluate(
@@ -160,7 +160,7 @@ export function updatePreview(target: HTMLElement, editor: any) {
 export function setPreview(
   expression: string,
   location: Range,
-  tokenPos: Position,
+  tokenPos: ColumnPosition,
   cursorPos: any
 ) {
   return async ({ dispatch, getState, client, sourceMaps }: ThunkArgs) => {

src/types.js

@@ -65,7 +65,13 @@ export type Position = {
   column: ?number
 };
 
+export type ColumnPosition = {
+  line: number,
+  column: number
+};
+
 export type Range = { end: Position, start: Position };
+export type ColumnRange = { end: ColumnPosition, start: ColumnPosition };
 
 export type PendingLocation = {
   line: number,

src/utils/ast.js

@@ -2,22 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
-// @flow
-
 import { without, range } from "lodash";
 
-import type { Location, Source, Position } from "../types";
+import type { Location, Source, ColumnPosition } from "../types";
 import type {
   AstPosition,
   AstLocation,
-  PausePoint,
   SymbolDeclarations,
-  SymbolDeclaration
+  SymbolDeclaration,
+  PausePoint
 } from "../workers/parser";
 
 export function findBestMatchExpression(
   symbols: SymbolDeclarations,
-  tokenPos: Position
+  tokenPos: ColumnPosition
 ) {
   const { memberExpressions, identifiers, literals } = symbols;
   const { line, column } = tokenPos;

src/utils/editor/get-expression.js

@@ -4,7 +4,7 @@
 
 // @flow
 
-import type { Position } from "../../types";
+import type { ColumnPosition } from "../../types";
 
 type Token = {
   startColumn: number,
@@ -14,7 +14,7 @@ type Token = {
 
 export function tokenAtTextPosition(
   cm: any,
-  { line, column }: Position
+  { line, column }: ColumnPosition
 ): Token | null {
   if (line < 0 || line >= cm.lineCount()) {
     return null;
@@ -30,7 +30,7 @@ export function tokenAtTextPosition(
 
 // The strategy of querying codeMirror tokens was borrowed
 // from Chrome's inital implementation in JavaScriptSourceFrame.js#L414
-export function getExpressionFromCoords(cm: any, coord: Position) {
+export function getExpressionFromCoords(cm: any, coord: ColumnPosition) {
   const token = tokenAtTextPosition(cm, coord);
   if (!token) {
     return null;

src/utils/editor/get-token-location.js

@@ -3,12 +3,12 @@
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
 // @flow
-import type { Position } from "../../types";
+import type { ColumnPosition } from "../../types";
 
 export function getTokenLocation(
   codeMirror: any,
   tokenEl: HTMLElement
-): Position {
+): ColumnPosition {
   const { left, top, width, height } = tokenEl.getBoundingClientRect();
   const { line, ch } = codeMirror.coordsChar({
     left: left + width / 2,

src/workers/parser/index.js

@@ -47,6 +47,5 @@ export type {
   SymbolDeclarations,
   AstLocation,
   AstPosition,
-  Scope,
   PausePoint
 } from "./types";

src/workers/parser/types.js

@@ -2,29 +2,23 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
-import type { BabelLocation } from "@babel/types";
+// @flow
 
 export type AstPosition = { line: number, column: number };
 export type AstLocation = { end: AstPosition, start: AstPosition };
 
-export type Scope = {
-  location: AstLocation,
-  parent: Scope,
-  bindings: Object[]
-};
-
 export type ClassDeclaration = {|
   name: string,
-  location: BabelLocation,
+  location: AstLocation,
   parent?: ClassDeclaration
 |};
 
 export type SymbolDeclaration = {|
   name: string,
   expression?: string,
   klass?: ?string,
-  location: BabelLocation,
-  expressionLocation?: BabelLocation,
+  location: AstLocation,
+  expressionLocation?: AstLocation,
   parameterNames?: string[],
   identifier?: Object,
   computed?: Boolean,
@@ -47,6 +41,6 @@ export type SymbolDeclarations = {
 };
 
 export type PausePoint = {
-  location: { line: number, column: number },
+  location: AstPosition,
   types: { breakpoint: boolean, stepOver: boolean }
 };