refactor(style): add indent option

Author: azu

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2

.eslintrc.js

@@ -69,7 +69,7 @@ module.exports = {
         "id-blacklist": "error",
         "id-length": "off",
         "id-match": "error",
-        "indent": "off",
+        "indent": ["error", 4],
         "init-declarations": "off",
         "jsx-quotes": "error",
         "key-spacing": "off",

.gitignore

@@ -82,3 +82,4 @@ crashlytics.properties
 crashlytics-build.properties
 
 
+/.eslintcache

.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 language: node_js
 node_js: "stable"
 script:
-- npm run check
 - npm test
 - npm run test:example-default
 - npm run test:example-ace

package.json

@@ -24,11 +24,11 @@
   },
   "scripts": {
     "build": "NODE_ENV=production babel src --out-dir lib --source-maps",
-    "check": "eslint src/*.js test/*.js",
-    "lint:fix": "eslint --fix src/*.js test/*.js",
+    "lint": "eslint --cache src/*.js test/*.js",
+    "lint:fix": "eslint --cache --fix src/*.js test/*.js",
     "watch": "babel src --out-dir lib --watch --source-maps",
     "prepublish": "npm run --if-present build",
-    "test": "mocha",
+    "test": "npm run lint && mocha",
     "test:example-default": "cd examples/default && npm i && npm run build",
     "test:example-ace": "cd examples/ace && npm i && npm run build",
     "test:example-custom": "cd examples/custom && npm i && npm run build"

src/parser.js

@@ -45,13 +45,13 @@ export function splitLabelToCommands(label = "") {
  * @return {string}
  */
 export function strip(s) {
-  // inspired from https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/string/strip.rb
-  if((s === undefined) || (s === "")) {
-      return s;
-  }
-  const indents = s.split(/\n/).map(s => s.match(/^[ \t]*(?=\S)/)).filter(m => m).map(m => m[0]);
-  const smallestIndent = indents.sort((a,b) => a.length - b.length)[0];
-  return s.replace(new RegExp(`^${smallestIndent}`, "gm"), "");
+    // inspired from https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/string/strip.rb
+    if ((s === undefined) || (s === "")) {
+        return s;
+    }
+    const indents = s.split(/\n/).map(s => s.match(/^[ \t]*(?=\S)/)).filter(m => m).map(m => m[0]);
+    const smallestIndent = indents.sort((a, b) => a.length - b.length)[0];
+    return s.replace(new RegExp(`^${smallestIndent}`, "gm"), "");
 }
 
 /**
@@ -73,8 +73,8 @@ export function containIncludeCommand(commands = []) {
  * @param {string} label
  * @return {object}
  */
-export function parseVariablesFromLabel(kvMap,label) {
-    const kv = Object.assign({},kvMap);
+export function parseVariablesFromLabel(kvMap, label) {
+    const kv = Object.assign({}, kvMap);
     const beginEx = "\^.*";
     const endEx = ".*\$";
     const sepEx = ",?";
@@ -90,18 +90,17 @@ export function parseVariablesFromLabel(kvMap,label) {
             valEx = "(([-\\w\\s]*,?)*)";
         }
         // Add value check here
-        switch(typeof defaultKeyValueMap[key]) {
-            case "string":
-                valEx = quotesEx + valEx + quotesEx;
-                break;
-            case "boolean":
+        switch (typeof defaultKeyValueMap[key]) {
+        case "string":
+            valEx = quotesEx + valEx + quotesEx;
+            break;
+        case "boolean":
                 // no quotes
-                valEx = quotesEx + "?(true|false)" + quotesEx + "?";
-                break;
-            default:
-                logger.error("include-codeblock: parseVariablesFromLabel: key type `" +
-                    typeof defaultKeyValueMap[key] + "` unknown (see options.js)");
-                break;
+            valEx = quotesEx + "?(true|false)" + quotesEx + "?";
+            break;
+        default:
+            logger.error("include-codeblock: parseVariablesFromLabel: key type `" + typeof defaultKeyValueMap[key] + "` unknown (see options.js)");
+            break;
         }
         // Val type cast to string.
         const regStr = beginEx + sepEx + spacesEx + keyEx +
@@ -123,18 +122,17 @@ export function parseVariablesFromLabel(kvMap,label) {
  * @param {string} content
  * @return {string}
  */
-export function generateEmbedCode(
-    kvMap,
-    {fileName, originalPath, content}){   
+export function generateEmbedCode(kvMap,
+    {fileName, originalPath, content}) {
     const tContent = getTemplateContent(kvMap);
-    const kv = Object.assign({},kvMap);
+    const kv = Object.assign({}, kvMap);
     const count = hasTitle(kv) ? codeCounter() : -1;
     checkMapTypes(kvMap, "generatedEmbedCode");
-    const contextMap = Object.assign({},kvMap,{
-        "content":content,
-        "count":count,
-        "fileName":fileName,
-        "originalPath":originalPath
+    const contextMap = Object.assign({}, kvMap, {
+        "content": content,
+        "count": count,
+        "fileName": fileName,
+        "originalPath": originalPath
     });
     // compile template
     const handlebars = Handlebars.compile(tContent);
@@ -148,8 +146,8 @@ export function generateEmbedCode(
  * @param {string} originalPath
  * @return {string}
  */
-export function getContent(filePath,originalPath){
-        return readFileFromPath(filePath);
+export function getContent(filePath, originalPath) {
+    return readFileFromPath(filePath);
 }
 
 /**
@@ -161,7 +159,7 @@ export function getContent(filePath,originalPath){
  * @return {string}
  */
 export function embedCode(kvMap,
-    {filePath, originalPath, label}){
+    {filePath, originalPath, label}) {
     const code = getContent(filePath, originalPath);
     const fileName = path.basename(filePath);
     const kvmparsed = parseVariablesFromLabel(kvMap, label);
@@ -206,10 +204,10 @@ export function parse(content, baseDir, options = {}) {
             const replacedContent = embedCode(
                 kvMap,
                 {
-                filePath: absolutePath,
-                originalPath: originalPath,
-                label
-            });
+                    filePath: absolutePath,
+                    originalPath: originalPath,
+                    label
+                });
             results.push({
                 target: all,
                 replaced: replacedContent

src/template.js

@@ -12,7 +12,7 @@ import {defaultBookOptionsMap, defaultTemplateMap} from "./options.js";
 export function readFileFromPath(path){
     var content;
     try {
-    content = fs.readFileSync(path, "utf8");
+        content = fs.readFileSync(path, "utf8");
     } catch (err) {
         if (err.code === "ENOENT") {
             logger.warn("Error: file not found: " + path);