Switch to esbuild

avindra · avindra · commit c52547a71243 · 2020-10-27T14:31:19.000-04:00
* Removed webpack and babel from project
 * Bump Tensorflow.js -&gt; 2
 * Bump Typescript -&gt; 4
 * use ts-node for several TS related concerns
 * new dev script built on browser-sync as
   esbuild does not have a native watch/serve
   mode
 * enable type=module for native es in Node
 * use top-level await in some scripts
diff --git a/.babelrc b/.babelrc
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -11,5 +11,6 @@ env:
   - CMD=tsc
   - CMD=test
   - CMD=build
+  - CMD=tsc
 
 script: npm run $CMD
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ There is experimental sound: unplug your headphones to rip beeps over your speak
 
 ## Development
 
-```bash
-yarn dev
-```
+ * Node.js 15 or higher
+
+`yarn install && yarn dev` to get a watch/recompile server, otherwise just use the build script.
 
 Unit tests are co-located with the code.
 
diff --git a/bin/dev b/bin/dev
diff --git a/bin/dev.js b/bin/dev.js
@@ -0,0 +1,12 @@
+import {exec} from 'child_process';
+import Brah from "browser-sync";
+
+// Start the server
+const driver = Brah({server: "./dist"});
+driver.watch('src/**').on('change', (file) => {
+  console.log('Source file changed', file);
+  exec('yarn build', (err, stdout, stderr) => {
+    console.log('[esbuild]', stdout);
+    driver.reload();
+  });
+});
diff --git a/bin/tsnode b/bin/tsnode
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#
+# ts-node fell apart with recent node
+# releases
+#
+# workaround applied courtesy of:
+#
+# https://github.com/TypeStrong/ts-node/issues/935#issuecomment-582673034
+#
+
+
+node --loader @k-foss/ts-esnode --experimental-specifier-resolution=node $@
diff --git a/index.html b/index.html
@@ -17,6 +17,6 @@
     <body>
         <div id="dev"></div>
         <canvas id="game" />
-        <script src="http://localhost:8080/app.js"></script>
+        <script src="/index.js"></script>
     </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,40 +1,36 @@
 {
   "name": "snake",
   "version": "0.0.2",
-  "description": "A game of snake for the browser using web technologies.",
-  "main": "index.js",
+  "description": "A game of snake using JavaScript",
+  "main": "src/index.ts",
+  "type": "module",
   "scripts": {
-    "build": "webpack -p && mv dist/app.js dist/app_new.js",
-    "dev": "NODE_ENV=development node bin/dev",
-    "sim": "babel-node --extensions '.ts,.js'  src/sim.ts",
-    "train": "babel-node --extensions '.ts,.js'  src/net/train.js",
-    "test-model": "babel-node --extensions '.ts,.js'  src/net/check_model.js",
+    "build": "esbuild --bundle src/index.ts --outdir=dist --minify && cp index.html dist",
+    "build:tfjs": "npm rebuild @tensorflow/tfjs-node-gpu --build-from-source",
+    "dev": "node bin/dev.js",
+    "sim": "bin/tsnode src/net/sim.ts",
+    "train": "bin/tsnode src/net/train.js",
+    "test-model": "node src/net/check_model.js",
     "tsc": "tsc",
-    "test": "mocha --require ./register-tests.js src/**/*.spec.ts"
+    "test": "mocha --require ts-node/register src/**/*.spec.ts"
   },
-  "keywords": [ "snake",
+  "keywords": [
+    "snake",
     "js",
     "game"
   ],
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/node": "^7.7.7",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/preset-typescript": "^7.0.0",
-    "@babel/register": "^7.6.0",
-    "@tensorflow/tfjs": "^1.5.1",
-    "@tensorflow/tfjs-node": "^1.5.1",
-    "@tensorflow/tfjs-node-gpu": "^1.5.1",
-    "@types/jasmine": "^3.5.0",
-    "@types/mocha": "^5.2.7",
-    "babel-loader": "^8.0.6",
-    "expect": "^24.9.0",
-    "mocha": "^6.0.0",
-    "typescript": "^3.7.5",
-    "webpack": "^4.16.3",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-server": "^3.1.5"
+    "@k-foss/ts-esnode": "^1.7.0",
+    "@tensorflow/tfjs": "^2.6.0",
+    "@tensorflow/tfjs-node": "^2.6.0",
+    "@tensorflow/tfjs-node-gpu": "^2.6.0",
+    "@types/mocha": "^8.0.0",
+    "browser-sync": "^2.26.13",
+    "esbuild": "^0.7.21",
+    "expect": "^26.6.1",
+    "mocha": "^8.2.0",
+    "typescript": "^4.0.3"
   },
   "author": "Avindra Goolcharan",
   "license": "MIT",
diff --git a/register-tests.js b/register-tests.js
diff --git a/src/net/README.md b/src/net/README.md
@@ -1,6 +1,10 @@
 
 ## Common errors / workflow stuff
 
+```sh
+yarn build:tfjs
+```
+
 Problem: Binding errors from tensorflow
 
 Solution: rebuild the package
diff --git a/src/net/check_model.js b/src/net/check_model.js
@@ -1,8 +1,6 @@
 import * as  tf from '@tensorflow/tfjs-node-gpu';
 
-(async() => {
-  const model = await tf.loadLayersModel('file:///dev/shm/brain/model.json');
-  model.loadWeights()
+const model = await tf.loadLayersModel('file:///dev/shm/brain/model.json');
+model.loadWeights()
 
-  console.log('prediction', model.predict(tf.tensor([ Array(400) ])));
-})();
+console.log('prediction', model.predict(tf.tensor([ Array(400) ])));
diff --git a/src/net/sim.ts b/src/net/sim.ts
@@ -38,6 +38,6 @@ const playGame = async function() {
 
 };
 
-if (require.main === module) {
+if (process.env.NODE) {
   playGame();
 }
diff --git a/src/net/train.js b/src/net/train.js
@@ -1,39 +1,37 @@
-import {createModel} from './model';
-import * as  tf from '@tensorflow/tfjs-node-gpu';
-import {createWorld} from './../world';
-import {worldToVector} from './worldToVector';
+import * as tf from '@tensorflow/tfjs-node-gpu';
+
+import {createModel} from './model.js';
+import {createWorld} from './../world.ts';
+import {worldToVector} from './worldToVector.ts';
 
 const width = 20;
 const height = 20;
 
 const inputVectorSize = width * height;
 const model = createModel(inputVectorSize);
 
-(async () => {
-  const world = createWorld(width, height);
-  const vector = worldToVector(world);
-
-  console.log('world vector', vector.length, vector);
-  // Generate some synthetic data for training.
-  const gameData = tf.tensor([vector] );
-  const resultantAction = tf.tensor([ [0,1,2,3,4] ]);
+const world = createWorld(width, height);
+const vector = worldToVector(world);
 
-  // Train the model using the data.
-  const history = await model.fit(gameData, resultantAction, {
-    verbose: 2,
-    epochs: 20,
-    callbacks: tf.node.tensorBoard('/dev/shm/snake_tf_logs'),
-  });
-  console.log(history.validationData)
+console.log('world vector', vector.length, vector);
+// Generate some synthetic data for training.
+const gameData = tf.tensor([vector] );
+const resultantAction = tf.tensor([ [0,1,2,3,4] ]);
 
-  const result = await model.save("file:///dev/shm/brain");
-  if(result.errors) {
-    console.log("error while saving model", result.errors);
-  }
+// Train the model using the data.
+const history = await model.fit(gameData, resultantAction, {
+  verbose: 2,
+  epochs: 20,
+  callbacks: tf.node.tensorBoard('/dev/shm/snake_tf_logs'),
+});
+console.log(history.validationData)
 
-  console.log('prediction', model.predict(gameData));
+const result = await model.save("file:///dev/shm/brain");
+if(result.errors) {
+  console.log("error while saving model", result.errors);
+}
 
-})();
+console.log('prediction', model.predict(gameData));
 
 /**
  * Using the model
diff --git a/src/point.ts b/src/point.ts
@@ -6,7 +6,7 @@ export default class Point {
     this.move(x, y);
   }
 
-  move(x, y) {
+  move(x: number, y: number) {
     this.x = x;
     this.y = y;
   }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
     "compilerOptions": {
-        "module": "es2015"
+        "module": "ESNext"
     },
     "exclude": [
-	"**/*.spec.ts"
+        "**/*.spec.ts"
     ]
-}
+}
diff --git a/webpack.config.js b/webpack.config.js
