Merge branch 'master' into jz/reverse-dynamic-tags

y-lohse · May 14, 2024 · 97254b0 · 97254b0
2 parents 87f8596 + b35555e
commit 97254b0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/script/inkjs-compiler.ts b/script/inkjs-compiler.ts
@@ -8,6 +8,8 @@ var path = require('path');
 import * as fs from "fs";
 import { ErrorHandler } from '../src/engine/Error';
 
+const BOM = '\u{feff}';
+
 const help = process.argv.includes("-h");
 if(help){
 process.stdout.write(`
@@ -36,30 +38,39 @@ if(!inputFile){
     process.stderr.write("No input file specified. -h for help\n");
     process.exit(1);
 }
-outputfile = outputfile || inputFile+".json";
-
-const fileHandler = new PosixFileHandler(path.dirname(inputFile));
-const mainInk = fileHandler.LoadInkFileContents(inputFile);
-
-const errorHandler: ErrorHandler = (message, errorType) => {
-    process.stderr.write(message + "\n");
-};
-const options = new CompilerOptions(
-    inputFile, [], countAllVisit, errorHandler, fileHandler
-)
-
-const c = new Compiler(mainInk, options);
-const rstory = c.Compile();
-if (!rstory) {
-    process.stderr.write("*** Compilation failed ***\n");
-    process.exit(1);
-}
 
-const jsonStory = rstory.ToJson()
+let jsonStory: string = "";
+
+if(!inputFile.endsWith(".json")){
+    outputfile = outputfile || inputFile+".json";
+
+    const fileHandler = new PosixFileHandler(path.dirname(inputFile));
+    const mainInk = fileHandler.LoadInkFileContents(inputFile);
+
+    const errorHandler: ErrorHandler = (message, errorType) => {
+        process.stderr.write(message + "\n");
+    };
+    const options = new CompilerOptions(
+        inputFile, [], countAllVisit, errorHandler, fileHandler
+    )
 
-if(jsonStory && write){
-    const BOM = '\u{feff}';
-    fs.writeFileSync(outputfile, BOM+jsonStory);
+    const c = new Compiler(mainInk, options);
+    const rstory = c.Compile();
+    if (!rstory) {
+        process.stderr.write("*** Compilation failed ***\n");
+        process.exit(1);
+    }
+    let jsonified: string | void;
+
+    if((jsonified = rstory.ToJson())){
+        jsonStory = jsonified
+    }
+
+    if(jsonStory && write){
+        fs.writeFileSync(outputfile, BOM+jsonStory);
+    }
+}else{
+    jsonStory = fs.readFileSync(inputFile,"utf-8").replace(BOM, "")
 }
 
 if(jsonStory && play){

diff --git a/src/engine/ControlCommand.ts b/src/engine/ControlCommand.ts
@@ -96,7 +96,7 @@ export class ControlCommand extends InkObject {
     return new ControlCommand(ControlCommand.CommandType.EndTag);
   }
   public toString() {
-    return this.commandType.toString();
+    return "ControlCommand " + this.commandType.toString();
   }
 }
 

diff --git a/src/engine/Void.ts b/src/engine/Void.ts
@@ -1,3 +1,7 @@
 import { InkObject } from "./Object";
 
-export class Void extends InkObject {}
+export class Void extends InkObject {
+  public toString() {
+    return "Void";
+  }
+}