load imports from package.json config dir path

ShMcK · ShMcK · commit a081f3c87d7a · 2016-05-01T16:31:05.000-07:00
diff --git a/lib/build/parser/import.js b/lib/build/parser/import.js
@@ -3,13 +3,14 @@ var fs_1 = require('fs');
 var path_1 = require('path');
 var file_1 = require('../../tools/file');
 var cleanup_1 = require('./cleanup');
+var settings_1 = require('./settings');
 function loadImport(lines, pathToMd) {
     pathToMd = cleanup_1.trimQuotes(pathToMd);
     if (!pathToMd.match(/\.md$/)) {
         pathToMd = pathToMd.concat('.md');
     }
-    var realPath = path_1.join(process.cwd(), pathToMd);
-    if (!file_1.fileExists(pathToMd)) {
+    var realPath = path_1.join(process.cwd(), settings_1.tutorialDir, pathToMd);
+    if (!file_1.fileExists(realPath)) {
         console.log('Invalid path to markdown file', realPath);
         return;
     }
diff --git a/lib/build/parser/settings.js b/lib/build/parser/settings.js
@@ -0,0 +1,12 @@
+"use strict";
+var fs_1 = require('fs');
+var path_1 = require('path');
+var chalk_1 = require('chalk');
+var settings = null;
+try {
+    settings = JSON.parse(fs_1.readFileSync(path_1.join(process.cwd(), 'package.json'), 'utf8'));
+}
+catch (e) {
+    console.log(chalk_1.red('No package.json config found in directory ', process.cwd(), e));
+}
+exports.tutorialDir = settings.dir || 'tutorial';
diff --git a/lib/build/parser/tutorialDir.js b/lib/build/parser/tutorialDir.js
@@ -0,0 +1,2 @@
+"use strict";
+exports.tutorialDir = 'tutorial';
diff --git a/src/build/parser/import.ts b/src/build/parser/import.ts
@@ -2,14 +2,17 @@ import {readFileSync} from 'fs';
 import {join} from 'path';
 import {fileExists} from '../../tools/file';
 import {trimQuotes} from './cleanup';
+import {tutorialDir} from './settings';
 
 export function loadImport(lines: string[], pathToMd: string): string[] {
+  // add .md suffix
   pathToMd = trimQuotes(pathToMd);
   if (!pathToMd.match(/\.md$/)) {
     pathToMd = pathToMd.concat('.md');
   }
-  let realPath: string = join(process.cwd(), pathToMd);
-  if (!fileExists(pathToMd)) {
+  // get path to imports
+  let realPath: string = join(process.cwd(), tutorialDir, pathToMd);
+  if (!fileExists(realPath)) {
     console.log('Invalid path to markdown file', realPath);
     return;
   }
diff --git a/src/build/parser/settings.ts b/src/build/parser/settings.ts
@@ -0,0 +1,16 @@
+import {readFileSync} from 'fs';
+import {join} from 'path';
+import {red} from 'chalk';
+
+let settings = null;
+try {
+  settings = JSON.parse(
+    readFileSync(
+      join(process.cwd(), 'package.json'), 'utf8'
+    )
+  );
+} catch (e) {
+  console.log(red('No package.json config found in directory ', process.cwd(), e));
+}
+
+export const tutorialDir = settings.dir || 'tutorial';
diff --git a/src/cli.ts b/src/cli.ts
@@ -13,10 +13,10 @@ program
   .version('0.3.27')
   .usage('[options] <keywords>')
   .option('-b, --build [path/to/tutorial.md]',
-    'tutorial markdown file', /^.+\.md$/i)
+  'tutorial markdown file', /^.+\.md$/i)
   .option('-c, --create [name]', 'tutorial name')
   .option('-p, --publish [version]',
-    'publish tutorial to npm with new version number')
+  'publish tutorial to npm with new version number')
   .option('-t, --tutorials', 'list of tutorial packages')
   .option('-s, --search [query]', 'search for tutorial package')
   .option('-r, --run', 'run tutorial')
@@ -55,6 +55,6 @@ switch (true) {
     program.help();
 }
 
-// exit
+// success! exit
 process.stdout.write(green(' ✓\n'));
 process.exit(0);
diff --git a/tsconfig.json b/tsconfig.json
@@ -23,6 +23,7 @@
         "src/build/parser/info.ts",
         "src/build/parser/match.ts",
         "src/build/parser/page.ts",
+        "src/build/parser/settings.ts",
         "src/build/parser/task.ts",
         "src/build/readme.ts",
         "src/build/validators.ts",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+"use strict";`
	`2`	`+exports.tutorialDir = 'tutorial';`