@openrewrite/rewrite 8.68.0-20251204-054843 → 8.68.0-20251204-145030

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.
Files changed (76) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.js +4 -0
  3. package/dist/index.js.map +1 -1
  4. package/dist/javascript/index.d.ts +3 -0
  5. package/dist/javascript/index.d.ts.map +1 -1
  6. package/dist/javascript/index.js +3 -0
  7. package/dist/javascript/index.js.map +1 -1
  8. package/dist/javascript/package-json-parser.d.ts +0 -5
  9. package/dist/javascript/package-json-parser.d.ts.map +1 -1
  10. package/dist/javascript/package-json-parser.js +13 -25
  11. package/dist/javascript/package-json-parser.js.map +1 -1
  12. package/dist/javascript/package-manager.d.ts +131 -0
  13. package/dist/javascript/package-manager.d.ts.map +1 -0
  14. package/dist/javascript/package-manager.js +372 -0
  15. package/dist/javascript/package-manager.js.map +1 -0
  16. package/dist/javascript/recipes/index.d.ts +2 -0
  17. package/dist/javascript/recipes/index.d.ts.map +1 -0
  18. package/dist/javascript/recipes/index.js +33 -0
  19. package/dist/javascript/recipes/index.js.map +1 -0
  20. package/dist/javascript/recipes/upgrade-dependency-version.d.ts +105 -0
  21. package/dist/javascript/recipes/upgrade-dependency-version.d.ts.map +1 -0
  22. package/dist/javascript/recipes/upgrade-dependency-version.js +493 -0
  23. package/dist/javascript/recipes/upgrade-dependency-version.js.map +1 -0
  24. package/dist/javascript/search/find-dependency.d.ts +32 -0
  25. package/dist/javascript/search/find-dependency.d.ts.map +1 -0
  26. package/dist/javascript/search/find-dependency.js +312 -0
  27. package/dist/javascript/search/find-dependency.js.map +1 -0
  28. package/dist/javascript/search/index.d.ts +1 -0
  29. package/dist/javascript/search/index.d.ts.map +1 -1
  30. package/dist/javascript/search/index.js +1 -0
  31. package/dist/javascript/search/index.js.map +1 -1
  32. package/dist/json/print.js +1 -1
  33. package/dist/json/print.js.map +1 -1
  34. package/dist/markers.d.ts +67 -0
  35. package/dist/markers.d.ts.map +1 -1
  36. package/dist/markers.js +101 -0
  37. package/dist/markers.js.map +1 -1
  38. package/dist/print.d.ts.map +1 -1
  39. package/dist/print.js +0 -1
  40. package/dist/print.js.map +1 -1
  41. package/dist/recipe.js +3 -3
  42. package/dist/recipe.js.map +1 -1
  43. package/dist/rpc/index.js +72 -0
  44. package/dist/rpc/index.js.map +1 -1
  45. package/dist/rpc/request/generate.js +1 -1
  46. package/dist/rpc/request/generate.js.map +1 -1
  47. package/dist/rpc/request/get-languages.d.ts.map +1 -1
  48. package/dist/rpc/request/get-languages.js +2 -1
  49. package/dist/rpc/request/get-languages.js.map +1 -1
  50. package/dist/rpc/request/visit.d.ts.map +1 -1
  51. package/dist/rpc/request/visit.js +27 -0
  52. package/dist/rpc/request/visit.js.map +1 -1
  53. package/dist/run.js +2 -2
  54. package/dist/run.js.map +1 -1
  55. package/dist/test/rewrite-test.js +1 -1
  56. package/dist/test/rewrite-test.js.map +1 -1
  57. package/dist/version.txt +1 -1
  58. package/package.json +1 -1
  59. package/src/index.ts +4 -0
  60. package/src/javascript/index.ts +3 -0
  61. package/src/javascript/package-json-parser.ts +14 -33
  62. package/src/javascript/package-manager.ts +428 -0
  63. package/src/javascript/recipes/index.ts +17 -0
  64. package/src/javascript/recipes/upgrade-dependency-version.ts +586 -0
  65. package/src/javascript/search/find-dependency.ts +303 -0
  66. package/src/javascript/search/index.ts +1 -0
  67. package/src/json/print.ts +1 -1
  68. package/src/markers.ts +146 -0
  69. package/src/print.ts +0 -1
  70. package/src/recipe.ts +3 -3
  71. package/src/rpc/index.ts +65 -1
  72. package/src/rpc/request/generate.ts +1 -1
  73. package/src/rpc/request/get-languages.ts +2 -1
  74. package/src/rpc/request/visit.ts +32 -1
  75. package/src/run.ts +2 -2
  76. package/src/test/rewrite-test.ts +1 -1
@@ -0,0 +1,312 @@
1
+ "use strict";
2
+ /*
3
+ * Copyright 2025 the original author or authors.
4
+ * <p>
5
+ * Licensed under the Moderne Source Available License (the "License");
6
+ * you may not use this file except in compliance with the License.
7
+ * You may obtain a copy of the License at
8
+ * <p>
9
+ * https://docs.moderne.io/licensing/moderate-source-available-license
10
+ * <p>
11
+ * Unless required by applicable law or agreed to in writing, software
12
+ * distributed under the License is distributed on an "AS IS" BASIS,
13
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ * See the License for the specific language governing permissions and
15
+ * limitations under the License.
16
+ */
17
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18
+ if (k2 === undefined) k2 = k;
19
+ var desc = Object.getOwnPropertyDescriptor(m, k);
20
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
21
+ desc = { enumerable: true, get: function() { return m[k]; } };
22
+ }
23
+ Object.defineProperty(o, k2, desc);
24
+ }) : (function(o, m, k, k2) {
25
+ if (k2 === undefined) k2 = k;
26
+ o[k2] = m[k];
27
+ }));
28
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
29
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
30
+ }) : function(o, v) {
31
+ o["default"] = v;
32
+ });
33
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
34
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
35
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
36
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
37
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
38
+ };
39
+ var __importStar = (this && this.__importStar) || (function () {
40
+ var ownKeys = function(o) {
41
+ ownKeys = Object.getOwnPropertyNames || function (o) {
42
+ var ar = [];
43
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
44
+ return ar;
45
+ };
46
+ return ownKeys(o);
47
+ };
48
+ return function (mod) {
49
+ if (mod && mod.__esModule) return mod;
50
+ var result = {};
51
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
52
+ __setModuleDefault(result, mod);
53
+ return result;
54
+ };
55
+ })();
56
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
57
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
58
+ return new (P || (P = Promise))(function (resolve, reject) {
59
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
60
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
61
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
62
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
63
+ });
64
+ };
65
+ Object.defineProperty(exports, "__esModule", { value: true });
66
+ exports.FindDependency = void 0;
67
+ const recipe_1 = require("../../recipe");
68
+ const json_1 = require("../../json");
69
+ const markers_1 = require("../../markers");
70
+ const node_resolution_result_1 = require("../node-resolution-result");
71
+ const semver = __importStar(require("semver"));
72
+ const picomatch = __importStar(require("picomatch"));
73
+ /** Dependency section names in package.json */
74
+ const DEPENDENCY_SECTIONS = new Set([
75
+ 'dependencies',
76
+ 'devDependencies',
77
+ 'peerDependencies',
78
+ 'optionalDependencies'
79
+ ]);
80
+ class FindDependency extends recipe_1.Recipe {
81
+ constructor(options) {
82
+ super(options);
83
+ this.name = "org.openrewrite.javascript.dependencies.find-dependency";
84
+ this.displayName = "Find Node.js dependency";
85
+ this.description = "Finds dependencies in a project's `package.json`. " +
86
+ "Can find both direct dependencies and dependencies that transitively include the target package. " +
87
+ "This recipe is commonly used as a precondition for other recipes.";
88
+ }
89
+ instanceName() {
90
+ return `${this.displayName} \`${this.packageName}${this.version ? '@' + this.version : ''}\``;
91
+ }
92
+ editor() {
93
+ return __awaiter(this, void 0, void 0, function* () {
94
+ var _a;
95
+ const packageName = this.packageName;
96
+ const version = this.version;
97
+ // Default to true if not specified (only search direct dependencies)
98
+ const onlyDirect = (_a = this.onlyDirect) !== null && _a !== void 0 ? _a : true;
99
+ // Create a picomatch matcher for the package name pattern
100
+ // For patterns without '/', use { contains: true } so that '*jest*' matches '@types/jest'
101
+ // (by default, '*' doesn't match '/' in glob patterns, but for package names this is more intuitive)
102
+ const matchOptions = packageName.includes('/') ? {} : { contains: true };
103
+ const matcher = picomatch.default
104
+ ? picomatch.default(packageName, matchOptions)
105
+ : picomatch(packageName, matchOptions);
106
+ return new class extends json_1.JsonVisitor {
107
+ constructor() {
108
+ super(...arguments);
109
+ this.isPackageJson = false;
110
+ }
111
+ visitDocument(document, ctx) {
112
+ const _super = Object.create(null, {
113
+ visitDocument: { get: () => super.visitDocument }
114
+ });
115
+ return __awaiter(this, void 0, void 0, function* () {
116
+ // Only process package.json files, not package-lock.json or other JSON files
117
+ const sourcePath = document.sourcePath;
118
+ this.isPackageJson = sourcePath.endsWith('package.json');
119
+ if (this.isPackageJson) {
120
+ this.resolution = (0, node_resolution_result_1.findNodeResolutionResult)(document);
121
+ }
122
+ return this.isPackageJson && this.resolution ? _super.visitDocument.call(this, document, ctx) : document;
123
+ });
124
+ }
125
+ visitMember(member, ctx) {
126
+ const _super = Object.create(null, {
127
+ visitMember: { get: () => super.visitMember }
128
+ });
129
+ return __awaiter(this, void 0, void 0, function* () {
130
+ // Check if we're inside a dependency section
131
+ const parentSection = this.getParentDependencySection();
132
+ if (!parentSection) {
133
+ return _super.visitMember.call(this, member, ctx);
134
+ }
135
+ // Get the package name from the member key
136
+ const depName = this.getMemberKeyName(member);
137
+ if (!depName) {
138
+ return _super.visitMember.call(this, member, ctx);
139
+ }
140
+ // Find the dependency in the resolution result
141
+ const dep = this.findDependencyByName(depName, parentSection);
142
+ if (!dep) {
143
+ return _super.visitMember.call(this, member, ctx);
144
+ }
145
+ // Check if this dependency matches directly
146
+ if (matcher(depName) && versionMatches(dep, version)) {
147
+ return this.markDependency(member, ctx);
148
+ }
149
+ // If not only direct, check if this dependency has the target as a transitive dependency
150
+ if (!onlyDirect && dep.resolved) {
151
+ if (hasTransitiveDependency(dep.resolved, matcher, version, new Set())) {
152
+ return this.markDependency(member, ctx);
153
+ }
154
+ }
155
+ return _super.visitMember.call(this, member, ctx);
156
+ });
157
+ }
158
+ /**
159
+ * Marks the dependency key with a search result marker.
160
+ */
161
+ markDependency(member, ctx) {
162
+ const _super = Object.create(null, {
163
+ visitMember: { get: () => super.visitMember }
164
+ });
165
+ return __awaiter(this, void 0, void 0, function* () {
166
+ const visitedMember = yield _super.visitMember.call(this, member, ctx);
167
+ const markedKey = (0, markers_1.foundSearchResult)(visitedMember.key.element);
168
+ return Object.assign(Object.assign({}, visitedMember), { key: Object.assign(Object.assign({}, visitedMember.key), { element: markedKey }) });
169
+ });
170
+ }
171
+ /**
172
+ * Checks if the current member's parent is a dependency section object.
173
+ * Returns the section name if so, undefined otherwise.
174
+ */
175
+ getParentDependencySection() {
176
+ // Walk up the cursor to find the parent member that contains this dependency
177
+ // Structure: Document > Object > Member("dependencies") > Object > Member("lodash")
178
+ let cursor = this.cursor.parent;
179
+ while (cursor) {
180
+ const tree = cursor.value;
181
+ if (tree && typeof tree === 'object' && 'kind' in tree) {
182
+ if (tree.kind === json_1.Json.Kind.Member) {
183
+ const memberKey = this.getMemberKeyName(tree);
184
+ if (memberKey && DEPENDENCY_SECTIONS.has(memberKey)) {
185
+ return memberKey;
186
+ }
187
+ }
188
+ }
189
+ cursor = cursor.parent;
190
+ }
191
+ return undefined;
192
+ }
193
+ /**
194
+ * Extracts the key name from a Json.Member
195
+ */
196
+ getMemberKeyName(member) {
197
+ const key = member.key.element;
198
+ if (key.kind === json_1.Json.Kind.Literal) {
199
+ // Remove quotes from string literal
200
+ const source = key.source;
201
+ if (source.startsWith('"') && source.endsWith('"')) {
202
+ return source.slice(1, -1);
203
+ }
204
+ return source;
205
+ }
206
+ else if (key.kind === json_1.Json.Kind.Identifier) {
207
+ return key.name;
208
+ }
209
+ return undefined;
210
+ }
211
+ /**
212
+ * Finds a dependency by name in the appropriate section of the resolution result.
213
+ */
214
+ findDependencyByName(name, section) {
215
+ if (!this.resolution)
216
+ return undefined;
217
+ let deps;
218
+ switch (section) {
219
+ case 'dependencies':
220
+ deps = this.resolution.dependencies;
221
+ break;
222
+ case 'devDependencies':
223
+ deps = this.resolution.devDependencies;
224
+ break;
225
+ case 'peerDependencies':
226
+ deps = this.resolution.peerDependencies;
227
+ break;
228
+ case 'optionalDependencies':
229
+ deps = this.resolution.optionalDependencies;
230
+ break;
231
+ }
232
+ return deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === name);
233
+ }
234
+ };
235
+ });
236
+ }
237
+ }
238
+ exports.FindDependency = FindDependency;
239
+ __decorate([
240
+ (0, recipe_1.Option)({
241
+ displayName: "Package name",
242
+ description: "The name of the npm package to find. Supports glob patterns.",
243
+ example: "lodash"
244
+ })
245
+ ], FindDependency.prototype, "packageName", void 0);
246
+ __decorate([
247
+ (0, recipe_1.Option)({
248
+ displayName: "Version",
249
+ description: "An exact version number or semver selector used to select the version number. " +
250
+ "Leave empty to match any version.",
251
+ example: "^18.0.0",
252
+ required: false
253
+ })
254
+ ], FindDependency.prototype, "version", void 0);
255
+ __decorate([
256
+ (0, recipe_1.Option)({
257
+ displayName: "Only direct dependencies",
258
+ description: "If true (default), only matches dependencies that directly match the package name. " +
259
+ "If false, also marks direct dependencies that have the target package as a transitive dependency.",
260
+ example: "true",
261
+ required: false
262
+ })
263
+ ], FindDependency.prototype, "onlyDirect", void 0);
264
+ /**
265
+ * Recursively checks if a resolved dependency has the target package as a transitive dependency.
266
+ */
267
+ function hasTransitiveDependency(resolved, matcher, version, visited) {
268
+ // Avoid cycles
269
+ const key = `${resolved.name}@${resolved.version}`;
270
+ if (visited.has(key)) {
271
+ return false;
272
+ }
273
+ visited.add(key);
274
+ // Check all dependency types
275
+ const allDeps = [
276
+ ...(resolved.dependencies || []),
277
+ ...(resolved.devDependencies || []),
278
+ ...(resolved.peerDependencies || []),
279
+ ...(resolved.optionalDependencies || [])
280
+ ];
281
+ for (const dep of allDeps) {
282
+ // Check if this dependency matches the target
283
+ if (matcher(dep.name) && versionMatches(dep, version)) {
284
+ return true;
285
+ }
286
+ // Recursively check transitive dependencies
287
+ if (dep.resolved && hasTransitiveDependency(dep.resolved, matcher, version, visited)) {
288
+ return true;
289
+ }
290
+ }
291
+ return false;
292
+ }
293
+ function versionMatches(dep, version) {
294
+ if (!version) {
295
+ return true;
296
+ }
297
+ const resolved = dep.resolved;
298
+ if (!resolved) {
299
+ // If no resolved version available, we can't validate the version
300
+ return false;
301
+ }
302
+ return versionMatchesResolved(resolved, version);
303
+ }
304
+ function versionMatchesResolved(resolved, version) {
305
+ if (!version) {
306
+ return true;
307
+ }
308
+ const actualVersion = resolved.version;
309
+ // Use semver.satisfies to check if the actual version matches the constraint
310
+ return semver.satisfies(actualVersion, version);
311
+ }
312
+ //# sourceMappingURL=find-dependency.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"find-dependency.js","sourceRoot":"","sources":["../../../src/javascript/search/find-dependency.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ export * from './find-dependency';
1
2
  export * from './uses-method';
2
3
  export * from './uses-type';
3
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/search/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/search/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}
@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./find-dependency"), exports);
17
18
  __exportStar(require("./uses-method"), exports);
18
19
  __exportStar(require("./uses-type"), exports);
19
20
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/search/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,8CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/search/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,gDAA8B;AAC9B,8CAA4B"}
@@ -31,7 +31,7 @@ const tree_2 = require("../tree");
31
31
  class JsonPrinter extends visitor_1.JsonVisitor {
32
32
  constructor() {
33
33
  super(...arguments);
34
- this.jsonMarkerWrapper = (out) => `/*~~${out}${out ? "~~" : ""}*/`;
34
+ this.jsonMarkerWrapper = (out) => `/*~~${out}${out ? "~~" : ""}>*/`;
35
35
  }
36
36
  visitArray(array, p) {
37
37
  return __awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"print.js","sourceRoot":"","sources":["../../src/json/print.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"print.js","sourceRoot":"","sources":["../../src/json/print.ts"],"names":[],"mappings":"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"}
package/dist/markers.d.ts CHANGED
@@ -4,6 +4,10 @@ export declare const MarkersKind: {
4
4
  readonly NamedStyles: "org.openrewrite.marker.NamedStyles";
5
5
  readonly SearchResult: "org.openrewrite.marker.SearchResult";
6
6
  readonly ParseExceptionResult: "org.openrewrite.ParseExceptionResult";
7
+ readonly MarkupError: "org.openrewrite.marker.Markup$Error";
8
+ readonly MarkupWarn: "org.openrewrite.marker.Markup$Warn";
9
+ readonly MarkupInfo: "org.openrewrite.marker.Markup$Info";
10
+ readonly MarkupDebug: "org.openrewrite.marker.Markup$Debug";
7
11
  /**
8
12
  * A generic marker that is sent/received as a bare map because the type hasn't been
9
13
  * defined in both Java and JavaScript.
@@ -24,6 +28,25 @@ export interface Markers {
24
28
  export declare function findMarker<T extends Marker>(o: {
25
29
  markers: Markers;
26
30
  }, kind: T["kind"]): T | undefined;
31
+ /**
32
+ * Replaces a marker in a Markers collection with a new marker.
33
+ * If the old marker is not found, the new marker is added.
34
+ *
35
+ * @param markers The markers collection to update
36
+ * @param oldMarker The marker to replace (matched by id)
37
+ * @param newMarker The new marker to insert
38
+ * @returns A new Markers object with the replacement applied
39
+ */
40
+ export declare function replaceMarker(markers: Markers, oldMarker: Marker, newMarker: Marker): Markers;
41
+ /**
42
+ * Replaces the first marker with the same kind as the new marker, or adds it if not found.
43
+ * This is useful when there's typically only one marker of each kind.
44
+ *
45
+ * @param markers The markers collection to update
46
+ * @param newMarker The new marker to insert (its kind is used to find the marker to replace)
47
+ * @returns A new Markers object with the replacement applied
48
+ */
49
+ export declare function replaceMarkerByKind(markers: Markers, newMarker: Marker): Markers;
27
50
  export declare const emptyMarkers: Markers;
28
51
  export interface SearchResult extends Marker {
29
52
  readonly kind: typeof MarkersKind.SearchResult;
@@ -39,4 +62,48 @@ export interface ParseExceptionResult extends Marker {
39
62
  readonly message: string;
40
63
  readonly treeType?: string;
41
64
  }
65
+ /**
66
+ * Base interface for Markup markers that attach messages to AST nodes.
67
+ * Used for errors, warnings, info, and debug messages.
68
+ */
69
+ export interface Markup extends Marker {
70
+ readonly message: string;
71
+ readonly detail?: string;
72
+ }
73
+ export interface MarkupError extends Markup {
74
+ readonly kind: typeof MarkersKind.MarkupError;
75
+ }
76
+ export interface MarkupWarn extends Markup {
77
+ readonly kind: typeof MarkersKind.MarkupWarn;
78
+ }
79
+ export interface MarkupInfo extends Markup {
80
+ readonly kind: typeof MarkersKind.MarkupInfo;
81
+ }
82
+ export interface MarkupDebug extends Markup {
83
+ readonly kind: typeof MarkersKind.MarkupDebug;
84
+ }
85
+ /**
86
+ * Attaches an error marker to a tree node.
87
+ */
88
+ export declare function markupError<T extends {
89
+ markers: Markers;
90
+ }>(t: T, message: string, detail?: string): T;
91
+ /**
92
+ * Attaches a warning marker to a tree node.
93
+ */
94
+ export declare function markupWarn<T extends {
95
+ markers: Markers;
96
+ }>(t: T, message: string, detail?: string): T;
97
+ /**
98
+ * Attaches an info marker to a tree node.
99
+ */
100
+ export declare function markupInfo<T extends {
101
+ markers: Markers;
102
+ }>(t: T, message: string, detail?: string): T;
103
+ /**
104
+ * Attaches a debug marker to a tree node.
105
+ */
106
+ export declare function markupDebug<T extends {
107
+ markers: Markers;
108
+ }>(t: T, message: string, detail?: string): T;
42
109
  //# sourceMappingURL=markers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":"AAeA,OAAO,EAAW,IAAI,EAAC,MAAM,QAAQ,CAAC;AAGtC,eAAO,MAAM,WAAW;;;;;IAMpB;;;OAGG;;CAEG,CAAA;AAEV,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;CACpB;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,MAAM,CAMlD;AAED,wBAAgB,OAAO,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAMrD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC,OAAO,CAAA;IACzC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;IACjB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAC7B;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACvC,CAAC,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EACvB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAChB,CAAC,GAAG,SAAS,CAIf;AAED,eAAO,MAAM,YAAY,EAAE,OAIzB,CAAC;AAEH,MAAM,WAAW,YAAa,SAAQ,MAAM;IACxC,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC,YAAY,CAAC;IAC/C,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAgB/F;AAED,MAAM,WAAW,oBAAqB,SAAQ,MAAM;IAChD,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC,oBAAoB,CAAA;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC9B"}
1
+ {"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":"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"}
package/dist/markers.js CHANGED
@@ -4,7 +4,13 @@ exports.emptyMarkers = exports.MarkersKind = void 0;
4
4
  exports.marker = marker;
5
5
  exports.markers = markers;
6
6
  exports.findMarker = findMarker;
7
+ exports.replaceMarker = replaceMarker;
8
+ exports.replaceMarkerByKind = replaceMarkerByKind;
7
9
  exports.foundSearchResult = foundSearchResult;
10
+ exports.markupError = markupError;
11
+ exports.markupWarn = markupWarn;
12
+ exports.markupInfo = markupInfo;
13
+ exports.markupDebug = markupDebug;
8
14
  /*
9
15
  * Copyright 2025 the original author or authors.
10
16
  * <p>
@@ -27,6 +33,11 @@ exports.MarkersKind = {
27
33
  NamedStyles: "org.openrewrite.marker.NamedStyles",
28
34
  SearchResult: "org.openrewrite.marker.SearchResult",
29
35
  ParseExceptionResult: "org.openrewrite.ParseExceptionResult",
36
+ // Markup markers for errors, warnings, info, and debug messages
37
+ MarkupError: "org.openrewrite.marker.Markup$Error",
38
+ MarkupWarn: "org.openrewrite.marker.Markup$Warn",
39
+ MarkupInfo: "org.openrewrite.marker.Markup$Info",
40
+ MarkupDebug: "org.openrewrite.marker.Markup$Debug",
30
41
  /**
31
42
  * A generic marker that is sent/received as a bare map because the type hasn't been
32
43
  * defined in both Java and JavaScript.
@@ -46,6 +57,46 @@ function markers(...markers) {
46
57
  function findMarker(o, kind) {
47
58
  return o.markers.markers.find((m) => m.kind === kind);
48
59
  }
60
+ /**
61
+ * Replaces a marker in a Markers collection with a new marker.
62
+ * If the old marker is not found, the new marker is added.
63
+ *
64
+ * @param markers The markers collection to update
65
+ * @param oldMarker The marker to replace (matched by id)
66
+ * @param newMarker The new marker to insert
67
+ * @returns A new Markers object with the replacement applied
68
+ */
69
+ function replaceMarker(markers, oldMarker, newMarker) {
70
+ const newMarkers = markers.markers.map(m => m.id === oldMarker.id ? newMarker : m);
71
+ // If old marker wasn't found, add the new one
72
+ if (!markers.markers.some(m => m.id === oldMarker.id)) {
73
+ newMarkers.push(newMarker);
74
+ }
75
+ return Object.assign(Object.assign({}, markers), { markers: newMarkers });
76
+ }
77
+ /**
78
+ * Replaces the first marker with the same kind as the new marker, or adds it if not found.
79
+ * This is useful when there's typically only one marker of each kind.
80
+ *
81
+ * @param markers The markers collection to update
82
+ * @param newMarker The new marker to insert (its kind is used to find the marker to replace)
83
+ * @returns A new Markers object with the replacement applied
84
+ */
85
+ function replaceMarkerByKind(markers, newMarker) {
86
+ let found = false;
87
+ const newMarkers = markers.markers.map(m => {
88
+ if (!found && m.kind === newMarker.kind) {
89
+ found = true;
90
+ return newMarker;
91
+ }
92
+ return m;
93
+ });
94
+ // If marker with kind wasn't found, add the new one
95
+ if (!found) {
96
+ newMarkers.push(newMarker);
97
+ }
98
+ return Object.assign(Object.assign({}, markers), { markers: newMarkers });
99
+ }
49
100
  exports.emptyMarkers = (0, reference_1.asRef)({
50
101
  kind: exports.MarkersKind.Markers,
51
102
  id: (0, uuid_1.randomId)(),
@@ -62,4 +113,54 @@ function foundSearchResult(t, description) {
62
113
  }
63
114
  return t;
64
115
  }
116
+ /**
117
+ * Attaches an error marker to a tree node.
118
+ */
119
+ function markupError(t, message, detail) {
120
+ return addMarkup(t, {
121
+ kind: exports.MarkersKind.MarkupError,
122
+ id: (0, uuid_1.randomId)(),
123
+ message,
124
+ detail
125
+ });
126
+ }
127
+ /**
128
+ * Attaches a warning marker to a tree node.
129
+ */
130
+ function markupWarn(t, message, detail) {
131
+ return addMarkup(t, {
132
+ kind: exports.MarkersKind.MarkupWarn,
133
+ id: (0, uuid_1.randomId)(),
134
+ message,
135
+ detail
136
+ });
137
+ }
138
+ /**
139
+ * Attaches an info marker to a tree node.
140
+ */
141
+ function markupInfo(t, message, detail) {
142
+ return addMarkup(t, {
143
+ kind: exports.MarkersKind.MarkupInfo,
144
+ id: (0, uuid_1.randomId)(),
145
+ message,
146
+ detail
147
+ });
148
+ }
149
+ /**
150
+ * Attaches a debug marker to a tree node.
151
+ */
152
+ function markupDebug(t, message, detail) {
153
+ return addMarkup(t, {
154
+ kind: exports.MarkersKind.MarkupDebug,
155
+ id: (0, uuid_1.randomId)(),
156
+ message,
157
+ detail
158
+ });
159
+ }
160
+ /**
161
+ * Helper to add a markup marker to a tree node.
162
+ */
163
+ function addMarkup(t, markup) {
164
+ return Object.assign(Object.assign({}, t), { markers: Object.assign(Object.assign({}, t.markers), { markers: [...t.markers.markers, markup] }) });
165
+ }
65
166
  //# sourceMappingURL=markers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"markers.js","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":";;;AAoCA,wBAMC;AAED,0BAMC;AAQD,gCAOC;AAaD,8CAgBC;AA9FD;;;;;;;;;;;;;;GAcG;AACH,iCAAsC;AACtC,2CAAkC;AAErB,QAAA,WAAW,GAAG;IACvB,OAAO,EAAE,gCAAgC;IACzC,WAAW,EAAE,oCAAoC;IACjD,YAAY,EAAE,qCAAqC;IACnD,oBAAoB,EAAE,sCAAsC;IAE5D;;;OAGG;IACH,SAAS,EAAE,+BAA+B;CACpC,CAAA;AAOV,SAAgB,MAAM,CAAC,EAAQ,EAAE,IAAS;IACtC,uBACI,IAAI,EAAE,mBAAW,CAAC,SAAS,EAC3B,EAAE,IACC,IAAI,EACV;AACL,CAAC;AAED,SAAgB,OAAO,CAAC,GAAG,OAAiB;IACxC,OAAO;QACH,IAAI,EAAE,mBAAW,CAAC,OAAO;QACzB,EAAE,EAAE,IAAA,eAAQ,GAAE;QACd,OAAO;KACV,CAAA;AACL,CAAC;AAQD,SAAgB,UAAU,CACtB,CAAuB,EACvB,IAAe;IAEf,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CACzB,CAAC,CAAC,EAAU,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CACjC,CAAC;AACN,CAAC;AAEY,QAAA,YAAY,GAAY,IAAA,iBAAK,EAAC;IACvC,IAAI,EAAE,mBAAW,CAAC,OAAO;IACzB,EAAE,EAAE,IAAA,eAAQ,GAAE;IACd,OAAO,EAAE,EAAE;CACd,CAAC,CAAC;AAOH,SAAgB,iBAAiB,CAAiC,CAAI,EAAE,WAAoB;IACxF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,EAAE,mBAAW,CAAC,YAAY,CAAC,CAAC;IACzD,IAAI,CAAC,QAAQ,IAAK,QAAyB,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;QACtE,OAAO,gCACA,CAAC,KACJ,OAAO,kCACA,CAAC,CAAC,OAAO,KACZ,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;wBAC5B,IAAI,EAAE,mBAAW,CAAC,YAAY;wBAC9B,EAAE,EAAE,IAAA,eAAQ,GAAE;wBACd,WAAW,EAAE,WAAW;qBACX,CAAC,MAEpB,CAAC;IACX,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"markers.js","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAA4B,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAC,MAAM,EAAgB,UAAU,EAAE,IAAI,EAAC,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAGtC,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC1B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;IAErF,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;IAErF,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;CACvF;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,OAAO,EAAE,aAiBrB,CAAA;IAEM,MAAM,mBAAmB,EAAE,aAcjC,CAAA;IAEM,MAAM,MAAM,EAAE,aAgBpB,CAAA;IAEM,MAAM,SAAS,EAAE,aAUvB,CAAA;CACJ;AAED,qBAAa,kBAAkB;aAGC,aAAa,EAAE,aAAa;IAFxD,OAAO,CAAC,IAAI,CAAc;gBAEE,aAAa,GAAE,aAAqC;IAGhF,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,kBAAkB;CAMvD;AAED,UAAU,WAAW;IACjB;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CACW;IAEnC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,IAAI;IAUxF;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW;IAcjE,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;WAIxC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAGrE;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,CAEzE"}
1
+ {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAA4B,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAC,MAAM,EAAgB,UAAU,EAAE,IAAI,EAAC,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAGtC,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC1B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;IAErF,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;IAErF,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC;CACvF;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,OAAO,EAAE,aAgBrB,CAAA;IAEM,MAAM,mBAAmB,EAAE,aAcjC,CAAA;IAEM,MAAM,MAAM,EAAE,aAgBpB,CAAA;IAEM,MAAM,SAAS,EAAE,aAUvB,CAAA;CACJ;AAED,qBAAa,kBAAkB;aAGC,aAAa,EAAE,aAAa;IAFxD,OAAO,CAAC,IAAI,CAAc;gBAEE,aAAa,GAAE,aAAqC;IAGhF,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,kBAAkB;CAMvD;AAED,UAAU,WAAW;IACjB;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CACW;IAEnC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,GAAG,IAAI;IAUxF;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW;IAcjE,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;WAIxC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAGrE;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,CAEzE"}
package/dist/print.js CHANGED
@@ -38,7 +38,6 @@ var MarkerPrinter;
38
38
  return commentWrapper(searchResult.description == null ? "" : "(" + searchResult.description + ")");
39
39
  }
40
40
  else if (marker.kind.startsWith("org.openrewrite.marker.Markup$")) {
41
- // TODO add markup marker types
42
41
  return commentWrapper("(" + marker.message + ")");
43
42
  }
44
43
  return "";