Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbac2e2e

Browse files
committed
prepare refactor, update action tests
1 parent835b2fd commitbac2e2e

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
varnode_file_exists_1=require('node-file-exists');
55
varcleanup_1=require('./cleanup');
66
varsettings_1=require('./settings');
7-
functionloadImport(dir,lines,pathToMd){
7+
functionloadImport(_a){
8+
vardir=_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
varMatch=require('./match');
33
varpage_1=require('./page');
44
varimport_1=require('./import');
5-
functioninfo(dir,result,lines,index){
5+
functioninfo(_a){
6+
vardir=_a.dir,result=_a.result,lines=_a.lines,index=_a.index;
67
varinCodeBlock=false;
78
vari=-1;
89
while(i<lines.length-1){
910
i+=1;
1011
varline=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-
returnpage_1.page(dir,result,lines.slice(i),index);
28+
returnpage_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
vartask_1=require('./task');
44
varimport_1=require('./import');
55
varcleanup_1=require('./cleanup');
6-
functionpage(dir,result,lines,index){
6+
functionpage(_a){
7+
vardir=_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
caseinCodeBlock:
4344
continue;
4445
case!!Match.page(line):
45-
returnpage(dir,result,lines.slice(i),index);
46+
returnpage({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-
returntask_1.task(dir,result,lines.slice(i),index);
51+
returntask_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
varactions_1=require('./actions');
55
varcleanup_1=require('./cleanup');
66
varimport_1=require('./import');
7-
functiontask(dir,result,lines,index){
7+
functiontask(_a){
8+
vardir=_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-
returntask(dir,result,lines.slice(i),index);
70+
returntask({dir:dir,result:result,lines:lines.slice(i),index:index});
7071
case!!Match.page(line):
71-
returnpage_1.page(dir,result,lines.slice(i),index);
72+
returnpage_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-
exportfunctionloadImport(dir:string,lines:string[],pathToMd:string):string[]{
7+
exportfunctionloadImport({ 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-
exportfunctioninfo(dir:string,result:CR.Output,lines:string[],index:CR.Index):CR.Output{
5+
exportfunctioninfo({ dir, result, lines, index}):CR.Output{
66
letinCodeBlock=false;
77
leti=-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-
returnpage(dir,result,lines.slice(i),index);
36+
returnpage({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-
exportfunctionpage(dir:string,result:CR.Output,lines:string[],index:CR.Index):CR.Output{
6+
exportfunctionpage({ 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-
returnpage(dir,result,lines.slice(i),index);
56+
returnpage({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-
returntask(dir,result,lines.slice(i),index);
63+
returntask({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-
exportfunctiontask(dir:string,result:CR.Output,lines:string[],index:CR.Index):CR.Output{
7+
exportfunctiontask({
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-
returntask(dir,result,lines.slice(i),index);
88+
returntask({dir, result,lines:lines.slice(i), index});
8789

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

9294

9395
// description

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp