Improve AiScript

2 files changed, 13 insertions, 7 deletions

diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts
index 1c4fe217c3..1e486c455d 100644
--- a/src/client/app/common/scripts/aiscript.ts
+++ b/src/client/app/common/scripts/aiscript.ts
@@ -139,8 +139,12 @@ const envVarsDef = {
 };
 
 class AiScriptError extends Error {
-	constructor(...params) {
-		super(...params);
+	public info?: any;
+
+	constructor(message: string, info?: any) {
+		super(message);
+
+		this.info = info;
 
 		// Maintains proper stack trace for where our error was thrown (only available on V8)
 		if (Error.captureStackTrace) {
@@ -178,7 +182,9 @@ class Scope {
 		}
 
 		throw new AiScriptError(
-			`No such variable '${name}' in scope '${this.name}'`);
+			`No such variable '${name}' in scope '${this.name}'`, {
+				scope: this.layerdStates
+			});
 	}
 }
 
diff --git a/src/client/app/common/scripts/collect-page-vars.ts b/src/client/app/common/scripts/collect-page-vars.ts
index 92727ce6db..683f9b73a5 100644
--- a/src/client/app/common/scripts/collect-page-vars.ts
+++ b/src/client/app/common/scripts/collect-page-vars.ts
@@ -6,25 +6,25 @@ export function collectPageVars(content) {
 				pageVars.push({
 					name: x.name,
 					type: 'string',
-					value: x.default
+					value: x.default || ''
 				});
 			} else if (x.type === 'textareaInput') {
 				pageVars.push({
 					name: x.name,
 					type: 'string',
-					value: x.default
+					value: x.default || ''
 				});
 			} else if (x.type === 'numberInput') {
 				pageVars.push({
 					name: x.name,
 					type: 'number',
-					value: x.default
+					value: x.default || 0
 				});
 			} else if (x.type === 'switch') {
 				pageVars.push({
 					name: x.name,
 					type: 'boolean',
-					value: x.default
+					value: x.default || false
 				});
 			} else if (x.children) {
 				collect(x.children);