playing around with test file format for mdsl and json split

dist/index.d.ts

@@ -2,5 +2,6 @@ import State from "./State";
 import { validateDefinition } from "./BehaviourTreeDefinitionValidator";
 import { convertMDSLToJSON } from "./mdsl/MDSLDefinitionParser";
 import { BehaviourTree, FlattenedTreeNode } from "./BehaviourTree";
+import { BehaviourTreeOptions } from "./BehaviourTreeOptions";
 export { BehaviourTree, State, convertMDSLToJSON, validateDefinition };
-export type { FlattenedTreeNode };
+export type { FlattenedTreeNode, BehaviourTreeOptions };

src/BehaviourTree.ts

@@ -12,6 +12,7 @@ import { convertMDSLToJSON } from "./mdsl/MDSLDefinitionParser";
 import { RootNodeDefinition } from "./BehaviourTreeDefinition";
 import { validateJSONDefinition } from "./BehaviourTreeDefinitionValidator";
 import buildRootNode from "./BehaviourTreeBuilder";
+import { isNullOrUndefined } from "./BehaviourTreeDefinitionUtilities";
 
 // Purely for outside inspection of the tree.
 export type FlattenedTreeNode = {
@@ -46,13 +47,13 @@ export class BehaviourTree {
         private options: BehaviourTreeOptions = {}
     ) {
         // The tree definition must be defined.
-        if (!definition) {
-            throw new Error("the tree definition must be a string ro");
+        if (isNullOrUndefined(definition)) {
+            throw new Error("tree definition not defined");
         }
 
         // The agent must be defined and not null.
         if (typeof agent !== "object" || agent === null) {
-            throw new Error("the agent must be defined and not null");
+            throw new Error("the agent must be an object and not null");
         }
 
         try {

src/index.ts

@@ -2,6 +2,7 @@ import State from "./State";
 import { validateDefinition } from "./BehaviourTreeDefinitionValidator";
 import { convertMDSLToJSON } from "./mdsl/MDSLDefinitionParser";
 import { BehaviourTree, FlattenedTreeNode } from "./BehaviourTree";
+import { BehaviourTreeOptions } from "./BehaviourTreeOptions";
 
 export { BehaviourTree, State, convertMDSLToJSON, validateDefinition };
-export type { FlattenedTreeNode };
+export type { FlattenedTreeNode, BehaviourTreeOptions };

test/behaviourTree.test.js

@@ -9,37 +9,46 @@ const findNode = (tree, type, caption) =>
 describe("A BehaviourTree instance", () => {
     describe("has initialisation logic that", () => {
         describe("should error when", () => {
-            it("the tree definition argument is not a string", () => {
+            it("the tree definition argument is not defined", () => {
+                assert.throws(() => new mistreevous.BehaviourTree(null, {}), Error, "tree definition not defined");
+                assert.throws(() => new mistreevous.BehaviourTree(undefined, {}), Error, "tree definition not defined");
+            });
+
+            it("the agent object is not defined", () => {
                 assert.throws(
-                    () => new mistreevous.BehaviourTree(null, {}),
+                    () => new mistreevous.BehaviourTree("", undefined),
                     Error,
-                    "the tree definition must be a string"
+                    "the agent must be an object and not null"
                 );
-            });
-
-            it("the tree definition argument is not a valid tree definition", () => {
                 assert.throws(
-                    () => new mistreevous.BehaviourTree("", {}),
+                    () => new mistreevous.BehaviourTree("", null),
                     Error,
-                    "error parsing tree: invalid token count"
+                    "the agent must be an object and not null"
                 );
-            });
-
-            it("the tree definition argument contains unexpected tokens", () => {
                 assert.throws(
-                    () => new mistreevous.BehaviourTree("invalid-token { }", {}),
+                    () => new mistreevous.BehaviourTree("", 42),
                     Error,
-                    "error parsing tree: unexpected token 'invalid-token'"
+                    "the agent must be an object and not null"
                 );
             });
+        });
 
-            it("the agent object is not defined", () => {
-                assert.throws(() => new mistreevous.BehaviourTree("", undefined), Error, "the agent must be defined");
+        describe("should not error when the tree definition argument is a valid definition", () => {
+            it("(MDSL)", () => {
+                const definition = "root { action [test] }";
+                assert.doesNotThrow(() => new mistreevous.BehaviourTree(definition, {}), Error);
             });
-        });
 
-        it("should not error when the tree definition argument is a valid definition", () => {
-            assert.doesNotThrow(() => new mistreevous.BehaviourTree("root { action [test] }", {}), Error);
+            it("(JSON)", () => {
+                const definition = {
+                    type: "root",
+                    child: {
+                        type: "action",
+                        call: "test"
+                    }
+                };
+                assert.doesNotThrow(() => new mistreevous.BehaviourTree(definition, {}), Error);
+            });
         });
     });