Everything but a small language bug now

package.json

@@ -21,14 +21,14 @@
   "main": "dist/jssm.es5.cjs.js",
   "scripts": {
     "test": "npm run make && nyc ava src/js/tests/*.js -v",
-    "removedir": "rm -rf build && rm -rf dist && rm -rf docs && sleep 1",
-    "createdir": "mkdir build && sleep 1 && mkdir dist && sleep 1 && mkdir docs",
+    "removedir": "rm -rf build && rm -rf dist && rm -rf docs",
+    "createdir": "mkdir build && mkdir dist && mkdir docs",
     "clean": "npm run removedir && rm -f src/js/jssm-dot.js && npm run createdir",
     "babel": "babel src/js -d build/",
-    "setver": "node ./set_version.js",
     "rename": "node -e \"require('fs').renameSync('./build/jssm.js', './build/jssm.es5.js');\"",
     "pack": "browserify -r ./build/jssm.es5.js:jssm -o build/jssm.es5.cjs.js",
-    "make": "npm run clean && npm run peg && npm run babel && npm run rename && npm run setver && npm run pack",
+    "wasmake": "npm run clean && npm run peg && npm run babel && npm run rename && npm run setver && npm run pack",
+    "make": "npm run clean && npm run peg && npm run ts",
     "peg": "rm -f src/js/jssm-dot.js && pegjs src/js/jssm-dot.peg && cp src/js/jssm-dot.js build/",
     "eslint": "eslint src/js/jssm.js src/js/jssm-types.js src/js/tests/*.js",
     "nyc-html": "nyc report --reporter=html",

rollup.config.js

@@ -4,6 +4,8 @@ import commonjs    from 'rollup-plugin-commonjs';
 import typescript  from 'rollup-plugin-typescript2';
 import replace     from 'rollup-plugin-replace';
 
+const pkg = require('./package.json');
+
 
 
 
@@ -33,7 +35,8 @@ const es6config = {
     typescript(),
 
     replace({
-      'process.env.NODE_ENV': JSON.stringify( 'production' )
+      'var version = null'   : 'var version = \'' + pkg.version + '\'',
+      'process.env.NODE_ENV' : JSON.stringify( 'production' )
     })
 
   ]
@@ -49,7 +52,7 @@ const cjsconfig = {
   input     : 'src/js/jssm.ts',
 
   output    : {
-    file      : 'build/jssm.cjs.js',
+    file      : 'build/jssm.es5.cjs.js',
     format    : 'cjs',
     name      : 'jssm',
     sourcemap : true,
@@ -69,6 +72,7 @@ const cjsconfig = {
     typescript(),
 
     replace({
+      'var version = null'   : 'var version = \'' + pkg.version + '\'',
       'process.env.NODE_ENV': JSON.stringify( 'production' )
     })
 
@@ -105,6 +109,7 @@ const iifeconfig = {
     typescript(),
 
     replace({
+      'var version = null'   : 'var version = \'' + pkg.version + '\'',
       'process.env.NODE_ENV': JSON.stringify( 'production' )
     })
 

src/js/tests/array_transitions.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/arrow unicode.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/arrow.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/comment.js

@@ -3,7 +3,7 @@
 
 import {test, describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/compile.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/cycles.js

@@ -3,7 +3,7 @@
 
 import {test, describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/forced transitions.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/general.js

@@ -3,7 +3,7 @@
 
 import {test, describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/graph node lists.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/histo.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/language.js

@@ -3,13 +3,9 @@
 
 import {describe} from 'ava-spec';
 
-const glob = require('glob');
+const glob           = require('glob');
 
-
-
-
-
-const jssm           = require('../../../build/jssm.es5.js'),
+const jssm           = require('../../../build/jssm.es5.cjs.js'),
       sm             = jssm.sm,
 
       language_files = glob.sync('./src/js/tests/language_data/*.json', {})  // for some reason glob is project-relative

src/js/tests/layout.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/machine_attributes.js

@@ -1,14 +1,21 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm,
       r639 = require('reduce-to-639-1').reduce;
 
 
 
 
 
+describe(`r639 e`, async it => it('should be en', t => t.is('en', r639('EnglISh'))));
+describe(`r639 a`, async it => it('should be am', t => t.is('am', r639('አማርኛ'))));
+
+
+
+
+
 
 describe('machine_name', async it => {
 
@@ -30,7 +37,7 @@ describe('machine_language', async it => {
     it(`${name} doesn't throw`, t =>
        t.notThrows(() => { const _foo = sm`machine_language: ${lang}; a->b;`; }) );
 
-    it(`${name} correct`, t =>
+    it(`${name} machine_language is correct`, t =>
        t.is(r639(lang), sm`machine_language: ${lang}; a->b;`.machine_language() ) );
 
   };

src/js/tests/machine_name.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/named lists.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/nominated states.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm,
       jp   = jssm.parse;
 

src/js/tests/parse actions.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/parse.js

@@ -3,7 +3,7 @@
 
 import {test, describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/sample_select.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/seq.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/sm_tag.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/state_declaration.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js'),
+const jssm = require('../../../build/jssm.es5.cjs.js'),
       sm   = jssm.sm;
 
 

src/js/tests/stop light.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/stripes.js

@@ -3,7 +3,7 @@
 
 import {test, describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/weighted_histo_key.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/weighted_rand_select.js

@@ -3,7 +3,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');
 
 
 

src/js/tests/weighted_sample_select.js

@@ -1,7 +1,7 @@
 
 import {describe} from 'ava-spec';
 
-const jssm = require('../../../build/jssm.es5.js');
+const jssm = require('../../../build/jssm.es5.cjs.js');