@openrewrite/rewrite 8.69.0-20251211-160325 → 8.69.0-20251211-200238
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/dist/javascript/package-json-parser.d.ts +0 -5
- package/dist/javascript/package-json-parser.d.ts.map +1 -1
- package/dist/javascript/package-json-parser.js +2 -12
- package/dist/javascript/package-json-parser.js.map +1 -1
- package/dist/javascript/package-manager.d.ts.map +1 -1
- package/dist/javascript/package-manager.js +13 -1
- package/dist/javascript/package-manager.js.map +1 -1
- package/dist/json/parser.d.ts.map +1 -1
- package/dist/json/parser.js +355 -123
- package/dist/json/parser.js.map +1 -1
- package/dist/json/tree.d.ts +5 -1
- package/dist/json/tree.d.ts.map +1 -1
- package/dist/json/tree.js +157 -7
- package/dist/json/tree.js.map +1 -1
- package/dist/print.d.ts.map +1 -1
- package/dist/print.js +5 -1
- package/dist/print.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +2 -1
- package/src/javascript/package-json-parser.ts +2 -12
- package/src/javascript/package-manager.ts +13 -1
- package/src/json/parser.ts +443 -146
- package/src/json/tree.ts +159 -7
- package/src/print.ts +6 -2
package/dist/json/tree.js
CHANGED
|
@@ -42,18 +42,168 @@ var Json;
|
|
|
42
42
|
RightPadded: "org.openrewrite.json.tree.JsonRightPadded"
|
|
43
43
|
};
|
|
44
44
|
})(Json || (exports.Json = Json = {}));
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
comments: [],
|
|
49
|
-
whitespace: whitespace
|
|
50
|
-
};
|
|
51
|
-
}
|
|
45
|
+
// Cache for Space objects - reuse for common whitespace patterns (flyweight pattern)
|
|
46
|
+
const spaceCache = new Map();
|
|
47
|
+
const SPACE_CACHE_MAX_LENGTH = 100;
|
|
52
48
|
exports.emptySpace = {
|
|
53
49
|
kind: Json.Kind.Space,
|
|
54
50
|
comments: [],
|
|
55
51
|
whitespace: ""
|
|
56
52
|
};
|
|
53
|
+
const singleSpace = {
|
|
54
|
+
kind: Json.Kind.Space,
|
|
55
|
+
comments: [],
|
|
56
|
+
whitespace: " "
|
|
57
|
+
};
|
|
58
|
+
/**
|
|
59
|
+
* Parse a formatting string into a Space object, extracting comments.
|
|
60
|
+
* Mirrors the Java Space.format() method.
|
|
61
|
+
*/
|
|
62
|
+
function space(formatting) {
|
|
63
|
+
if (formatting.length === 0) {
|
|
64
|
+
return exports.emptySpace;
|
|
65
|
+
}
|
|
66
|
+
if (formatting === " ") {
|
|
67
|
+
return singleSpace;
|
|
68
|
+
}
|
|
69
|
+
// Check cache first for short strings
|
|
70
|
+
const cacheable = formatting.length <= SPACE_CACHE_MAX_LENGTH;
|
|
71
|
+
if (cacheable) {
|
|
72
|
+
const cached = spaceCache.get(formatting);
|
|
73
|
+
if (cached !== undefined) {
|
|
74
|
+
return cached;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
// No comment markers means simple whitespace-only Space
|
|
78
|
+
if (!formatting.includes('/')) {
|
|
79
|
+
const result = {
|
|
80
|
+
kind: Json.Kind.Space,
|
|
81
|
+
comments: [],
|
|
82
|
+
whitespace: formatting
|
|
83
|
+
};
|
|
84
|
+
if (cacheable) {
|
|
85
|
+
spaceCache.set(formatting, result);
|
|
86
|
+
}
|
|
87
|
+
return result;
|
|
88
|
+
}
|
|
89
|
+
// Parse comments out of the formatting string
|
|
90
|
+
let prefix = '';
|
|
91
|
+
let comment = '';
|
|
92
|
+
const comments = [];
|
|
93
|
+
let inSingleLineComment = false;
|
|
94
|
+
let inMultiLineComment = false;
|
|
95
|
+
let last = '';
|
|
96
|
+
for (let i = 0; i < formatting.length; i++) {
|
|
97
|
+
const c = formatting[i];
|
|
98
|
+
if (c === '/') {
|
|
99
|
+
if (inSingleLineComment) {
|
|
100
|
+
comment += c;
|
|
101
|
+
}
|
|
102
|
+
else if (last === '/' && !inMultiLineComment) {
|
|
103
|
+
// Start of single-line comment
|
|
104
|
+
inSingleLineComment = true;
|
|
105
|
+
comment = '';
|
|
106
|
+
prefix = prefix.slice(0, -1); // Remove the first '/'
|
|
107
|
+
}
|
|
108
|
+
else if (last === '*' && inMultiLineComment && comment.length > 0) {
|
|
109
|
+
// End of multi-line comment
|
|
110
|
+
inMultiLineComment = false;
|
|
111
|
+
comment = comment.slice(0, -1); // Trim the last '*'
|
|
112
|
+
comments.push({
|
|
113
|
+
kind: Json.Kind.Comment,
|
|
114
|
+
multiline: true,
|
|
115
|
+
text: comment,
|
|
116
|
+
suffix: prefix.slice(0, -1),
|
|
117
|
+
markers: markers_1.emptyMarkers
|
|
118
|
+
});
|
|
119
|
+
prefix = '';
|
|
120
|
+
comment = '';
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
else if (inMultiLineComment) {
|
|
124
|
+
comment += c;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
prefix += c;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
else if (c === '\r' || c === '\n') {
|
|
131
|
+
if (inSingleLineComment) {
|
|
132
|
+
// End of single-line comment
|
|
133
|
+
inSingleLineComment = false;
|
|
134
|
+
comments.push({
|
|
135
|
+
kind: Json.Kind.Comment,
|
|
136
|
+
multiline: false,
|
|
137
|
+
text: comment,
|
|
138
|
+
suffix: prefix,
|
|
139
|
+
markers: markers_1.emptyMarkers
|
|
140
|
+
});
|
|
141
|
+
prefix = c;
|
|
142
|
+
comment = '';
|
|
143
|
+
}
|
|
144
|
+
else if (!inMultiLineComment) {
|
|
145
|
+
prefix += c;
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
comment += c;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
else if (c === '*') {
|
|
152
|
+
if (inSingleLineComment) {
|
|
153
|
+
comment += c;
|
|
154
|
+
}
|
|
155
|
+
else if (last === '/' && !inMultiLineComment) {
|
|
156
|
+
// Start of multi-line comment
|
|
157
|
+
inMultiLineComment = true;
|
|
158
|
+
comment = '';
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
comment += c;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
165
|
+
if (inSingleLineComment || inMultiLineComment) {
|
|
166
|
+
comment += c;
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
prefix += c;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
last = c;
|
|
173
|
+
}
|
|
174
|
+
// If a file ends with a single-line comment there may be no terminating newline
|
|
175
|
+
if (comment.length > 0 || inSingleLineComment) {
|
|
176
|
+
comments.push({
|
|
177
|
+
kind: Json.Kind.Comment,
|
|
178
|
+
multiline: false,
|
|
179
|
+
text: comment,
|
|
180
|
+
suffix: prefix,
|
|
181
|
+
markers: markers_1.emptyMarkers
|
|
182
|
+
});
|
|
183
|
+
prefix = '';
|
|
184
|
+
}
|
|
185
|
+
// Shift the whitespace on each comment forward to be a suffix of the comment before it,
|
|
186
|
+
// and the whitespace on the first comment to be the whitespace of the tree element.
|
|
187
|
+
// The remaining prefix is the suffix of the last comment.
|
|
188
|
+
let whitespace = prefix;
|
|
189
|
+
if (comments.length > 0) {
|
|
190
|
+
for (let i = comments.length - 1; i >= 0; i--) {
|
|
191
|
+
const c = comments[i];
|
|
192
|
+
const next = c.suffix;
|
|
193
|
+
comments[i] = Object.assign(Object.assign({}, c), { suffix: whitespace });
|
|
194
|
+
whitespace = next;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
const result = {
|
|
198
|
+
kind: Json.Kind.Space,
|
|
199
|
+
comments,
|
|
200
|
+
whitespace
|
|
201
|
+
};
|
|
202
|
+
if (cacheable) {
|
|
203
|
+
spaceCache.set(formatting, result);
|
|
204
|
+
}
|
|
205
|
+
return result;
|
|
206
|
+
}
|
|
57
207
|
const jsonKindValues = new Set(Object.values(Json.Kind));
|
|
58
208
|
function isJson(tree) {
|
|
59
209
|
return jsonKindValues.has(tree["kind"]);
|
package/dist/json/tree.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/json/tree.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/json/tree.ts"],"names":[],"mappings":"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"}
|
package/dist/print.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAoC,MAAM,WAAW,CAAC;AACpE,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,aAoBrB,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,11 @@ 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
|
-
|
|
41
|
+
const markup = marker;
|
|
42
|
+
const content = markup.detail
|
|
43
|
+
? `(${markup.message}: ${markup.detail})`
|
|
44
|
+
: `(${markup.message})`;
|
|
45
|
+
return commentWrapper(content);
|
|
42
46
|
}
|
|
43
47
|
return "";
|
|
44
48
|
},
|
package/dist/print.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.69.0-20251211-
|
|
1
|
+
8.69.0-20251211-200238
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.69.0-20251211-
|
|
3
|
+
"version": "8.69.0-20251211-200238",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"homepage": "https://github.com/openrewrite/rewrite",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"commander": "^14.0.0",
|
|
57
57
|
"diff": "^7.0.0",
|
|
58
58
|
"immer": "^10.1.1",
|
|
59
|
+
"jsonc-parser": "^3.3.1",
|
|
59
60
|
"picomatch": "^4.0.3",
|
|
60
61
|
"semver": "^7.7.3",
|
|
61
62
|
"tmp-promise": "^3.0.3",
|
|
@@ -336,20 +336,10 @@ export class PackageJsonParser extends Parser {
|
|
|
336
336
|
|
|
337
337
|
/**
|
|
338
338
|
* Parses JSONC (JSON with Comments and trailing commas) content.
|
|
339
|
-
*
|
|
340
|
-
* Note: This is a simple regex-based approach that works for bun.lock files but doesn't
|
|
341
|
-
* handle edge cases like comment-like sequences inside strings (e.g., "// not a comment").
|
|
342
|
-
* For lock files this is acceptable since they don't contain such patterns. If broader
|
|
343
|
-
* JSONC support is needed, consider using a proper parser like `jsonc-parser`.
|
|
344
339
|
*/
|
|
345
340
|
private parseJsonc(content: string): Record<string, any> {
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
// Remove multi-line comments (/* ... */)
|
|
349
|
-
stripped = stripped.replace(/\/\*[\s\S]*?\*\//g, '');
|
|
350
|
-
// Remove trailing commas before ] or }
|
|
351
|
-
stripped = stripped.replace(/,(\s*[}\]])/g, '$1');
|
|
352
|
-
return JSON.parse(stripped);
|
|
341
|
+
const {parse} = require('jsonc-parser');
|
|
342
|
+
return parse(content);
|
|
353
343
|
}
|
|
354
344
|
|
|
355
345
|
/**
|
|
@@ -533,9 +533,21 @@ export async function runInstallInTempDir(
|
|
|
533
533
|
});
|
|
534
534
|
|
|
535
535
|
if (!result.success) {
|
|
536
|
+
// Combine error message with stderr for more useful diagnostics
|
|
537
|
+
const errorParts: string[] = [];
|
|
538
|
+
if (result.error) {
|
|
539
|
+
errorParts.push(result.error);
|
|
540
|
+
}
|
|
541
|
+
if (result.stderr) {
|
|
542
|
+
// Trim and limit stderr to avoid excessively long error messages
|
|
543
|
+
const stderr = result.stderr.trim();
|
|
544
|
+
if (stderr) {
|
|
545
|
+
errorParts.push(stderr.length > 2000 ? stderr.slice(0, 2000) + '...' : stderr);
|
|
546
|
+
}
|
|
547
|
+
}
|
|
536
548
|
return {
|
|
537
549
|
success: false,
|
|
538
|
-
error:
|
|
550
|
+
error: errorParts.length > 0 ? errorParts.join('\n\n') : 'Unknown error'
|
|
539
551
|
};
|
|
540
552
|
}
|
|
541
553
|
|