Fix merge order of empty-doc

Author: borkdude

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ## Unreleased
 
-...
+- Fix merge order of options and `empty-doc`
 
 ## 0.7.211
 

src/nextjournal/markdown/impl.clj

@@ -287,7 +287,7 @@
              (set (keys ctx))
              (set (keys u/empty-doc))))
      ;; only settings were provided, we add the empty doc
-     (recur (merge ctx u/empty-doc) md)
+     (recur (merge u/empty-doc ctx) md)
      (node->data (update ctx :text-tokenizers (partial map u/normalize-tokenizer))
                  (.parse (parser ctx) md)))))
 

src/nextjournal/markdown/impl.cljs

@@ -1,6 +1,7 @@
 ;; # 🧩 Parsing
 (ns nextjournal.markdown.impl
   (:require ["/js/markdown" :as md]
+            [clojure.set :as set]
             [clojure.zip :as z]
             [nextjournal.markdown.impl.utils :as u]))
 
@@ -276,7 +277,9 @@ _this #should be a tag_, but this [_actually #foo shouldnt_](/bar/) is not."
 (defn parse
   ([markdown] (parse u/empty-doc markdown))
   ([ctx-in markdown]
-   (if (empty? (select-keys ctx-in [:type :content ::root]))
+   (if (not (set/superset?
+             (set (keys ctx-in))
+             (set (keys u/empty-doc))))
      (recur (merge u/empty-doc ctx-in) markdown)
      (let [{:as ctx-out :keys [doc title toc footnotes] ::keys [label->footnote-ref]}
            (-> ctx-in