fix import bug

Author: mProjectsCode

exampleVault/Test.md

@@ -112,6 +112,29 @@ const execution = await engine.internal.executeFile('testFile.js', {
 return execution.result
 ```
 
+Both of these following code blocks should say `Caught UserError`
+
+```js-engine
+const {bar} = await engine.importJs('importTest1.js');
+
+return bar(engine);
+```
+
+```js-engine
+const {UserError} = await engine.importJs('importTest2.js');
+const {foo} = await engine.importJs('importTest3.js');
+
+try {
+	foo();
+} catch (e) {
+	if (e instanceof UserError) {
+		return 'Caught UserError';
+	} else {
+		return 'Caught Other Error';
+	}
+}
+```
+
 # Lib Test
 
 Importing packaged libraries works. In this example [parsiNOM](https://github.com/mProjectsCode/parsiNOM) is used.
@@ -203,5 +226,5 @@ el.addEventListener("click", () => {
 # Test Error
 
 ```js-engine
-le
+le)
 ```

exampleVault/importTest1.js

@@ -0,0 +1,14 @@
+import {UserError} from "./importTest2.js";
+
+export async function bar(engine) {
+    const {foo} = await engine.importJs("importTest2.js");
+    try {
+        foo();
+    } catch (e) {
+        if (e instanceof UserError) {
+            return "Caught UserError";
+        } else {
+            return "Caught other error";
+        }
+    }
+}

exampleVault/importTest2.js

@@ -0,0 +1,10 @@
+export class UserError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "UserError";
+    }
+}
+
+export function foo() {
+    throw new UserError("UserError message");
+}

exampleVault/importTest3.js

@@ -0,0 +1,5 @@
+import { UserError } from "./importTest2.js";
+
+export function foo() {
+    throw new UserError("UserError message");
+}

jsEngine/api/API.ts

@@ -57,17 +57,22 @@ export class API {
 
 	/**
 	 * Loads an ECMAScript module from a vault relative path.
+	 * Everything you import via this function will be loaded as an ECMAScript module.
+	 *
+	 * Since imports are cached by the browser (aka Obsidian),
+	 * you might need to reload Obsidian to see changes made to the imported file.
 	 *
 	 * @param path the vault relative path of the file to import
 	 */
 	public async importJs(path: string): Promise<unknown> {
 		let fullPath = this.app.vault.adapter.getResourcePath(path);
-		if (!fullPath.includes('?')) {
-			const scriptFile = this.app.metadataCache.getFirstLinkpathDest(path, '');
-			if (scriptFile) {
-				fullPath += '?' + scriptFile.stat.mtime;
-			}
-		}
+
+		// we need to remove the query parameters from the path
+		// because other `import {} from '...'` statements don't add them
+		// and we would end up with multiple imports of the same file
+		// which would cause things like `instanceof` to produce false negatives
+		fullPath = fullPath.split('?')[0];
+
 		return import(fullPath);
 	}
 

jsEngine/engine/JsExecution.ts

@@ -153,6 +153,8 @@ export class JsExecution {
 				)}`,
 			) as JsFunc;
 		} catch (e) {
+			console.warn('failed to parse JS', e);
+
 			if (e instanceof Error) {
 				this.functionBuildError = e;