inter-coder
diff --git a/‎bin/phpjs.js
Lines changed: 15 additions & 48 deletions b/‎bin/phpjs.js
Lines changed: 15 additions & 48 deletions
@@ -44,54 +44,21 @@ cli.parse({
   abort   : ['a', 'Abort on first failure']
 });
 
-// cli.pad = function(str, pad, chr, dir) {
-//   if (!pad) pad = 20;
-//   if (!chr) chr = ' ';
-//   if (!dir) dir = 'left';
-
-//   if ((str + '').length >= pad) {
-//     return str;
-//   }
-
-//   if (dir === 'right') {
-//     return String(str + Array(pad).join(chr)).slice(0, pad);
-//   }
-
-//   return String(Array(pad).join(chr) + str).slice(-pad);
-// };
-
-// var width = 120;
-
 cli.buildnpm = function(args, options) {
   var self     = this;
   var globpath = __root + '/functions/' + options.category + '/' + options.name + '.js';
+  fs.writeFileSync(__root + '/build/npm.js', '// This file is generated by `make build`. \n');
+  fs.appendFileSync(__root + '/build/npm.js', '// Do NOT edit by hand. \n');
+  fs.appendFileSync(__root + '/build/npm.js', '// \n');
+  fs.appendFileSync(__root + '/build/npm.js', '// Make function changes in ./functions and \n');
+  fs.appendFileSync(__root + '/build/npm.js', '// generator changes in ./lib/phpjsutil.js \n');
   self.glob(globpath, function (err, params) {
-    console.log(params.signature);
-
-    var buf = '';
-    buf += 'exports.decbin = function (number) {\n';
-    buf += '    // Returns a string containing a binary representation of the number  \n';
-    buf += '    // \n';
-    buf += '    // version: 1008.1718\n';
-    buf += '    // discuss at: http://phpjs.org/functions/decbin\n';
-    buf += '    // +   original by: Enrique Gonzalez\n';
-    buf += '    // +   bugfixed by: Onno Marsman\n';
-    buf += '    // +   improved by: http://stackoverflow.com/questions/57803/how-to-convert-decimal-to-hex-in-javascript\n';
-    buf += '    // +   input by: pilus\n';
-    buf += '    // +   input by: nord_ua\n';
-    buf += '    // *     example 1: \php.decbin(12);\n';
-    buf += '    // *     returns 1: \'1100\'\n';
-    buf += '    // *     example 2: \php.decbin(26);\n';
-    buf += '    // *     returns 2: \'11010\'\n';
-    buf += '    // *     example 3: \php.decbin(\'26\');\n';
-    buf += '    // *     returns 3: \'11010\'\n';
-    buf += '    if (number < 0) {\n';
-    buf += '        number = 0xFFFFFFFF + number + 1;\n';
-    buf += '    }\n';
-    buf += '    return parseInt(number, 10).toString(2);\n';
+    var buf = '\n';
+    buf += 'exports.' + params.func_name + ' = function (' + params.func_arguments.join(', ') + ') {\n';
+    buf += '  ' + params.body.split('\n').join('\n  ').replace(/^  $/g, '') + '\n';
     buf += '};\n';
-
-    fs.writeFileSync(__root + '/build/npm.js', buf);
+    console.log(buf);
+    fs.appendFileSync(__root + '/build/npm.js', buf);
   });
 };
 
@@ -137,18 +104,18 @@ cli.test = function(args, options) {
       return cli.fatal(err);
     }
 
-    if (params['headKeys']['test'] && params['headKeys']['test'][0] === 'skip') {
+    if (params.headKeys.test && params.headKeys.test[0] === 'skip') {
       self.skip_cnt++;
-      return cli.info('--> ' + params['name'] + ' skipped as instructed. ');
+      return cli.info('--> ' + params.name + ' skipped as instructed. ');
     }
 
     PhpjsUtil.test(params, function(err, test, params) {
       if (!err) {
         self.pass_cnt++;
-        cli.debug('--> ' + params['name'] + '#' + (+test['number'] + 1) + ' passed. ');
+        cli.debug('--> ' + params.name + '#' + (+test.number + 1) + ' passed. ');
       } else {
         self.fail_cnt++;
-        cli.error('--> ' + params['name'] + '#' + (+test['number'] + 1) + ' failed. ');
+        cli.error('--> ' + params.name + '#' + (+test.number + 1) + ' failed. ');
         cli.error(err);
         if (options.abort) {
           cli.fatal('Aborting on first failure as instructed. ');
@@ -160,6 +127,6 @@ cli.test = function(args, options) {
 };
 
 cli.main(function(args, options) {
-  cli[options['action']](args, options);
+  cli[options.action](args, options);
 });