Update jsPythonForNode

ViktorKukurba · ViktorKukurba · commit 5f7bd40b9426 · 2022-03-27T22:59:12.000+03:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "dist/index.js",
   "bin": {
diff --git a/src/index.ts b/src/index.ts
@@ -24,42 +24,9 @@ const initialScope: Record<string, any> = {
   session: {}
 };
 
-const rootFolder = process.cwd().split('\\').join('/');
 const options = getOptionsFromArguments(process.argv);
 const interpreter: Interpreter = jsPythonForNode(options) as Interpreter;
 
-async function initialize(baseSource: string) {
-
-  // process app.js (if exists)
-  //  - run _init
-  //  - delete _ init
-  //  - run _initAsync
-  //  - delete _initAsync
-  //  - load content into 'app'
-
-  let appJsPath = `${rootFolder}/${baseSource}app.js`;
-  console.log({ rootFolder, baseSource })
-  if (!fs.existsSync(appJsPath)) {
-    appJsPath = `${rootFolder}/src/app.js`
-  }
-
-  if (fs.existsSync(appJsPath)) {
-    const app = require(appJsPath);
-
-    if (typeof app._init == 'function') {
-      app._init();
-      delete app._init;
-    }
-
-    if (typeof app._initAsync == 'function') {
-      await app._initAsync();
-      delete app._initAsync;
-    }
-
-    Object.assign(initialScope, app);
-  }
-}
-
 function getOptionsFromArguments(rawArgs: string[]): InterpreterOptions {
   const args = arg({
     '--file': String,
@@ -134,8 +101,6 @@ async function main() {
     console.error = console.log;
   }
 
-  await initialize(options.srcRoot);
-
   if (options.file) {
     let fileName = `${options.srcRoot}${options.file}`;
 
diff --git a/src/jspython-node.ts b/src/jspython-node.ts
@@ -31,14 +31,16 @@ export function jsPythonForNode(options: InterpreterOptions = {
     .registerModuleLoader(moduleLoader);
 
   const evaluate = interpreter.evaluate;
-  interpreter.evaluate = function() {
+
+  interpreter.evaluate = async function(script: string, evaluationContext?: object | undefined, entryFunctionName?: string | undefined, moduleName?: string | undefined) {
     context.asserts.length = 0;
-    return evaluate.apply(interpreter, arguments as any);
+    await initialize(options.srcRoot);
+    return evaluate.call(interpreter, script, evaluationContext, entryFunctionName, moduleName);
   }
 
-  interpreter.evaluateFile = function(filePath: string) {
+  interpreter.evaluateFile = function(filePath: string, context = {}) {
     const script = getScript(filePath);
-    return interpreter.evaluate(script, {});
+    return interpreter.evaluate(script, context, options.entryFunction);
   }
 
   return interpreter;
@@ -94,3 +96,35 @@ function getScript(fileName: string): string {
   const scripts = fs.readFileSync(fileName, 'utf8');
   return scripts;
 }
+
+async function initialize(baseSource: string) {
+
+  // process app.js (if exists)
+  //  - run _init
+  //  - delete _ init
+  //  - run _initAsync
+  //  - delete _initAsync
+  //  - load content into 'app'
+
+  let appJsPath = `${rootFolder}/${baseSource}app.js`;
+  console.log({ rootFolder, baseSource })
+  if (!fs.existsSync(appJsPath)) {
+    appJsPath = `${rootFolder}/src/app.js`
+  }
+
+  if (fs.existsSync(appJsPath)) {
+    const app = require(appJsPath);
+
+    if (typeof app._init == 'function') {
+      app._init();
+      delete app._init;
+    }
+
+    if (typeof app._initAsync == 'function') {
+      await app._initAsync();
+      delete app._initAsync;
+    }
+
+    Object.assign(initialScope, app);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jspython-cli",`
`3`		`- "version": "2.1.7",`
	`3`	`+ "version": "2.1.8",`
`4`	`4`	`"description": "CLI for jspython. Allows you to run jspython (*.jspy) files",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"bin": {`