feat: merge passed options.plugins

Author: jedwards1211

.prettierignore

@@ -0,0 +1,15 @@
+/coverage
+/.nyc_output
+node_modules
+/es
+.eslintcache
+*.js
+*.js.flow
+*.d.ts
+!/src/**/*.ts
+!/src/**/*.js
+!/src/**/*.js.flow
+!/test/**/*.ts
+!/test/**/*.js
+!/.babelrc.js
+/test/fixtures

README.md

@@ -17,7 +17,7 @@ project, it falls back to parsing with reasonable default options.
 
 # API
 
-## `parseSync(file: string, options?: { encoding?: BufferEncoding } & Omit<ParserOptions, 'plugins'>): File`
+## `parseSync(file: string, options?: { encoding?: BufferEncoding } & ParserOptions): File`
 
 ```ts
 import { parseSync } from 'babel-parse-wild-code'
@@ -26,8 +26,9 @@ import { parseSync } from 'babel-parse-wild-code'
 Parses the given file synchronously, returning the `File` node.
 
 `encoding` defaults to `utf8`. The remaining options are passed to `@babel/parser`'s `parse` function.
+`options.plugins` will be merged with the resolved options for the file.
 
-## `parseAsync(file: string, options?: { encoding?: BufferEncoding } & Omit<ParserOptions, 'plugins'>): Promise<File>`
+## `parseAsync(file: string, options?: { encoding?: BufferEncoding } & ParserOptions): Promise<File>`
 
 ```ts
 import { parseAsync } from 'babel-parse-wild-code'
@@ -36,6 +37,7 @@ import { parseAsync } from 'babel-parse-wild-code'
 Parses the given file asynchronously, returning a `Promise` that will resolve to the `File` node.
 
 `encoding` defaults to `utf8`. The remaining options are passed to `@babel/parser`'s `parse` function.
+`options.plugins` will be merged with the resolved options for the file.
 
 ## `clearCache(): void`
 
@@ -48,7 +50,7 @@ automatically when the user's Babel version or config changes, but setting up th
 complicated. Clearing the cache before you parse a bunch of files is simpler and won't have a huge
 impact on performance.
 
-## `getParserSync(file: string, options?: Omit<ParserOptions, 'plugins'>): Parser`
+## `getParserSync(file: string, options?: ParserOptions): Parser`
 
 ```ts
 import { getParserSync } from 'babel-parse-wild-code'
@@ -58,8 +60,9 @@ Gets a fully-configured parser for the given file synchronously.
 
 `options` is additional options for `@babel/parser`'s `parse` function. For example when working
 with `jscodeshift` or `recast`, you should pass `{ tokens: true }`.
+`options.plugins` will be merged with the resolved options for the file.
 
-## `getParserAsync(file: string, options?: Omit<ParserOptions, 'plugins'>): Promise<Parser>`
+## `getParserAsync(file: string, options?: ParserOptions): Promise<Parser>`
 
 ```ts
 import { getParserSync } from 'babel-parse-wild-code'
@@ -69,6 +72,7 @@ Gets a fully-configured parser for the given file asynchronously.
 
 `options` is additional options for `@babel/parser`'s `parse` function. For example when working
 with `jscodeshift` or `recast`, you should pass `{ tokens: true }`.
+`options.plugins` will be merged with the resolved options for the file.
 
 ## `class Parser`
 

src/index.ts

@@ -15,6 +15,30 @@ function isEmpty(obj: any): boolean {
 
 type BabelParser = Pick<typeof defaultBabelParser, 'parse' | 'parseExpression'>
 
+function mergePlugins(
+  a: ParserPlugin[] | undefined,
+  b: ParserPlugin[] | undefined
+): ParserPlugin[] | undefined {
+  if (!b) return a
+  if (!a) return b
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const map: Map<string, any> = new Map(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    a.map((p: ParserPlugin): [string, any] =>
+      Array.isArray(p) ? p : [p, undefined]
+    )
+  )
+  for (const p of b) {
+    if (Array.isArray(p)) map.set(p[0], { ...map.get(p[0]), ...p[1] })
+    else if (!map.has(p)) map.set(p, map.get(p))
+  }
+  return [...map.entries()].map(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (e: [string, any]) => (e[1] === undefined ? e[0] : e)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ) as any
+}
+
 export class Parser {
   readonly babelParser: BabelParser
   readonly parserOpts: ParserOptions
@@ -37,7 +61,11 @@ export class Parser {
   }
 
   bindParserOpts(parserOpts: ParserOptions): Parser {
-    return new Parser(this.babelParser, { ...this.parserOpts, ...parserOpts })
+    return new Parser(this.babelParser, {
+      ...this.parserOpts,
+      ...parserOpts,
+      plugins: mergePlugins(this.parserOpts.plugins, parserOpts.plugins),
+    })
   }
 }
 
@@ -141,10 +169,7 @@ function createParserFromConfig(babelParser: BabelParser, config: any): Parser {
   return new Parser(babelParser, opts.parserOpts)
 }
 
-export function getParserSync(
-  file: string,
-  options?: Omit<ParserOptions, 'plugins'>
-): Parser {
+export function getParserSync(file: string, options?: ParserOptions): Parser {
   let result
   const parentDir = Path.dirname(file)
   const extname = Path.extname(file)
@@ -185,7 +210,7 @@ export function getParserSync(
 
 export async function getParserAsync(
   file: string,
-  options?: Omit<ParserOptions, 'plugins'>
+  options?: ParserOptions
 ): Promise<Parser> {
   let promise
   if (/\.ts$/.test(file)) promise = Promise.resolve(tsParser)
@@ -241,7 +266,7 @@ export function parseSync(
   {
     encoding = 'utf8',
     ...options
-  }: { encoding?: BufferEncoding } & Omit<ParserOptions, 'plugins'> = {}
+  }: { encoding?: BufferEncoding } & ParserOptions = {}
 ): t.File {
   const parser = getParserSync(file, options)
   return parser.parse(readFileSync(file, encoding))
@@ -252,7 +277,7 @@ export async function parseAsync(
   {
     encoding = 'utf8',
     ...options
-  }: { encoding?: BufferEncoding } & Omit<ParserOptions, 'plugins'> = {}
+  }: { encoding?: BufferEncoding } & ParserOptions = {}
 ): Promise<t.File> {
   const parser = await getParserAsync(file, options)
   return parser.parse(await readFile(file, encoding))

test/fixtures/babelPipeline/pluginOptionsOverrideTest.js

@@ -0,0 +1,7 @@
+type Foo = number
+
+let person = { score: 25 }
+
+let newScore = person.score |> double(#) |> add(7, #) |> boundScore(0, 100, #)
+
+newScore //=> 57

test/fixtures/babelPipeline/topLevelAwaitTest.js

@@ -0,0 +1,9 @@
+type Foo = number
+
+let person = { score: 25 }
+
+let newScore =
+  person.score |> double |> ((_) => add(7, _)) |> ((_) => boundScore(0, 100, _))
+
+newScore //=> 57
+await blah

test/fixtures/babelPipeline/topLevelAwaitTest.ts

@@ -0,0 +1,9 @@
+type Foo = number
+
+let person = { score: 25 }
+
+let newScore =
+  person.score |> double |> ((_) => add(7, _)) |> ((_) => boundScore(0, 100, _))
+
+newScore //=> 57
+await blah

test/index.spec.ts

@@ -26,6 +26,26 @@ describe('parseSync', function () {
       parseSync(Path.join(fixturesDir, 'babelPipeline', 'test.js')).type
     ).to.equal('File')
   })
+  it('passing plugins works', () => {
+    expect(
+      parseSync(
+        Path.join(fixturesDir, 'babelPipeline', 'topLevelAwaitTest.js'),
+        { plugins: ['topLevelAwait'] }
+      ).type
+    ).to.equal('File')
+    expect(
+      parseSync(
+        Path.join(fixturesDir, 'babelPipeline', 'topLevelAwaitTest.ts'),
+        { plugins: ['topLevelAwait'] }
+      ).type
+    ).to.equal('File')
+    expect(
+      parseSync(
+        Path.join(fixturesDir, 'babelPipeline', 'pluginOptionsOverrideTest.js'),
+        { plugins: [['pipelineOperator', { proposal: 'smart' }]] }
+      ).type
+    ).to.equal('File')
+  })
   it('works on ts file', () => {
     expect(
       parseSync(Path.join(fixturesDir, 'babelPipeline', 'test.ts')).type