Merge branch 'TypeScriptToLua:master' into master

Z3rio · web-flow · commit f27fdcb80bdb · 2023-09-23T21:39:43.000+02:00
diff --git a/src/lualib/Error.ts b/src/lualib/Error.ts
@@ -3,7 +3,10 @@ interface ErrorType {
     new (...args: any[]): Error;
 }
 
-function getErrorStack(constructor: () => any): string {
+function getErrorStack(constructor: () => any): string | undefined {
+    // If debug module is not available in this environment, don't bother trying to get stack trace
+    if (debug === undefined) return undefined;
+
     let level = 1;
     while (true) {
         const info = debug.getinfo(level, "f");
@@ -49,7 +52,7 @@ function initErrorClass(Type: ErrorType, name: string): any {
 export const Error: ErrorConstructor = initErrorClass(
     class implements Error {
         public name = "Error";
-        public stack: string;
+        public stack?: string;
 
         constructor(public message = "") {
             this.stack = getErrorStack((this.constructor as any).new);
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -324,3 +324,22 @@ test.each([...builtinErrors, "CustomError"])("get stack from %s", errorType => {
     expect(stack).toMatch("innerFunction");
     expect(stack).toMatch("outerFunction");
 });
+
+test("still works without debug module", () => {
+    util.testFunction`
+        try
+        {
+            throw new Error("hello, world");
+        }
+        catch (e)
+        {
+            return e;
+        }
+    `
+        .setLuaHeader("debug = nil")
+        .expectToEqual({
+            message: "hello, world",
+            name: "Error",
+            stack: undefined,
+        });
+});
