May 31, 2020 · May 31, 2020 · May 31, 2020 · May 31, 2020
diff --git a/src/build.ts b/src/build.ts
 // write tutorial
 if(tutorial){
 try{
 awaitwrite(options.output,JSON.stringify(tutorial),"utf8");
 awaitwrite(options.output,JSON.stringify(tutorial,null,2),"utf8");
 console.info(`Success! See output at${options.output}`);
 }catch(e){
 console.error("Error writing tutorial json file:");
diff --git a/src/utils/commits.ts b/src/utils/commits.ts
 thrownewError(`Code branch "${codeBranch}" not found`);
 }

 console.log("branches",branches);

 // Checkout the code branches
 awaitgit.checkout(codeBranch);

 console.log("checked out");

 // Load all logs
 constlogs=awaitgit.log();

 console.log("logs",logs);
 // track the original branch in case of failure
 constoriginalBranch=branches.current;

 // Filter relevant logs
 constcommits:CommitLogObject={};

 for(constcommitoflogs.all){
 constmatches=commit.message.match(
 /^(?<stepId>(?<levelId>L\d+)(S\d+))(?<stepType>[QA])?/
 );

 if(matches&&matches.length){
 // Use an object of commit arrays to collect all commits
 constposition=matches[0];
 if(!commits[position]){
 // does not exist, create the list
 commits[position]=[commit.hash];
 }else{
 // add to the list
 commits[position].push(commit.hash);
 try{
 // Checkout the code branches
 awaitgit.checkout(codeBranch);

 // Load all logs
 constlogs=awaitgit.log();

 for(constcommitoflogs.all){
 constmatches=commit.message.match(
 /^(?<stepId>(?<levelId>L\d+)(S\d+))(?<stepType>[QA])?/
 );

 if(matches&&matches.length){
 // Use an object of commit arrays to collect all commits
 constposition=matches[0];
 if(!commits[position]){
 // does not exist, create the list
 commits[position]=[commit.hash];
 }else{
 // add to the list
 commits[position].push(commit.hash);
 }
 }
 }
 }catch(e){
 console.error("Error with checkout or commit matching");
 thrownewError(e.message);
 }finally{
 // revert back to the original branch on failure
 awaitgit.checkout(originalBranch);
 // cleanup the tmp directory
 awaitrmdir(tmpDir,{recursive:true});
 }

 console.log("remove");
 // cleanup the tmp directory
 awaitrmdir(tmpDir,{recursive:true});
 returncommits;
 }
diff --git a/src/utils/parse.ts b/src/utils/parse.ts
 constmdContent:TutorialFrame=parseMdContent(params.text);

 constparsed:Partial<T.Tutorial>={
 version:params.config.version,
 summary:mdContent.summary,
 config:params.config.config,
 levels:[],
diff --git a/src/utils/schema/index.ts b/src/utils/schema/index.ts
 "The solution commits that can be loaded if the user gets stuck. It can also run commands and/or open files",
 },
 {
 required:["commits"],
 required:[],
 },
 ],
 },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -124,7 +124,7 @@ async function build(args: string[]) {
		// write tutorial
		if(tutorial){
		try{
		awaitwrite(options.output,JSON.stringify(tutorial),"utf8");
		awaitwrite(options.output,JSON.stringify(tutorial,null,2),"utf8");
		console.info(`Success! See output at${options.output}`);
		}catch(e){
		console.error("Error writing tutorial json file:");
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,41 +45,45 @@ export async function getCommits({
		thrownewError(`Code branch "${codeBranch}" not found`);
		}

		console.log("branches",branches);

		// Checkout the code branches
		awaitgit.checkout(codeBranch);

		console.log("checked out");

		// Load all logs
		constlogs=awaitgit.log();

		console.log("logs",logs);
		// track the original branch in case of failure
		constoriginalBranch=branches.current;

		// Filter relevant logs
		constcommits:CommitLogObject={};

		for(constcommitoflogs.all){
		constmatches=commit.message.match(
		/^(?<stepId>(?<levelId>L\d+)(S\d+))(?<stepType>[QA])?/
		);

		if(matches&&matches.length){
		// Use an object of commit arrays to collect all commits
		constposition=matches[0];
		if(!commits[position]){
		// does not exist, create the list
		commits[position]=[commit.hash];
		}else{
		// add to the list
		commits[position].push(commit.hash);
		try{
		// Checkout the code branches
		awaitgit.checkout(codeBranch);

		// Load all logs
		constlogs=awaitgit.log();

		for(constcommitoflogs.all){
		constmatches=commit.message.match(
		/^(?<stepId>(?<levelId>L\d+)(S\d+))(?<stepType>[QA])?/
		);

		if(matches&&matches.length){
		// Use an object of commit arrays to collect all commits
		constposition=matches[0];
		if(!commits[position]){
		// does not exist, create the list
		commits[position]=[commit.hash];
		}else{
		// add to the list
		commits[position].push(commit.hash);
		}
		}
		}
		}catch(e){
		console.error("Error with checkout or commit matching");
		thrownewError(e.message);
		}finally{
		// revert back to the original branch on failure
		awaitgit.checkout(originalBranch);
		// cleanup the tmp directory
		awaitrmdir(tmpDir,{recursive:true});
		}

		console.log("remove");
		// cleanup the tmp directory
		awaitrmdir(tmpDir,{recursive:true});
		returncommits;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,6 +98,7 @@ export function parse(params: ParseParams): any {
		constmdContent:TutorialFrame=parseMdContent(params.text);

		constparsed:Partial<T.Tutorial>={
		version:params.config.version,
		summary:mdContent.summary,
		config:params.config.config,
		levels:[],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -193,7 +193,7 @@ export default {
		"The solution commits that can be loaded if the user gets stuck. It can also run commands and/or open files",
		},
		{
		required:["commits"],
		required:[],
		},
		],
		},
Expand Down