@appland/appmap 3.100.1 → 3.102.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.
- package/CHANGELOG.md +21 -0
- package/built/cmds/compare/loadFindings.js +1 -23
- package/built/cmds/compare/loadFindings.js.map +1 -1
- package/built/cmds/compare-report/ChangeReport.js +12 -19
- package/built/cmds/compare-report/ChangeReport.js.map +1 -1
- package/built/cmds/compare-report/MarkdownReport.js +11 -2
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -1
- package/built/cmds/compare-report/Preprocessor.js +25 -5
- package/built/cmds/compare-report/Preprocessor.js.map +1 -1
- package/built/cmds/compare-report/ReportSection.js +94 -37
- package/built/cmds/compare-report/ReportSection.js.map +1 -1
- package/built/cmds/compare-report/helpers.js +106 -0
- package/built/cmds/compare-report/helpers.js.map +1 -0
- package/built/cmds/compare-report/normalizeAppMapId.js +15 -0
- package/built/cmds/compare-report/normalizeAppMapId.js.map +1 -0
- package/built/cmds/inventory/inventory.js +1 -15
- package/built/cmds/inventory/inventory.js.map +1 -1
- package/built/cmds/inventory-report/MarkdownReport.js +16 -56
- package/built/cmds/inventory-report/MarkdownReport.js.map +1 -1
- package/built/cmds/inventory-report/inventoryReport.js +10 -3
- package/built/cmds/inventory-report/inventoryReport.js.map +1 -1
- package/built/html/appmap.js +94 -94
- package/built/html/appmap.js.map +4 -4
- package/built/html/sequenceDiagram.js +94 -94
- package/built/html/sequenceDiagram.js.map +4 -4
- package/built/lib/loadAppMapConfig.js.map +1 -1
- package/package.json +1 -1
- package/resources/change-report/changed-appmaps/details.hbs +1 -1
- package/resources/change-report/changed-appmaps/heading.hbs +1 -1
- package/resources/change-report/failed-tests/details.hbs +1 -1
- package/resources/change-report/findings/details.hbs +15 -19
- package/resources/change-report/findings/heading.hbs +7 -9
- package/resources/change-report/new-appmaps/details.hbs +1 -1
- package/resources/change-report/new-appmaps/heading.hbs +2 -2
- package/resources/change-report/openapi-diff/details.hbs +1 -1
- package/resources/change-report/openapi-diff/heading.hbs +1 -1
- package/resources/change-report/removed-appmaps/details.hbs +1 -1
- package/resources/change-report/removed-appmaps/heading.hbs +3 -1
- package/resources/inventory-report/welcome/welcome.hbs +95 -60
- package/resources/inventory-report/default/inventory.hbs +0 -89
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const handlebars_1 = __importDefault(require("handlebars"));
|
|
7
|
+
const js_yaml_1 = require("js-yaml");
|
|
8
|
+
const inspect = (value) => {
|
|
9
|
+
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
10
|
+
};
|
|
11
|
+
const length = (...list) => {
|
|
12
|
+
const _fn = list.pop();
|
|
13
|
+
let result = 0;
|
|
14
|
+
for (const item of list) {
|
|
15
|
+
if (Array.isArray(item)) {
|
|
16
|
+
result += item.length;
|
|
17
|
+
}
|
|
18
|
+
else if (item.constructor === Map) {
|
|
19
|
+
result += item.size;
|
|
20
|
+
}
|
|
21
|
+
else if (typeof item === 'object') {
|
|
22
|
+
result += Object.keys(item).length;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return result;
|
|
26
|
+
};
|
|
27
|
+
const coalesce = (...list) => {
|
|
28
|
+
const _fn = list.pop();
|
|
29
|
+
return list.find((item) => item !== undefined && item !== '');
|
|
30
|
+
};
|
|
31
|
+
const extractArrayValue = (args) => (Array.isArray(args[0]) ? args[0] : args);
|
|
32
|
+
const eq = (...args) => {
|
|
33
|
+
args = [...args];
|
|
34
|
+
const _fn = args.pop();
|
|
35
|
+
if (args.length === 0)
|
|
36
|
+
return false;
|
|
37
|
+
const first = args[0];
|
|
38
|
+
return args.every((value) => value === first);
|
|
39
|
+
};
|
|
40
|
+
const pluralize = (count, singular, plural) => {
|
|
41
|
+
if (count === 1)
|
|
42
|
+
return singular;
|
|
43
|
+
else if (plural)
|
|
44
|
+
return plural;
|
|
45
|
+
else
|
|
46
|
+
return `${singular}s`;
|
|
47
|
+
};
|
|
48
|
+
const format_as_yaml = (value) => new handlebars_1.default.SafeString((0, js_yaml_1.dump)(value));
|
|
49
|
+
const sum = (...args) => {
|
|
50
|
+
args = [...args];
|
|
51
|
+
const _fn = args.pop();
|
|
52
|
+
const values = extractArrayValue(args);
|
|
53
|
+
return values.reduce((a, b) => a + (b || 0), 0);
|
|
54
|
+
};
|
|
55
|
+
const subtract = (...args) => {
|
|
56
|
+
args = [...args];
|
|
57
|
+
const _fn = args.pop();
|
|
58
|
+
const initial = args.shift() || 0;
|
|
59
|
+
return args.reduce((a, b) => a - (b || 0), initial);
|
|
60
|
+
};
|
|
61
|
+
const divide = (...args) => {
|
|
62
|
+
args = [...args];
|
|
63
|
+
const _fn = args.pop();
|
|
64
|
+
const values = extractArrayValue(args);
|
|
65
|
+
const initial = values.shift() || 0;
|
|
66
|
+
return values.reduce((a, b) => a / (b || 1), initial);
|
|
67
|
+
};
|
|
68
|
+
const format_as_percentage = (value, precision) => {
|
|
69
|
+
return `${(value * 100).toFixed(precision)}%`;
|
|
70
|
+
};
|
|
71
|
+
// TODO: Customize this per-language, e.g. 'module' for Ruby.
|
|
72
|
+
const lang_package_alias = () => 'package';
|
|
73
|
+
const keys = (obj) => {
|
|
74
|
+
if (Array.isArray(obj))
|
|
75
|
+
return obj;
|
|
76
|
+
if (obj.constructor === Map)
|
|
77
|
+
return Array.from(obj.keys());
|
|
78
|
+
if (typeof obj === 'object')
|
|
79
|
+
return Object.keys(obj);
|
|
80
|
+
return [];
|
|
81
|
+
};
|
|
82
|
+
const values = (obj) => {
|
|
83
|
+
if (Array.isArray(obj))
|
|
84
|
+
return obj;
|
|
85
|
+
if (obj.constructor === Map)
|
|
86
|
+
return Array.from(obj.values());
|
|
87
|
+
if (typeof obj === 'object')
|
|
88
|
+
return Object.values(obj);
|
|
89
|
+
return [];
|
|
90
|
+
};
|
|
91
|
+
exports.default = {
|
|
92
|
+
divide,
|
|
93
|
+
format_as_percentage,
|
|
94
|
+
format_as_yaml,
|
|
95
|
+
keys,
|
|
96
|
+
inspect,
|
|
97
|
+
lang_package_alias,
|
|
98
|
+
length,
|
|
99
|
+
coalesce,
|
|
100
|
+
eq,
|
|
101
|
+
pluralize,
|
|
102
|
+
subtract,
|
|
103
|
+
sum,
|
|
104
|
+
values,
|
|
105
|
+
};
|
|
106
|
+
//# sourceMappingURL=helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const console_1 = require("console");
|
|
4
|
+
function normalizeAppMapId(id) {
|
|
5
|
+
let normalizedId = id;
|
|
6
|
+
if (normalizedId.startsWith('./'))
|
|
7
|
+
normalizedId = normalizedId.slice('./'.length);
|
|
8
|
+
if (normalizedId.endsWith('.appmap.json')) {
|
|
9
|
+
(0, console_1.warn)(`AppMap id ${id} should not include the file extension`);
|
|
10
|
+
normalizedId = normalizedId.slice(0, '.appmap.json'.length * -1);
|
|
11
|
+
}
|
|
12
|
+
return normalizedId;
|
|
13
|
+
}
|
|
14
|
+
exports.default = normalizeAppMapId;
|
|
15
|
+
//# sourceMappingURL=normalizeAppMapId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizeAppMapId.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/normalizeAppMapId.ts"],"names":[],"mappings":";;AAAA,qCAA+B;AAE/B,SAAwB,iBAAiB,CAAC,EAAU;IAClD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QACzC,IAAA,cAAI,EAAC,aAAa,EAAE,wCAAwC,CAAC,CAAC;QAC9D,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;KAClE;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,oCAQC"}
|
|
@@ -118,7 +118,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
118
118
|
const operation = pathItem[method];
|
|
119
119
|
if (!operation)
|
|
120
120
|
continue;
|
|
121
|
-
const route = `${method.toUpperCase()} ${pattern}`;
|
|
122
121
|
const directoryIsh = pattern.split('/').slice(0, resourceTokens).join('/');
|
|
123
122
|
if (!routeCountByResource[directoryIsh])
|
|
124
123
|
routeCountByResource[directoryIsh] = 1;
|
|
@@ -138,18 +137,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
138
137
|
}
|
|
139
138
|
}
|
|
140
139
|
}
|
|
141
|
-
const findingsFiles = await (0, utils_1.findFiles)(appmapDir, 'appmap-findings.json');
|
|
142
|
-
const findingCountByImpactDomain = {};
|
|
143
|
-
for (const findingsFile of findingsFiles) {
|
|
144
|
-
const scanResults = JSON.parse(await (0, promises_1.readFile)(findingsFile, 'utf-8'));
|
|
145
|
-
for (const finding of scanResults.findings) {
|
|
146
|
-
const impactDomain = finding.impactDomain || 'Unknown';
|
|
147
|
-
if (!findingCountByImpactDomain[impactDomain])
|
|
148
|
-
findingCountByImpactDomain[impactDomain] = 1;
|
|
149
|
-
else
|
|
150
|
-
findingCountByImpactDomain[impactDomain] = findingCountByImpactDomain[impactDomain] + 1;
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
140
|
return {
|
|
154
141
|
appmapCountByRecorderName,
|
|
155
142
|
appmapCountByHTTPServerRequestCount,
|
|
@@ -163,7 +150,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
163
150
|
...new Set(uniquePackageDependencies.dependencies.map((d) => [d.caller, d.callee]).flat()),
|
|
164
151
|
].sort(),
|
|
165
152
|
packageDependencies: uniquePackageDependencies.dependencies,
|
|
166
|
-
findingCountByImpactDomain,
|
|
167
153
|
};
|
|
168
154
|
}
|
|
169
155
|
exports.command = 'inventory [output-file]';
|
|
@@ -192,7 +178,7 @@ const builder = (args) => {
|
|
|
192
178
|
exports.builder = builder;
|
|
193
179
|
const handler = async (argv) => {
|
|
194
180
|
(0, utils_1.verbose)(argv.verbose);
|
|
195
|
-
const { outputFile, directory, resourceTokens } = argv;
|
|
181
|
+
const { outputFile, directory, resourceTokens, findingLimit } = argv;
|
|
196
182
|
(0, assert_1.default)(resourceTokens);
|
|
197
183
|
(0, assert_1.default)(typeof resourceTokens === 'number');
|
|
198
184
|
(0, assert_1.default)(resourceTokens > 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../src/cmds/inventory/inventory.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,+BAA+C;AAC/C,0CAAkD;AAClD,2BAAgC;AAChC,qCAA+B;AAE/B,iDAA0C;AAE1C,6EAA0E;AAC1E,uCAAiD;
|
|
1
|
+
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../src/cmds/inventory/inventory.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ReportTemplate = exports.WelcomeReport =
|
|
6
|
+
exports.ReportTemplate = exports.WelcomeReport = void 0;
|
|
7
7
|
const handlebars_1 = __importDefault(require("handlebars"));
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const promises_1 = require("fs/promises");
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const fs_1 = require("fs");
|
|
12
|
+
const helpers_1 = __importDefault(require("../compare-report/helpers"));
|
|
12
13
|
const TemplateDirectory = [
|
|
13
14
|
'../../../resources/inventory-report',
|
|
14
15
|
'../../../../resources/inventory-report', // In development
|
|
@@ -18,37 +19,25 @@ const TemplateDirectory = [
|
|
|
18
19
|
(0, assert_1.default)(TemplateDirectory, "Report template directory 'inventory-report' not found");
|
|
19
20
|
var TemplateName;
|
|
20
21
|
(function (TemplateName) {
|
|
21
|
-
TemplateName["Default"] = "default";
|
|
22
22
|
TemplateName["Welcome"] = "welcome";
|
|
23
23
|
})(TemplateName || (TemplateName = {}));
|
|
24
|
-
async function generateReport(templateName, report) {
|
|
24
|
+
async function generateReport(templateName, report, appmapConfig) {
|
|
25
25
|
let reportTemplate;
|
|
26
26
|
switch (templateName) {
|
|
27
|
-
case TemplateName.Default:
|
|
28
|
-
reportTemplate = new DefaultReport();
|
|
29
|
-
break;
|
|
30
27
|
case TemplateName.Welcome:
|
|
31
28
|
reportTemplate = new WelcomeReport();
|
|
32
29
|
break;
|
|
33
30
|
}
|
|
34
|
-
return reportTemplate.generateReport(report);
|
|
31
|
+
return reportTemplate.generateReport(report, appmapConfig);
|
|
35
32
|
}
|
|
36
33
|
exports.default = generateReport;
|
|
37
|
-
class DefaultReport {
|
|
38
|
-
async generateReport(reportData) {
|
|
39
|
-
(0, assert_1.default)(TemplateDirectory);
|
|
40
|
-
const templateFile = (0, path_1.join)(TemplateDirectory, 'default', 'inventory.hbs');
|
|
41
|
-
const template = await ReportTemplate.build(templateFile);
|
|
42
|
-
return template.generateMarkdown(reportData);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
exports.DefaultReport = DefaultReport;
|
|
46
34
|
class WelcomeReport {
|
|
47
|
-
async generateReport(reportData) {
|
|
35
|
+
async generateReport(reportData, appmapConfig) {
|
|
48
36
|
(0, assert_1.default)(TemplateDirectory);
|
|
49
37
|
const templateFile = (0, path_1.join)(TemplateDirectory, 'welcome', 'welcome.hbs');
|
|
50
38
|
const template = await ReportTemplate.build(templateFile);
|
|
51
|
-
|
|
39
|
+
const data = Object.assign(Object.assign({}, reportData), { appmapConfig });
|
|
40
|
+
return template.generateMarkdown(data);
|
|
52
41
|
}
|
|
53
42
|
}
|
|
54
43
|
exports.WelcomeReport = WelcomeReport;
|
|
@@ -56,36 +45,13 @@ class ReportTemplate {
|
|
|
56
45
|
constructor(template) {
|
|
57
46
|
this.template = template;
|
|
58
47
|
}
|
|
59
|
-
generateMarkdown(
|
|
60
|
-
return this.template(
|
|
48
|
+
generateMarkdown(data) {
|
|
49
|
+
return this.template(data, {
|
|
61
50
|
helpers: ReportTemplate.helpers(),
|
|
62
51
|
allowProtoPropertiesByDefault: true,
|
|
63
52
|
});
|
|
64
53
|
}
|
|
65
54
|
static helpers() {
|
|
66
|
-
const inspect = (value) => {
|
|
67
|
-
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
68
|
-
};
|
|
69
|
-
const length = (...list) => {
|
|
70
|
-
const _fn = list.pop();
|
|
71
|
-
let result = 0;
|
|
72
|
-
for (const item of list) {
|
|
73
|
-
if (Array.isArray(item)) {
|
|
74
|
-
result += item.length;
|
|
75
|
-
}
|
|
76
|
-
else if (item.constructor === Map) {
|
|
77
|
-
result += item.size;
|
|
78
|
-
}
|
|
79
|
-
else if (typeof item === 'object') {
|
|
80
|
-
result += Object.keys(item).length;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return result;
|
|
84
|
-
};
|
|
85
|
-
const coalesce = (...list) => {
|
|
86
|
-
const _fn = list.pop();
|
|
87
|
-
return list.find((item) => item !== undefined && item !== '');
|
|
88
|
-
};
|
|
89
55
|
const select_values_by_key_range = (data, keyMin, keyMax) => {
|
|
90
56
|
if (typeof keyMax === 'object')
|
|
91
57
|
keyMax = undefined;
|
|
@@ -95,25 +61,19 @@ class ReportTemplate {
|
|
|
95
61
|
.map((k) => data[k]);
|
|
96
62
|
return result;
|
|
97
63
|
};
|
|
98
|
-
const extractArrayValue = (args) => (Array.isArray(args[0]) ? args[0] : args);
|
|
99
64
|
const sum_values_by_key_range = (data, keyMin, keyMax) => {
|
|
100
65
|
const values = select_values_by_key_range(data, keyMin, keyMax);
|
|
101
66
|
return values.reduce((a, b) => a + (b || 0), 0);
|
|
102
67
|
};
|
|
103
|
-
const
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
68
|
+
const packages_matching_configuration = (packages, configuredPackages) => {
|
|
69
|
+
const normalizePackage = (pkg) => pkg.replace(/\//g, '.').toLowerCase();
|
|
70
|
+
return packages.filter((pkg) => {
|
|
71
|
+
return configuredPackages.find((configuredPackage) => normalizePackage(pkg).startsWith(normalizePackage(configuredPackage.path)));
|
|
72
|
+
});
|
|
108
73
|
};
|
|
109
|
-
return {
|
|
110
|
-
coalesce,
|
|
111
|
-
inspect,
|
|
112
|
-
length,
|
|
74
|
+
return Object.assign({ packages_matching_configuration,
|
|
113
75
|
select_values_by_key_range,
|
|
114
|
-
|
|
115
|
-
sum_values_by_key_range,
|
|
116
|
-
};
|
|
76
|
+
sum_values_by_key_range }, helpers_1.default);
|
|
117
77
|
}
|
|
118
78
|
static async build(templateFile) {
|
|
119
79
|
const template = handlebars_1.default.compile(await (0, promises_1.readFile)(templateFile, 'utf8'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;
|
|
1
|
+
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/MarkdownReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,8 @@ const MarkdownReport_1 = __importDefault(require("./MarkdownReport"));
|
|
|
11
11
|
const console_1 = require("console");
|
|
12
12
|
const process_1 = require("process");
|
|
13
13
|
const path_1 = require("path");
|
|
14
|
+
const assert_1 = __importDefault(require("assert"));
|
|
15
|
+
const loadAppMapConfig_1 = __importDefault(require("../../lib/loadAppMapConfig"));
|
|
14
16
|
exports.command = 'inventory-report <report-json-file> [output-file]';
|
|
15
17
|
exports.describe = 'Generate a report document describing the current state of a repository.';
|
|
16
18
|
const builder = (args) => {
|
|
@@ -22,8 +24,8 @@ const builder = (args) => {
|
|
|
22
24
|
args.positional('template-name', {
|
|
23
25
|
type: 'string',
|
|
24
26
|
describe: `Template name.`,
|
|
25
|
-
default: '
|
|
26
|
-
choices: ['
|
|
27
|
+
default: 'welcome',
|
|
28
|
+
choices: ['welcome'],
|
|
27
29
|
alias: 't',
|
|
28
30
|
});
|
|
29
31
|
args.positional('output-file', {
|
|
@@ -44,8 +46,13 @@ const handler = async (argv) => {
|
|
|
44
46
|
const { directory } = argv;
|
|
45
47
|
(0, handleWorkingDirectory_1.handleWorkingDirectory)(directory);
|
|
46
48
|
const { reportJsonFile, outputFile, templateName } = argv;
|
|
49
|
+
(0, assert_1.default)(reportJsonFile);
|
|
50
|
+
(0, assert_1.default)(templateName);
|
|
51
|
+
const appmapConfig = await (0, loadAppMapConfig_1.default)();
|
|
52
|
+
if (!appmapConfig)
|
|
53
|
+
throw new Error('Unable to load appmap.yml');
|
|
47
54
|
const report = JSON.parse(await (0, promises_1.readFile)(reportJsonFile, 'utf-8'));
|
|
48
|
-
const reportMD = await (0, MarkdownReport_1.default)(templateName, report);
|
|
55
|
+
const reportMD = await (0, MarkdownReport_1.default)(templateName, report, appmapConfig);
|
|
49
56
|
if (outputFile) {
|
|
50
57
|
await (0, promises_1.writeFile)(outputFile, reportMD);
|
|
51
58
|
(0, console_1.warn)(`Report written to ${(0, path_1.join)((0, process_1.cwd)(), outputFile)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventoryReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/inventoryReport.ts"],"names":[],"mappings":";;;;;;AACA,uCAAsC;AACtC,6EAA0E;AAC1E,0CAAkD;AAClD,sEAA8C;AAC9C,qCAA+B;AAC/B,qCAA8B;AAC9B,+BAA4B;
|
|
1
|
+
{"version":3,"file":"inventoryReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/inventoryReport.ts"],"names":[],"mappings":";;;;;;AACA,uCAAsC;AACtC,6EAA0E;AAC1E,0CAAkD;AAClD,sEAA8C;AAC9C,qCAA+B;AAC/B,qCAA8B;AAC9B,+BAA4B;AAE5B,oDAA4B;AAC5B,kFAA0D;AAE7C,QAAA,OAAO,GAAG,mDAAmD,CAAC;AAC9D,QAAA,QAAQ,GAAG,0EAA0E,CAAC;AAE5F,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE;QAClC,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,8EAA8E;QACxF,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,CAAC,SAAS,CAAC;QACpB,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;QAC7B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,0EAA0E;QACpF,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,CAAC;AA5BW,QAAA,OAAO,WA4BlB;AAEK,MAAM,OAAO,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;IACzC,IAAA,eAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAA,+CAAsB,EAAC,SAAS,CAAC,CAAC;IAElC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC1D,IAAA,gBAAM,EAAC,cAAc,CAAC,CAAC;IACvB,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC;IAErB,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAgB,GAAE,CAAC;IAC9C,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAE3E,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAc,EAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC1E,IAAI,UAAU,EAAE;QACd,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACtC,IAAA,cAAI,EAAC,qBAAqB,IAAA,WAAI,EAAC,IAAA,aAAG,GAAE,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;KACtD;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACvB;AACH,CAAC,CAAC;AArBW,QAAA,OAAO,WAqBlB"}
|