@appland/appmap 3.83.0 → 3.84.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 +14 -0
- package/built/cli.js +2 -0
- package/built/cli.js.map +1 -1
- package/built/cmds/archive/analyze.js +2 -2
- package/built/cmds/archive/analyze.js.map +1 -1
- package/built/cmds/archive/archive.js +12 -8
- package/built/cmds/archive/archive.js.map +1 -1
- package/built/cmds/archive/archiveStore.js +2 -5
- package/built/cmds/archive/archiveStore.js.map +1 -1
- package/built/cmds/archive/buildFilter.js +57 -0
- package/built/cmds/archive/buildFilter.js.map +1 -0
- package/built/cmds/archive/indexAppMaps.js +4 -1
- package/built/cmds/archive/indexAppMaps.js.map +1 -1
- package/built/cmds/archive/parseFilterArgs.js +35 -0
- package/built/cmds/archive/parseFilterArgs.js.map +1 -0
- package/built/cmds/archive/restore.js +129 -0
- package/built/cmds/archive/restore.js.map +1 -0
- package/built/cmds/archive/unpackArchive.js +39 -0
- package/built/cmds/archive/unpackArchive.js.map +1 -0
- package/built/cmds/archive/updateSequenceDiagrams.js +9 -2
- package/built/cmds/archive/updateSequenceDiagrams.js.map +1 -1
- package/built/lib/loadAppMapConfig.js.map +1 -1
- package/built/search/findCodeObjects.js +3 -1
- package/built/search/findCodeObjects.js.map +1 -1
- package/built/sequenceDiagram/analyzeAppMaps.js +3 -2
- package/built/sequenceDiagram/analyzeAppMaps.js.map +1 -1
- package/built/utils.js +34 -15
- package/built/utils.js.map +1 -1
- package/package.json +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@appland/appmap-v3.84.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.83.0...@appland/appmap-v3.84.0) (2023-08-07)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* remove fetch implementation for Octokit ([f9dda6e](https://github.com/getappmap/appmap-js/commit/f9dda6e439c55e55dd88fcbd9b499153d662e96e))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* Configure compare filters ([89b74b8](https://github.com/getappmap/appmap-js/commit/89b74b8c55a81f7e3d21778ba866be3f17236d86))
|
|
12
|
+
* Enable filter configuration via --filter options ([4c37936](https://github.com/getappmap/appmap-js/commit/4c37936598334c827a4be90cfbc45d62894e6c56))
|
|
13
|
+
* restore command ([b64a876](https://github.com/getappmap/appmap-js/commit/b64a87690a76ae81910b1f3ed717cd9cf6412cc8))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.83.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.82.1...@appland/appmap-v3.83.0) (2023-08-01)
|
|
2
16
|
|
|
3
17
|
|
package/built/cli.js
CHANGED
|
@@ -35,6 +35,7 @@ const SequenceDiagramCommand = require('./cmds/sequenceDiagram');
|
|
|
35
35
|
const SequenceDiagramDiffCommand = require('./cmds/sequenceDiagramDiff');
|
|
36
36
|
const StatsCommand = require('./cmds/stats/stats');
|
|
37
37
|
const ArchiveCommand = require('./cmds/archive/archive');
|
|
38
|
+
const RestoreCommand = require('./cmds/archive/restore');
|
|
38
39
|
const upload_1 = __importDefault(require("./cmds/upload"));
|
|
39
40
|
const sqlErrorLog_1 = __importDefault(require("./lib/sqlErrorLog"));
|
|
40
41
|
(0, models_1.setSQLErrorHandler)(sqlErrorLog_1.default);
|
|
@@ -209,6 +210,7 @@ yargs(process.argv.slice(2))
|
|
|
209
210
|
.command(prune_1.default)
|
|
210
211
|
.command(upload_1.default)
|
|
211
212
|
.command(ArchiveCommand)
|
|
213
|
+
.command(RestoreCommand)
|
|
212
214
|
.strict()
|
|
213
215
|
.demandCommand()
|
|
214
216
|
.help().argv;
|
package/built/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const updateSequenceDiagrams_1 = __importDefault(require("./updateSequenceDiagra
|
|
|
7
7
|
const generateOpenAPI_1 = __importDefault(require("./generateOpenAPI"));
|
|
8
8
|
const indexAppMaps_1 = require("./indexAppMaps");
|
|
9
9
|
const scan_1 = require("./scan");
|
|
10
|
-
async function analyze(maxAppMapSizeInBytes,
|
|
10
|
+
async function analyze(maxAppMapSizeInBytes, compareFilter, appMapDir) {
|
|
11
11
|
let oversizedAppMaps;
|
|
12
12
|
{
|
|
13
13
|
const startTime = new Date().getTime();
|
|
@@ -18,7 +18,7 @@ async function analyze(maxAppMapSizeInBytes, appMapFilter, appMapDir) {
|
|
|
18
18
|
}
|
|
19
19
|
{
|
|
20
20
|
console.log('Generating sequence diagrams...');
|
|
21
|
-
const result = await (0, updateSequenceDiagrams_1.default)(appMapDir, maxAppMapSizeInBytes,
|
|
21
|
+
const result = await (0, updateSequenceDiagrams_1.default)(appMapDir, maxAppMapSizeInBytes, compareFilter);
|
|
22
22
|
process.stdout.write(`done (${result.numGenerated})\n`);
|
|
23
23
|
oversizedAppMaps = result.oversizedAppMaps;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":";;;;;AAAA,sFAA8D;AAC9D,wEAAgD;AAChD,iDAA8C;AAC9C,iCAA8B;AAGf,KAAK,UAAU,OAAO,CACnC,oBAA4B,EAC5B,aAA4B,EAC5B,SAAiB;IAEjB,IAAI,gBAA0B,CAAC;IAC/B;QACE,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAY,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,eAAe,OAAO,IAAI,CAAC,CAAC;KAC9D;IACD;QACE,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAsB,EAAC,SAAS,EAAE,oBAAoB,EAAE,aAAa,CAAC,CAAC;QAC5F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,YAAY,KAAK,CAAC,CAAC;QACxD,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;KAC5C;IACD;QACE,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,IAAA,yBAAe,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,wBAAwB,OAAO,IAAI,CAAC,CAAC;KAClD;IACD;QACE,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,eAAe,OAAO,IAAI,CAAC,CAAC;KAC1D;IAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC9B,CAAC;AAnCD,0BAmCC"}
|
|
@@ -15,9 +15,8 @@ const loadAppMapConfig_1 = __importDefault(require("../../lib/loadAppMapConfig")
|
|
|
15
15
|
const fingerprinter_1 = require("../../fingerprint/fingerprinter");
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const gitRevision_1 = __importDefault(require("./gitRevision"));
|
|
18
|
-
const serializeAppMapFilter_1 = require("./serializeAppMapFilter");
|
|
19
|
-
const models_1 = require("@appland/models");
|
|
20
18
|
const analyze_1 = __importDefault(require("./analyze"));
|
|
19
|
+
const parseFilterArgs_1 = __importDefault(require("./parseFilterArgs"));
|
|
21
20
|
// ## 1.3.0
|
|
22
21
|
//
|
|
23
22
|
// * AppMap scanner is run on all AppMaps, with an appmap-findings.json file stored in each index directory.
|
|
@@ -81,6 +80,11 @@ commit of the current git revision may not be the one that triggered the build.`
|
|
|
81
80
|
describe: 'maximum AppMap size that will be processed, in filesystem-reported MB',
|
|
82
81
|
default: fileSizeFilter_1.DefaultMaxAppMapSizeInMB,
|
|
83
82
|
});
|
|
83
|
+
args.option('filter', {
|
|
84
|
+
describe: 'filter to apply to AppMaps when normalizing them into sequence diagrams',
|
|
85
|
+
type: 'string',
|
|
86
|
+
multiple: true,
|
|
87
|
+
});
|
|
84
88
|
return args.strict();
|
|
85
89
|
};
|
|
86
90
|
exports.builder = builder;
|
|
@@ -88,16 +92,17 @@ const handler = async (argv) => {
|
|
|
88
92
|
(0, utils_1.verbose)(argv.verbose);
|
|
89
93
|
if (!process.env.npm_package_version)
|
|
90
94
|
console.log(`Note: The AppMap archive won't contain the version of @appland/appmap because process.env.npm_package_version is not available.`);
|
|
95
|
+
const { maxSize, analyze: doAnalyze, type: typeArg, revision: revisionArg, outputFile: outputFileNameArg, outputDir: outputDirArg, filter: filterArg, } = argv;
|
|
91
96
|
(0, handleWorkingDirectory_1.handleWorkingDirectory)(argv.directory);
|
|
92
97
|
const workingDirectory = process.cwd();
|
|
93
98
|
const appmapConfig = await (0, loadAppMapConfig_1.default)();
|
|
94
99
|
if (!appmapConfig)
|
|
95
100
|
throw new Error(`Unable to load appmap.yml config file`);
|
|
96
|
-
const
|
|
97
|
-
const appMapDir = (0, path_1.resolve)(workingDirectory, suppliedAppMapDir);
|
|
101
|
+
const appMapDir = await (0, locateAppMapDir_1.locateAppMapDir)();
|
|
98
102
|
const compareConfig = appmapConfig.compare;
|
|
99
|
-
const
|
|
100
|
-
|
|
103
|
+
const compareFilter = (compareConfig === null || compareConfig === void 0 ? void 0 : compareConfig.filter) || {};
|
|
104
|
+
if (filterArg)
|
|
105
|
+
(0, parseFilterArgs_1.default)(compareFilter, typeof filterArg === 'string' ? [filterArg] : filterArg);
|
|
101
106
|
const maxAppMapSizeInBytes = Math.round(parseFloat(maxSize) * 1024 * 1024);
|
|
102
107
|
console.log(`Building '${typeArg}' archive from ${appMapDir}`);
|
|
103
108
|
const revision = revisionArg !== undefined ? revisionArg : await (0, gitRevision_1.default)();
|
|
@@ -107,7 +112,7 @@ const handler = async (argv) => {
|
|
|
107
112
|
versions[exports.PackageVersion.name] = exports.PackageVersion.version;
|
|
108
113
|
let oversizedAppMaps;
|
|
109
114
|
if (doAnalyze) {
|
|
110
|
-
const analyzeResult = await (0, analyze_1.default)(maxAppMapSizeInBytes,
|
|
115
|
+
const analyzeResult = await (0, analyze_1.default)(maxAppMapSizeInBytes, compareFilter, appMapDir);
|
|
111
116
|
oversizedAppMaps = analyzeResult.oversizedAppMaps;
|
|
112
117
|
}
|
|
113
118
|
process.chdir(appMapDir);
|
|
@@ -120,7 +125,6 @@ const handler = async (argv) => {
|
|
|
120
125
|
timestamp: Date.now().toString(),
|
|
121
126
|
oversizedAppMaps,
|
|
122
127
|
config: appmapConfig,
|
|
123
|
-
appMapFilter: (0, serializeAppMapFilter_1.serializeAppMapFilter)(appMapFilter),
|
|
124
128
|
};
|
|
125
129
|
let type;
|
|
126
130
|
if (await (0, utils_1.exists)('appmap_archive.json')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/cmds/archive/archive.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAqC;AAErC,6EAA0E;AAC1E,+DAA4D;AAC5D,uCAA8C;AAC9C,0CAAuE;AACvE,6DAAoE;AACpE,kFAA0D;AAC1D,mEAA0E;AAC1E,kDAA0B;AAC1B,gEAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/cmds/archive/archive.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAqC;AAErC,6EAA0E;AAC1E,+DAA4D;AAC5D,uCAA8C;AAC9C,0CAAuE;AACvE,6DAAoE;AACpE,kFAA0D;AAC1D,mEAA0E;AAC1E,kDAA0B;AAC1B,gEAAwC;AAExC,wDAAgC;AAChC,wEAAgD;AAEhD,WAAW;AACX,EAAE;AACF,4GAA4G;AAC5G,EAAE;AACF,WAAW;AACX,EAAE;AACF,sCAAsC;AACtC,EAAE;AACF,WAAW;AACX,EAAE;AACF,8FAA8F;AAC9F,EAAE;AACF,WAAW;AACX,EAAE;AACF,gDAAgD;AACnC,QAAA,cAAc,GAAG,OAAO,CAAC;AAEzB,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,iBAAiB;IACvB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;CACzC,CAAC;AAEW,QAAA,OAAO,GAAG,SAAS,CAAC;AACpB,QAAA,QAAQ,GAAG,6DAA6D,CAAC;AAE/E,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,cAAc;QACxB,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;QACxC,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE;;;;;gFAKkE;QAC5E,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,sFAAsF;QAChG,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,yDAAyD;QACnE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,QAAQ,EAAE,gCAAgC;QAC1C,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE,uEAAuE;QACjF,OAAO,EAAE,yCAAwB;KAClC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,yEAAyE;QACnF,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,CAAC;AAvDW,QAAA,OAAO,WAuDlB;AAEK,MAAM,OAAO,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;IACzC,IAAA,eAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAClC,OAAO,CAAC,GAAG,CACT,iIAAiI,CAClI,CAAC;IAEJ,MAAM,EACJ,OAAO,EACP,OAAO,EAAE,SAAS,EAClB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,WAAW,EACrB,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,SAAS,GAClB,GAAG,IAAI,CAAC;IAET,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEvC,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAgB,GAAE,CAAC;IAC9C,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAC;IAE1C,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC;IAC3C,MAAM,aAAa,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,KAAI,EAAE,CAAC;IAElD,IAAI,SAAS;QACX,IAAA,yBAAe,EAAC,aAAa,EAAE,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAE1F,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IAE3E,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,kBAAkB,SAAS,EAAE,CAAC,CAAC;IAE/D,MAAM,QAAQ,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,IAAA,qBAAW,GAAE,CAAC;IAE/E,OAAO,CAAC,GAAG,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,sBAAc,EAAE,KAAK,EAAE,uBAAY,EAAE,CAAC;IAClE,IAAI,sBAAc,CAAC,OAAO;QAAE,QAAQ,CAAC,sBAAc,CAAC,IAAI,CAAC,GAAG,sBAAc,CAAC,OAAO,CAAC;IAEnF,IAAI,gBAAsC,CAAC;IAC3C,IAAI,SAAS,EAAE;QACb,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAO,EAAC,oBAAoB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QACpF,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAC;KACnD;IAED,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEzB,MAAM,QAAQ,GAAoB;QAChC,QAAQ;QACR,gBAAgB;QAChB,SAAS;QACT,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;QAChC,gBAAgB;QAChB,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,IAAY,CAAC;IACjB,IAAI,MAAM,IAAA,cAAM,EAAC,qBAAqB,CAAC,EAAE;QACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC;QACnF,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,gBAAgB,CAAC;QACpD,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,OAAO,CAAC,GAAG,CACT;uBACe,YAAY,GAAG,CAC/B,CAAC;SACH;QAED,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,OAAO,CAAC,IAAI,CACV,eAAK,CAAC,MAAM,CACV;yBACe,YAAY;6HACwF,CACpH,CACF,CAAC;YACF,IAAI,GAAG,MAAM,CAAC;SACf;aAAM;YACL,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC;YACrC,IAAI,GAAG,aAAa,CAAC;SACtB;KACF;SAAM;QACL,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,OAAO,CAAC,GAAG,CACT,gGAAgG,CACjG,CAAC;SACH;aAAM,IAAI,OAAO,KAAK,aAAa,EAAE;YACpC,MAAM,IAAI,KAAK,CACb;kFAC0E,CAC3E,CAAC;SACH;QACD,IAAI,GAAG,MAAM,CAAC;KACf;IAED,MAAM,IAAI,OAAO,CAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;QAC9C,IAAA,oBAAI,EACF,uGAAuG,EACvG,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;YAElC,SAAS,EAAE,CAAC;QACd,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAA,iBAAM,EAAC,gBAAgB,CAAC,CAAC,CAAC;IAEnD,MAAM,IAAA,oBAAS,EAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,iBAAiB,IAAI,GAAG,QAAQ,MAAM,CAAC;IAE9D,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,YAAY,IAAI,gBAAgB,EAAE,CAAC;IACrD,MAAM,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvE,MAAM,IAAI,OAAO,CAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;QAC9C,IAAA,oBAAI,EACF,UAAU,IAAA,WAAI,EACZ,IAAA,cAAO,EAAC,gBAAgB,EAAE,SAAS,CAAC,EACpC,cAAc,CACf,iDAAiD,EAClD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;YAElC,SAAS,EAAE,CAAC;QACd,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAtIW,QAAA,OAAO,WAsIlB"}
|
|
@@ -11,7 +11,6 @@ const rest_1 = require("@octokit/rest");
|
|
|
11
11
|
const promises_1 = require("fs/promises");
|
|
12
12
|
const fs_1 = require("fs");
|
|
13
13
|
const os_1 = require("os");
|
|
14
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
15
14
|
const executeCommand_1 = require("../../lib/executeCommand");
|
|
16
15
|
const assert_1 = __importDefault(require("assert"));
|
|
17
16
|
const https_1 = require("https");
|
|
@@ -30,7 +29,8 @@ class FileArchiveStore {
|
|
|
30
29
|
return { id: path, type, revision };
|
|
31
30
|
};
|
|
32
31
|
const loadDirectory = async (directory) => {
|
|
33
|
-
|
|
32
|
+
const resolvedDir = (0, path_1.resolve)(process.cwd(), directory);
|
|
33
|
+
return (await (0, util_1.promisify)(glob_1.glob)((0, path_1.join)(resolvedDir, '*.tar')))
|
|
34
34
|
.map(parseArchivePath)
|
|
35
35
|
.reduce((memo, entry) => (memo.set(entry.id, parseArchivePath(entry.id)), memo), new Map());
|
|
36
36
|
};
|
|
@@ -54,9 +54,6 @@ class GitHubArchiveStore {
|
|
|
54
54
|
this.repo = tokens.pop().split('.')[0];
|
|
55
55
|
this.owner = tokens.pop();
|
|
56
56
|
this.octokit = new rest_1.Octokit({
|
|
57
|
-
request: {
|
|
58
|
-
fetch: node_fetch_1.default,
|
|
59
|
-
},
|
|
60
57
|
auth: this.token,
|
|
61
58
|
});
|
|
62
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiveStore.js","sourceRoot":"","sources":["../../../src/cmds/archive/archiveStore.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA4B;AAC5B,+
|
|
1
|
+
{"version":3,"file":"archiveStore.js","sourceRoot":"","sources":["../../../src/cmds/archive/archiveStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HIDE_EXTERNAL = exports.HIDE_OPTIONS = void 0;
|
|
4
|
+
const models_1 = require("@appland/models");
|
|
5
|
+
exports.HIDE_OPTIONS = {
|
|
6
|
+
pragma: [/^query:PRAGMA\b/, /^query:[\s\S]*\bPRAGMA\b/],
|
|
7
|
+
savepoint: [/^query:SAVEPOINT\b/, /^query:[\s\S]*\bSAVEPOINT\b/],
|
|
8
|
+
selenium: [/^external-route:.*\bhttp:\/\/127\.0\.0\.1:\d+\/session\/[a-f0-9]{32,}\//],
|
|
9
|
+
pg_metadata: [/^query:[\s\S]*\bpg_attribute\b/],
|
|
10
|
+
sqlite_metadata: [/^query:[\s\S]*\bsqlite_master\b/],
|
|
11
|
+
ruby_included: [/^function:.*\.included$/],
|
|
12
|
+
};
|
|
13
|
+
exports.HIDE_EXTERNAL = {
|
|
14
|
+
ruby: true,
|
|
15
|
+
python: true,
|
|
16
|
+
java: false,
|
|
17
|
+
javascript: false,
|
|
18
|
+
};
|
|
19
|
+
function buildFilter(language, compareFilter) {
|
|
20
|
+
const filterState = {};
|
|
21
|
+
const pushHideNames = (names) => {
|
|
22
|
+
if (!filterState.hideName)
|
|
23
|
+
filterState.hideName = [];
|
|
24
|
+
filterState.hideName.push(...names);
|
|
25
|
+
};
|
|
26
|
+
let filtersEnabled;
|
|
27
|
+
{
|
|
28
|
+
const hide = compareFilter.hide || Object.keys(exports.HIDE_OPTIONS);
|
|
29
|
+
const reveal = compareFilter.reveal || [];
|
|
30
|
+
filtersEnabled = hide.filter((key) => !(reveal === null || reveal === void 0 ? void 0 : reveal.includes(key)));
|
|
31
|
+
}
|
|
32
|
+
for (const item of filtersEnabled) {
|
|
33
|
+
const hideNames = exports.HIDE_OPTIONS[item];
|
|
34
|
+
if (!hideNames)
|
|
35
|
+
continue;
|
|
36
|
+
pushHideNames(hideNames.map((rexpg) => rexpg.toString()));
|
|
37
|
+
}
|
|
38
|
+
if (compareFilter.hide_name !== undefined)
|
|
39
|
+
pushHideNames(compareFilter.hide_name);
|
|
40
|
+
filterState.dependencyFolders = compareFilter.dependency_folders;
|
|
41
|
+
if (compareFilter.dependency_folders !== undefined)
|
|
42
|
+
filterState.dependencyFolders = compareFilter.dependency_folders;
|
|
43
|
+
if (compareFilter.hide_external !== undefined) {
|
|
44
|
+
filterState.hideExternal = compareFilter.hide_external;
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
filterState.hideExternal = exports.HIDE_EXTERNAL[language];
|
|
48
|
+
}
|
|
49
|
+
const filter = (0, models_1.deserializeFilter)(filterState);
|
|
50
|
+
if (filter.declutter.hideName.names)
|
|
51
|
+
filter.declutter.hideName.names.sort();
|
|
52
|
+
if (filter.declutter.hideExternalPaths.dependencyFolders)
|
|
53
|
+
filter.declutter.hideExternalPaths.dependencyFolders.sort();
|
|
54
|
+
return filter;
|
|
55
|
+
}
|
|
56
|
+
exports.default = buildFilter;
|
|
57
|
+
//# sourceMappingURL=buildFilter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildFilter.js","sourceRoot":"","sources":["../../../src/cmds/archive/buildFilter.ts"],"names":[],"mappings":";;;AAAA,4CAA+E;AAKlE,QAAA,YAAY,GAAiC;IACxD,MAAM,EAAE,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;IACvD,SAAS,EAAE,CAAC,oBAAoB,EAAE,6BAA6B,CAAC;IAChE,QAAQ,EAAE,CAAC,yEAAyE,CAAC;IACrF,WAAW,EAAE,CAAC,gCAAgC,CAAC;IAC/C,eAAe,EAAE,CAAC,iCAAiC,CAAC;IACpD,aAAa,EAAE,CAAC,yBAAyB,CAAC;CAC3C,CAAC;AAEW,QAAA,aAAa,GAA8B;IACtD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,KAAK;CAClB,CAAC;AAEF,SAAwB,WAAW,CACjC,QAAkB,EAClB,aAA4B;IAE5B,MAAM,WAAW,GAAgB,EAAE,CAAC;IAEpC,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,EAAE;QACxC,IAAI,CAAC,WAAW,CAAC,QAAQ;YAAE,WAAW,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrD,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,IAAI,cAA4B,CAAC;IACjC;QACE,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,IAAK,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAkB,CAAC;QAC/E,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC;QAC1C,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC;KAC/D;IAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;QACjC,MAAM,SAAS,GAAG,oBAAY,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS;YAAE,SAAS;QAEzB,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;KAC3D;IAED,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS;QAAE,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAElF,WAAW,CAAC,iBAAiB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAEjE,IAAI,aAAa,CAAC,kBAAkB,KAAK,SAAS;QAChD,WAAW,CAAC,iBAAiB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAEnE,IAAI,aAAa,CAAC,aAAa,KAAK,SAAS,EAAE;QAC7C,WAAW,CAAC,YAAY,GAAG,aAAa,CAAC,aAAa,CAAC;KACxD;SAAM;QACL,WAAW,CAAC,YAAY,GAAG,qBAAa,CAAC,QAAQ,CAAC,CAAC;KACpD;IAED,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;IAE9C,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK;QAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5E,IAAI,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,iBAAiB;QACtD,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAE9D,OAAO,MAAM,CAAC;AAChB,CAAC;AA7CD,8BA6CC"}
|
|
@@ -12,7 +12,10 @@ async function indexAppMaps(appmapDir, maxAppMapSizeInBytes) {
|
|
|
12
12
|
const handler = new fingerprinter_1.default();
|
|
13
13
|
handler.maxFileSizeInBytes = maxAppMapSizeInBytes;
|
|
14
14
|
const counter = new CountNumProcessed_1.CountNumProcessed();
|
|
15
|
-
|
|
15
|
+
const options = new utils_1.ProcessFileOptions(appmapDir);
|
|
16
|
+
options.fileCountFn = counter.setCount();
|
|
17
|
+
options.errorFn = (0, reportAppMapProcessingError_1.default)('Index');
|
|
18
|
+
await (0, utils_1.processFiles)('**/*.appmap.json', async (appmapFile) => await handler.fingerprint(appmapFile), options);
|
|
16
19
|
return counter.count;
|
|
17
20
|
}
|
|
18
21
|
exports.indexAppMaps = indexAppMaps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexAppMaps.js","sourceRoot":"","sources":["../../../src/cmds/archive/indexAppMaps.ts"],"names":[],"mappings":";;;;;;AAAA,oFAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"indexAppMaps.js","sourceRoot":"","sources":["../../../src/cmds/archive/indexAppMaps.ts"],"names":[],"mappings":";;;;;;AAAA,oFAA4D;AAC5D,uCAA+D;AAC/D,2DAAwD;AACxD,gGAAwE;AAEjE,KAAK,UAAU,YAAY,CAChC,SAAiB,EACjB,oBAA4B;IAE5B,MAAM,OAAO,GAAG,IAAI,uBAAa,EAAE,CAAC;IACpC,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAElD,MAAM,OAAO,GAAG,IAAI,qCAAiB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,0BAAkB,CAAC,SAAS,CAAC,CAAC;IAClD,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzC,OAAO,CAAC,OAAO,GAAG,IAAA,qCAA2B,EAAC,OAAO,CAAC,CAAC;IACvD,MAAM,IAAA,oBAAY,EAChB,kBAAkB,EAClB,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAC3D,OAAO,CACR,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC;AAlBD,oCAkBC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const console_1 = require("console");
|
|
4
|
+
function parseFilterArgs(compareFilter, filterArgs) {
|
|
5
|
+
var _a;
|
|
6
|
+
const filters = new Map();
|
|
7
|
+
for (const filter of filterArgs) {
|
|
8
|
+
const [key, v] = filter.split('=');
|
|
9
|
+
if (!filters.has(key))
|
|
10
|
+
filters.set(key, []);
|
|
11
|
+
(_a = filters.get(key)) === null || _a === void 0 ? void 0 : _a.push(v);
|
|
12
|
+
}
|
|
13
|
+
for (const [key, values] of filters.entries()) {
|
|
14
|
+
if (key === 'hide_external') {
|
|
15
|
+
if (values.length !== 1) {
|
|
16
|
+
(0, console_1.warn)(`hide_external should not be repeated, got: ${values.join(', ')}`);
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
19
|
+
const value = values[0];
|
|
20
|
+
if (value === 'true')
|
|
21
|
+
compareFilter[key] = true;
|
|
22
|
+
else if (value === 'false')
|
|
23
|
+
compareFilter[key] = false;
|
|
24
|
+
else
|
|
25
|
+
(0, console_1.warn)(`Invalid value for hide_external: ${value}`);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
if (!compareFilter[key])
|
|
29
|
+
compareFilter[key] = [];
|
|
30
|
+
compareFilter[key].push(...values);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.default = parseFilterArgs;
|
|
35
|
+
//# sourceMappingURL=parseFilterArgs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseFilterArgs.js","sourceRoot":"","sources":["../../../src/cmds/archive/parseFilterArgs.ts"],"names":[],"mappings":";;AAAA,qCAA+B;AAG/B,SAAwB,eAAe,CAAC,aAA4B,EAAE,UAAoB;;IACxF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC5C,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC/B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,IAAI,CAAC,CAAC,CAAC,CAAC;KAC3B;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QAC7C,IAAI,GAAG,KAAK,eAAe,EAAE;YAC3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,IAAA,cAAI,EAAC,8CAA8C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACxE,SAAS;aACV;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,KAAK,KAAK,MAAM;gBAAE,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;iBAC3C,IAAI,KAAK,KAAK,OAAO;gBAAE,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;;gBAClD,IAAA,cAAI,EAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;SACxD;aAAM;YACL,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;gBAAE,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACjD,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;SACpC;KACF;AACH,CAAC;AAtBD,kCAsBC"}
|
|
@@ -0,0 +1,129 @@
|
|
|
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
|
+
exports.handler = exports.builder = exports.describe = exports.command = void 0;
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
8
|
+
const fs_1 = require("fs");
|
|
9
|
+
const glob_1 = require("glob");
|
|
10
|
+
const path_1 = require("path");
|
|
11
|
+
const util_1 = require("util");
|
|
12
|
+
const handleWorkingDirectory_1 = require("../../lib/handleWorkingDirectory");
|
|
13
|
+
const utils_1 = require("../../utils");
|
|
14
|
+
const archiveStore_1 = require("./archiveStore");
|
|
15
|
+
const gitAncestors_1 = __importDefault(require("./gitAncestors"));
|
|
16
|
+
const gitRevision_1 = __importDefault(require("./gitRevision"));
|
|
17
|
+
const unpackArchive_1 = __importDefault(require("./unpackArchive"));
|
|
18
|
+
exports.command = 'restore';
|
|
19
|
+
exports.describe = 'Restore the most current available AppMap data from available archives';
|
|
20
|
+
const builder = (args) => {
|
|
21
|
+
args.option('directory', {
|
|
22
|
+
describe: 'program working directory',
|
|
23
|
+
type: 'string',
|
|
24
|
+
alias: 'd',
|
|
25
|
+
});
|
|
26
|
+
args.option('revision', {
|
|
27
|
+
describe: `revision to restore`,
|
|
28
|
+
type: 'string',
|
|
29
|
+
alias: 'r',
|
|
30
|
+
});
|
|
31
|
+
args.option('output-dir', {
|
|
32
|
+
describe: 'directory in which to restore the data. Default: .appmap/work/<revision>',
|
|
33
|
+
type: 'string',
|
|
34
|
+
});
|
|
35
|
+
args.option('archive-dir', {
|
|
36
|
+
describe: 'directory in which the archives are stored',
|
|
37
|
+
type: 'string',
|
|
38
|
+
default: '.appmap/archive',
|
|
39
|
+
});
|
|
40
|
+
args.option('github-repo', {
|
|
41
|
+
describe: 'Fetch AppMap archives from artifacts on a GitHub repository. GITHUB_TOKEN must be set for this option to work.',
|
|
42
|
+
type: 'string',
|
|
43
|
+
});
|
|
44
|
+
args.option('exact', {
|
|
45
|
+
describe: 'fail unless the specific revision requested is available to be restored',
|
|
46
|
+
type: 'boolean',
|
|
47
|
+
default: false,
|
|
48
|
+
});
|
|
49
|
+
return args.strict();
|
|
50
|
+
};
|
|
51
|
+
exports.builder = builder;
|
|
52
|
+
const handler = async (argv) => {
|
|
53
|
+
(0, utils_1.verbose)(argv.verbose);
|
|
54
|
+
(0, handleWorkingDirectory_1.handleWorkingDirectory)(argv.directory);
|
|
55
|
+
const { revision: revisionArg, outputDir: outputDirArg, githubRepo, archiveDir, exact } = argv;
|
|
56
|
+
const revision = revisionArg !== undefined ? revisionArg.toString() : await (0, gitRevision_1.default)();
|
|
57
|
+
const outputDir = outputDirArg || (0, path_1.join)('.appmap', 'work', revision);
|
|
58
|
+
if ((0, fs_1.existsSync)(outputDir))
|
|
59
|
+
throw new Error(`Output directory ${outputDir} already exists`);
|
|
60
|
+
console.log(`Restoring AppMaps of revision ${revision} to ${outputDir}`);
|
|
61
|
+
let archiveStore;
|
|
62
|
+
if (githubRepo) {
|
|
63
|
+
const token = process.env.GITHUB_TOKEN;
|
|
64
|
+
if (!token)
|
|
65
|
+
throw new Error('GITHUB_TOKEN must be set to use the --github-repo option');
|
|
66
|
+
archiveStore = new archiveStore_1.GitHubArchiveStore(githubRepo, token);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
archiveStore = new archiveStore_1.FileArchiveStore(archiveDir);
|
|
70
|
+
}
|
|
71
|
+
const archivesAvailable = await archiveStore.revisionsAvailable();
|
|
72
|
+
if ((0, utils_1.verbose)())
|
|
73
|
+
console.debug(`Found ${(0, util_1.inspect)(archivesAvailable)} AppMap archives`);
|
|
74
|
+
let ancestors;
|
|
75
|
+
let mostRecentArchiveAvailable = [
|
|
76
|
+
...archivesAvailable.full.values(),
|
|
77
|
+
].find((archive) => archive.revision === revision);
|
|
78
|
+
if (mostRecentArchiveAvailable) {
|
|
79
|
+
console.log(`Found exact match full AppMap archive ${revision}`);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
ancestors = await (0, gitAncestors_1.default)(revision);
|
|
83
|
+
{
|
|
84
|
+
const ancestorIndex = ancestors.reduce((memo, revision, index) => ((memo[revision] = index), memo), {});
|
|
85
|
+
let mostRecentAncestorIndex;
|
|
86
|
+
for (const archive of archivesAvailable.full.values()) {
|
|
87
|
+
const index = ancestorIndex[archive.revision];
|
|
88
|
+
if (index !== undefined &&
|
|
89
|
+
(mostRecentAncestorIndex === undefined || index < mostRecentAncestorIndex)) {
|
|
90
|
+
mostRecentAncestorIndex = index;
|
|
91
|
+
mostRecentArchiveAvailable = archive;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (!mostRecentArchiveAvailable)
|
|
96
|
+
throw new Error(`No full AppMap archive found in the ancestry of ${revision}`);
|
|
97
|
+
}
|
|
98
|
+
console.log(`Using revision ${mostRecentArchiveAvailable.revision} as the baseline`);
|
|
99
|
+
const fullArchivePath = await archiveStore.fetch(mostRecentArchiveAvailable.id);
|
|
100
|
+
console.log(`Restoring full archive revision '${mostRecentArchiveAvailable.revision}' from '${fullArchivePath}' to '${outputDir}'`);
|
|
101
|
+
await (0, unpackArchive_1.default)(outputDir, fullArchivePath);
|
|
102
|
+
let restoredRevision = mostRecentArchiveAvailable.revision;
|
|
103
|
+
const restoredRevisions = [restoredRevision];
|
|
104
|
+
if (mostRecentArchiveAvailable.revision !== revision) {
|
|
105
|
+
(0, assert_1.default)(ancestors);
|
|
106
|
+
const baseRevisionIndex = ancestors.indexOf(mostRecentArchiveAvailable.revision);
|
|
107
|
+
(0, assert_1.default)(baseRevisionIndex !== -1);
|
|
108
|
+
const ancestorsAfterBaseRevision = new Set(ancestors.slice(0, baseRevisionIndex));
|
|
109
|
+
const incrementalArchivesAvailable = (await (0, util_1.promisify)(glob_1.glob)((0, path_1.join)(archiveDir, 'incremental', '*.tar'))).filter((archive) => {
|
|
110
|
+
const revision = (0, path_1.basename)(archive, '.tar');
|
|
111
|
+
return ancestorsAfterBaseRevision.has(revision);
|
|
112
|
+
});
|
|
113
|
+
console.log(`Applying incremental archives ${incrementalArchivesAvailable.join(', ')}`);
|
|
114
|
+
for (const archive of incrementalArchivesAvailable) {
|
|
115
|
+
const incrementalRevision = (0, path_1.basename)(archive, '.tar');
|
|
116
|
+
restoredRevision = incrementalRevision;
|
|
117
|
+
restoredRevisions.push(restoredRevision);
|
|
118
|
+
await (0, unpackArchive_1.default)(outputDir, archive);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (exact) {
|
|
122
|
+
if (restoredRevisions[restoredRevisions.length - 1] !== revision) {
|
|
123
|
+
throw new Error(`Unable to restore specific revision ${revision}; applied ${restoredRevisions.join(', ')}.`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
console.log(`Restore complete`);
|
|
127
|
+
};
|
|
128
|
+
exports.handler = handler;
|
|
129
|
+
//# sourceMappingURL=restore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../src/cmds/archive/restore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const child_process_1 = require("child_process");
|
|
4
|
+
const promises_1 = require("fs/promises");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
async function unpackArchive(outputDir, archivePath) {
|
|
7
|
+
await (0, promises_1.mkdir)(outputDir, { recursive: true });
|
|
8
|
+
const dir = process.cwd();
|
|
9
|
+
try {
|
|
10
|
+
process.chdir(outputDir);
|
|
11
|
+
await new Promise((resolveCB, rejectCB) => {
|
|
12
|
+
(0, child_process_1.exec)(`tar xf ${(0, path_1.resolve)(dir, archivePath)}`, (error) => {
|
|
13
|
+
if (error)
|
|
14
|
+
rejectCB(error);
|
|
15
|
+
resolveCB();
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
await new Promise((resolveCB, rejectCB) => {
|
|
19
|
+
(0, child_process_1.exec)(`tar xf appmaps.tar.gz`, (error) => {
|
|
20
|
+
if (error)
|
|
21
|
+
rejectCB(error);
|
|
22
|
+
resolveCB();
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
await (0, promises_1.unlink)('appmaps.tar.gz');
|
|
26
|
+
const metadata = JSON.parse(await (0, promises_1.readFile)('appmap_archive.json', 'utf8'));
|
|
27
|
+
await (0, promises_1.cp)('appmap_archive.json', `appmap_archive.${metadata.revision}.json`);
|
|
28
|
+
const deletedAppMaps = metadata.deletedAppMaps || [];
|
|
29
|
+
for (const deletedAppMap of deletedAppMaps) {
|
|
30
|
+
await (0, promises_1.unlink)(deletedAppMap);
|
|
31
|
+
await (0, promises_1.rmdir)((0, path_1.basename)(deletedAppMap, '.appmap.json'), { recursive: true });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
finally {
|
|
35
|
+
process.chdir(dir);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.default = unpackArchive;
|
|
39
|
+
//# sourceMappingURL=unpackArchive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unpackArchive.js","sourceRoot":"","sources":["../../../src/cmds/archive/unpackArchive.ts"],"names":[],"mappings":";;AAAA,iDAAqC;AACrC,0CAAyE;AACzE,+BAA+C;AAGhC,KAAK,UAAU,aAAa,CAAC,SAAc,EAAE,WAAmB;IAC7E,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEzB,MAAM,IAAI,OAAO,CAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAA,oBAAI,EAAC,UAAU,IAAA,cAAO,EAAC,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpD,IAAI,KAAK;oBAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAE3B,SAAS,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,OAAO,CAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAA,oBAAI,EAAC,uBAAuB,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtC,IAAI,KAAK;oBAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAE3B,SAAS,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,iBAAM,EAAC,gBAAgB,CAAC,CAAC;QAE/B,MAAM,QAAQ,GAAoB,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5F,MAAM,IAAA,aAAE,EAAC,qBAAqB,EAAE,kBAAkB,QAAQ,CAAC,QAAQ,OAAO,CAAC,CAAC;QAE5E,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,IAAI,EAAE,CAAC;QACrD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;YAC1C,MAAM,IAAA,iBAAM,EAAC,aAAa,CAAC,CAAC;YAC5B,MAAM,IAAA,gBAAK,EAAC,IAAA,eAAQ,EAAC,aAAa,EAAE,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3E;KACF;YAAS;QACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACpB;AACH,CAAC;AAlCD,gCAkCC"}
|
|
@@ -11,12 +11,14 @@ const utils_1 = require("../../utils");
|
|
|
11
11
|
const fileTooLargeError_1 = __importDefault(require("../../fingerprint/fileTooLargeError"));
|
|
12
12
|
const CountNumProcessed_1 = require("./CountNumProcessed");
|
|
13
13
|
const reportAppMapProcessingError_1 = __importDefault(require("./reportAppMapProcessingError"));
|
|
14
|
-
|
|
14
|
+
const buildFilter_1 = __importDefault(require("./buildFilter"));
|
|
15
|
+
async function updateSequenceDiagrams(dir, maxAppMapSizeInBytes, compareFilter) {
|
|
15
16
|
const specOptions = {
|
|
16
17
|
loops: true,
|
|
17
18
|
};
|
|
18
19
|
const oversizedAppMaps = new Array();
|
|
19
20
|
const generateDiagram = async (appmapFileName) => {
|
|
21
|
+
var _a, _b;
|
|
20
22
|
// Determine size of file appmapFileName in bytes
|
|
21
23
|
const stats = await (0, promises_1.stat)(appmapFileName);
|
|
22
24
|
if (stats.size > maxAppMapSizeInBytes) {
|
|
@@ -26,6 +28,8 @@ async function updateSequenceDiagrams(dir, maxAppMapSizeInBytes, filter) {
|
|
|
26
28
|
const fullAppMap = (0, models_1.buildAppMap)()
|
|
27
29
|
.source(await (0, promises_1.readFile)(appmapFileName, 'utf8'))
|
|
28
30
|
.build();
|
|
31
|
+
const language = ((_b = (_a = fullAppMap.metadata) === null || _a === void 0 ? void 0 : _a.language) === null || _b === void 0 ? void 0 : _b.name) || 'unknown';
|
|
32
|
+
const filter = (0, buildFilter_1.default)(language, compareFilter);
|
|
29
33
|
const filteredAppMap = filter.filter(fullAppMap, []);
|
|
30
34
|
const specification = sequence_diagram_1.Specification.build(filteredAppMap, specOptions);
|
|
31
35
|
const diagram = (0, sequence_diagram_1.buildDiagram)(appmapFileName, filteredAppMap, specification);
|
|
@@ -35,7 +39,10 @@ async function updateSequenceDiagrams(dir, maxAppMapSizeInBytes, filter) {
|
|
|
35
39
|
await (0, promises_1.writeFile)(diagramFileName, diagramOutput.diagram);
|
|
36
40
|
};
|
|
37
41
|
const counter = new CountNumProcessed_1.CountNumProcessed();
|
|
38
|
-
|
|
42
|
+
const options = new utils_1.ProcessFileOptions(dir);
|
|
43
|
+
options.fileCountFn = counter.setCount();
|
|
44
|
+
options.errorFn = (0, reportAppMapProcessingError_1.default)('Sequence diagram');
|
|
45
|
+
await (0, utils_1.processFiles)('**/*.appmap.json', generateDiagram, options);
|
|
39
46
|
return { numGenerated: counter.count, oversizedAppMaps };
|
|
40
47
|
}
|
|
41
48
|
exports.default = updateSequenceDiagrams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateSequenceDiagrams.js","sourceRoot":"","sources":["../../../src/cmds/archive/updateSequenceDiagrams.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"updateSequenceDiagrams.js","sourceRoot":"","sources":["../../../src/cmds/archive/updateSequenceDiagrams.ts"],"names":[],"mappings":";;;;;AAAA,4CAA8C;AAC9C,gEAMmC;AACnC,0CAAwD;AACxD,+BAA+C;AAC/C,uCAA+D;AAC/D,4FAAoE;AACpE,2DAAwD;AACxD,gGAAwE;AACxE,gEAAsD;AAGvC,KAAK,UAAU,sBAAsB,CAClD,GAAW,EACX,oBAA4B,EAC5B,aAA4B;IAE5B,MAAM,WAAW,GAAG;QAClB,KAAK,EAAE,IAAI;KACc,CAAC;IAE5B,MAAM,gBAAgB,GAAG,IAAI,KAAK,EAAU,CAAC;IAE7C,MAAM,eAAe,GAAG,KAAK,EAAE,cAAsB,EAAE,EAAE;;QACvD,iDAAiD;QACjD,MAAM,KAAK,GAAG,MAAM,IAAA,eAAI,EAAC,cAAc,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,IAAI,GAAG,oBAAoB,EAAE;YACrC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACtC,MAAM,IAAI,2BAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;SAC/E;QAED,MAAM,UAAU,GAAG,IAAA,oBAAW,GAAE;aAC7B,MAAM,CAAC,MAAM,IAAA,mBAAQ,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;aAC9C,KAAK,EAAE,CAAC;QAEX,MAAM,QAAQ,GAAG,CAAA,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,QAAQ,0CAAE,IAAI,KAAI,SAAS,CAAC;QAClE,MAAM,MAAM,GAAG,IAAA,qBAAW,EAAC,QAAoB,EAAE,aAAa,CAAC,CAAC;QAChE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,aAAa,GAAG,gCAAa,CAAC,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,+BAAY,EAAC,cAAc,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,IAAA,yBAAM,EAAC,6BAAU,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,cAAc,CAAC,EAAE,IAAA,eAAQ,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;QACzF,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACxD,MAAM,IAAA,oBAAS,EAAC,eAAe,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,qCAAiB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,0BAAkB,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzC,OAAO,CAAC,OAAO,GAAG,IAAA,qCAA2B,EAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,IAAA,oBAAY,EAAC,kBAAkB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAC;AAC3D,CAAC;AAzCD,yCAyCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadAppMapConfig.js","sourceRoot":"","sources":["../../src/lib/loadAppMapConfig.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"loadAppMapConfig.js","sourceRoot":"","sources":["../../src/lib/loadAppMapConfig.ts"],"names":[],"mappings":";;AAAA,0CAAuC;AACvC,qCAA+B;AAqChB,KAAK,UAAU,gBAAgB,CAC5C,QAAQ,GAAG,YAAY;;IAEvB,IAAI,gBAAoC,CAAC;IACzC,IAAI;QACF,gBAAgB,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KACtD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;IAED,MAAM,eAAe,GAAG,IAAA,cAAI,EAAC,gBAAgB,CAAQ,CAAC;IACtD,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,OAAO,eAAe,KAAK,QAAQ,CAAC;QAAE,OAAO;IAEvE,MAAM,YAAY,GAAG,eAA+B,CAAC;IACrD,YAAY,CAAC,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,MAAM,CAAC,CAAC;IAE5C,OAAO,YAAY,CAAC;AACtB,CAAC;AAjBD,mCAiBC;AAED,SAAS,YAAY,CAAC,GAAoC;IACxD,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAClF,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;KAC3B;AACH,CAAC"}
|
|
@@ -197,7 +197,9 @@ class FindCodeObjects {
|
|
|
197
197
|
});
|
|
198
198
|
progressFn();
|
|
199
199
|
};
|
|
200
|
-
|
|
200
|
+
const options = new utils_1.ProcessFileOptions(this.appMapDir);
|
|
201
|
+
options.fileCountFn = fileCountFn;
|
|
202
|
+
await (0, utils_1.processFiles)('**/classMap.json', checkClassMap.bind(this), options);
|
|
201
203
|
return matches;
|
|
202
204
|
}
|
|
203
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findCodeObjects.js","sourceRoot":"","sources":["../../src/search/findCodeObjects.ts"],"names":[],"mappings":";AAAA,mCAAmC;AACnC,sCAAsC;AACtC,yCAAyC;AACzC,mCAAmC;;;;;AAEnC,4CAA+C;AAC/C,0CAAuC;AACvC,+BAAyC;AACzC,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"findCodeObjects.js","sourceRoot":"","sources":["../../src/search/findCodeObjects.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,10 +65,11 @@ async function analyzeAppMaps(appmapDir, codeObjectPatterns) {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
68
|
-
|
|
68
|
+
const options = new utils_1.ProcessFileOptions(appmapDir);
|
|
69
|
+
await (0, utils_1.processFiles)('**/*.appmap.json', (file, cb) => {
|
|
69
70
|
appmaps === null || appmaps === void 0 ? void 0 : appmaps.add(file.slice(0, file.length - '.appmap.json'.length));
|
|
70
71
|
cb();
|
|
71
|
-
});
|
|
72
|
+
}, options);
|
|
72
73
|
}
|
|
73
74
|
return {
|
|
74
75
|
appmaps: [...appmaps].sort(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeAppMaps.js","sourceRoot":"","sources":["../../src/sequenceDiagram/analyzeAppMaps.ts"],"names":[],"mappings":";;;;;AAAA,gFAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"analyzeAppMaps.js","sourceRoot":"","sources":["../../src/sequenceDiagram/analyzeAppMaps.ts"],"names":[],"mappings":"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"}
|
package/built/utils.js
CHANGED
|
@@ -3,15 +3,15 @@ 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.formatHttpServerRequest = exports.formatValue = exports.prefixLines = exports.exists = exports.listAppMapFiles = exports.processNamedFiles = exports.processFiles = exports.writeFileAtomic = exports.isFile = exports.mtime = exports.baseName = exports.verbose = exports.endTime = void 0;
|
|
6
|
+
exports.formatHttpServerRequest = exports.formatValue = exports.prefixLines = exports.exists = exports.listAppMapFiles = exports.processNamedFiles = exports.processFiles = exports.ProcessFileOptions = exports.writeFileAtomic = exports.isFile = exports.mtime = exports.baseName = exports.verbose = exports.endTime = void 0;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const graceful_fs_1 = __importDefault(require("graceful-fs"));
|
|
9
9
|
const async_1 = require("async");
|
|
10
|
-
const glob_1 = __importDefault(require("glob"));
|
|
11
10
|
const util_1 = require("util");
|
|
12
11
|
const path_1 = require("path");
|
|
13
12
|
const assert_1 = __importDefault(require("assert"));
|
|
14
13
|
const promises_1 = require("fs/promises");
|
|
14
|
+
const glob_1 = require("glob");
|
|
15
15
|
const StartTime = Date.now();
|
|
16
16
|
const renameFile = (0, util_1.promisify)(graceful_fs_1.default.rename);
|
|
17
17
|
function endTime() {
|
|
@@ -79,21 +79,37 @@ async function writeFileAtomic(dirName, fileName, suffix, data) {
|
|
|
79
79
|
await renameFile(tempFilePath, (0, path_1.join)(dirName, fileName));
|
|
80
80
|
}
|
|
81
81
|
exports.writeFileAtomic = writeFileAtomic;
|
|
82
|
+
class ProcessFileOptions {
|
|
83
|
+
constructor(root) {
|
|
84
|
+
this.root = root;
|
|
85
|
+
this.fileCountFn = (_count) => { };
|
|
86
|
+
this.errorFn = (err) => {
|
|
87
|
+
process.stderr.write(err.toString() + '\n');
|
|
88
|
+
};
|
|
89
|
+
this.workerCount = 2;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
exports.ProcessFileOptions = ProcessFileOptions;
|
|
82
93
|
/**
|
|
83
94
|
* Call a function with each matching file. No guarantee is given that
|
|
84
95
|
* files will be processed in any particular order.
|
|
85
96
|
*/
|
|
86
|
-
async function processFiles(pattern, fn,
|
|
87
|
-
process.
|
|
88
|
-
|
|
89
|
-
const
|
|
90
|
-
if (
|
|
91
|
-
|
|
97
|
+
async function processFiles(pattern, fn, options) {
|
|
98
|
+
// cwd is explicitly required; the doc says that process.cwd() is used by default, but I am not
|
|
99
|
+
// seeing that to be the case.
|
|
100
|
+
const globOptions = {};
|
|
101
|
+
if ((0, path_1.isAbsolute)(options.root)) {
|
|
102
|
+
globOptions.cwd = options.root;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
globOptions.cwd = (0, path_1.join)(process.cwd(), options.root);
|
|
92
106
|
}
|
|
107
|
+
const files = (await (0, util_1.promisify)(glob_1.glob)(pattern, globOptions)).map((f) => (0, path_1.join)(options.root, f));
|
|
108
|
+
options.fileCountFn(files.length);
|
|
93
109
|
if (files.length === 0)
|
|
94
110
|
return;
|
|
95
|
-
const q = (0, async_1.queue)(fn, workerCount);
|
|
96
|
-
q.error(errorFn);
|
|
111
|
+
const q = (0, async_1.queue)(fn, options.workerCount);
|
|
112
|
+
q.error(options.errorFn);
|
|
97
113
|
files.forEach((file) => q.push(file));
|
|
98
114
|
if (!q.idle())
|
|
99
115
|
await q.drain();
|
|
@@ -148,11 +164,14 @@ async function listAppMapFiles(directory, fn) {
|
|
|
148
164
|
if (printDebug) {
|
|
149
165
|
console.warn(`Scanning ${directory} for AppMaps`);
|
|
150
166
|
}
|
|
151
|
-
const
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
}
|
|
155
|
-
|
|
167
|
+
const options = { debug: printDebug };
|
|
168
|
+
if ((0, path_1.isAbsolute)(directory)) {
|
|
169
|
+
options.cwd = directory;
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
options.cwd = (0, path_1.join)(process.cwd(), directory);
|
|
173
|
+
}
|
|
174
|
+
await Promise.all((await (0, util_1.promisify)(glob_1.glob)('**/*.appmap.json', options)).map((f) => (0, path_1.join)(directory, f)).map(fn));
|
|
156
175
|
}
|
|
157
176
|
exports.listAppMapFiles = listAppMapFiles;
|
|
158
177
|
function exists(path) {
|
package/built/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgF;AAChF,8DAAqC;AACrC,iCAA2C;AAC3C
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.84.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -55,6 +55,7 @@
|
|
|
55
55
|
"jest-sinon": "^1.1.0",
|
|
56
56
|
"lint-staged": "^10.5.4",
|
|
57
57
|
"memfs": "^3.4.13",
|
|
58
|
+
"node-fetch": "2.6.7",
|
|
58
59
|
"openapi-types": "^12.1.0",
|
|
59
60
|
"prettier": "^2.7.1",
|
|
60
61
|
"sinon": "^11.1.2",
|