update deps; fix wrong error name

mProjectsCode · mProjectsCode · commit f40a5c9f1dad · 2024-11-02T22:20:44.000+01:00
diff --git a/bun.lockb b/bun.lockb
diff --git a/exampleVault/folder/entry.js b/exampleVault/folder/entry.js
@@ -0,0 +1,5 @@
+const importFromFolder1 = await engine.importJs('folder/importFromFolder1.js');
+
+console.log('importFromFolder1:', importFromFolder1);
+
+importFromFolder1.test();
diff --git a/exampleVault/folder/importFromFolder1.js b/exampleVault/folder/importFromFolder1.js
@@ -0,0 +1,7 @@
+import { greet } from "./importFromFolder2.js";
+
+export function test() {
+    greet();
+    console.log('Hello from folder/importFromFolder1.js');
+    console.log(import.meta);
+}
diff --git a/exampleVault/folder/importFromFolder2.js b/exampleVault/folder/importFromFolder2.js
@@ -0,0 +1,3 @@
+export function greet() {
+    console.log('Hello from folder/importFromFolder2.js');
+}
diff --git a/jsEngine/engine/ExecutionStatsModal.ts b/jsEngine/engine/ExecutionStatsModal.ts
@@ -11,7 +11,7 @@ import { mount, unmount } from 'svelte';
  */
 export class ExecutionStatsModal extends Modal {
 	private readonly plugin: JsEnginePlugin;
-	private component: MountedComponent<ExecutionStatsComponent> | undefined;
+	private component: MountedComponent<typeof ExecutionStatsComponent> | undefined;
 	private execution: JsExecution | undefined;
 
 	constructor(app: App, plugin: JsEnginePlugin) {
diff --git a/jsEngine/main.ts b/jsEngine/main.ts
@@ -27,7 +27,7 @@ export default class JsEnginePlugin extends Plugin {
 		this.api = new API(this.app, this, InstanceId.create(InstanceType.PLUGIN));
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-misused-promises
+	 
 	async onload(): Promise<void> {
 		await this.loadSettings();
 
diff --git a/jsEngine/messages/MessageDisplay.ts b/jsEngine/messages/MessageDisplay.ts
@@ -10,7 +10,7 @@ export class MessageDisplay extends Modal {
 	 * Reference the JS Engine plugin.
 	 */
 	private readonly plugin: JsEnginePlugin;
-	private component: MountedComponent<MessageDisplayComponent> | undefined;
+	private component: MountedComponent<typeof MessageDisplayComponent> | undefined;
 
 	constructor(app: App, plugin: JsEnginePlugin) {
 		super(app);
diff --git a/jsEngine/utils/Errors.ts b/jsEngine/utils/Errors.ts
@@ -5,7 +5,8 @@ export enum ErrorLevel {
 }
 
 export enum ErrorType {
-	INTERNAL = 'MB_INTERNAL',
+	INTERNAL = 'JSE_INTERNAL',
+	VALIDATION = 'JSE_VALIDATION',
 
 	OTHER = 'OTHER',
 }
@@ -63,3 +64,9 @@ export class JSEngineInternalError extends JSEngineError {
 		return ErrorType.INTERNAL;
 	}
 }
+
+export class JSEngineValidationError extends JSEngineError {
+	public getErrorType(): ErrorType {
+		return ErrorType.VALIDATION;
+	}
+}
diff --git a/jsEngine/utils/Validators.ts b/jsEngine/utils/Validators.ts
@@ -15,7 +15,7 @@ import type {
 import type { EngineExecutionParams } from 'jsEngine/engine/Engine';
 import type { Block, JsExecutionContext, JsExecutionGlobalsConstructionOptions } from 'jsEngine/engine/JsExecution';
 import { MessageType } from 'jsEngine/messages/MessageManager';
-import { ErrorLevel, JSEngineInternalError } from 'jsEngine/utils/Errors';
+import { ErrorLevel, JSEngineValidationError } from 'jsEngine/utils/Errors';
 import { ButtonStyleType } from 'jsEngine/utils/Util';
 import type { CachedMetadata } from 'obsidian';
 import { Component, TFile } from 'obsidian';
@@ -31,7 +31,7 @@ export function validateAPIArgs<T>(validator: z.ZodType<T>, args: T): void {
 	const result = validator.safeParse(args);
 
 	if (!result.success) {
-		throw new JSEngineInternalError({
+		throw new JSEngineValidationError({
 			errorLevel: ErrorLevel.CRITICAL,
 			effect: 'Failed to run function due to invalid arguments. Check that the arguments that you are passing to the function match the type definition of the function.',
 			cause: result.error,
diff --git a/package.json b/package.json
@@ -23,36 +23,35 @@
 	"author": "Moritz Jung",
 	"license": "GPL-3.0",
 	"devDependencies": {
-		"@codemirror/autocomplete": "^6.18.0",
+		"@codemirror/autocomplete": "^6.18.2",
 		"@codemirror/lang-javascript": "^6.2.2",
-		"@codemirror/language": "^6.10.2",
-		"@codemirror/lint": "^6.8.1",
+		"@codemirror/language": "^6.10.3",
+		"@codemirror/lint": "^6.8.2",
 		"@codemirror/state": "^6.4.1",
-		"@codemirror/view": "^6.33.0",
-		"@eslint/js": "^9.9.1",
-		"@happy-dom/global-registrator": "^15.0.0",
+		"@codemirror/view": "^6.34.1",
+		"@eslint/js": "^9.14.0",
+		"@happy-dom/global-registrator": "^15.8.0",
 		"@tsconfig/svelte": "^5.0.4",
-		"@types/bun": "^1.1.8",
+		"@types/bun": "^1.1.13",
 		"builtin-modules": "^4.0.0",
-		"esbuild": "^0.23.1",
+		"esbuild": "^0.24.0",
 		"esbuild-plugin-copy-watch": "^2.3.1",
-		"esbuild-svelte": "^0.8.1",
-		"eslint": "^9.9.1",
-		"eslint-plugin-import": "^2.29.1",
+		"esbuild-svelte": "^0.8.2",
+		"eslint": "^9.14.0",
+		"eslint-plugin-import": "^2.31.0",
 		"eslint-plugin-no-relative-import-paths": "^1.5.5",
 		"eslint-plugin-only-warn": "^1.1.0",
 		"obsidian": "latest",
-		"obsidian-dataview": "0.5.56",
 		"prettier": "^3.3.3",
-		"prettier-plugin-svelte": "^3.2.6",
+		"prettier-plugin-svelte": "^3.2.7",
 		"string-argv": "^0.3.2",
-		"svelte": "^5.0.0-next.238",
-		"svelte-check": "^3.8.6",
-		"svelte-preprocess": "^6.0.2",
-		"tslib": "^2.7.0",
-		"typedoc": "^0.26.6",
-		"typescript": "^5.5.4",
-		"typescript-eslint": "^8.2.0"
+		"svelte": "^5.1.9",
+		"svelte-check": "^4.0.5",
+		"svelte-preprocess": "^6.0.3",
+		"tslib": "^2.8.1",
+		"typedoc": "^0.26.11",
+		"typescript": "^5.6.3",
+		"typescript-eslint": "^8.12.2"
 	},
 	"dependencies": {
 		"@codemirror/legacy-modes": "^6.4.1",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function greet() {`
	`2`	`+ console.log('Hello from folder/importFromFolder2.js');`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export default class JsEnginePlugin extends Plugin {`
`27`	`27`	`this.api = new API(this.app, this, InstanceId.create(InstanceType.PLUGIN));`
`28`	`28`	`}`
`29`	`29`
`30`		`- // eslint-disable-next-line @typescript-eslint/no-misused-promises`
	`30`	`+`
`31`	`31`	`async onload(): Promise<void> {`
`32`	`32`	`await this.loadSettings();`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ export enum ErrorLevel {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`export enum ErrorType {`
`8`		`- INTERNAL = 'MB_INTERNAL',`
	`8`	`+ INTERNAL = 'JSE_INTERNAL',`
	`9`	`+ VALIDATION = 'JSE_VALIDATION',`
`9`	`10`
`10`	`11`	`OTHER = 'OTHER',`
`11`	`12`	`}`
`@@ -63,3 +64,9 @@ export class JSEngineInternalError extends JSEngineError {`
`63`	`64`	`return ErrorType.INTERNAL;`
`64`	`65`	`}`
`65`	`66`	`}`
	`67`	`+`
	`68`	`+export class JSEngineValidationError extends JSEngineError {`
	`69`	`+ public getErrorType(): ErrorType {`
	`70`	`+ return ErrorType.VALIDATION;`
	`71`	`+ }`
	`72`	`+}`