fixed app.js loading

ppaska · ppaska · commit 52999f0849b1 · 2022-08-12T07:06:36.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "./lib/public-api.js",
   "bin": {
diff --git a/src/cli.ts b/src/cli.ts
@@ -1,11 +1,7 @@
 import arg from 'arg';
 import fs from 'fs';
 import { Interpreter } from 'jspython-interpreter';
-import {
-  AssertInfo,
-  initialScope,
-  jsPythonForNode
-} from './jspython-node';
+import { AssertInfo, initialScope, jsPythonForNode } from './jspython-node';
 import { InterpreterOptions } from './types';
 import { trimChar } from './utils';
 var util = require('util');
@@ -23,11 +19,6 @@ process
     process.exit(1);
   });
 
-const options = getOptionsFromArguments(process.argv);
-const jspyContext: Record<string, any> = { ...initialScope, ...{ params: options.params } };
-
-const interpreter: Interpreter = jsPythonForNode(options) as Interpreter;
-
 function getOptionsFromArguments(rawArgs: string[]): InterpreterOptions {
   const args = arg(
     {
@@ -82,6 +73,10 @@ function getOptionsFromArguments(rawArgs: string[]): InterpreterOptions {
 }
 
 async function main() {
+  const options = getOptionsFromArguments(process.argv);
+  const interpreter: Interpreter = (await jsPythonForNode(options)) as Interpreter;
+  const jspyContext: Record<string, any> = { ...initialScope, ...{ params: options.params } };
+
   if (options.version) {
     console.log(interpreter.jsPythonInfo());
     console.log(`JSPython cli v${(pkg || {}).version}\n`);
diff --git a/src/jspython-node.ts b/src/jspython-node.ts
@@ -113,14 +113,16 @@ initialScope.params = (name: string) => {
   return value === undefined ? null : value;
 };
 
-export function jsPythonForNode(
+export async function jsPythonForNode(
   options: InterpreterOptions = {
     srcRoot: ''
   }
-): NodeJsInterpreter {
+): Promise<NodeJsInterpreter> {
   const interpreter: NodeJsInterpreter = jsPython() as NodeJsInterpreter;
   Object.assign(context.params, options.params);
 
+  await initialize(options.srcRoot || '');
+
   interpreter
     .registerPackagesLoader(packageLoader as PackageLoader)
     .registerModuleLoader(moduleLoader);
@@ -134,7 +136,6 @@ export function jsPythonForNode(
     moduleName?: string | undefined
   ) {
     initialScope.asserts.splice(0, initialScope.asserts.length);
-    await initialize(options.srcRoot || '');
     return evaluate.call(interpreter, script, evaluationContext, entryFunctionName, moduleName);
   };
 

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.13",`
	`3`	`+ "version": "2.1.14",`
`4`	`4`	`"description": "CLI for jspython. Allows you to run jspython (*.jspy) files",`
`5`	`5`	`"main": "./lib/public-api.js",`
`6`	`6`	`"bin": {`