improved typings

Author: ShMcK

.npmignore

@@ -1,6 +1,5 @@
 src
 test
-typings
 tsd.json
 tsconfig.json
 tslint.json

lib/build/build.js

@@ -6,7 +6,10 @@ var readme_1 = require('./readme');
 var cleanup_1 = require('./parser/cleanup');
 function build(lines) {
     var result = {
-        project: {},
+        project: {
+            title: '',
+            description: ''
+        },
         chapters: []
     };
     var index = {

lib/build/parser/actions.js

@@ -27,8 +27,7 @@ function doAction(type, isArray, actionValue, result, line, index) {
     return result;
 }
 function addToTasks(result, line, index) {
-    var match = Match.isAction(line);
-    var action = match.action;
+    var action = Match.isAction(line);
     var task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
     var trimmedContent = line.slice(action.length + 2, line.length - 1);
     var actionValue = cleanup_1.trimQuotes(trimmedContent);
@@ -40,6 +39,8 @@ function addToTasks(result, line, index) {
         case 'hint':
             result = doAction('hints', isActionArray, actionValue, result, line, index);
             break;
+        case 'continue':
+            result = doAction('continue', isActionArray, actionValue, result, line, index);
         case 'action':
             if (task.actions === undefined) {
                 result.chapters[index.chapter].pages[index.page].tasks[index.task].actions = [];

lib/build/parser/chapter.js

@@ -7,6 +7,7 @@ function chapter(result, lines, index) {
     index.chapter += 1;
     result.chapters.push({
         title: Match.chapter(lines[0]).trim(),
+        description: '',
         pages: []
     });
     var inCodeBlock = false;
@@ -42,9 +43,6 @@ function chapter(result, lines, index) {
 }
 exports.chapter = chapter;
 function addToDescription(i, result, line, index) {
-    if (result.chapters[index.chapter].description === undefined) {
-        result.chapters[index.chapter].description = '';
-    }
     if (i > 1) {
         result.chapters[index.chapter].description += '\n';
     }

lib/build/parser/match.js

@@ -12,13 +12,13 @@ var regex = {
 function parseWithCode(code) {
     return function (line) {
         if (!line) {
-            return false;
+            return null;
         }
         if (line.match(regex[code])) {
             return regex[code].exec(line)[1];
         }
         else {
-            return false;
+            return null;
         }
     };
 }
@@ -33,15 +33,13 @@ exports.task = parseWithCode('+');
 exports.codeBlock = parseWithCode('```');
 exports.isArray = function (line) {
     var isMatch = line.match(/^\[.+\]$/);
-    return isMatch ? isMatch[0] : false;
+    return isMatch ? isMatch[0] : null;
 };
 exports.isAction = function (line) {
-    var match = line.match(/^@(action|test|hint)/);
-    return !!match ? {
-        action: match[1]
-    } : false;
+    var match = line.match(/^@(action|test|hint|continue)/);
+    return !!match ? match[1] : null;
 };
 exports.isImport = function (line) {
     var isMatch = line.match(/^@import\((.+)\)$/);
-    return isMatch ? isMatch[1] : false;
+    return isMatch ? isMatch[1] : null;
 };

lib/build/parser/page.js

@@ -8,7 +8,8 @@ function page(result, lines, index) {
     index.page += 1;
     index.task = -1;
     result.chapters[index.chapter].pages.push({
-        title: Match.page(lines[0]).trim()
+        title: Match.page(lines[0]).trim(),
+        description: ''
     });
     var inCodeBlock = false;
     var i = 0;
@@ -53,9 +54,6 @@ function page(result, lines, index) {
 exports.page = page;
 function addToDescriptionOrExplanation(hasBreak, i, result, line, index) {
     if (!hasBreak) {
-        if (result.chapters[index.chapter].pages[index.page].description === undefined) {
-            result.chapters[index.chapter].pages[index.page].description = '';
-        }
         if (i > 1) {
             result.chapters[index.chapter].pages[index.page].description += '\n';
         }

lib/build/parser/project.js

@@ -3,10 +3,6 @@ var Match = require('./match');
 var chapter_1 = require('./chapter');
 var import_1 = require('./import');
 function project(result, lines, index) {
-    result.project = {
-        title: '',
-        description: ''
-    };
     var inCodeBlock = false;
     var i = -1;
     while (i < lines.length - 1) {

lib/build/readme.js

@@ -8,12 +8,10 @@ function createReadme() {
         console.log('No coderoad.json file found');
         return;
     }
-    ;
     if (!file_1.fileExists('./package.json')) {
         console.log('No package.json file found');
         return;
     }
-    ;
     var data = JSON.parse(fs.readFileSync('coderoad.json', 'utf8'));
     var packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
     var content = generateReadme(data, packageJson);

lib/cli.js

@@ -8,7 +8,6 @@ var create_1 = require('./create/create');
 var search_1 = require('./search/search');
 var tutorials_1 = require('./tutorials/tutorials');
 var publish_1 = require('./publish/publish');
-var docs_1 = require('./docs/docs');
 program
     .version('0.3.12')
     .usage('[options] <keywords>')
@@ -18,10 +17,9 @@ program
     .option('-t, --tutorials', 'list of tutorial packages')
     .option('-s, --search [query]', 'search for tutorial package')
     .option('-r, --run', 'run tutorial')
-    .option('-d, --docs', 'development documentation')
     .parse(process.argv);
 if (!program.args.length &&
-    !program.build && !program.tutorials && !program.run && !program.docs) {
+    !program.build && !program.tutorials && !program.run) {
     program.help();
 }
 else {
@@ -47,8 +45,5 @@ else {
         var version = program.args[0];
         publish_1.default(version);
     }
-    if (program.docs) {
-        docs_1.default();
-    }
     process.exit(0);
 }

lib/create/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 var chalk = require('chalk');
-var validateNpm = require("validate-npm-package-name");
+var validateNpm = require('validate-npm-package-name');
 var _ = require('lodash');
 function validatePackageName(name) {
     var validated = validateNpm(name);