Merge remote-tracking branch 'mysticatea/master'

* mysticatea/master:
  2.0.1
  Fix: follow tc39/ecma262#910 (refs eslint/eslint#10861)
  2.0.0
  2.0.0-beta.0
  Update: Unicode version to 11
  Breaking: replace Disjunction node by Alternative node
  Docs: update README.md
  Chore: trivial
  Chore: follow up mysticatea#2
  Update: parseRegExpLiteral supports RegExp object
  Chore: coverage
  Chore: upgrade deps
  Fix: location of quantifier (fixes mysticatea#3)
  New: add visitor
  Chore: update eslint config
  Breaking: drop Node.js 4 support

# Conflicts:
#	.eslintignore
#	.eslintrc.yml
#	package.json
#	src/index.ts
#	src/parser.ts
#	test/fixtures/parser/literal.ts
#	tsconfig.json

Author: bluelovers

.gitignore

@@ -1,4 +1,6 @@
+/.nyc_output
 /.temp
+/coverage
 /node_modules
 /test.*
 ### git template

.nycrc

@@ -0,0 +1,6 @@
+{
+    "include": ["src/**/*.ts"],
+    "exclude": ["src/unicode/*.ts"],
+    "extension": [".ts"],
+    "require": ["ts-node/register"]
+}

.travis.yml

@@ -2,7 +2,9 @@ sudo: false
 
 language: node_js
 node_js:
-  - "4"
-  - "6"
+  - "6.5"
   - "8"
-  - "9"
+  - "10"
+
+after_success:
+  - npm run coveralls

README.md

@@ -3,6 +3,7 @@
 [![npm version](https://img.shields.io/npm/v/regexpp.svg)](https://www.npmjs.com/package/regexpp)
 [![Downloads/month](https://img.shields.io/npm/dm/regexpp.svg)](http://www.npmtrends.com/regexpp)
 [![Build Status](https://travis-ci.org/mysticatea/regexpp.svg?branch=master)](https://travis-ci.org/mysticatea/regexpp)
+[![Coverage Status](https://coveralls.io/repos/github/mysticatea/regexpp/badge.svg)](https://coveralls.io/github/mysticatea/regexpp)
 [![Dependency Status](https://david-dm.org/mysticatea/regexpp.svg)](https://david-dm.org/mysticatea/regexpp)
 
 The regular expression parser for ECMAScript.
@@ -13,7 +14,7 @@ The regular expression parser for ECMAScript.
 $ npm install regexpp
 ```
 
-- require Node.js 4.0.0 or newer.
+- require Node.js 6.5.0 or newer.
 
 ## 📖 Usage
 
@@ -22,8 +23,10 @@ import {
     AST,
     RegExpParser,
     RegExpValidator,
+    RegExpVisitor,
     parseRegExpLiteral,
     validateRegExpLiteral,
+    visitRegExpAST
 } from "regexpp"
 ```
 
@@ -34,7 +37,7 @@ Parse a given regular expression literal then make AST object.
 This is equivalent to `new RegExpParser(options).parseLiteral(source)`.
 
 - **Parameters:**
-    - `source` (`string`) The source code to parse.
+    - `source` (`string | RegExp`) The source code to parse.
     - `options?` ([`RegExpParser.Options`]) The options to parse.
 - **Return:**
     - The AST of the regular expression.
@@ -49,6 +52,16 @@ This is equivalent to `new RegExpValidator(options).validateLiteral(source)`.
     - `source` (`string`) The source code to validate.
     - `options?` ([`RegExpValidator.Options`]) The options to validate.
 
+### visitRegExpAST(ast, handlers)
+
+Visit each node of a given AST.
+
+This is equivalent to `new RegExpVisitor(handlers).visit(ast)`.
+
+- **Parameters:**
+    - `ast` ([`AST.Node`]) The AST to visit.
+    - `handlers` ([`RegExpVisitor.Handlers`]) The callbacks.
+
 ### RegExpParser
 
 #### new RegExpParser(options?)
@@ -125,6 +138,20 @@ Validate a regular expression flags.
     - `start?` (`number`) The start index in the source code. Default is `0`.
     - `end?` (`number`) The end index in the source code. Default is `source.length`.
 
+### RegExpVisitor
+
+#### new RegExpVisitor(handlers)
+
+- **Parameters:**
+    - `handlers` ([`RegExpVisitor.Handlers`]) The callbacks.
+
+#### visitor.visit(ast)
+
+Validate a regular expression literal.
+
+- **Parameters:**
+    - `ast` ([`AST.Node`]) The AST to visit.
+
 ## 📰 Changelog
 
 - [GitHub Releases](https://github.com/mysticatea/regexpp/releases)
@@ -145,5 +172,7 @@ Please use GitHub's Issues/PRs.
 - `npm run update:ids` updates `src/unicode/ids.ts`.
 - `npm run watch` runs tests with `--watch` option.
 
-[`RegExpParser.Options`]: src/parser.ts#L527
+[`AST.Node`]: src/ast.ts#L4
+[`RegExpParser.Options`]: src/parser.ts#L539
 [`RegExpValidator.Options`]: src/validator.ts#L127
+[`RegExpVisitor.Handlers`]: src/visitor.ts#L204

rollup.config.js

@@ -0,0 +1,27 @@
+import resolve from "rollup-plugin-node-resolve"
+import sourcemaps from "rollup-plugin-sourcemaps"
+
+export default [
+    {
+        input: ".temp/index.js",
+        output: {
+            file: "index.js",
+            format: "cjs",
+            sourcemap: true,
+            sourcemapFile: "index.js.map",
+            banner: `/*! @author Toru Nagashima <https://github.com/mysticatea> */`,
+        },
+        plugins: [sourcemaps(), resolve()],
+    },
+    {
+        input: ".temp/index.js",
+        output: {
+            file: "index.mjs",
+            format: "es",
+            sourcemap: true,
+            sourcemapFile: "index.mjs.map",
+            banner: `/*! @author Toru Nagashima <https://github.com/mysticatea> */`,
+        },
+        plugins: [sourcemaps(), resolve()],
+    },
+]

tools/clone-without-circular.ts renamed to scripts/clone-without-circular.ts

@@ -1,7 +1,7 @@
 const relative = require("path").posix.relative
 
 function resolveLocation(
-    obj: object,
+    obj: any,
     path: string[],
     pathMap: Map<object, string>,
 ): void {
@@ -38,7 +38,7 @@ function cloneWithoutCircularRec(x: any, pathMap: Map<object, string>): any {
         return x.map(el => cloneWithoutCircularRec(el, pathMap))
     }
 
-    const y = {}
+    const y = {} as any
     for (const key of Object.keys(x)) {
         if (key === "parent" || key === "resolved" || key === "references") {
             y[key] = getRelativePath(x, x[key], pathMap)

scripts/update-fixtures.ts

@@ -0,0 +1,71 @@
+import { AST, parseRegExpLiteral, visitRegExpAST } from "../src/index"
+import * as Parser from "../test/fixtures/parser/literal"
+import * as Visitor from "../test/fixtures/visitor"
+import { cloneWithoutCircular } from "./clone-without-circular"
+
+for (const filename of Object.keys(Parser.Fixtures)) {
+    const fixture = Parser.Fixtures[filename]
+    const options = fixture.options
+
+    for (const pattern of Object.keys(fixture.patterns)) {
+        try {
+            const ast = parseRegExpLiteral(pattern, options)
+            fixture.patterns[pattern] = { ast: cloneWithoutCircular(ast) }
+        } catch (err) {
+            fixture.patterns[pattern] = {
+                error: { message: err.message, index: err.index },
+            }
+        }
+    }
+
+    Parser.save()
+}
+
+for (const filename of Object.keys(Visitor.Fixtures)) {
+    const fixture = Visitor.Fixtures[filename]
+    const options = fixture.options
+
+    for (const pattern of Object.keys(fixture.patterns)) {
+        const ast = parseRegExpLiteral(pattern, options)
+        const history = [] as string[]
+        const enter = (node: AST.Node): void => {
+            history.push(`enter:${node.type}:${node.raw}`)
+        }
+        const leave = (node: AST.Node): void => {
+            history.push(`leave:${node.type}:${node.raw}`)
+        }
+
+        visitRegExpAST(ast, {
+            onAlternativeEnter: enter,
+            onAssertionEnter: enter,
+            onBackreferenceEnter: enter,
+            onCapturingGroupEnter: enter,
+            onCharacterEnter: enter,
+            onCharacterClassEnter: enter,
+            onCharacterClassRangeEnter: enter,
+            onCharacterSetEnter: enter,
+            onFlagsEnter: enter,
+            onGroupEnter: enter,
+            onPatternEnter: enter,
+            onQuantifierEnter: enter,
+            onRegExpLiteralEnter: enter,
+            onAlternativeLeave: leave,
+            onAssertionLeave: leave,
+            onBackreferenceLeave: leave,
+            onCapturingGroupLeave: leave,
+            onCharacterLeave: leave,
+            onCharacterClassLeave: leave,
+            onCharacterClassRangeLeave: leave,
+            onCharacterSetLeave: leave,
+            onFlagsLeave: leave,
+            onGroupLeave: leave,
+            onPatternLeave: leave,
+            onQuantifierLeave: leave,
+            onRegExpLiteralLeave: leave,
+        })
+
+        fixture.patterns[pattern] = history
+    }
+
+    Visitor.save()
+}

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

@@ -17,7 +17,7 @@ enum Mode {
 
 // Main
 ;(async () => {
-    let banner: string = ""
+    let banner = ""
     const idStartSet: Set<string> = new Set()
     const idStartSmall: Array<[number, number]> = []
     const idStartLarge: Array<[number, number]> = []
@@ -26,7 +26,7 @@ enum Mode {
 
     logger.log("Fetching data... (%s)", DB_URL)
     await processEachLine(line => {
-        let m: RegExpExecArray //eslint-disable-line init-declarations
+        let m: RegExpExecArray | null = null
         if (banner === "") {
             logger.log("Processing data... (%s)", line.slice(2))
             banner = `/* Generated from ${line.slice(2)} */`
@@ -68,7 +68,10 @@ ${makeCondition(idContinueLarge, Mode.Former)}
 }`
 
     logger.log("Formatting code...")
-    const engine = new CLIEngine({ fix: true })
+    const engine = new CLIEngine({
+        fix: true,
+        rules: { curly: "off" },
+    })
     const result = engine.executeOnText(code, "ids.ts").results[0]
     code = result.output || code
 
@@ -92,7 +95,7 @@ function processEachLine(cb: (line: string) => void): Promise<void> {
                     if (lines.length === 1) {
                         buffer = lines[0]
                     } else {
-                        buffer = lines.pop()
+                        buffer = lines.pop()!
                         for (const line of lines) {
                             cb(line)
                         }