sval 0.4.8 → 0.5.0

package/.github/workflows/coverage.yml

@@ -0,0 +1,21 @@
+name: Coverage
+on:
+  push:
+    branches:
+      - master
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Setup node environment
+        uses: actions/setup-node@v3.4.1
+      - name: Install node modules
+        run: npm install
+      - name: Test code
+        run: npm test
+      - name: Send coverage info to Coveralls
+        uses: coverallsapp/github-action@1.1.3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -1,8 +1,4 @@
-# Sval
-
-[![npm](https://img.shields.io/npm/v/sval.svg?style=flat-square)](https://www.npmjs.com/package/sval)
-[![travis-ci](https://img.shields.io/travis/Siubaak/sval.svg?style=flat-square)](https://travis-ci.org/Siubaak/sval)
-[![coveralls](https://img.shields.io/coveralls/github/Siubaak/sval.svg?style=flat-square)](https://coveralls.io/github/Siubaak/sval)
+# Sval · [![npm](https://img.shields.io/npm/v/sval.svg?style=flat-square)](https://www.npmjs.com/package/sval) [![github-actions](https://img.shields.io/github/workflow/status/Siubaak/sval/Coverage.svg?style=flat-square)](https://github.com/Siubaak/sval/actions/workflows/coverage.yml) [![coveralls](https://img.shields.io/coveralls/github/Siubaak/sval.svg?style=flat-square)](https://coveralls.io/github/Siubaak/sval)
 
 A JavaScript interpreter writen in JavaScript, based on parser [Acorn](https://github.com/acornjs/acorn).
 
@@ -38,8 +34,11 @@ import Sval from 'sval'
 
 // Sval options
 const options = {
-  // ECMA Version of the code (5 | 6 | 7 | 8 | 9 | 10 | 2015 | 2016 | 2017 | 2018 | 2019)
-  ecmaVer: 9,
+  // ECMA Version of the code
+  // 3 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15
+  // or 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024
+  // or "latest"
+  ecmaVer: 'latest',
   // Whether the code runs in a sandbox
   sandBox: true,
 }
@@ -68,11 +67,11 @@ console.log(interpreter.exports.mod) // Get 'AllKindsOfStuffs'
 
 Sval constructor has options with two fields, **ecmaVer** and **sandBox**.
 
-- **ecmaVer** is the ECMAScript edition of the code. Currently, 5, 6(2015), 7(2016), 8(2017), 9(2018) and 10(2019) are supported, and the default edition is 9.
+- **ecmaVer** is the ECMAScript edition of the code. Currently, 3, 5, 6(2015), 7(2016), 8(2017), 9(2018), 10(2019), 11(2020), 12(2021), 13(2022), 14(2023), 15(2024) and "latest" are supported, and the default edition is "latest".
 
 - **sandBox** is true for sandbox mode or false for invasived mode. Sandbox mode will run code in an isolated sandbox and won't pollute your global scope. Invasived mode allows you run code in the same global scope of your current environment. The default setting is true.
 
-Sval instance has two methods, **import** and **run**.
+Sval instance has three methods, **import**, **parse** and **run**.
 
 - **import** is to import modules into your Sval instance scope, expecting a name and a module as arguments like `import(name: string, mod: any)`, or an object which contains the modules as argument like `import({ [name: string]: any })`. The modules will be automatically declared as global variables. This method is more likely to be used in sandbox mode.
 

package/dist/sval.es6.js

@@ -383,7 +383,7 @@
       }
   }
 
-  var version = "0.4.8";
+  var version = "0.5.0";
 
   const AWAIT = { RES: undefined };
   const RETURN = { RES: undefined };
@@ -733,7 +733,7 @@
       }
   }
   function AssignmentExpression(node, scope) {
-      const value = evaluate(node.right, scope);
+      var _a;
       const left = node.left;
       let variable;
       if (left.type === 'Identifier') {
@@ -747,8 +747,10 @@
           variable = MemberExpression(left, scope, { getVar: true });
       }
       else {
+          const value = evaluate(node.right, scope);
           return pattern$3(left, scope, { feed: value });
       }
+      const value = evaluate(node.right, scope);
       switch (node.operator) {
           case '=':
               variable.set(value);
@@ -789,15 +791,27 @@
           case '&=':
               variable.set(variable.get() & value);
               return variable.get();
+          case '??=':
+              variable.set((_a = variable.get()) !== null && _a !== void 0 ? _a : value);
+              return variable.get();
+          case '&&=':
+              variable.set(variable.get() && value);
+              return variable.get();
+          case '||=':
+              variable.set(variable.get() || value);
+              return variable.get();
           default: throw new SyntaxError(`Unexpected token ${node.operator}`);
       }
   }
   function LogicalExpression(node, scope) {
+      var _a;
       switch (node.operator) {
           case '||':
               return (evaluate(node.left, scope)) || (evaluate(node.right, scope));
           case '&&':
               return (evaluate(node.left, scope)) && (evaluate(node.right, scope));
+          case '??':
+              return (_a = (evaluate(node.left, scope))) !== null && _a !== void 0 ? _a : (evaluate(node.right, scope));
           default:
               throw new SyntaxError(`Unexpected token ${node.operator}`);
       }
@@ -836,9 +850,15 @@
           const getter = getGetter(object, key);
           if (node.object.type === 'Super' && getter) {
               const thisObject = scope.find('this').get();
+              if (node.optional && thisObject == null) {
+                  return undefined;
+              }
               return getter.call(thisObject);
           }
           else {
+              if (node.optional && object == null) {
+                  return undefined;
+              }
               return object[key];
           }
       }
@@ -853,6 +873,9 @@
       let object;
       if (node.callee.type === 'MemberExpression') {
           object = MemberExpression(node.callee, scope, { getObj: true });
+          if (node.callee.optional && object == null) {
+              return undefined;
+          }
           let key;
           if (node.callee.computed) {
               key = evaluate(node.callee.property, scope);
@@ -867,6 +890,9 @@
           else {
               func = object[key];
           }
+          if (node.optional && func == null) {
+              return undefined;
+          }
           if (typeof func !== 'function') {
               throw new TypeError(`${key} is not a function`);
           }
@@ -877,6 +903,9 @@
       else {
           object = scope.find('this').get();
           func = evaluate(node.callee, scope);
+          if (node.optional && func == null) {
+              return undefined;
+          }
           if (typeof func !== 'function' || node.callee.type !== 'Super' && func[CLSCTOR]) {
               let name;
               if (node.callee.type === 'Identifier') {
@@ -1020,6 +1049,9 @@
   }
   function SpreadElement(node, scope) {
       return evaluate(node.argument, scope);
+  }
+  function ChainExpression(node, scope) {
+      return evaluate(node.expression, scope);
   }
 
   var expression = /*#__PURE__*/Object.freeze({
@@ -1045,7 +1077,8 @@
     TemplateElement: TemplateElement,
     ClassExpression: ClassExpression,
     Super: Super,
-    SpreadElement: SpreadElement
+    SpreadElement: SpreadElement,
+    ChainExpression: ChainExpression
   });
 
   function ExpressionStatement(node, scope) {
@@ -1474,7 +1507,10 @@
   function ClassBody(node, scope, options = {}) {
       const { klass, superClass } = options;
       for (let i = 0; i < node.body.length; i++) {
-          MethodDefinition(node.body[i], scope, { klass, superClass });
+          const def = node.body[i];
+          if (def.type === 'MethodDefinition') {
+              MethodDefinition(def, scope, { klass, superClass });
+          }
       }
   }
   function MethodDefinition(node, scope, options = {}) {
@@ -1733,7 +1769,7 @@
       }
   }
   function* AssignmentExpression$1(node, scope) {
-      const value = yield* evaluate$1(node.right, scope);
+      var _a;
       const left = node.left;
       let variable;
       if (left.type === 'Identifier') {
@@ -1747,8 +1783,10 @@
           variable = yield* MemberExpression$1(left, scope, { getVar: true });
       }
       else {
+          const value = yield* evaluate$1(node.right, scope);
           return yield* pattern$2(left, scope, { feed: value });
       }
+      const value = yield* evaluate$1(node.right, scope);
       switch (node.operator) {
           case '=':
               variable.set(value);
@@ -1789,15 +1827,27 @@
           case '&=':
               variable.set(variable.get() & value);
               return variable.get();
+          case '??=':
+              variable.set((_a = variable.get()) !== null && _a !== void 0 ? _a : value);
+              return variable.get();
+          case '&&=':
+              variable.set(variable.get() && value);
+              return variable.get();
+          case '||=':
+              variable.set(variable.get() || value);
+              return variable.get();
           default: throw new SyntaxError(`Unexpected token ${node.operator}`);
       }
   }
   function* LogicalExpression$1(node, scope) {
+      var _a;
       switch (node.operator) {
           case '||':
               return (yield* evaluate$1(node.left, scope)) || (yield* evaluate$1(node.right, scope));
           case '&&':
               return (yield* evaluate$1(node.left, scope)) && (yield* evaluate$1(node.right, scope));
+          case '??':
+              return (_a = (yield* evaluate$1(node.left, scope))) !== null && _a !== void 0 ? _a : (yield* evaluate$1(node.right, scope));
           default:
               throw new SyntaxError(`Unexpected token ${node.operator}`);
       }
@@ -1836,9 +1886,15 @@
           const getter = getGetter(object, key);
           if (node.object.type === 'Super' && getter) {
               const thisObject = scope.find('this').get();
+              if (node.optional && thisObject == null) {
+                  return undefined;
+              }
               return getter.call(thisObject);
           }
           else {
+              if (node.optional && object == null) {
+                  return undefined;
+              }
               return object[key];
           }
       }
@@ -1853,6 +1909,9 @@
       let object;
       if (node.callee.type === 'MemberExpression') {
           object = yield* MemberExpression$1(node.callee, scope, { getObj: true });
+          if (node.callee.optional && object == null) {
+              return undefined;
+          }
           let key;
           if (node.callee.computed) {
               key = yield* evaluate$1(node.callee.property, scope);
@@ -1867,6 +1926,9 @@
           else {
               func = object[key];
           }
+          if (node.optional && func == null) {
+              return undefined;
+          }
           if (typeof func !== 'function') {
               throw new TypeError(`${key} is not a function`);
           }
@@ -1877,6 +1939,9 @@
       else {
           object = scope.find('this').get();
           func = yield* evaluate$1(node.callee, scope);
+          if (node.optional && func == null) {
+              return undefined;
+          }
           if (typeof func !== 'function' || node.callee.type !== 'Super' && func[CLSCTOR]) {
               let name;
               if (node.callee.type === 'Identifier') {
@@ -2021,6 +2086,9 @@
   function* SpreadElement$1(node, scope) {
       return yield* evaluate$1(node.argument, scope);
   }
+  function* ChainExpression$1(node, scope) {
+      return yield* evaluate$1(node.expression, scope);
+  }
   function* YieldExpression(node, scope) {
       const res = yield* evaluate$1(node.argument, scope);
       return node.delegate ? yield* res : yield res;
@@ -2054,6 +2122,7 @@
     ClassExpression: ClassExpression$1,
     Super: Super$1,
     SpreadElement: SpreadElement$1,
+    ChainExpression: ChainExpression$1,
     YieldExpression: YieldExpression,
     AwaitExpression: AwaitExpression
   });
@@ -2491,7 +2560,10 @@
   function* ClassBody$1(node, scope, options = {}) {
       const { klass, superClass } = options;
       for (let i = 0; i < node.body.length; i++) {
-          yield* MethodDefinition$1(node.body[i], scope, { klass, superClass });
+          const def = node.body[i];
+          if (def.type === 'MethodDefinition') {
+              yield* MethodDefinition$1(def, scope, { klass, superClass });
+          }
       }
   }
   function* MethodDefinition$1(node, scope, options = {}) {
@@ -2710,7 +2782,7 @@
                   yield* RestElement$1(param, subScope, { kind: 'var', feed: args.slice(i) });
               }
               else {
-                  yield* pattern$2(param, subScope, { feed: args[i] });
+                  yield* pattern$2(param, subScope, { kind: 'var', feed: args[i] });
               }
           }
           let result;
@@ -2786,7 +2858,7 @@
       const methodBody = node.body.body;
       for (let i = 0; i < methodBody.length; i++) {
           const method = methodBody[i];
-          if (method.kind === 'constructor') {
+          if (method.type === 'MethodDefinition' && method.kind === 'constructor') {
               klass = createFunc(method.value, scope, { superClass, isCtor: true });
               break;
           }
@@ -2949,7 +3021,7 @@
                   RestElement(param, subScope, { kind: 'var', feed: args.slice(i) });
               }
               else {
-                  pattern$3(param, subScope, { feed: args[i] });
+                  pattern$3(param, subScope, { kind: 'var', feed: args[i] });
               }
           }
           let result;
@@ -2997,7 +3069,7 @@
       const methodBody = node.body.body;
       for (let i = 0; i < methodBody.length; i++) {
           const method = methodBody[i];
-          if (method.kind === 'constructor') {
+          if (method.type === 'MethodDefinition' && method.kind === 'constructor') {
               klass = createFunc$1(method.value, scope, { superClass, isCtor: true });
               break;
           }
@@ -3037,14 +3109,17 @@
       return result;
   }
 
+  const latestVer = 15;
   class Sval {
       constructor(options = {}) {
-          this.options = {};
+          this.options = { ecmaVersion: 'latest' };
           this.scope = new Scope(null, true);
           this.exports = {};
-          let { ecmaVer = 9, sandBox = true } = options;
-          ecmaVer -= ecmaVer < 2015 ? 0 : 2009;
-          if ([3, 5, 6, 7, 8, 9, 10].indexOf(ecmaVer) === -1) {
+          let { ecmaVer = 'latest', sandBox = true } = options;
+          if (typeof ecmaVer === 'number') {
+              ecmaVer -= ecmaVer < 2015 ? 0 : 2009;
+          }
+          if (ecmaVer !== 'latest' && ecmaVer !== 3 && (ecmaVer < 5 || ecmaVer > latestVer)) {
               throw new Error(`unsupported ecmaVer`);
           }
           this.options.ecmaVersion = ecmaVer;