Merge pull request graphql#35 from wincent/glh/types

Declare new Range and Position interfaces

src/types/Types.js

@@ -17,9 +17,20 @@ import type {
   GraphQLType,
 } from 'graphql/type/definition';
 import type CharacterStream from '../parser/CharacterStream';
-import type {Position, Range} from '../utils/Range';
 
 // online-parser related
+export interface Position {
+  line: number,
+  character: number,
+  lessThanOrEqualTo: (position: Position) => boolean,
+}
+
+export interface Range {
+  start: Position,
+  end: Position,
+  containsPosition: (position: Position) => boolean,
+}
+
 export type ParseRule =
   ((token: Token, stream: CharacterStream) => ?string) |
   Array<Rule | string>;

src/utils/Range.js

@@ -9,16 +9,20 @@
  */
 
 import type {Location} from 'graphql/language';
-
-export class Range {
-  start: Position;
-  end: Position;
-  constructor(start: Position, end: Position): void {
+import type {
+  Range as RangeInterface,
+  Position as PositionInterface,
+} from '../types/Types';
+
+export class Range implements RangeInterface {
+  start: PositionInterface;
+  end: PositionInterface;
+  constructor(start: PositionInterface, end: PositionInterface): void {
     this.start = start;
     this.end = end;
   }
 
-  containsPosition(position: Position): boolean {
+  containsPosition = (position: PositionInterface): boolean => {
     const withinLine =
       this.start.line <= position.line && this.end.line >= position.line;
     const withinCharacter =
@@ -28,24 +32,18 @@ export class Range {
   }
 }
 
-export class Position {
+export class Position implements PositionInterface {
   line: number;
   character: number;
   constructor(line: number, character: number): void {
     this.line = line;
     this.character = character;
   }
 
-  lessThanOrEqualTo(position: Position): boolean {
-    if (
-      this.line < position.line ||
-      (this.line === position.line && this.character <= position.character)
-    ) {
-      return true;
-    }
-
-    return false;
-  }
+  lessThanOrEqualTo = (position: PositionInterface): boolean => (
+    this.line < position.line ||
+    (this.line === position.line && this.character <= position.character)
+  );
 }
 
 export function offsetToPosition(text: string, loc: number): Position {