@openrewrite/rewrite 8.70.0-20251222-101414 → 8.70.0-20251222-213047

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 (149) hide show
  1. package/dist/index.js +8 -8
  2. package/dist/index.js.map +1 -1
  3. package/dist/java/formatting-utils.d.ts +1 -1
  4. package/dist/java/formatting-utils.js +4 -4
  5. package/dist/java/formatting-utils.js.map +1 -1
  6. package/dist/java/markers.js +8 -8
  7. package/dist/java/markers.js.map +1 -1
  8. package/dist/java/type-visitor.d.ts +0 -3
  9. package/dist/java/type-visitor.d.ts.map +1 -1
  10. package/dist/java/type-visitor.js +67 -68
  11. package/dist/java/type-visitor.js.map +1 -1
  12. package/dist/java/visitor.d.ts +3 -3
  13. package/dist/java/visitor.d.ts.map +1 -1
  14. package/dist/java/visitor.js +5 -5
  15. package/dist/java/visitor.js.map +1 -1
  16. package/dist/javascript/assertions.js +4 -3
  17. package/dist/javascript/assertions.js.map +1 -1
  18. package/dist/javascript/cleanup/use-object-property-shorthand.js +3 -3
  19. package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
  20. package/dist/javascript/format/format.d.ts +28 -7
  21. package/dist/javascript/format/format.d.ts.map +1 -1
  22. package/dist/javascript/format/format.js +149 -158
  23. package/dist/javascript/format/format.js.map +1 -1
  24. package/dist/javascript/format/minimum-viable-spacing-visitor.js +23 -23
  25. package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
  26. package/dist/javascript/format/prettier-format.d.ts.map +1 -1
  27. package/dist/javascript/format/prettier-format.js +8 -11
  28. package/dist/javascript/format/prettier-format.js.map +1 -1
  29. package/dist/javascript/format/tabs-and-indents-visitor.js +7 -7
  30. package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
  31. package/dist/javascript/format/whitespace-reconciler.d.ts.map +1 -1
  32. package/dist/javascript/format/whitespace-reconciler.js +12 -11
  33. package/dist/javascript/format/whitespace-reconciler.js.map +1 -1
  34. package/dist/javascript/markers.d.ts.map +1 -1
  35. package/dist/javascript/markers.js +6 -5
  36. package/dist/javascript/markers.js.map +1 -1
  37. package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +2 -2
  38. package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
  39. package/dist/javascript/migrate/es6/modernize-octal-literals.js +2 -2
  40. package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
  41. package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +2 -2
  42. package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
  43. package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +2 -2
  44. package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
  45. package/dist/javascript/node-resolution-result.js +3 -9
  46. package/dist/javascript/node-resolution-result.js.map +1 -1
  47. package/dist/javascript/parser.d.ts.map +1 -1
  48. package/dist/javascript/parser.js +35 -35
  49. package/dist/javascript/parser.js.map +1 -1
  50. package/dist/javascript/project-parser.d.ts.map +1 -1
  51. package/dist/javascript/project-parser.js +6 -5
  52. package/dist/javascript/project-parser.js.map +1 -1
  53. package/dist/javascript/recipes/auto-format.d.ts +7 -23
  54. package/dist/javascript/recipes/auto-format.d.ts.map +1 -1
  55. package/dist/javascript/recipes/auto-format.js +8 -54
  56. package/dist/javascript/recipes/auto-format.js.map +1 -1
  57. package/dist/javascript/recipes/change-import.js +8 -8
  58. package/dist/javascript/recipes/change-import.js.map +1 -1
  59. package/dist/javascript/recipes/order-imports.js +4 -4
  60. package/dist/javascript/recipes/order-imports.js.map +1 -1
  61. package/dist/javascript/templating/engine.js +2 -2
  62. package/dist/javascript/templating/engine.js.map +1 -1
  63. package/dist/javascript/templating/index.d.ts +1 -0
  64. package/dist/javascript/templating/index.d.ts.map +1 -1
  65. package/dist/javascript/templating/index.js +4 -1
  66. package/dist/javascript/templating/index.js.map +1 -1
  67. package/dist/javascript/templating/placeholder-replacement.js +16 -16
  68. package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
  69. package/dist/javascript/type-mapping.d.ts.map +1 -1
  70. package/dist/javascript/type-mapping.js +49 -58
  71. package/dist/javascript/type-mapping.js.map +1 -1
  72. package/dist/javascript/visitor.d.ts +3 -3
  73. package/dist/javascript/visitor.d.ts.map +1 -1
  74. package/dist/javascript/visitor.js +3 -3
  75. package/dist/javascript/visitor.js.map +1 -1
  76. package/dist/json/rpc.js +48 -49
  77. package/dist/json/rpc.js.map +1 -1
  78. package/dist/json/visitor.d.ts +3 -3
  79. package/dist/json/visitor.d.ts.map +1 -1
  80. package/dist/json/visitor.js +3 -3
  81. package/dist/json/visitor.js.map +1 -1
  82. package/dist/parse-error.js +11 -11
  83. package/dist/parse-error.js.map +1 -1
  84. package/dist/reference.d.ts.map +1 -1
  85. package/dist/reference.js +0 -3
  86. package/dist/reference.js.map +1 -1
  87. package/dist/rpc/index.js +42 -42
  88. package/dist/rpc/index.js.map +1 -1
  89. package/dist/rpc/queue.d.ts.map +1 -1
  90. package/dist/rpc/queue.js +6 -8
  91. package/dist/rpc/queue.js.map +1 -1
  92. package/dist/rpc/request/install-recipes.js +1 -1
  93. package/dist/rpc/request/install-recipes.js.map +1 -1
  94. package/dist/rpc/request/parse-project.d.ts.map +1 -1
  95. package/dist/rpc/request/parse-project.js +12 -32
  96. package/dist/rpc/request/parse-project.js.map +1 -1
  97. package/dist/rpc/request/parse.d.ts.map +1 -1
  98. package/dist/rpc/request/parse.js +1 -4
  99. package/dist/rpc/request/parse.js.map +1 -1
  100. package/dist/text/rpc.js +18 -18
  101. package/dist/text/rpc.js.map +1 -1
  102. package/dist/version.txt +1 -1
  103. package/dist/visitor.d.ts +6 -4
  104. package/dist/visitor.d.ts.map +1 -1
  105. package/dist/visitor.js +19 -17
  106. package/dist/visitor.js.map +1 -1
  107. package/dist/yaml/rpc.js +65 -65
  108. package/dist/yaml/rpc.js.map +1 -1
  109. package/package.json +2 -2
  110. package/src/index.ts +8 -8
  111. package/src/java/formatting-utils.ts +2 -2
  112. package/src/java/markers.ts +8 -8
  113. package/src/java/type-visitor.ts +59 -68
  114. package/src/java/visitor.ts +8 -8
  115. package/src/javascript/assertions.ts +3 -3
  116. package/src/javascript/cleanup/use-object-property-shorthand.ts +1 -1
  117. package/src/javascript/format/format.ts +109 -107
  118. package/src/javascript/format/minimum-viable-spacing-visitor.ts +1 -1
  119. package/src/javascript/format/prettier-format.ts +9 -12
  120. package/src/javascript/format/tabs-and-indents-visitor.ts +1 -1
  121. package/src/javascript/format/whitespace-reconciler.ts +12 -11
  122. package/src/javascript/markers.ts +6 -6
  123. package/src/javascript/migrate/es6/modernize-octal-escape-sequences.ts +1 -1
  124. package/src/javascript/migrate/es6/modernize-octal-literals.ts +1 -1
  125. package/src/javascript/migrate/es6/remove-duplicate-object-keys.ts +1 -1
  126. package/src/javascript/migrate/typescript/export-assignment-to-export-default.ts +1 -1
  127. package/src/javascript/node-resolution-result.ts +8 -14
  128. package/src/javascript/parser.ts +5 -4
  129. package/src/javascript/project-parser.ts +4 -4
  130. package/src/javascript/recipes/auto-format.ts +9 -71
  131. package/src/javascript/recipes/change-import.ts +4 -4
  132. package/src/javascript/recipes/order-imports.ts +1 -1
  133. package/src/javascript/templating/engine.ts +1 -1
  134. package/src/javascript/templating/index.ts +5 -0
  135. package/src/javascript/templating/placeholder-replacement.ts +2 -2
  136. package/src/javascript/type-mapping.ts +28 -34
  137. package/src/javascript/visitor.ts +6 -6
  138. package/src/json/rpc.ts +51 -52
  139. package/src/json/visitor.ts +6 -6
  140. package/src/parse-error.ts +11 -11
  141. package/src/reference.ts +0 -5
  142. package/src/rpc/index.ts +43 -43
  143. package/src/rpc/queue.ts +6 -8
  144. package/src/rpc/request/install-recipes.ts +1 -1
  145. package/src/rpc/request/parse-project.ts +20 -32
  146. package/src/rpc/request/parse.ts +1 -4
  147. package/src/text/rpc.ts +18 -18
  148. package/src/visitor.ts +29 -30
  149. package/src/yaml/rpc.ts +80 -81
package/dist/yaml/rpc.js CHANGED
@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
27
27
  const visitor_1 = require("./visitor");
28
28
  const rpc_1 = require("../rpc");
29
29
  const tree_1 = require("./tree");
30
- const immer_1 = require("immer");
30
+ const util_1 = require("../util");
31
31
  class YamlSender extends visitor_1.YamlVisitor {
32
32
  preVisit(y, q) {
33
33
  return __awaiter(this, void 0, void 0, function* () {
@@ -133,114 +133,114 @@ class YamlSender extends visitor_1.YamlVisitor {
133
133
  class YamlReceiver extends visitor_1.YamlVisitor {
134
134
  preVisit(y, q) {
135
135
  return __awaiter(this, void 0, void 0, function* () {
136
- const draft = (0, immer_1.createDraft)(y);
137
- draft.id = yield q.receive(y.id);
138
- draft.prefix = yield q.receive(y.prefix);
139
- draft.markers = yield q.receive(y.markers);
140
- return (0, immer_1.finishDraft)(draft);
136
+ return (0, util_1.updateIfChanged)(y, {
137
+ id: yield q.receive(y.id),
138
+ prefix: yield q.receive(y.prefix),
139
+ markers: yield q.receive(y.markers),
140
+ });
141
141
  });
142
142
  }
143
143
  visitDocuments(documents, q) {
144
144
  return __awaiter(this, void 0, void 0, function* () {
145
- const draft = (0, immer_1.createDraft)(documents);
146
- draft.sourcePath = yield q.receive(documents.sourcePath);
147
- draft.charsetName = yield q.receive(documents.charsetName);
148
- draft.charsetBomMarked = yield q.receive(documents.charsetBomMarked);
149
- draft.checksum = yield q.receive(documents.checksum);
150
- draft.fileAttributes = yield q.receive(documents.fileAttributes);
151
- draft.documents = yield q.receiveListDefined(documents.documents, (doc) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(doc, q); }));
152
- draft.suffix = yield q.receive(documents.suffix);
153
- return (0, immer_1.finishDraft)(draft);
145
+ return (0, util_1.updateIfChanged)(documents, {
146
+ sourcePath: yield q.receive(documents.sourcePath),
147
+ charsetName: yield q.receive(documents.charsetName),
148
+ charsetBomMarked: yield q.receive(documents.charsetBomMarked),
149
+ checksum: yield q.receive(documents.checksum),
150
+ fileAttributes: yield q.receive(documents.fileAttributes),
151
+ documents: yield q.receiveListDefined(documents.documents, (doc) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(doc, q); })),
152
+ suffix: yield q.receive(documents.suffix),
153
+ });
154
154
  });
155
155
  }
156
156
  visitDocument(document, q) {
157
157
  return __awaiter(this, void 0, void 0, function* () {
158
- const draft = (0, immer_1.createDraft)(document);
159
- draft.explicit = yield q.receive(document.explicit);
160
- draft.block = yield q.receive(document.block, (b) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(b, q); }));
161
- draft.end = yield q.receive(document.end, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); }));
162
- return (0, immer_1.finishDraft)(draft);
158
+ return (0, util_1.updateIfChanged)(document, {
159
+ explicit: yield q.receive(document.explicit),
160
+ block: yield q.receive(document.block, (b) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(b, q); })),
161
+ end: yield q.receive(document.end, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); })),
162
+ });
163
163
  });
164
164
  }
165
165
  visitDocumentEnd(end, q) {
166
166
  return __awaiter(this, void 0, void 0, function* () {
167
- const draft = (0, immer_1.createDraft)(end);
168
- draft.explicit = yield q.receive(end.explicit);
169
- return (0, immer_1.finishDraft)(draft);
167
+ return (0, util_1.updateIfChanged)(end, {
168
+ explicit: yield q.receive(end.explicit),
169
+ });
170
170
  });
171
171
  }
172
172
  visitMapping(mapping, q) {
173
173
  return __awaiter(this, void 0, void 0, function* () {
174
- const draft = (0, immer_1.createDraft)(mapping);
175
- draft.openingBracePrefix = yield q.receive(mapping.openingBracePrefix);
176
- draft.entries = yield q.receiveListDefined(mapping.entries, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); }));
177
- draft.closingBracePrefix = yield q.receive(mapping.closingBracePrefix);
178
- draft.anchor = yield q.receive(mapping.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; }));
179
- draft.tag = yield q.receive(mapping.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; }));
180
- return (0, immer_1.finishDraft)(draft);
174
+ return (0, util_1.updateIfChanged)(mapping, {
175
+ openingBracePrefix: yield q.receive(mapping.openingBracePrefix),
176
+ entries: yield q.receiveListDefined(mapping.entries, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); })),
177
+ closingBracePrefix: yield q.receive(mapping.closingBracePrefix),
178
+ anchor: yield q.receive(mapping.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; })),
179
+ tag: yield q.receive(mapping.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; })),
180
+ });
181
181
  });
182
182
  }
183
183
  visitMappingEntry(entry, q) {
184
184
  return __awaiter(this, void 0, void 0, function* () {
185
- const draft = (0, immer_1.createDraft)(entry);
186
- draft.key = yield q.receive(entry.key, (k) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(k, q); }));
187
- draft.beforeMappingValueIndicator = yield q.receive(entry.beforeMappingValueIndicator);
188
- draft.value = yield q.receive(entry.value, (v) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(v, q); }));
189
- return (0, immer_1.finishDraft)(draft);
185
+ return (0, util_1.updateIfChanged)(entry, {
186
+ key: yield q.receive(entry.key, (k) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(k, q); })),
187
+ beforeMappingValueIndicator: yield q.receive(entry.beforeMappingValueIndicator),
188
+ value: yield q.receive(entry.value, (v) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(v, q); })),
189
+ });
190
190
  });
191
191
  }
192
192
  visitScalar(scalar, q) {
193
193
  return __awaiter(this, void 0, void 0, function* () {
194
- const draft = (0, immer_1.createDraft)(scalar);
195
- draft.style = yield q.receive(scalar.style);
196
- draft.anchor = yield q.receive(scalar.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; }));
197
- draft.tag = yield q.receive(scalar.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; }));
198
- draft.value = yield q.receive(scalar.value);
199
- return (0, immer_1.finishDraft)(draft);
194
+ return (0, util_1.updateIfChanged)(scalar, {
195
+ style: yield q.receive(scalar.style),
196
+ anchor: yield q.receive(scalar.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; })),
197
+ tag: yield q.receive(scalar.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; })),
198
+ value: yield q.receive(scalar.value),
199
+ });
200
200
  });
201
201
  }
202
202
  visitSequence(sequence, q) {
203
203
  return __awaiter(this, void 0, void 0, function* () {
204
- const draft = (0, immer_1.createDraft)(sequence);
205
- draft.openingBracketPrefix = yield q.receive(sequence.openingBracketPrefix);
206
- draft.entries = yield q.receiveListDefined(sequence.entries, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); }));
207
- draft.closingBracketPrefix = yield q.receive(sequence.closingBracketPrefix);
208
- draft.anchor = yield q.receive(sequence.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; }));
209
- draft.tag = yield q.receive(sequence.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; }));
210
- return (0, immer_1.finishDraft)(draft);
204
+ return (0, util_1.updateIfChanged)(sequence, {
205
+ openingBracketPrefix: yield q.receive(sequence.openingBracketPrefix),
206
+ entries: yield q.receiveListDefined(sequence.entries, (e) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(e, q); })),
207
+ closingBracketPrefix: yield q.receive(sequence.closingBracketPrefix),
208
+ anchor: yield q.receive(sequence.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return a ? yield this.visit(a, q) : undefined; })),
209
+ tag: yield q.receive(sequence.tag, (t) => __awaiter(this, void 0, void 0, function* () { return t ? yield this.visit(t, q) : undefined; })),
210
+ });
211
211
  });
212
212
  }
213
213
  visitSequenceEntry(entry, q) {
214
214
  return __awaiter(this, void 0, void 0, function* () {
215
- const draft = (0, immer_1.createDraft)(entry);
216
- draft.block = yield q.receive(entry.block, (b) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(b, q); }));
217
- draft.dash = yield q.receive(entry.dash);
218
- draft.trailingCommaPrefix = yield q.receive(entry.trailingCommaPrefix);
219
- return (0, immer_1.finishDraft)(draft);
215
+ return (0, util_1.updateIfChanged)(entry, {
216
+ block: yield q.receive(entry.block, (b) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(b, q); })),
217
+ dash: yield q.receive(entry.dash),
218
+ trailingCommaPrefix: yield q.receive(entry.trailingCommaPrefix),
219
+ });
220
220
  });
221
221
  }
222
222
  visitAnchor(anchor, q) {
223
223
  return __awaiter(this, void 0, void 0, function* () {
224
- const draft = (0, immer_1.createDraft)(anchor);
225
- draft.postfix = yield q.receive(anchor.postfix);
226
- draft.key = yield q.receive(anchor.key);
227
- return (0, immer_1.finishDraft)(draft);
224
+ return (0, util_1.updateIfChanged)(anchor, {
225
+ postfix: yield q.receive(anchor.postfix),
226
+ key: yield q.receive(anchor.key),
227
+ });
228
228
  });
229
229
  }
230
230
  visitAlias(alias, q) {
231
231
  return __awaiter(this, void 0, void 0, function* () {
232
- const draft = (0, immer_1.createDraft)(alias);
233
- draft.anchor = yield q.receive(alias.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(a, q); }));
234
- return (0, immer_1.finishDraft)(draft);
232
+ return (0, util_1.updateIfChanged)(alias, {
233
+ anchor: yield q.receive(alias.anchor, (a) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(a, q); })),
234
+ });
235
235
  });
236
236
  }
237
237
  visitTag(tag, q) {
238
238
  return __awaiter(this, void 0, void 0, function* () {
239
- const draft = (0, immer_1.createDraft)(tag);
240
- draft.name = yield q.receive(tag.name);
241
- draft.suffix = yield q.receive(tag.suffix);
242
- draft.tagKind = yield q.receive(tag.tagKind);
243
- return (0, immer_1.finishDraft)(draft);
239
+ return (0, util_1.updateIfChanged)(tag, {
240
+ name: yield q.receive(tag.name),
241
+ suffix: yield q.receive(tag.suffix),
242
+ tagKind: yield q.receive(tag.tagKind),
243
+ });
244
244
  });
245
245
  }
246
246
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/yaml/rpc.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,uCAAsC;AACtC,gCAAgE;AAChE,iCAA4B;AAE5B,iCAA+C;AAE/C,MAAM,UAAW,SAAQ,qBAAyB;IAE9B,QAAQ,CAAC,CAAO,EAAE,CAAe;;YAC7C,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,CAAC,CAAC;QACb,CAAC;KAAA;IAEe,cAAc,CAAC,SAAyB,EAAE,CAAe;;YACrE,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACjD,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC/C,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;YACrD,MAAM,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAC7D,CAAM,GAAG,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC3C,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC7C,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEe,aAAa,CAAC,QAAuB,EAAE,CAAe;;YAClE,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC9E,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC5E,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEe,gBAAgB,CAAC,GAAqB,EAAE,CAAe;;YACnE,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAEe,YAAY,CAAC,OAAqB,EAAE,CAAe;;YAC/D,MAAM,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EACrD,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC9F,MAAM,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC3F,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEe,iBAAiB,CAAC,KAAwB,EAAE,CAAe;;YACvE,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YACzE,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC;YAC9D,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC3E,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IAEe,WAAW,CAAC,MAAmB,EAAE,CAAe;;YAC5D,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC7F,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC1F,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEe,aAAa,CAAC,QAAuB,EAAE,CAAe;;YAClE,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EACtD,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC/F,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YAC5F,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEe,kBAAkB,CAAC,KAAyB,EAAE,CAAe;;YACzE,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC3E,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;YACtD,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IAEe,WAAW,CAAC,MAAmB,EAAE,CAAe;;YAC5D,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEe,UAAU,CAAC,KAAiB,EAAE,CAAe;;YACzD,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAC5E,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IAEe,QAAQ,CAAC,GAAa,EAAE,CAAe;;YACnD,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;CACJ;AAED,MAAM,YAAa,SAAQ,qBAA4B;IAEnC,QAAQ,CAAC,CAAO,EAAE,CAAkB;;YAChD,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAC,CAAC;YAC7B,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACzC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3C,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,cAAc,CAAC,SAAyB,EAAE,CAAkB;;YACxE,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;YACrC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACzD,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC3D,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YACrE,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACrD,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACjE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAC5D,CAAM,GAAG,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAkB,CAAA,GAAA,CAAC,CAAC;YAC5D,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACjD,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,aAAa,CAAC,QAAuB,EAAE,CAAkB;;YACrE,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpD,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EACxC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAe,CAAA,GAAA,CAAC,CAAC;YACrD,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EACpC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAqB,CAAA,GAAA,CAAC,CAAC;YAC3D,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,gBAAgB,CAAC,GAAqB,EAAE,CAAkB;;YACtE,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC/C,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,YAAY,CAAC,OAAqB,EAAE,CAAkB;;YAClE,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;YACnC,KAAK,CAAC,kBAAkB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACvE,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,EACtD,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAsB,CAAA,GAAA,CAAC,CAAC;YAC5D,KAAK,CAAC,kBAAkB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACvE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EACzC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACtE,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EACnC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAa,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACnE,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,iBAAiB,CAAC,KAAwB,EAAE,CAAkB;;YAC1E,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;YACjC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EACjC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAA,GAAA,CAAC,CAAC;YACvD,KAAK,CAAC,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACvF,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EACrC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAe,CAAA,GAAA,CAAC,CAAC;YACrD,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,WAAW,CAAC,MAAmB,EAAE,CAAkB;;YAC/D,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;YAClC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5C,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EACxC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACtE,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAClC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAa,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACnE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5C,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,aAAa,CAAC,QAAuB,EAAE,CAAkB;;YACrE,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAC5E,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EACvD,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAuB,CAAA,GAAA,CAAC,CAAC;YAC7D,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAC5E,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAC1C,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACtE,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EACpC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAa,CAAC,CAAC,CAAC,SAAS,CAAA,GAAA,CAAC,CAAC;YACnE,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,kBAAkB,CAAC,KAAyB,EAAE,CAAkB;;YAC5E,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;YACjC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EACrC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAe,CAAA,GAAA,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvE,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,WAAW,CAAC,MAAmB,EAAE,CAAkB;;YAC/D,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;YAClC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAChD,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxC,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,UAAU,CAAC,KAAiB,EAAE,CAAkB;;YAC5D,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;YACjC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EACvC,CAAM,CAAC,EAAC,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAA,GAAA,CAAC,CAAC;YACtD,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEe,QAAQ,CAAC,GAAa,EAAE,CAAkB;;YACtD,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,GAAG,CAAC,CAAC;YAC/B,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC3C,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;CACJ;AAED,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;AACpC,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;AAEhC,6CAA6C;AAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,WAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1C,eAAS,CAAC,aAAa,CAAC,IAAc,EAAE;QAC9B,UAAU,CAAC,MAAY,EAAE,CAAkB;;gBAC7C,OAAO,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAE,CAAC;YAC9C,CAAC;SAAA;QAEK,OAAO,CAAC,KAAW,EAAE,CAAe;;gBACtC,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;SAAA;KACJ,EAAE,WAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC"}
1
+ {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/yaml/rpc.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openrewrite/rewrite",
3
- "version": "8.70.0-20251222-101414",
3
+ "version": "8.70.0-20251222-213047",
4
4
  "license": "Moderne Source Available License",
5
5
  "description": "OpenRewrite JavaScript.",
6
6
  "homepage": "https://github.com/openrewrite/rewrite",
@@ -59,8 +59,8 @@
59
59
  "@types/node": "^22.5.4",
60
60
  "commander": "^14.0.0",
61
61
  "diff": "^7.0.0",
62
- "immer": "^10.1.1",
63
62
  "jsonc-parser": "^3.3.1",
63
+ "mutative": "^1.3.0",
64
64
  "picomatch": "^4.0.3",
65
65
  "semver": "^7.7.3",
66
66
  "tmp-promise": "^3.0.3",
package/src/index.ts CHANGED
@@ -14,8 +14,8 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import {RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "./rpc";
17
- import {createDraft, Draft, finishDraft} from "immer";
18
17
  import {MarkersKind, ParseExceptionResult} from "./markers";
18
+ import {updateIfChanged} from "./util";
19
19
  import {RecipeRegistry} from "./recipe";
20
20
 
21
21
  export * from "./data-table";
@@ -67,12 +67,12 @@ RpcCodecs.registerCodec(MarkersKind.ParseExceptionResult, {
67
67
  await q.getAndSend(after, a => a.treeType);
68
68
  },
69
69
  async rpcReceive(before: ParseExceptionResult, q: RpcReceiveQueue): Promise<ParseExceptionResult> {
70
- const draft: Draft<ParseExceptionResult> = createDraft(before);
71
- draft.id = await q.receive(before.id);
72
- draft.parserType = await q.receive(before.parserType);
73
- draft.exceptionType = await q.receive(before.exceptionType);
74
- draft.message = await q.receive(before.message);
75
- draft.treeType = await q.receive(before.treeType);
76
- return finishDraft(draft);
70
+ return updateIfChanged(before, {
71
+ id: await q.receive(before.id),
72
+ parserType: await q.receive(before.parserType),
73
+ exceptionType: await q.receive(before.exceptionType),
74
+ message: await q.receive(before.message),
75
+ treeType: await q.receive(before.treeType),
76
+ });
77
77
  }
78
78
  });
@@ -15,7 +15,7 @@
15
15
  */
16
16
 
17
17
  import {J} from "../java";
18
- import {produce} from "immer";
18
+ import {create as produce} from "mutative";
19
19
 
20
20
  /**
21
21
  * Gets the effective last whitespace from a Space.
@@ -34,7 +34,7 @@ export function lastWhitespace(space: J.Space): string {
34
34
  * When there are comments, updates the suffix of the last comment.
35
35
  * When there are no comments, updates the whitespace property.
36
36
  *
37
- * @param space The Space to modify (Immer draft)
37
+ * @param space The Space to modify (Mutative draft)
38
38
  * @param transform Function that receives the current last whitespace and returns the new value
39
39
  */
40
40
  export function replaceLastWhitespace(space: J.Space, transform: (ws: string) => string): J.Space {
@@ -16,7 +16,7 @@
16
16
  import {Marker} from "../markers";
17
17
  import {J} from "./tree";
18
18
  import {RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "../rpc";
19
- import {createDraft, finishDraft} from "immer";
19
+ import {updateIfChanged} from "../util";
20
20
  // The `RpcCodec` for `J.Space` is registered in the `rpc` module.
21
21
  import "./rpc";
22
22
 
@@ -53,10 +53,10 @@ export interface OmitParentheses extends Marker {
53
53
  // Register codecs for all Java markers with additional properties
54
54
  RpcCodecs.registerCodec(J.Markers.TrailingComma, {
55
55
  async rpcReceive(before: TrailingComma, q: RpcReceiveQueue): Promise<TrailingComma> {
56
- const draft = createDraft(before);
57
- draft.id = await q.receive(before.id);
58
- draft.suffix = await q.receive(before.suffix)
59
- return finishDraft(draft);
56
+ return updateIfChanged(before, {
57
+ id: await q.receive(before.id),
58
+ suffix: await q.receive(before.suffix),
59
+ });
60
60
  },
61
61
 
62
62
  async rpcSend(after: TrailingComma, q: RpcSendQueue): Promise<void> {
@@ -73,9 +73,9 @@ export function registerMarkerCodec<M extends Marker>(
73
73
  ) {
74
74
  RpcCodecs.registerCodec(kind, {
75
75
  async rpcReceive(before: M, q: RpcReceiveQueue): Promise<M> {
76
- const draft = createDraft(before);
77
- draft.id = await q.receive(before.id);
78
- return finishDraft(draft) as M;
76
+ return updateIfChanged(before, {
77
+ id: await q.receive(before.id),
78
+ } as Partial<M>);
79
79
  },
80
80
 
81
81
  async rpcSend(after: M, q: RpcSendQueue): Promise<void> {
@@ -14,10 +14,8 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import {Cursor, rootCursor} from "../tree";
17
- import {mapAsync} from "../util";
17
+ import {mapAsync, updateIfChanged} from "../util";
18
18
  import {Type} from "./type";
19
- import {createDraft, Draft, finishDraft} from "immer";
20
- import {produceAsync, ValidImmerRecipeReturnType} from "../visitor";
21
19
 
22
20
  export class TypeVisitor<P> {
23
21
  protected cursor: Cursor = rootCursor();
@@ -115,65 +113,71 @@ export class TypeVisitor<P> {
115
113
  }
116
114
 
117
115
  protected async visitUnion(union: Type.Union, p: P): Promise<Type | undefined> {
118
- return this.produceType<Type.Union>(union, p, async draft => {
119
- draft.bounds = await mapAsync(union.bounds || [], b => this.visit(b, p)) as Type[];
116
+ return updateIfChanged(union, {
117
+ bounds: await mapAsync(union.bounds || [], b => this.visit(b, p)) as Type[],
120
118
  });
121
119
  }
122
120
 
123
121
  protected async visitAnnotation(annotation: Type.Annotation, p: P): Promise<Type | undefined> {
124
- return this.produceType<Type.Annotation>(annotation, p, async draft => {
125
- draft.type = await this.visit(annotation.type, p) as Type.FullyQualified;
126
- // Note: values contain element values which themselves contain Type references
127
- draft.values = await mapAsync(annotation.values || [], async v => {
128
- const draftValue = createDraft(v);
129
- draftValue.element = await this.visit(v.element, p) as Type;
130
- if (v.kind === Type.Kind.SingleElementValue) {
131
- const single = v as Type.Annotation.SingleElementValue;
132
- if (single.referenceValue) {
133
- (draftValue as Draft<Type.Annotation.SingleElementValue>).referenceValue = await this.visit(single.referenceValue, p);
134
- }
135
- } else if (v.kind === Type.Kind.ArrayElementValue) {
136
- const array = v as Type.Annotation.ArrayElementValue;
137
- if (array.referenceValues) {
138
- (draftValue as Draft<Type.Annotation.ArrayElementValue>).referenceValues = await mapAsync(
139
- array.referenceValues,
140
- rv => this.visit(rv, p)
141
- ) as Type[];
142
- }
143
- }
144
- return finishDraft(draftValue);
145
- });
122
+ const newType = await this.visit(annotation.type, p) as Type.FullyQualified;
123
+ // Note: values contain element values which themselves contain Type references
124
+ const newValues = await mapAsync(annotation.values || [], async v => {
125
+ const newElement = await this.visit(v.element, p);
126
+ if (v.kind === Type.Kind.SingleElementValue) {
127
+ const single = v as Type.Annotation.SingleElementValue;
128
+ const newReferenceValue = single.referenceValue
129
+ ? await this.visit(single.referenceValue, p)
130
+ : undefined;
131
+ return updateIfChanged(v, {
132
+ element: newElement,
133
+ referenceValue: newReferenceValue,
134
+ });
135
+ } else if (v.kind === Type.Kind.ArrayElementValue) {
136
+ const array = v as Type.Annotation.ArrayElementValue;
137
+ const newReferenceValues = array.referenceValues
138
+ ? await mapAsync(array.referenceValues, rv => this.visit(rv, p)) as Type[]
139
+ : undefined;
140
+ return updateIfChanged(v, {
141
+ element: newElement,
142
+ referenceValues: newReferenceValues,
143
+ });
144
+ }
145
+ return updateIfChanged(v, {element: newElement});
146
+ });
147
+ return updateIfChanged(annotation, {
148
+ type: newType,
149
+ values: newValues,
146
150
  });
147
151
  }
148
152
 
149
153
  protected async visitArray(array: Type.Array, p: P): Promise<Type | undefined> {
150
- return this.produceType<Type.Array>(array, p, async draft => {
151
- draft.elemType = await this.visit(array.elemType, p) as Type;
152
- draft.annotations = await this.visitList(array.annotations, p) as Type.Annotation[] || [];
154
+ return updateIfChanged(array, {
155
+ elemType: await this.visit(array.elemType, p),
156
+ annotations: await this.visitList(array.annotations, p) || [],
153
157
  });
154
158
  }
155
159
 
156
160
  protected async visitClass(aClass: Type.Class, p: P): Promise<Type | undefined> {
157
- return this.produceType<Type.Class>(aClass, p, async draft => {
158
- draft.supertype = await this.visit(aClass.supertype, p) as Type.Class | undefined;
159
- draft.owningClass = await this.visit(aClass.owningClass, p) as Type.Class | undefined;
160
- draft.annotations = await mapAsync(aClass.annotations || [], a => this.visit(a, p) as Promise<Type.Annotation>);
161
- draft.interfaces = await mapAsync(aClass.interfaces || [], i => this.visit(i, p) as Promise<Type.Class>);
162
- draft.members = await mapAsync(aClass.members || [], m => this.visit(m, p) as Promise<Type.Variable>);
163
- draft.methods = await mapAsync(aClass.methods || [], m => this.visit(m, p) as Promise<Type.Method>);
164
- draft.typeParameters = await this.visitList(aClass.typeParameters, p) as Type[] || [];
161
+ return updateIfChanged(aClass, {
162
+ supertype: await this.visit(aClass.supertype, p),
163
+ owningClass: await this.visit(aClass.owningClass, p),
164
+ annotations: await mapAsync(aClass.annotations || [], a => this.visit(a, p)),
165
+ interfaces: await mapAsync(aClass.interfaces || [], i => this.visit(i, p)),
166
+ members: await mapAsync(aClass.members || [], m => this.visit(m, p)),
167
+ methods: await mapAsync(aClass.methods || [], m => this.visit(m, p)),
168
+ typeParameters: await this.visitList(aClass.typeParameters, p) || [],
165
169
  });
166
170
  }
167
171
 
168
172
  protected async visitGenericTypeVariable(generic: Type.GenericTypeVariable, p: P): Promise<Type | undefined> {
169
- return this.produceType<Type.GenericTypeVariable>(generic, p, async draft => {
170
- draft.bounds = await mapAsync(generic.bounds || [], b => this.visit(b, p)) as Type[];
173
+ return updateIfChanged(generic, {
174
+ bounds: await mapAsync(generic.bounds || [], b => this.visit(b, p)),
171
175
  });
172
176
  }
173
177
 
174
178
  protected async visitIntersection(intersection: Type.Intersection, p: P): Promise<Type | undefined> {
175
- return this.produceType<Type.Intersection>(intersection, p, async draft => {
176
- draft.bounds = await mapAsync(intersection.bounds || [], b => this.visit(b, p)) as Type[];
179
+ return updateIfChanged(intersection, {
180
+ bounds: await mapAsync(intersection.bounds || [], b => this.visit(b, p)),
177
181
  });
178
182
  }
179
183
 
@@ -185,19 +189,19 @@ export class TypeVisitor<P> {
185
189
  * @return A method
186
190
  */
187
191
  protected async visitMethod(method: Type.Method, p: P): Promise<Type | undefined> {
188
- return this.produceType<Type.Method>(method, p, async draft => {
189
- draft.declaringType = await this.visit(method.declaringType, p) as Type.FullyQualified;
190
- draft.returnType = await this.visit(method.returnType, p) as Type;
191
- draft.parameterTypes = await mapAsync(method.parameterTypes || [], pt => this.visit(pt, p)) as Type[];
192
- draft.thrownExceptions = await mapAsync(method.thrownExceptions || [], t => this.visit(t, p)) as Type[];
193
- draft.annotations = await mapAsync(method.annotations || [], a => this.visit(a, p) as Promise<Type.Annotation>);
192
+ return updateIfChanged(method, {
193
+ declaringType: await this.visit(method.declaringType, p),
194
+ returnType: await this.visit(method.returnType, p),
195
+ parameterTypes: await mapAsync(method.parameterTypes || [], pt => this.visit(pt, p)),
196
+ thrownExceptions: await mapAsync(method.thrownExceptions || [], t => this.visit(t, p)),
197
+ annotations: await mapAsync(method.annotations || [], a => this.visit(a, p)),
194
198
  });
195
199
  }
196
200
 
197
201
  protected async visitParameterized(parameterized: Type.Parameterized, p: P): Promise<Type | undefined> {
198
- return this.produceType<Type.Parameterized>(parameterized, p, async draft => {
199
- draft.type = await this.visit(parameterized.type, p) as Type.FullyQualified;
200
- draft.typeParameters = await mapAsync(parameterized.typeParameters || [], t => this.visit(t, p)) as Type[];
202
+ return updateIfChanged(parameterized, {
203
+ type: await this.visit(parameterized.type, p),
204
+ typeParameters: await mapAsync(parameterized.typeParameters || [], t => this.visit(t, p)),
201
205
  });
202
206
  }
203
207
 
@@ -214,10 +218,10 @@ export class TypeVisitor<P> {
214
218
  * @return A variable
215
219
  */
216
220
  protected async visitVariable(variable: Type.Variable, p: P): Promise<Type | undefined> {
217
- return this.produceType<Type.Variable>(variable, p, async draft => {
218
- draft.owner = await this.visit(variable.owner, p);
219
- draft.type = await this.visit(variable.type, p) as Type;
220
- draft.annotations = await mapAsync(variable.annotations || [], a => this.visit(a, p) as Promise<Type.Annotation>);
221
+ return updateIfChanged(variable, {
222
+ owner: await this.visit(variable.owner, p),
223
+ type: await this.visit(variable.type, p),
224
+ annotations: await mapAsync(variable.annotations || [], a => this.visit(a, p)),
221
225
  });
222
226
  }
223
227
 
@@ -225,17 +229,4 @@ export class TypeVisitor<P> {
225
229
  // Unknown types have no properties to visit
226
230
  return unknown;
227
231
  }
228
-
229
- protected async produceType<T extends Type>(
230
- before: T,
231
- p: P,
232
- recipe?: (draft: Draft<T>) =>
233
- ValidImmerRecipeReturnType<Draft<T>> |
234
- PromiseLike<ValidImmerRecipeReturnType<Draft<T>>>
235
- ): Promise<T | undefined> {
236
- if (recipe) {
237
- return produceAsync<T>(before, recipe);
238
- }
239
- return before;
240
- }
241
232
  }
@@ -15,9 +15,9 @@
15
15
  */
16
16
  import {Cursor, isTree, SourceFile} from "../tree";
17
17
  import {mapAsync, updateIfChanged} from "../util";
18
- import {produceAsync, TreeVisitor, ValidImmerRecipeReturnType} from "../visitor";
18
+ import {produceAsync, TreeVisitor, ValidRecipeReturnType} from "../visitor";
19
19
  import {Expression, isSpace, J, NameTree, Statement, TypedTree, TypeTree} from "./tree";
20
- import {createDraft, Draft, finishDraft, nothing} from "immer";
20
+ import {create, Draft, rawReturn} from "mutative";
21
21
  import {Type} from "./type";
22
22
 
23
23
  const javaKindValues = new Set(Object.values(J.Kind));
@@ -1224,7 +1224,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
1224
1224
  draft.markers = await this.visitMarkers(right.markers, p);
1225
1225
  this.cursor = this.cursor.parent!;
1226
1226
  if (draft.element === undefined) {
1227
- return nothing;
1227
+ return rawReturn(undefined);
1228
1228
  }
1229
1229
  });
1230
1230
  }
@@ -1245,7 +1245,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
1245
1245
  draft.markers = await this.visitMarkers(left.markers, p);
1246
1246
  this.cursor = this.cursor.parent!;
1247
1247
  if (draft.element === undefined) {
1248
- return nothing;
1248
+ return rawReturn(undefined);
1249
1249
  }
1250
1250
  });
1251
1251
  }
@@ -1268,16 +1268,16 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
1268
1268
  before: J2,
1269
1269
  p: P,
1270
1270
  recipe?: (draft: Draft<J2>) =>
1271
- ValidImmerRecipeReturnType<Draft<J2>> |
1272
- PromiseLike<ValidImmerRecipeReturnType<Draft<J2>>>
1271
+ ValidRecipeReturnType<Draft<J2>> |
1272
+ PromiseLike<ValidRecipeReturnType<Draft<J2>>>
1273
1273
  ): Promise<J2> {
1274
- const draft: Draft<J2> = createDraft(before);
1274
+ const [draft, finishDraft] = create(before);
1275
1275
  (draft as Draft<J>).prefix = await this.visitSpace(before!.prefix, p);
1276
1276
  (draft as Draft<J>).markers = await this.visitMarkers(before!.markers, p);
1277
1277
  if (recipe) {
1278
1278
  await recipe(draft);
1279
1279
  }
1280
- return finishDraft(draft) as J2;
1280
+ return finishDraft() as J2;
1281
1281
  }
1282
1282
 
1283
1283
  protected accept(t: J, p: P): Promise<J | undefined> {
@@ -22,11 +22,11 @@ import {json, Json} from "../json";
22
22
  import {DependencyWorkspace} from "./dependency-workspace";
23
23
  import {setTemplateSourceFileCache} from "./templating/engine";
24
24
  import {PrettierConfigLoader} from "./format/prettier-config-loader";
25
- import {produce} from "immer";
25
+ import {create as produce} from "mutative";
26
26
  import * as fs from "fs";
27
27
  import * as path from "path";
28
28
  import {Autodetect} from "./autodetect";
29
- import {Marker} from "../markers";
29
+ import {Marker, replaceMarkerByKind} from "../markers";
30
30
 
31
31
  /**
32
32
  * Shared TypeScript source file cache for test parsers.
@@ -174,7 +174,7 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
174
174
  // Compose with existing beforeRecipe if present
175
175
  beforeRecipe: styleMarker ? (sf: JS.CompilationUnit) => {
176
176
  const withMarker = produce(sf, draft => {
177
- draft.markers.markers = draft.markers.markers.concat([styleMarker]);
177
+ draft.markers = replaceMarkerByKind(draft.markers, styleMarker);
178
178
  });
179
179
  return spec.beforeRecipe ? spec.beforeRecipe(withMarker) : withMarker;
180
180
  } : spec.beforeRecipe