@appland/appmap 3.43.2 → 3.44.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.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ # [@appland/appmap-v3.44.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.44.0...@appland/appmap-v3.44.1) (2022-10-10)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * More reliable polling in index --watch ([8b6d18d](https://github.com/getappmap/appmap-js/commit/8b6d18de00aa61c5f7308b00e902ec6a18e09a59))
7
+
8
+ # [@appland/appmap-v3.44.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.43.2...@appland/appmap-v3.44.0) (2022-10-07)
9
+
10
+
11
+ ### Features
12
+
13
+ * handle when bundler ignores test and development ([fd3b174](https://github.com/getappmap/appmap-js/commit/fd3b17467f2735261ad39878ba9c36b8b6d22e77))
14
+
1
15
  # [@appland/appmap-v3.43.2](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.43.1...@appland/appmap-v3.43.2) (2022-10-05)
2
16
 
3
17
 
@@ -53,11 +53,11 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
53
53
  }
54
54
  }
55
55
  userInteraction_1.default.status = 'Installing AppMap...';
56
- await this.installer.checkCurrentConfig();
57
- await this.installer.installAgent();
58
- await this.verifyProject();
59
- const appMapYml = this.configPath;
60
56
  try {
57
+ await this.installer.checkCurrentConfig();
58
+ await this.installer.installAgent();
59
+ await this.verifyProject();
60
+ const appMapYml = this.configPath;
61
61
  if (!useExistingAppMapYml) {
62
62
  const initCommand = await this.installer.initCommand();
63
63
  const { stdout } = await (0, commandRunner_1.run)(initCommand);
@@ -77,27 +77,57 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
77
77
  }
78
78
  catch (e) {
79
79
  const error = e;
80
- if (this.installer.name === 'Bundler' &&
81
- (error === null || error === void 0 ? void 0 : error.message.includes('but is an incompatible architecture'))) {
82
- await (0, commandRunner_1.run)(new commandStruct_1.default('gem', ['uninstall', 'appmap', '-x', '--force'], this.path));
83
- const incompatibleArchitectureMessage = [
84
- '\n',
85
- chalk_1.default.bold.red('AppMap Installation Error!'),
86
- '',
87
- 'Please run the following command in your terminal, then re-run the installer:',
88
- '',
89
- chalk_1.default.blue('bundle'),
90
- '\n',
91
- ];
92
- telemetry_1.default.sendEvent({
93
- name: 'install-agent:architecture-mismatch-error',
94
- properties: {
95
- error: error === null || error === void 0 ? void 0 : error.message,
96
- directory: this.path,
97
- installer: this.installer.name,
98
- },
99
- });
100
- userInteraction_1.default.error(incompatibleArchitectureMessage.join('\n'));
80
+ console.log(error === null || error === void 0 ? void 0 : error.message);
81
+ if (this.installer.name === 'Bundler') {
82
+ if (error === null || error === void 0 ? void 0 : error.message.includes('but is an incompatible architecture')) {
83
+ await (0, commandRunner_1.run)(new commandStruct_1.default('gem', ['uninstall', 'appmap', '-x', '--force'], this.path));
84
+ const incompatibleArchitectureMessage = [
85
+ '\n',
86
+ chalk_1.default.bold.red('AppMap Installation Error!'),
87
+ '',
88
+ 'Please run the following command in your terminal, then re-run the installer:',
89
+ '',
90
+ chalk_1.default.blue('bundle'),
91
+ '\n',
92
+ ];
93
+ telemetry_1.default.sendEvent({
94
+ name: 'install-agent:architecture-mismatch-error',
95
+ properties: {
96
+ error: error === null || error === void 0 ? void 0 : error.message,
97
+ directory: this.path,
98
+ installer: this.installer.name,
99
+ },
100
+ });
101
+ userInteraction_1.default.error(incompatibleArchitectureMessage.join('\n'));
102
+ }
103
+ else if (error === null || error === void 0 ? void 0 : error.message.includes('without the test and development groups')) {
104
+ const bundlerConfigErrorMessage = [
105
+ '\n',
106
+ chalk_1.default.bold.red('AppMap Installation Error!'),
107
+ '',
108
+ 'Please ensure that bundler installs either the development group,',
109
+ 'the test group, or both. We suggest running the following command',
110
+ 'in your terminal and then re-running the installer:',
111
+ '',
112
+ chalk_1.default.blue('bundle install --with development'),
113
+ '\n',
114
+ 'For more information, see the bundler docs: ' +
115
+ 'https://bundler.io/man/bundle-install.1.html',
116
+ '',
117
+ ];
118
+ telemetry_1.default.sendEvent({
119
+ name: 'install-agent:bundler-config-error',
120
+ properties: {
121
+ error: error === null || error === void 0 ? void 0 : error.message,
122
+ directory: this.path,
123
+ installer: this.installer.name,
124
+ },
125
+ });
126
+ userInteraction_1.default.error(bundlerConfigErrorMessage.join('\n'));
127
+ }
128
+ else {
129
+ throw e;
130
+ }
101
131
  }
102
132
  else {
103
133
  throw e;
@@ -1 +1 @@
1
- {"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,7 @@ const commandRunner_1 = require("./commandRunner");
15
15
  const commandUtil_1 = require("./commandUtil");
16
16
  const commandStruct_1 = __importDefault(require("./commandStruct"));
17
17
  const encodedFile_1 = __importDefault(require("../../encodedFile"));
18
+ const errors_1 = require("../errors");
18
19
  const REGEX_GEM_DECLARATION = /^(?:gem|group|require)\s/m;
19
20
  const REGEX_GEM_DEPENDENCY = /^\s*gem\s+['|"]appmap['|"].*$/m;
20
21
  const GEM_DEPENDENCY = "gem 'appmap', :groups => [:development, :test]";
@@ -37,7 +38,15 @@ class BundleInstaller extends agentInstaller_1.default {
37
38
  async checkConfigCommand() {
38
39
  return new commandStruct_1.default('bundle', ['check', '--dry-run'], this.path);
39
40
  }
41
+ async checkBundlerConfig() {
42
+ const bundleConfig = await (0, commandRunner_1.run)(new commandStruct_1.default('bundle', ['config', 'get', 'without'], this.path));
43
+ const activeConfig = bundleConfig.stdout.split('\n')[1];
44
+ if (activeConfig && activeConfig.includes(':development') && activeConfig.includes(':test')) {
45
+ throw new errors_1.BundlerConfigError('Bundler is currently configured to install without the test and development groups\n');
46
+ }
47
+ }
40
48
  async installAgent() {
49
+ await this.checkBundlerConfig();
41
50
  const encodedFile = new encodedFile_1.default(this.buildFilePath);
42
51
  let gemfile = encodedFile.toString();
43
52
  const index = gemfile.search(REGEX_GEM_DECLARATION);
@@ -1 +1 @@
1
- {"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ 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.ChildProcessError = exports.HttpError = exports.UserConfigError = exports.ValidationError = exports.AbortError = exports.InvalidPathError = void 0;
6
+ exports.ChildProcessError = exports.HttpError = exports.BundlerConfigError = exports.UserConfigError = exports.ValidationError = exports.AbortError = exports.InvalidPathError = void 0;
7
7
  const chalk_1 = __importDefault(require("chalk"));
8
8
  const utils_1 = require("../utils");
9
9
  class InvalidPathError extends Error {
@@ -23,6 +23,9 @@ exports.ValidationError = ValidationError;
23
23
  class UserConfigError extends Error {
24
24
  }
25
25
  exports.UserConfigError = UserConfigError;
26
+ class BundlerConfigError extends Error {
27
+ }
28
+ exports.BundlerConfigError = BundlerConfigError;
26
29
  class HttpError extends Error {
27
30
  constructor(message, response) {
28
31
  super(message);
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/cmds/errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oCAAuC;AAEvC,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAqB,OAAe,EAAW,IAAa;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QADI,YAAO,GAAP,OAAO,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAS;IAE5D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAC7C,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAS7C,MAAa,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAe,EAAW,QAA4B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADqB,aAAQ,GAAR,QAAQ,CAAoB;IAElE,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YAAqB,OAAe,EAAW,MAAc,EAAW,IAAoB;QAC1F,KAAK,CACH;YACE,gDAAgD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;YACtE,IAAI,IAAI,gCAAgC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YAC3D,MAAM,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;QATiB,YAAO,GAAP,OAAO,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAgB;IAU5F,CAAC;CACF;AAZD,8CAYC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/cmds/errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oCAAuC;AAEvC,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAqB,OAAe,EAAW,IAAa;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QADI,YAAO,GAAP,OAAO,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAS;IAE5D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAC7C,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAC7C,MAAa,kBAAmB,SAAQ,KAAK;CAAG;AAAhD,gDAAgD;AAShD,MAAa,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAe,EAAW,QAA4B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADqB,aAAQ,GAAR,QAAQ,CAAoB;IAElE,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YAAqB,OAAe,EAAW,MAAc,EAAW,IAAoB;QAC1F,KAAK,CACH;YACE,gDAAgD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;YACtE,IAAI,IAAI,gCAAgC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YAC3D,MAAM,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;QATiB,YAAO,GAAP,OAAO,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAgB;IAU5F,CAAC;CACF;AAZD,8CAYC"}
@@ -12,6 +12,7 @@ const intersectMaps_1 = require("../lib/intersectMaps");
12
12
  const telemetry_1 = __importDefault(require("../telemetry"));
13
13
  const utils_1 = require("../utils");
14
14
  const fingerprintQueue_1 = __importDefault(require("./fingerprintQueue"));
15
+ const globber_1 = __importDefault(require("./globber"));
15
16
  class FingerprintWatchCommand {
16
17
  constructor(directory) {
17
18
  this.directory = directory;
@@ -38,30 +39,26 @@ class FingerprintWatchCommand {
38
39
  }
39
40
  }
40
41
  async execute() {
41
- // Index existing AppMap files
42
- await (0, utils_1.listAppMapFiles)(this.directory, (file) => this.fpQueue.push(file));
43
42
  this.fpQueue.process().then(() => {
44
43
  this.fpQueue.handler.checkVersion = false;
45
44
  });
46
45
  const glob = `${this.directory}/**/*.appmap.json`;
46
+ this.poller = new globber_1.default(glob)
47
+ .on('add', this.added.bind(this))
48
+ .on('change', this.changed.bind(this))
49
+ .on('unlink', this.removed.bind(this));
50
+ const pollReady = new Promise((r) => { var _a; return (_a = this.poller) === null || _a === void 0 ? void 0 : _a.once('end', r); });
51
+ this.poller.start();
52
+ await pollReady;
47
53
  this.watcher = (0, chokidar_1.watch)(glob, {
48
54
  ignoreInitial: true,
49
55
  ignored: ['**/node_modules/**', '**/.git/**'],
50
- });
51
- this.poller = (0, chokidar_1.watch)(glob, {
52
- ignoreInitial: true,
53
- ignored: ['**/node_modules/**', '**/.git/**'],
54
- usePolling: true,
55
- interval: 1000,
56
- persistent: false,
57
- });
58
- // eslint-disable-next-line no-restricted-syntax
59
- for (const ch of [this.watcher, this.poller]) {
60
- ch.on('add', this.added.bind(this))
61
- .on('change', this.changed.bind(this))
62
- .on('unlink', this.removed.bind(this));
63
- }
64
- await Promise.all([this.watcher, this.poller].map((ch) => new Promise((resolve) => ch.on('ready', resolve))));
56
+ })
57
+ .on('add', this.added.bind(this))
58
+ .on('change', this.changed.bind(this))
59
+ .on('unlink', this.removed.bind(this));
60
+ const watchReady = new Promise((r) => { var _a; return (_a = this.watcher) === null || _a === void 0 ? void 0 : _a.once('ready', r); });
61
+ await Promise.all([pollReady, watchReady]);
65
62
  this.ready();
66
63
  }
67
64
  async close() {
@@ -1 +1 @@
1
- {"version":3,"file":"fingerprintWatchCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintWatchCommand.ts"],"names":[],"mappings":";;;;;AACA,uCAA4C;AAC5C,uCAAsD;AACtD,+BAAqC;AACrC,6EAAqD;AACrD,6EAAqD;AACrD,wDAAqD;AACrD,6DAAqC;AACrC,oCAAoD;AAEpD,0EAAkD;AAElD,MAAqB,uBAAuB;IAe1C,YAAoB,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAV7B,kBAAa,GAAG,CAAC,CAAC;QAWxB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG,IAAI,0BAAgB,EAAE,CAAC;QAEtC,IAAI,yBAAe,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAuB,CAAC;YACnF,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC;QACrC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAjBD,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAY,YAAY,CAAC,KAAK;QAC5B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAaD,aAAa;QACX,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5C,IAAA,qBAAU,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;SAC9B;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,8BAA8B;QAC9B,MAAM,IAAA,uBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,mBAAmB,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,IAAA,gBAAK,EAAC,IAAI,EAAE;YACzB,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,CAAC,oBAAoB,EAAE,YAAY,CAAC;SAC9C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAK,EAAC,IAAI,EAAE;YACxB,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,CAAC,oBAAoB,EAAE,YAAY,CAAC;YAC7C,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,gDAAgD;QAChD,KAAK,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;YAC5C,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAChC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;QAED,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAC3F,CAAC;QACF,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,IAAI,IAAA,eAAO,GAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,IAAA,eAAO,GAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,OAAO,CAAC,IAAI,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAA,yBAAc,EAAC,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACnD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACnD;QACD,IAAI,IAAA,eAAO,GAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,uBAAuB,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SAC/E;IACH,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,8EAA8E;QAC9E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAClC,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,QAAoB;QACxC,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,IAAA,6BAAa,EAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,yBAAe,CAAC,CAAC,CAAC,OAAO,EAAE,CAC1D,CAAC;QACF,mBAAS,CAAC,SAAS,CAAC;YAClB,IAAI,EAAE,cAAc;YACpB,UAAU;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ,CAAC,MAAM;aACzB;SACF,CAAC,CAAC;IACL,CAAC;CACF;AA1HD,0CA0HC"}
1
+ {"version":3,"file":"fingerprintWatchCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintWatchCommand.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const stream_1 = require("stream");
4
+ const glob_1 = require("glob");
5
+ const console_1 = require("console");
6
+ const promises_1 = require("fs/promises");
7
+ class Globber extends stream_1.EventEmitter {
8
+ constructor(pattern, interval = 1000) {
9
+ super();
10
+ this.pattern = pattern;
11
+ this.interval = interval;
12
+ this.running = false;
13
+ this.mtimes = new Map();
14
+ }
15
+ scanNow() {
16
+ (0, console_1.assert)(!this.currentGlob);
17
+ this.timeout = undefined;
18
+ this.currentGlob = new glob_1.Glob(this.pattern, { ignore: ['**/node_modules/**', '**/.git/**'] })
19
+ .on('end', this.scanEnd.bind(this))
20
+ .on('match', this.matchFound.bind(this));
21
+ }
22
+ start() {
23
+ this.running = true;
24
+ this.scanNow();
25
+ }
26
+ close() {
27
+ if (this.currentGlob)
28
+ this.currentGlob.abort();
29
+ if (this.timeout)
30
+ clearTimeout(this.timeout);
31
+ this.running = false;
32
+ this.currentGlob = undefined;
33
+ this.timeout = undefined;
34
+ }
35
+ scanEnd(found) {
36
+ this.currentGlob = undefined;
37
+ const files = new Set(found);
38
+ for (const f of this.mtimes.keys()) {
39
+ if (!files.has(f))
40
+ this.remove(f);
41
+ }
42
+ this.emit('end');
43
+ if (this.running)
44
+ this.timeout = setTimeout(this.scanNow.bind(this), this.interval);
45
+ }
46
+ matchFound(file) {
47
+ (0, promises_1.stat)(file).then((stat) => this.update(file, stat), () => this.remove(file));
48
+ }
49
+ update(file, { mtimeMs }) {
50
+ const oldTime = this.mtimes.get(file);
51
+ if (oldTime === mtimeMs)
52
+ return;
53
+ this.mtimes.set(file, mtimeMs);
54
+ const event = oldTime ? 'change' : 'add';
55
+ this.emit(event, file);
56
+ }
57
+ remove(file) {
58
+ {
59
+ this.mtimes.delete(file);
60
+ this.emit('unlink', file);
61
+ }
62
+ }
63
+ }
64
+ exports.default = Globber;
65
+ //# sourceMappingURL=globber.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"globber.js","sourceRoot":"","sources":["../../src/fingerprint/globber.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.43.2",
3
+ "version": "3.44.1",
4
4
  "description": "",
5
5
  "bin": "built/cli.js",
6
6
  "publishConfig": {