chore: fix PR comments

Author: rosen-vladimirov

lib/common/test/unit-tests/mobile/device-log-provider.ts

@@ -53,7 +53,8 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("platformsDataService", {
 		getPlatformData: (pl: string) => {
 			return {
-				appDestinationDirectoryPath: path.join(__dirname, "..", "..", "resources", "device-log-provider-integration-tests", pl.toLowerCase())
+				appDestinationDirectoryPath: path.join(__dirname, "..", "..", "resources", "device-log-provider-integration-tests", pl.toLowerCase()),
+				frameworkPackageName: `tns-${platform.toLowerCase()}`
 			};
 		}
 	});

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

@@ -22,18 +22,22 @@ interface IFileLocation {
 
 export class LogSourceMapService implements Mobile.ILogSourceMapService {
 	private static FILE_PREFIX = "file:///";
+	private static MEMOIZE_FUNCTION_RANDOM_KEY_FOR_JOIN = "__some_random_value__";
 	private getProjectData: (projectDir: string) => IProjectData;
-	private getNSValue: (projectDir: string, propertyName: string) => any;
+	private getRuntimeVersion: (projectDir: string, platform: string) => string;
 	private cache: IDictionary<sourcemap.SourceMapConsumer> = {};
 
+	private get $platformsDataService(): IPlatformsDataService {
+		return this.$injector.resolve<IPlatformsDataService>("platformsDataService");
+	}
 	constructor(
 		private $fs: IFileSystem,
 		private $projectDataService: IProjectDataService,
 		private $injector: IInjector,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $logger: ILogger) {
 		this.getProjectData = _.memoize(this.$projectDataService.getProjectData.bind(this.$projectDataService));
-		this.getNSValue = _.memoize(this.$projectDataService.getNSValue.bind(this.$projectDataService));
+		this.getRuntimeVersion = _.memoize(this.getRuntimeVersionCore, (...args) => args.join(LogSourceMapService.MEMOIZE_FUNCTION_RANDOM_KEY_FOR_JOIN));
 	}
 
 	public async setSourceMapConsumerForFile(filePath: string): Promise<void> {
@@ -71,11 +75,13 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 			const originalLocation = this.getOriginalFileLocation(platform, parsedLine, projectData);
 
 			if (originalLocation && originalLocation.sourceFile) {
-				const runtimeData = this.getNSValue(loggingOptions.projectDir, `tns-${platform.toLowerCase()}`);
-				const runtimeVersion = runtimeData && runtimeData.version;
+				const runtimeVersion = this.getRuntimeVersion(loggingOptions.projectDir, platform);
 				const { sourceFile, line, column } = originalLocation;
 				if (semver.valid(runtimeVersion) && semver.gte(semver.coerce(runtimeVersion), "6.1.0")) {
-					outputData += rawLine.replace(/file:\/\/\/.*?:\d+:\d+/, `file:///${sourceFile}:${line}:${column}`) + '\n';
+					const lastIndexOfFile = rawLine.lastIndexOf(LogSourceMapService.FILE_PREFIX);
+					const firstPart = rawLine.substr(0, lastIndexOfFile);
+
+					outputData += firstPart + rawLine.substr(lastIndexOfFile).replace(/file:\/\/\/.+?:\d+:\d+/, `${LogSourceMapService.FILE_PREFIX}${sourceFile}:${line}:${column}`) + '\n';
 				} else {
 					outputData = `${outputData}${parsedLine.messagePrefix}${LogSourceMapService.FILE_PREFIX}${sourceFile}:${line}:${column}${parsedLine.messageSuffix}\n`;
 				}
@@ -87,6 +93,20 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 		return outputData;
 	}
 
+	private getRuntimeVersionCore(projectDir: string, platform: string): string {
+		let runtimeVersion: string = null;
+		try {
+			const projectData = this.getProjectData(projectDir);
+			const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
+			const runtimeVersionData = this.$projectDataService.getNSValue(projectData.projectDir, platformData.frameworkPackageName);
+			runtimeVersion = runtimeVersionData && runtimeVersionData.version;
+		} catch (err) {
+			this.$logger.trace(`Unable to get runtime version for project directory: ${projectDir} and platform ${platform}. Error is: `, err);
+		}
+
+		return runtimeVersion;
+	}
+
 	private getOriginalFileLocation(platform: string, parsedLine: IParsedMessage, projectData: IProjectData): IFileLocation {
 		const fileLocation = path.join(this.getFilesLocation(platform, projectData), APP_FOLDER_NAME);
 
@@ -185,7 +205,7 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 
 	private getFilesLocation(platform: string, projectData: IProjectData): string {
 		try {
-			const platformsData = this.$injector.resolve("platformsDataService").getPlatformData(platform.toLowerCase(), projectData);
+			const platformsData = this.$platformsDataService.getPlatformData(platform.toLowerCase(), projectData);
 			return platformsData.appDestinationDirectoryPath;
 		} catch (err) {
 			return "";

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

@@ -31,7 +31,8 @@ function createTestInjector(): IInjector {
 	testInjector.register("platformsDataService", {
 		getPlatformData: (platform: string) => {
 			return {
-				appDestinationDirectoryPath: path.join(__dirname, "..", "files", "sourceMapBundle", platform.toLowerCase())
+				appDestinationDirectoryPath: path.join(__dirname, "..", "files", "sourceMapBundle", platform.toLowerCase()),
+				frameworkPackageName: `tns-${platform.toLowerCase()}`
 			};
 		}
 	});