add @resource for pages

ShMcK · ShMcK · commit c5fe1d866e0a · 2016-09-16T20:48:35.000-07:00
diff --git a/lib/build/lint.js b/lib/build/lint.js
@@ -2,7 +2,7 @@
 var chalk_1 = require('chalk');
 var validKeys = {
     info: ['title', 'description'],
-    page: ['title', 'description', 'onPageComplete', 'tasks', 'video', 'resource'],
+    page: ['title', 'description', 'onPageComplete', 'tasks', 'video', 'resources'],
     task: ['description', 'tests', 'actions', 'hints']
 };
 function lintOutput(json) {
diff --git a/lib/build/parser/actions.js b/lib/build/parser/actions.js
@@ -47,16 +47,6 @@ function addToTasks(_a) {
                 task: task,
             });
             break;
-        case 'resource':
-            result = doAction({
-                type: 'resource',
-                isArray: isActionArray,
-                actionValue: actionValue,
-                result: result,
-                page: page,
-                task: task
-            });
-            break;
         case 'continue':
             break;
         case 'action':
diff --git a/lib/build/parser/match.js b/lib/build/parser/match.js
@@ -8,9 +8,10 @@ var regex = {
     '##': match('#', 2),
     '+': match('\\+', 1),
     '```': match('`', 3),
-    'action': /^@(action|test|hint|openConsole|resource)/,
+    'action': /^@(action|test|hint|openConsole)/,
     'import': /^@import\((.+)\)$/,
     'onPageComplete': /^(@onPageComplete.+)/,
+    'resource': /^(@resource.+)/,
 };
 function parseWithCode(code) {
     return function (line) {
@@ -32,6 +33,7 @@ exports.codeBlock = parseWithCode('```');
 exports.isAction = parseWithCode('action');
 exports.isImport = parseWithCode('import');
 exports.isPageComplete = parseWithCode('onPageComplete');
+exports.isResource = parseWithCode('resource');
 exports.isArray = function (line) {
     var isMatch = line.match(/^\[.+\]$/);
     return isMatch ? isMatch[0] : null;
diff --git a/lib/build/parser/page.js b/lib/build/parser/page.js
@@ -37,6 +37,12 @@ function page(_a) {
                     currentPageComplete = null;
                 }
                 continue;
+            case (!!Match.isResource(line)):
+                if (!result.pages[index.page].resources) {
+                    result.pages[index.page].resources = [];
+                }
+                result.pages[index.page].resources.push(cleanup_1.trimValue(Match.isResource(line)));
+                continue;
             case !!Match.codeBlock(line):
                 if (line.length > 3) {
                     result.pages[index.page].description += '\n' + line;
diff --git a/lib/build/parser/task.js b/lib/build/parser/task.js
@@ -32,6 +32,12 @@ function task(_a) {
                     currentPageComplete = null;
                 }
                 continue;
+            case (!!Match.isResource(line)):
+                if (!result.pages[index.page].resources) {
+                    result.pages[index.page].resources = [];
+                }
+                result.pages[index.page].resources.push(cleanup_1.trimValue(Match.isResource(line)));
+                continue;
             case !!currentAction:
                 if (line.length === 0) {
                     currentAction += '\n';
diff --git a/src/build/lint.ts b/src/build/lint.ts
@@ -2,7 +2,7 @@ import {yellow, red} from 'chalk';
 
 const validKeys = {
   info: ['title', 'description'],
-  page: ['title', 'description', 'onPageComplete', 'tasks', 'video', 'resource'],
+  page: ['title', 'description', 'onPageComplete', 'tasks', 'video', 'resources'],
   task: ['description', 'tests', 'actions', 'hints']
 };
 
diff --git a/src/build/parser/actions.ts b/src/build/parser/actions.ts
@@ -50,16 +50,6 @@ export function addToTasks({ result, line, index: {page, task} }) {
         task,
       });
       break;
-    case 'resource':
-      result = doAction({
-        type: 'resource',
-        isArray: isActionArray,
-        actionValue,
-        result,
-        page,
-        task
-      });
-      break;
     case 'continue':
       break;
     case 'action':
diff --git a/src/build/parser/match.ts b/src/build/parser/match.ts
@@ -9,9 +9,10 @@ var regex = {
   '##': match('#', 2),
   '+': match('\\+', 1),
   '```': match('`', 3),
-  'action': /^@(action|test|hint|openConsole|resource)/,
+  'action': /^@(action|test|hint|openConsole)/,
   'import': /^@import\((.+)\)$/,
   'onPageComplete': /^(@onPageComplete.+)/,
+  'resource': /^(@resource.+)/,
 };
 
 function parseWithCode(code: string) {
@@ -34,6 +35,7 @@ export const codeBlock = parseWithCode('```');
 export const isAction = parseWithCode('action');
 export const isImport = parseWithCode('import');
 export const isPageComplete = parseWithCode('onPageComplete');
+export const isResource = parseWithCode('resource')
 
 export const isArray = function(line: string): string {
   let isMatch = line.match(/^\[.+\]$/);
diff --git a/src/build/parser/page.ts b/src/build/parser/page.ts
@@ -44,6 +44,13 @@ export default function page({ dir, result, lines, index }) {
         }
         continue;
 
+      case (!!Match.isResource(line)):
+        if (!result.pages[index.page].resources) {
+          result.pages[index.page].resources = [];
+        }
+        result.pages[index.page].resources.push(trimValue(Match.isResource(line)));
+        continue;
+
       // ``` `
       case !!Match.codeBlock(line):
         if (line.length > 3) {
diff --git a/src/build/parser/task.ts b/src/build/parser/task.ts
@@ -39,6 +39,13 @@ export default function task({ dir, result, lines, index }) {
         }
         continue;
 
+      case (!!Match.isResource(line)):
+        if (!result.pages[index.page].resources) {
+          result.pages[index.page].resources = [];
+        }
+        result.pages[index.page].resources.push(trimValue(Match.isResource(line)));
+        continue;
+
       // @action multiline
       case !!currentAction:
         if (line.length === 0) {
