nap work

projects/nap/build.hxml

@@ -1,6 +1,7 @@
 -lib uuid
 -lib kiss
 -lib hscript
+-lib tink_json
 -cp src
 --main nap.Main
 --interp

projects/nap/example-archive/song1.json

@@ -1 +1 @@
-{"name":"Villain Alcohol","id":"song1","components":{"Tag":["song"]}}
+{"name":"Villain Alcohol","id":"song1","components":[["Tag", ["song"]]]}

projects/nap/haxelib.json

@@ -10,6 +10,7 @@
     "classPath": "src/",
     "main": "nap.Main",
     "dependencies": {
-        "kiss": ""
+        "kiss": "",
+        "tink_json": ""
     }
 }

projects/nap/src/nap/Archive.hx

@@ -3,7 +3,8 @@ package nap;
 import kiss.Prelude;
 import sys.FileSystem;
 import sys.io.File;
-import haxe.Json;
+import tink.Json;
+import nap.systems.TagSystem;
 
 using haxe.io.Path;
 

projects/nap/src/nap/Archive.kiss

@@ -1,10 +1,13 @@
 (defnew [archiveDir]
     [:Map<String,Entry> entries
             (let [entryFiles (FileSystem.readDirectory archiveDir)]
-                (for file entryFiles =>(file.withoutExtension) ~(Json.parse (File.getContent (Path.join [archiveDir file])))))
+                (for file entryFiles =>(file.withoutExtension) ~(the Entry (Json.parse (File.getContent (Path.join [archiveDir file]))))))
-        :Array<System> systems []] // TODO also create systems
+        :Array<System> systems [
-    // TODO register entities to systems that want them
+            (the System (new TagSystem "song"))]]
-    )
+    (doFor system systems
+        (doFor =>id entry entries
+            (when (system.canProcessEntry entry)
+                (system.entries.push entry)))))
 
 (defmethod :Void handleEvent [:Event e]
     (throw "can't handle $e"))

projects/nap/src/nap/Entry.hx

@@ -1,8 +1,7 @@
 package nap;
 
-import kiss.Kiss;
+typedef Entry = {
-import kiss.Prelude;
+    id:String,
-import uuid.Uuid;
+    name:String,
-
+    components:Map<String, Array<Dynamic>>
-@:build(kiss.Kiss.build())
+};
-class Entry {}

projects/nap/src/nap/Entry.kiss

@@ -1,3 +0,0 @@
-(defnew [&prop :String name]
-    [:String id (Uuid.v4)
-        :Map<String,kiss.List<Dynamic>> components (new Map)])

projects/nap/src/nap/Lib.hx

@@ -1,5 +1,6 @@
 package nap;
 
+import uuid.Uuid;
 import kiss.Prelude;
 import kiss.Stream;
 import hscript.Parser;

projects/nap/src/nap/Lib.kiss

@@ -6,4 +6,10 @@
                 (new BoolExpInterp)]
         (doFor condition activeConditions
             (interp.variables.set condition true))
-        ?(interp.execute hscriptExp)))
+        ?(interp.execute hscriptExp)))
+
+(defun :Entry newEntry [:String name]
+    (object
+        id (Uuid.v4)
+        name name
+        components (new Map)))

projects/nap/src/nap/components/Tag.kiss

@@ -0,0 +1,2 @@
+(defun :Array<String> getTags [:Entry e]
+    (or (dictGet e.components "Tag") []))

projects/nap/src/nap/systems/TagSystem.kiss

@@ -1,4 +1,6 @@
-(defnew [&prop :String tagFilterString])
+(load "../components/Tag.kiss")
+
+(defnew [&prop :String tagFilterString] [])
 
 (defmethod &override :Bool canProcessEntry [:Entry e]
-    )
+    (Lib.evalBoolExp tagFilterString (getTags e)))