Update rollup config

ViktorKukurba · ViktorKukurba · commit 6d84069bd2b0 · 2019-11-26T11:24:13.000+02:00
diff --git a/README.md b/README.md
@@ -10,15 +10,16 @@ Command line interface to run [jspython](https://github.com/jspython-dev/jspytho
 
 ### Run in terminal
 ```
-  jspython-cli --file path/to/jspython/file
-  jspython-cli --file test.jsy
+  jspython path/to/jspython/file
+  jspython --file path/to/jspython/file
+  jspython --file=test.jspy
+
 ```
 
 ### Development
 Run example using node. (Works only if you have `@jspython-dev/jspython-cli` devDependencies in you project)
 ```
-node ./bin/jspython-cli --file=examples/project/axios-test.jspy
-node ./bin/jspython-cli --file examples/project/parse.jspy
-node ./bin/jspython-cli --file examples/project/p-test.jspy
+node ./bin/jspython --file=examples/project/axios-test.jspy
+node ./bin/jspython --file examples/project/parse.jspy
 ```
 
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "src/index.ts",
   "bin": {
-    "JSPython-cli": "bin/JSPython-cli"
+    "jspython": "bin/jspython"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/rollup.config.js b/rollup.config.js
@@ -5,7 +5,7 @@ const pkg = require('./package.json');
 
 export default {
   input: pkg.main,
-  output: { file: pkg.bin['JSPython-cli'], format: 'cjs', sourcemap: true, compact: true, banner: '#!/usr/bin/env node' },
+  output: { file: pkg.bin['jspython'], format: 'cjs', sourcemap: true, compact: true, banner: '#!/usr/bin/env node' },
   plugins: [
     typescript({
       clean: true
@@ -16,5 +16,5 @@ export default {
       ]
     })
   ],
-  external: ['arg', 'fs', 'JSPython']
+  external: ['arg', 'fs', '@jspython-dev/jspython']
 };
diff --git a/src/index.ts b/src/index.ts
@@ -1,10 +1,10 @@
 import arg from 'arg';
 import fs from 'fs';
-import { jsPython, PackageToImport } from '@jspython-dev/jspython';
+import { jsPython, PackageToImport, Interpreter, PackageLoader } from '@jspython-dev/jspython';
 
 const pkg = require('../package.json');
 
-export const interpreter = jsPython();
+export const interpreter: Interpreter = jsPython() as Interpreter;
 
 run();
 
@@ -15,7 +15,7 @@ async function run() {
   }
 
   if (options.file) {
-    interpreter.registerPackagesLoader(packageLoader);
+    interpreter.registerPackagesLoader(packageLoader as PackageLoader);
     const scripts = fs.readFileSync(options.file, 'utf8');
     const res = await interpreter.evaluate(scripts);
     console.log('Execution result:\n', res);
@@ -39,7 +39,7 @@ function getOptionsFromArguments(rawArgs: string[]) {
   };
 }
 
-
+/**@type {PackageLoader} */
 function packageLoader(packages: PackageToImport[]): object {
   const libraries: any = {};
   packages.forEach(({ name, as, properties }: PackageToImport) => {
