Fix runtime concurrency

Cargo.toml

@@ -12,11 +12,13 @@ edition = "2021"
 
 [features]
 default = ["extensions", "crypto-functions", "encoding-functions"]
-extensions = ["js-sandbox"]
+extensions = ["js_playground"]
 crypto-functions = ["md-5", "sha2"]
 encoding-functions = ["base64", "urlencoding"]
 
 [dependencies]
+once_cell = "1.18.0"
+thiserror = "1.0.40"
 regex = "1.9.4"
 pest = "2.5.6"
 pest_derive = "2.7.3"
@@ -27,7 +29,7 @@ chrono = "0.4.23"
 rand = "0.8.5"
 
 # Feature deps
-js-sandbox = { version = "0.2.0-rc.2", optional = true }
+js_playground = { git = "https://github.com/rscarson/js-playground.git", optional = true }
 md-5 = { version = "0.10.5", optional = true }
 sha2 = { version = "0.10.6", optional = true }
 base64 = { version = "0.21.0", optional = true }

README.md

@@ -16,9 +16,9 @@ This project is the engine behind [Lavendeux](https://rscarson.github.io/lavende
 ### Getting Started
 To use it, create a `ParserState` object, and use it to tokenize input with `Token::new`:
 ```rust
-use lavendeux_parser::{ParserState, ParserError, Token, Value};
+use lavendeux_parser::{ParserState, Error, Token, Value};
 
-fn main() -> Result<(), ParserError> {
+fn main() -> Result<(), Error> {
     // Create a new parser, and tokenize 2 lines
     let mut state : ParserState = ParserState::new();
     let lines = Token::new("x=9\nsqrt(x) @bin", &mut state)?;
@@ -32,9 +32,9 @@ fn main() -> Result<(), ParserError> {
 ```
 The result will be a `Token` object:
 ```rust
-use lavendeux_parser::{ParserState, ParserError, Token, Value};
+use lavendeux_parser::{ParserState, Error, Token, Value};
 
-fn main() -> Result<(), ParserError> {
+fn main() -> Result<(), Error> {
     let mut state : ParserState = ParserState::new();
     let lines = Token::new("x=9\nsqrt(x) @bin", &mut state)?;
 
@@ -56,8 +56,8 @@ fn main() -> Result<(), ParserError> {
 
 A number of functions and @decorators are available for expressions to use - add more using the state:
 ```rust
-use lavendeux_parser::{ParserState, ParserError, DecoratorDefinition, FunctionDefinition, FunctionArgument, Value};
-use lavendeux_parser::errors::*;
+use lavendeux_parser::{ParserState, Error, DecoratorDefinition, FunctionDefinition, FunctionArgument, Value};
+use lavendeux_parser::Error;
 
 let mut state : ParserState = ParserState::new();
 state.decorators.register(DecoratorDefinition {
@@ -151,9 +151,9 @@ Extensions are enabled by default, and can be excluded by disabling the crate's
 
 Extensions can be loaded as follows:
 ```rust
-use lavendeux_parser::{ParserState, ParserError, Value, Token};
+use lavendeux_parser::{ParserState, Error, Value, Token};
 
-fn main() -> Result<(), ParserError> {
+fn main() -> Result<(), Error> {
     let mut state : ParserState = ParserState::new();
 
     // Load one extension

example_extensions/colour_utils.js

@@ -3,7 +3,7 @@
  * It must return an object similar to the one below.
  * @returns Object
  */
-function extension() {
+export function extension() {
     return {
         name: "HTML Colour Utilities",
         author: "@rscarson",
@@ -31,7 +31,7 @@ function extension() {
  * @param {Value} args 
  * @returns {Value} result
  */
-function function_colour(args) {
+export function function_colour(args) {
     if (args.length != 1) {
         throw "color(s): expected 1 argument";
     } else if (!args[0].String) {
@@ -60,7 +60,7 @@ function function_colour(args) {
  * @param {Value} args 
  * @returns {Value} result
  */
-function function_complement(args) {    
+export function function_complement(args) {    
     if (args.length != 1) {
         throw "complement(n): expected 1 argument";
     } else if (!args[0].Integer) {
@@ -89,15 +89,15 @@ function function_complement(args) {
  * @param {Value} args 
  * @returns {String} result
  */
-function decorator_colour(value) {
+export function decorator_colour(value) {
     if (value.Integer) {
         return '#'+value.Integer.toString(16).padEnd(6, '0');
     }
 
     throw "@color: expected an integer value";
 }
 
-function extract_rgb(int_val) {
+export function extract_rgb(int_val) {
     return {
         "b": int_val & 0xFF,
         "g": (int_val >> 8) & 0xFF,

example_extensions/simple.js

@@ -0,0 +1,12 @@
+let extension = lavendeux.extend({
+    'name': 'simple_extension',
+    'author': '@rscarson',
+    'version': '1.0.0'
+});
+
+extension.addFunction('add', (left, right) => left + right, 'Float')
+.requireArgument('Integer').requireArgument('Integer');
+
+extension.addDecorator('usd', (input) => `${input}`, 'Float')
+
+lavendeux.register(extension);

example_extensions/stateful_functions.js

@@ -1,36 +1,19 @@
-/**
- * This function tells Lavendeux about this extension.
- * It must return an object similar to the one below.
- * @returns Object
- */
-function extension() {
-    return {
-        name: "Stateful function demo",
-        author: "@rscarson",
-        version: "0.2.0",
+let extension = lavendeux.extend({
+    'name': 'stateful_extension',
+    'author': '@rscarson',
+    'version': '1.0.0'
+});
 
-        functions: {
-            "set": "functionSet"
-        },
-    };
-}
-
-/**
- * Functions can also be stateful, gaining access to the parser's variables
- * @param {Value} args 
- * @returns {Value} result
- */
-function functionSet(args) {
-    if (args.length != 2) {
-        throw new Error("set(<string>, <any>): expected 2 arguments");
-    } else if (!args[0].String) {
-        throw "set(<string>, <any>): expected a string value";
-    }
-
-    let name = args[0].String, value = args[1];
-    const state = getState();
+extension.addFunction('put', (name, value, state) => {
     state[name] = value;
-    setState(state);
-
     return value;
-}
+})
+.requireArgument('String')
+.requireArgument();
+
+extension.addFunction('get', (name, state) => {
+    return state[name];
+})
+.requireArgument('String');
+
+lavendeux.register(extension);