added import *.js amd *.json files

ppaska · ppaska · commit 83377823e58c · 2021-01-06T23:25:00.000Z
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "src/index.ts",
   "bin": {
diff --git a/src/index.ts b/src/index.ts
@@ -20,7 +20,8 @@ interpreter.addFunction('showAsserts', () => {
   console.table(context.asserts);
 });
 interpreter.addFunction('params', (name: string) => {
-  return context.params[name];
+  const value = context.params[name];
+  return value === undefined ? null : value;
 });
 
 run();
@@ -48,9 +49,12 @@ async function run() {
     interpreter.registerPackagesLoader(packageLoader as PackageLoader);
     const scripts = fs.readFileSync(options.file, 'utf8');
     context.asserts.length = 0;
-    const res = await interpreter.evaluate(scripts);
-    console.log('Execution result:\n', res);
-    console.log('Finish');
+    console.log("JSPython (c) FalconSoft Ltd")
+    console.log(`${options.file}`)
+    const res = await interpreter.evaluate(scripts, undefined, undefined, options.file);
+    if (res !== null) {
+      console.log(res);
+    }
   }
 }
 
@@ -90,15 +94,20 @@ function getOptionsFromArguments(rawArgs: string[]) {
 
 /**@type {PackageLoader} */
 function packageLoader(packageName: string): any {
-  if (['fs', 'path', 'readline', 'timers', 'child_process', 'util', 'zlib', 'stream', 'net', 'https', 'http', 'events', 'os', 'buffer']
-    .includes(packageName)) {
-    return require(packageName)
-  }
-
   try {
+    if (['fs', 'path', 'readline', 'timers', 'child_process', 'util', 'zlib', 'stream', 'net', 'https', 'http', 'events', 'os', 'buffer']
+      .includes(packageName)) {
+      return require(packageName)
+    }
+
+    if (packageName.toLowerCase().endsWith('.js') || packageName.toLowerCase().endsWith('.json')) {
+      return require(`${process.cwd().split('\\').join('/')}/${packageName}`)
+    }
+
     return require(`${process.cwd().split('\\').join('/')}/node_modules/${packageName}`);
   }
   catch (err) {
     console.log('Import Error: ', err);
+    throw err;
   }
 }

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