jspython-dev
diff --git a/‎README.md
Copy file name to clipboardExpand all lines: README.md
+1Lines changed: 1 addition & 0 deletions b/‎README.md
Copy file name to clipboardExpand all lines: README.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎package.json
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion b/‎package.json
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/index.ts
Copy file name to clipboardExpand all lines: src/index.ts
+49-4Lines changed: 49 additions & 4 deletions b/‎src/index.ts
Copy file name to clipboardExpand all lines: src/index.ts
+49-4Lines changed: 49 additions & 4 deletions
@@ -89,6 +89,7 @@ Run example using node. (Works only if you have build project `npm run build`)
 ```
 node ./bin/jspython --file=../jspython-examples/axios-test.jspy
 node ./bin/jspython --file ../jspython-examples/parse.jspy
+node ./bin/jspython --file=test.jspy --srcRoot=../jspython-examples/
 ```
 
 # License
 
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/jspython-dev/jspython-cli#readme",
   "dependencies": {
     "arg": "^4.1.2",
-    "jspython-interpreter": "~2.0.13"
+    "jspython-interpreter": "~2.0.14"
   },
   "devDependencies": {
     "rollup": "^1.27.13",
 
@@ -32,6 +32,54 @@ function trimChar(text: string, charToRemove: string): string {
   return text;
 }
 
+function registerFileLoader(interpreter: Interpreter): Interpreter {
+  function getScriptFunctionsListWithArgs(scripts: string): any {
+    if (scripts) {
+      return scripts.split('\n').map(line => {
+        const match = line.match(/(def\s)(.*)(\(.*\)):/);
+        if (match) {
+          const args = (match[3] as string).replace(/[\(\)\s+]/g, '').split(',') as string[];
+          return [match[2].replace(/ /g, '') as string, args] as [string, string[]];
+        }
+      }).filter(func => Boolean(func));
+    }
+  }
+
+  const loader = async (filePath: string) => {
+    const module = filePath;
+    try {
+
+      const script = fs.readFileSync(`${options.srcRoot}${trimChar(filePath, '/')}.jspy`, 'utf8');
+      const funcs = getScriptFunctionsListWithArgs(script);
+      const result = funcs
+        .reduce((prev: any, [func, paramKeys]: any) => {
+          prev[func] = async (...args: any) => {
+            const params = (paramKeys || []).reduce((prev2: any, key: any, i: any) => {
+              prev2[key] = args[i] || null;
+              return prev2;
+            }, {});
+            const context = {};// this.getAppContext();
+            try {
+              return await interpreter.evaluate(script, { ...context, ...params }, func, module);
+            } catch (e) {
+              throw Error(`${e.message} `);
+            }
+          };
+          return prev;
+        }, {}
+        );
+
+      return result;
+    } catch (e) {
+      console.error(e);
+    }
+
+  };
+  interpreter.registerFileLoader(loader);
+  return interpreter;
+}
+
+
 async function initialize(baseSource: string) {
   // process app.json (if exists)
   // add configuration to the 'app'
@@ -92,11 +140,8 @@ async function run() {
   await initialize(options.srcRoot);
 
   if (options.file) {
-    interpreter.registerFileLoader((jspyPath: any) => {
-      console.log(' * file loader * ', rootFolder, jspyPath);
-      return Promise.resolve({ sum: (x: number, y: number) => x + y });
-    })
     interpreter.registerPackagesLoader(packageLoader as PackageLoader);
+    registerFileLoader(interpreter)
     const scripts = fs.readFileSync(`${options.srcRoot}${options.file}`, 'utf8');
     context.asserts.length = 0;
     console.log(interpreter.jsPythonInfo())