Skip to content

Filter iOS log to show original file location for ts files #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion lib/services/ios-log-filter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
let sourcemap = require("source-map");
import * as path from "path";

export class IOSLogFilter implements Mobile.IPlatformLogFilter {

constructor(private $loggingLevels: Mobile.ILoggingLevels) { }
constructor(
private $fs: IFileSystem,
private $projectData: IProjectData,
private $loggingLevels: Mobile.ILoggingLevels) { }

public filterData(data: string, logLevel: string, pid?: string): string {

Expand All @@ -23,12 +29,40 @@ export class IOSLogFilter implements Mobile.IPlatformLogFilter {
let pidIndex = data.indexOf(searchString);
if (pidIndex > 0) {
data = data.substring(pidIndex + searchString.length, data.length);
data = this.getOriginalFileLocation(data);
}
}
return data.trim();
}

return data;
}

private getOriginalFileLocation(data: string): string {
let fileString = "file:///";
let fileIndex = data.indexOf(fileString);
if (fileIndex >= 0) {
let parts = data.substring(fileIndex + fileString.length).split(":");
if (parts.length >= 4) {
let file = parts[0];
let sourceMapFile = path.join(this.$projectData.projectDir, file + ".map");
let row = parseInt(parts[1]);
let column = parseInt(parts[2]);
if (this.$fs.exists(sourceMapFile).wait()) {
let sourceMap = this.$fs.readText(sourceMapFile, "utf8").wait();
let smc = new sourcemap.SourceMapConsumer(sourceMap);
let originalPosition = smc.originalPositionFor({line:row,column:column});
data = data.substring(0, fileIndex + fileString.length)
+ file.replace(".js", ".ts") + ":"
+ originalPosition.line + ":"
+ originalPosition.column;
for (let i = 3; i<parts.length; i++) {
data += ":" + parts[i];
}
}
}
}
return data;
}
}
$injector.register("iOSLogFilter", IOSLogFilter);
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"ref-struct": "https://github.com/telerik/ref-struct/tarball/v1.0.2.3",
"semver": "5.0.1",
"shelljs": "0.5.3",
"source-map": "0.5.6",
"tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
"temp": "0.8.3",
"utf-8-validate": "https://github.com/telerik/utf-8-validate/tarball/v1.0.1.3",
Expand Down