fix: restore original log message order

Author: KristianDD

lib/services/log-source-map-service.ts

@@ -9,7 +9,8 @@ interface IParsedMessage {
 	filePath?: string;
 	line?: number;
 	column?: number;
-	message: string;
+	messagePrefix: string;
+	messageSuffix: string;
 }
 
 interface IFileLocation {
@@ -46,7 +47,7 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 
 			if (originalLocation && originalLocation.sourceFile) {
 				const {sourceFile, line, column} = originalLocation;
-				outputData = `${outputData}${parsedLine.message} ${LogSourceMapService.FILE_PREFIX}${sourceFile}:${line}:${column}\n`;
+				outputData = `${outputData}${parsedLine.messagePrefix}${LogSourceMapService.FILE_PREFIX}${sourceFile}:${line}:${column}${parsedLine.messageSuffix}\n`;
 			} else if (rawLine !== "") {
 				outputData = `${outputData}${rawLine}\n`;
 			}
@@ -85,9 +86,9 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 		// "System.err: File: "file:///data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
 		const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
 		const deviceProjectPath = util.format(ANDROID_DEVICE_APP_ROOT_TEMPLATE, projectData.projectIdentifiers.android);
-		let message = rawMessage;
 		let separator = ",";
-		let parts, filePath, line, column;
+		let messageSuffix = "";
+		let parts, filePath, line, column, messagePrefix;
 
 		if (fileIndex >= 0) {
 			const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
@@ -113,24 +114,23 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 				filePath =  path.relative(devicePath, `${"/"}${parts[0]}`);
 				line = parseInt(parts[1]);
 				column = parseInt(parts[2]);
-				message = rawMessage.substring(0, fileIndex);
+				messagePrefix = rawMessage.substring(0, fileIndex);
 				for (let i = 3; i < parts.length; i++) {
-					message += `${parts[i]}${i === (parts.length - 1) ? "" : separator}`;
+					messageSuffix += `${parts[i]}${i === (parts.length - 1) ? "" : separator}`;
 				}
 				// "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap ("
-				message = _.trimEnd(message, "(");
-				message = message.trim();
+				messagePrefix = _.trimEnd(messagePrefix, "(");
 			}
 		}
 
-		return { filePath, line, column, message };
+		return { filePath, line, column, messagePrefix, messageSuffix};
 	}
 
 	private parseIosLog(rawMessage: string): IParsedMessage {
 		// "CONSOLE INFO file:///app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
 		const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
-		let message = rawMessage;
-		let parts, filePath, line, column;
+		let messageSuffix = "";
+		let parts, filePath, line, column, messagePrefix;
 
 		if (fileIndex >= 0) {
 			// "app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
@@ -146,15 +146,14 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 				line = parseInt(parts[1]);
 				column = parseInt(parts[2]);
 
-				message = rawMessage.substring(0, fileIndex).trim();
+				messagePrefix = rawMessage.substring(0, fileIndex);
 				for (let i = 3; i < parts.length; i++) {
-					message += `${parts[i]}${i === (parts.length - 1) ? "" : ":"}`;
+					messageSuffix += `${parts[i]}${i === (parts.length - 1) ? "" : ":"}`;
 				}
-				message = message.trim();
 			}
 		}
 
-		return { filePath, line, column, message };
+		return { filePath, line, column, messagePrefix, messageSuffix };
 	}
 
 	private getFilesLocation(platform: string, projectData: IProjectData): string {

test/services/log-source-map-service.ts

@@ -47,7 +47,7 @@ const testCases: IDictionary<Array<{caseName: string, message: string, expected:
 		}, {
 			caseName: "error message",
 			message: "System.err: 	Frame: function:'module.exports.push../main-view-model.ts.HelloWorldModel.onTap', file:'file:///data/data/org.nativescript.sourceMap/files/app/bundle.js', line: 304, column: 15",
-			expected: `System.err: 	Frame: function:'module.exports.push../main-view-model.ts.HelloWorldModel.onTap', file:' file:///${toPlatformSep("src/main-view-model.ts")}:31:14\n`
+			expected: `System.err: 	Frame: function:'module.exports.push../main-view-model.ts.HelloWorldModel.onTap', file:'file:///${toPlatformSep("src/main-view-model.ts")}:31:14\n`
 		}, {
 			caseName: "error message no match",
 			message: "System.err: 	Frame: function:'module.exports.push../main-view-model.ts.HelloWorldModel.onTap', file:'file:///data/data/org.nativescript.sourceMap/files/app/bundle.js', line: 400, column: 15",
@@ -60,15 +60,19 @@ const testCases: IDictionary<Array<{caseName: string, message: string, expected:
 	"ios": [{
 			caseName: "console message",
 			message: "CONSOLE LOG file:///app/bundle.js:294:20: Test.",
-			expected: `CONSOLE LOG Test. file:///${toPlatformSep("src/main-view-model.ts")}:29:20\n`
+			expected: `CONSOLE LOG file:///${toPlatformSep("src/main-view-model.ts")}:29:20 Test.\n`
 		}, {
 			caseName: "trace message",
 			message: "CONSOLE TRACE file:///app/bundle.js:295:22: Test",
-			expected: `CONSOLE TRACE Test file:///${toPlatformSep("src/main-view-model.ts")}:30:22\n`
+			expected: `CONSOLE TRACE file:///${toPlatformSep("src/main-view-model.ts")}:30:22 Test\n`
 		}, {
 			caseName: "error message",
 			message: "file:///app/bundle.js:296:32: JS ERROR Error: Test",
-			expected: `JS ERROR Error Test file:///${toPlatformSep("src/main-view-model.ts")}:31:31\n`
+			expected: `file:///${toPlatformSep("src/main-view-model.ts")}:31:31 JS ERROR Error: Test\n`
+		}, {
+			caseName: "error stack tracew",
+			message: "onTap@file:///app/bundle.js:296:32",
+			expected: `onTap@file:///${toPlatformSep("src/main-view-model.ts")}:31:31\n`
 		}, {
 			caseName: "error message no match",
 			message: "file:///app/bundle.js:400:32: JS ERROR Error: Test",