questmark 0.0.24 → 0.0.29

package/dist/cjs/QuestVM.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { VM, Functions } from "tzo";
+import { Functions } from "tzo";
+import { VM } from "tzo";
 export interface Choice {
     title: string;
     id: number;

package/dist/cjs/parseMarkdown.js

@@ -13,8 +13,7 @@ const unist_util_visit_parents_1 = __importDefault(require("unist-util-visit-par
 const unist_util_visit_1 = __importDefault(require("unist-util-visit"));
 const unist_builder_1 = __importDefault(require("unist-builder"));
 require("array-flat-polyfill");
-const tzo_1 = __importDefault(require("tzo"));
-const { Tokenizer, pushString, pushNumber, invokeFunction } = tzo_1.default;
+const tzo_1 = require("tzo");
 var NoLinkBehaviour;
 (function (NoLinkBehaviour) {
     NoLinkBehaviour[NoLinkBehaviour["EXIT"] = 0] = "EXIT";
@@ -22,7 +21,7 @@ var NoLinkBehaviour;
 })(NoLinkBehaviour = exports.NoLinkBehaviour || (exports.NoLinkBehaviour = {}));
 function parseMarkdown(file_contents) {
     const tree = mdast_util_from_markdown_1.default(file_contents);
-    const tokenizer = new Tokenizer();
+    const tokenizer = new tzo_1.Tokenizer();
     const root = unist_builder_1.default('questmarkDocument', { options: {} }, []);
     let last_once_directive_nr = 0;
     let noLinkBehaviour = NoLinkBehaviour.LOOPBACK_TO_OPTIONS;
@@ -195,18 +194,18 @@ function parseMarkdown(file_contents) {
                     if (node.options["initial-context"]) {
                         Object.entries(node.options["initial-context"]).forEach(entry => {
                             if (typeof entry[1] === "string") {
-                                q(pushString(entry[1]));
+                                q(tzo_1.pushString(entry[1]));
                             }
                             else if (typeof entry[1] === "number") {
-                                q(pushNumber(entry[1]));
+                                q(tzo_1.pushNumber(entry[1]));
                             }
-                            q(pushString(entry[0]));
-                            q(invokeFunction("setContext"));
+                            q(tzo_1.pushString(entry[0]));
+                            q(tzo_1.invokeFunction("setContext"));
                         });
                     }
                     if (node.options["initial-state"]) {
-                        q(pushString(node.options["initial-state"]));
-                        q(invokeFunction("goto"));
+                        q(tzo_1.pushString(node.options["initial-state"]));
+                        q(tzo_1.invokeFunction("goto"));
                     }
                     if (node.options["options"]) {
                         if (node.options["options"]["no_link_behaviour"]) {
@@ -244,10 +243,10 @@ function parseMarkdown(file_contents) {
                         last_once_directive_nr += 1;
                     }
                     if (has_once_directive) {
-                        q(pushString(once_directive_name));
-                        q(invokeFunction("hasContext"));
-                        q(invokeFunction("jz"));
-                        q(invokeFunction("{")); // once directive block start
+                        q(tzo_1.pushString(once_directive_name));
+                        q(tzo_1.invokeFunction("hasContext"));
+                        q(tzo_1.invokeFunction("jz"));
+                        q(tzo_1.invokeFunction("{")); // once directive block start
                     }
                     if (option.preconditionChildren !== null) {
                         has_precondition = true;
@@ -261,25 +260,25 @@ function parseMarkdown(file_contents) {
                         });
                     }
                     if (has_precondition) {
-                        q(invokeFunction("jgz"));
-                        q(invokeFunction("{")); // precondition block start
+                        q(tzo_1.invokeFunction("jgz"));
+                        q(tzo_1.invokeFunction("{")); // precondition block start
                     }
                     if (option.text !== null) {
                         if (option.text.includes("`")) {
                             // TODO: support inlineCode in options. Can do via `concat`.
                             console.warn("WARN: Option text contains a backtick. Inline code elements in option blocks is currently not supported!");
                         }
-                        q(pushString(option.text));
+                        q(tzo_1.pushString(option.text));
                     }
-                    q(invokeFunction("ppc")); // push address of effect body to stack
-                    q(pushNumber(4));
-                    q(invokeFunction("+"));
-                    q(invokeFunction("{")); // effect body start
+                    q(tzo_1.invokeFunction("ppc")); // push address of effect body to stack
+                    q(tzo_1.pushNumber(4));
+                    q(tzo_1.invokeFunction("+"));
+                    q(tzo_1.invokeFunction("{")); // effect body start
                     if (has_once_directive) {
                         // set the once directive context variable immediatley
-                        q(pushNumber(1));
-                        q(pushString(once_directive_name));
-                        q(invokeFunction("setContext"));
+                        q(tzo_1.pushNumber(1));
+                        q(tzo_1.pushString(once_directive_name));
+                        q(tzo_1.invokeFunction("setContext"));
                     }
                     if (option.effectChildren !== null) {
                         option.effectChildren.forEach(child => {
@@ -295,35 +294,35 @@ function parseMarkdown(file_contents) {
                                 instructions.forEach(i => q(i));
                             }
                             else {
-                                q(pushString(fixText(child)));
-                                q(invokeFunction("emit"));
+                                q(tzo_1.pushString(fixText(child)));
+                                q(tzo_1.invokeFunction("emit"));
                             }
                         });
                     }
                     if (option.link !== null) {
-                        q(pushString(option.link.substr(1)));
-                        q(invokeFunction("goto"));
+                        q(tzo_1.pushString(option.link.substr(1)));
+                        q(tzo_1.invokeFunction("goto"));
                     }
                     if (noLinkBehaviour === NoLinkBehaviour.LOOPBACK_TO_OPTIONS) {
-                        q(pushString(nodeOptionsLabel)); // ensure that options with no link or "goto" effect loop back to the options
-                        q(invokeFunction("goto"));
+                        q(tzo_1.pushString(nodeOptionsLabel)); // ensure that options with no link or "goto" effect loop back to the options
+                        q(tzo_1.invokeFunction("goto"));
                     }
                     else if (noLinkBehaviour === NoLinkBehaviour.EXIT) {
-                        q(invokeFunction("exit")); // ensure that options with no effect or link cause the VM to exit
+                        q(tzo_1.invokeFunction("exit")); // ensure that options with no effect or link cause the VM to exit
                     }
-                    q(invokeFunction("}")); // effect body end
-                    q(invokeFunction("response"));
+                    q(tzo_1.invokeFunction("}")); // effect body end
+                    q(tzo_1.invokeFunction("response"));
                     if (has_once_directive) {
                         // when there was a once directive, ensure we close its block
-                        q(invokeFunction("}")); // once directive block end
+                        q(tzo_1.invokeFunction("}")); // once directive block end
                     }
                     if (has_precondition) {
                         // when there was a precondition, ensure we close the precondition block
-                        q(invokeFunction("}")); // precondition block end
+                        q(tzo_1.invokeFunction("}")); // precondition block end
                     }
                 });
-                q(invokeFunction("getResponse")); // getResponse is expected to pause the VM and push the relevant programlist index onto the stack
-                q(invokeFunction("goto")); // goto whatever was pushed onto the stack by getResponse
+                q(tzo_1.invokeFunction("getResponse")); // getResponse is expected to pause the VM and push the relevant programlist index onto the stack
+                q(tzo_1.invokeFunction("goto")); // goto whatever was pushed onto the stack by getResponse
                 return "skip";
                 // children have been parsed earlier
                 break;
@@ -337,15 +336,15 @@ function parseMarkdown(file_contents) {
                 instructions.forEach(i => q(i));
                 break;
             case "text":
-                q(pushString(fixText(node)));
-                q(invokeFunction("emit"));
+                q(tzo_1.pushString(fixText(node)));
+                q(tzo_1.invokeFunction("emit"));
                 break;
             default:
                 break;
         }
     };
     unist_util_visit_1.default(root, visitorFunc);
-    q(invokeFunction("exit")); // ensure we always exit at the end
+    q(tzo_1.invokeFunction("exit")); // ensure we always exit at the end
     return {
         parsedMDFile: unist_util_remove_position_1.default(root, true),
         qvmState

package/dist/mjs/QuestVM.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { VM, Functions } from "tzo";
+import { Functions } from "tzo";
+import { VM } from "tzo";
 export interface Choice {
     title: string;
     id: number;

package/dist/mjs/parseMarkdown.js

@@ -7,8 +7,7 @@ import visitParents from "unist-util-visit-parents";
 import visit from "unist-util-visit";
 import u from "unist-builder";
 import 'array-flat-polyfill';
-import pkg from 'tzo';
-const { Tokenizer, pushString, pushNumber, invokeFunction } = pkg;
+import { Tokenizer, pushString, pushNumber, invokeFunction } from "tzo";
 export var NoLinkBehaviour;
 (function (NoLinkBehaviour) {
     NoLinkBehaviour[NoLinkBehaviour["EXIT"] = 0] = "EXIT";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "questmark",
-  "version": "0.0.24",
+  "version": "0.0.29",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",
@@ -29,7 +29,7 @@
     "mdast": "^3.0.0",
     "mdast-util-from-markdown": "^0.1.1",
     "node-fetch": "^2.6.5",
-    "tzo": "^1.0.9",
+    "tzo": "^1.0.14",
     "unist-builder": "^2.0.3",
     "unist-util-filter": "^2.0.2",
     "unist-util-find-after": "^3.0.0",