Merge pull request #138 from vidartf/es5

ES5 / ES6 clean up

Author: vidartf

js/.eslintrc.js

@@ -0,0 +1,27 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "commonjs": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-console": "off",
+        "no-unused-vars": "warn",
+    }
+};

js/package.json

@@ -11,18 +11,20 @@
   },
   "scripts": {
     "clean": "rimraf dist && rimraf ../pythreejs/static && node ./scripts/clean-generated-files.js",
-    "autogen-enums": "node ./scripts/generate-enums.js",
-    "autogen-shaders": "node ./scripts/generate-shader-utils.js",
-    "autogen-wrappers": "node ./scripts/generate-wrappers.js",
-    "autogen": "npm run autogen-shaders && npm run autogen-wrappers",
+    "autogen:enums": "node ./scripts/generate-enums.js",
+    "autogen:shaders": "node ./scripts/generate-shader-utils.js",
+    "autogen:wrappers": "node ./scripts/generate-wrappers.js",
+    "autogen": "npm run autogen:shaders && npm run autogen:wrappers",
     "build": "webpack && node ./scripts/copy-three.js",
     "prepublish": "npm run autogen && npm run build"
   },
   "devDependencies": {
+    "eslint": "^4.11.0",
     "fs-extra": "^4.0.1",
     "glob": "^7.0.6",
     "handlebars": "^4.0.5",
     "rimraf": "^2.4.1",
+    "underscore": "^1.8.3",
     "webpack": "^3.6.0"
   },
   "dependencies": {

js/scripts/.eslintrc.js

@@ -0,0 +1,27 @@
+module.exports = {
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "sourceType": "script"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": "off",
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-console": "off",
+        "no-unused-vars": "warn",
+    }
+};

js/scripts/clean-generated-files.js

@@ -1,13 +1,11 @@
-var path = require('path');
+'use strict';
 
-var Promise = require('bluebird');
-var Glob = require('glob').Glob;
-var fse = require('fs-extra');
+const path = require('path');
+const Glob = require('glob').Glob;
+const fse = require('fs-extra');
 
-Promise.promisifyAll(fse);
-
-var scriptDir = __dirname;
-var baseDir = path.resolve(scriptDir, '..');
+const scriptDir = __dirname;
+const baseDir = path.resolve(scriptDir, '..');
 
 // Execute a function for each match to a glob query
 //
@@ -20,10 +18,10 @@ var baseDir = path.resolve(scriptDir, '..');
 function mapPromiseFnOverGlob(globPattern, mapFn, globOptions) {
     return new Promise(function(resolve, reject) {
 
-        var promises = [];
+        let promises = [];
 
         // trailing slash will match only directories
-        var glob = new Glob(globPattern, globOptions)
+        new Glob(globPattern, globOptions)
             .on('match', function(match) {
                 var result = mapFn(match);
                 if (result instanceof Array) {
@@ -52,7 +50,7 @@ function rmFileGlobAsync(globPattern) {
     return mapPromiseFnOverGlob(globPattern, function(filePath) {
         console.log(filePath);
         var absPath = path.resolve(baseDir, filePath);
-        return fse.removeAsync(absPath);
+        return fse.remove(absPath);
     }, {
         cwd: baseDir,
         nodir: true,

js/scripts/copy-three.js

@@ -1,11 +1,13 @@
-var path = require('path');
-var fse = require('fs-extra');
+'use strict';
 
-var scriptDir = __dirname;
-var baseDir = path.resolve(scriptDir, '..');
+const path = require('path');
+const fse = require('fs-extra');
 
-var threeBuildDir = path.resolve(baseDir, 'node_modules', 'three', 'build');
-var staticDir = path.resolve(baseDir, '..', 'pythreejs', 'static');
+const scriptDir = __dirname;
+const baseDir = path.resolve(scriptDir, '..');
+
+const threeBuildDir = path.resolve(baseDir, 'node_modules', 'three', 'build');
+const staticDir = path.resolve(baseDir, '..', 'pythreejs', 'static');
 
 
 function copyThree() {

js/scripts/generate-class-config.js

@@ -1,54 +1,53 @@
-var path = require('path');
-var Promise = require('bluebird');
-var Glob = require('glob').Glob;
-var fse = require('fs-extra');
+'use strict';
+
+const path = require('path');
+const Glob = require('glob').Glob;
+const fse = require('fs-extra');
 
 Promise.promisifyAll(fse);
 
-var scriptDir = __dirname;
-var baseDir = path.resolve(scriptDir, '..');
+const scriptDir = __dirname;
+const baseDir = path.resolve(scriptDir, '..');
 
-var jsSrcDir = path.resolve(baseDir, 'src/');
-var pySrcDir = path.resolve(baseDir, '..', 'pythreejs');
+const threeSrcDir = path.resolve(baseDir, 'node_modules', 'three', 'src');
 
-var threeSrcDir = path.resolve(baseDir, 'node_modules', 'three', 'src');
+const outPath = path.resolve(scriptDir, 'three-class-config.js');
 
-var outPath = path.resolve(scriptDir, 'three-class-config.js');
 
 function generateClassConfig() {
 
     return new Promise(function(resolve, reject) {
 
-        var lines = [
-            "//",
-            "// base version of this file auto-generated by " + path.basename(__filename),
-            "// date: " + new Date(),
-            "//",
-            "",
-            "module.exports = {",
-            "    _defaults: require('./three-class-config-defaults'),",
-            "",
+        let lines = [
+            '//',
+            '// base version of this file auto-generated by ' + path.basename(__filename),
+            '// date: ' + new Date(),
+            '//',
+            '',
+            'module.exports = {',
+            '    _defaults: require(\'./three-class-config-defaults\'),',
+            '',
         ];
 
-        var glob = new Glob('**/*.js', { cwd: threeSrcDir, nodir: true, })
+        new Glob('**/*.js', { cwd: threeSrcDir, nodir: true, })
             .on('match', function(match) {
 
-                var classDir = path.dirname(match);
-                var className = path.basename(match, '.js');
+                const classDir = path.dirname(match);
+                const className = path.basename(match, '.js');
 
                 lines = lines.concat([
-                    "    " + className.replace(/\./g, '_') + ": {",
-                    "        relativePath: './" + path.join(classDir, className) + "',",
+                    '    ' + className.replace(/\./g, '_') + ': {',
+                    '        relativePath: \'./' + path.join(classDir, className) + '\',',
                     // "        superClass: 'ThreeModel',",
                     // "        properties: {},",
                     // "        constructorArgs: [],",
-                    "    },",
+                    '    },',
                 ]);
 
             })
             .on('end', function() {
 
-                lines.push("};", "");
+                lines.push('};', '');
 
                 // write result to file
                 fse.outputFileAsync(outPath, lines.join('\n')).then(resolve);

js/scripts/generate-enums.js

@@ -1,12 +1,9 @@
-var _ = require('underscore');
-var path = require('path');
-var fs = require('fs');
-var fse = require('fs-extra');
-var Promise = require('bluebird');
-var Handlebars = require('handlebars');
+'use strict';
 
-Promise.promisifyAll(fs);
-Promise.promisifyAll(fse);
+const _ = require('underscore');
+const path = require('path');
+const fse = require('fs-extra');
+const Handlebars = require('handlebars');
 
 const enumConfigs = require('./three-enum-config');
 
@@ -27,8 +24,9 @@ const pyEnumDst = path.resolve(pySrcDir, 'enums.py');
 //
 
 function parseThreeConstants() {
-    var content = fs.readFileSync(path.resolve(threeSrcDir, 'constants.js'), 'utf-8');
-    eval('var result = new function() {\n' + content.replace(/export var (.*?);/g, 'var $1;\nthis.$1;') + '}()');
+    var content = fse.readFileSync(path.resolve(threeSrcDir, 'constants.js'), 'utf-8');
+    var result;
+    eval('result = new function() {\n' + content.replace(/export var (.*?);/g, 'var $1;\nthis.$1;') + '}()');
     return result;
 }
 
@@ -40,9 +38,9 @@ const threeEnums = parseThreeConstants();
 //
 
 function compileTemplate(templateName) {
-    var templateName = path.basename(templateName, '.mustache');
-    var templatePath = path.resolve(templateDir, templateName + '.mustache');
-    return Handlebars.compile(fs.readFileSync(templatePath, {
+    templateName = path.basename(templateName, '.mustache');
+    const templatePath = path.resolve(templateDir, templateName + '.mustache');
+    return Handlebars.compile(fse.readFileSync(templatePath, {
         encoding: 'utf-8'
     }));
 }
@@ -56,13 +54,13 @@ var pyEnumTemplate = compileTemplate('py_enums');
 //
 
 function checkUnused() {
-    return new Promise(function(resolve, reject) {
+    return new Promise(() => {
         var unusedThreeEnums = _.keys(threeEnums);
 
         _.keys(enumConfigs).map(function(category) {
-            values = enumConfigs[category];
+            const values = enumConfigs[category];
             values.forEach(function(enumKey) {
-                 if (Array.isArray(enumKey)) {
+                if (Array.isArray(enumKey)) {
                     // Several keys share the same value, remove all.
                     enumKey.forEach(function(subKey) {
                         unusedThreeEnums.splice(unusedThreeEnums.indexOf(subKey), 1);
@@ -89,7 +87,7 @@ function writeJavascriptFile() {
 
     var categories = [];
 
-    _.keys(enumConfigs).map(function(category) {
+    _.keys(enumConfigs).map(category => {
         var categoryObj = {key: category, enums: []};
         categories.push(categoryObj);
         enumConfigs[category].forEach(function(enumKey) {
@@ -108,11 +106,11 @@ function writeJavascriptFile() {
         categories: categories
     });
 
-    return fse.outputFileAsync(jsEnumDst, content);
+    return fse.outputFile(jsEnumDst, content);
 }
 
 function createJavascriptFiles() {
-    return new Promise(function(resolve, reject) {
+    return new Promise(function(resolve) {
         resolve(writeJavascriptFile());
     });
 }
@@ -143,11 +141,11 @@ function writePythonFile() {
         categories: categories,
     });
 
-    return fse.outputFileAsync(pyEnumDst, content);
+    return fse.outputFile(pyEnumDst, content);
 }
 
 function createPythonFiles() {
-    return new Promise(function(resolve, reject) {
+    return new Promise(function(resolve) {
         resolve(writePythonFile());
     });
 }
@@ -166,4 +164,4 @@ if (require.main === module) {
     generateFiles().then(function() {
         console.log('DONE');
     });
-}
+}

js/scripts/generate-shader-utils.js

@@ -1,12 +1,8 @@
-var _ = require('underscore');
-var path = require('path');
-var fs = require('fs');
-var fse = require('fs-extra');
-var Promise = require('bluebird');
-var Handlebars = require('handlebars');
+'use strict';
 
-Promise.promisifyAll(fs);
-Promise.promisifyAll(fse);
+const path = require('path');
+const fse = require('fs-extra');
+const Handlebars = require('handlebars');
 
 var shaderUtilsConfig = require('./three-shader-utils-config');
 
@@ -29,17 +25,15 @@ var THREE = require('three');
 //
 
 function compileTemplate(templateName) {
-    var templateName = path.basename(templateName, '.mustache');
+    templateName = path.basename(templateName, '.mustache');
     var templatePath = path.resolve(templateDir, templateName + '.mustache');
-    return Handlebars.compile(fs.readFileSync(templatePath, {
+    return Handlebars.compile(fse.readFileSync(templatePath, {
         encoding: 'utf-8'
     }));
 }
 
 var pyWrapperTemplate = compileTemplate('py_shader_utils');
 
-var pathSep = /\\|\//;
-
 
 //
 // Helper functions
@@ -67,7 +61,7 @@ function createPythonWrapper(name, relativePath) {
     var data = THREE[name];
 
     var jsonPath = path.resolve(pySrcDir, relativePath + JSON_AUTOGEN_EXT);
-    var promises = [fse.outputFileAsync(jsonPath, JSON.stringify(data, null, 4))];
+    var promises = [fse.outputFile(jsonPath, JSON.stringify(data, null, 4))];
 
     var pyPath = path.resolve(pySrcDir, relativePath + '_' + AUTOGEN_EXT + '.py');
     var output = pyWrapperTemplate({
@@ -77,22 +71,22 @@ function createPythonWrapper(name, relativePath) {
         now: new Date(),
         generatorScriptName: path.basename(__filename),
     });
-    promises.push(fse.outputFileAsync(pyPath, output))
+    promises.push(fse.outputFile(pyPath, output));
     return Promise.all(promises);
 }
 
 function createPythonModuleInitFile(modulePath) {
 
     var dirname = path.dirname(modulePath);
     var pyInitFilePath = path.resolve(pySrcDir, dirname, '__init__.py');
-    return fse.ensureFileAsync(pyInitFilePath);
+    return fse.ensureFile(pyInitFilePath);
 
 }
 
 function createPythonFiles() {
 
     // Prevent python file generation when outside dir (e.g. npm install in dependent)
-    if (!fs.existsSync(pySrcDir)) {
+    if (!fse.existsSync(pySrcDir)) {
         return Promise.resolve();
     }