Skip to content

Commit 0dbc2d3

Browse files
committed
Chore: update eslint config
1 parent 54ffa1a commit 0dbc2d3

12 files changed

+98
-113
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/.temp
22
/node_modules
3+
/src/unicode
34
/index.*

.eslintrc.yml

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,8 @@
11
extends:
2-
- mysticatea
3-
- mysticatea/modules
4-
- plugin:prettier/recommended
5-
6-
rules:
7-
class-methods-use-this: off
8-
complexity: off
9-
mysticatea/arrow-parens: off
10-
mysticatea/prefer-for-of: off
11-
prettier/prettier:
12-
- error
13-
- tabWidth: 4
14-
semi: false
15-
trailingComma: all
16-
parser: typescript
2+
- plugin:mysticatea/es2018
173

184
overrides:
19-
- files: ["*.ts"]
20-
parser: typescript-eslint-parser
5+
- files: "*.ts"
216
rules:
22-
lines-between-class-members: off
23-
no-invalid-this: off
24-
no-loop-func: off
25-
no-undef: off
26-
no-unused-vars: off
27-
no-use-before-define: off
287
require-jsdoc: off
29-
valid-jsdoc: off
30-
settings:
31-
node:
32-
tryExtensions: [".ts"]
33-
34-
- files: ["src/unicode/ids.ts"]
35-
rules:
36-
import/exports-last: off
37-
38-
- files: ["src/unicode/property-data.ts"]
39-
rules:
40-
camelcase: off
8+
mysticatea/ts/no-use-before-define: off

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
"@types/node": "^9.4.6",
1717
"dts-bundle": "^0.7.3",
1818
"eslint": "^4.18.0",
19-
"eslint-config-mysticatea": "^13.0.2",
20-
"eslint-config-prettier": "^2.9.0",
21-
"eslint-plugin-prettier": "^2.4.0",
19+
"eslint-plugin-mysticatea": "^5.0.0-beta.15",
2220
"mocha": "^5.0.1",
2321
"npm-run-all": "^4.1.2",
24-
"prettier": "^1.9.2",
2522
"rimraf": "^2.6.2",
2623
"rollup": "^0.56.1",
2724
"rollup-plugin-node-resolve": "^3.0.3",
@@ -34,11 +31,11 @@
3431
"scripts": {
3532
"prebuild": "npm run -s clean",
3633
"build": "run-s build:*",
37-
"build:tsc": "tsc --module es2015 --target es2015",
34+
"build:tsc": "tsc --module es2015",
3835
"build:rollup": "rollup -c",
3936
"build:dts": "dts-bundle --name regexpp --main .temp/index.d.ts --out ../index.d.ts",
4037
"clean": "rimraf .temp index.*",
41-
"lint": "eslint src test tools --ext .ts",
38+
"lint": "eslint scripts src test --ext .ts",
4239
"pretest": "run-s build lint",
4340
"test": "_mocha --require ts-node/register --reporter dot --timeout 10000 \"test/*.ts\"",
4441
"update:test": "ts-node tools/update-fixtures.ts",
File renamed without changes.
File renamed without changes.

tools/update-unicode-ids.ts renamed to scripts/update-unicode-ids.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ enum Mode {
1717

1818
// Main
1919
;(async () => {
20-
let banner: string = ""
20+
let banner = ""
2121
const idStartSet: Set<string> = new Set()
2222
const idStartSmall: Array<[number, number]> = []
2323
const idStartLarge: Array<[number, number]> = []
@@ -26,7 +26,7 @@ enum Mode {
2626

2727
logger.log("Fetching data... (%s)", DB_URL)
2828
await processEachLine(line => {
29-
let m: RegExpExecArray //eslint-disable-line init-declarations
29+
let m: RegExpExecArray
3030
if (banner === "") {
3131
logger.log("Processing data... (%s)", line.slice(2))
3232
banner = `/* Generated from ${line.slice(2)} */`

src/parser.ts

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -87,36 +87,36 @@ function addCommonElement(
8787
}
8888

8989
class RegExpParserState {
90-
readonly strict: boolean
91-
readonly ecmaVersion: 5 | 2015 | 2016 | 2017 | 2018
90+
public readonly strict: boolean
91+
public readonly ecmaVersion: 5 | 2015 | 2016 | 2017 | 2018
9292
private _node: AppendableNode = DummyPattern
9393
private _flags: Flags = DummyFlags
9494
private _disjunctionStartStack: number[] = []
9595
private _backreferences: Backreference[] = []
9696
private _capturingGroups: CapturingGroup[] = []
9797

98-
source: string = ""
98+
public source = ""
9999

100-
constructor(options?: RegExpParser.Options) {
100+
public constructor(options?: RegExpParser.Options) {
101101
this.strict = Boolean(options && options.strict)
102102
this.ecmaVersion = (options && options.ecmaVersion) || 2018
103103
}
104104

105-
get pattern(): Pattern {
105+
public get pattern(): Pattern {
106106
if (this._node.type !== "Pattern") {
107107
throw new Error("UnknownError")
108108
}
109109
return this._node
110110
}
111111

112-
get flags(): Flags {
112+
public get flags(): Flags {
113113
if (this._flags.type !== "Flags") {
114114
throw new Error("UnknownError")
115115
}
116116
return this._flags
117117
}
118118

119-
onFlags(
119+
public onFlags(
120120
start: number,
121121
end: number,
122122
global: boolean,
@@ -141,7 +141,7 @@ class RegExpParserState {
141141
}
142142
}
143143

144-
onPatternEnter(start: number): void {
144+
public onPatternEnter(start: number): void {
145145
this._node = {
146146
type: "Pattern",
147147
parent: null,
@@ -154,7 +154,7 @@ class RegExpParserState {
154154
this._capturingGroups.length = 0
155155
}
156156

157-
onPatternLeave(start: number, end: number): void {
157+
public onPatternLeave(start: number, end: number): void {
158158
this._node.end = end
159159
this._node.raw = this.source.slice(start, end)
160160

@@ -169,15 +169,15 @@ class RegExpParserState {
169169
}
170170
}
171171

172-
onDisjunctionEnter(start: number): void {
172+
public onDisjunctionEnter(start: number): void {
173173
this._disjunctionStartStack.push(start)
174174
}
175175

176-
onDisjunctionLeave(start: number, end: number): void {
176+
public onDisjunctionLeave(start: number, end: number): void {
177177
this._disjunctionStartStack.pop()
178178
}
179179

180-
onAlternativeEnter(start: number, index: number): void {
180+
public onAlternativeEnter(start: number, index: number): void {
181181
if (index === 0) {
182182
return
183183
}
@@ -212,7 +212,7 @@ class RegExpParserState {
212212
}
213213
}
214214

215-
onAlternativeLeave(start: number, end: number, index: number): void {
215+
public onAlternativeLeave(start: number, end: number, index: number): void {
216216
if (index === 0) {
217217
return
218218
}
@@ -221,7 +221,7 @@ class RegExpParserState {
221221
this._node = this._node.parent as AppendableNode
222222
}
223223

224-
onGroupEnter(start: number): void {
224+
public onGroupEnter(start: number): void {
225225
const parentNode = this._node
226226
if (parentNode.type === "CharacterClass") {
227227
throw new Error("UnknownError")
@@ -238,13 +238,13 @@ class RegExpParserState {
238238
addAlternativeElement(parentNode, this._node)
239239
}
240240

241-
onGroupLeave(start: number, end: number): void {
241+
public onGroupLeave(start: number, end: number): void {
242242
this._node.end = end
243243
this._node.raw = this.source.slice(start, end)
244244
this._node = this._node.parent as AppendableNode
245245
}
246246

247-
onCapturingGroupEnter(start: number, name: string | null): void {
247+
public onCapturingGroupEnter(start: number, name: string | null): void {
248248
const parentNode = this._node
249249
if (parentNode.type === "CharacterClass") {
250250
throw new Error("UnknownError")
@@ -264,7 +264,7 @@ class RegExpParserState {
264264
this._capturingGroups.push(this._node)
265265
}
266266

267-
onCapturingGroupLeave(
267+
public onCapturingGroupLeave(
268268
start: number,
269269
end: number,
270270
name: string | null,
@@ -274,7 +274,7 @@ class RegExpParserState {
274274
this._node = this._node.parent as AppendableNode
275275
}
276276

277-
onQuantifier(
277+
public onQuantifier(
278278
start: number,
279279
end: number,
280280
min: number,
@@ -307,7 +307,7 @@ class RegExpParserState {
307307
prevNode.parent = node
308308
}
309309

310-
onLookaroundAssertionEnter(
310+
public onLookaroundAssertionEnter(
311311
start: number,
312312
kind: "lookahead" | "lookbehind",
313313
negate: boolean,
@@ -330,7 +330,7 @@ class RegExpParserState {
330330
addAlternativeElement(parentNode, this._node)
331331
}
332332

333-
onLookaroundAssertionLeave(
333+
public onLookaroundAssertionLeave(
334334
start: number,
335335
end: number,
336336
kind: "lookahead" | "lookbehind",
@@ -341,7 +341,11 @@ class RegExpParserState {
341341
this._node = this._node.parent as AppendableNode
342342
}
343343

344-
onEdgeAssertion(start: number, end: number, kind: "start" | "end"): void {
344+
public onEdgeAssertion(
345+
start: number,
346+
end: number,
347+
kind: "start" | "end",
348+
): void {
345349
const parentNode = this._node
346350
if (parentNode.type === "CharacterClass") {
347351
throw new Error("UnknownError")
@@ -357,7 +361,7 @@ class RegExpParserState {
357361
})
358362
}
359363

360-
onWordBoundaryAssertion(
364+
public onWordBoundaryAssertion(
361365
start: number,
362366
end: number,
363367
kind: "word",
@@ -379,7 +383,7 @@ class RegExpParserState {
379383
})
380384
}
381385

382-
onAnyCharacterSet(start: number, end: number, kind: "any"): void {
386+
public onAnyCharacterSet(start: number, end: number, kind: "any"): void {
383387
const parentNode = this._node
384388
if (parentNode.type === "CharacterClass") {
385389
throw new Error("UnknownError")
@@ -395,7 +399,7 @@ class RegExpParserState {
395399
})
396400
}
397401

398-
onEscapeCharacterSet(
402+
public onEscapeCharacterSet(
399403
start: number,
400404
end: number,
401405
kind: "digit" | "space" | "word",
@@ -412,7 +416,7 @@ class RegExpParserState {
412416
})
413417
}
414418

415-
onUnicodePropertyCharacterSet(
419+
public onUnicodePropertyCharacterSet(
416420
start: number,
417421
end: number,
418422
kind: "property",
@@ -433,7 +437,7 @@ class RegExpParserState {
433437
})
434438
}
435439

436-
onCharacter(start: number, end: number, value: number): void {
440+
public onCharacter(start: number, end: number, value: number): void {
437441
addCommonElement(this._node, {
438442
type: "Character",
439443
parent: this._node,
@@ -444,7 +448,11 @@ class RegExpParserState {
444448
})
445449
}
446450

447-
onBackreference(start: number, end: number, ref: number | string): void {
451+
public onBackreference(
452+
start: number,
453+
end: number,
454+
ref: number | string,
455+
): void {
448456
const parentNode = this._node
449457
if (parentNode.type === "CharacterClass") {
450458
throw new Error("UnknownError")
@@ -463,7 +471,7 @@ class RegExpParserState {
463471
this._backreferences.push(node)
464472
}
465473

466-
onCharacterClassEnter(start: number, negate: boolean): void {
474+
public onCharacterClassEnter(start: number, negate: boolean): void {
467475
const parentNode = this._node
468476
if (parentNode.type === "CharacterClass") {
469477
throw new Error("UnknownError")
@@ -481,13 +489,17 @@ class RegExpParserState {
481489
addAlternativeElement(parentNode, this._node)
482490
}
483491

484-
onCharacterClassLeave(start: number, end: number, negate: boolean): void {
492+
public onCharacterClassLeave(
493+
start: number,
494+
end: number,
495+
negate: boolean,
496+
): void {
485497
this._node.end = end
486498
this._node.raw = this.source.slice(start, end)
487499
this._node = this._node.parent as AppendableNode
488500
}
489501

490-
onCharacterClassRange(
502+
public onCharacterClassRange(
491503
start: number,
492504
end: number,
493505
min: number,
@@ -548,7 +560,7 @@ export class RegExpParser {
548560
* Initialize this parser.
549561
* @param options The options of parser.
550562
*/
551-
constructor(options?: RegExpParser.Options) {
563+
public constructor(options?: RegExpParser.Options) {
552564
this._state = new RegExpParserState(options)
553565
this._validator = new RegExpValidator(this._state)
554566
}
@@ -560,9 +572,9 @@ export class RegExpParser {
560572
* @param end The end index in the source code.
561573
* @returns The AST of the given regular expression.
562574
*/
563-
parseLiteral(
575+
public parseLiteral(
564576
source: string,
565-
start: number = 0,
577+
start = 0,
566578
end: number = source.length,
567579
): RegExpLiteral {
568580
this._state.source = source
@@ -590,9 +602,9 @@ export class RegExpParser {
590602
* @param end The end index in the source code.
591603
* @returns The AST of the given flags.
592604
*/
593-
parseFlags(
605+
public parseFlags(
594606
source: string,
595-
start: number = 0,
607+
start = 0,
596608
end: number = source.length,
597609
): Flags {
598610
this._state.source = source
@@ -608,11 +620,11 @@ export class RegExpParser {
608620
* @param uFlag The flag to set unicode mode.
609621
* @returns The AST of the given pattern.
610622
*/
611-
parsePattern(
623+
public parsePattern(
612624
source: string,
613-
start: number = 0,
625+
start = 0,
614626
end: number = source.length,
615-
uFlag: boolean = false,
627+
uFlag = false,
616628
): Pattern {
617629
this._state.source = source
618630
this._validator.validatePattern(source, start, end, uFlag)

0 commit comments

Comments
 (0)