Skip to content

Commit eae7e09

Browse files
committed
fix: unify path according to platform
1 parent 311d6b3 commit eae7e09

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as path from "path";
33
const sourceMapConverter = require("convert-source-map");
44
import { ANDROID_DEVICE_APP_ROOT_TEMPLATE, APP_FOLDER_NAME, NODE_MODULES_FOLDER_NAME } from "../constants";
55
import * as util from "util";
6+
import { stringReplaceAll } from "../common/helpers";
67

78
interface IParsedMessage {
89
filePath?: string;
@@ -71,7 +72,7 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
7172
if (!_.startsWith(sourceFile, NODE_MODULES_FOLDER_NAME)) {
7273
sourceFile = path.join(projectData.getAppDirectoryRelativePath(), sourceFile);
7374
}
74-
75+
sourceFile = stringReplaceAll(sourceFile, "/", path.sep);
7576
return { sourceFile, line: originalPosition.line, column: originalPosition.column};
7677
}
7778
}

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as path from "path";
44
import { LogSourceMapService } from "../../lib/services/log-source-map-service";
55
import { DevicePlatformsConstants } from "../../lib/common/mobile/device-platforms-constants";
66
import { FileSystem } from "../../lib/common/file-system";
7+
import { stringReplaceAll } from "../../lib/common/helpers";
78

89
function createTestInjector(): IInjector {
910
const testInjector = new Yok();
@@ -34,28 +35,32 @@ function createTestInjector(): IInjector {
3435
return testInjector;
3536
}
3637

38+
function toPlatformSep(filePath: string) {
39+
return stringReplaceAll(filePath, "/", path.sep);
40+
}
41+
3742
const testCases: IDictionary<Array<{caseName: string, message: string, expected: string}>> = {
3843
"android": [{
3944
caseName: "trace massage",
4045
message: "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap (file:///data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)",
41-
expected: "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap file:///src/main-view-model.ts:30:16\n"
46+
expected: `JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap file:///${toPlatformSep("src/main-view-model.ts")}:30:16\n`
4247
}, {
4348
caseName: "error massage",
4449
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",
45-
expected: "System.err: Frame: function:'module.exports.push../main-view-model.ts.HelloWorldModel.onTap', file:' file:///src/main-view-model.ts:31:14\n"
50+
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`
4651
}],
4752
"ios": [{
4853
caseName: "console massage",
4954
message: "CONSOLE LOG file:///app/bundle.js:294:20: Test.",
50-
expected: "CONSOLE LOG Test. file:///src/main-view-model.ts:29:20\n"
55+
expected: `CONSOLE LOG Test. file:///${toPlatformSep("src/main-view-model.ts")}:29:20\n`
5156
}, {
5257
caseName: "trace massage",
5358
message: "CONSOLE TRACE file:///app/bundle.js:295:22: Test",
54-
expected: "CONSOLE TRACE Test file:///src/main-view-model.ts:30:22\n"
59+
expected: `CONSOLE TRACE Test file:///${toPlatformSep("src/main-view-model.ts")}:30:22\n`
5560
}, {
5661
caseName: "error massage",
5762
message: "file:///app/bundle.js:296:32: JS ERROR Error: Test",
58-
expected: "JS ERROR Error Test file:///src/main-view-model.ts:31:31\n"
63+
expected: `JS ERROR Error Test file:///${toPlatformSep("src/main-view-model.ts")}:31:31\n`
5964
}]
6065
};
6166

0 commit comments

Comments
 (0)