Fix relative paths in includes

src/cli.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import process from 'process';
 import path from 'path';
+import fs from 'fs';
 import { RenderSettings } from './settings';
 import { analyze } from './analysis';
 import { launchInteractive } from './interactive';
@@ -31,7 +32,7 @@ export type Action = { function: Function, args: any[] };
 
 function readFile(path: string): string {
   try {
-    return fileUtils.readFile(path, null);
+    return '' + fs.readFileSync(path);
   } catch {
     handleNonexistingPath(path);
     process.exit(1);

src/fileUtils.ts

@@ -1,19 +1,6 @@
 import fs from 'fs';
-import path from 'path';
 
 
-export function readFile(filePath: string, workingDir: string | null): string {
-  if (workingDir) {
-    // Sanity check that the given working dir is a directory.
-    // the stat call will also error if the directory is invalid
-    if (!fs.lstatSync(workingDir).isDirectory()) {
-      throw new Error()
-    }
-    filePath = path.resolve(workingDir, filePath);
-  }
-  return '' + fs.readFileSync(filePath);
-}
-
 export function readStdin(): string {
   return fs.readFileSync(0, 'utf8'); // STDIN_FILENO = 0
 }

src/renderer.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import process from 'process';
+import fs from 'fs';
 import * as rand from './rand';
 import * as postprocessing from './postprocessing';
 import { defaultBMLSettings, defaultRenderSettings, mergeSettings, RenderSettings } from './settings';
@@ -12,7 +13,6 @@ import { Choice } from './weightedChoice';
 import { isStr } from './stringUtils';
 import { EvalDisabledError, IncludeError } from './errors';
 import { EvalContext } from './evalBlock';
-import * as fileUtils from './fileUtils';
 
 
 // If the referred fork is a silent set fork that has not yet been executed,
@@ -157,9 +157,10 @@ export class Renderer {
   renderInclude(includePath: string): string {
     let rngState = rand.saveRngState();
     let bmlDocumentString;
+    let resolvedWorkingDir = this.settings.workingDir || process.cwd();
+    let resolvedIncludePath = path.resolve(resolvedWorkingDir, includePath);
     try {
-      let resolvedWorkingDir = this.settings.workingDir || process.cwd();
-      bmlDocumentString = fileUtils.readFile(includePath, resolvedWorkingDir);
+      bmlDocumentString = '' + fs.readFileSync(resolvedIncludePath);
     } catch (e) {
       if (typeof window !== 'undefined') {
         throw new IncludeError(includePath, `Includes can't be used in browsers`);
@@ -172,10 +173,10 @@ export class Renderer {
 
     let lexer = new Lexer(bmlDocumentString);
     let ast = parseDocument(lexer, true);
-    let subWorkingDir = path.dirname(path.join(this.settings.workingDir || '', includePath))
+    let subWorkingDir = path.dirname(resolvedIncludePath)
     let subSettings = {
+      ...this.settings,
       workingDir: subWorkingDir,
-      ...this.settings
     }
     let subRenderer = new Renderer(subSettings);
     let result = subRenderer.renderWithoutPostProcess(ast);

test/testRenderer.ts

@@ -224,7 +224,7 @@ insert('foo got ' + forkResult);
 
   it('Allows disabling eval execution', function() {
     let testString = `{[insert('foo')]}`;
-    expect(() => render(testString, { allowEval: false }, null))
+    expect(() => render(testString, { allowEval: false }))
       .toThrow(EvalDisabledError);
   })