Skip to content

Commit 0eccef8

Browse files
committed
chore: fix pr comments
1 parent eae7e09 commit 0eccef8

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const sourcemap = require("source-map");
21
import * as path from "path";
3-
const sourceMapConverter = require("convert-source-map");
4-
import { ANDROID_DEVICE_APP_ROOT_TEMPLATE, APP_FOLDER_NAME, NODE_MODULES_FOLDER_NAME } from "../constants";
52
import * as util from "util";
3+
import * as sourcemap from "source-map";
4+
import * as sourceMapConverter from "convert-source-map";
65
import { stringReplaceAll } from "../common/helpers";
6+
import { ANDROID_DEVICE_APP_ROOT_TEMPLATE, APP_FOLDER_NAME, NODE_MODULES_FOLDER_NAME } from "../constants";
77

88
interface IParsedMessage {
99
filePath?: string;

npm-shrinkwrap.json

Lines changed: 17 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"@types/chai-as-promised": "0.0.31",
9797
"@types/chokidar": "1.6.0",
9898
"@types/color": "3.0.0",
99+
"@types/convert-source-map": "^1.5.1",
99100
"@types/inquirer": "0.0.43",
100101
"@types/lodash": "4.14.123",
101102
"@types/node": "8.10.30",

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,38 @@ function toPlatformSep(filePath: string) {
4141

4242
const testCases: IDictionary<Array<{caseName: string, message: string, expected: string}>> = {
4343
"android": [{
44-
caseName: "trace massage",
44+
caseName: "trace message",
4545
message: "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap (file:///data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)",
4646
expected: `JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap file:///${toPlatformSep("src/main-view-model.ts")}:30:16\n`
4747
}, {
48-
caseName: "error massage",
48+
caseName: "error message",
4949
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",
5050
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`
51+
}, {
52+
caseName: "error message no match",
53+
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",
54+
expected: "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\n"
55+
}, {
56+
caseName: "no file match",
57+
message: "System.err: at com.tns.Runtime.dispatchCallJSMethodNative(Runtime.java:1203)",
58+
expected: "System.err: at com.tns.Runtime.dispatchCallJSMethodNative(Runtime.java:1203)\n"
5159
}],
5260
"ios": [{
53-
caseName: "console massage",
61+
caseName: "console message",
5462
message: "CONSOLE LOG file:///app/bundle.js:294:20: Test.",
5563
expected: `CONSOLE LOG Test. file:///${toPlatformSep("src/main-view-model.ts")}:29:20\n`
5664
}, {
57-
caseName: "trace massage",
65+
caseName: "trace message",
5866
message: "CONSOLE TRACE file:///app/bundle.js:295:22: Test",
5967
expected: `CONSOLE TRACE Test file:///${toPlatformSep("src/main-view-model.ts")}:30:22\n`
6068
}, {
61-
caseName: "error massage",
69+
caseName: "error message",
6270
message: "file:///app/bundle.js:296:32: JS ERROR Error: Test",
6371
expected: `JS ERROR Error Test file:///${toPlatformSep("src/main-view-model.ts")}:31:31\n`
72+
}, {
73+
caseName: "error message no match",
74+
message: "file:///app/bundle.js:400:32: JS ERROR Error: Test",
75+
expected: "file:///app/bundle.js:400:32: JS ERROR Error: Test\n"
6476
}]
6577
};
6678

0 commit comments

Comments
 (0)