Updated package loader

ViktorKukurba · ViktorKukurba · commit 6b4c24b59731 · 2019-11-29T19:12:40.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jspython-dev/jspython-cli",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "src/index.ts",
   "bin": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/jspython-dev/jspython-cli#readme",
   "dependencies": {
-    "@jspython-dev/jspython": "0.0.1",
+    "@jspython-dev/jspython": "^0.0.3",
     "arg": "^4.1.1"
   },
   "devDependencies": {
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,6 @@
 import arg from 'arg';
 import fs from 'fs';
-import { jsPython, PackageToImport, Interpreter, PackageLoader } from '@jspython-dev/jspython';
+import { jsPython, Interpreter, PackageLoader } from '@jspython-dev/jspython';
 
 const pkg = require('../package.json');
 
@@ -40,22 +40,6 @@ function getOptionsFromArguments(rawArgs: string[]) {
 }
 
 /**@type {PackageLoader} */
-function packageLoader(packages: PackageToImport[]): object {
-  const libraries: any = {};
-  packages.forEach(({ name, as, properties }: PackageToImport) => {
-    const lib = require(name);
-    if (properties?.length) {
-      properties.forEach((prop) => {
-        libraries[prop.as || prop.name] = lib[prop.name];
-      })
-    } else if (as) {
-      libraries[as] = lib;
-    } else {
-      libraries[name] = lib;
-    }
-    if (as) {
-      libraries[as] = lib;
-    }
-  });
-  return libraries;
+function packageLoader(packageName: string): any {
+    return require(packageName);
 }
