Update grammar structure

Author: thenamankumar

src/language/experimentalOnlineParser/grammarTypes.d.ts

@@ -1,25 +1,21 @@
 export interface GraphQLGrammarType {
-  rules: GraphQLGrammarRules;
-}
-
-export interface GraphQLGrammarRules {
   [name: string]: GraphQLGrammarRule;
 }
 
-export declare type GraphQLGrammarRule =
+export type GraphQLGrammarRule =
   | GraphQLGrammarRuleName
   | GraphQLGrammarRuleConstraint
   | GraphQLGrammarConstraintsSet;
 
-export declare type GraphQLGrammarRuleName = string;
+export type GraphQLGrammarRuleName = string;
 
-export declare type GraphQLGrammarRuleConstraint =
+export type GraphQLGrammarRuleConstraint =
   | GraphQLGrammarTokenConstraint
   | GraphQLGrammarOfTypeConstraint
   | GraphQLGrammarListOfTypeConstraint
   | GraphQLGrammarPeekConstraint;
 
-export declare type GraphQLGrammarConstraintsSet = Array<
+export type GraphQLGrammarConstraintsSet = Array<
   GraphQLGrammarRuleName | GraphQLGrammarRuleConstraint
 >;
 

src/language/experimentalOnlineParser/grammarTypes.js

@@ -1,10 +1,4 @@
-// @flow
-
-export type GraphQLGrammarType = {|
-  rules: GraphQLGrammarRules,
-|};
-
-export interface GraphQLGrammarRules {
+export interface GraphQLGrammarType {
   [name: string]: GraphQLGrammarRule;
 }
 export type GraphQLGrammarRuleName = string;

src/language/experimentalOnlineParser/index.d.ts

@@ -1 +1,6 @@
-export { OnlineParser, RuleKind, TokenKind } from './onlineParser';
+export {
+  OnlineParser,
+  RuleKind,
+  TokenKind,
+  OnlineParserState,
+} from './onlineParser';

src/language/experimentalOnlineParser/index.js

@@ -1 +1,6 @@
-export { OnlineParser, RuleKind, TokenKind } from './onlineParser';
+export {
+  OnlineParser,
+  RuleKind,
+  TokenKind,
+  OnlineParserState,
+} from './onlineParser';

src/language/experimentalOnlineParser/onlineParser.d.ts

@@ -38,14 +38,14 @@ interface ConstraintsSetOnlineParserRule extends BaseOnlineParserRule {
   constraints: GraphQLGrammarConstraintsSet;
 }
 
-declare type OnlineParserRule =
+type OnlineParserRule =
   | TokenOnlineParserRule
   | OfTypeOnlineParserRule
   | ListOfTypeOnlineParserRule
   | PeekOnlineParserRule
   | ConstraintsSetOnlineParserRule;
 
-declare interface OnlineParserState {
+export interface OnlineParserState {
   rules: Array<OnlineParserRule>;
   kind: () => string;
   step: () => number;
@@ -55,22 +55,22 @@ declare interface OnlineParserState {
   type: string | null;
 }
 
-declare interface Token {
+interface Token {
   kind: string;
   value?: string;
   tokenName?: string | undefined;
   ruleName?: string | undefined;
 }
 
-declare type OnlineParserConfig = {
+type OnlineParserConfig = {
   tabSize: number;
 };
 
-declare type OnlineParserConfigOption = {
+type OnlineParserConfigOption = {
   tabSize?: number;
 };
 
-export declare class OnlineParser {
+export class OnlineParser {
   state: OnlineParserState;
   _lexer: Lexer;
   _config: OnlineParserConfig;
@@ -101,7 +101,7 @@ export declare class OnlineParser {
   private readonly _lookAhead;
 }
 
-export declare const TokenKind: {
+export const TokenKind: {
   NAME: string;
   INT: string;
   FLOAT: string;
@@ -113,7 +113,7 @@ export declare const TokenKind: {
   INVALID: string;
 };
 
-export declare const RuleKind: {
+export const RuleKind: {
   TOKEN_CONSTRAINT: string;
   OF_TYPE_CONSTRAINT: string;
   LIST_OF_TYPE_CONSTRAINT: string;

src/language/experimentalOnlineParser/onlineParser.js

@@ -73,7 +73,7 @@ type OnlineParserRule =
   | PeekOnlineParserRule
   | ConstraintsSetOnlineParserRule;
 
-type OnlineParserState = {|
+export type OnlineParserState = {|
   rules: Array<OnlineParserRule>,
   kind: () => string,
   step: () => number,
@@ -127,7 +127,7 @@ export class OnlineParser {
           name: 'Document',
           state: 'Document',
           kind: 'ListOfTypeConstraint',
-          ...GraphQLGrammar.rules.Document,
+          ...GraphQLGrammar.Document,
           expanded: false,
           depth: 1,
           step: 1,
@@ -275,7 +275,7 @@ export class OnlineParser {
 
   _parseListOfTypeConstraint(rule: ListOfTypeOnlineParserRule): Token {
     this._pushRule(
-      GraphQLGrammar.rules[rule.listOfType],
+      GraphQLGrammar[rule.listOfType],
       rule.depth + 1,
       rule.listOfType,
       1,
@@ -315,7 +315,7 @@ export class OnlineParser {
 
       let { ifCondition } = constraint;
       if (typeof ifCondition === 'string') {
-        ifCondition = GraphQLGrammar.rules[ifCondition];
+        ifCondition = GraphQLGrammar[ifCondition];
       }
 
       let token = this._lookAhead();
@@ -551,7 +551,7 @@ export class OnlineParser {
       case RuleKind.RULE_NAME:
         rule = (rule: GraphQLGrammarRuleName);
         this._pushRule(
-          GraphQLGrammar.rules[rule],
+          GraphQLGrammar[rule],
           depth,
           (typeof name === 'string' ? name : undefined) || rule,
           step,