@security-alert/sarif-to-markdown 1.3.5 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -25,6 +25,14 @@ export declare type sarifFormatterOptions = {
25
25
  * Base path
26
26
  */
27
27
  sourceRoot: string;
28
+ /**
29
+ * Details of the rules in the comment or not, this might make the comment too big for Github
30
+ */
31
+ details?: boolean;
32
+ /**
33
+ * Should the markdown include suppressed findings, defaults to true
34
+ */
35
+ suppressedResults?: boolean;
28
36
  };
29
37
  declare type sarifToMarkdownResult = {
30
38
  title?: string;
@@ -19,7 +19,7 @@ function escapeMarkdown(strings) {
19
19
  return strings.reduce(function (result, str, i) {
20
20
  var value = values[i - 1];
21
21
  if (typeof value === "string") {
22
- return result + markdown_escape_1.default(value) + str;
22
+ return result + (0, markdown_escape_1.default)(value) + str;
23
23
  }
24
24
  else {
25
25
  return result + String(value) + str;
@@ -43,15 +43,29 @@ var createCodeURL = function (result, options) {
43
43
  if (!physicalLocation.region) {
44
44
  return [];
45
45
  }
46
- var lineNumber = physicalLocation.region.endLine !== undefined ? "L" + physicalLocation.region.startLine + "-" + physicalLocation.region.endLine : "L" + physicalLocation.region.startLine;
47
- return url_join_1.default(githubHost, options.owner, options.repo, "blob/" + options.branch, options.sourceRoot, physicalLocation.artifactLocation.uri + "#" + lineNumber);
46
+ var lineNumber = physicalLocation.region.endLine !== undefined
47
+ ? "L".concat(physicalLocation.region.startLine, "-").concat(physicalLocation.region.endLine)
48
+ : "L".concat(physicalLocation.region.startLine);
49
+ return (0, url_join_1.default)(githubHost, options.owner, options.repo, "blob/".concat(options.branch), options.sourceRoot, "".concat(physicalLocation.artifactLocation.uri, "#").concat(lineNumber));
48
50
  });
49
51
  };
50
- exports.sarifToMarkdown = function (options) {
52
+ function groupBy(arr, criteria) {
53
+ var newObj = arr.reduce(function (acc, currentValue) {
54
+ if (!acc[currentValue[criteria]]) {
55
+ acc[currentValue[criteria]] = [];
56
+ }
57
+ acc[currentValue[criteria]].push(currentValue);
58
+ return acc;
59
+ }, {});
60
+ return [newObj];
61
+ }
62
+ var sarifToMarkdown = function (options) {
63
+ var suppressedResultsFlag = options.suppressedResults !== undefined ? options.suppressedResults : true;
51
64
  return function (sarifLog) {
52
65
  return sarifLog.runs.map(function (run) {
53
- var _a, _b, _c, _d;
54
- var title = options.title ? "# " + options.title + "\n" : "";
66
+ var _a, _b, _c, _d, _e, _f, _g;
67
+ var title = options.title ? "# ".concat(options.title, "\n") : "# Report";
68
+ var toolInfo = "\n## Tool information\n- Name: ".concat((_a = run.tool.driver) === null || _a === void 0 ? void 0 : _a.name, "\n- Organization: ").concat((_b = run.tool.driver) === null || _b === void 0 ? void 0 : _b.organization, "\n- Version: ").concat((_c = run.tool.driver) === null || _c === void 0 ? void 0 : _c.semanticVersion, "\n");
55
69
  // # tool section
56
70
  // Rule info
57
71
  // Vulnerability info
@@ -60,14 +74,29 @@ exports.sarifToMarkdown = function (options) {
60
74
  /**
61
75
  * # Rule Info
62
76
  */
63
- var ruleInfo = escapeMarkdown(templateObject_1 || (templateObject_1 = __makeTemplateObject(["## Rules\n<!-- Rule Info -->\n", "\n "], ["\\\n## Rules\n<!-- Rule Info -->\n",
64
- "\n "])), (_b = (_a = run.tool.driver) === null || _a === void 0 ? void 0 : _a.rules) === null || _b === void 0 ? void 0 : _b.map(function (rule) {
77
+ var ruleInfo = escapeMarkdown(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n## Rules information\n<!-- Rule Info -->\n<details><summary>Rules details</summary>\n\n", "\n "], ["\n## Rules information\n<!-- Rule Info -->\n<details><summary>Rules details</summary>\n\n", "\n "])), (_e = (_d = run.tool.driver) === null || _d === void 0 ? void 0 : _d.rules) === null || _e === void 0 ? void 0 : _e.map(function (rule) {
65
78
  var _a, _b;
66
79
  var severity = rule.properties ? (_a = rule.properties) === null || _a === void 0 ? void 0 : _a["problem.severity"] : "";
67
80
  // rule description
68
- return "**" + rule.id + "** (severity: **" + severity + "**)\n\n> " + ((_b = rule.shortDescription) === null || _b === void 0 ? void 0 : _b.text);
81
+ return "\n - ".concat(rule.id, " [").concat(severity, "] \n\n > ").concat((_b = rule.shortDescription) === null || _b === void 0 ? void 0 : _b.text, "\n");
69
82
  }));
70
- var ruleDetails = "<details><summary>Details</summary>\n<pre>" + JSON.stringify(run.tool, null, 4) + "</pre></details>";
83
+ var ruleDetails = "<details><summary>Details</summary>\n<pre>".concat(JSON.stringify(run.tool, null, 4), "</pre></details>\n");
84
+ var groupedResults = groupBy(run.results, "ruleId");
85
+ var groupedResultsMarkdown = "";
86
+ for (var _i = 0, groupedResults_1 = groupedResults; _i < groupedResults_1.length; _i++) {
87
+ var group = groupedResults_1[_i];
88
+ for (var r in group) {
89
+ groupedResultsMarkdown +=
90
+ "- **".concat(r, "**: ").concat(group[r][0] ? (0, markdown_escape_1.default)(group[r][0].message.text) : "") + "\n";
91
+ for (var _h = 0, _j = group[r]; _h < _j.length; _h++) {
92
+ var result = _j[_h];
93
+ var properResult = result;
94
+ if (properResult.suppressions === undefined) {
95
+ groupedResultsMarkdown += " - " + createCodeURL(result, options) + "\n";
96
+ }
97
+ }
98
+ }
99
+ }
71
100
  /* Results
72
101
  - rule id
73
102
  - message
@@ -75,19 +104,57 @@ exports.sarifToMarkdown = function (options) {
75
104
 
76
105
  If pass the scan, results is empty array
77
106
  */
78
- var results = run.results && run.results.length > 0 ? "\n## Results\n\n" + ((_c = run.results) === null || _c === void 0 ? void 0 : _c.map(function (result) {
79
- return "- **" + result.ruleId + "**: " + markdown_escape_1.default(result.message.text)
80
- + "\n\n"
81
- + createCodeURL(result, options).join("\n")
82
- + "\n";
83
- }).join("\n")) + "\n"
107
+ var results = run.results && run.results.length > 0
108
+ ? "\n## Results\n".concat(groupedResultsMarkdown)
84
109
  : "\n## Results\n\nNo Error\n\n";
110
+ var groupedSuppressedResultsMD = "";
111
+ var suppressedCounter = 0;
112
+ for (var _k = 0, groupedResults_2 = groupedResults; _k < groupedResults_2.length; _k++) {
113
+ var group = groupedResults_2[_k];
114
+ for (var r in group) {
115
+ var groupContainsSuppressed = group[r].filter(function (r) { return r.suppressions !== undefined; }).length > 0;
116
+ if (groupContainsSuppressed) {
117
+ groupedSuppressedResultsMD +=
118
+ "- **".concat(r, "**: ").concat(group[r][0] ? (0, markdown_escape_1.default)(group[r][0].message.text) : "") + "\n";
119
+ for (var _l = 0, _m = group[r]; _l < _m.length; _l++) {
120
+ var result = _m[_l];
121
+ var properResult = result;
122
+ if (properResult.suppressions !== undefined) {
123
+ suppressedCounter += 1;
124
+ groupedSuppressedResultsMD += " - " + createCodeURL(result, options) + "\n";
125
+ }
126
+ }
127
+ }
128
+ }
129
+ }
130
+ // careful, double ternary... first check if we should include suppressedresults (return empty string)
131
+ // then check if there are results, if none, return default string
132
+ var suppressedResultsText = suppressedResultsFlag
133
+ ? run.results && suppressedCounter > 0
134
+ ? "\n## Suppressed results\n\n".concat(groupedSuppressedResultsMD, "\n")
135
+ : "\n## Results\n\nNo suppressed issues\n\n"
136
+ : "";
137
+ if (options.details) {
138
+ return {
139
+ body: title +
140
+ results +
141
+ "\n" +
142
+ suppressedResultsText +
143
+ "\n" +
144
+ ruleInfo +
145
+ "\n" +
146
+ ruleDetails +
147
+ toolInfo,
148
+ hasMessages: ((_f = run.results) === null || _f === void 0 ? void 0 : _f.length) !== 0
149
+ };
150
+ }
85
151
  return {
86
- body: title + ruleInfo + "\n" + ruleDetails + "\n" + results,
87
- hasMessages: ((_d = run.results) === null || _d === void 0 ? void 0 : _d.length) !== 0
152
+ body: title + results + "\n" + suppressedResultsText + "\n" + ruleInfo + "\n" + toolInfo,
153
+ hasMessages: ((_g = run.results) === null || _g === void 0 ? void 0 : _g.length) !== 0
88
154
  };
89
155
  });
90
156
  };
91
157
  };
158
+ exports.sarifToMarkdown = sarifToMarkdown;
92
159
  var templateObject_1;
93
160
  //# sourceMappingURL=sarif-to-markdown.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sarif-to-markdown.js","sourceRoot":"","sources":["../src/sarif-to-markdown.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sarif-to-markdown.js","sourceRoot":"","sources":["../src/sarif-to-markdown.ts"],"names":[],"mappings":";;;;;;;;;;AACA,aAAa;AACb,oEAAqC;AACrC,sDAA+B;AAE/B,SAAS,cAAc,CAAC,OAA6B;IAAE,gBAAgB;SAAhB,UAAgB,EAAhB,qBAAgB,EAAhB,IAAgB;QAAhB,+BAAgB;;IACnE,OAAO,OAAO,CAAC,MAAM,CAAC,UAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACjC,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,MAAM,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;aAAM;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,IAAM,aAAa,GAAG,UAAC,MAAc,EAAE,OAA8B;;IACjE,IAAM,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,oBAAoB,CAAC;IAC9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IACD,OAAO,MAAA,MAAM,CAAC,SAAS,0CAAE,OAAO,CAAC,UAAC,QAAa;QAC3C,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YAC5B,OAAO,EAAE,CAAC;SACb;QACD,IAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC;QACnD,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE;YACpC,OAAO,EAAE,CAAC;SACb;QACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACb;QACD,IAAM,UAAU,GACZ,gBAAgB,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS;YACzC,CAAC,CAAC,WAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,cAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAE;YAC5E,CAAC,CAAC,WAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAE,CAAC;QAClD,OAAO,IAAA,kBAAO,EACV,UAAU,EACV,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,EACZ,eAAQ,OAAO,CAAC,MAAM,CAAE,EACxB,OAAO,CAAC,UAAU,EAClB,UAAG,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAI,UAAU,CAAE,CAC3D,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAsCF,SAAS,OAAO,CAAC,GAAa,EAAE,QAAa;IACzC,IAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAQ,EAAE,YAAiB;QAC3D,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE;YAC9B,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;SACpC;QACD,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/C,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CAAC,MAAM,CAAC,CAAC;AACpB,CAAC;AAUM,IAAM,eAAe,GAAG,UAAC,OAA8B;IAC1D,IAAM,qBAAqB,GAAG,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,OAAO,UAAC,QAAa;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;;YAC9B,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAK,OAAO,CAAC,KAAK,OAAI,CAAC,CAAC,CAAC,UAAU,CAAC;YAElE,IAAM,QAAQ,GAAG,yCAEnB,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,IAAI,+BACb,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,YAAY,0BAClC,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,eAAe,OAC5C,CAAC;YACU,iBAAiB;YACjB,YAAY;YACZ,qBAAqB;YACrB,aAAa;YACb,YAAY;YACZ;;eAEG;YACH,IAAM,QAAQ,GAAG,cAAc,qKAAA,2FAKzC,EAMA,KACA,KAPA,MAAA,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,IAAS;;gBACpC,IAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,UAAU,0CAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9E,mBAAmB;gBACnB,OAAO,kBACH,IAAI,CAAC,EAAE,eAAK,QAAQ,yBACpB,MAAA,IAAI,CAAC,gBAAgB,0CAAE,IAAI,OAAI,CAAC;YACxC,CAAC,CAAC,CACA,CAAC;YACS,IAAM,WAAW,GAAG,oDACzB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,uBACvC,CAAC;YACU,IAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEtD,IAAI,sBAAsB,GAAG,EAAE,CAAC;YAChC,KAAoB,UAAc,EAAd,iCAAc,EAAd,4BAAc,EAAd,IAAc,EAAE;gBAA/B,IAAM,KAAK,uBAAA;gBACZ,KAAK,IAAM,CAAC,IAAI,KAAK,EAAE;oBACnB,sBAAsB;wBAClB,cAAO,CAAC,iBAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAE,GAAG,IAAI,CAAC;oBAChF,KAAqB,UAAQ,EAAR,KAAA,KAAK,CAAC,CAAC,CAAC,EAAR,cAAQ,EAAR,IAAQ,EAAE;wBAA1B,IAAM,MAAM,SAAA;wBACb,IAAM,YAAY,GAAG,MAA2B,CAAC;wBACjD,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;4BACzC,sBAAsB,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;yBAC9E;qBACJ;iBACJ;aACJ;YACD;;;;;;cAME;YACF,IAAM,OAAO,GACT,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACjC,CAAC,CAAC,wBAEpB,sBAAsB,CAAE;gBACN,CAAC,CAAC,8BAKrB,CAAC;YAEU,IAAI,0BAA0B,GAAG,EAAE,CAAC;YACpC,IAAI,iBAAiB,GAAG,CAAC,CAAC;YAC1B,KAAoB,UAAc,EAAd,iCAAc,EAAd,4BAAc,EAAd,IAAc,EAAE;gBAA/B,IAAM,KAAK,uBAAA;gBACZ,KAAK,IAAM,CAAC,IAAI,KAAK,EAAE;oBACnB,IAAM,uBAAuB,GACzB,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,CAAS,IAAK,OAAA,CAAC,CAAC,YAAY,KAAK,SAAS,EAA5B,CAA4B,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;oBAC5E,IAAI,uBAAuB,EAAE;wBACzB,0BAA0B;4BACtB,cAAO,CAAC,iBAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAE,GAAG,IAAI,CAAC;wBAChF,KAAqB,UAAQ,EAAR,KAAA,KAAK,CAAC,CAAC,CAAC,EAAR,cAAQ,EAAR,IAAQ,EAAE;4BAA1B,IAAM,MAAM,SAAA;4BACb,IAAM,YAAY,GAAG,MAA2B,CAAC;4BACjD,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gCACzC,iBAAiB,IAAI,CAAC,CAAC;gCACvB,0BAA0B,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;6BAClF;yBACJ;qBACJ;iBACJ;aACJ;YACD,sGAAsG;YACtG,kEAAkE;YAClE,IAAM,qBAAqB,GAAG,qBAAqB;gBAC/C,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,iBAAiB,GAAG,CAAC;oBAClC,CAAC,CAAC,qCAGpB,0BAA0B,OAC3B;oBACmB,CAAC,CAAC,0CAKrB;gBACe,CAAC,CAAC,EAAE,CAAC;YAET,IAAI,OAAO,CAAC,OAAO,EAAE;gBACjB,OAAO;oBACH,IAAI,EACA,KAAK;wBACL,OAAO;wBACP,IAAI;wBACJ,qBAAqB;wBACrB,IAAI;wBACJ,QAAQ;wBACR,IAAI;wBACJ,WAAW;wBACX,QAAQ;oBACZ,WAAW,EAAE,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,MAAM,MAAK,CAAC;iBACzC,CAAC;aACL;YACD,OAAO;gBACH,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI,GAAG,qBAAqB,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,QAAQ;gBACxF,WAAW,EAAE,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,MAAM,MAAK,CAAC;aACzC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC,CAAC;AAhIW,QAAA,eAAe,mBAgI1B"}
@@ -25,6 +25,14 @@ export declare type sarifFormatterOptions = {
25
25
  * Base path
26
26
  */
27
27
  sourceRoot: string;
28
+ /**
29
+ * Details of the rules in the comment or not, this might make the comment too big for Github
30
+ */
31
+ details?: boolean;
32
+ /**
33
+ * Should the markdown include suppressed findings, defaults to true
34
+ */
35
+ suppressedResults?: boolean;
28
36
  };
29
37
  declare type sarifToMarkdownResult = {
30
38
  title?: string;
@@ -3,7 +3,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
3
3
  return cooked;
4
4
  };
5
5
  // @ts-ignore
6
- import escape from 'markdown-escape';
6
+ import escape from "markdown-escape";
7
7
  import urlJoin from "url-join";
8
8
  function escapeMarkdown(strings) {
9
9
  var values = [];
@@ -37,15 +37,29 @@ var createCodeURL = function (result, options) {
37
37
  if (!physicalLocation.region) {
38
38
  return [];
39
39
  }
40
- var lineNumber = physicalLocation.region.endLine !== undefined ? "L" + physicalLocation.region.startLine + "-" + physicalLocation.region.endLine : "L" + physicalLocation.region.startLine;
41
- return urlJoin(githubHost, options.owner, options.repo, "blob/" + options.branch, options.sourceRoot, physicalLocation.artifactLocation.uri + "#" + lineNumber);
40
+ var lineNumber = physicalLocation.region.endLine !== undefined
41
+ ? "L".concat(physicalLocation.region.startLine, "-").concat(physicalLocation.region.endLine)
42
+ : "L".concat(physicalLocation.region.startLine);
43
+ return urlJoin(githubHost, options.owner, options.repo, "blob/".concat(options.branch), options.sourceRoot, "".concat(physicalLocation.artifactLocation.uri, "#").concat(lineNumber));
42
44
  });
43
45
  };
46
+ function groupBy(arr, criteria) {
47
+ var newObj = arr.reduce(function (acc, currentValue) {
48
+ if (!acc[currentValue[criteria]]) {
49
+ acc[currentValue[criteria]] = [];
50
+ }
51
+ acc[currentValue[criteria]].push(currentValue);
52
+ return acc;
53
+ }, {});
54
+ return [newObj];
55
+ }
44
56
  export var sarifToMarkdown = function (options) {
57
+ var suppressedResultsFlag = options.suppressedResults !== undefined ? options.suppressedResults : true;
45
58
  return function (sarifLog) {
46
59
  return sarifLog.runs.map(function (run) {
47
- var _a, _b, _c, _d;
48
- var title = options.title ? "# " + options.title + "\n" : "";
60
+ var _a, _b, _c, _d, _e, _f, _g;
61
+ var title = options.title ? "# ".concat(options.title, "\n") : "# Report";
62
+ var toolInfo = "\n## Tool information\n- Name: ".concat((_a = run.tool.driver) === null || _a === void 0 ? void 0 : _a.name, "\n- Organization: ").concat((_b = run.tool.driver) === null || _b === void 0 ? void 0 : _b.organization, "\n- Version: ").concat((_c = run.tool.driver) === null || _c === void 0 ? void 0 : _c.semanticVersion, "\n");
49
63
  // # tool section
50
64
  // Rule info
51
65
  // Vulnerability info
@@ -54,14 +68,29 @@ export var sarifToMarkdown = function (options) {
54
68
  /**
55
69
  * # Rule Info
56
70
  */
57
- var ruleInfo = escapeMarkdown(templateObject_1 || (templateObject_1 = __makeTemplateObject(["## Rules\n<!-- Rule Info -->\n", "\n "], ["\\\n## Rules\n<!-- Rule Info -->\n",
58
- "\n "])), (_b = (_a = run.tool.driver) === null || _a === void 0 ? void 0 : _a.rules) === null || _b === void 0 ? void 0 : _b.map(function (rule) {
71
+ var ruleInfo = escapeMarkdown(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n## Rules information\n<!-- Rule Info -->\n<details><summary>Rules details</summary>\n\n", "\n "], ["\n## Rules information\n<!-- Rule Info -->\n<details><summary>Rules details</summary>\n\n", "\n "])), (_e = (_d = run.tool.driver) === null || _d === void 0 ? void 0 : _d.rules) === null || _e === void 0 ? void 0 : _e.map(function (rule) {
59
72
  var _a, _b;
60
73
  var severity = rule.properties ? (_a = rule.properties) === null || _a === void 0 ? void 0 : _a["problem.severity"] : "";
61
74
  // rule description
62
- return "**" + rule.id + "** (severity: **" + severity + "**)\n\n> " + ((_b = rule.shortDescription) === null || _b === void 0 ? void 0 : _b.text);
75
+ return "\n - ".concat(rule.id, " [").concat(severity, "] \n\n > ").concat((_b = rule.shortDescription) === null || _b === void 0 ? void 0 : _b.text, "\n");
63
76
  }));
64
- var ruleDetails = "<details><summary>Details</summary>\n<pre>" + JSON.stringify(run.tool, null, 4) + "</pre></details>";
77
+ var ruleDetails = "<details><summary>Details</summary>\n<pre>".concat(JSON.stringify(run.tool, null, 4), "</pre></details>\n");
78
+ var groupedResults = groupBy(run.results, "ruleId");
79
+ var groupedResultsMarkdown = "";
80
+ for (var _i = 0, groupedResults_1 = groupedResults; _i < groupedResults_1.length; _i++) {
81
+ var group = groupedResults_1[_i];
82
+ for (var r in group) {
83
+ groupedResultsMarkdown +=
84
+ "- **".concat(r, "**: ").concat(group[r][0] ? escape(group[r][0].message.text) : "") + "\n";
85
+ for (var _h = 0, _j = group[r]; _h < _j.length; _h++) {
86
+ var result = _j[_h];
87
+ var properResult = result;
88
+ if (properResult.suppressions === undefined) {
89
+ groupedResultsMarkdown += " - " + createCodeURL(result, options) + "\n";
90
+ }
91
+ }
92
+ }
93
+ }
65
94
  /* Results
66
95
  - rule id
67
96
  - message
@@ -69,16 +98,53 @@ export var sarifToMarkdown = function (options) {
69
98
 
70
99
  If pass the scan, results is empty array
71
100
  */
72
- var results = run.results && run.results.length > 0 ? "\n## Results\n\n" + ((_c = run.results) === null || _c === void 0 ? void 0 : _c.map(function (result) {
73
- return "- **" + result.ruleId + "**: " + escape(result.message.text)
74
- + "\n\n"
75
- + createCodeURL(result, options).join("\n")
76
- + "\n";
77
- }).join("\n")) + "\n"
101
+ var results = run.results && run.results.length > 0
102
+ ? "\n## Results\n".concat(groupedResultsMarkdown)
78
103
  : "\n## Results\n\nNo Error\n\n";
104
+ var groupedSuppressedResultsMD = "";
105
+ var suppressedCounter = 0;
106
+ for (var _k = 0, groupedResults_2 = groupedResults; _k < groupedResults_2.length; _k++) {
107
+ var group = groupedResults_2[_k];
108
+ for (var r in group) {
109
+ var groupContainsSuppressed = group[r].filter(function (r) { return r.suppressions !== undefined; }).length > 0;
110
+ if (groupContainsSuppressed) {
111
+ groupedSuppressedResultsMD +=
112
+ "- **".concat(r, "**: ").concat(group[r][0] ? escape(group[r][0].message.text) : "") + "\n";
113
+ for (var _l = 0, _m = group[r]; _l < _m.length; _l++) {
114
+ var result = _m[_l];
115
+ var properResult = result;
116
+ if (properResult.suppressions !== undefined) {
117
+ suppressedCounter += 1;
118
+ groupedSuppressedResultsMD += " - " + createCodeURL(result, options) + "\n";
119
+ }
120
+ }
121
+ }
122
+ }
123
+ }
124
+ // careful, double ternary... first check if we should include suppressedresults (return empty string)
125
+ // then check if there are results, if none, return default string
126
+ var suppressedResultsText = suppressedResultsFlag
127
+ ? run.results && suppressedCounter > 0
128
+ ? "\n## Suppressed results\n\n".concat(groupedSuppressedResultsMD, "\n")
129
+ : "\n## Results\n\nNo suppressed issues\n\n"
130
+ : "";
131
+ if (options.details) {
132
+ return {
133
+ body: title +
134
+ results +
135
+ "\n" +
136
+ suppressedResultsText +
137
+ "\n" +
138
+ ruleInfo +
139
+ "\n" +
140
+ ruleDetails +
141
+ toolInfo,
142
+ hasMessages: ((_f = run.results) === null || _f === void 0 ? void 0 : _f.length) !== 0
143
+ };
144
+ }
79
145
  return {
80
- body: title + ruleInfo + "\n" + ruleDetails + "\n" + results,
81
- hasMessages: ((_d = run.results) === null || _d === void 0 ? void 0 : _d.length) !== 0
146
+ body: title + results + "\n" + suppressedResultsText + "\n" + ruleInfo + "\n" + toolInfo,
147
+ hasMessages: ((_g = run.results) === null || _g === void 0 ? void 0 : _g.length) !== 0
82
148
  };
83
149
  });
84
150
  };
@@ -1 +1 @@
1
- {"version":3,"file":"sarif-to-markdown.js","sourceRoot":"","sources":["../src/sarif-to-markdown.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sarif-to-markdown.js","sourceRoot":"","sources":["../src/sarif-to-markdown.ts"],"names":[],"mappings":";;;;AACA,aAAa;AACb,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,OAA6B;IAAE,gBAAgB;SAAhB,UAAgB,EAAhB,qBAAgB,EAAhB,IAAgB;QAAhB,+BAAgB;;IACnE,OAAO,OAAO,CAAC,MAAM,CAAC,UAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACjC,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;aAAM;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,IAAM,aAAa,GAAG,UAAC,MAAc,EAAE,OAA8B;;IACjE,IAAM,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,oBAAoB,CAAC;IAC9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IACD,OAAO,MAAA,MAAM,CAAC,SAAS,0CAAE,OAAO,CAAC,UAAC,QAAa;QAC3C,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YAC5B,OAAO,EAAE,CAAC;SACb;QACD,IAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC;QACnD,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE;YACpC,OAAO,EAAE,CAAC;SACb;QACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACb;QACD,IAAM,UAAU,GACZ,gBAAgB,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS;YACzC,CAAC,CAAC,WAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,cAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAE;YAC5E,CAAC,CAAC,WAAI,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAE,CAAC;QAClD,OAAO,OAAO,CACV,UAAU,EACV,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,IAAI,EACZ,eAAQ,OAAO,CAAC,MAAM,CAAE,EACxB,OAAO,CAAC,UAAU,EAClB,UAAG,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,cAAI,UAAU,CAAE,CAC3D,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAsCF,SAAS,OAAO,CAAC,GAAa,EAAE,QAAa;IACzC,IAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAQ,EAAE,YAAiB;QAC3D,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE;YAC9B,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;SACpC;QACD,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/C,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CAAC,MAAM,CAAC,CAAC;AACpB,CAAC;AAUD,MAAM,CAAC,IAAM,eAAe,GAAG,UAAC,OAA8B;IAC1D,IAAM,qBAAqB,GAAG,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,OAAO,UAAC,QAAa;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,GAAQ;;YAC9B,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAK,OAAO,CAAC,KAAK,OAAI,CAAC,CAAC,CAAC,UAAU,CAAC;YAElE,IAAM,QAAQ,GAAG,yCAEnB,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,IAAI,+BACb,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,YAAY,0BAClC,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,eAAe,OAC5C,CAAC;YACU,iBAAiB;YACjB,YAAY;YACZ,qBAAqB;YACrB,aAAa;YACb,YAAY;YACZ;;eAEG;YACH,IAAM,QAAQ,GAAG,cAAc,qKAAA,2FAKzC,EAMA,KACA,KAPA,MAAA,MAAA,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,IAAS;;gBACpC,IAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,UAAU,0CAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9E,mBAAmB;gBACnB,OAAO,kBACH,IAAI,CAAC,EAAE,eAAK,QAAQ,yBACpB,MAAA,IAAI,CAAC,gBAAgB,0CAAE,IAAI,OAAI,CAAC;YACxC,CAAC,CAAC,CACA,CAAC;YACS,IAAM,WAAW,GAAG,oDACzB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,uBACvC,CAAC;YACU,IAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEtD,IAAI,sBAAsB,GAAG,EAAE,CAAC;YAChC,KAAoB,UAAc,EAAd,iCAAc,EAAd,4BAAc,EAAd,IAAc,EAAE;gBAA/B,IAAM,KAAK,uBAAA;gBACZ,KAAK,IAAM,CAAC,IAAI,KAAK,EAAE;oBACnB,sBAAsB;wBAClB,cAAO,CAAC,iBAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAE,GAAG,IAAI,CAAC;oBAChF,KAAqB,UAAQ,EAAR,KAAA,KAAK,CAAC,CAAC,CAAC,EAAR,cAAQ,EAAR,IAAQ,EAAE;wBAA1B,IAAM,MAAM,SAAA;wBACb,IAAM,YAAY,GAAG,MAA2B,CAAC;wBACjD,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;4BACzC,sBAAsB,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;yBAC9E;qBACJ;iBACJ;aACJ;YACD;;;;;;cAME;YACF,IAAM,OAAO,GACT,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACjC,CAAC,CAAC,wBAEpB,sBAAsB,CAAE;gBACN,CAAC,CAAC,8BAKrB,CAAC;YAEU,IAAI,0BAA0B,GAAG,EAAE,CAAC;YACpC,IAAI,iBAAiB,GAAG,CAAC,CAAC;YAC1B,KAAoB,UAAc,EAAd,iCAAc,EAAd,4BAAc,EAAd,IAAc,EAAE;gBAA/B,IAAM,KAAK,uBAAA;gBACZ,KAAK,IAAM,CAAC,IAAI,KAAK,EAAE;oBACnB,IAAM,uBAAuB,GACzB,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,CAAS,IAAK,OAAA,CAAC,CAAC,YAAY,KAAK,SAAS,EAA5B,CAA4B,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;oBAC5E,IAAI,uBAAuB,EAAE;wBACzB,0BAA0B;4BACtB,cAAO,CAAC,iBAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAE,GAAG,IAAI,CAAC;wBAChF,KAAqB,UAAQ,EAAR,KAAA,KAAK,CAAC,CAAC,CAAC,EAAR,cAAQ,EAAR,IAAQ,EAAE;4BAA1B,IAAM,MAAM,SAAA;4BACb,IAAM,YAAY,GAAG,MAA2B,CAAC;4BACjD,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gCACzC,iBAAiB,IAAI,CAAC,CAAC;gCACvB,0BAA0B,IAAI,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;6BAClF;yBACJ;qBACJ;iBACJ;aACJ;YACD,sGAAsG;YACtG,kEAAkE;YAClE,IAAM,qBAAqB,GAAG,qBAAqB;gBAC/C,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,iBAAiB,GAAG,CAAC;oBAClC,CAAC,CAAC,qCAGpB,0BAA0B,OAC3B;oBACmB,CAAC,CAAC,0CAKrB;gBACe,CAAC,CAAC,EAAE,CAAC;YAET,IAAI,OAAO,CAAC,OAAO,EAAE;gBACjB,OAAO;oBACH,IAAI,EACA,KAAK;wBACL,OAAO;wBACP,IAAI;wBACJ,qBAAqB;wBACrB,IAAI;wBACJ,QAAQ;wBACR,IAAI;wBACJ,WAAW;wBACX,QAAQ;oBACZ,WAAW,EAAE,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,MAAM,MAAK,CAAC;iBACzC,CAAC;aACL;YACD,OAAO;gBACH,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI,GAAG,qBAAqB,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,GAAG,QAAQ;gBACxF,WAAW,EAAE,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,MAAM,MAAK,CAAC;aACzC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@security-alert/sarif-to-markdown",
3
- "version": "1.3.5",
3
+ "version": "1.7.0",
4
4
  "description": "Convert Sarif format to body text",
5
5
  "keywords": [
6
6
  "sarif",
@@ -33,18 +33,11 @@
33
33
  "scripts": {
34
34
  "build": "tsc -p . && tsc --project ./tsconfig.module.json",
35
35
  "clean": "rimraf lib/ module/",
36
- "prettier": "prettier --write \"**/*.{js,jsx,ts,tsx,css}\"",
37
36
  "prepublish": "npm run --if-present build",
38
37
  "test": "mocha \"test/**/*.ts\"",
39
38
  "updateSnapshot": "UPDATE_SNAPSHOT=1 npm test",
40
39
  "watch": "tsc -p . --watch"
41
40
  },
42
- "prettier": {
43
- "printWidth": 120,
44
- "singleQuote": false,
45
- "tabWidth": 4,
46
- "trailingComma": "none"
47
- },
48
41
  "dependencies": {
49
42
  "@types/sarif": "^2.1.2",
50
43
  "markdown-escape": "^1.1.0",
@@ -54,15 +47,14 @@
54
47
  "@types/mocha": "^8.0.1",
55
48
  "@types/node": "^14.0.27",
56
49
  "@types/url-join": "^4.0.0",
57
- "mocha": "^8.1.0",
58
- "prettier": "^2.0.5",
50
+ "mocha": "^9.2.2",
59
51
  "rimraf": "^3.0.2",
60
- "ts-node": "^8.10.2",
61
- "ts-node-test-register": "^8.0.1",
62
- "typescript": "^3.9.7"
52
+ "ts-node": "^10.7.0",
53
+ "ts-node-test-register": "^10.0.0",
54
+ "typescript": "^4.6.3"
63
55
  },
64
56
  "publishConfig": {
65
57
  "access": "public"
66
58
  },
67
- "gitHead": "7a4cdf7ddf5e3773f8790bf704b88bb7630c8914"
59
+ "gitHead": "5be23f660a2ff4af68317b34132e0853f65829ce"
68
60
  }
package/CHANGELOG.md DELETED
@@ -1,33 +0,0 @@
1
- # Change Log
2
-
3
- All notable changes to this project will be documented in this file.
4
- See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
-
6
- ## [1.3.5](https://github.com/azu/security-alert/compare/v1.3.4...v1.3.5) (2020-08-05)
7
-
8
-
9
- ### Bug Fixes
10
-
11
- * **sarif-to-mark:** fix title and add severity ([b6a41e0](https://github.com/azu/security-alert/commit/b6a41e0bfeb3b7674dec963a2475aff7e473e20c))
12
-
13
-
14
-
15
-
16
-
17
- ## [1.3.4](https://github.com/azu/security-alert/compare/v1.3.3...v1.3.4) (2020-08-04)
18
-
19
-
20
- ### Bug Fixes
21
-
22
- * **sarif-to-markdown:** use blob ([8dfb3f3](https://github.com/azu/security-alert/commit/8dfb3f3c4df65d408d977feea01ce5fee32242d9))
23
-
24
-
25
-
26
-
27
-
28
- # [1.3.0](https://github.com/azu/security-alert/compare/v1.2.0...v1.3.0) (2020-08-04)
29
-
30
-
31
- ### Features
32
-
33
- * add sarif packages ([c0831cd](https://github.com/azu/security-alert/commit/c0831cd1834e1f84ed721500cbe8db9523edc4eb))
@@ -1,24 +0,0 @@
1
- import type { Log } from "sarif";
2
- export declare type sarifFormatterResult = {
3
- title: string;
4
- body: string;
5
- };
6
- export declare type sarifFormatterOptions = {
7
- githubHost?: string;
8
- /**
9
- * GitHub Owner
10
- */
11
- owner: string;
12
- /**
13
- * GitHub Repo
14
- */
15
- repo: string;
16
- /**
17
- * Base path
18
- */
19
- sourceRoot: string;
20
- };
21
- export declare const sarifFormatter: (options: sarifFormatterOptions) => (sarifLog: Log) => {
22
- title: string;
23
- body: string;
24
- }[];
@@ -1,56 +0,0 @@
1
- "use strict";
2
- var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
3
- if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
4
- return cooked;
5
- };
6
- var __importDefault = (this && this.__importDefault) || function (mod) {
7
- return (mod && mod.__esModule) ? mod : { "default": mod };
8
- };
9
- Object.defineProperty(exports, "__esModule", { value: true });
10
- exports.sarifFormatter = void 0;
11
- // @ts-ignore
12
- var markdown_escape_1 = __importDefault(require("markdown-escape"));
13
- function escapeMarkdown(strings) {
14
- var values = [];
15
- for (var _i = 1; _i < arguments.length; _i++) {
16
- values[_i - 1] = arguments[_i];
17
- }
18
- return strings.reduce(function (result, str, i) {
19
- var value = values[i - 1];
20
- if (typeof value === "string") {
21
- return result + markdown_escape_1.default(value) + str;
22
- }
23
- else {
24
- return result + String(value) + str;
25
- }
26
- });
27
- }
28
- var createCodeURL = function (result, options) {
29
- return options.githubHost + "/" + ;
30
- };
31
- exports.sarifFormatter = function (options) {
32
- return function (sarifLog) {
33
- return sarifLog.runs.map(function (run) {
34
- var _a, _b, _c;
35
- // # tool section
36
- // Rule info
37
- // Vulnerability info
38
- // ## Results
39
- // Result(s)
40
- var rule = escapeMarkdown(templateObject_2 || (templateObject_2 = __makeTemplateObject(["# ", "\n<!-- Rule Info -->\n", "\n \n<details><summary>Details</summary>\n<pre>", "</pre></details>\n\n<!-- Results \n\n- rule id\n- message\n- vulnerability location\n\n-->\n\n", "\n"], ["\\\n# ", "\n<!-- Rule Info -->\n",
41
- "\n \n<details><summary>Details</summary>\n<pre>", "</pre></details>\n\n<!-- Results \n\n- rule id\n- message\n- vulnerability location\n\n-->\n\n",
42
- "\n"])), run.tool.driver.name, (_b = (_a = run.tool.driver) === null || _a === void 0 ? void 0 : _a.rules) === null || _b === void 0 ? void 0 : _b.map(function (rule) {
43
- // rule description
44
- return "**" + rule.id + "**\n\n> " + rule.shortDescription;
45
- }), JSON.stringify(run.tool, null, 4), (_c = run.results) === null || _c === void 0 ? void 0 : _c.map(function (result) {
46
- return escapeMarkdown(templateObject_1 || (templateObject_1 = __makeTemplateObject(["**", "**: ", "\n\n\n"], ["**", "**: ", "\n\n\n"])), result.ruleId, result.message);
47
- }));
48
- return {
49
- title: "",
50
- body: ""
51
- };
52
- });
53
- };
54
- };
55
- var templateObject_1, templateObject_2;
56
- //# sourceMappingURL=sarif-to-markdown.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sarif-to-markdown.js","sourceRoot":"","sources":["../src/sarif-to-markdown.ts"],"names":[],"mappings":";;;;;;;;;;AACA,aAAa;AACb,oEAAoC;AAGpC,SAAS,cAAc,CAAC,OAA6B;IAAE,gBAAgB;SAAhB,UAAgB,EAAhB,qBAAgB,EAAhB,IAAgB;QAAhB,+BAAgB;;IACnE,OAAO,OAAO,CAAC,MAAM,CAAC,UAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACjC,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,MAAM,GAAG,yBAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;aAAM;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACvC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,IAAM,aAAa,GAAG,UAAC,MAAc,EAAE,OAA8B;IACjE,OAAU,OAAO,CAAC,UAAU,SAAM,CAAA;AAEtC,CAAC,CAAA;AAsBY,QAAA,cAAc,GAAG,UAAC,OAA8B;IACzD,OAAO,UAAC,QAAa;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG;;YACxB,iBAAiB;YACjB,YAAY;YACZ,qBAAqB;YACrB,aAAa;YACb,YAAY;YACZ,IAAM,IAAI,GAAG,cAAc,4PAAA,QACnC,EAAoB,wBAEtB;gBAMW,iDAGN,EAAiC,gGAUtC;gBAKY,IACb,KA3BG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,cAEtB,GAAG,CAAC,IAAI,CAAC,MAAM,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAA,IAAI;gBACd,mBAAmB;gBACnB,OAAO,OAAK,IAAI,CAAC,EAAE,gBAEnC,IAAI,CAAC,gBAAkB,CAAA;YACX,CAAC,GAIV,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAUtC,GAAG,CAAC,OAAO,0CAAE,GAAG,CAAC,UAAA,MAAM;gBACT,OAAO,cAAc,yFAAA,IAAK,EAAa,MAAO,EAAc,QAG3E,KAHyC,MAAM,CAAC,MAAM,EAAO,MAAM,CAAC,OAAO,EAG3E;YACW,CAAC,EACZ,CAAA;YAGW,OAAO;gBACH,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,EAAE;aACX,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;AAEL,CAAC,CAAA"}