Decaffeinate the codebase back to ES2015 natively

aichaos · Jun 14, 2018 · 303e466 · 303e466 · julien-c · Jun 15, 2018
1 parent 7ef6d0e
commit 303e466
Show file tree

Hide file tree

Showing 49 changed files with 6,281 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ lib.es6/
 dist/
 node_modules/
 .idea/
-test/*.js
+test.babel/
 
 #OS X
 .DS_Store
diff --git a/Makefile b/Makefile
@@ -0,0 +1,36 @@
+SHELL := /bin/bash
+
+BUILD=$(shell git describe --always)
+CURDIR=$(shell pwd)
+
+# `make setup` to set up a new environment, pull dependencies, etc.
+.PHONY: setup
+setup: clean
+	npm install
+	npm install -g babel-cli webpack uglify-js nodeunit
+
+# `make run` to run it in debug mode.
+.PHONY: run
+run:
+	node shell.js eg/brain
+
+# `make test` to run unit tests.
+.PHONY: test
+test:
+	nodeunit test
+
+# `make build` to build code with Babel for older JS clients.
+.PHONY: build
+build:
+	npm run build
+	npm run test
+
+# `make dist` to create a distribution for npm.
+.PHONY: dist
+dist: build
+	npm run dist
+
+# `make clean` cleans everything up.
+.PHONY: clean
+clean:
+	npm run clean
diff --git a/README.md b/README.md
@@ -180,19 +180,29 @@ may work right now, a future update will probably rigidly enforce this).
 
 I use npm run scripts to handle various build tasks.
 
-* `npm run build` - Compiles the CoffeeScript in the `src/` folder into
-  ES2015+ JavaScript in the `lib/` folder.
-* `npm run lint` - Runs `coffeelint` on the source.
-* `npm run test` - Builds RiveScript, compiles the CoffeeScript unit test files,
-  and runs them with `nodeunit`
-* `npm run dist` - Produces a full distributable build. CoffeeScript is compiled,
-  Babel translates it to ES5-compatible code, and webpack/uglify is applied.
-* `npm run webpack` - Runs Babel to take the ES2015+ code in `lib/` and output
-  ES5-compatible code in `lib.babel/`, and then runs `webpack` to create
-  `dist/rivescript.js`
+* `npm run build` - Compiles the ES2015+ sources from `src/` with Babel and
+  outputs them into `lib/`
+* `npm run test` - Builds the source with Babel per above, builds the ES2015+
+  test scripts in `test/` and outputs them into `test.babel/` and then runs
+  `nodeunit` on it.
+* `npm run dist` - Produces a full distributable build. Source is built with
+  Babel and then handed off to webpack and uglify for browser builds.
+* `npm run webpack` - Creates `dist/rivescript.js` from the ES2015+ sources
+  directly from `src/` (using `babel-loader`). This command is independent from
+  `npm run build` and could be run without leaving any ES5 code sitting around.
 * `npm run uglify` - Minifies `dist/rivescript.js` to `dist/rivescript.min.js`
 * `npm run clean` - Clean up all the build files.
 
+If your local Node version is >= 7 (supports Async/Await), you can run the
+ES2015+ sources directly without needing to run any npm scripts. For that
+purpose, I have a Makefile.
+
+* `make setup` - sets up the dev environment, installs dependencies, etc.
+* `make run` - runs `shell.js` pointed at the example brain. This script runs
+  natively on the ES2015+ sources, no build steps needed.
+* `make test` - runs `nodeunit` on the ES2015+ test sources directly without
+  building them as `npm run test` would.
+
 ## GRUNT SERVER
 
 This project uses [Grunt](http://gruntjs.com) for compiling to minified JS and

diff --git a/shell.coffee → coffee/shell.coffee b/shell.coffee → coffee/shell.coffee
diff --git a/src/brain.coffee → coffee/src/brain.coffee b/src/brain.coffee → coffee/src/brain.coffee
diff --git a/src/inheritance.coffee → coffee/src/inheritance.coffee b/src/inheritance.coffee → coffee/src/inheritance.coffee
diff --git a/src/lang/coffee.coffee → coffee/src/lang/coffee.coffee b/src/lang/coffee.coffee → coffee/src/lang/coffee.coffee
diff --git a/src/lang/javascript.coffee → coffee/src/lang/javascript.coffee b/src/lang/javascript.coffee → coffee/src/lang/javascript.coffee
diff --git a/src/parser.coffee → coffee/src/parser.coffee b/src/parser.coffee → coffee/src/parser.coffee
diff --git a/src/rivescript.coffee → coffee/src/rivescript.coffee b/src/rivescript.coffee → coffee/src/rivescript.coffee
diff --git a/src/sorting.coffee → coffee/src/sorting.coffee b/src/sorting.coffee → coffee/src/sorting.coffee
diff --git a/src/utils.coffee → coffee/src/utils.coffee b/src/utils.coffee → coffee/src/utils.coffee
diff --git a/test/test-base.coffee → coffee/test/test-base.coffee b/test/test-base.coffee → coffee/test/test-base.coffee
diff --git a/test/test-begin.coffee → coffee/test/test-begin.coffee b/test/test-begin.coffee → coffee/test/test-begin.coffee
diff --git a/test/test-bot-variables.coffee → coffee/test/test-bot-variables.coffee b/test/test-bot-variables.coffee → coffee/test/test-bot-variables.coffee
diff --git a/test/test-math.coffee → coffee/test/test-math.coffee b/test/test-math.coffee → coffee/test/test-math.coffee
diff --git a/test/test-objects.coffee → coffee/test/test-objects.coffee b/test/test-objects.coffee → coffee/test/test-objects.coffee
diff --git a/test/test-options.coffee → coffee/test/test-options.coffee b/test/test-options.coffee → coffee/test/test-options.coffee
diff --git a/test/test-replies.coffee → coffee/test/test-replies.coffee b/test/test-replies.coffee → coffee/test/test-replies.coffee
diff --git a/test/test-rivescript.coffee → coffee/test/test-rivescript.coffee b/test/test-rivescript.coffee → coffee/test/test-rivescript.coffee
diff --git a/test/test-substitutions.coffee → coffee/test/test-substitutions.coffee b/test/test-substitutions.coffee → coffee/test/test-substitutions.coffee
diff --git a/test/test-topics.coffee → coffee/test/test-topics.coffee b/test/test-topics.coffee → coffee/test/test-topics.coffee
diff --git a/test/test-triggers.coffee → coffee/test/test-triggers.coffee b/test/test-triggers.coffee → coffee/test/test-triggers.coffee
diff --git a/test/test-unicode.coffee → coffee/test/test-unicode.coffee b/test/test-unicode.coffee → coffee/test/test-unicode.coffee
diff --git a/eg/web-client/chat.html b/eg/web-client/chat.html
@@ -6,7 +6,7 @@
 <link rel="stylesheet" type="text/css" href="chat.css">
 <script type="text/javascript" src="jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="datadumper.js"></script>
-<script type="text/javascript" src="../lib/rivescript.js"></script>
+<script type="text/javascript" src="../../dist/rivescript.js"></script>
 </head>
 <body>
 
@@ -65,22 +65,23 @@ <h1>Chat</h1>
 
 // Load our files from the brain/ folder.
 rs.loadFile([
-	"brain/begin.rive",
-	"brain/admin.rive",
-	"brain/clients.rive",
-	"brain/eliza.rive",
-	"brain/myself.rive",
-	"brain/rpg.rive",
-	"brain/javascript.rive"
+	"../brain/begin.rive",
+	"../brain/admin.rive",
+	"../brain/clients.rive",
+	"../brain/eliza.rive",
+	"../brain/myself.rive",
+	"../brain/rpg.rive",
+	"../brain/javascript.rive"
 	], on_load_success, on_load_error);
 
-// You can register objects that can then be called 
+// You can register objects that can then be called
 // using <call></call> syntax
 rs.setSubroutine('fancyJSObject', function(rs, args){
 	// doing complex stuff here
 });
 
 function on_load_success () {
+	$("#dialogue").append("<div><span class='bot'>Bot:</span> Welcome, this is RiveScript.js v" + rs.version() + ", ready to chat!");
 	$("#message").removeAttr("disabled");
 	$("#message").attr("placeholder", "Send message");
 	$("#message").focus();
@@ -90,23 +91,23 @@ <h1>Chat</h1>
 }
 
 function on_load_error (err) {
-	console.log("Loading error: " + err);
+	window.alert("Loading error: " + err);
 }
 
 // Handle sending a message to the bot.
 function sendMessage () {
 	var text = $("#message").val();
 	$("#message").val("");
 	$("#dialogue").append("<div><span class='user'>You:</span> " + text + "</div>");
-	try {
-	var reply = rs.reply("soandso", text);
-	reply = reply.replace(/\n/g, "<br>");
-	$("#dialogue").append("<div><span class='bot'>Bot:</span> " + reply + "</div>");
-	$("#dialogue").animate({ scrollTop: $("#dialogue").height() }, 1000);
-	} catch(e) {
+
+	rs.reply("soandso", text, this).then(function(reply) {
+		reply = reply.replace(/\n/g, "<br>");
+		$("#dialogue").append("<div><span class='bot'>Bot:</span> " + reply + "</div>");
+		$("#dialogue").animate({ scrollTop: $("#dialogue").height() }, 1000);
+	}).catch(function(e) {
 		window.alert(e.message + "\n" + e.line);
 		console.log(e);
-	}
+	});
 
 	return false;
 }