[nat] (saveComponent) and (withComponents)

projects/nat-archive-tool/src/nat/Lib.kiss

@@ -4,12 +4,42 @@
 (defmacro hasComponent [e componentType]
     `(.exists .components ,e ,(symbolName componentType)))
 
-// TODO add to the documentation a hint that macros should use fully qualified paths so macro caller classes don't need to import everything
+(defmacro _componentPath [archive e componentType]
+    `(haxe.io.Path.join [.archiveDir (the nat.Archive ,archive) "components" (+ (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType)) ".json")]))
+
 (defmacro getComponent [archive e componentType]
+    // TODO add to the documentation a hint that macros should use fully qualified type paths so macro caller classes don't need to import everything
     `(the nat.components ,componentType 
         (tink.Json.parse
-            (sys.io.File.getContent
+            (sys.io.File.getContent (_componentPath ,archive ,e ,componentType)))))
-                (haxe.io.Path.join [.archiveDir (the nat.Archive ,archive) "components" (+ (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType)) ".json")])))))
+
+// Components have to be saved individually after writing because the Entity only knows their ids,
+// not the data they contain. This is more ergonomically done by using (withComponents...)
+(defmacro saveComponent [archive e componentType c]
+    `(sys.io.File.saveContent
+        (_componentPath ,archive ,e ,componentType)
+        (tink.Json.stringify
+            (the nat.components ,componentType ,c))))
+
+// Retrieve multiple components from an Entity with mutable access.
+// All components will be serialized after the block is done.
+(defmacro withComponents [archive e bindings &rest body]
+    (let [bindingPairs
+                (groups (expList bindings) 2 Throw)
+            bindingList
+                []
+            saveList
+                []
+            retValSymbol
+                (symbol)]
+        (doFor [name type] bindingPairs
+            (bindingList.push `&mut ,name)
+            (bindingList.push `(getComponent ,archive ,e ,type))
+            (saveList.push `(saveComponent ,archive ,e ,type ,name)))
+        `(let [,@bindingList
+                ,retValSymbol {,@body}]
+            ,@saveList
+            ,retValSymbol)))
 
 (defun tagList [archive e]
     (let [t

projects/nat-archive-tool/src/nat/components/Author.hx

@@ -1,4 +1,3 @@
 package nat.components;
 
-typedef Name = String;
 typedef Author = String;

projects/nat-archive-tool/src/nat/components/Name.hx

@@ -0,0 +1,3 @@
+package nat.components;
+
+typedef Name = String;

projects/nat-archive-tool/src/test/TestMain.kiss

@@ -25,4 +25,9 @@
         (assert !(tagsMatch archive song1 "(and song religious)"))
         (assert (tagsMatch archive song2 "(and song religious)"))
         (assert !(tagsMatch archive song2 "(and song western)"))
-        ))
+
+        (withComponents archive song1
+            [author Author
+                name Name]
+            (assert (= author "Rafael Krux"))
+            (assert (= name "Adventure")))))