prepare refactor, update action tests

ShMcK · ShMcK · commit bac2e2e2c0e9 · 2016-08-13T13:09:17.000-07:00
diff --git a/lib/build/parser/import.js b/lib/build/parser/import.js
@@ -4,7 +4,8 @@ var path_1 = require('path');
 var node_file_exists_1 = require('node-file-exists');
 var cleanup_1 = require('./cleanup');
 var settings_1 = require('./settings');
-function loadImport(dir, lines, pathToMd) {
+function loadImport(_a) {
+    var dir = _a.dir, lines = _a.lines, pathToMd = _a.pathToMd;
     pathToMd = cleanup_1.trimQuotes(pathToMd);
     if (!pathToMd.match(/\.md$/)) {
         if (node_file_exists_1.default(path_1.join(dir, settings_1.tutorialDir, pathToMd.concat('.md')))) {
diff --git a/lib/build/parser/info.js b/lib/build/parser/info.js
@@ -2,15 +2,16 @@
 var Match = require('./match');
 var page_1 = require('./page');
 var import_1 = require('./import');
-function info(dir, result, lines, index) {
+function info(_a) {
+    var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
     var inCodeBlock = false;
     var i = -1;
     while (i < lines.length - 1) {
         i += 1;
         var line = lines[i];
         switch (true) {
             case !!Match.isImport(line):
-                lines = import_1.loadImport(dir, lines, Match.isImport(line));
+                lines = import_1.loadImport({ dir: dir, lines: lines, pathToMd: Match.isImport(line) });
                 continue;
             case !!Match.codeBlock(line):
                 if (line.length > 3) {
@@ -24,7 +25,7 @@ function info(dir, result, lines, index) {
                 result.info.title = Match.info(line).trim();
                 continue;
             case !!Match.page(line):
-                return page_1.page(dir, result, lines.slice(i), index);
+                return page_1.page({ dir: dir, result: result, lines: lines.slice(i), index: index });
             default:
                 if (i > 1) {
                     result.info.description += '\n';
diff --git a/lib/build/parser/page.js b/lib/build/parser/page.js
@@ -3,7 +3,8 @@ var Match = require('./match');
 var task_1 = require('./task');
 var import_1 = require('./import');
 var cleanup_1 = require('./cleanup');
-function page(dir, result, lines, index) {
+function page(_a) {
+    var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
     index.page += 1;
     index.task = -1;
     result.pages.push({
@@ -42,12 +43,12 @@ function page(dir, result, lines, index) {
             case inCodeBlock:
                 continue;
             case !!Match.page(line):
-                return page(dir, result, lines.slice(i), index);
+                return page({ dir: dir, result: result, lines: lines.slice(i), index: index });
             case !!Match.task(line):
                 if (result.pages[index.page].tasks === undefined) {
                     result.pages[index.page].tasks = [];
                 }
-                return task_1.task(dir, result, lines.slice(i), index);
+                return task_1.task({ dir: dir, result: result, lines: lines.slice(i), index: index });
             default:
                 if (i > 1) {
                     result.pages[index.page].description += '\n';
diff --git a/lib/build/parser/task.js b/lib/build/parser/task.js
@@ -4,7 +4,8 @@ var page_1 = require('./page');
 var actions_1 = require('./actions');
 var cleanup_1 = require('./cleanup');
 var import_1 = require('./import');
-function task(dir, result, lines, index) {
+function task(_a) {
+    var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
     result.pages[index.page].tasks.push({
         description: cleanup_1.trimLeadingSpaces(Match.task(lines[0]))
     });
@@ -66,9 +67,9 @@ function task(dir, result, lines, index) {
                 }
                 continue;
             case !!Match.task(line):
-                return task(dir, result, lines.slice(i), index);
+                return task({ dir: dir, result: result, lines: lines.slice(i), index: index });
             case !!Match.page(line):
-                return page_1.page(dir, result, lines.slice(i), index);
+                return page_1.page({ dir: dir, result: result, lines: lines.slice(i), index: index });
             default:
                 if (i > 0) {
                     result.pages[index.page].tasks[index.task].description += '\n';
diff --git a/src/build/parser/import.ts b/src/build/parser/import.ts
@@ -4,7 +4,7 @@ import fileExists from 'node-file-exists';
 import {trimQuotes} from './cleanup';
 import {tutorialDir} from './settings';
 
-export function loadImport(dir: string, lines: string[], pathToMd: string): string[] {
+export function loadImport({ dir, lines, pathToMd }): string[] {
   // add .md suffix
   pathToMd = trimQuotes(pathToMd);
   if (!pathToMd.match(/\.md$/)) {
diff --git a/src/build/parser/info.ts b/src/build/parser/info.ts
@@ -2,7 +2,7 @@ import * as Match from './match';
 import {page} from './page';
 import {loadImport} from './import';
 
-export function info(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
+export function info({ dir, result, lines, index }): CR.Output {
   let inCodeBlock = false;
   let i = -1;
 
@@ -14,7 +14,7 @@ export function info(dir: string, result: CR.Output, lines: string[], index: CR.
 
       // @import
       case !!Match.isImport(line):
-        lines = loadImport(dir, lines, Match.isImport(line));
+        lines = loadImport({dir, lines, pathToMd: Match.isImport(line)});
         continue;
 
       // ``` `
@@ -33,7 +33,7 @@ export function info(dir: string, result: CR.Output, lines: string[], index: CR.
 
       // ##
       case !!Match.page(line):
-        return page(dir, result, lines.slice(i), index);
+        return page({dir, result, lines: lines.slice(i), index});
 
       // description
       default:
diff --git a/src/build/parser/page.ts b/src/build/parser/page.ts
@@ -3,7 +3,7 @@ import {task} from './task';
 import {loadImport} from './import';
 import {bracketTracker, trimValue} from './cleanup';
 
-export function page(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
+export function page({ dir, result, lines, index}) {
   index.page += 1;
   index.task = -1;
   result.pages.push({
@@ -53,14 +53,14 @@ export function page(dir: string, result: CR.Output, lines: string[], index: CR.
 
       // ##
       case !!Match.page(line):
-        return page(dir, result, lines.slice(i), index);
+        return page({dir, result, lines: lines.slice(i), index});
 
       // +
       case !!Match.task(line):
         if (result.pages[index.page].tasks === undefined) {
           result.pages[index.page].tasks = [];
         }
-        return task(dir, result, lines.slice(i), index);
+        return task({dir, result, lines: lines.slice(i), index});
 
       // description
       default:
diff --git a/src/build/parser/task.ts b/src/build/parser/task.ts
@@ -4,7 +4,9 @@ import {addToTasks} from './actions';
 import {trimLeadingSpaces, bracketTracker, trimValue} from './cleanup';
 import {loadImport} from './import';
 
-export function task(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
+export function task({
+  dir, result, lines, index
+}) {
   result.pages[index.page].tasks.push({
     description: trimLeadingSpaces(Match.task(lines[0]))
   });
@@ -83,11 +85,11 @@ export function task(dir: string, result: CR.Output, lines: string[], index: CR.
 
       // +
       case !!Match.task(line):
-        return task(dir, result, lines.slice(i), index);
+        return task({dir, result, lines: lines.slice(i), index});
 
       // ##
       case !!Match.page(line):
-        return page(dir, result, lines.slice(i), index);
+        return page({dir, result, lines: lines.slice(i), index});
 
 
       // description
diff --git a/test/action.spec.js b/test/action.spec.js
