@appland/appmap 3.10.0 → 3.10.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.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appland/appmap",
3
- "version": "3.9.0",
3
+ "version": "3.10.0",
4
4
  "description": "",
5
5
  "bin": "built/src/cli.js",
6
6
  "publishConfig": {
@@ -73,7 +73,9 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
73
73
  * If there's no plugins block, and no buildscript block, append a new plugins
74
74
  * block.
75
75
  *
76
- * @returns {string}
76
+ * @returns {updatedSrc: string, offset: number} updatedSrc is the source
77
+ * updated to reference the plugin, offset is the index in the original source
78
+ * from which copying should continue
77
79
  */
78
80
  async insertPluginSpec(buildFileSource, parseResult, whitespace) {
79
81
  const pluginSpec = `id 'com.appland.appmap' version '1.1.0'`;
@@ -126,8 +128,9 @@ ${whitespace.padLine(pluginSpec)}
126
128
  const updatedSrc = [
127
129
  buildFileSource.substring(0, parseResult.plugins.lbrace + 1),
128
130
  lines.map((l) => whitespace.padLine(l)).join(os_1.default.EOL),
131
+ '}'
129
132
  ].join(os_1.default.EOL);
130
- const offset = parseResult.plugins.rbrace - 1;
133
+ const offset = parseResult.plugins.rbrace + 1;
131
134
  return { updatedSrc, offset };
132
135
  }
133
136
  /**
@@ -165,10 +168,10 @@ ${whitespace.padLine(mavenCentral)}
165
168
  }
166
169
  updatedSrc = [
167
170
  updatedSrc,
168
- buildFileSource.substring(offset, parseResult.repositories.lbrace),
171
+ buildFileSource.substring(offset, parseResult.repositories.rbrace),
169
172
  whitespace.padLine(mavenCentral),
170
- ].join[''];
171
- offset = parseResult.repositories.rbrace;
173
+ ].join('');
174
+ offset = parseResult.repositories.rbrace - 1;
172
175
  return { updatedSrc, offset };
173
176
  }
174
177
  async installAgent() {
@@ -1 +1 @@
1
- {"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.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.GradleParser = exports.GradleParseResult = void 0;
6
+ exports.GradleParser = void 0;
7
7
  const moo_1 = __importDefault(require("moo"));
8
8
  class SourceOffsets {
9
9
  constructor(blockName, lbrace) {
@@ -15,24 +15,25 @@ class SourceOffsets {
15
15
  this.rbrace = -1;
16
16
  }
17
17
  }
18
- /**
19
- * The results of parsing a build.gradle file. Each member contains the offsets
20
- * into the source for the block's left brace and right brace, or is null if the
21
- * block is not present.
22
- *
23
- * startOffset is the first non-comment, non-whitespace character. mavenPresent
24
- * will be true if `mavenCentral()` is included in the repositories.
25
- **/
26
- class GradleParseResult {
27
- constructor() {
28
- this.startOffset = -1;
29
- this.buildscript = null;
30
- this.repositories = null;
31
- this.plugins = null;
32
- this.mavenPresent = false;
33
- }
34
- }
35
- exports.GradleParseResult = GradleParseResult;
18
+ // These are the names blocks that can contain "repositories" blocks:
19
+ var RepositoriesContainers;
20
+ (function (RepositoriesContainers) {
21
+ RepositoriesContainers["buildscript"] = "buildscript";
22
+ RepositoriesContainers["allprojects"] = "allprojects";
23
+ RepositoriesContainers["subprojects"] = "subprojects";
24
+ })(RepositoriesContainers || (RepositoriesContainers = {}));
25
+ ;
26
+ const REPOSITORIES_CONTAINERS = Object.values(RepositoriesContainers);
27
+ // These are the names of the other blocks we care about:
28
+ var OtherContainers;
29
+ (function (OtherContainers) {
30
+ OtherContainers["repositories"] = "repositories";
31
+ OtherContainers["plugins"] = "plugins";
32
+ })(OtherContainers || (OtherContainers = {}));
33
+ ;
34
+ const keywords = Object.assign(Object.assign({}, RepositoriesContainers), OtherContainers);
35
+ const KEYWORDS = Object.values(keywords);
36
+ ;
36
37
  class GradleParser {
37
38
  constructor() {
38
39
  this.debug = 0;
@@ -45,7 +46,7 @@ class GradleParser {
45
46
  parse(src) {
46
47
  const lexer = moo_1.default.states({
47
48
  gradle: {
48
- keyword: GradleParser.keywords,
49
+ keyword: KEYWORDS,
49
50
  mavenCentral: 'mavenCentral',
50
51
  comment: { match: /\/\/.*?\n/, lineBreaks: true },
51
52
  multicomment: /\/\*[^]*?\*\//,
@@ -71,7 +72,10 @@ class GradleParser {
71
72
  let startBlock = null;
72
73
  const blockStack = [];
73
74
  lexer.reset(src);
74
- let result = new GradleParseResult();
75
+ let result = {
76
+ startOffset: -1,
77
+ mavenPresent: false
78
+ };
75
79
  // eslint-disable-next-line no-cond-assign
76
80
  /* eslint-disable no-continue */
77
81
  /* eslint-disable no-plusplus */
@@ -95,7 +99,7 @@ class GradleParser {
95
99
  }
96
100
  // We're only interested in the repositories block if it's not within
97
101
  // the buildscript block.
98
- const inBuildscript = blockStack.length === 1 && blockStack[0].blockName === 'buildscript';
102
+ const inBuildscript = blockStack.length === 1 && REPOSITORIES_CONTAINERS.includes(blockStack[0].blockName);
99
103
  if (t.value !== 'repositories' || !inBuildscript) {
100
104
  startBlock = t.value;
101
105
  continue;
@@ -145,13 +149,13 @@ class GradleParser {
145
149
  return result;
146
150
  }
147
151
  checkSyntax(parseResult) {
148
- GradleParser.keywords.forEach((k) => {
149
- if (parseResult[k] !== null && parseResult[k].rbrace === -1) {
152
+ KEYWORDS.forEach((k) => {
153
+ var _a;
154
+ if (((_a = parseResult[k]) === null || _a === void 0 ? void 0 : _a.rbrace) === -1) {
150
155
  throw new Error(`parse failed, ${JSON.stringify(parseResult, null, 2)}`);
151
156
  }
152
157
  });
153
158
  }
154
159
  }
155
160
  exports.GradleParser = GradleParser;
156
- GradleParser.keywords = ['buildscript', 'repositories', 'plugins'];
157
161
  //# sourceMappingURL=gradleParser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gradleParser.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gradleParser.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleParser.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.10.0",
3
+ "version": "3.10.1",
4
4
  "description": "",
5
5
  "bin": "built/src/cli.js",
6
6
  "publishConfig": {
@@ -65,7 +65,7 @@
65
65
  "vuex"
66
66
  ],
67
67
  "dependencies": {
68
- "@appland/components": "1.14.1",
68
+ "@appland/components": "1.14.2",
69
69
  "@appland/diagrams": "1.5.0",
70
70
  "@appland/models": "1.5.1",
71
71
  "@sidvind/better-ajv-errors": "^0.9.1",