@putout/processor-markdown 12.0.0 → 12.2.0

package/lib/markdown.js

@@ -1,17 +1,15 @@
-import {
-    toJS,
-    fromJS,
-} from '@putout/operator-json';
+import {toJS, fromJS} from '@putout/operator-json';
 import stringify from 'remark-stringify';
 import preset from 'remark-preset-lint-consistent';
+import remarkFrontmatter from 'remark-frontmatter';
+import {visit} from 'unist-util-visit';
+import {unified} from 'unified';
+import remarkParse from 'remark-parse';
 import removeDependenciesStatusBadge from './rules/remove-dependencies-status-badge.js';
 import removeTrailingWhitespacesFromHeading from './rules/remove-trailing-whitespaces-from-heading.js';
 import mergeHeadingSpceces from './rules/merge-heading-spaces.js';
 import {run} from './rules/index.js';
-import {visit} from 'unist-util-visit';
-import {unified} from 'unified';
 import {toPlace} from './parse-place.js';
-import {initParseStore} from './parse-store.js';
 
 const plugins = [
     removeDependenciesStatusBadge,
@@ -19,8 +17,6 @@ const plugins = [
     mergeHeadingSpceces,
 ];
 
-const parseStore = initParseStore();
-
 const text = ({value}) => value;
 
 const stringifyOptions = {
@@ -35,13 +31,11 @@ const stringifyOptions = {
 
 export const files = ['*.md'];
 export const find = async (rawSource, options = {}) => {
-    await parseStore.init();
-    
     if (!rawSource.length)
         return [];
     
     const {messages} = await unified()
-        .use(parseStore)
+        .use(remarkParse)
         .use(preset)
         .use(run, {
             fix: false,
@@ -51,16 +45,17 @@ export const find = async (rawSource, options = {}) => {
             ],
         })
         .use(stringify, stringifyOptions)
+        .use(remarkFrontmatter, ['yaml', 'toml'])
         .process(rawSource);
     
     return messages.map(toPlace);
 };
 export const fix = async (rawSource, options = {}) => {
-    await parseStore.init();
-    
     const {value} = await unified()
-        .use(parseStore)
+        .use(remarkParse)
         .use(preset)
+        .use(stringify, stringifyOptions)
+        .use(remarkFrontmatter, ['yaml', 'toml'])
         .use(run, {
             fix: true,
             plugins: [
@@ -68,7 +63,6 @@ export const fix = async (rawSource, options = {}) => {
                 ...options.plugins || [],
             ],
         })
-        .use(stringify, stringifyOptions)
         .process(rawSource);
     
     return value;
@@ -77,7 +71,7 @@ export const branch = async (rawSource) => {
     const list = [];
     
     await unified()
-        .use(parseStore)
+        .use(remarkParse)
         .use(collect, {
             list,
             visit,
@@ -91,7 +85,7 @@ export const merge = async (rawSource, list) => {
     const newList = list.slice();
     
     const {value} = await unified()
-        .use(parseStore)
+        .use(remarkParse)
         .use(apply, {
             list: newList,
             rawSource,
@@ -100,15 +94,12 @@ export const merge = async (rawSource, list) => {
         .use(stringify, stringifyOptions)
         .process(rawSource);
     
-    await parseStore.clear();
-    
     return value;
 };
 
 const collect = ({list, visit}) => (node) => {
     visit(node, 'code', (node) => {
         const {lang, value} = node;
-        
         const startLine = node.position.start.line;
         
         if (/^(js|javascript)$/.test(lang)) {

package/lib/rules/merge-heading-spaces.js

@@ -38,7 +38,7 @@ const bothSpaces = (node, nextNode) => {
     if (node.type !== 'text' || node.value !== ' ')
         return false;
     
-    return !(nextNode.type !== 'text' || nextNode.value !== ' ');
+    return nextNode.type === 'text' && nextNode.value === ' ';
 };
 
 export default {

package/package.json

@@ -1,21 +1,20 @@
 {
   "name": "@putout/processor-markdown",
-  "version": "12.0.0",
+  "version": "12.2.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout processor adds ability to parse markdown files and lint JavaScript, JSX, TypeScript and JSON snippets",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/processor-markdown#readme",
   "main": "./lib/markdown.js",
   "exports": {
-    ".": "./lib/markdown.js",
-    "./parse-store": "./lib/parse-store.js"
+    ".": "./lib/markdown.js"
   },
   "release": false,
   "tag": false,
   "changelog": false,
   "repository": {
     "type": "git",
-    "url": "git://github.com/coderaiser/putout.git"
+    "url": "git+https://github.com/coderaiser/putout.git"
   },
   "scripts": {
     "test": "madrun test",
@@ -31,11 +30,12 @@
   "dependencies": {
     "@putout/operator-json": "^2.0.0",
     "once": "^1.4.0",
+    "remark-frontmatter": "^5.0.0",
     "remark-parse": "^11.0.0",
-    "remark-preset-lint-consistent": "^5.0.0",
+    "remark-preset-lint-consistent": "^6.0.0",
     "remark-stringify": "^11.0.0",
     "unified": "^11.0.3",
-    "unified-lint-rule": "^2.1.0",
+    "unified-lint-rule": "^3.0.0",
     "unist-util-visit": "^5.0.0"
   },
   "keywords": [
@@ -44,18 +44,18 @@
     "markdown"
   ],
   "devDependencies": {
-    "@putout/test": "^8.0.0",
-    "c8": "^9.0.0",
-    "eslint": "^9.0.0-alpha.0",
-    "eslint-plugin-n": "^17.0.0-0",
-    "eslint-plugin-putout": "^22.0.0",
+    "@putout/test": "^11.0.0",
+    "c8": "^10.0.0",
+    "eslint": "^9.0.0",
+    "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-putout": "^24.0.0",
     "lerna": "^6.0.1",
-    "madcut": "^1.0.0",
+    "madcut": "^2.0.0",
     "madrun": "^10.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
     "putout": "*",
-    "supertape": "^9.0.0"
+    "supertape": "^10.0.0"
   },
   "engines": {
     "node": ">=18"

package/lib/parse-store.js

@@ -1,29 +0,0 @@
-export const initParseStore = () => {
-    let cache = null;
-    let parse = null;
-    
-    const fn = function needContext(a) {
-        parse.call(this, a);
-        const {parser} = this;
-        
-        this.parser = function(...a) {
-            if (cache)
-                return cache;
-            
-            cache = parser(...a);
-            
-            return cache;
-        };
-    };
-    
-    fn.init = async () => {
-        cache = null;
-        ({default: parse} = await import('remark-parse'));
-    };
-    
-    fn.clear = async () => {
-        cache = null;
-    };
-    
-    return fn;
-};