Format code with prettier-eslint.

blueimp · blueimp · commit 1a8c3e48d307 · 2017-08-28T00:50:48.000+02:00
diff --git a/js/compile.js b/js/compile.js
@@ -21,7 +21,8 @@
   var regexp = /<script( id="([\w-]+)")? type="text\/x-tmpl"( id="([\w-]+)")?>([\s\S]+?)<\/script>/gi
   // A regular expression to match the helper function names:
   var helperRegexp = new RegExp(
-    tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join('\\s*\\(|') + '\\s*\\('
+    tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join('\\s*\\(|') +
+      '\\s*\\('
   )
   // A list to store the function bodies:
   var list = []
@@ -31,12 +32,18 @@
     // Only add helper functions if they are used inside of the template:
     var helper = helperRegexp.test(str) ? tmpl.helper : ''
     var body = str.replace(tmpl.regexp, tmpl.func)
-    if (helper || (/_e\s*\(/.test(body))) {
+    if (helper || /_e\s*\(/.test(body)) {
       helper = '_e=tmpl.encode' + helper + ','
     }
-    return 'function(' + tmpl.arg + ',tmpl){' +
-    ('var ' + helper + "_s='" + body + "';return _s;")
-      .split("_s+='';").join('') + '}'
+    return (
+      'function(' +
+      tmpl.arg +
+      ',tmpl){' +
+      ('var ' + helper + "_s='" + body + "';return _s;")
+        .split("_s+='';")
+        .join('') +
+      '}'
+    )
   }
   // Loop through the command line arguments:
   process.argv.forEach(function (file, index) {
@@ -77,4 +84,4 @@
   code = runtime.replace('{}', '{' + list.join(',') + '}')
   // Print the resulting code to the console output:
   console.log(code)
-}())
+})()
diff --git a/js/runtime.js b/js/runtime.js
@@ -15,9 +15,11 @@
   'use strict'
   var tmpl = function (id, data) {
     var f = tmpl.cache[id]
-    return data ? f(data, tmpl) : function (data) {
-      return f(data, tmpl)
-    }
+    return data
+      ? f(data, tmpl)
+      : function (data) {
+        return f(data, tmpl)
+      }
   }
   tmpl.cache = {}
   tmpl.encReg = /[<>&"'\x00]/g // eslint-disable-line no-control-regex
@@ -29,12 +31,9 @@
     "'": '&#39;'
   }
   tmpl.encode = function (s) {
-    return (s == null ? '' : '' + s).replace(
-      tmpl.encReg,
-      function (c) {
-        return tmpl.encMap[c] || ''
-      }
-    )
+    return (s == null ? '' : '' + s).replace(tmpl.encReg, function (c) {
+      return tmpl.encMap[c] || ''
+    })
   }
   if (typeof define === 'function' && define.amd) {
     define(function () {
@@ -45,4 +44,4 @@
   } else {
     $.tmpl = tmpl
   }
-}(this))
+})(this)
diff --git a/js/tmpl.js b/js/tmpl.js
@@ -18,40 +18,51 @@
   'use strict'
   var tmpl = function (str, data) {
     var f = !/[^\w\-.:]/.test(str)
-      ? tmpl.cache[str] = tmpl.cache[str] || tmpl(tmpl.load(str))
-      : new Function(// eslint-disable-line no-new-func
+      ? (tmpl.cache[str] = tmpl.cache[str] || tmpl(tmpl.load(str)))
+      : new Function( // eslint-disable-line no-new-func
         tmpl.arg + ',tmpl',
-        'var _e=tmpl.encode' + tmpl.helper + ",_s='" +
-          str.replace(tmpl.regexp, tmpl.func) + "';return _s;"
+        'var _e=tmpl.encode' +
+            tmpl.helper +
+            ",_s='" +
+            str.replace(tmpl.regexp, tmpl.func) +
+            "';return _s;"
       )
-    return data ? f(data, tmpl) : function (data) {
-      return f(data, tmpl)
-    }
+    return data
+      ? f(data, tmpl)
+      : function (data) {
+        return f(data, tmpl)
+      }
   }
   tmpl.cache = {}
   tmpl.load = function (id) {
     return document.getElementById(id).innerHTML
   }
   tmpl.regexp = /([\s'\\])(?!(?:[^{]|\{(?!%))*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g
   tmpl.func = function (s, p1, p2, p3, p4, p5) {
-    if (p1) { // whitespace, quote and backspace in HTML context
-      return {
-        '\n': '\\n',
-        '\r': '\\r',
-        '\t': '\\t',
-        ' ': ' '
-      }[p1] || '\\' + p1
+    if (p1) {
+      // whitespace, quote and backspace in HTML context
+      return (
+        {
+          '\n': '\\n',
+          '\r': '\\r',
+          '\t': '\\t',
+          ' ': ' '
+        }[p1] || '\\' + p1
+      )
     }
-    if (p2) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
+    if (p2) {
+      // interpolation: {%=prop%}, or unescaped: {%#prop%}
       if (p2 === '=') {
         return "'+_e(" + p3 + ")+'"
       }
       return "'+(" + p3 + "==null?'':" + p3 + ")+'"
     }
-    if (p4) { // evaluation start tag: {%
+    if (p4) {
+      // evaluation start tag: {%
       return "';"
     }
-    if (p5) { // evaluation end tag: %}
+    if (p5) {
+      // evaluation end tag: %}
       return "_s+='"
     }
   }
@@ -64,16 +75,14 @@
     "'": '&#39;'
   }
   tmpl.encode = function (s) {
-    return (s == null ? '' : '' + s).replace(
-      tmpl.encReg,
-      function (c) {
-        return tmpl.encMap[c] || ''
-      }
-    )
+    return (s == null ? '' : '' + s).replace(tmpl.encReg, function (c) {
+      return tmpl.encMap[c] || ''
+    })
   }
   tmpl.arg = 'o'
-  tmpl.helper = ",print=function(s,e){_s+=e?(s==null?'':s):_e(s);}" +
-                  ',include=function(s,d){_s+=tmpl(s,d);}'
+  tmpl.helper =
+    ",print=function(s,e){_s+=e?(s==null?'':s):_e(s);}" +
+    ',include=function(s,d){_s+=tmpl(s,d);}'
   if (typeof define === 'function' && define.amd) {
     define(function () {
       return tmpl
@@ -83,4 +92,4 @@
   } else {
     $.tmpl = tmpl
   }
-}(this))
+})(this)
diff --git a/package.json b/package.json
@@ -27,9 +27,11 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "mocha": "^3.5.0",
+    "prettier-eslint-cli": "^4.2.1",
     "uglify-js": "^3.0.28"
   },
   "scripts": {
+    "format": "prettier-eslint --no-semi --single-quote --write **/*.js",
     "lint": "eslint .",
     "unit": "mocha",
     "test": "npm run lint && npm run unit",
diff --git a/test/test.js b/test/test.js
