[#54] allow namespaced maps with namespace alias.

Author: Yannick Scherer

src/rewrite_clj/node/seq.clj

@@ -41,8 +41,6 @@
             "can only contain 2 non-whitespace forms.")
     (assert (keyword? (first exs))
             "first form in namespaced map needs to be keyword.")
-    (assert (not (namespace (first exs)))
-            "keyword for namespaced map may not be already namespaced.")
     (assert (map? (second exs))
             "second form in namespaced map needs to be map.")))
 
@@ -52,12 +50,20 @@
     :namespaced-map)
   (printable-only? [_] false)
   (sexpr [this]
-    (let [[ns m] (node/sexprs children)
-          ns     (name ns)]
+    (let [[nspace' m] (node/sexprs children)
+          nspace (if (namespace nspace')
+                   (-> (ns-aliases *ns*)
+                       (get (symbol (name nspace')))
+                       (ns-name)
+                       (name))
+                   (name nspace'))]
+      (assert nspace
+              (str "could not resolve namespace alias for namespaced map: "
+                   (namespace nspace')))
       (->> (for [[k v] m
                  :let [k' (cond (not (keyword? k)) k
                                 (namespace k)      k
-                                :else (keyword ns (name k)))]]
+                                :else (keyword nspace (name k)))]]
              [k' v])
            (into {}))))
   (length [_]

test/rewrite_clj/parser_test.clj

@@ -241,6 +241,16 @@
      "#:abc{:x 1, :y 1}"
      "#:abc   {:x 1, :y 1}"))
 
+(deftest t-parsing-namespaced-maps-with-namespace-alias
+  (are [?s]
+       (let [n (p/parse-string ?s)]
+         (is (= :namespaced-map (node/tag n)))
+         (is (= (count ?s) (node/length n)))
+         (is (= ?s (node/string n)))
+         (is (= {::node/x 1, ::node/y 1} (node/sexpr n))))
+    "#::node{:x 1, :y 1}"
+    "#::node   {:x 1, :y 1}"))
+
 (deftest t-parsing-exceptions
   (are [?s ?p]
        (is (thrown? Exception ?p (p/parse-string ?s)))