fix: markdown plain parser

antfu · Dec 11, 2023 · b6114b4 · b6114b4
1 parent 921883a
commit b6114b4
Show file tree

Hide file tree

Showing 15 changed files with 270 additions and 2 deletions.
diff --git a/fixtures/input/mdx.mdx b/fixtures/input/mdx.mdx
@@ -9,12 +9,14 @@ export  const   foo    = {
     ]
 }
 
+export const hello = 'hello'
+
 # Hello,    world!
 
 
  I'm an awesome   paragraph.
 
-<!-- I'm a comment -->
+{ /* I'm a comment */ }
 
 <Foo bg='red'>
       <Bar    >hi    </Bar>

diff --git a/fixtures/output/all/markdown.md b/fixtures/output/all/markdown.md
@@ -27,6 +27,7 @@ Jane Roe|JFK|314
  + with a [link] (/to/somewhere)
 + and [another one]
 
+
   [another one]:  http://example.com 'Example title'
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.

diff --git a/fixtures/output/all/mdx.mdx b/fixtures/output/all/mdx.mdx
@@ -0,0 +1,42 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello,    world!
+
+
+ I'm an awesome   paragraph.
+
+{ /* I'm a comment */ }
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = 'test'
+```
+
+```sh
+npm i -g foo
+```
+
+| Test  | Table   |
+|    :---     | :----  |
+|   Col1  | Col2    |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/fixtures/output/js/markdown.md b/fixtures/output/js/markdown.md
@@ -27,6 +27,7 @@ Jane Roe|JFK|314
  + with a [link] (/to/somewhere)
 + and [another one]
 
+
   [another one]:  http://example.com 'Example title'
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.

diff --git a/fixtures/output/js/mdx.mdx b/fixtures/output/js/mdx.mdx
@@ -0,0 +1,42 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello,    world!
+
+
+ I'm an awesome   paragraph.
+
+{ /* I'm a comment */ }
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = 'test'
+```
+
+```sh
+npm i -g foo
+```
+
+| Test  | Table   |
+|    :---     | :----  |
+|   Col1  | Col2    |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/fixtures/output/no-style/mdx.mdx b/fixtures/output/no-style/mdx.mdx
@@ -0,0 +1,42 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello,    world!
+
+
+ I'm an awesome   paragraph.
+
+{ /* I'm a comment */ }
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = 'test'
+```
+
+```sh
+npm i -g foo
+```
+
+| Test  | Table   |
+|    :---     | :----  |
+|   Col1  | Col2    |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/fixtures/output/tab-double-quotes/markdown.md b/fixtures/output/tab-double-quotes/markdown.md
@@ -27,6 +27,7 @@ Jane Roe|JFK|314
  + with a [link] (/to/somewhere)
 + and [another one]
 
+
   [another one]:  http://example.com 'Example title'
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.

diff --git a/fixtures/output/tab-double-quotes/mdx.mdx b/fixtures/output/tab-double-quotes/mdx.mdx
@@ -0,0 +1,42 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello,    world!
+
+
+ I'm an awesome   paragraph.
+
+{ /* I'm a comment */ }
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = "test"
+```
+
+```sh
+npm i -g foo
+```
+
+| Test  | Table   |
+|    :---     | :----  |
+|   Col1  | Col2    |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/fixtures/output/ts-override/markdown.md b/fixtures/output/ts-override/markdown.md
@@ -27,6 +27,7 @@ Jane Roe|JFK|314
  + with a [link] (/to/somewhere)
 + and [another one]
 
+
   [another one]:  http://example.com 'Example title'
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.

diff --git a/fixtures/output/ts-override/mdx.mdx b/fixtures/output/ts-override/mdx.mdx
@@ -0,0 +1,42 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello,    world!
+
+
+ I'm an awesome   paragraph.
+
+{ /* I'm a comment */ }
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = 'test'
+```
+
+```sh
+npm i -g foo
+```
+
+| Test  | Table   |
+|    :---     | :----  |
+|   Col1  | Col2    |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/fixtures/output/with-formatters/mdx.mdx b/fixtures/output/with-formatters/mdx.mdx
@@ -0,0 +1,41 @@
+import     {     Baz   } from     './Fixture'
+
+export  const   foo    = {
+  hi:     `Fudge ${Baz.displayName || 'Baz'}`,
+  authors: [
+     'fred',
+           'sally'
+    ]
+}
+
+export const hello = 'hello'
+
+# Hello, world!
+
+I'm an awesome paragraph.
+
+{/* I'm a comment */}
+
+<Foo bg='red'>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+</Foo>
+
+```
+test codeblock
+```
+
+```js
+module.exports = 'test'
+```
+
+```sh
+npm i -g foo
+```
+
+| Test | Table |
+| :--- | :---- |
+| Col1 | Col2  |
+
+export   default     ({children   }) => < div>{    children}</div>
diff --git a/src/configs/formatters.ts b/src/configs/formatters.ts
@@ -8,6 +8,7 @@ import { StylisticConfigDefaults } from './stylistic'
 export async function formatters(
   options: OptionsFormatters | true = {},
   stylistic: StylisticConfig = {},
+  markdownParserEnabled = true,
 ): Promise<FlatConfigItem[]> {
   await ensurePackages([
     'eslint-plugin-format',
@@ -143,6 +144,9 @@ export async function formatters(
 
     configs.push({
       files: [GLOB_MARKDOWN],
+      languageOptions: markdownParserEnabled
+        ? {}
+        : { parser: parserPlain },
       name: 'antfu:formatter:markdown',
       rules: {
         [`format/${formatter}`]: [
@@ -165,6 +169,9 @@ export async function formatters(
   if (options.mdx) {
     configs.push({
       files: [GLOB_MDX],
+      languageOptions: markdownParserEnabled
+        ? {}
+        : { parser: parserPlain },
       name: 'antfu:formatter:mdx',
       rules: {
         'format/prettier': [

diff --git a/src/configs/markdown.ts b/src/configs/markdown.ts
@@ -33,7 +33,6 @@ export async function markdown(
       rules: {
         'mdx/remark': 'warn',
         'no-unused-expressions': 'error',
-        'style/indent': 'off',
       },
     },
     {

diff --git a/src/configs/stylistic.ts b/src/configs/stylistic.ts
@@ -1,3 +1,4 @@
+import { GLOB_MARKDOWN_OR_MDX } from '../globs'
 import { interopDefault } from '../utils'
 import type { FlatConfigItem, StylisticConfig } from '../types'
 import { pluginAntfu } from '../plugins'
@@ -33,6 +34,9 @@ export async function stylistic(options: StylisticConfig = {}): Promise<FlatConf
 
   return [
     {
+      ignores: [
+        GLOB_MARKDOWN_OR_MDX,
+      ],
       name: 'antfu:stylistic',
       plugins: {
         antfu: pluginAntfu,

diff --git a/src/factory.ts b/src/factory.ts
@@ -191,6 +191,7 @@ export async function antfu(
     configs.push(formatters(
       options.formatters,
       typeof stylisticOptions === 'boolean' ? {} : stylisticOptions,
+      options.markdown !== false,
     ))
   }