Refactor code-style

Author: wooorm

lib/index.js

@@ -18,142 +18,106 @@ import {normalizeIdentifier} from 'micromark-util-normalize-identifier'
 footnoteReference.peek = footnoteReferencePeek
 
 /**
- * Create an extension for `mdast-util-from-markdown` to enable GFM footnotes
- * in markdown.
- *
- * @returns {FromMarkdownExtension}
- *   Extension for `mdast-util-from-markdown`.
+ * @this {CompileContext}
+ * @type {FromMarkdownHandle}
  */
-export function gfmFootnoteFromMarkdown() {
-  return {
-    enter: {
-      gfmFootnoteDefinition: enterFootnoteDefinition,
-      gfmFootnoteDefinitionLabelString: enterFootnoteDefinitionLabelString,
-      gfmFootnoteCall: enterFootnoteCall,
-      gfmFootnoteCallString: enterFootnoteCallString
-    },
-    exit: {
-      gfmFootnoteDefinition: exitFootnoteDefinition,
-      gfmFootnoteDefinitionLabelString: exitFootnoteDefinitionLabelString,
-      gfmFootnoteCall: exitFootnoteCall,
-      gfmFootnoteCallString: exitFootnoteCallString
-    }
-  }
+function enterFootnoteCallString() {
+  this.buffer()
 }
 
 /**
- * Create an extension for `mdast-util-to-markdown` to enable GFM footnotes
- * in markdown.
- *
- * @returns {ToMarkdownExtension}
- *   Extension for `mdast-util-to-markdown`.
+ * @this {CompileContext}
+ * @type {FromMarkdownHandle}
  */
-export function gfmFootnoteToMarkdown() {
-  return {
-    // This is on by default already.
-    unsafe: [{character: '[', inConstruct: ['phrasing', 'label', 'reference']}],
-    handlers: {footnoteDefinition, footnoteReference}
-  }
+function enterFootnoteCall(token) {
+  this.enter({type: 'footnoteReference', identifier: '', label: ''}, token)
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function enterFootnoteDefinition(token) {
-  this.enter(
-    {type: 'footnoteDefinition', identifier: '', label: '', children: []},
-    token
-  )
+function enterFootnoteDefinitionLabelString() {
+  this.buffer()
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function enterFootnoteDefinitionLabelString() {
-  this.buffer()
+function enterFootnoteDefinition(token) {
+  this.enter(
+    {type: 'footnoteDefinition', identifier: '', label: '', children: []},
+    token
+  )
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function exitFootnoteDefinitionLabelString(token) {
+function exitFootnoteCallString(token) {
   const label = this.resume()
   const node = this.stack[this.stack.length - 1]
-  assert(node.type === 'footnoteDefinition')
-  node.label = label
+  assert(node.type === 'footnoteReference')
   node.identifier = normalizeIdentifier(
     this.sliceSerialize(token)
   ).toLowerCase()
+  node.label = label
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function exitFootnoteDefinition(token) {
+function exitFootnoteCall(token) {
   this.exit(token)
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function enterFootnoteCall(token) {
-  this.enter({type: 'footnoteReference', identifier: '', label: ''}, token)
-}
-
-/**
- * @this {CompileContext}
- * @type {FromMarkdownHandle}
- */
-function enterFootnoteCallString() {
-  this.buffer()
-}
-
-/**
- * @this {CompileContext}
- * @type {FromMarkdownHandle}
- */
-function exitFootnoteCallString(token) {
+function exitFootnoteDefinitionLabelString(token) {
   const label = this.resume()
   const node = this.stack[this.stack.length - 1]
-  assert(node.type === 'footnoteReference')
-  node.label = label
+  assert(node.type === 'footnoteDefinition')
   node.identifier = normalizeIdentifier(
     this.sliceSerialize(token)
   ).toLowerCase()
+  node.label = label
 }
 
 /**
  * @this {CompileContext}
  * @type {FromMarkdownHandle}
  */
-function exitFootnoteCall(token) {
+function exitFootnoteDefinition(token) {
   this.exit(token)
 }
 
 /**
  * @type {ToMarkdownHandle}
- * @param {FootnoteReference} node
+ * @param {FootnoteDefinition} node
  */
-function footnoteReference(node, _, state, info) {
+function footnoteDefinition(node, _, state, info) {
   const tracker = state.createTracker(info)
   let value = tracker.move('[^')
-  const exit = state.enter('footnoteReference')
-  const subexit = state.enter('reference')
+  const exit = state.enter('footnoteDefinition')
+  const subexit = state.enter('label')
   value += tracker.move(
-    state.safe(state.associationId(node), {
-      ...tracker.current(),
-      before: value,
-      after: ']'
-    })
+    state.safe(state.associationId(node), {before: value, after: ']'})
   )
   subexit()
+  value += tracker.move(
+    ']:' + (node.children && node.children.length > 0 ? ' ' : '')
+  )
+  tracker.shift(4)
+  value += tracker.move(
+    state.indentLines(state.containerFlow(node, tracker.current()), map)
+  )
   exit()
-  value += tracker.move(']')
+
   return value
 }
 
@@ -164,33 +128,61 @@ function footnoteReferencePeek() {
 
 /**
  * @type {ToMarkdownHandle}
- * @param {FootnoteDefinition} node
+ * @param {FootnoteReference} node
  */
-function footnoteDefinition(node, _, state, info) {
+function footnoteReference(node, _, state, info) {
   const tracker = state.createTracker(info)
   let value = tracker.move('[^')
-  const exit = state.enter('footnoteDefinition')
-  const subexit = state.enter('label')
+  const exit = state.enter('footnoteReference')
+  const subexit = state.enter('reference')
   value += tracker.move(
-    state.safe(state.associationId(node), {
-      ...tracker.current(),
-      before: value,
-      after: ']'
-    })
+    state.safe(state.associationId(node), {after: ']', before: value})
   )
   subexit()
-  value += tracker.move(
-    ']:' + (node.children && node.children.length > 0 ? ' ' : '')
-  )
-  tracker.shift(4)
-  value += tracker.move(
-    state.indentLines(state.containerFlow(node, tracker.current()), map)
-  )
   exit()
-
+  value += tracker.move(']')
   return value
 }
 
+/**
+ * Create an extension for `mdast-util-from-markdown` to enable GFM footnotes
+ * in markdown.
+ *
+ * @returns {FromMarkdownExtension}
+ *   Extension for `mdast-util-from-markdown`.
+ */
+export function gfmFootnoteFromMarkdown() {
+  return {
+    enter: {
+      gfmFootnoteCallString: enterFootnoteCallString,
+      gfmFootnoteCall: enterFootnoteCall,
+      gfmFootnoteDefinitionLabelString: enterFootnoteDefinitionLabelString,
+      gfmFootnoteDefinition: enterFootnoteDefinition
+    },
+    exit: {
+      gfmFootnoteCallString: exitFootnoteCallString,
+      gfmFootnoteCall: exitFootnoteCall,
+      gfmFootnoteDefinitionLabelString: exitFootnoteDefinitionLabelString,
+      gfmFootnoteDefinition: exitFootnoteDefinition
+    }
+  }
+}
+
+/**
+ * Create an extension for `mdast-util-to-markdown` to enable GFM footnotes
+ * in markdown.
+ *
+ * @returns {ToMarkdownExtension}
+ *   Extension for `mdast-util-to-markdown`.
+ */
+export function gfmFootnoteToMarkdown() {
+  return {
+    handlers: {footnoteDefinition, footnoteReference},
+    // This is on by default already.
+    unsafe: [{character: '[', inConstruct: ['label', 'phrasing', 'reference']}]
+  }
+}
+
 /** @type {Map} */
 function map(line, index, blank) {
   if (index === 0) {

test.js

@@ -1,12 +1,12 @@
 import assert from 'node:assert/strict'
 import test from 'node:test'
 import {fromMarkdown} from 'mdast-util-from-markdown'
-import {toMarkdown} from 'mdast-util-to-markdown'
-import {gfmFootnote} from 'micromark-extension-gfm-footnote'
 import {
   gfmFootnoteFromMarkdown,
   gfmFootnoteToMarkdown
 } from 'mdast-util-gfm-footnote'
+import {toMarkdown} from 'mdast-util-to-markdown'
+import {gfmFootnote} from 'micromark-extension-gfm-footnote'
 
 test('core', async function (t) {
   await t.test('should expose the public api', async function () {