Skip to content

Commit 62a3044

Browse files
committed
chore: format
1 parent b8a0e37 commit 62a3044

File tree

6 files changed

+54
-29
lines changed

6 files changed

+54
-29
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"eslint-plugin-vue": "^9.0.0",
7676
"mocha": "^10.0.0",
7777
"nyc": "^15.1.0",
78-
"prettier": "^3.0.0",
78+
"prettier": "~3.1.0",
7979
"ts-node": "^10.0.0",
8080
"typescript": "~5.0.0",
8181
"vue-eslint-parser": "^9.0.0"

src/parser/convert.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ export class TokenConvertor {
2929
}
3030

3131
// eslint-disable-next-line complexity -- X
32-
public convertToken(token: AcornToken): AST.Token | null {
32+
public convertToken(
33+
token: AcornToken & {
34+
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- ignore
35+
value: any;
36+
},
37+
): AST.Token | null {
3338
const { tokTypes } = this;
3439
let type: AST.Token["type"], value: string;
3540
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- ignore

src/parser/errors.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ export function throwUnexpectedNodeError(
154154
const type = (node as any).bigint
155155
? "bigint"
156156
: isRegExpLiteral(node)
157-
? "regex"
158-
: node.value === null
159-
? "null"
160-
: typeof node.value;
157+
? "regex"
158+
: node.value === null
159+
? "null"
160+
: typeof node.value;
161161
const locs = getLocation(node);
162162
const err = new ParseError(
163163
`Unexpected ${type} literal.`,

src/parser/extend-parser.ts

+27-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export function getParser(): typeof Parser {
2222
return parserCache;
2323
}
2424

25-
parserCache = class ExtendParser extends getAcorn().Parser {
25+
parserCache = class ExtendParser
26+
// @ts-expect-error -- Ignore
27+
extends getAcorn().Parser
28+
{
2629
private [PRIVATE]: {
2730
code: string;
2831
ctx: JSONSyntaxContext;
@@ -48,7 +51,7 @@ export function getParser(): typeof Parser {
4851
const onToken: Options["onToken"] =
4952
options.onToken ||
5053
((token) => {
51-
const t = tokenConvertor.convertToken(token);
54+
const t = tokenConvertor.convertToken(token as never);
5255
if (t) {
5356
this[PRIVATE].tokenStore.add(t);
5457
}
@@ -94,13 +97,27 @@ export function getParser(): typeof Parser {
9497
};
9598
}
9699

97-
public finishNode(...args: Parameters<Parser["finishNode"]>) {
98-
const result: Node = super.finishNode(...args);
100+
public finishNode(
101+
...args: Parameters<
102+
// @ts-expect-error -- Ignore
103+
Parser["finishNode"]
104+
>
105+
) {
106+
const result: Node =
107+
// @ts-expect-error -- Ignore
108+
super.finishNode(...args);
99109
return this[PRIVATE_PROCESS_NODE](result);
100110
}
101111

102-
public finishNodeAt(...args: Parameters<Parser["finishNodeAt"]>) {
103-
const result: Node = super.finishNodeAt(...args);
112+
public finishNodeAt(
113+
...args: Parameters<
114+
// @ts-expect-error -- Ignore
115+
Parser["finishNodeAt"]
116+
>
117+
) {
118+
const result: Node =
119+
// @ts-expect-error -- Ignore
120+
super.finishNodeAt(...args);
104121
return this[PRIVATE_PROCESS_NODE](result);
105122
}
106123

@@ -162,7 +179,10 @@ export function getParser(): typeof Parser {
162179

163180
/** Get extend parser */
164181
export function getAnyTokenErrorParser(): typeof Parser {
165-
const parser = class ExtendParser extends getParser() {
182+
const parser = class ExtendParser
183+
// @ts-expect-error -- Ignore
184+
extends getParser()
185+
{
166186
public constructor(options: Options, code: string, pos: number) {
167187
super(
168188
{

src/utils/ast.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ const resolver: { [key in JSONNode["type"]]: (node: any) => JSONValue } = {
143143
return node.operator === "+"
144144
? left + right
145145
: node.operator === "-"
146-
? left - right
147-
: node.operator === "*"
148-
? left * right
149-
: node.operator === "/"
150-
? left / right
151-
: node.operator === "%"
152-
? left % right
153-
: node.operator === "**"
154-
? left ** right
155-
: (() => {
156-
throw new Error(`Unknown operator: ${node.operator}`);
157-
})();
146+
? left - right
147+
: node.operator === "*"
148+
? left * right
149+
: node.operator === "/"
150+
? left / right
151+
: node.operator === "%"
152+
? left % right
153+
: node.operator === "**"
154+
? left ** right
155+
: (() => {
156+
throw new Error(`Unknown operator: ${node.operator}`);
157+
})();
158158
},
159159
JSONIdentifier(node: JSONIdentifier) {
160160
if (node.name === "Infinity") {

tests/src/parser/parser.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ function parse(code: string, fileName: string) {
1818
ext === ".json"
1919
? "JSON"
2020
: ext === ".jsonc"
21-
? "JSONC"
22-
: ext === ".json5"
23-
? "JSON5"
24-
: undefined,
21+
? "JSONC"
22+
: ext === ".json5"
23+
? "JSON5"
24+
: undefined,
2525
});
2626
}
2727

0 commit comments

Comments
 (0)