kiss-express projects smarter dts2hx handling. Close #164

projects/kiss-cli-tests/.gitignore

@@ -1 +1,2 @@
 TestNewProject/
+TestNewExpressProject/

projects/kiss-cli-tests/new-express-project-input.txt

@@ -0,0 +1 @@
+TestNewExpressProject

projects/kiss-cli-tests/test.sh

@@ -1,6 +1,15 @@
 #! /bin/bash
 
 # Test kiss new-project command
+if [ -d TestNewProject ]; then
+    rm -rf TestNewProject
+fi
 cat new-project-input.txt | haxelib run kiss new-project && (cd TestNewProject && sh test.sh)
 
+# Test kiss new-express-project command
+if [ -d testnewexpressproject ]; then
+    rm -rf testnewexpressproject
+fi
+cat new-express-project-input.txt | haxelib run kiss new-express-project && (cd testnewexpressproject && sh test.sh)
+
 # TODO test other kiss project templates

projects/kiss-express/template/.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .haxelib/
+libs/
 index.js

projects/kiss-express/template/src/template/Main.kiss

@@ -1,5 +1,6 @@
 (let [app (Express.call)
         port 3000]
     (app.get "/" ->[req res next] (res.send "Hello World!"))
-    (app.listen port ->(print "kiss-express listening at http://localhost:$port")))
+    (#unless test
+        (app.listen port ->(print "kiss-express listening at http://localhost:$port"))))
 

projects/kiss-express/template/test.sh

@@ -1,4 +1,7 @@
 #! /bin/bash
 
-npm install .
-haxe build.hxml
+if [ ! -d node_modules ]; then
+    $(haxelib libpath kiss)/build-scripts/dts2hx-externs/regenerate.sh
+fi
+
+haxe -D test build.hxml

projects/nat-globelet-playground/.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .haxelib/
-index.js
+libs/
+index.js

projects/nat-globelet-playground/package.json

@@ -10,8 +10,8 @@
 	"devDependencies": {
 		"dts2hx": "^0.19.0"
 	},
-	"version": "0.0.0",
 	"scripts": {
 		"postinstall": "dts2hx --all"
-	}
+	},
+	"version": "0.0.0"
 }

projects/nat-globelet-playground/test.sh

@@ -1,24 +1,7 @@
 #! /bin/bash
 
 if [ ! -d node_modules ]; then
-    npm install .
+    $(haxelib libpath kiss)/build-scripts/dts2hx-externs/regenerate.sh
 fi
-# npm install creates a .haxelib folder which needs to be pointed to the dependencies
-if [ ! -d .haxelib/kiss ]; then
-    cp .haxelib/express/.current .haxelib/express/.current.tmp
-    (cp ../../kiss/build-scripts/common-args.hxml ./ && haxelib install all --always && rm common-args.hxml)
-    # install all introduces an out-of-date express haxelib
-    mv .haxelib/express/.current.tmp .haxelib/express/.current
 
-    haxelib dev kiss ../../kiss
-    projects=$(ls ..)
-    for project in $projects
-    do
-        if [ -e ../${project}/haxelib.json ]
-        then
-            haxelib dev $project ../$project
-            # the word project has lost all meaning at this point
-        fi
-    done
-fi
 haxe -D test build.hxml