arguments and logging fixes

ppaska · ppaska · commit af9fc6bf2da5 · 2022-08-27T13:59:23.000+01:00
diff --git a/README.md b/README.md
@@ -17,16 +17,16 @@ Command line interface to run [JSPython](https://github.com/jspython-dev/jspytho
 
 ```
 
-### Pass parameters to script
+### JSPython command line arguments
 In CLI
 ```
-jspython --file=path/to/jspython/file --param1=value --param
-jspython path/to/jspython/file param1=value param
+jspython --file=path/to/jspython/file --arg1=value --arg2='test value 1'
+jspython path/to/jspython/file arg1=value
 ```
-In script
+Inside your JSPython script yu can access arguments with `args` object.
 ```py
-params.param1 == "value" # true
-params.param == false # true
+a1 = args.arg1
+a2 = args.arg2 or 'another value'
 ```
 
 ### Run file
@@ -54,7 +54,7 @@ jspython -f path/to/jspython/file.jspy -e myFunc1
 ```
 jspython --file=path/to/jspython/file.jspy --srcRoot=src
 ```
-Normally you would expect package.json and node_modules to be in the root level and all scripts in the `src` folder
+Normally, you would expect package.json and node_modules to be in the root level and all scripts in the `src` folder
 
 ```
 -|- .git
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "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
@@ -75,7 +75,7 @@ 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 } };
+  const jspyContext: Record<string, any> = { ...initialScope, ...{ args: options.params } };
 
   if (options.version) {
     console.log(interpreter.jsPythonInfo());
diff --git a/src/jspython-node.ts b/src/jspython-node.ts
@@ -6,13 +6,16 @@ import { trimChar } from './utils';
 
 const rootFolder = process.cwd().split('\\').join('/');
 export const initialScope: any = {
+  session: {},
   asserts: [] as AssertInfo[]
 };
 
 type NodeJsInterpreter = Interpreter & { evaluateFile: (fileName: string) => Promise<any> };
 export type AssertInfo = { success: boolean; name: string; description?: string };
 type LogInfo = { level: 'info' | 'fail' | 'success'; message: string; time: Date; logId?: string };
 
+let previousLogMessage = '';
+
 const context: {
   params: any;
 } = {
@@ -21,8 +24,12 @@ const context: {
 
 function logFn(msg: LogInfo): void {
   const level = msg.level === 'success' ? msg.level : msg.level + '   ';
+  const message = `${level} | ${msg.message}`;
 
-  console.log(`| ${msg.time.toTimeString().slice(0, 8)} | ${level} | ${msg.message}`);
+  if (message !== previousLogMessage) {
+    console.log(`| ${msg.time.toTimeString().slice(0, 8)} | ${message}`);
+    previousLogMessage = message;
+  }
 }
 
 function assert(name: string, dataContext?: boolean | any): Assert | void {
@@ -114,10 +121,6 @@ initialScope.print = (...args: any) =>
     level: 'info',
     message: args.map((v: any) => (typeof v === 'object' ? JSON.stringify(v) : v)).join(' ')
   });
-initialScope.params = (name: string) => {
-  const value = context.params[name];
-  return value === undefined ? null : value;
-};
 
 export async function jsPythonForNode(
   options: InterpreterOptions = {

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