Initial boiler plate structure for jsPython v2

Author: ppaska

.gitignore

@@ -9,6 +9,7 @@
 
 # dependencies
 /node_modules
+/website/node_modules
 
 # IDEs and editors
 /.idea

.vscode/launch.json

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2019, FalconSoft Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.vscode/settings.json

@@ -2,8 +2,6 @@
 JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment. It does not transpile/compile your code into JavaScript, instead, it provides an interactive interpreter that reads Python code and carries out their instructions. With JSPython you should be able to safely use or interact any JavaScript libraries or API with a nice Python language.
 
 ```py
-import Math
-
 arr = [4, 9, 16]
 
 def sqrt(a):
@@ -21,19 +19,21 @@ Interactive [Worksheet Systems JSPython editor](https://run.worksheet.systems/re
 
 ## Why would you use it?
 You can easily embed `JSPython` into your web app and your end users will benefit from a Python like scripting facility to:
-   * build data transformation and data analysis tasks
+   * to build data transformation and data analysis tasks
    * allow users to configure a JS objects at run-time
    * run a comprehensive testing scenarios
    * experiment with your JS Libraries or features.
+   * bring a SAFE run time script evaluation functions to your web app
+   * bring Python language to NodeJS environment
 
 ## Features
 Our aim here is to provide a SAFE Python experience to Javascript or NodeJS users at run-time. So far, we implement a core set of Python feature which should be OK to start coding.
 
   * **Syntax and code flow** Same as Python, In `JSPython` we use indentation to indicate a block of code. All flow features like `if - else`, `for`, `while` loops - along with `break` and `continue`
 
-  * **Objects, Arrays** `JSPython` allows you to work with JavaScript objects and arrays and you should be able to invoke their methods and properties as normal. So, all methods including prototype functions `push()`, `pop()`, `splice()` and [any more](ttps://www.w3schools.com/js/js_array_methods.asp) will work out of box.
+  * **Objects, Arrays** `JSPython` allows you to work with JavaScript objects and arrays and you should be able to invoke their methods and properties as normal. So, all methods including prototype functions `push()`, `pop()`, `splice()` and [any more](https://www.w3schools.com/js/js_array_methods.asp) will work out of box.
 
-  * **JSON** JSPython interpreter recognises [json5](https://json5.org/) style format. So, you can assign your variable a valid JSON as
+  * **JSON** JSPython allows you to work with JSON same way as you would in JavaScript or Python dictionaries
 
   * **Functions** Functions def `def` `async def`, arrow functions `=>` - (including multiline arrow functions)
 
@@ -54,13 +54,13 @@ Although we haven't implemented all the features available in Python yet. But, w
 Zero install !
 The most simple way to get started, without anything to install, is to use the distribution available online through jsDelivr. You can choose the latest stable release :
 ```
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jspython@0.1.0/jspython.min.js">
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jspython-interpreter/dist/jspython-interpreter.min.js">
 </script>
 ```
 
 Or local install
 ```
-npm install jspython
+npm install jspython-interpreter
 ```
 Run JS Python from your Javascript App or web page.
 ### Basic
@@ -87,4 +87,6 @@ Run JS Python from your Javascript App or web page.
 ```
 Also, you can provide entire JS Object or even a library.
 
+## License
+A permissive [BSD 3-Clause License](https://github.com/jspython-dev/jspython/blob/master/LICENSE) (c) FalconSoft Ltd.
 

LICENSE

@@ -2,10 +2,9 @@
 
 <head>
   <title>JSPython dev</title>
-  <script src="./node_modules/json5/dist/index.min.js"></script>
   <script src="./node_modules/ace-builds/src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
-  <script src="./lib/jspython.js"></script>
-  <script src="./lib/assets/mode-jspython.js"></script>
+  <script src="./dist/jspython-interpreter.js"></script>
+  <script src="./dist/assets/mode-jspython.js"></script>
   <style>
     .container {
       height: 100%;
@@ -27,13 +26,12 @@
 
 <body>
   <div class="container">
-    <h4>PScript development console</h4>
+    <h4>JSPython development console</h4>
     <div id="editor">
-x = [1,2,3,4,5,6,7,8,9]
-x
-  .filter(i => i > 5)
-  .join(",")
-    </div>
+[
+  [12, 42]
+  [22, 88]
+]</div>
     <button onclick="runInterpreter()">Run</button>
     <textarea id="result"></textarea>
   </div>
@@ -43,17 +41,15 @@ <h4>PScript development console</h4>
     editor.setTheme("ace/theme/monokai");
     editor.session.setMode("ace/mode/python");
 
-    const jsPython = JSPython.jsPython;
+    const jsPython = jspython.jsPython;
 
     async function runInterpreter() {
 
       const scripts = editor.getValue();
       try {
         const result = await jsPython()
-          .addFunction('returnsPromise', a1 => new Promise((s, f) => { setTimeout(() => s(a1), 10) }))
-          .addFunction('nullValue', () => { console.log(' ** invoked!!!'); return null })
-          .evaluate(scripts);
-        document.getElementById('result').value = typeof result === 'object' ? JSON.stringify(result) : result
+          .evaluate(scripts, {str: "shdsd sd,sd d s ds d"});
+        document.getElementById('result').value = typeof result === 'object' ? JSON.stringify(result, null, '\t') : result
         console.log('Result => ', result);
       } catch (err) {
         document.getElementById('result').value = err;

README.md

@@ -1,24 +1,25 @@
 {
-  "name": "@jspython-dev/jspython",
-  "version": "0.0.1",
+  "name": "jspython-interpreter",
+  "version": "2.0.1",
   "description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",
   "keywords": [
     "python",
     "interpreter",
     "evaluator",
     "parser"
   ],
-  "main": "lib/jspython.umd.js",
-  "module": "lib/jspython.esm.js",
-  "typings": "lib/interpreter.d.ts",
+  "main": "dist/jspython-interpreter.min.js",
+  "module": "dist/jspython-interpreter.esm.js",
+  "typings": "dist/interpreter.d.ts",
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
     "test": "jest",
     "test:dev": "jest --watch",
     "test:dev:debug": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
-    "build": "npx rollup -c && npm pack",
+    "build": "npx rollup -c",
+    "build:publish": "npx rollup -c && npm publish",
     "dev": "npx rollup --config rollup.config.dev.js --watch"
   },
   "repository": {
@@ -28,27 +29,24 @@
   "author": {
     "name": "Pavlo Paska - [email protected]"
   },
-  "license": "MIT",
+  "license": "BSD 3-Clause",
   "bugs": {
     "url": "https://github.com/jspython-dev/jspython/issues"
   },
-  "homepage": "https://github.com/jspython-dev/jspython#readme",
-  "dependencies": {
-    "@types/json5": "0.0.30",
-    "json5": "^2.1.1"
-  },
+  "homepage": "https://jspython.dev",
+  "dependencies": {},
   "devDependencies": {
-    "@types/jest": "^24.0.22",
-    "ace-builds": "^1.4.7",
-    "jest": "^24.9.0",
-    "rollup": "^1.26.3",
-    "rollup-plugin-copy": "^3.1.0",
-    "rollup-plugin-livereload": "^1.0.4",
-    "rollup-plugin-serve": "^1.0.1",
-    "rollup-plugin-typescript2": "^0.25.2",
-    "rollup-plugin-uglify": "^6.0.3",
-    "ts-jest": "^24.1.0",
-    "tslib": "^1.10.0",
-    "typescript": "^3.7.2"
+    "@types/jest": "^26.0.15",
+    "ace-builds": "^1.4.12",
+    "jest": "^26.6.3",
+    "rollup": "^2.33.3",
+    "rollup-plugin-copy": "^3.3.0",
+    "rollup-plugin-livereload": "^2.0.0",
+    "rollup-plugin-serve": "^1.1.0",
+    "rollup-plugin-typescript2": "^0.29.0",
+    "rollup-plugin-uglify": "^6.0.4",
+    "ts-jest": "^26.4.4",
+    "tslib": "^2.0.3",
+    "typescript": "^4.1.2"
   }
 }

index.html

@@ -6,21 +6,19 @@ export default {
 
   input: 'src/interpreter.ts',
   output: {
-    name: 'JSPython',
-    file: 'lib/jspython.js',
+    name: 'jspython',
+    file: 'dist/jspython-interpreter.js',
     format: 'umd',
     sourcemap: true,
-    globals: {'json5': 'JSON5'}
+    globals: {}
   },
-  external: [
-    'json5'
-  ],
+  external: [],
   plugins: [
     typescript({
       abortOnError: false
     }),
     serve({contentBase: '', open: true}),
-    livereload('lib')
+    livereload('dist')
   ],
   watch: {
     exclude: ['node_modules/**'],

package.json

@@ -7,28 +7,24 @@ const input = 'src/interpreter.ts';
 
 export default [{
   input,
-  output: { file: pkg.main, name: 'JSPython', format: 'umd', sourcemap: true, compact: true, globals: {'json5': 'JSON5'} },
-  external: [
-    'json5'
-  ],
+  output: { file: pkg.main, name: 'jspython', format: 'umd', sourcemap: true, compact: true },
+  external: [],
   treeshake: true,
   plugins: [
     typescript({
       clean: true
     }),
     copy({
       targets: [
-        { src: 'src/assets', dest: 'lib' }
+        { src: 'src/assets', dest: 'dist' }
       ]
     }),
     uglify()
   ]
 }, {
   input,
   output: { file: pkg.module, format: 'esm', sourcemap: true, compact: true },
-  external: [
-    'json5'
-  ],
+  external: [],
   plugins: [
     typescript({
       clean: true

rollup.config.dev.js

@@ -7,7 +7,7 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var PythonHighlightRules = function() {
 
     var keywords = (
-        "async|def|if|return|and|or|while|for|in|break|continue|else"
+        "async|def|if|return|and|or|while|for|in|break|continue|else|from|import"
     );
 
     var builtinConstants = (