Properly extend Error instead of implementing it, update the Error message and stack to appear in the console and error activity

PanayotCankov · PanayotCankov · commit 5db5dfd8674f · 2016-12-01T10:50:46.000+02:00
diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
@@ -782,7 +782,7 @@ export function test_NonExistingElementError() {
     var basePath = "xml-declaration/";
     var expectedErrorStart =
         "Building UI from XML. @file:///app/" + basePath + "errors/non-existing-element.xml:11:5\n" +
-        " ↳Module 'ui/unicorn' not found for element 'Unicorn'.";
+        " > Module 'ui/unicorn' not found for element 'Unicorn'.";
     var message;
     try {
         builder.load(__dirname + "/errors/non-existing-element.xml");
@@ -796,7 +796,7 @@ export function test_NonExistingElementInTemplateError() {
     var basePath = "xml-declaration/";
     var expectedErrorStart =
         "Building UI from XML. @file:///app/" + basePath + "errors/non-existing-element-in-template.xml:14:17\n" +
-        " ↳Module 'ui/unicorn' not found for element 'Unicorn'.";
+        " > Module 'ui/unicorn' not found for element 'Unicorn'.";
     var message;
     var page = builder.load(__dirname + "/errors/non-existing-element-in-template.xml");
     TKUnit.assert(view, "Expected the xml to generate a page");
diff --git a/tns-core-modules/lib.core.d.ts b/tns-core-modules/lib.core.d.ts
@@ -878,6 +878,7 @@ declare var RegExp: RegExpConstructor;
 
 interface Error {
     name: string;
+    stack: string;
     message: string;
 }
 
diff --git a/tns-core-modules/utils/debug-common.ts b/tns-core-modules/utils/debug-common.ts
@@ -0,0 +1,47 @@
+import { knownFolders } from "file-system"
+
+export var debug = true;
+
+var applicationRootPath: string;
+function ensureAppRootPath() {
+    if (!applicationRootPath) {
+        applicationRootPath = knownFolders.currentApp().path;
+        applicationRootPath = applicationRootPath.substr(0, applicationRootPath.length - "app/".length);
+    }
+}
+
+export class Source {
+    private _uri: string;
+    private _line: number;
+    private _column: number;
+    
+    private static _source: symbol = Symbol("source");
+
+    constructor(uri: string, line: number, column: number) {
+        ensureAppRootPath();
+
+        if (uri.length > applicationRootPath.length && uri.substr(0, applicationRootPath.length) === applicationRootPath) {
+            this._uri = "file://" + uri.substr(applicationRootPath.length);
+        } else {
+            this._uri = uri;
+        }
+        this._line = line;
+        this._column = column;
+    }
+    
+    get uri(): string { return this._uri; }
+    get line(): number { return this._line; }
+    get column(): number { return this._column; }
+    
+    public toString() {
+        return this._uri + ":" + this._line + ":" + this._column;
+    }
+
+    public static get(object: any): Source {
+        return object[Source._source];
+    }
+    
+    public static set(object: any, src: Source) {
+        object[Source._source] = src;
+    }
+}
diff --git a/tns-core-modules/utils/debug.android.ts b/tns-core-modules/utils/debug.android.ts
@@ -0,0 +1,22 @@
+import { Source } from "./debug-common";
+export * from "./debug-common";
+
+export class ScopeError extends Error {
+    constructor(inner: Error, message?: string) {
+        let formattedMessage;
+        if (message && inner.message) {
+            formattedMessage = message + "\n > " + inner.message.replace("\n", "\n  ");
+        } else {
+            formattedMessage = message || inner.message || undefined;
+        }
+        super(formattedMessage);
+        this.stack = "Error: " + this.message + "\n" + inner.stack.substr(inner.stack.indexOf("\n") + 1);
+        this.message = formattedMessage;
+    }
+}
+
+export class SourceError extends ScopeError {
+    constructor(child: Error, source: Source, message?: string) {
+        super(child, message ? message + " @" + source + "" : source + "");
+    }
+}
diff --git a/tns-core-modules/utils/debug.d.ts b/tns-core-modules/utils/debug.d.ts
@@ -43,35 +43,15 @@ declare module "utils/debug" {
 	/**
 	 * An Error class that provides additional context to an error.
 	 */
-	export class ScopeError implements Error {
+	export class ScopeError extends Error {
 		/**
 		 * Creates a new ScopeError providing addtional context to the child error.
 		 * @param child The child error to extend.
 		 * @param message Additional message to prepend to the child error.
 		 */
 		constructor(child: Error, message?: string);
-		
-		/**
-		 * Gets the child error.
-		 */
-		child: Error;
-		
-		/**
-		 * Gets the error message.
-		 */
-		message: string;
-		
-		/**
-		 * Gets the stack trace.
-		 */
-		stack: string;
-		
-		/**
-		 * Gets the error name.
-		 */
-		name: string;
 	}
-	
+
 	/**
 	 * Represents a scope error providing addiot
 	 */
@@ -83,10 +63,5 @@ declare module "utils/debug" {
 		 * @param message Additonal message to prepend along the source location and the child error's message.
 		 */
 		constructor(child: Error, source: Source, message?: string);
-		
-		/**
-		 * Gets the error source.
-		 */
-		source: Source;
 	}
-}
+}
diff --git a/tns-core-modules/utils/debug.ios.ts b/tns-core-modules/utils/debug.ios.ts
@@ -0,0 +1,22 @@
+import { Source } from "./debug-common";
+export * from "./debug-common";
+
+export class ScopeError extends Error {
+    constructor(inner: Error, message?: string) {
+        let formattedMessage;
+        if (message && inner.message) {
+            formattedMessage = message + "\n > " + inner.message.replace("\n", "\n  ");
+        } else {
+            formattedMessage = message || inner.message || undefined;
+        }
+        super(formattedMessage);
+        this.stack = inner.stack;
+        this.message = formattedMessage;
+    }
+}
+
+export class SourceError extends ScopeError {
+    constructor(child: Error, source: Source, message?: string) {
+        super(child, message ? message + " @" + source + "" : source + "");
+    }
+}
diff --git a/tns-core-modules/utils/debug.ts b/tns-core-modules/utils/debug.ts

Original file line number	Diff line number	Diff line change
`@@ -878,6 +878,7 @@ declare var RegExp: RegExpConstructor;`
`878`	`878`
`879`	`879`	`interface Error {`
`880`	`880`	`name: string;`
	`881`	`+ stack: string;`
`881`	`882`	`message: string;`
`882`	`883`	`}`
`883`	`884`