@appland/scanner 1.40.0 → 1.40.1
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.
|
@@ -72,17 +72,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
72
72
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
73
73
|
};
|
|
74
74
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
75
|
-
var fs_1 = require("fs");
|
|
76
75
|
var url_1 = require("url");
|
|
77
76
|
var async_1 = require("async");
|
|
78
77
|
var src_1 = require("@appland/client/dist/src");
|
|
79
78
|
var appMap_1 = require("./appMap");
|
|
80
79
|
var mapset_1 = require("./mapset");
|
|
81
80
|
var path_1 = require("path");
|
|
81
|
+
var promises_1 = require("fs/promises");
|
|
82
82
|
function default_1(scanResults, appId, appmapDir) {
|
|
83
83
|
return __awaiter(this, void 0, void 0, function () {
|
|
84
84
|
var findings, relevantFilePaths, appMapUUIDByFileName, branchCount, commitCount, q, mostFrequent, branch, commit, mapset, uploadData, request;
|
|
85
|
-
var _this = this;
|
|
86
85
|
return __generator(this, function (_a) {
|
|
87
86
|
switch (_a.label) {
|
|
88
87
|
case 0:
|
|
@@ -92,38 +91,32 @@ function default_1(scanResults, appId, appmapDir) {
|
|
|
92
91
|
appMapUUIDByFileName = {};
|
|
93
92
|
branchCount = {};
|
|
94
93
|
commitCount = {};
|
|
95
|
-
q = (0, async_1.queue)(function (filePath, callback) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
branch = (_a = appMapStruct.metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
|
|
107
|
-
commit = (_b = appMapStruct.metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
|
|
108
|
-
if (branch) {
|
|
109
|
-
branchCount[branch] || (branchCount[branch] = 1);
|
|
110
|
-
branchCount[branch] += 1;
|
|
111
|
-
}
|
|
112
|
-
if (commit) {
|
|
113
|
-
commitCount[commit] || (commitCount[commit] = 1);
|
|
114
|
-
commitCount[commit] += 1;
|
|
115
|
-
}
|
|
116
|
-
return [4 /*yield*/, appMap_1.AppMap.upload(buffer, { app: appId })];
|
|
117
|
-
case 2:
|
|
118
|
-
appMap = _c.sent();
|
|
119
|
-
if (appMap) {
|
|
120
|
-
appMapUUIDByFileName[filePath] = appMap.uuid;
|
|
121
|
-
}
|
|
122
|
-
callback();
|
|
123
|
-
return [2 /*return*/];
|
|
94
|
+
q = (0, async_1.queue)(function (filePath, callback) {
|
|
95
|
+
console.log("Uploading AppMap " + filePath);
|
|
96
|
+
(0, promises_1.readFile)((0, path_1.join)(appmapDir, filePath))
|
|
97
|
+
.then(function (buffer) {
|
|
98
|
+
var _a, _b;
|
|
99
|
+
var appMapStruct = JSON.parse(buffer.toString());
|
|
100
|
+
var branch = (_a = appMapStruct.metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
|
|
101
|
+
var commit = (_b = appMapStruct.metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
|
|
102
|
+
if (branch) {
|
|
103
|
+
branchCount[branch] || (branchCount[branch] = 1);
|
|
104
|
+
branchCount[branch] += 1;
|
|
124
105
|
}
|
|
125
|
-
|
|
126
|
-
|
|
106
|
+
if (commit) {
|
|
107
|
+
commitCount[commit] || (commitCount[commit] = 1);
|
|
108
|
+
commitCount[commit] += 1;
|
|
109
|
+
}
|
|
110
|
+
return appMap_1.AppMap.upload(buffer, { app: appId });
|
|
111
|
+
})
|
|
112
|
+
.then(function (appMap) {
|
|
113
|
+
if (appMap) {
|
|
114
|
+
appMapUUIDByFileName[filePath] = appMap.uuid;
|
|
115
|
+
}
|
|
116
|
+
})
|
|
117
|
+
.then(function () { return callback(); })
|
|
118
|
+
.catch(callback);
|
|
119
|
+
}, 5);
|
|
127
120
|
q.error(function (err, filePath) {
|
|
128
121
|
console.error("An error occurred uploading " + filePath + ": " + err);
|
|
129
122
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/integration/appland/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/integration/appland/upload.ts"],"names":[],"mappings":"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"}
|