core: Support top level !code and !data tags

Author: ingydotnet

core/src/yamlscript/compiler.clj

@@ -43,7 +43,7 @@
         blocks (loop [[group & groups] groups blocks [] i 1]
                  (let [blocks (conj blocks
                                 (-> group
-                                  yamlscript.composer/compose
+                                  (yamlscript.composer/compose (= i 1))
                                   yamlscript.resolver/resolve
                                   yamlscript.builder/build
                                   yamlscript.transformer/transform
@@ -80,7 +80,8 @@
                  (let [blocks (conj blocks
                                 (-> group
                                   (#(stage-with-options "compose"
-                                      yamlscript.composer/compose [%1]))
+                                      yamlscript.composer/compose
+                                      [%1 (= i 1)]))
                                   (#(stage-with-options "resolve"
                                       yamlscript.resolver/resolve [%1]))
                                   (#(stage-with-options "build"

core/src/yamlscript/composer.clj

@@ -32,20 +32,30 @@
 
 (defn compose
   "Compose YAML parse events into a tree."
-  [events]
-  (let [node (if (seq events)
-               (->
-                 events
-                 compose-events
-                 first)
-               {:! "yamlscript/v0", := ""})]
-    (if (and
-          (= "YS" (get-in node [:% 0 :!]))
-          (= "v0" (get-in node [:% 0 :=]))
-          (= {:= ""} (get-in node [:% 1])))
-      (let [node (assoc-in node [:%] (vec (drop 2 (get-in node [:%]))))]
-        (merge {:! "yamlscript/v0:"} node))
-      node)))
+  ([events]
+    (compose events true))
+  ([events first]
+   (let [node (if (seq events)
+                (->
+                  events
+                  compose-events
+                  clojure.core/first)
+                {:! "yamlscript/v0", := ""})
+         node (if (and
+                    (= "YS" (get-in node [:% 0 :!]))
+                    (= "v0" (get-in node [:% 0 :=]))
+                    (= {:= ""} (get-in node [:% 1])))
+                (let [node (assoc-in node [:%]
+                             (vec (drop 2 (get-in node [:%]))))]
+                  (merge {:! "yamlscript/v0:"} node))
+                node)
+         node (if (not first)
+                (cond
+                  (= "code" (:! node)) (assoc node :! "yamlscript/v0/code")
+                  (= "data" (:! node)) (assoc node :! "yamlscript/v0/data")
+                  :else node)
+                node)]
+     node)))
 
 (defn compose-mapping [events]
   (let [[event & events] events

core/test/compiler-stack.yaml

@@ -1514,3 +1514,32 @@
   clojure: |
     (def name "World")
     {"foo" name}
+
+
+- name: Support top level !code and !data tags
+  yamlscript: |
+    !yamlscript/v0
+    x =: 1
+    --- !code
+    y =: 2
+    --- !data
+    z:: x + y
+  clojure: |
+    (def x 1)
+    (def y 2)
+    {"z" (add+ x y)}
+
+
+- name: Support top level !code and !data tags with '!YS v0:'
+  yamlscript: |
+    !YS v0:
+    --- !code
+    x =: 1
+    y =: 2
+    --- !data
+    z:: x + y
+  clojure: |
+    {}
+    (def x 1)
+    (def y 2)
+    {"z" (add+ x y)}