@openrewrite/rewrite 8.72.2 → 8.72.4
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/execution.js +3 -16
- package/dist/execution.js.map +1 -1
- package/dist/index.js +34 -49
- package/dist/index.js.map +1 -1
- package/dist/java/markers.js +12 -29
- package/dist/java/markers.js.map +1 -1
- package/dist/java/print.js +2 -13
- package/dist/java/print.js.map +1 -1
- package/dist/java/rpc.js +1344 -1725
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/type-visitor.js +143 -184
- package/dist/java/type-visitor.js.map +1 -1
- package/dist/java/visitor.js +1072 -1249
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/add-import.js +495 -534
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/autodetect.js +116 -159
- package/dist/javascript/autodetect.js.map +1 -1
- package/dist/javascript/cleanup/add-parse-int-radix.js +41 -57
- package/dist/javascript/cleanup/add-parse-int-radix.js.map +1 -1
- package/dist/javascript/cleanup/prefer-optional-chain.js +89 -105
- package/dist/javascript/cleanup/prefer-optional-chain.js.map +1 -1
- package/dist/javascript/cleanup/use-object-property-shorthand.js +74 -95
- package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
- package/dist/javascript/comparator.js +815 -1167
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/dependency-workspace.js +206 -219
- package/dist/javascript/dependency-workspace.js.map +1 -1
- package/dist/javascript/format/format.js +682 -908
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +152 -231
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
- package/dist/javascript/format/normalize-whitespace-visitor.js +12 -31
- package/dist/javascript/format/normalize-whitespace-visitor.js.map +1 -1
- package/dist/javascript/format/prettier-config-loader.js +134 -153
- package/dist/javascript/format/prettier-config-loader.js.map +1 -1
- package/dist/javascript/format/prettier-format.js +112 -129
- package/dist/javascript/format/prettier-format.js.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.js +112 -136
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
- package/dist/javascript/markers.js +59 -92
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +39 -52
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-literals.js +25 -38
- package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +66 -82
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +10 -23
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
- package/dist/javascript/node-resolution-result.js +137 -166
- package/dist/javascript/node-resolution-result.js.map +1 -1
- package/dist/javascript/package-json-parser.js +312 -343
- package/dist/javascript/package-json-parser.js.map +1 -1
- package/dist/javascript/package-manager.js +145 -170
- package/dist/javascript/package-manager.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +94 -68
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/print.js +1572 -1835
- package/dist/javascript/print.js.map +1 -1
- package/dist/javascript/project-parser.js +151 -172
- package/dist/javascript/project-parser.js.map +1 -1
- package/dist/javascript/recipes/add-dependency.js +140 -175
- package/dist/javascript/recipes/add-dependency.js.map +1 -1
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js +20 -36
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js.map +1 -1
- package/dist/javascript/recipes/auto-format.js +3 -14
- package/dist/javascript/recipes/auto-format.js.map +1 -1
- package/dist/javascript/recipes/change-import.js +447 -495
- package/dist/javascript/recipes/change-import.js.map +1 -1
- package/dist/javascript/recipes/order-imports.js +162 -175
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/recipes/upgrade-dependency-version.js +167 -197
- package/dist/javascript/recipes/upgrade-dependency-version.js.map +1 -1
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js +166 -193
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js.map +1 -1
- package/dist/javascript/remove-import.js +689 -724
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/javascript/rpc.js +1007 -1332
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/search/find-dependency.js +84 -110
- package/dist/javascript/search/find-dependency.js.map +1 -1
- package/dist/javascript/search/uses-method.js +5 -19
- package/dist/javascript/search/uses-method.js.map +1 -1
- package/dist/javascript/search/uses-type.js +9 -20
- package/dist/javascript/search/uses-type.js.map +1 -1
- package/dist/javascript/templating/comparator.js +737 -822
- package/dist/javascript/templating/comparator.js.map +1 -1
- package/dist/javascript/templating/engine.js +211 -245
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/pattern.js +169 -190
- package/dist/javascript/templating/pattern.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +172 -210
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/templating/rewrite.js +75 -97
- package/dist/javascript/templating/rewrite.js.map +1 -1
- package/dist/javascript/templating/template.js +69 -82
- package/dist/javascript/templating/template.js.map +1 -1
- package/dist/javascript/tree-debug.js +109 -137
- package/dist/javascript/tree-debug.js.map +1 -1
- package/dist/javascript/visitor.js +1090 -1254
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/print.js +72 -103
- package/dist/json/print.js.map +1 -1
- package/dist/json/rpc.js +120 -181
- package/dist/json/rpc.js.map +1 -1
- package/dist/json/visitor.js +69 -100
- package/dist/json/visitor.js.map +1 -1
- package/dist/marketplace.js +20 -33
- package/dist/marketplace.js.map +1 -1
- package/dist/parse-error.js +41 -62
- package/dist/parse-error.js.map +1 -1
- package/dist/parser.js +7 -18
- package/dist/parser.js.map +1 -1
- package/dist/path-utils.js +46 -59
- package/dist/path-utils.js.map +1 -1
- package/dist/preconditions.js +30 -47
- package/dist/preconditions.js.map +1 -1
- package/dist/print.js +6 -19
- package/dist/print.js.map +1 -1
- package/dist/recipe.js +42 -73
- package/dist/recipe.js.map +1 -1
- package/dist/rpc/index.js +74 -115
- package/dist/rpc/index.js.map +1 -1
- package/dist/rpc/queue.js +71 -90
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/recipe.js +32 -57
- package/dist/rpc/recipe.js.map +1 -1
- package/dist/rpc/request/generate.js +4 -13
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-languages.js +2 -11
- package/dist/rpc/request/get-languages.js.map +1 -1
- package/dist/rpc/request/get-marketplace.js +9 -20
- package/dist/rpc/request/get-marketplace.js.map +1 -1
- package/dist/rpc/request/get-object.js +4 -13
- package/dist/rpc/request/get-object.js.map +1 -1
- package/dist/rpc/request/install-recipes.js +25 -36
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/metrics.js +8 -17
- package/dist/rpc/request/metrics.js.map +1 -1
- package/dist/rpc/request/parse-project.js +36 -45
- package/dist/rpc/request/parse-project.js.map +1 -1
- package/dist/rpc/request/parse.js +5 -14
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +37 -52
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/rpc/request/print.js +5 -14
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/visit.js +56 -71
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.js +70 -97
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.js +76 -89
- package/dist/rpc/server.js.map +1 -1
- package/dist/run.js +47 -66
- package/dist/run.js.map +1 -1
- package/dist/search/is-source-file.js +8 -19
- package/dist/search/is-source-file.js.map +1 -1
- package/dist/test/rewrite-test.js +154 -188
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/text/print.js +23 -38
- package/dist/text/print.js.map +1 -1
- package/dist/text/rpc.js +29 -44
- package/dist/text/rpc.js.map +1 -1
- package/dist/text/visitor.js +16 -33
- package/dist/text/visitor.js.map +1 -1
- package/dist/util.js +13 -24
- package/dist/util.js.map +1 -1
- package/dist/version.txt +1 -1
- package/dist/visitor.js +84 -115
- package/dist/visitor.js.map +1 -1
- package/dist/yaml/index.d.ts +2 -0
- package/dist/yaml/index.d.ts.map +1 -1
- package/dist/yaml/index.js +2 -0
- package/dist/yaml/index.js.map +1 -1
- package/dist/yaml/markers.d.ts +21 -0
- package/dist/yaml/markers.d.ts.map +1 -0
- package/dist/yaml/markers.js +37 -0
- package/dist/yaml/markers.js.map +1 -0
- package/dist/yaml/parser.d.ts.map +1 -1
- package/dist/yaml/parser.js +4 -1
- package/dist/yaml/parser.js.map +1 -1
- package/dist/yaml/print.d.ts +1 -1
- package/dist/yaml/print.d.ts.map +1 -1
- package/dist/yaml/print.js +175 -208
- package/dist/yaml/print.js.map +1 -1
- package/dist/yaml/rpc.js +154 -219
- package/dist/yaml/rpc.js.map +1 -1
- package/dist/yaml/visitor.js +78 -113
- package/dist/yaml/visitor.js.map +1 -1
- package/package.json +1 -1
- package/src/javascript/parser.ts +56 -14
- package/src/yaml/index.ts +2 -0
- package/src/yaml/markers.ts +70 -0
- package/src/yaml/parser.ts +5 -1
- package/src/yaml/print.ts +5 -2
package/dist/yaml/visitor.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.YamlVisitor = void 0;
|
|
13
4
|
/*
|
|
@@ -29,122 +20,96 @@ const util_1 = require("../util");
|
|
|
29
20
|
const visitor_1 = require("../visitor");
|
|
30
21
|
const tree_1 = require("./tree");
|
|
31
22
|
class YamlVisitor extends visitor_1.TreeVisitor {
|
|
32
|
-
isAcceptable(sourceFile) {
|
|
33
|
-
return
|
|
34
|
-
return (0, tree_1.isYaml)(sourceFile);
|
|
35
|
-
});
|
|
23
|
+
async isAcceptable(sourceFile) {
|
|
24
|
+
return (0, tree_1.isYaml)(sourceFile);
|
|
36
25
|
}
|
|
37
|
-
visitDocuments(documents, p) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return (0, util_1.updateIfChanged)(documents, updates);
|
|
44
|
-
});
|
|
26
|
+
async visitDocuments(documents, p) {
|
|
27
|
+
const updates = {
|
|
28
|
+
markers: await this.visitMarkers(documents.markers, p),
|
|
29
|
+
documents: await (0, util_1.mapAsync)(documents.documents, doc => this.visitDefined(doc, p))
|
|
30
|
+
};
|
|
31
|
+
return (0, util_1.updateIfChanged)(documents, updates);
|
|
45
32
|
}
|
|
46
|
-
visitDocument(document, p) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return (0, util_1.updateIfChanged)(document, updates);
|
|
55
|
-
});
|
|
33
|
+
async visitDocument(document, p) {
|
|
34
|
+
const updates = {
|
|
35
|
+
markers: await this.visitMarkers(document.markers, p),
|
|
36
|
+
directives: await (0, util_1.mapAsync)(document.directives, d => this.visitDefined(d, p)),
|
|
37
|
+
block: await this.visitDefined(document.block, p),
|
|
38
|
+
end: await this.visitDefined(document.end, p)
|
|
39
|
+
};
|
|
40
|
+
return (0, util_1.updateIfChanged)(document, updates);
|
|
56
41
|
}
|
|
57
|
-
visitDirective(directive, p) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
return (0, util_1.updateIfChanged)(directive, updates);
|
|
63
|
-
});
|
|
42
|
+
async visitDirective(directive, p) {
|
|
43
|
+
const updates = {
|
|
44
|
+
markers: await this.visitMarkers(directive.markers, p)
|
|
45
|
+
};
|
|
46
|
+
return (0, util_1.updateIfChanged)(directive, updates);
|
|
64
47
|
}
|
|
65
|
-
visitDocumentEnd(end, p) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
return (0, util_1.updateIfChanged)(end, updates);
|
|
71
|
-
});
|
|
48
|
+
async visitDocumentEnd(end, p) {
|
|
49
|
+
const updates = {
|
|
50
|
+
markers: await this.visitMarkers(end.markers, p)
|
|
51
|
+
};
|
|
52
|
+
return (0, util_1.updateIfChanged)(end, updates);
|
|
72
53
|
}
|
|
73
|
-
visitMapping(mapping, p) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
return (0, util_1.updateIfChanged)(mapping, updates);
|
|
82
|
-
});
|
|
54
|
+
async visitMapping(mapping, p) {
|
|
55
|
+
const updates = {
|
|
56
|
+
markers: await this.visitMarkers(mapping.markers, p),
|
|
57
|
+
tag: mapping.tag ? await this.visit(mapping.tag, p) : undefined,
|
|
58
|
+
anchor: mapping.anchor ? await this.visit(mapping.anchor, p) : undefined,
|
|
59
|
+
entries: await (0, util_1.mapAsync)(mapping.entries, entry => this.visitDefined(entry, p))
|
|
60
|
+
};
|
|
61
|
+
return (0, util_1.updateIfChanged)(mapping, updates);
|
|
83
62
|
}
|
|
84
|
-
visitMappingEntry(entry, p) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return (0, util_1.updateIfChanged)(entry, updates);
|
|
92
|
-
});
|
|
63
|
+
async visitMappingEntry(entry, p) {
|
|
64
|
+
const updates = {
|
|
65
|
+
markers: await this.visitMarkers(entry.markers, p),
|
|
66
|
+
key: await this.visitDefined(entry.key, p),
|
|
67
|
+
value: await this.visitDefined(entry.value, p)
|
|
68
|
+
};
|
|
69
|
+
return (0, util_1.updateIfChanged)(entry, updates);
|
|
93
70
|
}
|
|
94
|
-
visitScalar(scalar, p) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
return (0, util_1.updateIfChanged)(scalar, updates);
|
|
102
|
-
});
|
|
71
|
+
async visitScalar(scalar, p) {
|
|
72
|
+
const updates = {
|
|
73
|
+
markers: await this.visitMarkers(scalar.markers, p),
|
|
74
|
+
anchor: scalar.anchor ? await this.visit(scalar.anchor, p) : undefined,
|
|
75
|
+
tag: scalar.tag ? await this.visit(scalar.tag, p) : undefined
|
|
76
|
+
};
|
|
77
|
+
return (0, util_1.updateIfChanged)(scalar, updates);
|
|
103
78
|
}
|
|
104
|
-
visitSequence(sequence, p) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return (0, util_1.updateIfChanged)(sequence, updates);
|
|
113
|
-
});
|
|
79
|
+
async visitSequence(sequence, p) {
|
|
80
|
+
const updates = {
|
|
81
|
+
markers: await this.visitMarkers(sequence.markers, p),
|
|
82
|
+
tag: sequence.tag ? await this.visit(sequence.tag, p) : undefined,
|
|
83
|
+
anchor: sequence.anchor ? await this.visit(sequence.anchor, p) : undefined,
|
|
84
|
+
entries: await (0, util_1.mapAsync)(sequence.entries, entry => this.visitDefined(entry, p))
|
|
85
|
+
};
|
|
86
|
+
return (0, util_1.updateIfChanged)(sequence, updates);
|
|
114
87
|
}
|
|
115
|
-
visitSequenceEntry(entry, p) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
return (0, util_1.updateIfChanged)(entry, updates);
|
|
122
|
-
});
|
|
88
|
+
async visitSequenceEntry(entry, p) {
|
|
89
|
+
const updates = {
|
|
90
|
+
markers: await this.visitMarkers(entry.markers, p),
|
|
91
|
+
block: await this.visitDefined(entry.block, p)
|
|
92
|
+
};
|
|
93
|
+
return (0, util_1.updateIfChanged)(entry, updates);
|
|
123
94
|
}
|
|
124
|
-
visitAnchor(anchor, p) {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
return (0, util_1.updateIfChanged)(anchor, updates);
|
|
130
|
-
});
|
|
95
|
+
async visitAnchor(anchor, p) {
|
|
96
|
+
const updates = {
|
|
97
|
+
markers: await this.visitMarkers(anchor.markers, p)
|
|
98
|
+
};
|
|
99
|
+
return (0, util_1.updateIfChanged)(anchor, updates);
|
|
131
100
|
}
|
|
132
|
-
visitAlias(alias, p) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
return (0, util_1.updateIfChanged)(alias, updates);
|
|
139
|
-
});
|
|
101
|
+
async visitAlias(alias, p) {
|
|
102
|
+
const updates = {
|
|
103
|
+
markers: await this.visitMarkers(alias.markers, p),
|
|
104
|
+
anchor: await this.visitDefined(alias.anchor, p)
|
|
105
|
+
};
|
|
106
|
+
return (0, util_1.updateIfChanged)(alias, updates);
|
|
140
107
|
}
|
|
141
|
-
visitTag(tag, p) {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
return (0, util_1.updateIfChanged)(tag, updates);
|
|
147
|
-
});
|
|
108
|
+
async visitTag(tag, p) {
|
|
109
|
+
const updates = {
|
|
110
|
+
markers: await this.visitMarkers(tag.markers, p)
|
|
111
|
+
};
|
|
112
|
+
return (0, util_1.updateIfChanged)(tag, updates);
|
|
148
113
|
}
|
|
149
114
|
accept(t, p) {
|
|
150
115
|
switch (t.kind) {
|
package/dist/yaml/visitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/yaml/visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/yaml/visitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/javascript/parser.ts
CHANGED
|
@@ -43,7 +43,6 @@ import {
|
|
|
43
43
|
getPreviousSibling,
|
|
44
44
|
hasFlowAnnotation,
|
|
45
45
|
isStatement,
|
|
46
|
-
isValidSurrogateRange,
|
|
47
46
|
TextSpan
|
|
48
47
|
} from "./parser-utils";
|
|
49
48
|
import {JavaScriptTypeMapping} from "./type-mapping";
|
|
@@ -640,7 +639,7 @@ export class JavaScriptParserVisitor {
|
|
|
640
639
|
return {
|
|
641
640
|
kind: J.Kind.RightPadded,
|
|
642
641
|
element: t,
|
|
643
|
-
after: trailing,
|
|
642
|
+
after: trailing ?? emptySpace,
|
|
644
643
|
markers: markers ?? emptyMarkers
|
|
645
644
|
};
|
|
646
645
|
}
|
|
@@ -673,7 +672,7 @@ export class JavaScriptParserVisitor {
|
|
|
673
672
|
private leftPadded<T extends J | J.Space | number | string | boolean>(before: J.Space, t: T, markers?: Markers): J.LeftPadded<T> {
|
|
674
673
|
return {
|
|
675
674
|
kind: J.Kind.LeftPadded,
|
|
676
|
-
before: before,
|
|
675
|
+
before: before ?? emptySpace,
|
|
677
676
|
element: t,
|
|
678
677
|
markers: markers ?? emptyMarkers
|
|
679
678
|
};
|
|
@@ -908,19 +907,17 @@ export class JavaScriptParserVisitor {
|
|
|
908
907
|
private mapLiteral(node: ts.LiteralExpression | ts.TrueLiteral | ts.FalseLiteral | ts.NullLiteral | ts.Identifier
|
|
909
908
|
| ts.TemplateHead | ts.TemplateMiddle | ts.TemplateTail | ts.JsxText, value: any): J.Literal {
|
|
910
909
|
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
// TODO: Fix to prevent ingestion failure for invalid surrogate pairs. Should be reworked with J.Literal.UnicodeEscape
|
|
914
|
-
throw new InvalidSurrogatesNotSupportedError();
|
|
915
|
-
}
|
|
910
|
+
const valueSource = node.getText();
|
|
911
|
+
const { cleanedSource, unicodeEscapes } = extractSurrogateEscapes(valueSource);
|
|
916
912
|
|
|
917
913
|
return {
|
|
918
914
|
kind: J.Kind.Literal,
|
|
919
915
|
id: randomId(),
|
|
920
916
|
prefix: this.prefix(node),
|
|
921
917
|
markers: emptyMarkers,
|
|
922
|
-
value: value,
|
|
923
|
-
valueSource:
|
|
918
|
+
value: unicodeEscapes.length > 0 ? cleanedSource : value,
|
|
919
|
+
valueSource: cleanedSource,
|
|
920
|
+
unicodeEscapes: unicodeEscapes.length > 0 ? unicodeEscapes : undefined,
|
|
924
921
|
type: this.mapPrimitiveType(node)
|
|
925
922
|
};
|
|
926
923
|
}
|
|
@@ -4671,11 +4668,56 @@ class FlowSyntaxNotSupportedError extends SyntaxError {
|
|
|
4671
4668
|
}
|
|
4672
4669
|
}
|
|
4673
4670
|
|
|
4674
|
-
|
|
4675
|
-
|
|
4676
|
-
|
|
4677
|
-
|
|
4671
|
+
const SURR_FIRST = 0xD800;
|
|
4672
|
+
const SURR_LAST = 0xDFFF;
|
|
4673
|
+
|
|
4674
|
+
/**
|
|
4675
|
+
* Extracts invalid UTF-16 surrogate pairs from a string literal's value source.
|
|
4676
|
+
* Unmatched UTF-16 surrogate pairs (composed of two escape and code point pairs) are unserializable
|
|
4677
|
+
* by technologies like Jackson. So we separate and store the code point off and reconstruct
|
|
4678
|
+
* the escape sequence when printing later.
|
|
4679
|
+
* We only escape unicode characters that are part of UTF-16 surrogate pairs. Others are generally
|
|
4680
|
+
* treated well by tools like Jackson.
|
|
4681
|
+
*
|
|
4682
|
+
* Handles both:
|
|
4683
|
+
* 1. Unicode escape sequences (\uXXXX) where XXXX is in the surrogate range
|
|
4684
|
+
* 2. Raw surrogate characters in the source (character codes 0xD800-0xDFFF)
|
|
4685
|
+
*/
|
|
4686
|
+
function extractSurrogateEscapes(valueSource: string): { cleanedSource: string, unicodeEscapes: J.LiteralUnicodeEscape[] } {
|
|
4687
|
+
const unicodeEscapes: J.LiteralUnicodeEscape[] = [];
|
|
4688
|
+
let cleanedSource = '';
|
|
4689
|
+
let cleanedIndex = 0;
|
|
4690
|
+
|
|
4691
|
+
for (let j = 0; j < valueSource.length; j++) {
|
|
4692
|
+
const c = valueSource.charAt(j);
|
|
4693
|
+
const charCode = valueSource.charCodeAt(j);
|
|
4694
|
+
|
|
4695
|
+
// Check for unicode escape sequence: \uXXXX
|
|
4696
|
+
// Ensure we're not escaped (previous char is not \) or we're at the start
|
|
4697
|
+
if (c === '\\' && j < valueSource.length - 1 && (j === 0 || valueSource.charAt(j - 1) !== '\\')) {
|
|
4698
|
+
if (valueSource.charAt(j + 1) === 'u' && j < valueSource.length - 5) {
|
|
4699
|
+
const codePoint = valueSource.substring(j + 2, j + 6);
|
|
4700
|
+
const codePointNumeric = parseInt(codePoint, 16);
|
|
4701
|
+
if (!isNaN(codePointNumeric) && codePointNumeric >= SURR_FIRST && codePointNumeric <= SURR_LAST) {
|
|
4702
|
+
unicodeEscapes.push({ valueSourceIndex: cleanedIndex, codePoint });
|
|
4703
|
+
j += 5; // Skip the \uXXXX sequence (we're already at \, skip u and 4 hex digits)
|
|
4704
|
+
continue;
|
|
4705
|
+
}
|
|
4706
|
+
}
|
|
4707
|
+
}
|
|
4708
|
+
|
|
4709
|
+
// Check for raw surrogate characters in the source
|
|
4710
|
+
if (charCode >= SURR_FIRST && charCode <= SURR_LAST) {
|
|
4711
|
+
const codePoint = charCode.toString(16).toUpperCase().padStart(4, '0');
|
|
4712
|
+
unicodeEscapes.push({ valueSourceIndex: cleanedIndex, codePoint });
|
|
4713
|
+
continue;
|
|
4714
|
+
}
|
|
4715
|
+
|
|
4716
|
+
cleanedSource += c;
|
|
4717
|
+
cleanedIndex++;
|
|
4678
4718
|
}
|
|
4719
|
+
|
|
4720
|
+
return { cleanedSource, unicodeEscapes };
|
|
4679
4721
|
}
|
|
4680
4722
|
|
|
4681
4723
|
Parsers.registerParser("javascript", JavaScriptParser);
|
package/src/yaml/index.ts
CHANGED
|
@@ -14,9 +14,11 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
export * from "./assertions";
|
|
17
|
+
export * from "./markers";
|
|
17
18
|
export * from "./parser";
|
|
18
19
|
export * from "./tree";
|
|
19
20
|
export * from "./visitor";
|
|
20
21
|
|
|
21
22
|
import "./print";
|
|
22
23
|
import "./rpc";
|
|
24
|
+
import "./markers";
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright 2025 the original author or authors.
|
|
3
|
+
* <p>
|
|
4
|
+
* Licensed under the Moderne Source Available License (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
* <p>
|
|
8
|
+
* https://docs.moderne.io/licensing/moderne-source-available-license
|
|
9
|
+
* <p>
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import {Marker} from "../markers";
|
|
17
|
+
import {randomId} from "../uuid";
|
|
18
|
+
import {Yaml} from "./tree";
|
|
19
|
+
import {RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "../rpc";
|
|
20
|
+
import {updateIfChanged} from "../util";
|
|
21
|
+
|
|
22
|
+
declare module "./tree" {
|
|
23
|
+
namespace Yaml {
|
|
24
|
+
export const Markers: {
|
|
25
|
+
readonly OmitColon: "org.openrewrite.yaml.marker.OmitColon";
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// At runtime actually attach it to Yaml
|
|
31
|
+
(Yaml as any).Markers = {
|
|
32
|
+
OmitColon: "org.openrewrite.yaml.marker.OmitColon"
|
|
33
|
+
} as const;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Marker indicating that a mapping entry should be printed without a colon.
|
|
37
|
+
* This is used for flow mappings like { "key", "key2" } where entries lack explicit colons.
|
|
38
|
+
*/
|
|
39
|
+
export interface OmitColon extends Marker {
|
|
40
|
+
readonly kind: typeof Yaml.Markers.OmitColon;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Creates an OmitColon marker.
|
|
45
|
+
*/
|
|
46
|
+
export function omitColon(): OmitColon {
|
|
47
|
+
return {
|
|
48
|
+
kind: Yaml.Markers.OmitColon,
|
|
49
|
+
id: randomId()
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Registers an RPC codec for any marker without additional properties.
|
|
55
|
+
*/
|
|
56
|
+
function registerMarkerCodec<M extends Marker>(kind: M["kind"]) {
|
|
57
|
+
RpcCodecs.registerCodec(kind, {
|
|
58
|
+
async rpcReceive(before: M, q: RpcReceiveQueue): Promise<M> {
|
|
59
|
+
return updateIfChanged(before, {
|
|
60
|
+
id: await q.receive(before.id),
|
|
61
|
+
} as Partial<M>);
|
|
62
|
+
},
|
|
63
|
+
|
|
64
|
+
async rpcSend(after: M, q: RpcSendQueue): Promise<void> {
|
|
65
|
+
await q.getAndSend(after, a => a.id);
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
registerMarkerCodec(Yaml.Markers.OmitColon);
|
package/src/yaml/parser.ts
CHANGED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import {emptyMarkers, markers, MarkersKind, ParseExceptionResult} from "../markers";
|
|
17
|
+
import {omitColon} from "./markers";
|
|
17
18
|
import {Parser, ParserInput, parserInputRead, Parsers} from "../parser";
|
|
18
19
|
import {randomId} from "../uuid";
|
|
19
20
|
import {SourceFile} from "../tree";
|
|
@@ -639,12 +640,15 @@ class YamlCstReader {
|
|
|
639
640
|
value = this.createEmptyScalar(afterColonSpace);
|
|
640
641
|
}
|
|
641
642
|
|
|
643
|
+
// In flow mappings like { "MV7", "7J04" }, entries may lack explicit colons
|
|
644
|
+
const entryMarkers = seenColon ? emptyMarkers : markers(omitColon());
|
|
645
|
+
|
|
642
646
|
return {
|
|
643
647
|
entry: {
|
|
644
648
|
kind: Yaml.Kind.MappingEntry,
|
|
645
649
|
id: randomId(),
|
|
646
650
|
prefix,
|
|
647
|
-
markers:
|
|
651
|
+
markers: entryMarkers,
|
|
648
652
|
key,
|
|
649
653
|
beforeMappingValueIndicator,
|
|
650
654
|
value
|
package/src/yaml/print.ts
CHANGED
|
@@ -17,7 +17,8 @@ import {PrintOutputCapture, TreePrinters} from "../print";
|
|
|
17
17
|
import {YamlVisitor} from "./visitor";
|
|
18
18
|
import {printTag, Yaml} from "./tree";
|
|
19
19
|
import {Cursor} from "../tree";
|
|
20
|
-
import {Markers} from "../markers";
|
|
20
|
+
import {findMarker, Markers} from "../markers";
|
|
21
|
+
import "./markers"; // Ensures Yaml.Markers is defined
|
|
21
22
|
|
|
22
23
|
class YamlPrinter extends YamlVisitor<PrintOutputCapture> {
|
|
23
24
|
|
|
@@ -88,7 +89,9 @@ class YamlPrinter extends YamlVisitor<PrintOutputCapture> {
|
|
|
88
89
|
await this.beforeSyntax(entry, p);
|
|
89
90
|
await this.visit(entry.key, p);
|
|
90
91
|
p.append(entry.beforeMappingValueIndicator);
|
|
91
|
-
|
|
92
|
+
if (!findMarker(entry, Yaml.Markers.OmitColon)) {
|
|
93
|
+
p.append(':');
|
|
94
|
+
}
|
|
92
95
|
await this.visit(entry.value, p);
|
|
93
96
|
this.afterSyntax(entry, p);
|
|
94
97
|
return entry;
|