Attempt to rearrange repo, package.json etc to make this a 'real' npm…

… package
mcclure · Aug 24, 2016 · 31c25f3 · 31c25f3
1 parent 10f7ba1
commit 31c25f3
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 62 deletions.
diff --git a/Makefile b/Makefile
@@ -1,32 +1,39 @@
 # Start by running: npm install -g typescript typings && npm install
 
-all: install/app.js install/tsGlue.js install/index.html install/style.css
+all: bin/dts2nim.js
+
+# Clean
 
-# Clean.
 clean:
-	rm -f install/* src/tsGlue.nim tools/dts2nim.js
+	rm -f bin/* tests/test.js tests/tsGlue.js tests/tsGlue.nim tests/testMain.js
+
+# Build app
 
-install/tsGlue.js: src/tsGlue.ts
+bin/dts2nim.js: typings/index.d.ts src/dts2nim.ts
 	mkdir -p $(@D)
 	tsc
 
-install/app.js: src/app.nim src/tsGlue.nim
-	mkdir -p $(@D)
-	nim js -o:$@ $<
+typings/index.d.ts: typings.json
+	typings install
 
-install/index.html: static/index.html
-	mkdir -p $(@D)
-	cp $< $@
+# Tests
 
-install/style.css: static/style.css
+test: tests/test.js
+	node ./tests/test.js
+
+tests/test.js: tests/tsGlue.js tests/testMain.js
+	echo "#!/usr/bin/env node" > $@
+	cat tests/tsGlue.js >> $@
+	cat tests/testMain.js >> $@
+
+tests/tsGlue.js: tests/tsGlue.ts
 	mkdir -p $(@D)
-	cp $< $@
+	tsc -p $(@D)
 
-src/tsGlue.nim: src/tsGlue.ts install/tsGlue.js tools/dts2nim.js
-	node tools/dts2nim.js -q $< > $@
+tests/tsGlue.nim: tests/tsGlue.ts tests/tsGlue.js bin/dts2nim.js
+	node bin/dts2nim.js -q $< > $@
 
-tools/dts2nim.js: tools/typings/index.d.ts tools/dts2nim.ts
-	tsc -p tools
+tests/testMain.js: tests/testMain.nim tests/tsGlue.nim
+	mkdir -p $(@D)
+	nim js -o:$@ $<
 
-tools/typings/index.d.ts: tools/typings.json
-	cd tools && typings install
diff --git a/package.json b/package.json
@@ -4,5 +4,32 @@
     "commander.js-error": "^1.1.0",
     "graphlib": "^2.1.1",
     "typescript": "^1.8.10"
-  }
+  },
+  "name": "dts2nim",
+  "description": "Binding generator from TypeScript to the Nim programming language",
+  "version": "0.0.1",
+  "main": "bin/dts2nim.js",
+  "devDependencies": {},
+  "bin": {
+  	"dts2nim" : "bin/dts2nim.js"
+  },
+  "scripts": {
+    "prepublish": "make all",
+    "test": "make test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mcclure/dts2nim.git"
+  },
+  "keywords": [
+    "nim",
+    "typescript",
+    "binding"
+  ],
+  "author": "Andi McClure",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/mcclure/dts2nim/issues"
+  },
+  "homepage": "https://github.com/mcclure/dts2nim"
 }
diff --git a/tools/dts2nim.ts → src/dts2nim.ts b/tools/dts2nim.ts → src/dts2nim.ts
diff --git a/static/index.html b/static/index.html
diff --git a/static/style.css b/static/style.css
diff --git a/tests/index.html b/tests/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head><title>dts2nim test</title>
+</head>
+    <body>
+        This HTML file can be used to run the dts2nim <tt>make test</tt> script in a browser. Run <tt>make test</tt> to build the js files, then open this file in a browser and check the JavaScript console for errors.
+        <script src="tsGlue.js"></script>
+        <script src="testMain.js"></script>
+    </body>
+</html>
diff --git a/src/app.nim → tests/testMain.nim b/src/app.nim → tests/testMain.nim
@@ -1,5 +1,7 @@
 import tsGlue
 
+# Nim side of tests-- calls into functions defined in tsGlue.ts
+
 # POST
 
 var failed = false

diff --git a/src/tsGlue.ts → tests/tsGlue.ts b/src/tsGlue.ts → tests/tsGlue.ts
@@ -1,3 +1,5 @@
+// TypeScript side of tests-- defines functions called by testMain.nim
+
 function testAssert(condition: boolean, message:string) {
 	if (!condition)
 		throw new Error("Test failed: " + message)
@@ -98,8 +100,10 @@ let QFvarcallback : (x: number, y: (z: number) => number) => number
 
 QFvarcallback = (x, y) => y(x + 1) + 1
 
-// Ugly way to access global variable
-let QFbackflow = () : number => (<any>this).QBbackflow
+// This will allow QFbackflow through the type checker, but will not declare a variable
+declare var QBbackflow : number
+
+let QFbackflow = () : number => QBbackflow
 
 // A pattern lib.d.ts frequently follows.
 interface QCproto {

diff --git a/tools/tsconfig.json → tests/tsconfig.json b/tools/tsconfig.json → tests/tsconfig.json
@@ -4,7 +4,6 @@
     "outDir": "."
   },
   "files": [
-    "typings/index.d.ts",
-    "dts2nim.ts"
+    "tsGlue.ts"
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,9 +1,10 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "install"
+    "outDir": "bin"
   },
   "files": [
-    "src/tsGlue.ts"
+    "typings/index.d.ts",
+    "src/dts2nim.ts"
   ]
 }
diff --git a/tools/typings.json → typings.json b/tools/typings.json → typings.json