@openrewrite/rewrite 8.69.0-20251207-125823 → 8.69.0-20251207-135957
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/json/parser.d.ts.map +1 -1
- package/dist/json/parser.js +22 -1
- package/dist/json/parser.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/json/parser.ts +26 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/json/parser.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,MAAM,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/json/parser.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAsC,MAAM,WAAW,CAAC;AAEnF,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AAInC,qBAAa,UAAW,SAAQ,MAAM;IAE3B,KAAK,CAAC,GAAG,WAAW,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC;CA2B1E"}
|
package/dist/json/parser.js
CHANGED
|
@@ -33,11 +33,32 @@ const markers_1 = require("../markers");
|
|
|
33
33
|
const parser_1 = require("../parser");
|
|
34
34
|
const uuid_1 = require("../uuid");
|
|
35
35
|
const tree_1 = require("./tree");
|
|
36
|
+
const parse_error_1 = require("../parse-error");
|
|
36
37
|
class JsonParser extends parser_1.Parser {
|
|
37
38
|
parse(...sourcePaths) {
|
|
38
39
|
return __asyncGenerator(this, arguments, function* parse_1() {
|
|
39
40
|
for (const sourcePath of sourcePaths) {
|
|
40
|
-
|
|
41
|
+
try {
|
|
42
|
+
yield yield __await(Object.assign(Object.assign({}, new ParseJsonReader(sourcePath).parse()), { sourcePath: this.relativePath(sourcePath) }));
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
// Return a ParseError for files that can't be parsed (e.g., JSONC with comments)
|
|
46
|
+
const text = (0, parser_1.parserInputRead)(sourcePath);
|
|
47
|
+
const parseError = {
|
|
48
|
+
kind: parse_error_1.ParseErrorKind,
|
|
49
|
+
id: (0, uuid_1.randomId)(),
|
|
50
|
+
markers: (0, markers_1.markers)({
|
|
51
|
+
kind: markers_1.MarkersKind.ParseExceptionResult,
|
|
52
|
+
id: (0, uuid_1.randomId)(),
|
|
53
|
+
parserType: "JsonParser",
|
|
54
|
+
exceptionType: e.name || "Error",
|
|
55
|
+
message: e.message || "Unknown parse error"
|
|
56
|
+
}),
|
|
57
|
+
sourcePath: this.relativePath(sourcePath),
|
|
58
|
+
text
|
|
59
|
+
};
|
|
60
|
+
yield yield __await(parseError);
|
|
61
|
+
}
|
|
41
62
|
}
|
|
42
63
|
});
|
|
43
64
|
}
|
package/dist/json/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/json/parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/json/parser.ts"],"names":[],"mappings":"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"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.69.0-20251207-
|
|
1
|
+
8.69.0-20251207-135957
|
package/package.json
CHANGED
package/src/json/parser.ts
CHANGED
|
@@ -13,20 +13,40 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import {emptyMarkers} from "../markers";
|
|
17
|
-
import {Parser, ParserInput, ParserSourceReader} from "../parser";
|
|
16
|
+
import {emptyMarkers, markers, MarkersKind, ParseExceptionResult} from "../markers";
|
|
17
|
+
import {Parser, ParserInput, parserInputRead, ParserSourceReader} from "../parser";
|
|
18
18
|
import {randomId} from "../uuid";
|
|
19
19
|
import {SourceFile} from "../tree";
|
|
20
20
|
import {emptySpace, Json, space} from "./tree";
|
|
21
|
+
import {ParseError, ParseErrorKind} from "../parse-error";
|
|
21
22
|
|
|
22
23
|
export class JsonParser extends Parser {
|
|
23
24
|
|
|
24
25
|
async *parse(...sourcePaths: ParserInput[]): AsyncGenerator<SourceFile> {
|
|
25
26
|
for (const sourcePath of sourcePaths) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
try {
|
|
28
|
+
yield {
|
|
29
|
+
...new ParseJsonReader(sourcePath).parse(),
|
|
30
|
+
sourcePath: this.relativePath(sourcePath)
|
|
31
|
+
};
|
|
32
|
+
} catch (e: any) {
|
|
33
|
+
// Return a ParseError for files that can't be parsed (e.g., JSONC with comments)
|
|
34
|
+
const text = parserInputRead(sourcePath);
|
|
35
|
+
const parseError: ParseError = {
|
|
36
|
+
kind: ParseErrorKind,
|
|
37
|
+
id: randomId(),
|
|
38
|
+
markers: markers({
|
|
39
|
+
kind: MarkersKind.ParseExceptionResult,
|
|
40
|
+
id: randomId(),
|
|
41
|
+
parserType: "JsonParser",
|
|
42
|
+
exceptionType: e.name || "Error",
|
|
43
|
+
message: e.message || "Unknown parse error"
|
|
44
|
+
} satisfies ParseExceptionResult as ParseExceptionResult),
|
|
45
|
+
sourcePath: this.relativePath(sourcePath),
|
|
46
|
+
text
|
|
47
|
+
};
|
|
48
|
+
yield parseError;
|
|
49
|
+
}
|
|
30
50
|
}
|
|
31
51
|
}
|
|
32
52
|
}
|