Fix join order

Closes GH-32.
syntax-tree · Jun 23, 2021 · ac4bf0e · ac4bf0e
1 parent 59112a0
commit ac4bf0e
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -34,7 +34,7 @@ export function toMarkdown(tree, options = {}) {
   configure(context, options)
 
   if (context.options.tightDefinitions) {
-    context.join.unshift(joinDefinition)
+    configure(context, {join: [joinDefinition]})
   }
 
   /** @type {Handle} */

diff --git a/lib/util/container-flow.js b/lib/util/container-flow.js
@@ -36,11 +36,11 @@ export function containerFlow(parent, context) {
    * @returns {string}
    */
   function between(left, right) {
-    let index = -1
+    let index = context.join.length
     /** @type {ReturnType<Join>} */
     let result
 
-    while (++index < context.join.length) {
+    while (index--) {
       result = context.join[index](left, right, parent, context)
 
       if (result === true || result === 1) {

diff --git a/test/index.js b/test/index.js
@@ -2700,6 +2700,70 @@ test('escape', (t) => {
     'should support empty `join`, `handlers`, `extensions` in an extension (coverage)'
   )
 
+
+  t.equal(
+    to(
+      {
+        "type": "root",
+        "children": [
+            {
+                "type": "list",
+                "ordered": true,
+                "start": 1,
+                "spread": false,
+                "children": [
+                    {
+                        "type": "listItem",
+                        "spread": true,
+                        "checked": null,
+                        "children": [
+                            {
+                                "type": "paragraph",
+                                "children": [
+                                    {
+                                        "type": "text",
+                                        "value": "foo"
+                                    }
+                                ]
+                            },
+                            {
+                                "type": "list",
+                                "ordered": false,
+                                "start": null,
+                                "spread": false,
+                                "children": [
+                                    {
+                                        "type": "listItem",
+                                        "spread": false,
+                                        "checked": null,
+                                        "children": [
+                                            {
+                                                "type": "paragraph",
+                                                "children": [
+                                                    {
+                                                        "type": "text",
+                                                        "value": "bar"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+      {
+        join: [() => 0],
+      }
+    ),
+    '1.  foo\n    *   bar\n',
+    'should make `join` from options highest priority'
+  )
+
   t.equal(
     to(
       {