Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bac2e2e

Browse files
ShMcKShMcK
committed
prepare refactor, update action tests
1 parent 835b2fd commit bac2e2e

File tree

9 files changed

+95
-96
lines changed

9 files changed

+95
-96
lines changed

‎lib/build/parser/import.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ var path_1 = require('path');
44
var node_file_exists_1 = require('node-file-exists');
55
var cleanup_1 = require('./cleanup');
66
var settings_1 = require('./settings');
7-
function loadImport(dir, lines, pathToMd) {
7+
function loadImport(_a) {
8+
var dir = _a.dir, lines = _a.lines, pathToMd = _a.pathToMd;
89
pathToMd = cleanup_1.trimQuotes(pathToMd);
910
if (!pathToMd.match(/\.md$/)) {
1011
if (node_file_exists_1.default(path_1.join(dir, settings_1.tutorialDir, pathToMd.concat('.md')))) {

‎lib/build/parser/info.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
var Match = require('./match');
33
var page_1 = require('./page');
44
var import_1 = require('./import');
5-
function info(dir, result, lines, index) {
5+
function info(_a) {
6+
var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
67
var inCodeBlock = false;
78
var i = -1;
89
while (i < lines.length - 1) {
910
i += 1;
1011
var line = lines[i];
1112
switch (true) {
1213
case !!Match.isImport(line):
13-
lines = import_1.loadImport(dir, lines, Match.isImport(line));
14+
lines = import_1.loadImport({ dir: dir, lines: lines, pathToMd: Match.isImport(line) });
1415
continue;
1516
case !!Match.codeBlock(line):
1617
if (line.length > 3) {
@@ -24,7 +25,7 @@ function info(dir, result, lines, index) {
2425
result.info.title = Match.info(line).trim();
2526
continue;
2627
case !!Match.page(line):
27-
return page_1.page(dir, result, lines.slice(i), index);
28+
return page_1.page({ dir: dir, result: result, lines: lines.slice(i), index: index });
2829
default:
2930
if (i > 1) {
3031
result.info.description += '\n';

‎lib/build/parser/page.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ var Match = require('./match');
33
var task_1 = require('./task');
44
var import_1 = require('./import');
55
var cleanup_1 = require('./cleanup');
6-
function page(dir, result, lines, index) {
6+
function page(_a) {
7+
var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
78
index.page += 1;
89
index.task = -1;
910
result.pages.push({
@@ -42,12 +43,12 @@ function page(dir, result, lines, index) {
4243
case inCodeBlock:
4344
continue;
4445
case !!Match.page(line):
45-
return page(dir, result, lines.slice(i), index);
46+
return page({ dir: dir, result: result, lines: lines.slice(i), index: index });
4647
case !!Match.task(line):
4748
if (result.pages[index.page].tasks === undefined) {
4849
result.pages[index.page].tasks = [];
4950
}
50-
return task_1.task(dir, result, lines.slice(i), index);
51+
return task_1.task({ dir: dir, result: result, lines: lines.slice(i), index: index });
5152
default:
5253
if (i > 1) {
5354
result.pages[index.page].description += '\n';

‎lib/build/parser/task.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ var page_1 = require('./page');
44
var actions_1 = require('./actions');
55
var cleanup_1 = require('./cleanup');
66
var import_1 = require('./import');
7-
function task(dir, result, lines, index) {
7+
function task(_a) {
8+
var dir = _a.dir, result = _a.result, lines = _a.lines, index = _a.index;
89
result.pages[index.page].tasks.push({
910
description: cleanup_1.trimLeadingSpaces(Match.task(lines[0]))
1011
});
@@ -66,9 +67,9 @@ function task(dir, result, lines, index) {
6667
}
6768
continue;
6869
case !!Match.task(line):
69-
return task(dir, result, lines.slice(i), index);
70+
return task({ dir: dir, result: result, lines: lines.slice(i), index: index });
7071
case !!Match.page(line):
71-
return page_1.page(dir, result, lines.slice(i), index);
72+
return page_1.page({ dir: dir, result: result, lines: lines.slice(i), index: index });
7273
default:
7374
if (i > 0) {
7475
result.pages[index.page].tasks[index.task].description += '\n';

‎src/build/parser/import.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import fileExists from 'node-file-exists';
44
import {trimQuotes} from './cleanup';
55
import {tutorialDir} from './settings';
66

7-
export function loadImport(dir: string, lines: string[], pathToMd: string): string[] {
7+
export function loadImport({ dir, lines, pathToMd }): string[] {
88
// add .md suffix
99
pathToMd = trimQuotes(pathToMd);
1010
if (!pathToMd.match(/\.md$/)) {

‎src/build/parser/info.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as Match from './match';
22
import {page} from './page';
33
import {loadImport} from './import';
44

5-
export function info(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
5+
export function info({ dir, result, lines, index }): CR.Output {
66
let inCodeBlock = false;
77
let i = -1;
88

@@ -14,7 +14,7 @@ export function info(dir: string, result: CR.Output, lines: string[], index: CR.
1414

1515
// @import
1616
case !!Match.isImport(line):
17-
lines = loadImport(dir, lines, Match.isImport(line));
17+
lines = loadImport({dir, lines, pathToMd: Match.isImport(line)});
1818
continue;
1919

2020
// ``` `
@@ -33,7 +33,7 @@ export function info(dir: string, result: CR.Output, lines: string[], index: CR.
3333

3434
// ##
3535
case !!Match.page(line):
36-
return page(dir, result, lines.slice(i), index);
36+
return page({dir, result, lines: lines.slice(i), index});
3737

3838
// description
3939
default:

‎src/build/parser/page.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {task} from './task';
33
import {loadImport} from './import';
44
import {bracketTracker, trimValue} from './cleanup';
55

6-
export function page(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
6+
export function page({ dir, result, lines, index}) {
77
index.page += 1;
88
index.task = -1;
99
result.pages.push({
@@ -53,14 +53,14 @@ export function page(dir: string, result: CR.Output, lines: string[], index: CR.
5353

5454
// ##
5555
case !!Match.page(line):
56-
return page(dir, result, lines.slice(i), index);
56+
return page({dir, result, lines: lines.slice(i), index});
5757

5858
// +
5959
case !!Match.task(line):
6060
if (result.pages[index.page].tasks === undefined) {
6161
result.pages[index.page].tasks = [];
6262
}
63-
return task(dir, result, lines.slice(i), index);
63+
return task({dir, result, lines: lines.slice(i), index});
6464

6565
// description
6666
default:

‎src/build/parser/task.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import {addToTasks} from './actions';
44
import {trimLeadingSpaces, bracketTracker, trimValue} from './cleanup';
55
import {loadImport} from './import';
66

7-
export function task(dir: string, result: CR.Output, lines: string[], index: CR.Index): CR.Output {
7+
export function task({
8+
dir, result, lines, index
9+
}) {
810
result.pages[index.page].tasks.push({
911
description: trimLeadingSpaces(Match.task(lines[0]))
1012
});
@@ -83,11 +85,11 @@ export function task(dir: string, result: CR.Output, lines: string[], index: CR.
8385

8486
// +
8587
case !!Match.task(line):
86-
return task(dir, result, lines.slice(i), index);
88+
return task({dir, result, lines: lines.slice(i), index});
8789

8890
// ##
8991
case !!Match.page(line):
90-
return page(dir, result, lines.slice(i), index);
92+
return page({dir, result, lines: lines.slice(i), index});
9193

9294

9395
// description

0 commit comments

Comments
 (0)