@foxystar/molang 0.1.0 → 0.1.2

package/esm/runtime/context.js

@@ -6,7 +6,11 @@ export const DEFAULT_CONTEXT = {
     math: MolangMath,
     variable: {},
     temp: {},
-    context: {},
+    context: {
+        log: (...args) => {
+            console.log(...args);
+        }
+    },
     query: {
         block_state: (_name) => {
             throw new Error("This function call can only be used in block context");

package/esm/runtime/runtime.d.ts

@@ -27,6 +27,7 @@ export declare class MolangRuntime {
     evaluate(expr: Expr): any;
     private toNumber;
     private toBoolean;
+    private resolveCallable;
     private applyOperator;
     static normalizePath(path: string): string[];
     private suggestPath;

package/esm/runtime/runtime.js

@@ -109,7 +109,8 @@ export class MolangRuntime {
                 throw new ReturnSignal(value);
             }
             case "ConditionalStatement": {
-                const condition = this.evaluate(stmt.condition);
+                let condition = this.evaluate(stmt.condition);
+                condition = this.resolveCallable(condition, stmt.condition);
                 if (this.toBoolean(condition)) {
                     return this.evaluateStatement(stmt.then);
                 }
@@ -405,9 +406,32 @@ export class MolangRuntime {
         return Number(value) || 0;
     }
     toBoolean(v) {
-        return this.options.strict
-            ? Boolean(v)
-            : this.toNumber(v) !== 0;
+        if (this.options.strict) {
+            return Boolean(v);
+        }
+        if (typeof v === "boolean")
+            return v;
+        if (typeof v === "number")
+            return v !== 0;
+        // undefined / null -> false
+        if (v === undefined || v === null)
+            return false;
+        // objects -> true
+        return true;
+    }
+    resolveCallable(value, expr) {
+        if (typeof value === "function" && value.length === 0) {
+            try {
+                return value();
+            }
+            catch (error) {
+                if (error instanceof MolangRuntimeError) {
+                    throw error;
+                }
+                throw new MolangRuntimeError(error instanceof Error ? error.message : String(error), expr, this.source);
+            }
+        }
+        return value;
     }
     applyOperator(operator, left, right, expr) {
         switch (operator) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxystar/molang",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A fast, extensible, and safe implementation of the Molang expression language.",
   "author": {
     "name": "FoxyStar Studios",
@@ -32,6 +32,9 @@
   "dependencies": {
     "@foxystar/math": "^0.1.3"
   },
+  "peerDependencies": {
+    "@minecraft/server": "^2.9.0-rc.1.26.40-preview.29"
+  },
   "devDependencies": {
     "@types/node": "^20.9.0"
   },

package/script/runtime/context.js

@@ -9,7 +9,11 @@ exports.DEFAULT_CONTEXT = {
     math: math_js_1.MolangMath,
     variable: {},
     temp: {},
-    context: {},
+    context: {
+        log: (...args) => {
+            console.log(...args);
+        }
+    },
     query: {
         block_state: (_name) => {
             throw new Error("This function call can only be used in block context");

package/script/runtime/runtime.d.ts

@@ -27,6 +27,7 @@ export declare class MolangRuntime {
     evaluate(expr: Expr): any;
     private toNumber;
     private toBoolean;
+    private resolveCallable;
     private applyOperator;
     static normalizePath(path: string): string[];
     private suggestPath;

package/script/runtime/runtime.js

@@ -138,7 +138,8 @@ class MolangRuntime {
                 throw new ReturnSignal(value);
             }
             case "ConditionalStatement": {
-                const condition = this.evaluate(stmt.condition);
+                let condition = this.evaluate(stmt.condition);
+                condition = this.resolveCallable(condition, stmt.condition);
                 if (this.toBoolean(condition)) {
                     return this.evaluateStatement(stmt.then);
                 }
@@ -434,9 +435,32 @@ class MolangRuntime {
         return Number(value) || 0;
     }
     toBoolean(v) {
-        return this.options.strict
-            ? Boolean(v)
-            : this.toNumber(v) !== 0;
+        if (this.options.strict) {
+            return Boolean(v);
+        }
+        if (typeof v === "boolean")
+            return v;
+        if (typeof v === "number")
+            return v !== 0;
+        // undefined / null -> false
+        if (v === undefined || v === null)
+            return false;
+        // objects -> true
+        return true;
+    }
+    resolveCallable(value, expr) {
+        if (typeof value === "function" && value.length === 0) {
+            try {
+                return value();
+            }
+            catch (error) {
+                if (error instanceof error_js_1.MolangRuntimeError) {
+                    throw error;
+                }
+                throw new error_js_1.MolangRuntimeError(error instanceof Error ? error.message : String(error), expr, this.source);
+            }
+        }
+        return value;
     }
     applyOperator(operator, left, right, expr) {
         switch (operator) {