indenting uniformity via jsbeautifier

gulp-sourcemaps · Oct 13, 2016 · 8db077c · 8db077c
1 parent 5e97199
commit 8db077c
Show file tree

Hide file tree

Showing 6 changed files with 835 additions and 902 deletions.
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
@@ -0,0 +1,10 @@
+{
+  "js":{
+    "indent_level": 0,
+    "indent_with_tabs": false,
+    "preserve_newlines": true,
+    "max_preserve_newlines": 2,
+    "jslint_happy": true,
+    "indent_handlebars": true
+  }
+}
diff --git a/src/init.js b/src/init.js
@@ -12,7 +12,6 @@ var utils = require('./utils'),
   SourceMapGenerator = require('source-map').SourceMapGenerator,
   css = require('css');
 
-
 /**
  * Initialize source mapping chain
  */
@@ -33,9 +32,11 @@ function init(options) {
     }
 
     if (options === undefined) {
-        options = {};
+      options = {};
     }
-    debug(function () {return options;});
+    debug(function() {
+      return options;
+    });
 
     var fileContent = file.contents.toString();
     var sourceMap;
@@ -61,7 +62,7 @@ function init(options) {
         if (mapComment) {
           mapFile = path.resolve(path.dirname(file.path), mapComment[1] || mapComment[2]);
           fileContent = convert.removeMapFileComments(fileContent);
-        // if no comment try map file with same name as source file
+          // if no comment try map file with same name as source file
         } else {
           mapFile = file.path + '.map';
         }
@@ -71,7 +72,7 @@ function init(options) {
 
         try {
           sourceMap = JSON.parse(stripBom(fs.readFileSync(mapFile, 'utf8')));
-        } catch(e) {}
+        } catch (e) {}
       }
 
       // fix source paths and sourceContent for imported source map
@@ -99,7 +100,7 @@ function init(options) {
             if (absPath === file.path) {
               sourceContent = fileContent;
 
-            // else load content from file
+              // else load content from file
             } else {
               try {
                 if (options.debug)
@@ -108,8 +109,8 @@ function init(options) {
               } catch (e) {
                 if (options.debug)
                   debug('warn: source file not found: ' + absPath);
+                }
               }
-            }
             sourceMap.sourcesContent[i] = sourceContent;
           }
         });
@@ -120,7 +121,9 @@ function init(options) {
     }
 
     if (!sourceMap && options.identityMap) {
-      debug(function () { return 'identityMap'; });
+      debug(function() {
+        return 'identityMap';
+      });
       var fileType = path.extname(file.path);
       var source = unixStylePath(file.relative);
       var generator = new SourceMapGenerator({file: source});
@@ -134,7 +137,7 @@ function init(options) {
           var mapping = {
             original: token.loc.start,
             generated: token.loc.start,
-            source: source,
+            source: source
           };
           if (token.type.label === 'name') {
             mapping.name = token.value;
@@ -147,19 +150,21 @@ function init(options) {
       } else if (fileType === '.css') {
         debug('css');
         var ast = css.parse(fileContent, {silent: true});
-        debug(function () { return ast;});
+        debug(function() {
+          return ast;
+        });
         var registerTokens = function(ast) {
           if (ast.position) {
-            generator.addMapping({
-              original: ast.position.start,
-              generated: ast.position.start,
-              source: source,
-            });
+            generator.addMapping({original: ast.position.start, generated: ast.position.start, source: source});
           }
 
           function logAst(key, ast) {
-            debug(function () { return 'key: ' + key;});
-            debug(function () { return ast[key];});
+            debug(function() {
+              return 'key: ' + key;
+            });
+            debug(function() {
+              return ast[key];
+            });
           }
 
           for (var key in ast) {
@@ -168,7 +173,9 @@ function init(options) {
               if (Object.prototype.toString.call(ast[key]) === '[object Object]') {
                 registerTokens(ast[key]);
               } else if (Array.isArray(ast[key])) {
-                debug(function () { return "@@@@ ast[key] isArray @@@@";});
+                debug(function() {
+                  return "@@@@ ast[key] isArray @@@@";
+                });
                 for (var i = 0; i < ast[key].length; i++) {
                   registerTokens(ast[key][i]);
                 }
@@ -185,7 +192,7 @@ function init(options) {
     if (!sourceMap) {
       // Make an empty source map
       sourceMap = {
-        version : 3,
+        version: 3,
         names: [],
         mappings: '',
         sources: [unixStylePath(file.relative)],

diff --git a/src/utils.js b/src/utils.js
@@ -1,18 +1,14 @@
 'use strict';
 var path = require('path');
 
-
 function unixStylePath(filePath) {
   return filePath.split(path.sep).join('/');
 }
 
-
 var PLUGIN_NAME = require('../package.json').name;
 
-
 var urlRegex = /^(https?|webpack(-[^:]+)?):\/\//;
 
-
 module.exports = {
   unixStylePath: unixStylePath,
   PLUGIN_NAME: PLUGIN_NAME,

diff --git a/src/write.js b/src/write.js
@@ -9,7 +9,6 @@ var utils = require('./utils'),
   stripBom = require('strip-bom'),
   detectNewline = require('detect-newline');
 
-
 /**
  * Write the source map
  *
@@ -33,7 +32,10 @@ function write(destPath, options) {
   if (options.charset === undefined)
     options.charset = "utf8";
 
-  debug(function() {return options;});
+  debug(function() {
+    return options;
+  });
+
   function sourceMapWrite(file, encoding, callback) {
     /*jshint validthis:true */
 
@@ -66,7 +68,7 @@ function write(destPath, options) {
       sourceMap.sourceRoot = options.sourceRoot;
     }
     if (sourceMap.sourceRoot === null) {
-        sourceMap.sourceRoot = undefined;
+      sourceMap.sourceRoot = undefined;
     }
 
     if (options.includeContent) {
@@ -83,8 +85,8 @@ function write(destPath, options) {
           } catch (e) {
             if (options.debug)
               debug('source file not found: ' + sourcePath);
+            }
           }
-        }
       }
     } else {
       delete sourceMap.sourcesContent;
@@ -107,7 +109,9 @@ function write(destPath, options) {
         break;
       default:
         /* jshint ignore:start */
-        commentFormatter = function(url) { return ""; };
+        commentFormatter = function(url) {
+          return "";
+        };
         /* jshint ignore:end */
     }
 
@@ -151,13 +155,27 @@ function write(destPath, options) {
         path: sourceMapPath,
         contents: new Buffer(JSON.stringify(sourceMap)),
         stat: {
-          isFile: function () { return true; },
-          isDirectory: function () { return false; },
-          isBlockDevice: function () { return false; },
-          isCharacterDevice: function () { return false; },
-          isSymbolicLink: function () { return false; },
-          isFIFO: function () { return false; },
-          isSocket: function () { return false; }
+          isFile: function() {
+            return true;
+          },
+          isDirectory: function() {
+            return false;
+          },
+          isBlockDevice: function() {
+            return false;
+          },
+          isCharacterDevice: function() {
+            return false;
+          },
+          isSymbolicLink: function() {
+            return false;
+          },
+          isFIFO: function() {
+            return false;
+          },
+          isSocket: function() {
+            return false;
+          }
         }
       });
       this.push(sourceMapFile);
@@ -171,7 +189,7 @@ function write(destPath, options) {
         } else {
           prefix = options.sourceMappingURLPrefix;
         }
-        sourceMapPathRelative = prefix+path.join('/', sourceMapPathRelative);
+        sourceMapPathRelative = prefix + path.join('/', sourceMapPathRelative);
       }
       comment = commentFormatter(unixStylePath(sourceMapPathRelative));