.vscode/launch.json

@@ -5,14 +5,12 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "chrome",
+            "type": "pwa-chrome",
             "request": "launch",
             "runtimeExecutable": "/usr/bin/chromium",
             "name": "Launch Chrome against localhost",
             "url": "http://localhost:30000/game",
-            "pathMapping": {
-                "/systems/ds4": "${workspaceFolder}/dist"
-            }
+            "webRoot": "${workspaceFolder}/dist"
         }
     ]
 }

src/documents/actor/actor.js

@@ -5,8 +5,7 @@
 
 import { DS4 } from "../../config";
 import { createCheckRoll } from "../../dice/check-factory";
-import { Evaluator } from "../../expression-evaluation/evaluator";
-import { Validator } from "../../expression-evaluation/validator";
+import { mathEvaluator } from "../../expression-evaluation/evaluator";
 import { logger } from "../../utils/logger";
 import { getGame } from "../../utils/utils";
 import { DS4ActiveEffect } from "../active-effect";
@@ -60,7 +59,7 @@ export class DS4Actor extends Actor {
   }
 
   /**
-   * The effects that should be applied to this actor.
+   * The effects that should be applioed to this actor.
    * @type {import("../active-effect").DS4ActiveEffect[]}
    * @protected
    */
@@ -91,7 +90,7 @@ export class DS4Actor extends Actor {
       if (condition !== undefined && condition !== "") {
         try {
           const replacedCondition = DS4Actor.replaceFormulaData(condition, { item, actor: this, effect });
-          return replacedCondition !== undefined ? Boolean(DS4Actor.evaluator.evaluate(replacedCondition)) : false;
+          return replacedCondition !== undefined ? Boolean(mathEvaluator.evaluate(replacedCondition)) : false;
         } catch (error) {
           logger.warn(error);
           return false;
@@ -521,12 +520,6 @@ export class DS4Actor extends Actor {
       rejectClose: false,
     });
   }
-
-  static evaluator = new Evaluator({
-    context: Math,
-    predicate: (identifier) =>
-      Validator.defaultPredicate(identifier) || ["includes", "toLowerCase", "toUpperCase"].includes(identifier),
-  });
 }
 
 /**

src/expression-evaluation/evaluator.ts

@@ -19,7 +19,7 @@ export class Evaluator<Context extends object> {
         get: (t, k) => (k === Symbol.unscopables ? undefined : t[k as keyof typeof t]),
       });
       actualPredicate = (identifier: string) =>
-        predicate(identifier) || Object.getOwnPropertyNames(context).includes(identifier);
+        predicate(identifier) || Object.getOwnPropertyNames(Math).includes(identifier);
     }
     this.validator = new Validator(actualPredicate);
   }