upgraded jspython and fixed import

ppaska · ppaska · commit fd73398c39db · 2021-01-05T22:35:20.000Z
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "0.0.7",
+  "version": "2.0.4",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "src/index.ts",
   "bin": {
@@ -9,7 +9,8 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "npx rollup -c rollup.config.dev.js",
-    "build": "npx rollup -c rollup.config.js"
+    "build": "npx rollup -c rollup.config.js",
+    "build:publish": "npm run build && npm publish"
   },
   "repository": {
     "type": "git",
@@ -29,7 +30,7 @@
   "homepage": "https://github.com/jspython-dev/jspython-cli#readme",
   "dependencies": {
     "arg": "^4.1.2",
-    "jspython-interpreter": "~0.1.3"
+    "jspython-interpreter": "~2.0.7"
   },
   "devDependencies": {
     "rollup": "^1.27.13",
diff --git a/src/index.ts b/src/index.ts
@@ -67,7 +67,7 @@ function getOptionsFromArguments(rawArgs: string[]) {
     permissive: true
   });
 
-  const params = args._.reduce((obj: {[key: string]: any}, a: string) => {
+  const params = args._.reduce((obj: { [key: string]: any }, a: string) => {
     const kv = a.replace('--', '');
     let [key, val]: any = kv.split('=');
     if (kv === key) {
@@ -83,12 +83,22 @@ function getOptionsFromArguments(rawArgs: string[]) {
     output: args['--output']
   };
 
-  context.params = {...res, ...params};
+  context.params = { ...res, ...params };
 
   return res;
 }
 
 /**@type {PackageLoader} */
 function packageLoader(packageName: string): any {
-    return require(packageName);
+  if (['fs', 'path', 'readline', 'timers', 'child_process', 'util', 'zlib', 'stream', 'net', 'https', 'http', 'events', 'os', 'buffer']
+    .includes(packageName)) {
+    return require(packageName)
+  }
+
+  try {
+    return require(`${process.cwd().split('\\').join('/')}/node_modules/${packageName}`);
+  }
+  catch (err) {
+    console.log('Import Error: ', err);
+  }
 }
