@openrewrite/rewrite 8.96.0 → 8.96.2
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/add-import.d.ts.map +1 -1
- package/dist/javascript/add-import.js +7 -1
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/amd.d.ts.map +1 -1
- package/dist/javascript/amd.js +29 -16
- package/dist/javascript/amd.js.map +1 -1
- package/dist/javascript/format/format.d.ts.map +1 -1
- package/dist/javascript/format/format.js +14 -5
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/recipes/order-imports.d.ts.map +1 -1
- package/dist/javascript/recipes/order-imports.js +20 -27
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/search/find-dependency.d.ts.map +1 -1
- package/dist/javascript/search/find-dependency.js +3 -0
- package/dist/javascript/search/find-dependency.js.map +1 -1
- package/dist/markers.js +4 -0
- package/dist/markers.js.map +1 -1
- package/dist/rewrite-javascript-version.txt +1 -1
- package/dist/test/rewrite-test.d.ts +26 -1
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +174 -14
- package/dist/test/rewrite-test.js.map +1 -1
- package/package.json +1 -1
- package/src/javascript/add-import.ts +7 -1
- package/src/javascript/amd.ts +31 -17
- package/src/javascript/format/format.ts +12 -5
- package/src/javascript/recipes/order-imports.ts +24 -28
- package/src/javascript/search/find-dependency.ts +3 -0
- package/src/markers.ts +4 -0
- package/src/test/rewrite-test.ts +175 -12
|
@@ -137,6 +137,9 @@ class FindDependency extends recipe_1.Recipe {
|
|
|
137
137
|
async markDependency(member, ctx) {
|
|
138
138
|
const visitedMember = await super.visitMember(member, ctx);
|
|
139
139
|
const markedKey = (0, markers_1.foundSearchResult)(visitedMember.key.element);
|
|
140
|
+
if (markedKey === visitedMember.key.element) {
|
|
141
|
+
return visitedMember;
|
|
142
|
+
}
|
|
140
143
|
return Object.assign(Object.assign({}, visitedMember), { key: Object.assign(Object.assign({}, visitedMember.key), { element: markedKey }) });
|
|
141
144
|
}
|
|
142
145
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-dependency.js","sourceRoot":"","sources":["../../../src/javascript/search/find-dependency.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yCAA4C;AAG5C,qCAAyE;AACzE,2CAAgD;AAChD,sEAOmC;AACnC,+CAAiC;AACjC,qDAAuC;AAEvC,+CAA+C;AAC/C,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAkB,4CAAmB,CAAC,CAAC;AAoB1E,MAAa,cAAe,SAAQ,eAAM;IAgCtC,YAAY,OAA8B;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QAhCV,SAAI,GAAG,yDAAyD,CAAC;QACjE,gBAAW,GAAG,yBAAyB,CAAC;QACxC,gBAAW,GAAG,oDAAoD;YACvE,mGAAmG;YACnG,mEAAmE,CAAC;QA6BpE,+EAA+E;QAC/E,uCAAuC;QACvC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,UAAiB,KAAK,OAAO,CAAC,CAAC,CAAC;IAC3F,CAAC;IAEQ,YAAY;QACjB,OAAO,GAAG,IAAI,CAAC,WAAW,MAAM,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,0DAA0D;QAC1D,0FAA0F;QAC1F,qGAAqG;QACrG,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACzE,MAAM,OAAO,GAAsB,SAAS,CAAC,OAAO;YAChD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC;YAC9C,CAAC,CAAE,SAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEpD,OAAO,IAAI,KAAM,SAAQ,kBAA6B;YAA3C;;gBAEC,kBAAa,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"find-dependency.js","sourceRoot":"","sources":["../../../src/javascript/search/find-dependency.ts"],"names":[],"mappings":"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"}
|
package/dist/markers.js
CHANGED
|
@@ -171,6 +171,10 @@ function markupDebug(t, message, detail) {
|
|
|
171
171
|
* Helper to add a markup marker to a tree node.
|
|
172
172
|
*/
|
|
173
173
|
function addMarkup(t, markup) {
|
|
174
|
+
if (t.markers.markers.some(m => m.kind === markup.kind &&
|
|
175
|
+
m.message === markup.message && m.detail === markup.detail)) {
|
|
176
|
+
return t;
|
|
177
|
+
}
|
|
174
178
|
return Object.assign(Object.assign({}, t), { markers: Object.assign(Object.assign({}, t.markers), { markers: [...t.markers.markers, markup] }) });
|
|
175
179
|
}
|
|
176
180
|
//# sourceMappingURL=markers.js.map
|
package/dist/markers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../src/markers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
8.96.
|
|
1
|
+
8.96.2
|
|
@@ -21,6 +21,17 @@ export declare class RecipeSpec {
|
|
|
21
21
|
* its output carry.
|
|
22
22
|
*/
|
|
23
23
|
checkReportingMarkersOnly: boolean;
|
|
24
|
+
/**
|
|
25
|
+
* The cycles to run, by default one more than {@link expectedCyclesThatMakeChanges} and at least two. The
|
|
26
|
+
* cycles after the expected ones, and a run on a fresh parse of the output, fail the test if they change
|
|
27
|
+
* anything, so setting this to 1 turns the stability checks off.
|
|
28
|
+
*/
|
|
29
|
+
cycles?: number;
|
|
30
|
+
/**
|
|
31
|
+
* How many cycles a recipe needs to settle, by default 1. A recipe that only reaches its result over
|
|
32
|
+
* several cycles declares how many here, and the test then compares the output of the last of them.
|
|
33
|
+
*/
|
|
34
|
+
expectedCyclesThatMakeChanges?: number;
|
|
24
35
|
recipe: Recipe;
|
|
25
36
|
/**
|
|
26
37
|
* Used for both parsing and recipe execution unless an alternative recipe execution context is set with
|
|
@@ -35,7 +46,11 @@ export declare class RecipeSpec {
|
|
|
35
46
|
private static live?;
|
|
36
47
|
private suiteConfiguration?;
|
|
37
48
|
constructor();
|
|
38
|
-
|
|
49
|
+
/**
|
|
50
|
+
* Asserts on the rows the first cycle of each subsequent {@link rewriteRun} writes to the named data
|
|
51
|
+
* table, failing the run when the recipe wrote none.
|
|
52
|
+
*/
|
|
53
|
+
dataTable<Row>(name: string, allRows: (rows: Row[]) => void | Promise<void>): void;
|
|
39
54
|
private configuration;
|
|
40
55
|
/** Starts recording specs, so that the calls below have something to act on. */
|
|
41
56
|
static trackSuiteConfiguration(): void;
|
|
@@ -51,6 +66,16 @@ export declare class RecipeSpec {
|
|
|
51
66
|
* "Inspecting type attribution".
|
|
52
67
|
*/
|
|
53
68
|
rewriteRun(...sourceSpecs: (SourceSpec<any> | Generator<SourceSpec<any>, void, unknown> | AsyncGenerator<SourceSpec<any>, void, unknown>)[]): Promise<void>;
|
|
69
|
+
private expectDataTables;
|
|
70
|
+
private runCycles;
|
|
71
|
+
/** Data tables are written by the first cycle only, as in Java. */
|
|
72
|
+
private laterRunContext;
|
|
73
|
+
private expectNoFurtherChanges;
|
|
74
|
+
/**
|
|
75
|
+
* Code that the next run reads is parsed from the printed output, not the LST this run produced, and a
|
|
76
|
+
* recipe that recognizes its own output only by the shape of that LST changes it again.
|
|
77
|
+
*/
|
|
78
|
+
private expectStableOnFreshParse;
|
|
54
79
|
private expectNoParseFailures;
|
|
55
80
|
private expectParsePrintIdempotence;
|
|
56
81
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-test.d.ts","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAc,WAAW,EAAC,MAAM,YAAY,CAAC;AACpD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAEjC,OAAO,EAA6B,UAAU,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"rewrite-test.d.ts","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ const style_1 = require("../style");
|
|
|
39
39
|
const javascript_1 = require("../javascript");
|
|
40
40
|
const type_report_1 = require("../javascript/type-report");
|
|
41
41
|
const java_1 = require("../java");
|
|
42
|
+
const data_table_1 = require("../data-table");
|
|
42
43
|
class RecipeSpec {
|
|
43
44
|
constructor() {
|
|
44
45
|
var _a;
|
|
@@ -62,6 +63,10 @@ class RecipeSpec {
|
|
|
62
63
|
this.dataTableAssertions = {};
|
|
63
64
|
(_a = RecipeSpec.live) === null || _a === void 0 ? void 0 : _a.push(this);
|
|
64
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Asserts on the rows the first cycle of each subsequent {@link rewriteRun} writes to the named data
|
|
68
|
+
* table, failing the run when the recipe wrote none.
|
|
69
|
+
*/
|
|
65
70
|
dataTable(name, allRows) {
|
|
66
71
|
this.dataTableAssertions[name] = allRows;
|
|
67
72
|
}
|
|
@@ -70,6 +75,8 @@ class RecipeSpec {
|
|
|
70
75
|
checkParsePrintIdempotence: this.checkParsePrintIdempotence,
|
|
71
76
|
allowEmptyDiff: this.allowEmptyDiff,
|
|
72
77
|
checkReportingMarkersOnly: this.checkReportingMarkersOnly,
|
|
78
|
+
cycles: this.cycles,
|
|
79
|
+
expectedCyclesThatMakeChanges: this.expectedCyclesThatMakeChanges,
|
|
73
80
|
recipe: this.recipe,
|
|
74
81
|
recipeExecutionContext: this.recipeExecutionContext,
|
|
75
82
|
dataTableAssertions: Object.assign({}, this.dataTableAssertions)
|
|
@@ -107,6 +114,7 @@ class RecipeSpec {
|
|
|
107
114
|
*/
|
|
108
115
|
async rewriteRun(...sourceSpecs) {
|
|
109
116
|
var _a, e_1, _b, _c;
|
|
117
|
+
var _d, _e;
|
|
110
118
|
// Flatten generators into a list of sourceSpecs
|
|
111
119
|
const flattenedSpecs = [];
|
|
112
120
|
for (const specOrGenerator of sourceSpecs) {
|
|
@@ -114,9 +122,9 @@ class RecipeSpec {
|
|
|
114
122
|
// Check if it's an async generator
|
|
115
123
|
if (typeof specOrGenerator[Symbol.asyncIterator] === 'function') {
|
|
116
124
|
try {
|
|
117
|
-
for (var
|
|
118
|
-
_c =
|
|
119
|
-
|
|
125
|
+
for (var _f = true, _g = (e_1 = void 0, __asyncValues(specOrGenerator)), _h; _h = await _g.next(), _a = _h.done, !_a; _f = true) {
|
|
126
|
+
_c = _h.value;
|
|
127
|
+
_f = false;
|
|
120
128
|
const spec = _c;
|
|
121
129
|
flattenedSpecs.push(spec);
|
|
122
130
|
}
|
|
@@ -124,7 +132,7 @@ class RecipeSpec {
|
|
|
124
132
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
125
133
|
finally {
|
|
126
134
|
try {
|
|
127
|
-
if (!
|
|
135
|
+
if (!_f && !_a && (_b = _g.return)) await _b.call(_g);
|
|
128
136
|
}
|
|
129
137
|
finally { if (e_1) throw e_1.error; }
|
|
130
138
|
}
|
|
@@ -179,13 +187,160 @@ class RecipeSpec {
|
|
|
179
187
|
}
|
|
180
188
|
}
|
|
181
189
|
}
|
|
182
|
-
|
|
190
|
+
this.recipeExecutionContext.messages[data_table_1.DATA_TABLE_STORE] = new data_table_1.InMemoryDataTableStore();
|
|
191
|
+
const expectedCycles = (_d = this.expectedCyclesThatMakeChanges) !== null && _d !== void 0 ? _d : 1;
|
|
192
|
+
const cycles = (_e = this.cycles) !== null && _e !== void 0 ? _e : Math.max(2, expectedCycles + 1);
|
|
193
|
+
const { changeset, unsettled } = await this.runCycles(allParsed.map(([_, sourceFile]) => sourceFile), cycles, expectedCycles);
|
|
183
194
|
this.checkReportingMarkersOnly && await this.expectNoAddedMarkers(flattenedSpecs, allParsed, changeset);
|
|
184
195
|
await this.expectResultsToMatchAfter(flattenedSpecs, changeset, allParsed);
|
|
185
196
|
await this.expectGeneratedFiles(flattenedSpecs, changeset);
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
197
|
+
if (unsettled) {
|
|
198
|
+
await this.expectNoFurtherChanges(unsettled.changes, `Expected recipe to complete in ${pluralCycles(expectedCycles)}, but cycle ${unsettled.cycle} changed`);
|
|
199
|
+
}
|
|
200
|
+
cycles > expectedCycles && await this.expectStableOnFreshParse(flattenedSpecs, allParsed, changeset);
|
|
201
|
+
await this.expectDataTables();
|
|
202
|
+
}
|
|
203
|
+
async expectDataTables() {
|
|
204
|
+
const store = this.recipeExecutionContext.messages[data_table_1.DATA_TABLE_STORE];
|
|
205
|
+
const dataTables = store.getDataTables();
|
|
206
|
+
for (const [name, assertion] of Object.entries(this.dataTableAssertions)) {
|
|
207
|
+
const dataTable = dataTables.find(dt => dt.descriptor.name === name);
|
|
208
|
+
if (!dataTable) {
|
|
209
|
+
throw new Error(`No data table named ${name}` + (dataTables.length === 0 ? "" :
|
|
210
|
+
`\nFound data tables: ${[...new Set(dataTables.map(dt => dt.descriptor.name))].join(", ")}`));
|
|
211
|
+
}
|
|
212
|
+
await assertion(store.getRows(name, dataTable.group));
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
async runCycles(sources, cycles, expectedCycles) {
|
|
216
|
+
const lineages = sources.map(s => ({ origin: s, latest: s }));
|
|
217
|
+
const changesetOf = () => lineages.map(({ origin, latest }) => new run_1.Result(origin, latest));
|
|
218
|
+
let changeset;
|
|
219
|
+
let cyclesThatMadeChanges = 0;
|
|
220
|
+
for (let cycle = 1; cycle <= cycles; cycle++) {
|
|
221
|
+
const live = lineages.filter(l => l.latest).map(l => l.latest);
|
|
222
|
+
const ctx = cycle === 1 ? this.recipeExecutionContext : this.laterRunContext();
|
|
223
|
+
const changes = (await (0, run_1.scheduleRun)(this.recipe, live, ctx)).changeset.filter(r => r.before !== r.after);
|
|
224
|
+
if (changes.length === 0) {
|
|
225
|
+
break;
|
|
226
|
+
}
|
|
227
|
+
if (changeset) {
|
|
228
|
+
return { changeset, unsettled: { cycle, changes } };
|
|
229
|
+
}
|
|
230
|
+
cyclesThatMadeChanges++;
|
|
231
|
+
for (const { before, after } of changes) {
|
|
232
|
+
const lineage = before && lineages.find(l => l.latest === before);
|
|
233
|
+
if (lineage) {
|
|
234
|
+
lineage.latest = after;
|
|
235
|
+
}
|
|
236
|
+
else {
|
|
237
|
+
lineages.push({ latest: after });
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
if (cycle >= expectedCycles) {
|
|
241
|
+
changeset = changesetOf();
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
if (cyclesThatMadeChanges < expectedCycles && expectedCycles > 1) {
|
|
245
|
+
throw new Error(`Expected recipe to complete in ${pluralCycles(expectedCycles)}, ` +
|
|
246
|
+
`but it settled after ${pluralCycles(cyclesThatMadeChanges)}. Lower expectedCyclesThatMakeChanges.`);
|
|
247
|
+
}
|
|
248
|
+
return { changeset: changeset !== null && changeset !== void 0 ? changeset : changesetOf() };
|
|
249
|
+
}
|
|
250
|
+
/** Data tables are written by the first cycle only, as in Java. */
|
|
251
|
+
laterRunContext() {
|
|
252
|
+
const messages = Object.assign({}, this.recipeExecutionContext.messages);
|
|
253
|
+
delete messages[data_table_1.DATA_TABLE_STORE];
|
|
254
|
+
return new execution_1.ExecutionContext(messages);
|
|
255
|
+
}
|
|
256
|
+
async expectNoFurtherChanges(changes, headline, sanitized = false) {
|
|
257
|
+
const print = (sourceFile) => sanitized ? printSanitized(sourceFile) : print_1.TreePrinters.print(sourceFile);
|
|
258
|
+
const found = [];
|
|
259
|
+
for (const { before, after } of changes) {
|
|
260
|
+
if (!before) {
|
|
261
|
+
found.push(` ${after.sourcePath}, which it generated`);
|
|
262
|
+
}
|
|
263
|
+
else if (!after) {
|
|
264
|
+
found.push(` ${before.sourcePath}, which it deleted`);
|
|
265
|
+
}
|
|
266
|
+
else {
|
|
267
|
+
const [expected, actual] = [await print(before), await print(after)];
|
|
268
|
+
if (expected !== actual) {
|
|
269
|
+
found.push(` ${after.sourcePath}\nExpected:\n${expected}\n\nActual:\n${actual}`);
|
|
270
|
+
}
|
|
271
|
+
else if (!sanitized && !this.allowEmptyDiff) {
|
|
272
|
+
found.push(` ${after.sourcePath}, whose LST it changed without changing the printed source`);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
if (found.length > 0) {
|
|
277
|
+
throw new Error([
|
|
278
|
+
`${headline} the sources again:`,
|
|
279
|
+
...found,
|
|
280
|
+
"A recipe should recognize code it has already changed and leave it alone, so that running it " +
|
|
281
|
+
"again changes nothing. A recipe that is meant to need more cycles declares how many with " +
|
|
282
|
+
"expectedCyclesThatMakeChanges."
|
|
283
|
+
].join("\n"));
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
/**
|
|
287
|
+
* Code that the next run reads is parsed from the printed output, not the LST this run produced, and a
|
|
288
|
+
* recipe that recognizes its own output only by the shape of that LST changes it again.
|
|
289
|
+
*/
|
|
290
|
+
async expectStableOnFreshParse(specs, parsed, changeset) {
|
|
291
|
+
var _a, e_2, _b, _c;
|
|
292
|
+
if (!changeset.some(r => r.before !== r.after)) {
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
const finals = changeset.filter(r => r.after).map(({ before, after }) => {
|
|
296
|
+
var _a;
|
|
297
|
+
return [
|
|
298
|
+
before ? (_a = parsed.find(([_, sourceFile]) => sourceFile === before)) === null || _a === void 0 ? void 0 : _a[0] :
|
|
299
|
+
specs.find(s => s.path === after.sourcePath),
|
|
300
|
+
after
|
|
301
|
+
];
|
|
302
|
+
});
|
|
303
|
+
const reparsedByFinal = new Map();
|
|
304
|
+
const kinds = new Set(finals.filter(([spec]) => spec).map(([spec]) => spec.kind));
|
|
305
|
+
for (const kind of kinds) {
|
|
306
|
+
const group = finals.filter(([spec]) => (spec === null || spec === void 0 ? void 0 : spec.kind) === kind);
|
|
307
|
+
const inputs = [];
|
|
308
|
+
for (const [_, sourceFile] of group) {
|
|
309
|
+
inputs.push({ text: await printSanitized(sourceFile), sourcePath: sourceFile.sourcePath });
|
|
310
|
+
}
|
|
311
|
+
let i = 0;
|
|
312
|
+
try {
|
|
313
|
+
try {
|
|
314
|
+
for (var _d = true, _e = (e_2 = void 0, __asyncValues(group[0][0].parser(this.executionContext).parse(...inputs))), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
|
|
315
|
+
_c = _f.value;
|
|
316
|
+
_d = false;
|
|
317
|
+
const reparsed = _c;
|
|
318
|
+
if (!(0, parse_error_1.isParseError)(reparsed) && await printSanitized(reparsed) === inputs[i].text) {
|
|
319
|
+
// What the source file carries, like its styles, comes from outside its text
|
|
320
|
+
reparsedByFinal.set(group[i][1], Object.assign(Object.assign({}, reparsed), { markers: group[i][1].markers }));
|
|
321
|
+
}
|
|
322
|
+
i++;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
326
|
+
finally {
|
|
327
|
+
try {
|
|
328
|
+
if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
|
|
329
|
+
}
|
|
330
|
+
finally { if (e_2) throw e_2.error; }
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
catch (_g) {
|
|
334
|
+
// files that do not parse again keep the LST the recipe produced
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
if (reparsedByFinal.size === 0) {
|
|
338
|
+
return;
|
|
339
|
+
}
|
|
340
|
+
const sources = finals.map(([_, sourceFile]) => { var _a; return (_a = reparsedByFinal.get(sourceFile)) !== null && _a !== void 0 ? _a : sourceFile; });
|
|
341
|
+
const changes = (await (0, run_1.scheduleRun)(this.recipe, sources, this.laterRunContext())).changeset
|
|
342
|
+
.filter(r => r.before !== r.after);
|
|
343
|
+
await this.expectNoFurtherChanges(changes, "Running the recipe on a fresh parse of its output changed", true);
|
|
189
344
|
}
|
|
190
345
|
async expectNoParseFailures(parsed) {
|
|
191
346
|
for (const [_, sourceFile] of parsed) {
|
|
@@ -263,9 +418,7 @@ class RecipeSpec {
|
|
|
263
418
|
*/
|
|
264
419
|
async freshParsePlacements(spec, after) {
|
|
265
420
|
try {
|
|
266
|
-
|
|
267
|
-
const out = new print_1.PrintOutputCapture(print_1.MarkerPrinter.SANITIZED);
|
|
268
|
-
const text = await print_1.TreePrinters.printer(after).print(after, out);
|
|
421
|
+
const text = await printSanitized(after);
|
|
269
422
|
const reparsed = await spec.parser(this.executionContext).parseOne({ text, sourcePath: after.sourcePath });
|
|
270
423
|
return (0, parse_error_1.isParseError)(reparsed) ? new Set() : new Set(markerPlacements(reparsed).keys());
|
|
271
424
|
}
|
|
@@ -347,7 +500,7 @@ class RecipeSpec {
|
|
|
347
500
|
* Parse the whole group together so the sources can reference once another.
|
|
348
501
|
*/
|
|
349
502
|
async parse(specs) {
|
|
350
|
-
var _a,
|
|
503
|
+
var _a, e_3, _b, _c;
|
|
351
504
|
// The path is a function of position, so a test parses under the same path on every run,
|
|
352
505
|
// which is what lets a parser pooled across specs reuse its program.
|
|
353
506
|
let unnamed = 0;
|
|
@@ -368,12 +521,12 @@ class RecipeSpec {
|
|
|
368
521
|
parsed.push(sourceFile);
|
|
369
522
|
}
|
|
370
523
|
}
|
|
371
|
-
catch (
|
|
524
|
+
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
372
525
|
finally {
|
|
373
526
|
try {
|
|
374
527
|
if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
|
|
375
528
|
}
|
|
376
|
-
finally { if (
|
|
529
|
+
finally { if (e_3) throw e_3.error; }
|
|
377
530
|
}
|
|
378
531
|
return before.map(([spec, _], i) => [spec, parsed[i]]);
|
|
379
532
|
}
|
|
@@ -394,6 +547,13 @@ class ValidateWhitespaceVisitor extends javascript_1.JavaScriptVisitor {
|
|
|
394
547
|
return ret;
|
|
395
548
|
}
|
|
396
549
|
}
|
|
550
|
+
/** Without the comments that search results and markup print as. */
|
|
551
|
+
function printSanitized(sourceFile) {
|
|
552
|
+
return print_1.TreePrinters.printer(sourceFile).print(sourceFile, new print_1.PrintOutputCapture(print_1.MarkerPrinter.SANITIZED));
|
|
553
|
+
}
|
|
554
|
+
function pluralCycles(count) {
|
|
555
|
+
return `${count} cycle${count === 1 ? "" : "s"}`;
|
|
556
|
+
}
|
|
397
557
|
/** Markers that report on an LST rather than describe it, which a recipe is free to leave. */
|
|
398
558
|
const reportingMarkerKinds = new Set([
|
|
399
559
|
markers_1.MarkersKind.SearchResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1346,6 +1346,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
|
|
|
1346
1346
|
const self = this;
|
|
1347
1347
|
const matchesModule = (name: string | undefined) =>
|
|
1348
1348
|
name !== undefined && (name === expectedDeclaringType || name === targetModule);
|
|
1349
|
+
const alreadyBound = moduleScopeBindings(compilationUnit).some(b => b.name === targetName);
|
|
1349
1350
|
|
|
1350
1351
|
// If no existing imports from this module, look for unresolved references
|
|
1351
1352
|
// If there ARE existing imports, look for references with the expected declaring type
|
|
@@ -1363,7 +1364,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
|
|
|
1363
1364
|
found = true;
|
|
1364
1365
|
}
|
|
1365
1366
|
}
|
|
1366
|
-
else if (type && Type.isClass(type)) {
|
|
1367
|
+
else if (!alreadyBound && type && Type.isClass(type)) {
|
|
1367
1368
|
if (self.classTypeMatchesModule(type as Type.Class, expectedDeclaringType) ||
|
|
1368
1369
|
self.classTypeMatchesModule(type as Type.Class, targetModule)) {
|
|
1369
1370
|
found = true;
|
|
@@ -1415,6 +1416,11 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
|
|
|
1415
1416
|
found = true;
|
|
1416
1417
|
}
|
|
1417
1418
|
}
|
|
1419
|
+
// 4. References typed as the module's namespace object (e.g. `z` from zod)
|
|
1420
|
+
else if (!alreadyBound && type && Type.isClass(type) &&
|
|
1421
|
+
sameModule((type as Type.Class).fullyQualifiedName, targetModule)) {
|
|
1422
|
+
found = true;
|
|
1423
|
+
}
|
|
1418
1424
|
}
|
|
1419
1425
|
}
|
|
1420
1426
|
return super.visitIdentifier(identifier, p);
|
package/src/javascript/amd.ts
CHANGED
|
@@ -29,7 +29,7 @@ import {
|
|
|
29
29
|
} from "../java";
|
|
30
30
|
import {JS} from "./tree";
|
|
31
31
|
import {moduleNameOf} from "./add-import";
|
|
32
|
-
import {cursorOf, deconflict, namesDeclaredWithin, scopeOf} from "./scope";
|
|
32
|
+
import {cursorOf, deconflict, namesDeclaredWithin, namesReferencedWithin, scopeOf} from "./scope";
|
|
33
33
|
import {Cursor} from "../tree";
|
|
34
34
|
import {JavaScriptVisitor} from "./visitor";
|
|
35
35
|
import {ExecutionContext} from "../execution";
|
|
@@ -513,8 +513,11 @@ export function withoutDependencyAt(
|
|
|
513
513
|
block: AmdBlock,
|
|
514
514
|
index: number
|
|
515
515
|
): J.MethodInvocation {
|
|
516
|
-
const dependencies = withElements(block.dependencies, removeEntry(elementsOf(block), index, dependencySlot));
|
|
517
516
|
const parameters = parametersOf(block);
|
|
517
|
+
if (index < 0 || index >= Math.max(elementsOf(block).length, parameters.length)) {
|
|
518
|
+
return call;
|
|
519
|
+
}
|
|
520
|
+
const dependencies = withElements(block.dependencies, removeEntry(elementsOf(block), index, dependencySlot));
|
|
518
521
|
const factory = index >= parameters.length ?
|
|
519
522
|
block.factory :
|
|
520
523
|
withParameters(block.factory, removeEntry(parameters, index, parameterSlot));
|
|
@@ -644,6 +647,11 @@ function queuedFor(visitor: JavaScriptVisitor<any>, blockId: UUID): AddAmdDepend
|
|
|
644
647
|
return visitor.afterVisit.filter((v): v is AddAmdDependency<any> => v instanceof AddAmdDependency && v.blockId === blockId);
|
|
645
648
|
}
|
|
646
649
|
|
|
650
|
+
/** Whether `scope` is where the factory's parameters are declared, which for an arrow is the arrow wrapping its lambda. */
|
|
651
|
+
function declaresParameters(scope: J | undefined, factory: J.MethodDeclaration | J.Lambda): boolean {
|
|
652
|
+
return scope === factory || (scope?.kind === JS.Kind.ArrowFunction && (scope as JS.ArrowFunction).lambda === factory);
|
|
653
|
+
}
|
|
654
|
+
|
|
647
655
|
/**
|
|
648
656
|
* A local binding for `module` on the AMD lane, creating one where the block does not already
|
|
649
657
|
* have it, or `undefined` where no safe binding exists.
|
|
@@ -662,18 +670,19 @@ export function bindAmd(
|
|
|
662
670
|
const modules = dependencyNames(amd.block);
|
|
663
671
|
const bindings = parameterNames(amd.block);
|
|
664
672
|
|
|
665
|
-
const declared = module === "" ?
|
|
666
|
-
if (declared
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
const
|
|
676
|
-
if (
|
|
673
|
+
const declared = module === "" ? [] : modules.flatMap((m, i) => m === module ? [i] : []);
|
|
674
|
+
if (declared.length > 0 && bindings[declared[0]] === undefined) {
|
|
675
|
+
// A parameter that is not a plain name gives the module no binding to hand back.
|
|
676
|
+
return undefined;
|
|
677
|
+
}
|
|
678
|
+
// Only code the factory encloses can shadow its parameter, so a cursor elsewhere in the
|
|
679
|
+
// block — on the `define` call, or on its dependency array — has nothing to measure.
|
|
680
|
+
const cursor = cursorOf(visitor);
|
|
681
|
+
const withinFactory = cursor?.firstEnclosing((v): v is J => v === amd.block.factory);
|
|
682
|
+
for (const index of declared) {
|
|
683
|
+
const bound = bindings[index];
|
|
684
|
+
if (bound !== undefined && (withinFactory === undefined ||
|
|
685
|
+
declaresParameters(scopeOf(cursor!).declaringScope(bound), amd.block.factory))) {
|
|
677
686
|
return bound;
|
|
678
687
|
}
|
|
679
688
|
}
|
|
@@ -696,10 +705,15 @@ export function bindAmd(
|
|
|
696
705
|
return undefined;
|
|
697
706
|
}
|
|
698
707
|
// A parameter is in scope across the whole factory, and the queue hands this name to later
|
|
699
|
-
// requests at cursors inside it, so every name the factory declares is one it has to clear
|
|
700
|
-
|
|
708
|
+
// requests at cursors inside it, so every name the factory declares is one it has to clear,
|
|
709
|
+
// as is every name it reads from further out, such as a global like `Element`, which it would capture.
|
|
710
|
+
// A pinned alias is exempt from the latter: its caller names a global on purpose to take it over.
|
|
711
|
+
const declaredWithin = namesDeclaredWithin(amd.block.factory);
|
|
712
|
+
const referencedWithin = pinned ? new Set<string>() : namesReferencedWithin(amd.block.factory);
|
|
713
|
+
const isTaken = (candidate: string) => declaredWithin.has(candidate) || referencedWithin.has(candidate) ||
|
|
714
|
+
bindings.includes(candidate) || queued.some(v => v.binding === candidate);
|
|
701
715
|
const requested = preferredName ?? derivedBindingName(module)!;
|
|
702
|
-
const binding = deconflict(requested,
|
|
716
|
+
const binding = deconflict(requested, isTaken);
|
|
703
717
|
if (pinned && binding !== requested) {
|
|
704
718
|
// An alias is bound verbatim or not at all, since the caller may already have emitted
|
|
705
719
|
// code naming it, and a deconflicted spelling would leave that unbound.
|