ran prettier over whole js codebase

Author: walterhiggins

src/main/js/.prettierrc renamed to src/.prettierrc

@@ -2,26 +2,24 @@
 /*
  This script is run at build time to generate api.md - a single Markdown document containing documentation for ScriptCraft's API
  */
-function foreach(array, func){
-  for (var i =0; i < array.length; i++){
-    func(array[i],i,array);
+function foreach(array, func) {
+  for (var i = 0; i < array.length; i++) {
+    func(array[i], i, array);
   }
 }
 /*
  find - a (very) basic implementation of the unix command line tool.
  */
-function find(dir,store,re) {
+function find(dir, store, re) {
   var files = dir.listFiles();
-  foreach (files, function(filename){
+  foreach(files, function(filename) {
     filename = '' + filename;
     var file = new File(filename);
     if (file.isDirectory()) {
-      find(file,store,re);
+      find(file, store, re);
     } else {
-      if (typeof re == 'undefined') 
-        store.push(filename);
-      else if (filename.match(re)) 
-        store.push(filename);
+      if (typeof re == 'undefined') store.push(filename);
+      else if (filename.match(re)) store.push(filename);
     }
   });
 }
@@ -30,56 +28,50 @@ function find(dir,store,re) {
  (assuming the main module is in a file with the same name as the parent 
  directory) - e.g. drone/drone.js 
  */
-function sorter( precedence ){
-  return function(a,b)
-  {
+function sorter(precedence) {
+  return function(a, b) {
     // convert from Java string to JS string
-    a = '' + a; 
+    a = '' + a;
     b = '' + b;
     var aparts = a.split(/\//);
     var bparts = b.split(/\//);
-    var adir = aparts.slice(3,aparts.length-1).join('/');
-    var afile = aparts[aparts.length-1];
-    var bdir = bparts.slice(3,bparts.length-1).join('/');
-    var bfile = bparts[bparts.length-1];
+    var adir = aparts.slice(3, aparts.length - 1).join('/');
+    var afile = aparts[aparts.length - 1];
+    var bdir = bparts.slice(3, bparts.length - 1).join('/');
+    var bfile = bparts[bparts.length - 1];
 
-    for (var i = 0;i < precedence.length; i++){
+    for (var i = 0; i < precedence.length; i++) {
       var re = precedence[i];
-      if (a.match(re) && b.match(re)){
-        if (afile < bfile)
-          return -1;
-        if (afile > bfile)
-          return 1;
+      if (a.match(re) && b.match(re)) {
+        if (afile < bfile) return -1;
+        if (afile > bfile) return 1;
       }
-      if (a.match(re))
-        return -1;
-      if (b.match(re))
-        return 1;
+      if (a.match(re)) return -1;
+      if (b.match(re)) return 1;
     }
-    if(adir<bdir) return -1;
-    if(adir>bdir) return 1;
-    afile = afile.replace(/\.js$/,'');
-    if (afile == adir){
+    if (adir < bdir) return -1;
+    if (adir > bdir) return 1;
+    afile = afile.replace(/\.js$/, '');
+    if (afile == adir) {
       return -1;
-    }
-    else {
+    } else {
       var result = 0;
-      if (afile < bfile){
-        result =  -1;
+      if (afile < bfile) {
+        result = -1;
       }
-      if (afile > bfile){
+      if (afile > bfile) {
         result = 1;
       }
       //err.println("afile: " + afile + ", bfile:" + bfile + ",result=" + result);
-      
+
       return result;
     }
   };
 }
 var err = java.lang.System.err;
-args = Array.prototype.slice.call(args,1);
+args = Array.prototype.slice.call(args, 1);
 
-if (typeof importPackage == 'undefined'){
+if (typeof importPackage == 'undefined') {
   // load compatibility script
   load('nashorn:mozilla_compat.js');
 }
@@ -88,28 +80,30 @@ var dir = args[0];
 var io = Packages.java.io;
 var File = io.File;
 var store = [];
-find(new io.File(dir),store,/\/[a-zA-Z0-9_\-]+\.js$/);
+find(new io.File(dir), store, /\/[a-zA-Z0-9_\-]+\.js$/);
 
-store.sort(sorter([ 
-  /lib\/scriptcraft\.js$/, 
-  /lib\/require\.js$/,
-  /lib\/plugin\.js$/,
-  /lib\/events\.js$/,
-  /lib\/events\-helper\-canary/,
-  /lib\/events\-helper\-bukkit/,
-  /lib\//, 
-  /modules\/drone\/index\.js/, 
-  /modules\/drone\//,
-  /plugins\/drone\//,
-  /modules\//,
-  /examples\//
-]));
+store.sort(
+  sorter([
+    /lib\/scriptcraft\.js$/,
+    /lib\/require\.js$/,
+    /lib\/plugin\.js$/,
+    /lib\/events\.js$/,
+    /lib\/events\-helper\-canary/,
+    /lib\/events\-helper\-bukkit/,
+    /lib\//,
+    /modules\/drone\/index\.js/,
+    /modules\/drone\//,
+    /plugins\/drone\//,
+    /modules\//,
+    /examples\//
+  ])
+);
 
 var contents = [];
-foreach(store, function(filename){
+foreach(store, function(filename) {
   var br = new io.BufferedReader(new io.FileReader(filename));
-  var line ;
-  while ( (line = br.readLine()) != null){
+  var line;
+  while ((line = br.readLine()) != null) {
     contents.push(line);
   }
   br.close();
@@ -120,17 +114,16 @@ var writeComment = false;
 var startComment = /^\/\*{10}/;
 var endComment = /^\*{3}\//;
 
-for (var i = 0;i < contents.length; i++){
+for (var i = 0; i < contents.length; i++) {
   var line = contents[i];
-  if (line.match(startComment)){
+  if (line.match(startComment)) {
     writeComment = true;
     i++;
   }
-  if (line.match(endComment)){
+  if (line.match(endComment)) {
     writeComment = false;
   }
-  if (writeComment){
+  if (writeComment) {
     java.lang.System.out.println(contents[i]);
   }
 }
-

src/docs/js/generateApiDocs.js

@@ -1,4 +1,4 @@
-args = Array.prototype.slice.call(args,1);
+args = Array.prototype.slice.call(args, 1);
 // [0] = type, [1] = lib.jar [2] = blockX, [3] = classX
 var out = java.lang.System.out,
   err = java.lang.System.err,
@@ -13,34 +13,36 @@ var content = [
   'When each function is called with no parameters, it will return the appropriate EntityType object. ',
   'For example `entities.polar_bear()` will return an `EntityType.POLAR_BEAR` object. ',
   '',
-  'When each function is called with a single parameter - an entity - the entity\'s type will be compared and return true or false. ',
+  "When each function is called with a single parameter - an entity - the entity's type will be compared and return true or false. ",
   '',
   '### Usage',
   '',
   '    entities.zombie(); // returns a SpigotMC/CanaryMod EntityType.ZOMBIE enum value',
-  '    entities.zombie( mob ); // compares the entity\'s type to a zombie, returns true if mob type is zombie, false otherwise',
+  "    entities.zombie( mob ); // compares the entity's type to a zombie, returns true if mob type is zombie, false otherwise",
   '    entities.player( self ); // at the in-game prompt this should return true (compares self to a player entity type)',
   '    entities.rabbit( self ); // at the in-game prompt this should return false (compares self to a rabbit entity type)',
   '',
   'The following functions are provided:',
   ''
 ];
 
-var enumVals = [], t, i, name;
+var enumVals = [],
+  t,
+  i,
+  name;
 var entitytypes = org.bukkit.entity.EntityType.values();
 for (t in entitytypes) {
   if (entitytypes[t] && entitytypes[t].ordinal) {
     name = entitytypes[t].name();
-    name = ('' + name).replace(/^(.*)/,function(a){ return a.toLowerCase(); });
+    name = ('' + name).replace(/^(.*)/, function(a) {
+      return a.toLowerCase();
+    });
     enumVals.push(' * ' + name + '()');
   }
 }
 enumVals.sort();
 content = content.concat(enumVals);
 content.push('');
-for (i = 0; i< content.length; i++){
+for (i = 0; i < content.length; i++) {
   out.println(content[i]);
 }
-
-
-  

src/docs/js/generateEntitiesDoc.js

@@ -1,5 +1,5 @@
 /*global args*/
-args = Array.prototype.slice.call(args,1);
+args = Array.prototype.slice.call(args, 1);
 // [0] = type, [1] = lib.jar [2] = blockX, [3] = classX
 var File = java.io.File,
   FileReader = java.io.FileReader,
@@ -16,88 +16,105 @@ var content = [
   '/*********************',
   '## Events Helper Module (' + FRAMEWORK + ' version)',
   'The Events helper module provides a suite of functions - one for each possible event.',
-  'For example, the events.' + args[2] + '() function is just a wrapper function which calls events.on(' + args[3] + ', callback, priority)',
+  'For example, the events.' +
+    args[2] +
+    '() function is just a wrapper function which calls events.on(' +
+    args[3] +
+    ', callback, priority)',
   'This module is a convenience wrapper for easily adding new event handling functions in Javascript. ',
   'At the in-game or server-console prompt, players/admins can type `events.` and use TAB completion ',
   'to choose from any of the approx. 160 different event types to listen to.',
   '',
   '### Usage',
   '',
-  '    events.' + args[2] + '( function( event ) { ', 
-  '      echo( event.player, \'You broke a block!\'); ', 
+  '    events.' + args[2] + '( function( event ) { ',
+  "      echo( event.player, 'You broke a block!'); ",
   '    });',
   '',
   'The crucial difference is that the events module now has functions for each of the built-in events. The functions are accessible via TAB-completion so will help beginning programmers to explore the events at the server console window.',
   '',
   '***/'
 ];
 var canary = false;
-if (FRAMEWORK == 'CanaryMod'){
+if (FRAMEWORK == 'CanaryMod') {
   canary = true;
 }
 
-for (var i = 0; i< content.length; i++){
+for (var i = 0; i < content.length; i++) {
   out.println(content[i]);
 }
 var names = [];
-while ( ( entry = zis.nextEntry) != null) {
+while ((entry = zis.nextEntry) != null) {
   names.push(String(entry.name));
 }
 names.sort();
 names.forEach(function(name) {
   var re1 = /org\/bukkit\/event\/.+Event\.class$/;
-  if (canary){
+  if (canary) {
     re1 = /net\/canarymod\/hook\/.+Hook\.class$/;
   }
-  if ( re1.test(name) ) {
-    name = name.replace(/\//g,'.').replace('.class','');
-    try { 
+  if (re1.test(name)) {
+    name = name.replace(/\//g, '.').replace('.class', '');
+    try {
       clz = java.lang.Class.forName(name);
-    }catch ( e) {
+    } catch (e) {
       err.println('Warning: could not Class.forName("' + name + '")');
       clz = engine.eval(name);
     }
     var isAbstract = Modifier.isAbstract(clz.getModifiers());
-    if ( isAbstract ) {
+    if (isAbstract) {
       return;
     }
     var parts = name.split('.');
     var shortName = null;
-    if (canary){
-      shortName = name.replace('net.canarymod.hook.','');
+    if (canary) {
+      shortName = name.replace('net.canarymod.hook.', '');
     }
-    if (!canary){
-      shortName = name.replace('org.bukkit.event.','');
+    if (!canary) {
+      shortName = name.replace('org.bukkit.event.', '');
     }
-    var fname = parts.reverse().shift().replace(/^(.)/,function(a){ 
-      return a.toLowerCase();});
-    if (!canary){
-      fname = fname.replace(/Event$/,'');
+    var fname = parts
+      .reverse()
+      .shift()
+      .replace(/^(.)/, function(a) {
+        return a.toLowerCase();
+      });
+    if (!canary) {
+      fname = fname.replace(/Event$/, '');
     }
-    if (canary){
-      fname = fname.replace(/Hook$/,'');
+    if (canary) {
+      fname = fname.replace(/Hook$/, '');
     }
-    var javaDoc = canary ? 'https://ci.visualillusionsent.net/job/CanaryLib/javadoc/net/canarymod/hook/' : 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/';
+    var javaDoc = canary
+      ? 'https://ci.visualillusionsent.net/job/CanaryLib/javadoc/net/canarymod/hook/'
+      : 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/';
     var comment = [
       '/*********************',
       '### events.' + fname + '()',
       '',
       '#### Parameters',
       '',
-      ' * callback - A function which is called whenever the ['+ shortName + ' event](' + javaDoc + shortName.replace('.','/') + '.html) is fired',
+      ' * callback - A function which is called whenever the [' +
+        shortName +
+        ' event](' +
+        javaDoc +
+        shortName.replace('.', '/') +
+        '.html) is fired',
       '',
       ' * priority - optional - see events.on() for more information.',
       '',
       '***/'
       //http://jd.bukkit.org/rb/apidocs/org/bukkit/event/player/PlayerJoinEvent.html
     ];
-    for (var i = 0; i < comment.length; i++){
+    for (var i = 0; i < comment.length; i++) {
       out.println(comment[i]);
     }
     out.println('exports.' + fname + ' = function(callback,priority){ ');
-    if (canary){
-      out.println('  return events.on(Packages.' + name + ',callback,priority);');
-    } else { 
+    if (canary) {
+      out.println(
+        '  return events.on(Packages.' + name + ',callback,priority);'
+      );
+    } else {
       out.println('  return events.on(' + name + ',callback,priority);');
     }
     out.println('};');