fix: always pass through parserOptions

Author: JounQin

.eslintrc.js

@@ -4,6 +4,7 @@ tsNode.register({
   compilerOptions: {
     module: 'commonjs',
   },
+  transpileOnly: true,
 })
 
 module.exports = {

.travis.yml

@@ -7,7 +7,7 @@ cache:
   - directories:
       - .changelog
 
-env: EFF_NO_LINK_RULES=true
+env: EFF_NO_LINK_RULES=true PARSER_NO_WATCH=true
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -18,7 +18,6 @@ before_install:
 install: yarn --frozen-lockfile
 
 script:
-  - yarn build
   - yarn lint
   - yarn test
 

package.json

@@ -13,17 +13,20 @@
     "build": "run-p build:*",
     "build:r": "r",
     "build:ts": "tsc -b",
+    "clean": "rimraf packages/*/{lib,*.tsbuildinfo}",
     "lint": "run-p lint:*",
-    "lint:es": "eslint . --ext js,md,ts -f friendly",
+    "lint:es": "cross-env PARSER_NO_WATCH=true eslint . --cache --ext js,md,ts -f friendly",
     "lint:ts": "tslint -p . -t stylish",
-    "lint:tsc": "tsc --noEmit",
-    "test": "ts-node --skip-ignore node_modules/.bin/jest",
+    "lint:tsc": "tsc --incremental --noEmit",
+    "prelint": "yarn build",
+    "pretest": "yarn clean",
+    "test": "ts-node --skip-ignore -T node_modules/.bin/jest",
     "type-coverage": "type-coverage --cache --detail --ignore-catch --ignore-files *.d.ts --strict"
   },
   "devDependencies": {
-    "@1stg/babel-preset": "^0.7.9",
+    "@1stg/babel-preset": "^0.7.10",
     "@1stg/commitlint-config": "^0.1.2",
-    "@1stg/eslint-config": "^0.12.21",
+    "@1stg/eslint-config": "^0.13.1",
     "@1stg/husky-config": "^0.3.2",
     "@1stg/lint-staged": "^0.8.11",
     "@1stg/prettier-config": "^0.4.3",
@@ -36,7 +39,7 @@
     "@types/cosmiconfig": "^5.0.3",
     "@types/eslint": "^6.1.2",
     "@types/jest": "^24.0.19",
-    "@types/node": "^12.11.1",
+    "@types/node": "^12.11.2",
     "@types/react": "^16.9.9",
     "@types/rebass": "^4.0.3",
     "@types/unist": "^2.0.3",
@@ -45,7 +48,7 @@
     "eslint-plugin-mdx": "link:packages/eslint-plugin-mdx/src",
     "husky": "^3.0.9",
     "jest": "^24.9.0",
-    "lerna": "^3.18.1",
+    "lerna": "^3.18.2",
     "lerna-changelog": "^0.8.2",
     "lint-staged": "^9.4.2",
     "npm-run-all": "^4.1.5",
@@ -58,6 +61,9 @@
     "type-coverage": "^2.3.0",
     "typescript": "^3.6.4"
   },
+  "resolutions": {
+    "typescript": "^3.6.4"
+  },
   "commitlint": {
     "extends": [
       "@1stg"

packages/eslint-mdx/package.json

@@ -29,8 +29,8 @@
     "eslint": ">=5.0.0"
   },
   "dependencies": {
-    "espree": "^6.1.1",
-    "remark-mdx": "^1.5.0",
+    "espree": "^6.1.2",
+    "remark-mdx": "^1.5.1",
     "remark-parse": "^7.0.1",
     "tslib": "^1.10.0",
     "unified": "^8.4.1"

packages/eslint-mdx/src/parser.ts

@@ -59,14 +59,14 @@ export class Parser {
   }
 
   // @internal
-  private _options = DEFAULT_PARSER_OPTIONS
+  private readonly _options = DEFAULT_PARSER_OPTIONS
 
   constructor() {
     this.parse = this.parse.bind(this)
     this.parseForESLint = this.parseForESLint.bind(this)
   }
 
-  normalizeJsxNode(node: Node, parent?: Parent) {
+  normalizeJsxNode(node: Node, parent?: Parent, options = this._options) {
     const value = node.value as string
 
     if (node.type !== 'jsx' || isComment(value)) {
@@ -135,7 +135,7 @@ export class Parser {
       })
     }
 
-    return this._normalizeJsxNodes(node)
+    return this._normalizeJsxNodes(node, options)
   }
 
   parse(code: string, options: ParserOptions) {
@@ -176,7 +176,7 @@ export class Parser {
             return
           }
 
-          let normalized = this.normalizeJsxNode(node, parent)
+          let normalized = this.normalizeJsxNode(node, parent, options)
           normalized = Array.isArray(normalized) ? normalized : [normalized]
           normalized.forEach(_node => this._nodeToAst(_node, options))
         },
@@ -190,15 +190,15 @@ export class Parser {
   }
 
   // @internal
-  private _eslintParse(code: string, options = this._options) {
+  private _eslintParse(code: string, options: ParserOptions) {
     if (!this._parser || options.parser !== this._options.parser) {
       this._parser = normalizeParser(options.parser)
     }
     /* istanbul ignore else */
-    if (options.filePath) {
-      this._options = options
+    if (options.filePath && this._options !== options) {
+      Object.assign(this._options, options)
     }
-    const program = this._parser(code, options)
+    const program = this._parser(code, this._options)
     /* istanbul ignore next */
     return ('ast' in program && program.ast
       ? program
@@ -207,7 +207,10 @@ export class Parser {
 
   // fix adjacent JSX nodes
   // @internal
-  private _normalizeJsxNodes(node: Node): Node | Node[] {
+  private _normalizeJsxNodes(
+    node: Node,
+    options: ParserOptions,
+  ): Node | Node[] {
     const value = node.value as string
 
     let program: AST.Program
@@ -216,6 +219,7 @@ export class Parser {
       // wrap into single element which is valid jsx but not valid jsx in mdx, so that it won't break on adjacent JSX nodes
       program = this._eslintParse(
         `${JSX_WRAPPER_START}${value}${JSX_WRAPPER_END}`,
+        options,
       ).ast
     } catch (e) {
       if (hasProperties<LocationError>(e, LOC_ERROR_PROPERTIES)) {
@@ -225,6 +229,7 @@ export class Parser {
 
         e.index += start.offset - OFFSET
         e.column =
+          /* istanbul ignore next */
           e.lineNumber > 1 ? e.column : e.column + start.column - OFFSET
         e.lineNumber += start.line - 1
 

packages/eslint-plugin-mdx/package.json

@@ -32,7 +32,7 @@
     "cosmiconfig": "^5.2.1",
     "eslint-mdx": "^1.5.6",
     "eslint-plugin-react": ">=7.0.0",
-    "remark-mdx": "^1.5.0",
+    "remark-mdx": "^1.5.1",
     "remark-parse": "^7.0.1",
     "remark-stringify": "^7.0.3",
     "tslib": "^1.10.0",

packages/eslint-plugin-mdx/src/configs/helper.ts

@@ -1,16 +1,18 @@
 export const getGlobals = <
   T extends Record<string, unknown> | string[],
-  G extends {}
+  G extends Record<string, boolean>,
+  R extends G = G & Record<T extends Array<infer R> ? R : keyof T, false>
 >(
   sources: T,
   initialGlobals: G = {} as G,
-): Record<keyof G | (T extends Array<infer R> ? R : keyof T), false> =>
-  (Array.isArray(sources) ? sources : Object.keys(sources)).reduce(
+): R =>
+  (Array.isArray(sources)
+    ? (sources as string[])
+    : Object.keys(sources)
+  ).reduce(
     (globals, source) =>
       Object.assign(globals, {
         [source]: false,
       }),
-    // FIXME: find a better solution
-    // @ts-ignore
-    initialGlobals,
+    initialGlobals as R,
   )

test/parser.test.ts

@@ -150,23 +150,23 @@ describe('parser', () => {
       parser.parse("import A from 'a'\nimport A from 'a'", parserOptions),
     ).toThrow("unknown: Identifier 'A' has already been declared")
     expect(() => parser.parse('<header><>\n</header>', parserOptions)).toThrow(
-      'Expected corresponding closing tag for JSX fragment.',
+      'Expected corresponding JSX closing tag for <>',
     )
     expect(() => parser.parse('<h1></h2>', parserOptions)).toThrow(
-      "Expected corresponding JSX closing tag for 'h1'.",
+      'Expected corresponding JSX closing tag for <h1>',
     )
     expect(() => parser.parse('Header\n<>', parserOptions)).toThrow(
-      'Expected corresponding closing tag for JSX fragment.',
+      'Unexpected token (1:2)',
     )
     expect(() => parser.parse('<main><</main>', parserOptions)).toThrow(
-      'Identifier expected.',
+      'Unexpected token (1:7)',
     )
     expect(() => parser.parse('<main>{<}</main>', parserOptions)).toThrow(
-      'Expression expected.',
+      'Unexpected token (1:8)',
     )
     expect(() =>
       parser.parse('<main>\n<section><</section></main>', parserOptions),
-    ).toThrow('Identifier expected.')
+    ).toThrow('Unexpected token (2:10)')
   })
 
   it('should not throw on adjacent JSX nodes', () =>

tsconfig.base.json

@@ -1,3 +1,7 @@
 {
-  "extends": "@1stg/tsconfig/loose"
+  "extends": "@1stg/tsconfig/lib",
+  "compilerOptions": {
+    "strictFunctionTypes": false,
+    "strictNullChecks": false
+  }
 }

tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "incremental": false,
     "noEmit": true
   },