diff --git a/.travis.yml b/.travis.yml index e1d38de890..eb22eaf9c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,48 +1,43 @@ sudo: false language: node_js node_js: - - "0.10" - - "0.12" - "4" - - "5" - "6" - "7" -before_install: - # Rollup doesn't support node < 4.x. Switch to latest for build - - . $HOME/.nvm/nvm.sh - - nvm install stable && nvm use stable +env: + - JOB=test before_script: - - 'if [ -n "${BABEL-}" ]; then make bootstrap-babel ; fi' - - 'if [ -n "${FLOWTESTS-}" ]; then make bootstrap-flow ; fi' - - 'BABEL_ENV=test npm run build' - # Switch back to node version currently being tested prior to test run - - 'nvm use $TRAVIS_NODE_VERSION;' + - 'if [ "$JOB" = "babel-test" ]; then make bootstrap-babel ; fi' + - 'if [ "$JOB" = "flow-test" ]; then make bootstrap-flow ; fi' + - 'if [ "$JOB" = "test" ]; then yarn run build; fi' script: - - 'if [ -n "${LINT-}" ]; then npm run lint ; fi' - - 'if [ -n "${FLOW-}" ]; then npm run flow ; fi' - - 'if [ -n "${FLOWTESTS-}" ]; then make test-flow ; fi' - - 'if [ -n "${BABEL-}" ]; then make test-babel ; fi' - - 'if [ -z "${LINT-}" ] && [ -z "${FLOW-}" ] && [ -z "${BABEL-}" ] && [ -z "${FLOWTESTS-}" ]; then npm run test-ci ; fi' + - 'if [ "$JOB" = "test" ]; then yarn test-only; fi' + - 'if [ "$JOB" = "lint" ]; then yarn run lint && yarn run flow; fi' + - 'if [ "$JOB" = "flow-test" ]; then make test-flow; fi' + - 'if [ "$JOB" = "babel-test" ]; then make test-babel; fi' + - 'if [ "$JOB" = "test-coverage" ]; then yarn run test-coverage; fi' matrix: fast_finish: true include: - - node_js: "node" - env: LINT=true - - node_js: "node" - env: FLOW=true - - node_js: "node" - env: BABEL=true - - node_js: "node" - env: FLOWTESTS=true + - node_js: "lts/*" + env: JOB=test-coverage + - node_js: "lts/*" + env: JOB=lint + - node_js: "lts/*" + env: JOB=babel-test + - node_js: "lts/*" + env: JOB=flow-test allow_failures: - - node_js: "node" - env: FLOWTESTS=true + - node_js: "lts/*" + env: JOB=flow-test -after_success: 'if [ -z "${LINT-}" ] && [ -z "${FLOW-}" ] && [ -z "${FLOWTESTS-}" ]; then npm run coverage ; fi' +after_success: + - 'if [ "$JOB" = "babel-test" ]; then bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json -F babel ; fi' + - 'if [ "$JOB" = "test-coverage" ]; then bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json -F babylon ; fi' notifications: slack: babeljs:5Wy4QX13KVkGy9CnU0rmvgeK diff --git a/CHANGELOG.md b/CHANGELOG.md index bb482fc5c7..161458e9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,54 @@ _Note: Gaps between patch versions are faulty, broken or test releases._ See the [Babel Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) for the pre-6.8.0 version Changelog. +## 7.0.0-beta.4 (2017-03-01) + +* Don't consume async when checking for async func decl (#377) (Brian Ng) +* add `ranges` option [skip ci] (Henry Zhu) +* Don't parse class properties without initializers when classProperties is disabled and Flow is enabled (#300) (Andrew Levine) + +## 7.0.0-beta.3 (2017-02-28) + +- [7.0] Change RestProperty/SpreadProperty to RestElement/SpreadElement (#384) +- Merge changes from 6.x + +## 7.0.0-beta.2 (2017-02-20) + +- estree: correctly change literals in all cases (#368) (Daniel Tschinder) + +## 7.0.0-beta.1 (2017-02-20) + +- Fix negative number literal typeannotations (#366) (Daniel Tschinder) +- Update contributing with more test info [skip ci] (#355) (Brian Ng) + +## 7.0.0-beta.0 (2017-02-15) + +- Reintroduce Variance node (#333) (Daniel Tschinder) +- Rename NumericLiteralTypeAnnotation to NumberLiteralTypeAnnotation (#332) (Charles Pick) +- [7.0] Remove ForAwaitStatement, add await flag to ForOfStatement (#349) (Brandon Dail) +- chore(package): update ava to version 0.18.0 (#345) (greenkeeper[bot]) +- chore(package): update babel-plugin-istanbul to version 4.0.0 (#350) (greenkeeper[bot]) +- Change location of ObjectTypeIndexer to match flow (#228) (Daniel Tschinder) +- Rename flow AST Type ExistentialTypeParam to ExistsTypeAnnotation (#322) (Toru Kobayashi) +- Revert "Temporary rollback for erroring on trailing comma with spread (#154)" (#290) (Daniel Tschinder) +- Remove classConstructorCall plugin (#291) (Brian Ng) +- Update yarn.lock (Daniel Tschinder) +- Update cross-env to 3.x (Daniel Tschinder) +- [7.0] Remove node 0.10, 0.12 and 5 from Travis (#284) (Sergey Rubanov) +- Remove `String.fromCodePoint` shim (#279) (Mathias Bynens) + +## 6.16.1 (2017-02-23) + +### :bug: Regression + +- Revert "Fix export default async function to be FunctionDeclaration" ([#375](https://github.com/babel/babylon/pull/375)) + +Need to modify Babel for this AST node change, so moving to 7.0. + +- Revert "Don't parse class properties without initializers when classProperties plugin is disabled, and Flow is enabled" ([#376](https://github.com/babel/babylon/pull/376)) + +[react-native](https://github.com/facebook/react-native/issues/12542) broke with this so we reverted. + ## 6.16.0 (2017-02-23) ### :rocket: New Feature diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5130b2c078..c065958bdf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,10 +6,14 @@ contributing, please read the ## Setup local env +> Install yarn beforehand: https://yarnpkg.com/en/docs/install + To start developing on Babylon you only need to install its dependencies: ```bash -npm install +git clone https://github.com/babel/babylon +cd babylon +yarn ``` ## Tests @@ -31,6 +35,26 @@ npm run test-only Note, this does not actually run a build, so you may have to call `npm run build` after performing any changes. +### Running one test + +To run only a single test, add `"only": true` to the `options.json` inside any test fixture folder (you may have to create the file if it doesn't exist). +For example, let's say we want to only run the test for the [`test/fixtures/comments/basic/shebang-import`](https://github.com/babel/babylon/tree/7.0/test/fixtures/comments/basic/shebang-import) fixture. + +Add `"only": true` to its `options.json`: + +```json +{ + "sourceType": "module", + "only": true +} +``` + +Then, run the tests using the same command as before: + +```bash +npm run test-only +``` + ### Checking code coverage locally To generate code coverage, be sure to set `BABEL_ENV=test` so that code is instrumented during diff --git a/Makefile b/Makefile index 22e088f90a..82a89ee84b 100644 --- a/Makefile +++ b/Makefile @@ -8,19 +8,18 @@ clean: ; rm -rf ./build bootstrap-babel: clean mkdir ./build - git clone --depth=1 --branch=master https://github.com/babel/babel.git ./build/babel + git clone --depth=1 --branch=7.0 https://github.com/babel/babel.git ./build/babel cd ./build/babel; \ make bootstrap find ./build/babel/packages -type d -name 'babylon' -prune -exec rm -rf '{}' \; -exec ln -s '../../../../../' '{}' \; test-babel: - BABEL_ENV=test npm run build + BABEL_ENV=test yarn run build # in case babel ever switches to nyc: filter its config out of package.json cd ./build/babel; \ jq "del(.nyc)" package.json > package.nonyc.json; \ mv -f package.nonyc.json package.json; \ - ../../node_modules/.bin/nyc --no-instrument --no-source-map --report-dir ../../coverage node_modules/mocha/bin/_mocha `scripts/_get-test-directories.sh` --opts test/mocha.opts; \ - mv .nyc_output ../../.nyc_output + ../../node_modules/.bin/nyc --no-instrument --no-source-map --reporter=json --report-dir ../../coverage node_modules/mocha/bin/_mocha `scripts/_get-test-directories.sh` --opts test/mocha.opts; \ bootstrap-flow: clean mkdir ./build diff --git a/README.md b/README.md index ad2a8fd874..39188bb475 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@

+ NPM Version Travis Status Codecov Status

@@ -56,6 +57,8 @@ mind. When in doubt, use `.parse()`. - **strictMode**: TODO +- **ranges**: Adds a `ranges` property to each node: `[node.start, node.end]` + ### Output Babylon generates AST according to [Babel AST format][]. diff --git a/ast/spec.md b/ast/spec.md index f06b1ebe99..0ff1c87c51 100644 --- a/ast/spec.md +++ b/ast/spec.md @@ -1,6 +1,7 @@ These are the core Babylon AST node types. - [Node objects](#node-objects) +- [Changes](#changes) - [Identifier](#identifier) - [Literals](#literals) - [RegExpLiteral](#regexpliteral) @@ -35,7 +36,6 @@ These are the core Babylon AST node types. - [ForStatement](#forstatement) - [ForInStatement](#forinstatement) - [ForOfStatement](#forofstatement) - - [ForAwaitStatement](#forawaitstatement) - [Declarations](#declarations) - [FunctionDeclaration](#functiondeclaration) - [VariableDeclaration](#variabledeclaration) @@ -56,8 +56,6 @@ These are the core Babylon AST node types. - [ObjectMember](#objectmember) - [ObjectProperty](#objectproperty) - [ObjectMethod](#objectmethod) - - [RestProperty](#restproperty) - - [SpreadProperty](#spreadproperty) - [FunctionExpression](#functionexpression) - [Unary operations](#unary-operations) - [UnaryExpression](#unaryexpression) @@ -141,6 +139,22 @@ interface Position { } ``` +# Changes + +### Babylon 7 + +Flow: Node renamed from `ExistentialTypeParam` to `ExistsTypeAnnotation` [#322](https://github.com/babel/babylon/pull/322) + +Flow: Node renamed from `NumericLiteralTypeAnnotation` to `NumberLiteralTypeAnnotation` [babel/babylon#332](https://github.com/babel/babylon/pull/332) + +Flow: Node `Variance` which replaces the string value of the `variance` field on several nodes [babel/babylon#333](https://github.com/babel/babylon/pull/333) + +Flow: `ObjectTypeIndexer` location info matches Flow's better [babel/babylon#228](https://github.com/babel/babylon/pull/228) + +Node `ForAwaitStatement` has been removed [#349](https://github.com/babel/babylon/pull/349) in favor of modifying `ForOfStatement` + +`RestProperty` and `SpreadProperty` have been dropped in favor of `RestElement` and `SpreadElement`. + # Identifier ```js @@ -479,16 +493,7 @@ A `for`/`in` statement. ```js interface ForOfStatement <: ForInStatement { type: "ForOfStatement"; -} -``` - -A `for`/`await` statement. - -## ForAwaitStatement - -```js -interface ForAwaitStatement <: ForInStatement { - type: "ForAwaitStatement"; + await: boolean; } ``` @@ -652,7 +657,7 @@ An array expression. ```js interface ObjectExpression <: Expression { type: "ObjectExpression"; - properties: [ ObjectProperty | ObjectMethod | SpreadProperty ]; + properties: [ ObjectProperty | ObjectMethod | SpreadElement ]; } ``` @@ -664,7 +669,6 @@ An object expression. interface ObjectMember <: Node { key: Expression; computed: boolean; - value: Expression; decorators: [ Decorator ]; } ``` @@ -675,6 +679,7 @@ interface ObjectMember <: Node { interface ObjectProperty <: ObjectMember { type: "ObjectProperty"; shorthand: boolean; + value: Expression; } ``` @@ -687,24 +692,6 @@ interface ObjectMethod <: ObjectMember, Function { } ``` -## RestProperty - -```js -interface RestProperty <: Node { - type: "RestProperty"; - argument: Expression; -} -``` - -## SpreadProperty - -```js -interface SpreadProperty <: Node { - type: "SpreadProperty"; - argument: Expression; -} -``` - ## FunctionExpression ```js @@ -980,7 +967,7 @@ interface AssignmentProperty <: ObjectProperty { interface ObjectPattern <: Pattern { type: "ObjectPattern"; - properties: [ AssignmentProperty | RestProperty ]; + properties: [ AssignmentProperty | RestElement ]; } ``` @@ -1035,10 +1022,9 @@ interface ClassBody <: Node { ## ClassMethod ```js -interface ClassMethod <: Node { +interface ClassMethod <: Function { type: "ClassMethod"; key: Expression; - value: FunctionExpression; kind: "constructor" | "method" | "get" | "set"; computed: boolean; static: boolean; diff --git a/package.json b/package.json index eb5642d926..816c2c4d59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "babylon", - "version": "6.16.1", + "version": "7.0.0-beta.5", "description": "A JavaScript parser", "author": "Sebastian McKenzie ", "homepage": "https://babeljs.io/", @@ -17,19 +17,21 @@ "bin", "lib" ], + "engines": { + "node": ">=4.2.0" + }, "devDependencies": { - "ava": "^0.17.0", + "ava": "^0.18.0", "babel-cli": "^6.14.0", "babel-eslint": "^7.0.0", "babel-helper-fixtures": "^6.9.0", "babel-plugin-external-helpers": "^6.18.0", - "babel-plugin-istanbul": "^3.0.0", + "babel-plugin-istanbul": "^4.0.0", "babel-plugin-transform-flow-strip-types": "^6.14.0", "babel-preset-es2015": "^6.14.0", "babel-preset-stage-0": "^6.5.0", "chalk": "^1.1.3", - "codecov": "^1.0.1", - "cross-env": "^2.0.0", + "cross-env": "^3.1.4", "eslint": "^3.7.1", "eslint-config-babel": "^6.0.0", "eslint-plugin-flowtype": "^2.20.0", @@ -46,18 +48,17 @@ "babylon": "./bin/babylon.js" }, "scripts": { - "build": "npm run clean && rollup -c", - "coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", - "lint": "eslint src bin", + "build": "yarn run clean && rollup -c", + "changelog": "git log `git describe --tags --abbrev=0`..HEAD --pretty=format:' * %s (%an)' | grep -v 'Merge pull request'", "clean": "rimraf lib", "flow": "flow", - "prepublish": "cross-env BABEL_ENV=production npm run build", - "preversion": "npm run test && npm run changelog", - "test": "npm run lint && npm run flow && npm run build -- -m && npm run test-only", + "lint": "eslint src bin", + "prepublish": "cross-env BABEL_ENV=production yarn run build", + "preversion": "yarn run test && npm run changelog", + "test": "yarn run lint && yarn run flow && yarn run build -- -m && yarn run test-only", "test-only": "ava", - "test-ci": "nyc npm run test-only", - "changelog": "git log `git describe --tags --abbrev=0`..HEAD --pretty=format:' * %s (%an)' | grep -v 'Merge pull request'", - "watch": "npm run clean && rollup -c --watch" + "test-coverage": "cross-env BABEL_ENV=test yarn run build && nyc --reporter=json --reporter=text yarn run test-only", + "watch": "yarn run clean && rollup -c --watch" }, "nyc": { "include": [ @@ -75,10 +76,5 @@ "src/**/*.js", "bin/**/*.js" ] - }, - "greenkeeper": { - "ignore": [ - "cross-env" - ] } } diff --git a/scripts/rmExpected.js b/scripts/rmExpected.js new file mode 100644 index 0000000000..613071b02f --- /dev/null +++ b/scripts/rmExpected.js @@ -0,0 +1,24 @@ +// Use this to remove all "expected.json" in all tests. + +const { existsSync, readdirSync, statSync, unlinkSync } = require("fs"); +const { join } = require("path"); + +const rootPath = join(__dirname, "..", "test", "fixtures"); + +for (const fixtureName of readdirSync(rootPath)) { + const fixturePath = join(rootPath, fixtureName); + for (const suiteName of readdirSync(fixturePath)) { + const suitePath = join(fixturePath, suiteName); + if (!statSync(suitePath).isDirectory()) { + continue; + } + + for (const testName of readdirSync(suitePath)) { + const testPath = join(suitePath, testName); + const expectedPath = join(testPath, "expected.json"); + if (existsSync(expectedPath)) { + unlinkSync(expectedPath); + } + } + } +} diff --git a/src/options.js b/src/options.js index 72c65f34a6..ad75996fce 100755 --- a/src/options.js +++ b/src/options.js @@ -9,7 +9,8 @@ export const defaultOptions: { allowImportExportEverywhere: boolean, allowSuperOutsideMethod: boolean, plugins: Array, - strictMode: any + strictMode: any, + ranges: boolean, } = { // Source type ("script" or "module") for different semantics sourceType: "script", @@ -30,6 +31,15 @@ export const defaultOptions: { plugins: [], // TODO strictMode: null, + // Nodes have their start and end characters offsets recorded in + // `start` and `end` properties (directly on the node, rather than + // the `loc` object, which holds line/column data. To also add a + // [semi-standardized][range] `range` property holding a `[start, + // end]` array with the same numbers, set the `ranges` option to + // `true`. + // + // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678 + ranges: false, }; // Interpret and default an options object diff --git a/src/parser/expression.js b/src/parser/expression.js index 775d658f32..f974459462 100644 --- a/src/parser/expression.js +++ b/src/parser/expression.js @@ -752,7 +752,7 @@ pp.parseObj = function (isPattern, refShorthandDefaultPos) { if (this.hasPlugin("objectRestSpread") && this.match(tt.ellipsis)) { prop = this.parseSpread(isPattern ? { start: 0 } : undefined); - prop.type = isPattern ? "RestProperty" : "SpreadProperty"; + prop.type = isPattern ? "RestElement" : "SpreadElement"; if (isPattern) this.toAssignable(prop.argument, true, "object pattern"); node.properties.push(prop); if (isPattern) { @@ -762,9 +762,7 @@ pp.parseObj = function (isPattern, refShorthandDefaultPos) { } else if (this.eat(tt.braceR)) { break; } else if (this.match(tt.comma) && this.lookahead().type === tt.braceR) { - // TODO: temporary rollback - // this.unexpected(position, "A trailing comma is not permitted after the rest element"); - continue; + this.unexpected(position, "A trailing comma is not permitted after the rest element"); } else { firstRestLocation = position; continue; diff --git a/src/parser/index.js b/src/parser/index.js index c3b6c742ac..2a4768affb 100644 --- a/src/parser/index.js +++ b/src/parser/index.js @@ -3,19 +3,6 @@ import { getOptions } from "../options"; import Tokenizer from "../tokenizer"; export const plugins = {}; -const frozenDeprecatedWildcardPluginList = [ - "jsx", - "doExpressions", - "objectRestSpread", - "decorators", - "classProperties", - "exportExtensions", - "asyncGenerators", - "functionBind", - "functionSent", - "dynamicImport", - "flow" -]; export default class Parser extends Tokenizer { constructor(options: Object, input: string) { @@ -43,10 +30,6 @@ export default class Parser extends Tokenizer { } hasPlugin(name: string): boolean { - if (this.plugins["*"] && frozenDeprecatedWildcardPluginList.indexOf(name) > -1) { - return true; - } - return !!this.plugins[name]; } @@ -54,25 +37,7 @@ export default class Parser extends Tokenizer { this[name] = f(this[name]); } - loadAllPlugins() { - // ensure flow plugin loads last, also ensure estree is not loaded with * - const pluginNames = Object.keys(plugins).filter((name) => name !== "flow" && name !== "estree"); - pluginNames.push("flow"); - - pluginNames.forEach((name) => { - const plugin = plugins[name]; - if (plugin) plugin(this); - }); - } - loadPlugins(pluginList: Array): { [key: string]: boolean } { - // TODO: Deprecate "*" option in next major version of Babylon - if (pluginList.indexOf("*") >= 0) { - this.loadAllPlugins(); - - return { "*": true }; - } - const pluginMap = {}; if (pluginList.indexOf("flow") >= 0) { diff --git a/src/parser/lval.js b/src/parser/lval.js index da712e3298..60c26ec9f3 100644 --- a/src/parser/lval.js +++ b/src/parser/lval.js @@ -34,8 +34,8 @@ pp.toAssignable = function (node, isBinding, contextDescription) { this.toAssignable(node.value, isBinding, contextDescription); break; - case "SpreadProperty": - node.type = "RestProperty"; + case "SpreadElement": + node.type = "RestElement"; break; case "ArrayExpression": @@ -85,6 +85,8 @@ pp.toAssignableList = function (exprList, isBinding, contextDescription) { } for (let i = 0; i < end; i++) { const elt = exprList[i]; + if (elt && elt.type === "SpreadElement") + this.raise(elt.start, "The rest element has to be the last element when destructuring"); if (elt) this.toAssignable(elt, isBinding, contextDescription); } return exprList; @@ -246,10 +248,6 @@ pp.checkLVal = function (expr, isBinding, checkClashes, contextDescription) { this.checkLVal(expr.left, isBinding, checkClashes, "assignment pattern"); break; - case "RestProperty": - this.checkLVal(expr.argument, isBinding, checkClashes, "rest property"); - break; - case "RestElement": this.checkLVal(expr.argument, isBinding, checkClashes, "rest element"); break; diff --git a/src/parser/node.js b/src/parser/node.js index 86f697c130..364323ec7f 100644 --- a/src/parser/node.js +++ b/src/parser/node.js @@ -1,5 +1,5 @@ import Parser from "./index"; -import { SourceLocation } from "../util/location"; +import { SourceLocation, type Position } from "../util/location"; // Start an AST node, attaching a start offset. @@ -7,12 +7,13 @@ const pp = Parser.prototype; const commentKeys = ["leadingComments", "trailingComments", "innerComments"]; class Node { - constructor(pos?: number, loc?: number, filename?: string) { + constructor(parser?: Parser, pos?: number, loc?: Position) { this.type = ""; this.start = pos; this.end = 0; this.loc = new SourceLocation(loc); - if (filename) this.loc.filename = filename; + if (parser && parser.options.ranges) this.range = [pos, 0]; + if (parser && parser.filename) this.loc.filename = parser.filename; } type: string; @@ -34,17 +35,18 @@ class Node { } pp.startNode = function () { - return new Node(this.state.start, this.state.startLoc, this.filename); + return new Node(this, this.state.start, this.state.startLoc); }; pp.startNodeAt = function (pos, loc) { - return new Node(pos, loc, this.filename); + return new Node(this, pos, loc); }; function finishNodeAt(node, type, pos, loc) { node.type = type; node.end = pos; node.loc.end = loc; + if (this.options.ranges) node.range[1] = pos; this.processComment(node); return node; } @@ -60,3 +62,15 @@ pp.finishNode = function (node, type) { pp.finishNodeAt = function (node, type, pos, loc) { return finishNodeAt.call(this, node, type, pos, loc); }; + + +/** + * Reset the start location of node to the start location of locationNode + */ +pp.resetStartLocationFromNode = function (node, locationNode) { + node.start = locationNode.start; + node.loc.start = locationNode.loc.start; + if (this.options.ranges) node.range[0] = locationNode.range[0]; + + return node; +}; diff --git a/src/parser/statement.js b/src/parser/statement.js index 03fc2aaac3..3a1eafa407 100644 --- a/src/parser/statement.js +++ b/src/parser/statement.js @@ -529,14 +529,13 @@ pp.parseFor = function (node, init) { // same from parser's perspective. pp.parseForIn = function (node, init, forAwait) { - let type; + const type = this.match(tt._in) ? "ForInStatement" : "ForOfStatement"; if (forAwait) { this.eatContextual("of"); - type = "ForAwaitStatement"; } else { - type = this.match(tt._in) ? "ForInStatement" : "ForOfStatement"; this.next(); } + node.await = !!forAwait; node.left = init; node.right = this.parseExpression(); this.expect(tt.parenR); @@ -644,7 +643,6 @@ pp.parseClassBody = function (node) { const oldStrict = this.state.strict; this.state.strict = true; - let hadConstructorCall = false; let hadConstructor = false; let decorators = []; const classBody = this.startNode(); @@ -750,17 +748,6 @@ pp.parseClassBody = function (node) { } this.parseClassMethod(classBody, method, false, false); this.checkGetterSetterParamCount(method); - } else if (this.hasPlugin("classConstructorCall") && isSimple && key.name === "call" && this.match(tt.name) && this.state.value === "constructor") { - // a (deprecated) call constructor - if (hadConstructorCall) { - this.raise(method.start, "Duplicate constructor call in the same class"); - } else if (method.decorators) { - this.raise(method.start, "You can't attach decorators to a class constructor"); - } - hadConstructorCall = true; - method.kind = "constructorCall"; - this.parsePropertyName(method); // consume "constructor" and make it the method's name - this.parseClassMethod(classBody, method, false, false); } else if (this.isLineTerminator()) { // an uninitialized class property (due to ASI, since we don't otherwise recognize the next token) if (this.isNonstaticConstructor(method)) { @@ -783,8 +770,13 @@ pp.parseClassBody = function (node) { }; pp.parseClassProperty = function (node) { + const noPluginMsg = "You can only use Class Properties when the 'classProperties' plugin is enabled."; + if (!node.typeAnnotation && !this.hasPlugin("classProperties")) { + this.raise(node.start, noPluginMsg); + } + if (this.match(tt.eq)) { - if (!this.hasPlugin("classProperties")) this.unexpected(); + if (!this.hasPlugin("classProperties")) this.raise(this.state.start, noPluginMsg); this.next(); node.value = this.parseMaybeAssign(); } else { @@ -852,6 +844,13 @@ pp.parseExport = function (node) { let needsSemi = false; if (this.eat(tt._function)) { expr = this.parseFunction(expr, true, false, false, true); + } else if ( + this.isContextual("async") && + this.lookahead().type === tt._function + ) { // async function declaration + this.eatContextual("async"); + this.eat(tt._function); + expr = this.parseFunction(expr, true, false, true, true); } else if (this.match(tt._class)) { expr = this.parseClass(expr, true, true); } else { @@ -969,7 +968,7 @@ pp.checkDeclaration = function(node) { } } else if (node.type === "ObjectProperty") { this.checkDeclaration(node.value); - } else if (node.type === "RestElement" || node.type === "RestProperty") { + } else if (node.type === "RestElement") { this.checkDeclaration(node.argument); } else if (node.type === "Identifier") { this.checkDuplicateExports(node, node.name); diff --git a/src/plugins/flow.js b/src/plugins/flow.js index d30545b113..163918cdd4 100644 --- a/src/plugins/flow.js +++ b/src/plugins/flow.js @@ -352,8 +352,11 @@ pp.flowParseObjectTypeIndexer = function (node, isStatic, variance) { node.value = this.flowParseTypeInitialiser(); node.variance = variance; + // Finish node first to not include a possible semicolon in the locations + const indexer = this.finishNode(node, "ObjectTypeIndexer"); this.flowObjectTypeSemicolon(); - return this.finishNode(node, "ObjectTypeIndexer"); + + return indexer; }; pp.flowParseObjectTypeMethodish = function (node) { @@ -437,14 +440,13 @@ pp.flowParseObjectType = function (allowStatic, allowExact) { isStatic = true; } - const variancePos = this.state.start; const variance = this.flowParseVariance(); if (this.match(tt.bracketL)) { nodeStart.indexers.push(this.flowParseObjectTypeIndexer(node, isStatic, variance)); } else if (this.match(tt.parenL) || this.isRelational("<")) { if (variance) { - this.unexpected(variancePos); + this.unexpected(variance.start); } nodeStart.callProperties.push(this.flowParseObjectTypeCallProperty(node, isStatic)); } else { @@ -452,7 +454,7 @@ pp.flowParseObjectType = function (allowStatic, allowExact) { if (this.isRelational("<") || this.match(tt.parenL)) { // This is a method property if (variance) { - this.unexpected(variancePos); + this.unexpected(variance.start); } nodeStart.properties.push(this.flowParseObjectTypeMethod(startPos, startLoc, isStatic, propertyKey)); } else { @@ -716,12 +718,12 @@ pp.flowParsePrimaryType = function () { this.next(); if (!this.match(tt.num)) this.unexpected(null, "Unexpected token, expected number"); - return this.parseLiteral(-this.state.value, "NumericLiteralTypeAnnotation", node.start, node.loc.start); + return this.parseLiteral(-this.state.value, "NumberLiteralTypeAnnotation", node.start, node.loc.start); } this.unexpected(); case tt.num: - return this.parseLiteral(this.state.value, "NumericLiteralTypeAnnotation"); + return this.parseLiteral(this.state.value, "NumberLiteralTypeAnnotation"); case tt._null: node.value = this.match(tt._null); @@ -735,7 +737,7 @@ pp.flowParsePrimaryType = function () { case tt.star: this.next(); - return this.finishNode(node, "ExistentialTypeParam"); + return this.finishNode(node, "ExistsTypeAnnotation"); default: if (this.state.type.keyword === "typeof") { @@ -847,12 +849,14 @@ pp.typeCastToParameter = function (node) { pp.flowParseVariance = function() { let variance = null; if (this.match(tt.plusMin)) { + variance = this.startNode(); if (this.state.value === "+") { - variance = "plus"; - } else if (this.state.value === "-") { - variance = "minus"; + variance.kind = "plus"; + } else { + variance.kind = "minus"; } this.next(); + this.finishNode(variance, "Variance"); } return variance; }; @@ -1101,7 +1105,6 @@ export default function (instance) { // parse class property type annotations instance.extend("parseClassProperty", function (inner) { return function (node) { - delete node.variancePos; if (this.match(tt.colon)) { node.typeAnnotation = this.flowParseTypeAnnotation(); } @@ -1127,10 +1130,9 @@ export default function (instance) { instance.extend("parseClassMethod", function (inner) { return function (classBody, method, ...args) { if (method.variance) { - this.unexpected(method.variancePos); + this.unexpected(method.variance.start); } delete method.variance; - delete method.variancePos; if (this.isRelational("<")) { method.typeParameters = this.flowParseTypeParameterDeclaration(); } @@ -1165,11 +1167,9 @@ export default function (instance) { instance.extend("parsePropertyName", function (inner) { return function (node) { - const variancePos = this.state.start; const variance = this.flowParseVariance(); const key = inner.call(this, node); node.variance = variance; - node.variancePos = variancePos; return key; }; }); @@ -1178,10 +1178,9 @@ export default function (instance) { instance.extend("parseObjPropValue", function (inner) { return function (prop) { if (prop.variance) { - this.unexpected(prop.variancePos); + this.unexpected(prop.variance.start); } delete prop.variance; - delete prop.variancePos; let typeParameters; @@ -1389,8 +1388,7 @@ export default function (instance) { arrowExpression = inner.apply(this, args); arrowExpression.typeParameters = typeParameters; - arrowExpression.start = typeParameters.start; - arrowExpression.loc.start = typeParameters.loc.start; + this.resetStartLocationFromNode(arrowExpression, typeParameters); } catch (err) { throw jsxError || err; } diff --git a/src/plugins/jsx/fromCodePoint.js b/src/plugins/jsx/fromCodePoint.js deleted file mode 100644 index a69acf7686..0000000000 --- a/src/plugins/jsx/fromCodePoint.js +++ /dev/null @@ -1,66 +0,0 @@ -// Adapted from String.fromcodepoint to export the function without modifying String -/*! https://mths.be/fromcodepoint v0.2.1 by @mathias */ - -// The MIT License (MIT) -// Copyright (c) Mathias Bynens -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -// associated documentation files (the "Software"), to deal in the Software without restriction, -// including without limitation the rights to use, copy, modify, merge, publish, distribute, -// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT -// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -let fromCodePoint = String.fromCodePoint; - -if (!fromCodePoint) { - const stringFromCharCode = String.fromCharCode; - const floor = Math.floor; - fromCodePoint = function() { - const MAX_SIZE = 0x4000; - const codeUnits = []; - let highSurrogate; - let lowSurrogate; - let index = -1; - const length = arguments.length; - if (!length) { - return ""; - } - let result = ""; - while (++index < length) { - let codePoint = Number(arguments[index]); - if ( - !isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity` - codePoint < 0 || // not a valid Unicode code point - codePoint > 0x10FFFF || // not a valid Unicode code point - floor(codePoint) != codePoint // not an integer - ) { - throw RangeError("Invalid code point: " + codePoint); - } - if (codePoint <= 0xFFFF) { // BMP code point - codeUnits.push(codePoint); - } else { // Astral code point; split in surrogate halves - // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae - codePoint -= 0x10000; - highSurrogate = (codePoint >> 10) + 0xD800; - lowSurrogate = (codePoint % 0x400) + 0xDC00; - codeUnits.push(highSurrogate, lowSurrogate); - } - if (index + 1 == length || codeUnits.length > MAX_SIZE) { - result += stringFromCharCode.apply(null, codeUnits); - codeUnits.length = 0; - } - } - return result; - }; -} - -export default fromCodePoint; diff --git a/src/plugins/jsx/index.js b/src/plugins/jsx/index.js index 2a05e129b0..c4e363ee35 100644 --- a/src/plugins/jsx/index.js +++ b/src/plugins/jsx/index.js @@ -1,5 +1,3 @@ -import fromCodePoint from "./fromCodePoint"; - import XHTMLEntities from "./xhtml"; import { TokenType, types as tt } from "../../tokenizer/types"; import { TokContext, types as tc } from "../../tokenizer/context"; @@ -136,11 +134,11 @@ pp.jsxReadEntity = function() { if (str[1] === "x") { str = str.substr(2); if (HEX_NUMBER.test(str)) - entity = fromCodePoint(parseInt(str, 16)); + entity = String.fromCodePoint(parseInt(str, 16)); } else { str = str.substr(1); if (DECIMAL_NUMBER.test(str)) - entity = fromCodePoint(parseInt(str, 10)); + entity = String.fromCodePoint(parseInt(str, 10)); } } else { entity = XHTMLEntities[str]; diff --git a/src/util/location.js b/src/util/location.js index 38137496c1..fb53aab1c5 100644 --- a/src/util/location.js +++ b/src/util/location.js @@ -4,14 +4,14 @@ import { lineBreakG } from "./whitespace"; // `startLoc` and `endLoc` properties. export class Position { - constructor(line, col) { + constructor(line: number, col: number) { this.line = line; this.column = col; } } export class SourceLocation { - constructor(start, end) { + constructor(start: Position, end?: Position) { this.start = start; this.end = end; } diff --git a/test/fixtures/comments/basic/block-trailing-comment/expected.json b/test/fixtures/comments/basic/block-trailing-comment/expected.json old mode 100755 new mode 100644 index f8f5e28599..8a36b86cdf --- a/test/fixtures/comments/basic/block-trailing-comment/expected.json +++ b/test/fixtures/comments/basic/block-trailing-comment/expected.json @@ -83,7 +83,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/comments/basic/comment-within-condition/expected.json b/test/fixtures/comments/basic/comment-within-condition/expected.json old mode 100755 new mode 100644 index 695fa34b10..d98e5b584d --- a/test/fixtures/comments/basic/comment-within-condition/expected.json +++ b/test/fixtures/comments/basic/comment-within-condition/expected.json @@ -54,7 +54,8 @@ "end": { "line": 2, "column": 16 - } + }, + "identifierName": "a" }, "name": "a", "leadingComments": [ diff --git a/test/fixtures/comments/basic/export-default-anonymous-class/expected.json b/test/fixtures/comments/basic/export-default-anonymous-class/expected.json old mode 100755 new mode 100644 index e42c57b979..10e0d6cbdc --- a/test/fixtures/comments/basic/export-default-anonymous-class/expected.json +++ b/test/fixtures/comments/basic/export-default-anonymous-class/expected.json @@ -87,6 +87,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -100,16 +101,17 @@ "end": { "line": 8, "column": 11 - } + }, + "identifierName": "method1" }, "name": "method1", "leadingComments": null }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/comments/basic/shebang-import/expected.json b/test/fixtures/comments/basic/shebang-import/expected.json index 3d0e83f874..0a4d4d6663 100644 --- a/test/fixtures/comments/basic/shebang-import/expected.json +++ b/test/fixtures/comments/basic/shebang-import/expected.json @@ -69,9 +69,11 @@ "end": { "line": 3, "column": 13 - } + }, + "identifierName": "spawn" }, - "name": "spawn" + "name": "spawn", + "leadingComments": null }, "local": { "type": "Identifier", @@ -85,10 +87,12 @@ "end": { "line": 3, "column": 13 - } + }, + "identifierName": "spawn" }, "name": "spawn" - } + }, + "leadingComments": null } ], "source": { @@ -151,4 +155,4 @@ } } ] -} +} \ No newline at end of file diff --git a/test/fixtures/comments/basic/shebang-object/expected.json b/test/fixtures/comments/basic/shebang-object/expected.json index 199d8d452a..1d5ab8aced 100644 --- a/test/fixtures/comments/basic/shebang-object/expected.json +++ b/test/fixtures/comments/basic/shebang-object/expected.json @@ -101,9 +101,11 @@ "end": { "line": 3, "column": 11 - } + }, + "identifierName": "spawn" }, - "name": "spawn" + "name": "spawn", + "leadingComments": null }, "value": { "type": "Identifier", @@ -117,15 +119,18 @@ "end": { "line": 3, "column": 11 - } + }, + "identifierName": "spawn" }, "name": "spawn" }, + "leadingComments": null, "extra": { "shorthand": true } } - ] + ], + "leadingComments": null }, "init": { "type": "Identifier", @@ -139,10 +144,12 @@ "end": { "line": 3, "column": 17 - } + }, + "identifierName": "x" }, "name": "x" - } + }, + "leadingComments": null } ], "kind": "var", @@ -186,4 +193,4 @@ } } ] -} +} \ No newline at end of file diff --git a/test/fixtures/comments/basic/surrounding-call-comments/expected.json b/test/fixtures/comments/basic/surrounding-call-comments/expected.json old mode 100755 new mode 100644 index 1b90fb89f0..ea2c84fbc9 --- a/test/fixtures/comments/basic/surrounding-call-comments/expected.json +++ b/test/fixtures/comments/basic/surrounding-call-comments/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +118,8 @@ "end": { "line": 3, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo", "leadingComments": null diff --git a/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json b/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json old mode 100755 new mode 100644 index 76143585ee..f3fc61bd29 --- a/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json +++ b/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/comments/basic/surrounding-return-comments/expected.json b/test/fixtures/comments/basic/surrounding-return-comments/expected.json old mode 100755 new mode 100644 index 5ce003f2c5..02cf5d12e9 --- a/test/fixtures/comments/basic/surrounding-return-comments/expected.json +++ b/test/fixtures/comments/basic/surrounding-return-comments/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/comments/basic/surrounding-throw-comments/expected.json b/test/fixtures/comments/basic/surrounding-throw-comments/expected.json old mode 100755 new mode 100644 index 5dcfd548ca..c76d573a84 --- a/test/fixtures/comments/basic/surrounding-throw-comments/expected.json +++ b/test/fixtures/comments/basic/surrounding-throw-comments/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json b/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json old mode 100755 new mode 100644 index d2805cc6ab..669d70dc8f --- a/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json +++ b/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -204,7 +206,8 @@ "end": { "line": 1, "column": 65 - } + }, + "identifierName": "each" }, "name": "each", "leadingComments": null diff --git a/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json b/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json old mode 100755 new mode 100644 index 4559db028e..3ce051b4a8 --- a/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json +++ b/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "bar" }, "name": "bar" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -119,7 +122,8 @@ "end": { "line": 2, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -252,7 +256,8 @@ "end": { "line": 7, "column": 16 - } + }, + "identifierName": "doIt" }, "name": "doIt" }, diff --git a/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json b/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json old mode 100755 new mode 100644 index 9246cd1331..1e6c9d5796 --- a/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json +++ b/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -187,7 +188,8 @@ "end": { "line": 6, "column": 12 - } + }, + "identifierName": "doIt" }, "name": "doIt" }, diff --git a/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json b/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json old mode 100755 new mode 100644 index aa28503c94..ec0792f047 --- a/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json +++ b/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "bar" }, "name": "bar" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" } @@ -119,7 +122,8 @@ "end": { "line": 2, "column": 13 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json b/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json old mode 100755 new mode 100644 index 985d6e376b..2c858e5b45 --- a/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json +++ b/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "module" }, "name": "module" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "exports" }, "name": "exports" }, @@ -122,6 +124,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -135,7 +138,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "context" }, "name": "context" } @@ -181,12 +185,14 @@ "end": { "line": 3, "column": 23 - } + }, + "identifierName": "isConstant" }, "name": "isConstant" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -200,7 +206,8 @@ "end": { "line": 3, "column": 28 - } + }, + "identifierName": "node" }, "name": "node" } @@ -260,7 +267,8 @@ "end": { "line": 4, "column": 20 - } + }, + "identifierName": "node" }, "name": "node" }, @@ -276,7 +284,8 @@ "end": { "line": 4, "column": 25 - } + }, + "identifierName": "type" }, "name": "type" }, @@ -338,7 +347,8 @@ "end": { "line": 6, "column": 33 - } + }, + "identifierName": "isConstant" }, "name": "isConstant" }, @@ -383,7 +393,8 @@ "end": { "line": 6, "column": 38 - } + }, + "identifierName": "node" }, "name": "node" }, @@ -399,7 +410,8 @@ "end": { "line": 6, "column": 50 - } + }, + "identifierName": "expressions" }, "name": "expressions" }, @@ -459,7 +471,8 @@ "end": { "line": 6, "column": 55 - } + }, + "identifierName": "node" }, "name": "node" }, @@ -475,7 +488,8 @@ "end": { "line": 6, "column": 67 - } + }, + "identifierName": "expressions" }, "name": "expressions" }, @@ -493,7 +507,8 @@ "end": { "line": 6, "column": 74 - } + }, + "identifierName": "length" }, "name": "length" }, @@ -631,4 +646,4 @@ } } ] -} +} \ No newline at end of file diff --git a/test/fixtures/comments/basic/switch-no-default-comment/expected.json b/test/fixtures/comments/basic/switch-no-default-comment/expected.json old mode 100755 new mode 100644 index 95efdd480c..99e1057f70 --- a/test/fixtures/comments/basic/switch-no-default-comment/expected.json +++ b/test/fixtures/comments/basic/switch-no-default-comment/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/core/categorized/filename-specified/expected.json b/test/fixtures/core/categorized/filename-specified/expected.json index f48495688b..2269e0729d 100644 --- a/test/fixtures/core/categorized/filename-specified/expected.json +++ b/test/fixtures/core/categorized/filename-specified/expected.json @@ -74,7 +74,8 @@ "line": 2, "column": 8 }, - "filename": "path/to/input-file.js" + "filename": "path/to/input-file.js", + "identifierName": "node" }, "name": "node", "leadingComments": null diff --git a/test/fixtures/core/categorized/not-directive/expected.json b/test/fixtures/core/categorized/not-directive/expected.json index 7e25efd1e5..6f0c685ad2 100644 --- a/test/fixtures/core/categorized/not-directive/expected.json +++ b/test/fixtures/core/categorized/not-directive/expected.json @@ -68,4 +68,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/core/categorized/startline-specified/expected.json b/test/fixtures/core/categorized/startline-specified/expected.json index 52ce62c781..8cd916691c 100644 --- a/test/fixtures/core/categorized/startline-specified/expected.json +++ b/test/fixtures/core/categorized/startline-specified/expected.json @@ -168,292 +168,5 @@ } ], "directives": [] - }, - "comments": [], - "tokens": [ - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "call", - "start": 0, - "end": 4, - "loc": { - "start": { - "line": 3, - "column": 0 - }, - "end": { - "line": 3, - "column": 4 - } - } - }, - { - "type": { - "label": "(", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 4, - "end": 5, - "loc": { - "start": { - "line": 3, - "column": 4 - }, - "end": { - "line": 3, - "column": 5 - } - } - }, - { - "type": { - "label": "num", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "value": 1, - "start": 5, - "end": 6, - "loc": { - "start": { - "line": 3, - "column": 5 - }, - "end": { - "line": 3, - "column": 6 - } - } - }, - { - "type": { - "label": ")", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 3, - "column": 6 - }, - "end": { - "line": 3, - "column": 7 - } - } - }, - { - "type": { - "label": ";", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 7, - "end": 8, - "loc": { - "start": { - "line": 3, - "column": 7 - }, - "end": { - "line": 3, - "column": 8 - } - } - }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "run", - "start": 9, - "end": 12, - "loc": { - "start": { - "line": 4, - "column": 0 - }, - "end": { - "line": 4, - "column": 3 - } - } - }, - { - "type": { - "label": "(", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 12, - "end": 13, - "loc": { - "start": { - "line": 4, - "column": 3 - }, - "end": { - "line": 4, - "column": 4 - } - } - }, - { - "type": { - "label": "num", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "value": 2, - "start": 13, - "end": 14, - "loc": { - "start": { - "line": 4, - "column": 4 - }, - "end": { - "line": 4, - "column": 5 - } - } - }, - { - "type": { - "label": ")", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 14, - "end": 15, - "loc": { - "start": { - "line": 4, - "column": 5 - }, - "end": { - "line": 4, - "column": 6 - } - } - }, - { - "type": { - "label": ";", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 15, - "end": 16, - "loc": { - "start": { - "line": 4, - "column": 6 - }, - "end": { - "line": 4, - "column": 7 - } - } - }, - { - "type": { - "label": "eof", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 16, - "end": 16, - "loc": { - "start": { - "line": 4, - "column": 7 - }, - "end": { - "line": 4, - "column": 7 - } - } - } - ] -} + } +} \ No newline at end of file diff --git a/test/fixtures/core/opts/ranges-false/actual.js b/test/fixtures/core/opts/ranges-false/actual.js new file mode 100644 index 0000000000..a5433428e9 --- /dev/null +++ b/test/fixtures/core/opts/ranges-false/actual.js @@ -0,0 +1,3 @@ +var a = 1; + +var b = a + 1; diff --git a/test/fixtures/core/opts/ranges-false/expected.json b/test/fixtures/core/opts/ranges-false/expected.json new file mode 100644 index 0000000000..e8ab354792 --- /dev/null +++ b/test/fixtures/core/opts/ranges-false/expected.json @@ -0,0 +1,207 @@ +{ + "type": "File", + "start": 0, + "end": 26, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 26, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "sourceType": "script", + "body": [ + { + "type": "VariableDeclaration", + "start": 0, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 10 + } + }, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 4, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "id": { + "type": "Identifier", + "start": 4, + "end": 5, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 5 + }, + "identifierName": "a" + }, + "name": "a" + }, + "init": { + "type": "NumericLiteral", + "start": 8, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 8 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + ], + "kind": "var" + }, + { + "type": "VariableDeclaration", + "start": 12, + "end": 26, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 16, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 4 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "id": { + "type": "Identifier", + "start": 16, + "end": 17, + "loc": { + "start": { + "line": 3, + "column": 4 + }, + "end": { + "line": 3, + "column": 5 + }, + "identifierName": "b" + }, + "name": "b" + }, + "init": { + "type": "BinaryExpression", + "start": 20, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 8 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "left": { + "type": "Identifier", + "start": 20, + "end": 21, + "loc": { + "start": { + "line": 3, + "column": 8 + }, + "end": { + "line": 3, + "column": 9 + }, + "identifierName": "a" + }, + "name": "a" + }, + "operator": "+", + "right": { + "type": "NumericLiteral", + "start": 24, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 12 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + } + ], + "kind": "var" + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/opts/ranges-true/actual.js b/test/fixtures/core/opts/ranges-true/actual.js new file mode 100644 index 0000000000..a5433428e9 --- /dev/null +++ b/test/fixtures/core/opts/ranges-true/actual.js @@ -0,0 +1,3 @@ +var a = 1; + +var b = a + 1; diff --git a/test/fixtures/core/opts/ranges-true/expected.json b/test/fixtures/core/opts/ranges-true/expected.json new file mode 100644 index 0000000000..c5e28e30ea --- /dev/null +++ b/test/fixtures/core/opts/ranges-true/expected.json @@ -0,0 +1,255 @@ +{ + "type": "File", + "start": 0, + "end": 26, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "range": [ + 0, + 26 + ], + "program": { + "type": "Program", + "start": 0, + "end": 26, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "range": [ + 0, + 26 + ], + "sourceType": "script", + "body": [ + { + "type": "VariableDeclaration", + "start": 0, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 10 + } + }, + "range": [ + 0, + 10 + ], + "declarations": [ + { + "type": "VariableDeclarator", + "start": 4, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "range": [ + 4, + 9 + ], + "id": { + "type": "Identifier", + "start": 4, + "end": 5, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 5 + }, + "identifierName": "a" + }, + "range": [ + 4, + 5 + ], + "name": "a" + }, + "init": { + "type": "NumericLiteral", + "start": 8, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 8 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "range": [ + 8, + 9 + ], + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + ], + "kind": "var" + }, + { + "type": "VariableDeclaration", + "start": 12, + "end": 26, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 14 + } + }, + "range": [ + 12, + 26 + ], + "declarations": [ + { + "type": "VariableDeclarator", + "start": 16, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 4 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "range": [ + 16, + 25 + ], + "id": { + "type": "Identifier", + "start": 16, + "end": 17, + "loc": { + "start": { + "line": 3, + "column": 4 + }, + "end": { + "line": 3, + "column": 5 + }, + "identifierName": "b" + }, + "range": [ + 16, + 17 + ], + "name": "b" + }, + "init": { + "type": "BinaryExpression", + "start": 20, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 8 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "range": [ + 20, + 25 + ], + "left": { + "type": "Identifier", + "start": 20, + "end": 21, + "loc": { + "start": { + "line": 3, + "column": 8 + }, + "end": { + "line": 3, + "column": 9 + }, + "identifierName": "a" + }, + "range": [ + 20, + 21 + ], + "name": "a" + }, + "operator": "+", + "right": { + "type": "NumericLiteral", + "start": 24, + "end": 25, + "loc": { + "start": { + "line": 3, + "column": 12 + }, + "end": { + "line": 3, + "column": 13 + } + }, + "range": [ + 24, + 25 + ], + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + } + ], + "kind": "var" + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/opts/ranges-true/options.json b/test/fixtures/core/opts/ranges-true/options.json new file mode 100644 index 0000000000..7d108ad39d --- /dev/null +++ b/test/fixtures/core/opts/ranges-true/options.json @@ -0,0 +1,3 @@ +{ + "ranges": true +} diff --git a/test/fixtures/core/regression/2591/expected.json b/test/fixtures/core/regression/2591/expected.json index f7fa0d0dd4..71e7684f6c 100644 --- a/test/fixtures/core/regression/2591/expected.json +++ b/test/fixtures/core/regression/2591/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,7 +119,8 @@ "end": { "line": 2, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/1/expected.json b/test/fixtures/core/uncategorised/1/expected.json index a60c7436d9..b6bfaa93ed 100644 --- a/test/fixtures/core/uncategorised/1/expected.json +++ b/test/fixtures/core/uncategorised/1/expected.json @@ -58,6 +58,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/10/expected.json b/test/fixtures/core/uncategorised/10/expected.json index 0af5ba3e9c..8b0fba21a9 100644 --- a/test/fixtures/core/uncategorised/10/expected.json +++ b/test/fixtures/core/uncategorised/10/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/102/expected.json b/test/fixtures/core/uncategorised/102/expected.json index 043e944588..1f10ec84f5 100644 --- a/test/fixtures/core/uncategorised/102/expected.json +++ b/test/fixtures/core/uncategorised/102/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/103/expected.json b/test/fixtures/core/uncategorised/103/expected.json index 7e44569209..fcadc76bf1 100644 --- a/test/fixtures/core/uncategorised/103/expected.json +++ b/test/fixtures/core/uncategorised/103/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/104/expected.json b/test/fixtures/core/uncategorised/104/expected.json index caa4a97a89..5deda8be2b 100644 --- a/test/fixtures/core/uncategorised/104/expected.json +++ b/test/fixtures/core/uncategorised/104/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/105/expected.json b/test/fixtures/core/uncategorised/105/expected.json index a6c7677449..d9695a7ebf 100644 --- a/test/fixtures/core/uncategorised/105/expected.json +++ b/test/fixtures/core/uncategorised/105/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/106/expected.json b/test/fixtures/core/uncategorised/106/expected.json index d0ccbfb250..aaae474d9c 100644 --- a/test/fixtures/core/uncategorised/106/expected.json +++ b/test/fixtures/core/uncategorised/106/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/107/expected.json b/test/fixtures/core/uncategorised/107/expected.json index 5eafc662cb..d866871347 100644 --- a/test/fixtures/core/uncategorised/107/expected.json +++ b/test/fixtures/core/uncategorised/107/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/108/expected.json b/test/fixtures/core/uncategorised/108/expected.json index a8e37406e8..83c8e811c9 100644 --- a/test/fixtures/core/uncategorised/108/expected.json +++ b/test/fixtures/core/uncategorised/108/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/109/expected.json b/test/fixtures/core/uncategorised/109/expected.json index 08c175955a..8a400eec78 100644 --- a/test/fixtures/core/uncategorised/109/expected.json +++ b/test/fixtures/core/uncategorised/109/expected.json @@ -68,13 +68,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Button" }, "name": "Button" }, "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/11/expected.json b/test/fixtures/core/uncategorised/11/expected.json index 6cb8b01d29..05a6e4f3d1 100644 --- a/test/fixtures/core/uncategorised/11/expected.json +++ b/test/fixtures/core/uncategorised/11/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/110/expected.json b/test/fixtures/core/uncategorised/110/expected.json index 782d5ea7e4..05c9a2e459 100644 --- a/test/fixtures/core/uncategorised/110/expected.json +++ b/test/fixtures/core/uncategorised/110/expected.json @@ -68,13 +68,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Button" }, "name": "Button" }, "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/111/expected.json b/test/fixtures/core/uncategorised/111/expected.json index 376081c391..42758a1f4e 100644 --- a/test/fixtures/core/uncategorised/111/expected.json +++ b/test/fixtures/core/uncategorised/111/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -91,6 +92,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/112/expected.json b/test/fixtures/core/uncategorised/112/expected.json index 5c476aa6cf..99a0eebd01 100644 --- a/test/fixtures/core/uncategorised/112/expected.json +++ b/test/fixtures/core/uncategorised/112/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -91,6 +92,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/113/expected.json b/test/fixtures/core/uncategorised/113/expected.json index 1b87993df9..b7777dc84a 100644 --- a/test/fixtures/core/uncategorised/113/expected.json +++ b/test/fixtures/core/uncategorised/113/expected.json @@ -96,7 +96,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -123,6 +125,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/114/expected.json b/test/fixtures/core/uncategorised/114/expected.json index 952d418f50..ee47879eca 100644 --- a/test/fixtures/core/uncategorised/114/expected.json +++ b/test/fixtures/core/uncategorised/114/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -107,6 +109,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/115/expected.json b/test/fixtures/core/uncategorised/115/expected.json index 7ace856b56..dc595a854e 100644 --- a/test/fixtures/core/uncategorised/115/expected.json +++ b/test/fixtures/core/uncategorised/115/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -107,6 +109,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/116/expected.json b/test/fixtures/core/uncategorised/116/expected.json index 5e0c9c3c30..36a8e9983d 100644 --- a/test/fixtures/core/uncategorised/116/expected.json +++ b/test/fixtures/core/uncategorised/116/expected.json @@ -96,13 +96,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "foo" }, "name": "foo" }, "arguments": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "property": { @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/core/uncategorised/117/expected.json b/test/fixtures/core/uncategorised/117/expected.json index c20918ced6..14abd247cf 100644 --- a/test/fixtures/core/uncategorised/117/expected.json +++ b/test/fixtures/core/uncategorised/117/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -101,13 +103,15 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "baz" }, "name": "baz" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/118/expected.json b/test/fixtures/core/uncategorised/118/expected.json index 2a92530d73..55989c03bf 100644 --- a/test/fixtures/core/uncategorised/118/expected.json +++ b/test/fixtures/core/uncategorised/118/expected.json @@ -68,11 +68,13 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "foo" }, "name": "foo", "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "arguments": [] diff --git a/test/fixtures/core/uncategorised/119/expected.json b/test/fixtures/core/uncategorised/119/expected.json index 937e364bb2..85def70954 100644 --- a/test/fixtures/core/uncategorised/119/expected.json +++ b/test/fixtures/core/uncategorised/119/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/12/expected.json b/test/fixtures/core/uncategorised/12/expected.json index 5e38d61c9f..b6b96223fa 100644 --- a/test/fixtures/core/uncategorised/12/expected.json +++ b/test/fixtures/core/uncategorised/12/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/120/expected.json b/test/fixtures/core/uncategorised/120/expected.json index 9b9c988c91..9b29fb40a0 100644 --- a/test/fixtures/core/uncategorised/120/expected.json +++ b/test/fixtures/core/uncategorised/120/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "solarsystem" }, "name": "solarsystem" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/121/expected.json b/test/fixtures/core/uncategorised/121/expected.json index e160672e6a..3a03cde9b1 100644 --- a/test/fixtures/core/uncategorised/121/expected.json +++ b/test/fixtures/core/uncategorised/121/expected.json @@ -96,7 +96,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -112,7 +113,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "solarsystem" }, "name": "solarsystem" }, @@ -148,13 +151,15 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "Earth" }, "name": "Earth" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/122/expected.json b/test/fixtures/core/uncategorised/122/expected.json index 269aad8658..fcc39e4ecc 100644 --- a/test/fixtures/core/uncategorised/122/expected.json +++ b/test/fixtures/core/uncategorised/122/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "galaxyName" }, "name": "galaxyName" }, @@ -115,7 +117,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "otherUselessName" }, "name": "otherUselessName" } @@ -124,6 +127,7 @@ "computed": true } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/123/expected.json b/test/fixtures/core/uncategorised/123/expected.json index fd2ad08336..6a6c95e194 100644 --- a/test/fixtures/core/uncategorised/123/expected.json +++ b/test/fixtures/core/uncategorised/123/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "galaxyName" }, "name": "galaxyName" }, "computed": true } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/124/expected.json b/test/fixtures/core/uncategorised/124/expected.json index ff93859240..7dbf01ef02 100644 --- a/test/fixtures/core/uncategorised/124/expected.json +++ b/test/fixtures/core/uncategorised/124/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, diff --git a/test/fixtures/core/uncategorised/125/expected.json b/test/fixtures/core/uncategorised/125/expected.json index a12ebbfc91..a732436290 100644 --- a/test/fixtures/core/uncategorised/125/expected.json +++ b/test/fixtures/core/uncategorised/125/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -121,7 +122,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, diff --git a/test/fixtures/core/uncategorised/126/expected.json b/test/fixtures/core/uncategorised/126/expected.json index a8ceaa9228..fa67fb5375 100644 --- a/test/fixtures/core/uncategorised/126/expected.json +++ b/test/fixtures/core/uncategorised/126/expected.json @@ -110,7 +110,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -149,7 +150,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, @@ -230,7 +232,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, diff --git a/test/fixtures/core/uncategorised/127/expected.json b/test/fixtures/core/uncategorised/127/expected.json index 0286b0ea65..edbf36b172 100644 --- a/test/fixtures/core/uncategorised/127/expected.json +++ b/test/fixtures/core/uncategorised/127/expected.json @@ -110,7 +110,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "earth" }, "name": "earth" }, @@ -126,7 +127,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "asia" }, "name": "asia" }, @@ -144,7 +146,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "Indonesia" }, "name": "Indonesia" }, @@ -162,7 +165,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "prepareForElection" }, "name": "prepareForElection" }, diff --git a/test/fixtures/core/uncategorised/128/expected.json b/test/fixtures/core/uncategorised/128/expected.json index 41129f5624..92b467b8e9 100644 --- a/test/fixtures/core/uncategorised/128/expected.json +++ b/test/fixtures/core/uncategorised/128/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "if" }, "name": "if" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/129/expected.json b/test/fixtures/core/uncategorised/129/expected.json index b31bc7542a..43038cf090 100644 --- a/test/fixtures/core/uncategorised/129/expected.json +++ b/test/fixtures/core/uncategorised/129/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "true" }, "name": "true" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/13/expected.json b/test/fixtures/core/uncategorised/13/expected.json index 838c80a0b4..9a01559bd9 100644 --- a/test/fixtures/core/uncategorised/13/expected.json +++ b/test/fixtures/core/uncategorised/13/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/130/expected.json b/test/fixtures/core/uncategorised/130/expected.json index 5bc538a2b9..76fd57dc7a 100644 --- a/test/fixtures/core/uncategorised/130/expected.json +++ b/test/fixtures/core/uncategorised/130/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "false" }, "name": "false" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/131/expected.json b/test/fixtures/core/uncategorised/131/expected.json index a8f3caddc1..1e0fe82f7b 100644 --- a/test/fixtures/core/uncategorised/131/expected.json +++ b/test/fixtures/core/uncategorised/131/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "null" }, "name": "null" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/132/expected.json b/test/fixtures/core/uncategorised/132/expected.json index 0712715b16..6cff980e29 100644 --- a/test/fixtures/core/uncategorised/132/expected.json +++ b/test/fixtures/core/uncategorised/132/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/133/expected.json b/test/fixtures/core/uncategorised/133/expected.json index c4ea608985..b402ef1d3f 100644 --- a/test/fixtures/core/uncategorised/133/expected.json +++ b/test/fixtures/core/uncategorised/133/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/134/expected.json b/test/fixtures/core/uncategorised/134/expected.json index b1909f3acc..4436502a54 100644 --- a/test/fixtures/core/uncategorised/134/expected.json +++ b/test/fixtures/core/uncategorised/134/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/135/expected.json b/test/fixtures/core/uncategorised/135/expected.json index aaebc648e7..28309341ef 100644 --- a/test/fixtures/core/uncategorised/135/expected.json +++ b/test/fixtures/core/uncategorised/135/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/136/expected.json b/test/fixtures/core/uncategorised/136/expected.json index bb07286fc5..397833c9f4 100644 --- a/test/fixtures/core/uncategorised/136/expected.json +++ b/test/fixtures/core/uncategorised/136/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/137/expected.json b/test/fixtures/core/uncategorised/137/expected.json index 5fdbf545d2..b27829eedc 100644 --- a/test/fixtures/core/uncategorised/137/expected.json +++ b/test/fixtures/core/uncategorised/137/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/138/expected.json b/test/fixtures/core/uncategorised/138/expected.json index b8e60e420d..a072a29131 100644 --- a/test/fixtures/core/uncategorised/138/expected.json +++ b/test/fixtures/core/uncategorised/138/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/139/expected.json b/test/fixtures/core/uncategorised/139/expected.json index 74d0f506ec..29f62109f3 100644 --- a/test/fixtures/core/uncategorised/139/expected.json +++ b/test/fixtures/core/uncategorised/139/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/14/expected.json b/test/fixtures/core/uncategorised/14/expected.json index ade504173a..51f1d84750 100644 --- a/test/fixtures/core/uncategorised/14/expected.json +++ b/test/fixtures/core/uncategorised/14/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "日本語" }, "name": "日本語" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/140/expected.json b/test/fixtures/core/uncategorised/140/expected.json index 892974799e..164c7de5e1 100644 --- a/test/fixtures/core/uncategorised/140/expected.json +++ b/test/fixtures/core/uncategorised/140/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "eval" }, "name": "eval" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/141/expected.json b/test/fixtures/core/uncategorised/141/expected.json index f82908bc2b..e24ebd8ae3 100644 --- a/test/fixtures/core/uncategorised/141/expected.json +++ b/test/fixtures/core/uncategorised/141/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "eval" }, "name": "eval" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/142/expected.json b/test/fixtures/core/uncategorised/142/expected.json index e190c488dd..f8c24a6e5c 100644 --- a/test/fixtures/core/uncategorised/142/expected.json +++ b/test/fixtures/core/uncategorised/142/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "arguments" }, "name": "arguments" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/143/expected.json b/test/fixtures/core/uncategorised/143/expected.json index 8451361753..7c9d3dd0a4 100644 --- a/test/fixtures/core/uncategorised/143/expected.json +++ b/test/fixtures/core/uncategorised/143/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "arguments" }, "name": "arguments" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/144/expected.json b/test/fixtures/core/uncategorised/144/expected.json index 62ee624c4c..8c0aefbb8e 100644 --- a/test/fixtures/core/uncategorised/144/expected.json +++ b/test/fixtures/core/uncategorised/144/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/145/expected.json b/test/fixtures/core/uncategorised/145/expected.json index 4b614da625..d0695f2e20 100644 --- a/test/fixtures/core/uncategorised/145/expected.json +++ b/test/fixtures/core/uncategorised/145/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/146/expected.json b/test/fixtures/core/uncategorised/146/expected.json index 326a3d6c51..900b160cf8 100644 --- a/test/fixtures/core/uncategorised/146/expected.json +++ b/test/fixtures/core/uncategorised/146/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/147/expected.json b/test/fixtures/core/uncategorised/147/expected.json index 5db05c771f..47e35ce89d 100644 --- a/test/fixtures/core/uncategorised/147/expected.json +++ b/test/fixtures/core/uncategorised/147/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/148/expected.json b/test/fixtures/core/uncategorised/148/expected.json index 776ed71df2..9c3d31a745 100644 --- a/test/fixtures/core/uncategorised/148/expected.json +++ b/test/fixtures/core/uncategorised/148/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/149/expected.json b/test/fixtures/core/uncategorised/149/expected.json index f5edc45759..87f98df461 100644 --- a/test/fixtures/core/uncategorised/149/expected.json +++ b/test/fixtures/core/uncategorised/149/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/15/expected.json b/test/fixtures/core/uncategorised/15/expected.json index 81dfb24bee..2699a24ddc 100644 --- a/test/fixtures/core/uncategorised/15/expected.json +++ b/test/fixtures/core/uncategorised/15/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "T‿" }, "name": "T‿" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/150/expected.json b/test/fixtures/core/uncategorised/150/expected.json index 137dc642bc..644e2e6689 100644 --- a/test/fixtures/core/uncategorised/150/expected.json +++ b/test/fixtures/core/uncategorised/150/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/151/expected.json b/test/fixtures/core/uncategorised/151/expected.json index 89022ede9f..e4544003c4 100644 --- a/test/fixtures/core/uncategorised/151/expected.json +++ b/test/fixtures/core/uncategorised/151/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/152/expected.json b/test/fixtures/core/uncategorised/152/expected.json index 8a860dd890..328a727dec 100644 --- a/test/fixtures/core/uncategorised/152/expected.json +++ b/test/fixtures/core/uncategorised/152/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/153/expected.json b/test/fixtures/core/uncategorised/153/expected.json index 2887a84d0e..ee2eb7b83f 100644 --- a/test/fixtures/core/uncategorised/153/expected.json +++ b/test/fixtures/core/uncategorised/153/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/154/expected.json b/test/fixtures/core/uncategorised/154/expected.json index 951a2c8573..4f4281d12b 100644 --- a/test/fixtures/core/uncategorised/154/expected.json +++ b/test/fixtures/core/uncategorised/154/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/155/expected.json b/test/fixtures/core/uncategorised/155/expected.json index 4be8cd12bf..e715c38ccb 100644 --- a/test/fixtures/core/uncategorised/155/expected.json +++ b/test/fixtures/core/uncategorised/155/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/156/expected.json b/test/fixtures/core/uncategorised/156/expected.json index 7da984159e..1d480a3e1a 100644 --- a/test/fixtures/core/uncategorised/156/expected.json +++ b/test/fixtures/core/uncategorised/156/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/157/expected.json b/test/fixtures/core/uncategorised/157/expected.json index 51b1fefd9e..80210cee23 100644 --- a/test/fixtures/core/uncategorised/157/expected.json +++ b/test/fixtures/core/uncategorised/157/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/158/expected.json b/test/fixtures/core/uncategorised/158/expected.json index c61c63d02d..5edfbca9c7 100644 --- a/test/fixtures/core/uncategorised/158/expected.json +++ b/test/fixtures/core/uncategorised/158/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/159/expected.json b/test/fixtures/core/uncategorised/159/expected.json index da2300c3ba..39ed4b1c81 100644 --- a/test/fixtures/core/uncategorised/159/expected.json +++ b/test/fixtures/core/uncategorised/159/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/16/expected.json b/test/fixtures/core/uncategorised/16/expected.json index 5a6cd38868..0f87b255d7 100644 --- a/test/fixtures/core/uncategorised/16/expected.json +++ b/test/fixtures/core/uncategorised/16/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "T‌" }, "name": "T‌" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/160/expected.json b/test/fixtures/core/uncategorised/160/expected.json index d036898e8d..edbe85495e 100644 --- a/test/fixtures/core/uncategorised/160/expected.json +++ b/test/fixtures/core/uncategorised/160/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/161/expected.json b/test/fixtures/core/uncategorised/161/expected.json index 21272df967..f4fd2421d9 100644 --- a/test/fixtures/core/uncategorised/161/expected.json +++ b/test/fixtures/core/uncategorised/161/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/162/expected.json b/test/fixtures/core/uncategorised/162/expected.json index 4eba25fa96..fab9884151 100644 --- a/test/fixtures/core/uncategorised/162/expected.json +++ b/test/fixtures/core/uncategorised/162/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/163/expected.json b/test/fixtures/core/uncategorised/163/expected.json index 179ec5032f..09804a0b7c 100644 --- a/test/fixtures/core/uncategorised/163/expected.json +++ b/test/fixtures/core/uncategorised/163/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/164/expected.json b/test/fixtures/core/uncategorised/164/expected.json index 8edd71168c..992fb876e2 100644 --- a/test/fixtures/core/uncategorised/164/expected.json +++ b/test/fixtures/core/uncategorised/164/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/165/expected.json b/test/fixtures/core/uncategorised/165/expected.json index 855baa45d7..39e74f7d29 100644 --- a/test/fixtures/core/uncategorised/165/expected.json +++ b/test/fixtures/core/uncategorised/165/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/166/expected.json b/test/fixtures/core/uncategorised/166/expected.json index c1e5bf26af..582e04e0dc 100644 --- a/test/fixtures/core/uncategorised/166/expected.json +++ b/test/fixtures/core/uncategorised/166/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/167/expected.json b/test/fixtures/core/uncategorised/167/expected.json index 8eb45e6a10..507ec12519 100644 --- a/test/fixtures/core/uncategorised/167/expected.json +++ b/test/fixtures/core/uncategorised/167/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/168/expected.json b/test/fixtures/core/uncategorised/168/expected.json index 2610f3986a..aada50d79c 100644 --- a/test/fixtures/core/uncategorised/168/expected.json +++ b/test/fixtures/core/uncategorised/168/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/169/expected.json b/test/fixtures/core/uncategorised/169/expected.json index ab3b9424ab..a22ceaea6a 100644 --- a/test/fixtures/core/uncategorised/169/expected.json +++ b/test/fixtures/core/uncategorised/169/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/17/expected.json b/test/fixtures/core/uncategorised/17/expected.json index 2fbb41c2a6..26bc8c13c9 100644 --- a/test/fixtures/core/uncategorised/17/expected.json +++ b/test/fixtures/core/uncategorised/17/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "T‍" }, "name": "T‍" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/170/expected.json b/test/fixtures/core/uncategorised/170/expected.json index a21f7900f7..a479164a06 100644 --- a/test/fixtures/core/uncategorised/170/expected.json +++ b/test/fixtures/core/uncategorised/170/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/171/expected.json b/test/fixtures/core/uncategorised/171/expected.json index 9ff129d06b..e22094073c 100644 --- a/test/fixtures/core/uncategorised/171/expected.json +++ b/test/fixtures/core/uncategorised/171/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/172/expected.json b/test/fixtures/core/uncategorised/172/expected.json index 2c6c6a71aa..7cd159ef07 100644 --- a/test/fixtures/core/uncategorised/172/expected.json +++ b/test/fixtures/core/uncategorised/172/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/173/expected.json b/test/fixtures/core/uncategorised/173/expected.json index 102f5d3d69..8d5866efa2 100644 --- a/test/fixtures/core/uncategorised/173/expected.json +++ b/test/fixtures/core/uncategorised/173/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/174/expected.json b/test/fixtures/core/uncategorised/174/expected.json index de56597e6a..bcc48922f6 100644 --- a/test/fixtures/core/uncategorised/174/expected.json +++ b/test/fixtures/core/uncategorised/174/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/175/expected.json b/test/fixtures/core/uncategorised/175/expected.json index edc0351968..d4924593c3 100644 --- a/test/fixtures/core/uncategorised/175/expected.json +++ b/test/fixtures/core/uncategorised/175/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/176/expected.json b/test/fixtures/core/uncategorised/176/expected.json index 74e0ab65b8..3b53c28f8f 100644 --- a/test/fixtures/core/uncategorised/176/expected.json +++ b/test/fixtures/core/uncategorised/176/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/177/expected.json b/test/fixtures/core/uncategorised/177/expected.json index 510073e483..3eab6d0286 100644 --- a/test/fixtures/core/uncategorised/177/expected.json +++ b/test/fixtures/core/uncategorised/177/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/178/expected.json b/test/fixtures/core/uncategorised/178/expected.json index 5e5fca2313..e929279a89 100644 --- a/test/fixtures/core/uncategorised/178/expected.json +++ b/test/fixtures/core/uncategorised/178/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/179/expected.json b/test/fixtures/core/uncategorised/179/expected.json index dc0ac6b9bf..e0124c982f 100644 --- a/test/fixtures/core/uncategorised/179/expected.json +++ b/test/fixtures/core/uncategorised/179/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/18/expected.json b/test/fixtures/core/uncategorised/18/expected.json index 86195734f1..3e3a06842f 100644 --- a/test/fixtures/core/uncategorised/18/expected.json +++ b/test/fixtures/core/uncategorised/18/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "ⅣⅡ" }, "name": "ⅣⅡ" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/180/expected.json b/test/fixtures/core/uncategorised/180/expected.json index 4beef8dd3d..d891a4741e 100644 --- a/test/fixtures/core/uncategorised/180/expected.json +++ b/test/fixtures/core/uncategorised/180/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/181/expected.json b/test/fixtures/core/uncategorised/181/expected.json index 9d743b0d39..07dfb3ff15 100644 --- a/test/fixtures/core/uncategorised/181/expected.json +++ b/test/fixtures/core/uncategorised/181/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/182/expected.json b/test/fixtures/core/uncategorised/182/expected.json index 3e5a22a223..a251fd60d7 100644 --- a/test/fixtures/core/uncategorised/182/expected.json +++ b/test/fixtures/core/uncategorised/182/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/183/expected.json b/test/fixtures/core/uncategorised/183/expected.json index 2174559e10..63a295482e 100644 --- a/test/fixtures/core/uncategorised/183/expected.json +++ b/test/fixtures/core/uncategorised/183/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/184/expected.json b/test/fixtures/core/uncategorised/184/expected.json index 92c65557e6..8384ff1b91 100644 --- a/test/fixtures/core/uncategorised/184/expected.json +++ b/test/fixtures/core/uncategorised/184/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/185/expected.json b/test/fixtures/core/uncategorised/185/expected.json index 188c481bfc..11335ea1d3 100644 --- a/test/fixtures/core/uncategorised/185/expected.json +++ b/test/fixtures/core/uncategorised/185/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/186/expected.json b/test/fixtures/core/uncategorised/186/expected.json index 3c6c2f0817..1cfab365e3 100644 --- a/test/fixtures/core/uncategorised/186/expected.json +++ b/test/fixtures/core/uncategorised/186/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/187/expected.json b/test/fixtures/core/uncategorised/187/expected.json index 48e47e4198..e819fc3506 100644 --- a/test/fixtures/core/uncategorised/187/expected.json +++ b/test/fixtures/core/uncategorised/187/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/188/expected.json b/test/fixtures/core/uncategorised/188/expected.json index 0fa66acc0b..f14d54ace0 100644 --- a/test/fixtures/core/uncategorised/188/expected.json +++ b/test/fixtures/core/uncategorised/188/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/189/expected.json b/test/fixtures/core/uncategorised/189/expected.json index c8df10d3d8..481b96d976 100644 --- a/test/fixtures/core/uncategorised/189/expected.json +++ b/test/fixtures/core/uncategorised/189/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/19/expected.json b/test/fixtures/core/uncategorised/19/expected.json index 86195734f1..3e3a06842f 100644 --- a/test/fixtures/core/uncategorised/19/expected.json +++ b/test/fixtures/core/uncategorised/19/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "ⅣⅡ" }, "name": "ⅣⅡ" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/190/expected.json b/test/fixtures/core/uncategorised/190/expected.json index c66d330503..ff26c296d7 100644 --- a/test/fixtures/core/uncategorised/190/expected.json +++ b/test/fixtures/core/uncategorised/190/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/191/expected.json b/test/fixtures/core/uncategorised/191/expected.json index 43821da431..3dbff25ba9 100644 --- a/test/fixtures/core/uncategorised/191/expected.json +++ b/test/fixtures/core/uncategorised/191/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/192/expected.json b/test/fixtures/core/uncategorised/192/expected.json index 7b3dce0fdb..b4327fea4a 100644 --- a/test/fixtures/core/uncategorised/192/expected.json +++ b/test/fixtures/core/uncategorised/192/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/193/expected.json b/test/fixtures/core/uncategorised/193/expected.json index 313205c734..3e277f2fb0 100644 --- a/test/fixtures/core/uncategorised/193/expected.json +++ b/test/fixtures/core/uncategorised/193/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/194/expected.json b/test/fixtures/core/uncategorised/194/expected.json index 076e9826f5..759ef90eeb 100644 --- a/test/fixtures/core/uncategorised/194/expected.json +++ b/test/fixtures/core/uncategorised/194/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/195/expected.json b/test/fixtures/core/uncategorised/195/expected.json index 39a92de27e..51c2a9cc9c 100644 --- a/test/fixtures/core/uncategorised/195/expected.json +++ b/test/fixtures/core/uncategorised/195/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/196/expected.json b/test/fixtures/core/uncategorised/196/expected.json index 27399a9c53..663534b1b4 100644 --- a/test/fixtures/core/uncategorised/196/expected.json +++ b/test/fixtures/core/uncategorised/196/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/197/expected.json b/test/fixtures/core/uncategorised/197/expected.json index 11b669b4ea..ca2df57148 100644 --- a/test/fixtures/core/uncategorised/197/expected.json +++ b/test/fixtures/core/uncategorised/197/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/core/uncategorised/198/expected.json b/test/fixtures/core/uncategorised/198/expected.json index 32682fb46d..7ec28110ed 100644 --- a/test/fixtures/core/uncategorised/198/expected.json +++ b/test/fixtures/core/uncategorised/198/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/core/uncategorised/199/expected.json b/test/fixtures/core/uncategorised/199/expected.json index 712d4fd6c1..0f7d218b48 100644 --- a/test/fixtures/core/uncategorised/199/expected.json +++ b/test/fixtures/core/uncategorised/199/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/2/expected.json b/test/fixtures/core/uncategorised/2/expected.json index 9ca3c11021..bdfeb76fd1 100644 --- a/test/fixtures/core/uncategorised/2/expected.json +++ b/test/fixtures/core/uncategorised/2/expected.json @@ -58,6 +58,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/20/expected.json b/test/fixtures/core/uncategorised/20/expected.json index fcc6f37efa..7634638322 100644 --- a/test/fixtures/core/uncategorised/20/expected.json +++ b/test/fixtures/core/uncategorised/20/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/200/expected.json b/test/fixtures/core/uncategorised/200/expected.json index 01bf6f0d71..08e10f09be 100644 --- a/test/fixtures/core/uncategorised/200/expected.json +++ b/test/fixtures/core/uncategorised/200/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" }, diff --git a/test/fixtures/core/uncategorised/201/expected.json b/test/fixtures/core/uncategorised/201/expected.json index 691796ca2f..588a74e579 100644 --- a/test/fixtures/core/uncategorised/201/expected.json +++ b/test/fixtures/core/uncategorised/201/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/core/uncategorised/202/expected.json b/test/fixtures/core/uncategorised/202/expected.json index 4a01dfd629..3a99ca3eb6 100644 --- a/test/fixtures/core/uncategorised/202/expected.json +++ b/test/fixtures/core/uncategorised/202/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/203/expected.json b/test/fixtures/core/uncategorised/203/expected.json index 1382a9b238..ec473b3207 100644 --- a/test/fixtures/core/uncategorised/203/expected.json +++ b/test/fixtures/core/uncategorised/203/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/204/expected.json b/test/fixtures/core/uncategorised/204/expected.json index e2a6524e00..812fb07cc1 100644 --- a/test/fixtures/core/uncategorised/204/expected.json +++ b/test/fixtures/core/uncategorised/204/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/205/expected.json b/test/fixtures/core/uncategorised/205/expected.json index 3fb8e6a109..4d6b358971 100644 --- a/test/fixtures/core/uncategorised/205/expected.json +++ b/test/fixtures/core/uncategorised/205/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/206/expected.json b/test/fixtures/core/uncategorised/206/expected.json index 8b681331b0..26b624a7d4 100644 --- a/test/fixtures/core/uncategorised/206/expected.json +++ b/test/fixtures/core/uncategorised/206/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/207/expected.json b/test/fixtures/core/uncategorised/207/expected.json index 827b99dbe0..441330c54c 100644 --- a/test/fixtures/core/uncategorised/207/expected.json +++ b/test/fixtures/core/uncategorised/207/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/208/expected.json b/test/fixtures/core/uncategorised/208/expected.json index d27aeea8cc..1d99f52655 100644 --- a/test/fixtures/core/uncategorised/208/expected.json +++ b/test/fixtures/core/uncategorised/208/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/209/expected.json b/test/fixtures/core/uncategorised/209/expected.json index ea2c4e00ff..10665e9e41 100644 --- a/test/fixtures/core/uncategorised/209/expected.json +++ b/test/fixtures/core/uncategorised/209/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/21/expected.json b/test/fixtures/core/uncategorised/21/expected.json index ed3af08e0b..53768b945f 100644 --- a/test/fixtures/core/uncategorised/21/expected.json +++ b/test/fixtures/core/uncategorised/21/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/210/expected.json b/test/fixtures/core/uncategorised/210/expected.json index 12db3bd78f..ffab2697d0 100644 --- a/test/fixtures/core/uncategorised/210/expected.json +++ b/test/fixtures/core/uncategorised/210/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/211/expected.json b/test/fixtures/core/uncategorised/211/expected.json index 2b34e74553..a4a9088d93 100644 --- a/test/fixtures/core/uncategorised/211/expected.json +++ b/test/fixtures/core/uncategorised/211/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/212/expected.json b/test/fixtures/core/uncategorised/212/expected.json index ef886d2c97..173d746401 100644 --- a/test/fixtures/core/uncategorised/212/expected.json +++ b/test/fixtures/core/uncategorised/212/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/213/expected.json b/test/fixtures/core/uncategorised/213/expected.json index 5d5053da91..ca5a5fb0eb 100644 --- a/test/fixtures/core/uncategorised/213/expected.json +++ b/test/fixtures/core/uncategorised/213/expected.json @@ -69,13 +69,16 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "foo" }, "name": "foo" } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/214/expected.json b/test/fixtures/core/uncategorised/214/expected.json index eec6775871..b271f0a04c 100644 --- a/test/fixtures/core/uncategorised/214/expected.json +++ b/test/fixtures/core/uncategorised/214/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "doThis" }, "name": "doThis" }, @@ -130,15 +131,18 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/215/expected.json b/test/fixtures/core/uncategorised/215/expected.json index 5792211240..d209b58703 100644 --- a/test/fixtures/core/uncategorised/215/expected.json +++ b/test/fixtures/core/uncategorised/215/expected.json @@ -42,8 +42,10 @@ "column": 2 } }, - "body": [] + "body": [], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/216/expected.json b/test/fixtures/core/uncategorised/216/expected.json index ec2dadfcf0..2dc156600a 100644 --- a/test/fixtures/core/uncategorised/216/expected.json +++ b/test/fixtures/core/uncategorised/216/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/217/expected.json b/test/fixtures/core/uncategorised/217/expected.json index 4ed5077fe0..efb47e7394 100644 --- a/test/fixtures/core/uncategorised/217/expected.json +++ b/test/fixtures/core/uncategorised/217/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -110,6 +112,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/218/expected.json b/test/fixtures/core/uncategorised/218/expected.json index fceb7088d9..8515e2fd31 100644 --- a/test/fixtures/core/uncategorised/218/expected.json +++ b/test/fixtures/core/uncategorised/218/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/219/expected.json b/test/fixtures/core/uncategorised/219/expected.json index 0937c1b68d..c43470cfea 100644 --- a/test/fixtures/core/uncategorised/219/expected.json +++ b/test/fixtures/core/uncategorised/219/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/core/uncategorised/22/expected.json b/test/fixtures/core/uncategorised/22/expected.json index 87f4913585..bc44d62df8 100644 --- a/test/fixtures/core/uncategorised/22/expected.json +++ b/test/fixtures/core/uncategorised/22/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "answer" }, "name": "answer" }, diff --git a/test/fixtures/core/uncategorised/220/expected.json b/test/fixtures/core/uncategorised/220/expected.json index 4c14f501ea..880833c662 100644 --- a/test/fixtures/core/uncategorised/220/expected.json +++ b/test/fixtures/core/uncategorised/220/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/core/uncategorised/221/expected.json b/test/fixtures/core/uncategorised/221/expected.json index 17a5559327..3b4811d947 100644 --- a/test/fixtures/core/uncategorised/221/expected.json +++ b/test/fixtures/core/uncategorised/221/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "implements" }, "name": "implements" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "interface" }, "name": "interface" }, @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "package" }, "name": "package" }, @@ -142,6 +145,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/222/expected.json b/test/fixtures/core/uncategorised/222/expected.json index 8744560249..1afee34c9e 100644 --- a/test/fixtures/core/uncategorised/222/expected.json +++ b/test/fixtures/core/uncategorised/222/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "private" }, "name": "private" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "protected" }, "name": "protected" }, @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "public" }, "name": "public" }, @@ -165,7 +168,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "static" }, "name": "static" }, @@ -174,6 +178,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/223/expected.json b/test/fixtures/core/uncategorised/223/expected.json index d76894f1aa..e48902c158 100644 --- a/test/fixtures/core/uncategorised/223/expected.json +++ b/test/fixtures/core/uncategorised/223/expected.json @@ -43,6 +43,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/224/expected.json b/test/fixtures/core/uncategorised/224/expected.json index 470ad995ab..7d660bdda7 100644 --- a/test/fixtures/core/uncategorised/224/expected.json +++ b/test/fixtures/core/uncategorised/224/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/225/expected.json b/test/fixtures/core/uncategorised/225/expected.json index a1f0e67018..a8a40d3c2b 100644 --- a/test/fixtures/core/uncategorised/225/expected.json +++ b/test/fixtures/core/uncategorised/225/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,13 +86,15 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "y" }, "name": "y" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/226/expected.json b/test/fixtures/core/uncategorised/226/expected.json index afc7d69fc3..f144d42ff4 100644 --- a/test/fixtures/core/uncategorised/226/expected.json +++ b/test/fixtures/core/uncategorised/226/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/227/expected.json b/test/fixtures/core/uncategorised/227/expected.json index 2f6ae75852..69f5646954 100644 --- a/test/fixtures/core/uncategorised/227/expected.json +++ b/test/fixtures/core/uncategorised/227/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "aa" }, "name": "aa" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/228/expected.json b/test/fixtures/core/uncategorised/228/expected.json index 61f0887961..18f37a7b65 100644 --- a/test/fixtures/core/uncategorised/228/expected.json +++ b/test/fixtures/core/uncategorised/228/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "goodMorning" }, "name": "goodMorning" }, @@ -107,6 +109,7 @@ }, "alternate": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/229/expected.json b/test/fixtures/core/uncategorised/229/expected.json index 640c5691c2..38198e3d25 100644 --- a/test/fixtures/core/uncategorised/229/expected.json +++ b/test/fixtures/core/uncategorised/229/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -89,6 +90,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -108,7 +110,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 13 } } }, diff --git a/test/fixtures/core/uncategorised/23/expected.json b/test/fixtures/core/uncategorised/23/expected.json index fa3c158b8a..8373348ba7 100644 --- a/test/fixtures/core/uncategorised/23/expected.json +++ b/test/fixtures/core/uncategorised/23/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "if" }, "name": "if" }, diff --git a/test/fixtures/core/uncategorised/230/expected.json b/test/fixtures/core/uncategorised/230/expected.json index bf2044c42a..492f0ac62c 100644 --- a/test/fixtures/core/uncategorised/230/expected.json +++ b/test/fixtures/core/uncategorised/230/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/231/expected.json b/test/fixtures/core/uncategorised/231/expected.json index 720f53798d..453c4e700d 100644 --- a/test/fixtures/core/uncategorised/231/expected.json +++ b/test/fixtures/core/uncategorised/231/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "goodMorning" }, "name": "goodMorning" }, @@ -145,7 +147,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "goodDay" }, "name": "goodDay" }, @@ -153,6 +156,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/232/expected.json b/test/fixtures/core/uncategorised/232/expected.json index 52f64a4d6b..6b99345c09 100644 --- a/test/fixtures/core/uncategorised/232/expected.json +++ b/test/fixtures/core/uncategorised/232/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "keep" }, "name": "keep" }, diff --git a/test/fixtures/core/uncategorised/233/expected.json b/test/fixtures/core/uncategorised/233/expected.json index 04998adb58..a131703fce 100644 --- a/test/fixtures/core/uncategorised/233/expected.json +++ b/test/fixtures/core/uncategorised/233/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "keep" }, "name": "keep" }, diff --git a/test/fixtures/core/uncategorised/234/expected.json b/test/fixtures/core/uncategorised/234/expected.json index 9814bc6039..e2f50113d3 100644 --- a/test/fixtures/core/uncategorised/234/expected.json +++ b/test/fixtures/core/uncategorised/234/expected.json @@ -99,7 +99,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } @@ -147,7 +148,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } @@ -182,7 +184,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/236/expected.json b/test/fixtures/core/uncategorised/236/expected.json index b154f386f7..1cd371f080 100644 --- a/test/fixtures/core/uncategorised/236/expected.json +++ b/test/fixtures/core/uncategorised/236/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "doSomething" }, "name": "doSomething" }, diff --git a/test/fixtures/core/uncategorised/237/expected.json b/test/fixtures/core/uncategorised/237/expected.json index 8ca1322823..f08d3a9485 100644 --- a/test/fixtures/core/uncategorised/237/expected.json +++ b/test/fixtures/core/uncategorised/237/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -151,7 +152,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" } @@ -199,7 +201,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/core/uncategorised/238/expected.json b/test/fixtures/core/uncategorised/238/expected.json index 9474ed02f5..5f4998d8a0 100644 --- a/test/fixtures/core/uncategorised/238/expected.json +++ b/test/fixtures/core/uncategorised/238/expected.json @@ -61,6 +61,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/239/expected.json b/test/fixtures/core/uncategorised/239/expected.json index ee4511c5df..67a281d20e 100644 --- a/test/fixtures/core/uncategorised/239/expected.json +++ b/test/fixtures/core/uncategorised/239/expected.json @@ -59,9 +59,11 @@ "column": 9 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/24/expected.json b/test/fixtures/core/uncategorised/24/expected.json index e332b892cc..723c8db2a5 100644 --- a/test/fixtures/core/uncategorised/24/expected.json +++ b/test/fixtures/core/uncategorised/24/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "true" }, "name": "true" }, diff --git a/test/fixtures/core/uncategorised/240/expected.json b/test/fixtures/core/uncategorised/240/expected.json index 96e6163073..ac885ace49 100644 --- a/test/fixtures/core/uncategorised/240/expected.json +++ b/test/fixtures/core/uncategorised/240/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/241/expected.json b/test/fixtures/core/uncategorised/241/expected.json index 06e23e5726..424fedd8b8 100644 --- a/test/fixtures/core/uncategorised/241/expected.json +++ b/test/fixtures/core/uncategorised/241/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/242/expected.json b/test/fixtures/core/uncategorised/242/expected.json index 9703da41dc..f701a8cc20 100644 --- a/test/fixtures/core/uncategorised/242/expected.json +++ b/test/fixtures/core/uncategorised/242/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/core/uncategorised/243/expected.json b/test/fixtures/core/uncategorised/243/expected.json index 799bca6bd8..019c93da93 100644 --- a/test/fixtures/core/uncategorised/243/expected.json +++ b/test/fixtures/core/uncategorised/243/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/244/expected.json b/test/fixtures/core/uncategorised/244/expected.json index bab630bd14..d44ae9616d 100644 --- a/test/fixtures/core/uncategorised/244/expected.json +++ b/test/fixtures/core/uncategorised/244/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -174,7 +176,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/core/uncategorised/245/expected.json b/test/fixtures/core/uncategorised/245/expected.json index 88e0fa1c9f..bd932cf468 100644 --- a/test/fixtures/core/uncategorised/245/expected.json +++ b/test/fixtures/core/uncategorised/245/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -174,7 +176,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" } @@ -219,7 +222,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -236,7 +240,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/core/uncategorised/246/expected.json b/test/fixtures/core/uncategorised/246/expected.json index f95b2f15a7..9c7cdebe0f 100644 --- a/test/fixtures/core/uncategorised/246/expected.json +++ b/test/fixtures/core/uncategorised/246/expected.json @@ -42,6 +42,7 @@ "column": 26 } }, + "await": false, "left": { "type": "Identifier", "start": 4, @@ -54,7 +55,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -70,7 +72,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -114,7 +117,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -131,7 +135,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "x" }, "name": "x" } @@ -139,6 +144,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/247/expected.json b/test/fixtures/core/uncategorised/247/expected.json index 50d29b5d32..4a3a0ecfda 100644 --- a/test/fixtures/core/uncategorised/247/expected.json +++ b/test/fixtures/core/uncategorised/247/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +178,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/25/expected.json b/test/fixtures/core/uncategorised/25/expected.json index dbe5f3ef0b..1245b12ad3 100644 --- a/test/fixtures/core/uncategorised/25/expected.json +++ b/test/fixtures/core/uncategorised/25/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "false" }, "name": "false" }, diff --git a/test/fixtures/core/uncategorised/252/expected.json b/test/fixtures/core/uncategorised/252/expected.json index 3d3611769c..7b69d3e398 100644 --- a/test/fixtures/core/uncategorised/252/expected.json +++ b/test/fixtures/core/uncategorised/252/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/core/uncategorised/253/expected.json b/test/fixtures/core/uncategorised/253/expected.json index e2eede95cf..73a3847e0b 100644 --- a/test/fixtures/core/uncategorised/253/expected.json +++ b/test/fixtures/core/uncategorised/253/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/core/uncategorised/255/expected.json b/test/fixtures/core/uncategorised/255/expected.json index 930203bdfe..b46b8cecc6 100644 --- a/test/fixtures/core/uncategorised/255/expected.json +++ b/test/fixtures/core/uncategorised/255/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/core/uncategorised/256/expected.json b/test/fixtures/core/uncategorised/256/expected.json index 207d4cf4c5..75ce4af774 100644 --- a/test/fixtures/core/uncategorised/256/expected.json +++ b/test/fixtures/core/uncategorised/256/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/core/uncategorised/257/expected.json b/test/fixtures/core/uncategorised/257/expected.json index 9e26dfeeb6..31e7290e5c 100644 --- a/test/fixtures/core/uncategorised/257/expected.json +++ b/test/fixtures/core/uncategorised/257/expected.json @@ -1 +1,179 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "sourceType": "script", + "body": [ + { + "type": "LabeledStatement", + "start": 0, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "body": { + "type": "LabeledStatement", + "start": 9, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "body": { + "type": "WhileStatement", + "start": 18, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 18 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "test": { + "type": "BooleanLiteral", + "start": 25, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 25 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "value": true + }, + "body": { + "type": "BlockStatement", + "start": 31, + "end": 52, + "loc": { + "start": { + "line": 1, + "column": 31 + }, + "end": { + "line": 1, + "column": 52 + } + }, + "body": [ + { + "type": "ContinueStatement", + "start": 33, + "end": 50, + "loc": { + "start": { + "line": 1, + "column": 33 + }, + "end": { + "line": 1, + "column": 50 + } + }, + "label": { + "type": "Identifier", + "start": 42, + "end": 49, + "loc": { + "start": { + "line": 1, + "column": 42 + }, + "end": { + "line": 1, + "column": 49 + }, + "identifierName": "target1" + }, + "name": "target1" + } + } + ], + "directives": [] + } + }, + "label": { + "type": "Identifier", + "start": 9, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "target2" + }, + "name": "target2" + } + }, + "label": { + "type": "Identifier", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + }, + "identifierName": "target1" + }, + "name": "target1" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/258/expected.json b/test/fixtures/core/uncategorised/258/expected.json index 9e26dfeeb6..b806d609b1 100644 --- a/test/fixtures/core/uncategorised/258/expected.json +++ b/test/fixtures/core/uncategorised/258/expected.json @@ -1 +1,211 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "sourceType": "script", + "body": [ + { + "type": "LabeledStatement", + "start": 0, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "body": { + "type": "LabeledStatement", + "start": 9, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "body": { + "type": "LabeledStatement", + "start": 18, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 18 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "body": { + "type": "WhileStatement", + "start": 27, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 27 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "test": { + "type": "BooleanLiteral", + "start": 34, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 34 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "value": true + }, + "body": { + "type": "BlockStatement", + "start": 40, + "end": 61, + "loc": { + "start": { + "line": 1, + "column": 40 + }, + "end": { + "line": 1, + "column": 61 + } + }, + "body": [ + { + "type": "ContinueStatement", + "start": 42, + "end": 59, + "loc": { + "start": { + "line": 1, + "column": 42 + }, + "end": { + "line": 1, + "column": 59 + } + }, + "label": { + "type": "Identifier", + "start": 51, + "end": 58, + "loc": { + "start": { + "line": 1, + "column": 51 + }, + "end": { + "line": 1, + "column": 58 + }, + "identifierName": "target1" + }, + "name": "target1" + } + } + ], + "directives": [] + } + }, + "label": { + "type": "Identifier", + "start": 18, + "end": 25, + "loc": { + "start": { + "line": 1, + "column": 18 + }, + "end": { + "line": 1, + "column": 25 + }, + "identifierName": "target3" + }, + "name": "target3" + } + }, + "label": { + "type": "Identifier", + "start": 9, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "target2" + }, + "name": "target2" + } + }, + "label": { + "type": "Identifier", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + }, + "identifierName": "target1" + }, + "name": "target1" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/259/expected.json b/test/fixtures/core/uncategorised/259/expected.json index 3811851cf2..fe9666a99e 100644 --- a/test/fixtures/core/uncategorised/259/expected.json +++ b/test/fixtures/core/uncategorised/259/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -95,7 +96,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/26/expected.json b/test/fixtures/core/uncategorised/26/expected.json index 88e109fbf9..17acbb207e 100644 --- a/test/fixtures/core/uncategorised/26/expected.json +++ b/test/fixtures/core/uncategorised/26/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "null" }, "name": "null" }, diff --git a/test/fixtures/core/uncategorised/260/expected.json b/test/fixtures/core/uncategorised/260/expected.json index cfc30f8e34..1f4ff8a16a 100644 --- a/test/fixtures/core/uncategorised/260/expected.json +++ b/test/fixtures/core/uncategorised/260/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -95,7 +96,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/261/expected.json b/test/fixtures/core/uncategorised/261/expected.json index 7e253235fc..05b71f8cff 100644 --- a/test/fixtures/core/uncategorised/261/expected.json +++ b/test/fixtures/core/uncategorised/261/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" } @@ -110,7 +112,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/262/expected.json b/test/fixtures/core/uncategorised/262/expected.json index d4f71c39ad..bd73928291 100644 --- a/test/fixtures/core/uncategorised/262/expected.json +++ b/test/fixtures/core/uncategorised/262/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "y" }, "name": "y" } @@ -142,7 +145,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/263/expected.json b/test/fixtures/core/uncategorised/263/expected.json index 9e26dfeeb6..88cf010a10 100644 --- a/test/fixtures/core/uncategorised/263/expected.json +++ b/test/fixtures/core/uncategorised/263/expected.json @@ -1 +1,167 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "sourceType": "script", + "body": [ + { + "type": "WithStatement", + "start": 17, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "object": { + "type": "Identifier", + "start": 23, + "end": 24, + "loc": { + "start": { + "line": 1, + "column": 23 + }, + "end": { + "line": 1, + "column": 24 + }, + "identifierName": "x" + }, + "name": "x" + }, + "body": { + "type": "ExpressionStatement", + "start": 26, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "expression": { + "type": "AssignmentExpression", + "start": 26, + "end": 35, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 35 + } + }, + "operator": "=", + "left": { + "type": "Identifier", + "start": 26, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 29 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + "right": { + "type": "Identifier", + "start": 32, + "end": 35, + "loc": { + "start": { + "line": 1, + "column": 32 + }, + "end": { + "line": 1, + "column": 35 + }, + "identifierName": "bar" + }, + "name": "bar" + } + } + } + } + ], + "directives": [ + { + "type": "Directive", + "start": 0, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 16 + } + }, + "value": { + "type": "DirectiveLiteral", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "value": "use\\x20strict", + "extra": { + "raw": "'use\\x20strict'", + "rawValue": "use\\x20strict" + } + } + } + ] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/264/expected.json b/test/fixtures/core/uncategorised/264/expected.json index 9e26dfeeb6..43dab0dc7a 100644 --- a/test/fixtures/core/uncategorised/264/expected.json +++ b/test/fixtures/core/uncategorised/264/expected.json @@ -1 +1,167 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "sourceType": "script", + "body": [ + { + "type": "WithStatement", + "start": 17, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "object": { + "type": "Identifier", + "start": 23, + "end": 24, + "loc": { + "start": { + "line": 1, + "column": 23 + }, + "end": { + "line": 1, + "column": 24 + }, + "identifierName": "x" + }, + "name": "x" + }, + "body": { + "type": "ExpressionStatement", + "start": 26, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "expression": { + "type": "AssignmentExpression", + "start": 26, + "end": 35, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 35 + } + }, + "operator": "=", + "left": { + "type": "Identifier", + "start": 26, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 26 + }, + "end": { + "line": 1, + "column": 29 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + "right": { + "type": "Identifier", + "start": 32, + "end": 35, + "loc": { + "start": { + "line": 1, + "column": 32 + }, + "end": { + "line": 1, + "column": 35 + }, + "identifierName": "bar" + }, + "name": "bar" + } + } + } + } + ], + "directives": [ + { + "type": "Directive", + "start": 0, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 16 + } + }, + "value": { + "type": "DirectiveLiteral", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "value": "use\\x20strict", + "extra": { + "raw": "\"use\\x20strict\"", + "rawValue": "use\\x20strict" + } + } + } + ] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/265/expected.json b/test/fixtures/core/uncategorised/265/expected.json index f4e3da9d15..c1ca938f16 100644 --- a/test/fixtures/core/uncategorised/265/expected.json +++ b/test/fixtures/core/uncategorised/265/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,13 +117,15 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/266/expected.json b/test/fixtures/core/uncategorised/266/expected.json index 9e895a7f45..bca8b9d7da 100644 --- a/test/fixtures/core/uncategorised/266/expected.json +++ b/test/fixtures/core/uncategorised/266/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,13 +117,15 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/267/expected.json b/test/fixtures/core/uncategorised/267/expected.json index d9e30cca90..e44e902aa7 100644 --- a/test/fixtures/core/uncategorised/267/expected.json +++ b/test/fixtures/core/uncategorised/267/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -130,15 +132,18 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/268/expected.json b/test/fixtures/core/uncategorised/268/expected.json index e48fd0f035..b77f94e94a 100644 --- a/test/fixtures/core/uncategorised/268/expected.json +++ b/test/fixtures/core/uncategorised/268/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, "cases": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/269/expected.json b/test/fixtures/core/uncategorised/269/expected.json index 54b7c12792..3c3a42b257 100644 --- a/test/fixtures/core/uncategorised/269/expected.json +++ b/test/fixtures/core/uncategorised/269/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "hi" }, "name": "hi" }, diff --git a/test/fixtures/core/uncategorised/27/expected.json b/test/fixtures/core/uncategorised/27/expected.json index b292e26154..df92c26e13 100644 --- a/test/fixtures/core/uncategorised/27/expected.json +++ b/test/fixtures/core/uncategorised/27/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/270/expected.json b/test/fixtures/core/uncategorised/270/expected.json index ce967090f0..f474c77e7d 100644 --- a/test/fixtures/core/uncategorised/270/expected.json +++ b/test/fixtures/core/uncategorised/270/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "hi" }, "name": "hi" }, diff --git a/test/fixtures/core/uncategorised/271/expected.json b/test/fixtures/core/uncategorised/271/expected.json index ea2201a00e..0edfa7e1e6 100644 --- a/test/fixtures/core/uncategorised/271/expected.json +++ b/test/fixtures/core/uncategorised/271/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "start" }, "name": "start" } @@ -103,11 +104,13 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "start" }, "name": "start" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/272/expected.json b/test/fixtures/core/uncategorised/272/expected.json index 5157602658..0c49d0e8f9 100644 --- a/test/fixtures/core/uncategorised/272/expected.json +++ b/test/fixtures/core/uncategorised/272/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "start" }, "name": "start" } @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "start" }, "name": "start" } diff --git a/test/fixtures/core/uncategorised/273/expected.json b/test/fixtures/core/uncategorised/273/expected.json index 0e9f3c0da0..a5a7fc11ac 100644 --- a/test/fixtures/core/uncategorised/273/expected.json +++ b/test/fixtures/core/uncategorised/273/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/274/expected.json b/test/fixtures/core/uncategorised/274/expected.json index 91f3d0ffa7..fbc9ab8952 100644 --- a/test/fixtures/core/uncategorised/274/expected.json +++ b/test/fixtures/core/uncategorised/274/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/275/expected.json b/test/fixtures/core/uncategorised/275/expected.json index 1586888a8b..e0ef904785 100644 --- a/test/fixtures/core/uncategorised/275/expected.json +++ b/test/fixtures/core/uncategorised/275/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "message" }, "name": "message" }, diff --git a/test/fixtures/core/uncategorised/276/expected.json b/test/fixtures/core/uncategorised/276/expected.json index 49a3324324..e5753c7cc2 100644 --- a/test/fixtures/core/uncategorised/276/expected.json +++ b/test/fixtures/core/uncategorised/276/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -102,12 +104,14 @@ "column": 21 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/277/expected.json b/test/fixtures/core/uncategorised/277/expected.json index 4fa8f999b5..7a8e08f5e0 100644 --- a/test/fixtures/core/uncategorised/277/expected.json +++ b/test/fixtures/core/uncategorised/277/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -102,12 +104,14 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/278/expected.json b/test/fixtures/core/uncategorised/278/expected.json index 42cc2e8bf7..a6eb4ec45b 100644 --- a/test/fixtures/core/uncategorised/278/expected.json +++ b/test/fixtures/core/uncategorised/278/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, @@ -102,12 +104,14 @@ "column": 29 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/279/expected.json b/test/fixtures/core/uncategorised/279/expected.json index bb353db32f..2e17e596c6 100644 --- a/test/fixtures/core/uncategorised/279/expected.json +++ b/test/fixtures/core/uncategorised/279/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -143,7 +145,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -160,19 +163,22 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/28/expected.json b/test/fixtures/core/uncategorised/28/expected.json index a2566571e4..c3ee0acf14 100644 --- a/test/fixtures/core/uncategorised/28/expected.json +++ b/test/fixtures/core/uncategorised/28/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/280/expected.json b/test/fixtures/core/uncategorised/280/expected.json index ca8f6bd080..4f92072de7 100644 --- a/test/fixtures/core/uncategorised/280/expected.json +++ b/test/fixtures/core/uncategorised/280/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": null, "guardedHandlers": [], @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "cleanup" }, "name": "cleanup" }, @@ -132,16 +134,19 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "stuff" }, "name": "stuff" } ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/281/expected.json b/test/fixtures/core/uncategorised/281/expected.json index 291705c18b..6024793dbd 100644 --- a/test/fixtures/core/uncategorised/281/expected.json +++ b/test/fixtures/core/uncategorised/281/expected.json @@ -97,14 +97,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] }, "handler": { "type": "CatchClause", @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -208,19 +212,22 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/282/expected.json b/test/fixtures/core/uncategorised/282/expected.json index 9dd799f3ee..c73f720c72 100644 --- a/test/fixtures/core/uncategorised/282/expected.json +++ b/test/fixtures/core/uncategorised/282/expected.json @@ -97,14 +97,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] }, "handler": { "type": "CatchClause", @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -208,14 +212,16 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], @@ -274,7 +280,8 @@ "end": { "line": 1, "column": 56 - } + }, + "identifierName": "cleanup" }, "name": "cleanup" }, @@ -291,16 +298,19 @@ "end": { "line": 1, "column": 62 - } + }, + "identifierName": "stuff" }, "name": "stuff" } ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/283/expected.json b/test/fixtures/core/uncategorised/283/expected.json index bf36100cfe..c70dc07eb5 100644 --- a/test/fixtures/core/uncategorised/283/expected.json +++ b/test/fixtures/core/uncategorised/283/expected.json @@ -43,6 +43,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/284/expected.json b/test/fixtures/core/uncategorised/284/expected.json index 8de460e887..89d8911652 100644 --- a/test/fixtures/core/uncategorised/284/expected.json +++ b/test/fixtures/core/uncategorised/284/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,16 +118,19 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/285/expected.json b/test/fixtures/core/uncategorised/285/expected.json index d8bcde0844..01acb188ed 100644 --- a/test/fixtures/core/uncategorised/285/expected.json +++ b/test/fixtures/core/uncategorised/285/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 19 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/286/expected.json b/test/fixtures/core/uncategorised/286/expected.json index 086e1ef65b..93d4d923bf 100644 --- a/test/fixtures/core/uncategorised/286/expected.json +++ b/test/fixtures/core/uncategorised/286/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/287/expected.json b/test/fixtures/core/uncategorised/287/expected.json index c081c978ea..05cce3b8f3 100644 --- a/test/fixtures/core/uncategorised/287/expected.json +++ b/test/fixtures/core/uncategorised/287/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "t" }, "name": "t" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "t" }, "name": "t" } @@ -108,9 +112,11 @@ "column": 23 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/288/expected.json b/test/fixtures/core/uncategorised/288/expected.json index a9c517251e..4b79120694 100644 --- a/test/fixtures/core/uncategorised/288/expected.json +++ b/test/fixtures/core/uncategorised/288/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "t" }, "name": "t" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "t" }, "name": "t" } @@ -126,7 +130,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/289/expected.json b/test/fixtures/core/uncategorised/289/expected.json index 5924cefb02..1b08145eb9 100644 --- a/test/fixtures/core/uncategorised/289/expected.json +++ b/test/fixtures/core/uncategorised/289/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -102,12 +104,14 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "inner" }, "name": "inner" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/29/expected.json b/test/fixtures/core/uncategorised/29/expected.json index 1462403c0d..057f1cf08d 100644 --- a/test/fixtures/core/uncategorised/29/expected.json +++ b/test/fixtures/core/uncategorised/29/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "width" }, "name": "width" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -167,7 +170,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "m_width" }, "name": "m_width" } diff --git a/test/fixtures/core/uncategorised/290/expected.json b/test/fixtures/core/uncategorised/290/expected.json index 3d1b214f48..a5373f5a79 100644 --- a/test/fixtures/core/uncategorised/290/expected.json +++ b/test/fixtures/core/uncategorised/290/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" } @@ -133,16 +136,19 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/291/expected.json b/test/fixtures/core/uncategorised/291/expected.json index 8bc6714852..cdfeb7b019 100644 --- a/test/fixtures/core/uncategorised/291/expected.json +++ b/test/fixtures/core/uncategorised/291/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "b" }, "name": "b" } @@ -149,16 +153,19 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/292/expected.json b/test/fixtures/core/uncategorised/292/expected.json index 70213bc4ee..2a928b39d2 100644 --- a/test/fixtures/core/uncategorised/292/expected.json +++ b/test/fixtures/core/uncategorised/292/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "rest" }, "name": "rest" } @@ -107,9 +110,11 @@ "column": 27 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/293/expected.json b/test/fixtures/core/uncategorised/293/expected.json index 73f53f2cd1..ed3d6655c1 100644 --- a/test/fixtures/core/uncategorised/293/expected.json +++ b/test/fixtures/core/uncategorised/293/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "rest" }, "name": "rest" } @@ -123,9 +127,11 @@ "column": 30 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/294/expected.json b/test/fixtures/core/uncategorised/294/expected.json index 6483debdcd..7df304a88a 100644 --- a/test/fixtures/core/uncategorised/294/expected.json +++ b/test/fixtures/core/uncategorised/294/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -146,20 +148,23 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/295/expected.json b/test/fixtures/core/uncategorised/295/expected.json index 3aee1a20fd..53520cfe7f 100644 --- a/test/fixtures/core/uncategorised/295/expected.json +++ b/test/fixtures/core/uncategorised/295/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "r" }, "name": "r" } @@ -178,20 +181,23 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/296/expected.json b/test/fixtures/core/uncategorised/296/expected.json index b4b770ef03..ce5cb42288 100644 --- a/test/fixtures/core/uncategorised/296/expected.json +++ b/test/fixtures/core/uncategorised/296/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -120,13 +123,15 @@ "column": 28 } }, - "body": [] + "body": [], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/297/expected.json b/test/fixtures/core/uncategorised/297/expected.json index 75abd7b81c..2b88f0d953 100644 --- a/test/fixtures/core/uncategorised/297/expected.json +++ b/test/fixtures/core/uncategorised/297/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -120,13 +123,15 @@ "column": 33 } }, - "body": [] + "body": [], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/298/expected.json b/test/fixtures/core/uncategorised/298/expected.json index 71c7365c51..f3e529622f 100644 --- a/test/fixtures/core/uncategorised/298/expected.json +++ b/test/fixtures/core/uncategorised/298/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "hello" }, "name": "hello" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "hi" }, "name": "hi" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -161,20 +164,23 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/299/expected.json b/test/fixtures/core/uncategorised/299/expected.json index fac0f4b32c..f79af90cc1 100644 --- a/test/fixtures/core/uncategorised/299/expected.json +++ b/test/fixtures/core/uncategorised/299/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -78,7 +79,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/30/expected.json b/test/fixtures/core/uncategorised/30/expected.json index 7694f2fd33..b2a8bf8168 100644 --- a/test/fixtures/core/uncategorised/30/expected.json +++ b/test/fixtures/core/uncategorised/30/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "undef" }, "name": "undef" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/300/expected.json b/test/fixtures/core/uncategorised/300/expected.json index bab8079535..855b9666cc 100644 --- a/test/fixtures/core/uncategorised/300/expected.json +++ b/test/fixtures/core/uncategorised/300/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,14 +117,20 @@ "end": { "line": 2, "column": 3 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/301/expected.json b/test/fixtures/core/uncategorised/301/expected.json index e7aa5f92ff..f531eb96b4 100644 --- a/test/fixtures/core/uncategorised/301/expected.json +++ b/test/fixtures/core/uncategorised/301/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,14 +117,20 @@ "end": { "line": 2, "column": 3 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/302/expected.json b/test/fixtures/core/uncategorised/302/expected.json index b80d317427..3840e25325 100644 --- a/test/fixtures/core/uncategorised/302/expected.json +++ b/test/fixtures/core/uncategorised/302/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null, diff --git a/test/fixtures/core/uncategorised/303/expected.json b/test/fixtures/core/uncategorised/303/expected.json index 0c955c4730..3881fa499d 100644 --- a/test/fixtures/core/uncategorised/303/expected.json +++ b/test/fixtures/core/uncategorised/303/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -189,7 +191,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "z" }, "name": "z" } diff --git a/test/fixtures/core/uncategorised/304/expected.json b/test/fixtures/core/uncategorised/304/expected.json index 1c02f6ef66..84e28f3bd9 100644 --- a/test/fixtures/core/uncategorised/304/expected.json +++ b/test/fixtures/core/uncategorised/304/expected.json @@ -115,7 +115,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there" } diff --git a/test/fixtures/core/uncategorised/305/expected.json b/test/fixtures/core/uncategorised/305/expected.json index 675fe056a3..fd7f41293b 100644 --- a/test/fixtures/core/uncategorised/305/expected.json +++ b/test/fixtures/core/uncategorised/305/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/306/expected.json b/test/fixtures/core/uncategorised/306/expected.json index dfef6b5c50..820264c6d1 100644 --- a/test/fixtures/core/uncategorised/306/expected.json +++ b/test/fixtures/core/uncategorised/306/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/307/expected.json b/test/fixtures/core/uncategorised/307/expected.json index 2b8d9fef9f..560762d177 100644 --- a/test/fixtures/core/uncategorised/307/expected.json +++ b/test/fixtures/core/uncategorised/307/expected.json @@ -115,7 +115,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there" } diff --git a/test/fixtures/core/uncategorised/308/expected.json b/test/fixtures/core/uncategorised/308/expected.json index 21c911cbbc..b5794cac3a 100644 --- a/test/fixtures/core/uncategorised/308/expected.json +++ b/test/fixtures/core/uncategorised/308/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/309/expected.json b/test/fixtures/core/uncategorised/309/expected.json index 55ac6a29a8..62b72404df 100644 --- a/test/fixtures/core/uncategorised/309/expected.json +++ b/test/fixtures/core/uncategorised/309/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/31/expected.json b/test/fixtures/core/uncategorised/31/expected.json index 966b9f90ca..5b18965177 100644 --- a/test/fixtures/core/uncategorised/31/expected.json +++ b/test/fixtures/core/uncategorised/31/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "if" }, "name": "if" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/310/expected.json b/test/fixtures/core/uncategorised/310/expected.json index 7d4c8d5bb6..e5fa9ec260 100644 --- a/test/fixtures/core/uncategorised/310/expected.json +++ b/test/fixtures/core/uncategorised/310/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,7 +118,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } @@ -126,7 +128,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/311/expected.json b/test/fixtures/core/uncategorised/311/expected.json index f0cf8a4b53..3b50dd8b73 100644 --- a/test/fixtures/core/uncategorised/311/expected.json +++ b/test/fixtures/core/uncategorised/311/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -136,7 +137,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null @@ -164,7 +166,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/312/expected.json b/test/fixtures/core/uncategorised/312/expected.json index 975bfdf605..6ae21e8aa6 100644 --- a/test/fixtures/core/uncategorised/312/expected.json +++ b/test/fixtures/core/uncategorised/312/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -136,7 +137,8 @@ "end": { "line": 2, "column": 11 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null @@ -164,7 +166,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/313/expected.json b/test/fixtures/core/uncategorised/313/expected.json index d55af430c7..d1fb3ac429 100644 --- a/test/fixtures/core/uncategorised/313/expected.json +++ b/test/fixtures/core/uncategorised/313/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error" } @@ -100,13 +101,16 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "error" }, "name": "error" } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/314/expected.json b/test/fixtures/core/uncategorised/314/expected.json index 1340d70360..55562ff024 100644 --- a/test/fixtures/core/uncategorised/314/expected.json +++ b/test/fixtures/core/uncategorised/314/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null, @@ -120,7 +121,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/315/expected.json b/test/fixtures/core/uncategorised/315/expected.json index fcf481f414..acb5183a09 100644 --- a/test/fixtures/core/uncategorised/315/expected.json +++ b/test/fixtures/core/uncategorised/315/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null, @@ -120,7 +121,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/316/expected.json b/test/fixtures/core/uncategorised/316/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/core/uncategorised/316/expected.json +++ b/test/fixtures/core/uncategorised/316/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/317/expected.json b/test/fixtures/core/uncategorised/317/expected.json index 96b5884573..75aac067bd 100644 --- a/test/fixtures/core/uncategorised/317/expected.json +++ b/test/fixtures/core/uncategorised/317/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/core/uncategorised/318/expected.json b/test/fixtures/core/uncategorised/318/expected.json index 1fda36e9a7..be25c9494b 100644 --- a/test/fixtures/core/uncategorised/318/expected.json +++ b/test/fixtures/core/uncategorised/318/expected.json @@ -73,6 +73,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -165,7 +166,8 @@ }, "arguments": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/319/expected.json b/test/fixtures/core/uncategorised/319/expected.json index 9cb04403f1..712b896d4b 100644 --- a/test/fixtures/core/uncategorised/319/expected.json +++ b/test/fixtures/core/uncategorised/319/expected.json @@ -102,7 +102,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "toString" }, "name": "toString" }, diff --git a/test/fixtures/core/uncategorised/32/expected.json b/test/fixtures/core/uncategorised/32/expected.json index 0ab2082d42..5ed0dee78e 100644 --- a/test/fixtures/core/uncategorised/32/expected.json +++ b/test/fixtures/core/uncategorised/32/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "true" }, "name": "true" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/321/expected.json b/test/fixtures/core/uncategorised/321/expected.json index 0fbaec1ec3..93c8373aec 100644 --- a/test/fixtures/core/uncategorised/321/expected.json +++ b/test/fixtures/core/uncategorised/321/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" } @@ -85,11 +86,13 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "b" }, "name": "b" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/323/expected.json b/test/fixtures/core/uncategorised/323/expected.json index 662a04aa6e..1fd3d16a4b 100644 --- a/test/fixtures/core/uncategorised/323/expected.json +++ b/test/fixtures/core/uncategorised/323/expected.json @@ -89,7 +89,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -155,7 +156,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/core/uncategorised/325/expected.json b/test/fixtures/core/uncategorised/325/expected.json index 60a0422da0..2d2a386aeb 100644 --- a/test/fixtures/core/uncategorised/325/expected.json +++ b/test/fixtures/core/uncategorised/325/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "price_9̶9̶_89" }, "name": "price_9̶9̶_89" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/326/expected.json b/test/fixtures/core/uncategorised/326/expected.json index ddb03e0cb1..818768b81f 100644 --- a/test/fixtures/core/uncategorised/326/expected.json +++ b/test/fixtures/core/uncategorised/326/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "in" }, "name": "in" }, @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/327/expected.json b/test/fixtures/core/uncategorised/327/expected.json index 9e26dfeeb6..faafaf7932 100644 --- a/test/fixtures/core/uncategorised/327/expected.json +++ b/test/fixtures/core/uncategorised/327/expected.json @@ -1 +1,101 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ReturnStatement", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "argument": { + "type": "BinaryExpression", + "start": 7, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "left": { + "type": "ObjectExpression", + "start": 7, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "properties": [] + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 12, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 12 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/328/expected.json b/test/fixtures/core/uncategorised/328/expected.json index 9e26dfeeb6..fdb2242bec 100644 --- a/test/fixtures/core/uncategorised/328/expected.json +++ b/test/fixtures/core/uncategorised/328/expected.json @@ -1 +1,102 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ReturnStatement", + "start": 0, + "end": 6, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 6 + } + }, + "argument": null + }, + { + "type": "BlockStatement", + "start": 7, + "end": 9, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 2 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/329/expected.json b/test/fixtures/core/uncategorised/329/expected.json index 9e26dfeeb6..a8b5a5435c 100644 --- a/test/fixtures/core/uncategorised/329/expected.json +++ b/test/fixtures/core/uncategorised/329/expected.json @@ -1 +1,121 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "expression": { + "type": "BinaryExpression", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "left": { + "type": "UnaryExpression", + "start": 0, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "operator": "+", + "prefix": true, + "argument": { + "type": "ObjectExpression", + "start": 1, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "properties": [] + }, + "extra": { + "parenthesizedArgument": false + } + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 6, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 6 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/33/expected.json b/test/fixtures/core/uncategorised/33/expected.json index ccc78d04a7..a0a3fa12fd 100644 --- a/test/fixtures/core/uncategorised/33/expected.json +++ b/test/fixtures/core/uncategorised/33/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "false" }, "name": "false" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/330/expected.json b/test/fixtures/core/uncategorised/330/expected.json index 9e26dfeeb6..0f4d9b4428 100644 --- a/test/fixtures/core/uncategorised/330/expected.json +++ b/test/fixtures/core/uncategorised/330/expected.json @@ -1 +1,86 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "sourceType": "script", + "body": [ + { + "type": "BlockStatement", + "start": 0, + "end": 2, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 2 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 3, + "end": 8, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 3, + "end": 8, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/331/expected.json b/test/fixtures/core/uncategorised/331/expected.json index 9e26dfeeb6..e5046ea184 100644 --- a/test/fixtures/core/uncategorised/331/expected.json +++ b/test/fixtures/core/uncategorised/331/expected.json @@ -1 +1,135 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "expression": { + "type": "UpdateExpression", + "start": 0, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "operator": "++", + "prefix": false, + "argument": { + "type": "Identifier", + "start": 0, + "end": 1, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 1 + }, + "identifierName": "x" + }, + "name": "x" + } + } + }, + { + "type": "BlockStatement", + "start": 4, + "end": 6, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 2 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 7, + "end": 12, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 7, + "end": 12, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/332/expected.json b/test/fixtures/core/uncategorised/332/expected.json index 9e26dfeeb6..aace18f78b 100644 --- a/test/fixtures/core/uncategorised/332/expected.json +++ b/test/fixtures/core/uncategorised/332/expected.json @@ -1 +1,104 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 6 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 6 + } + }, + "sourceType": "script", + "body": [ + { + "type": "BlockStatement", + "start": 0, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 6 + } + }, + "body": [ + { + "type": "BlockStatement", + "start": 1, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 4, + "end": 9, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 4, + "end": 9, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/333/expected.json b/test/fixtures/core/uncategorised/333/expected.json index 9e26dfeeb6..f8c581d82e 100644 --- a/test/fixtures/core/uncategorised/333/expected.json +++ b/test/fixtures/core/uncategorised/333/expected.json @@ -1 +1,104 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "sourceType": "script", + "body": [ + { + "type": "WhileStatement", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "test": { + "type": "NumericLiteral", + "start": 7, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + }, + "body": { + "type": "ExpressionStatement", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/334/expected.json b/test/fixtures/core/uncategorised/334/expected.json index 9e26dfeeb6..abfa6cae3c 100644 --- a/test/fixtures/core/uncategorised/334/expected.json +++ b/test/fixtures/core/uncategorised/334/expected.json @@ -1 +1,107 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "expression": { + "type": "BinaryExpression", + "start": 0, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "left": { + "type": "NumericLiteral", + "start": 1, + "end": 2, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 2 + } + }, + "extra": { + "rawValue": 1, + "raw": "1", + "parenthesized": true, + "parenStart": 0 + }, + "value": 1 + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 6, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 6 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/335/expected.json b/test/fixtures/core/uncategorised/335/expected.json index 9e26dfeeb6..7ecc877cd8 100644 --- a/test/fixtures/core/uncategorised/335/expected.json +++ b/test/fixtures/core/uncategorised/335/expected.json @@ -1 +1,210 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 17, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 17 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 17, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 17 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 17, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 17 + } + }, + "expression": { + "type": "BinaryExpression", + "start": 0, + "end": 17, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 17 + } + }, + "left": { + "type": "BinaryExpression", + "start": 1, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 12 + } + }, + "left": { + "type": "ObjectExpression", + "start": 1, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "properties": [ + { + "type": "ObjectProperty", + "start": 2, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 2 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 2, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 2 + }, + "end": { + "line": 1, + "column": 3 + }, + "identifierName": "a" + }, + "name": "a" + }, + "value": { + "type": "ArrayExpression", + "start": 5, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 5 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "elements": [ + { + "type": "NumericLiteral", + "start": 6, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 6 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + ] + } + } + ] + }, + "operator": "+", + "right": { + "type": "ArrayExpression", + "start": 10, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 12 + } + }, + "elements": [] + }, + "extra": { + "parenthesized": true, + "parenStart": 0 + } + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 16, + "end": 17, + "loc": { + "start": { + "line": 1, + "column": 16 + }, + "end": { + "line": 1, + "column": 17 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/336/expected.json b/test/fixtures/core/uncategorised/336/expected.json index 9e26dfeeb6..63ecb1d5de 100644 --- a/test/fixtures/core/uncategorised/336/expected.json +++ b/test/fixtures/core/uncategorised/336/expected.json @@ -1 +1,139 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "sourceType": "script", + "body": [ + { + "type": "BlockStatement", + "start": 0, + "end": 5, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 5 + } + }, + "body": [ + { + "type": "ExpressionStatement", + "start": 1, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 4 + } + }, + "expression": { + "type": "ArrayExpression", + "start": 1, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 4 + } + }, + "elements": [ + { + "type": "NumericLiteral", + "start": 2, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 2 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + ] + } + } + ], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 6, + "end": 11, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 6, + "end": 11, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/337/expected.json b/test/fixtures/core/uncategorised/337/expected.json index 9e26dfeeb6..202e7d6c52 100644 --- a/test/fixtures/core/uncategorised/337/expected.json +++ b/test/fixtures/core/uncategorised/337/expected.json @@ -1 +1,157 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 7 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 7 + } + }, + "sourceType": "script", + "body": [ + { + "type": "SwitchStatement", + "start": 0, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 7 + } + }, + "discriminant": { + "type": "Identifier", + "start": 7, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 8 + }, + "identifierName": "a" + }, + "name": "a" + }, + "cases": [ + { + "type": "SwitchCase", + "start": 12, + "end": 28, + "loc": { + "start": { + "line": 1, + "column": 12 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "consequent": [ + { + "type": "BlockStatement", + "start": 20, + "end": 22, + "loc": { + "start": { + "line": 1, + "column": 20 + }, + "end": { + "line": 1, + "column": 22 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 23, + "end": 28, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 23, + "end": 28, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "test": { + "type": "NumericLiteral", + "start": 17, + "end": 18, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 18 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + ] + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/338/expected.json b/test/fixtures/core/uncategorised/338/expected.json index 9e26dfeeb6..fe0875e9a4 100644 --- a/test/fixtures/core/uncategorised/338/expected.json +++ b/test/fixtures/core/uncategorised/338/expected.json @@ -1 +1,160 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 13, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 13 + } + }, + "expression": { + "type": "ObjectExpression", + "start": 1, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 12 + } + }, + "properties": [ + { + "type": "ObjectProperty", + "start": 2, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 2 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "NumericLiteral", + "start": 2, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 2 + }, + "end": { + "line": 1, + "column": 3 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + }, + "value": { + "type": "BinaryExpression", + "start": 5, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 5 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "left": { + "type": "ObjectExpression", + "start": 5, + "end": 7, + "loc": { + "start": { + "line": 1, + "column": 5 + }, + "end": { + "line": 1, + "column": 7 + } + }, + "properties": [] + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 10, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "extra": { + "parenthesized": true, + "parenStart": 0 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/339/expected.json b/test/fixtures/core/uncategorised/339/expected.json index 9e26dfeeb6..f219c75e64 100644 --- a/test/fixtures/core/uncategorised/339/expected.json +++ b/test/fixtures/core/uncategorised/339/expected.json @@ -1 +1,139 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "expression": { + "type": "BinaryExpression", + "start": 0, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "left": { + "type": "UnaryExpression", + "start": 0, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 4 + } + }, + "operator": "+", + "prefix": true, + "argument": { + "type": "UpdateExpression", + "start": 1, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 4 + } + }, + "operator": "++", + "prefix": false, + "argument": { + "type": "Identifier", + "start": 1, + "end": 2, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 2 + }, + "identifierName": "x" + }, + "name": "x" + } + }, + "extra": { + "parenthesizedArgument": false + } + }, + "operator": "/", + "right": { + "type": "NumericLiteral", + "start": 7, + "end": 8, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 8 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/34/expected.json b/test/fixtures/core/uncategorised/34/expected.json index c8ef1380a8..5ccdf34d1e 100644 --- a/test/fixtures/core/uncategorised/34/expected.json +++ b/test/fixtures/core/uncategorised/34/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "null" }, "name": "null" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/340/expected.json b/test/fixtures/core/uncategorised/340/expected.json index 9e26dfeeb6..7ccbc843ad 100644 --- a/test/fixtures/core/uncategorised/340/expected.json +++ b/test/fixtures/core/uncategorised/340/expected.json @@ -1 +1,151 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 6, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 6 + } + }, + "expression": { + "type": "MemberExpression", + "start": 0, + "end": 6, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 6 + } + }, + "object": { + "type": "Identifier", + "start": 0, + "end": 3, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 3 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + "property": { + "type": "Identifier", + "start": 4, + "end": 6, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 6 + }, + "identifierName": "in" + }, + "name": "in" + }, + "computed": false + } + }, + { + "type": "BlockStatement", + "start": 7, + "end": 9, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 2 + } + }, + "body": [], + "directives": [] + }, + { + "type": "ExpressionStatement", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "expression": { + "type": "RegExpLiteral", + "start": 10, + "end": 15, + "loc": { + "start": { + "line": 3, + "column": 0 + }, + "end": { + "line": 3, + "column": 5 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/342/expected.json b/test/fixtures/core/uncategorised/342/expected.json index 418f936ff6..4501a541b5 100644 --- a/test/fixtures/core/uncategorised/342/expected.json +++ b/test/fixtures/core/uncategorised/342/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo", "leadingComments": null, @@ -104,7 +105,8 @@ "end": { "line": 2, "column": 4 - } + }, + "identifierName": "baz" }, "name": "baz", "leadingComments": [ diff --git a/test/fixtures/core/uncategorised/343/expected.json b/test/fixtures/core/uncategorised/343/expected.json index e3a56910e4..16b19e6130 100644 --- a/test/fixtures/core/uncategorised/343/expected.json +++ b/test/fixtures/core/uncategorised/343/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/core/uncategorised/344/expected.json b/test/fixtures/core/uncategorised/344/expected.json index 827aebf2db..7bf2896043 100644 --- a/test/fixtures/core/uncategorised/344/expected.json +++ b/test/fixtures/core/uncategorised/344/expected.json @@ -82,7 +82,8 @@ "end": { "line": 2, "column": 6 - } + }, + "identifierName": "object" }, "name": "object" }, @@ -98,7 +99,8 @@ "end": { "line": 2, "column": 13 - } + }, + "identifierName": "static" }, "name": "static" }, diff --git a/test/fixtures/core/uncategorised/35/expected.json b/test/fixtures/core/uncategorised/35/expected.json index 6a4504c896..36830ddf37 100644 --- a/test/fixtures/core/uncategorised/35/expected.json +++ b/test/fixtures/core/uncategorised/35/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/36/expected.json b/test/fixtures/core/uncategorised/36/expected.json index 80eca1b9e4..dfbd42e884 100644 --- a/test/fixtures/core/uncategorised/36/expected.json +++ b/test/fixtures/core/uncategorised/36/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/37/expected.json b/test/fixtures/core/uncategorised/37/expected.json index ad75991dc1..821787cfd7 100644 --- a/test/fixtures/core/uncategorised/37/expected.json +++ b/test/fixtures/core/uncategorised/37/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "width" }, "name": "width" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "w" }, "name": "w" } @@ -199,7 +203,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "m_width" }, "name": "m_width" }, @@ -215,7 +220,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/38/expected.json b/test/fixtures/core/uncategorised/38/expected.json index e290b184de..8b525fb80c 100644 --- a/test/fixtures/core/uncategorised/38/expected.json +++ b/test/fixtures/core/uncategorised/38/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "if" }, "name": "if" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "w" }, "name": "w" } @@ -199,7 +203,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "m_if" }, "name": "m_if" }, @@ -215,7 +220,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/39/expected.json b/test/fixtures/core/uncategorised/39/expected.json index 60ca06a14b..6d693c7fb0 100644 --- a/test/fixtures/core/uncategorised/39/expected.json +++ b/test/fixtures/core/uncategorised/39/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "true" }, "name": "true" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "w" }, "name": "w" } @@ -199,7 +203,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "m_true" }, "name": "m_true" }, @@ -215,7 +220,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/40/expected.json b/test/fixtures/core/uncategorised/40/expected.json index 2e92b355f6..226cdce5f6 100644 --- a/test/fixtures/core/uncategorised/40/expected.json +++ b/test/fixtures/core/uncategorised/40/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "false" }, "name": "false" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "w" }, "name": "w" } @@ -199,7 +203,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "m_false" }, "name": "m_false" }, @@ -215,7 +220,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/41/expected.json b/test/fixtures/core/uncategorised/41/expected.json index af9300d188..6fb466dce4 100644 --- a/test/fixtures/core/uncategorised/41/expected.json +++ b/test/fixtures/core/uncategorised/41/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "null" }, "name": "null" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "w" }, "name": "w" } @@ -199,7 +203,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "m_null" }, "name": "m_null" }, @@ -215,7 +220,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/42/expected.json b/test/fixtures/core/uncategorised/42/expected.json index 7bc3ec6059..c0d601a0c6 100644 --- a/test/fixtures/core/uncategorised/42/expected.json +++ b/test/fixtures/core/uncategorised/42/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -142,7 +144,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "w" }, "name": "w" } @@ -203,7 +206,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "m_null" }, "name": "m_null" }, @@ -219,7 +223,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/43/expected.json b/test/fixtures/core/uncategorised/43/expected.json index b2b46810dc..ef2d3f1eb7 100644 --- a/test/fixtures/core/uncategorised/43/expected.json +++ b/test/fixtures/core/uncategorised/43/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -142,7 +144,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "w" }, "name": "w" } @@ -203,7 +206,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "m_null" }, "name": "m_null" }, @@ -219,7 +223,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "w" }, "name": "w" } diff --git a/test/fixtures/core/uncategorised/44/expected.json b/test/fixtures/core/uncategorised/44/expected.json index 33f2638826..da5e30670e 100644 --- a/test/fixtures/core/uncategorised/44/expected.json +++ b/test/fixtures/core/uncategorised/44/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "get" }, "name": "get" }, diff --git a/test/fixtures/core/uncategorised/45/expected.json b/test/fixtures/core/uncategorised/45/expected.json index bb724805ea..36c20d4050 100644 --- a/test/fixtures/core/uncategorised/45/expected.json +++ b/test/fixtures/core/uncategorised/45/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "set" }, "name": "set" }, diff --git a/test/fixtures/core/uncategorised/525/expected.json b/test/fixtures/core/uncategorised/525/expected.json index 9e7caa0016..76753120a1 100644 --- a/test/fixtures/core/uncategorised/525/expected.json +++ b/test/fixtures/core/uncategorised/525/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -78,6 +79,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/526/expected.json b/test/fixtures/core/uncategorised/526/expected.json index 9e32e59ad2..e762adfed3 100644 --- a/test/fixtures/core/uncategorised/526/expected.json +++ b/test/fixtures/core/uncategorised/526/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -110,6 +112,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/527/expected.json b/test/fixtures/core/uncategorised/527/expected.json index 8db391b3af..157910021f 100644 --- a/test/fixtures/core/uncategorised/527/expected.json +++ b/test/fixtures/core/uncategorised/527/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/528/expected.json b/test/fixtures/core/uncategorised/528/expected.json index ebe4c4d182..f678e52654 100644 --- a/test/fixtures/core/uncategorised/528/expected.json +++ b/test/fixtures/core/uncategorised/528/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/core/uncategorised/529/expected.json b/test/fixtures/core/uncategorised/529/expected.json index e883fbe4f2..1067b58643 100644 --- a/test/fixtures/core/uncategorised/529/expected.json +++ b/test/fixtures/core/uncategorised/529/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/core/uncategorised/530/expected.json b/test/fixtures/core/uncategorised/530/expected.json index ced9b7da30..a1ccc73433 100644 --- a/test/fixtures/core/uncategorised/530/expected.json +++ b/test/fixtures/core/uncategorised/530/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/531/expected.json b/test/fixtures/core/uncategorised/531/expected.json index a40116c512..26a28de03c 100644 --- a/test/fixtures/core/uncategorised/531/expected.json +++ b/test/fixtures/core/uncategorised/531/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/core/uncategorised/532/expected.json b/test/fixtures/core/uncategorised/532/expected.json index 12d30b3dd3..c86ced2dd6 100644 --- a/test/fixtures/core/uncategorised/532/expected.json +++ b/test/fixtures/core/uncategorised/532/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +178,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/533/expected.json b/test/fixtures/core/uncategorised/533/expected.json index e194cd4fc2..5b8946932d 100644 --- a/test/fixtures/core/uncategorised/533/expected.json +++ b/test/fixtures/core/uncategorised/533/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/534/expected.json b/test/fixtures/core/uncategorised/534/expected.json index ee0b458ad8..e09754f492 100644 --- a/test/fixtures/core/uncategorised/534/expected.json +++ b/test/fixtures/core/uncategorised/534/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/core/uncategorised/535/expected.json b/test/fixtures/core/uncategorised/535/expected.json index 446cd2cbed..62dc6d154e 100644 --- a/test/fixtures/core/uncategorised/535/expected.json +++ b/test/fixtures/core/uncategorised/535/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/core/uncategorised/537/expected.json b/test/fixtures/core/uncategorised/537/expected.json index 0ad053b30e..958b6ab0cc 100644 --- a/test/fixtures/core/uncategorised/537/expected.json +++ b/test/fixtures/core/uncategorised/537/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/core/uncategorised/539/expected.json b/test/fixtures/core/uncategorised/539/expected.json index 9e26dfeeb6..2bd4333d31 100644 --- a/test/fixtures/core/uncategorised/539/expected.json +++ b/test/fixtures/core/uncategorised/539/expected.json @@ -1 +1,141 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "sourceType": "script", + "body": [ + { + "type": "FunctionDeclaration", + "start": 0, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "id": { + "type": "Identifier", + "start": 9, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 10 + }, + "identifierName": "f" + }, + "name": "f" + }, + "generator": false, + "expression": false, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 11, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 11 + }, + "end": { + "line": 1, + "column": 12 + }, + "identifierName": "f" + }, + "name": "f" + } + ], + "body": { + "type": "BlockStatement", + "start": 14, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 14 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "body": [], + "directives": [ + { + "type": "Directive", + "start": 16, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 16 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "value": { + "type": "DirectiveLiteral", + "start": 16, + "end": 28, + "loc": { + "start": { + "line": 1, + "column": 16 + }, + "end": { + "line": 1, + "column": 28 + } + }, + "value": "use strict", + "extra": { + "raw": "'use strict'", + "rawValue": "use strict" + } + } + } + ] + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/540/expected.json b/test/fixtures/core/uncategorised/540/expected.json index ffbcf34606..0decbaaefa 100644 --- a/test/fixtures/core/uncategorised/540/expected.json +++ b/test/fixtures/core/uncategorised/540/expected.json @@ -73,6 +73,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -114,7 +115,8 @@ "value": 1 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/core/uncategorised/541/expected.json b/test/fixtures/core/uncategorised/541/expected.json index c9f5c36ac7..db7df06cb3 100644 --- a/test/fixtures/core/uncategorised/541/expected.json +++ b/test/fixtures/core/uncategorised/541/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/542/expected.json b/test/fixtures/core/uncategorised/542/expected.json index dac534f2f7..3dc935f6be 100644 --- a/test/fixtures/core/uncategorised/542/expected.json +++ b/test/fixtures/core/uncategorised/542/expected.json @@ -102,7 +102,8 @@ "end": { "line": 2, "column": 6 - } + }, + "identifierName": "split" }, "name": "split" }, @@ -135,4 +136,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/543/expected.json b/test/fixtures/core/uncategorised/543/expected.json index ecc6f809c9..174e12e8d2 100644 --- a/test/fixtures/core/uncategorised/543/expected.json +++ b/test/fixtures/core/uncategorised/543/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "fn" }, "name": "fn" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/core/uncategorised/6/expected.json b/test/fixtures/core/uncategorised/6/expected.json index 33043e035c..213f57310d 100644 --- a/test/fixtures/core/uncategorised/6/expected.json +++ b/test/fixtures/core/uncategorised/6/expected.json @@ -112,7 +112,8 @@ "value": 2 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "operator": "*", diff --git a/test/fixtures/core/uncategorised/64/expected.json b/test/fixtures/core/uncategorised/64/expected.json index 417e718ef6..9c1a6d4b50 100644 --- a/test/fixtures/core/uncategorised/64/expected.json +++ b/test/fixtures/core/uncategorised/64/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -113,7 +114,8 @@ "end": { "line": 2, "column": 6 - } + }, + "identifierName": "doThat" }, "name": "doThat", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/65/expected.json b/test/fixtures/core/uncategorised/65/expected.json index 7a17ba3527..dfcf35acfe 100644 --- a/test/fixtures/core/uncategorised/65/expected.json +++ b/test/fixtures/core/uncategorised/65/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 46 - } + }, + "identifierName": "bingo" }, "name": "bingo", "leadingComments": null diff --git a/test/fixtures/core/uncategorised/7/expected.json b/test/fixtures/core/uncategorised/7/expected.json index eecbadfa66..7653286f2a 100644 --- a/test/fixtures/core/uncategorised/7/expected.json +++ b/test/fixtures/core/uncategorised/7/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/8/expected.json b/test/fixtures/core/uncategorised/8/expected.json index afd3885785..a971641682 100644 --- a/test/fixtures/core/uncategorised/8/expected.json +++ b/test/fixtures/core/uncategorised/8/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -91,6 +92,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/core/uncategorised/9/expected.json b/test/fixtures/core/uncategorised/9/expected.json index 13c08de8ec..e07b3ce88d 100644 --- a/test/fixtures/core/uncategorised/9/expected.json +++ b/test/fixtures/core/uncategorised/9/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/es2015/uncategorised/288/actual.js b/test/fixtures/es2015/array-rest-spread/invalid-location/actual.js similarity index 100% rename from test/fixtures/es2015/uncategorised/288/actual.js rename to test/fixtures/es2015/array-rest-spread/invalid-location/actual.js diff --git a/test/fixtures/es2015/array-rest-spread/invalid-location/options.json b/test/fixtures/es2015/array-rest-spread/invalid-location/options.json new file mode 100644 index 0000000000..beef14a214 --- /dev/null +++ b/test/fixtures/es2015/array-rest-spread/invalid-location/options.json @@ -0,0 +1,3 @@ +{ + "throws": "The rest element has to be the last element when destructuring (1:1)" +} diff --git a/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json b/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json index 00b780b1c4..718795d103 100644 --- a/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json +++ b/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -135,7 +137,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "title" }, "name": "title" }, @@ -151,7 +154,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "title" }, "name": "title" }, @@ -160,7 +164,7 @@ } }, { - "type": "RestProperty", + "type": "RestElement", "start": 21, "end": 29, "loc": { @@ -185,7 +189,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "other" }, "name": "other" } diff --git a/test/fixtures/es2015/class-methods/linebreaks/expected.json b/test/fixtures/es2015/class-methods/linebreaks/expected.json index 62dcad3c53..7094788e97 100644 --- a/test/fixtures/es2015/class-methods/linebreaks/expected.json +++ b/test/fixtures/es2015/class-methods/linebreaks/expected.json @@ -90,7 +90,6 @@ } }, "static": false, - "kind": "get", "computed": false, "key": { "type": "Identifier", @@ -109,6 +108,7 @@ }, "name": "a" }, + "kind": "get", "id": null, "generator": false, "expression": false, @@ -147,7 +147,6 @@ } }, "static": false, - "kind": "set", "computed": false, "key": { "type": "Identifier", @@ -166,6 +165,7 @@ }, "name": "a" }, + "kind": "set", "id": null, "generator": false, "expression": false, @@ -393,7 +393,6 @@ } }, "static": true, - "kind": "get", "computed": false, "key": { "type": "Identifier", @@ -412,6 +411,7 @@ }, "name": "a" }, + "kind": "get", "id": null, "generator": false, "expression": false, @@ -450,7 +450,6 @@ } }, "static": true, - "kind": "set", "computed": false, "key": { "type": "Identifier", @@ -469,6 +468,7 @@ }, "name": "a" }, + "kind": "set", "id": null, "generator": false, "expression": false, diff --git a/test/fixtures/es2015/class-methods/tricky-names/expected.json b/test/fixtures/es2015/class-methods/tricky-names/expected.json index 27b74a271b..5a167e4d71 100644 --- a/test/fixtures/es2015/class-methods/tricky-names/expected.json +++ b/test/fixtures/es2015/class-methods/tricky-names/expected.json @@ -90,7 +90,6 @@ } }, "static": false, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -109,6 +108,7 @@ }, "name": "get" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -147,7 +147,6 @@ } }, "static": false, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -166,6 +165,7 @@ }, "name": "set" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -261,7 +261,6 @@ } }, "static": false, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -280,6 +279,7 @@ }, "name": "async" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -318,7 +318,6 @@ } }, "static": true, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -337,6 +336,7 @@ }, "name": "get" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -375,7 +375,6 @@ } }, "static": true, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -394,6 +393,7 @@ }, "name": "set" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -489,7 +489,6 @@ } }, "static": true, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -508,6 +507,7 @@ }, "name": "async" }, + "kind": "method", "id": null, "generator": false, "expression": false, @@ -603,7 +603,6 @@ } }, "static": false, - "kind": "get", "computed": false, "key": { "type": "Identifier", @@ -622,6 +621,7 @@ }, "name": "async" }, + "kind": "get", "id": null, "generator": false, "expression": false, @@ -660,7 +660,6 @@ } }, "static": true, - "kind": "get", "computed": false, "key": { "type": "Identifier", @@ -679,6 +678,7 @@ }, "name": "static" }, + "kind": "get", "id": null, "generator": false, "expression": false, diff --git a/test/fixtures/es2015/computed-properties/call-expression/expected.json b/test/fixtures/es2015/computed-properties/call-expression/expected.json index 6a6f627eec..876a6855b0 100644 --- a/test/fixtures/es2015/computed-properties/call-expression/expected.json +++ b/test/fixtures/es2015/computed-properties/call-expression/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -131,7 +132,8 @@ "end": { "line": 2, "column": 6 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json b/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json index 3d8ba60894..7b3fa80cce 100644 --- a/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json +++ b/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json @@ -2521,7 +2521,8 @@ "end": { "line": 12, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -2554,7 +2555,8 @@ "end": { "line": 12, "column": 29 - } + }, + "identifierName": "qux7" }, "name": "qux7" } @@ -2575,7 +2577,8 @@ "end": { "line": 12, "column": 39 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/es2015/modules/export-default-function-declaration-expression-disambiguation/expected.json b/test/fixtures/es2015/modules/export-default-function-declaration-expression-disambiguation/expected.json index 499e822973..8106cf01a0 100644 --- a/test/fixtures/es2015/modules/export-default-function-declaration-expression-disambiguation/expected.json +++ b/test/fixtures/es2015/modules/export-default-function-declaration-expression-disambiguation/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -105,11 +106,13 @@ "end": { "line": 2, "column": 4 - } + }, + "identifierName": "foo" }, "name": "foo", "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 30 } } } diff --git a/test/fixtures/es2015/modules/export-default-function-declaration/expected.json b/test/fixtures/es2015/modules/export-default-function-declaration/expected.json index 182219d69c..ffc9c92fd4 100644 --- a/test/fixtures/es2015/modules/export-default-function-declaration/expected.json +++ b/test/fixtures/es2015/modules/export-default-function-declaration/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -89,10 +91,12 @@ "column": 30 } }, - "body": [] + "body": [], + "directives": [] } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2015/modules/export-default-function-expression/expected.json b/test/fixtures/es2015/modules/export-default-function-expression/expected.json index a83ccafb0b..845de0632b 100644 --- a/test/fixtures/es2015/modules/export-default-function-expression/expected.json +++ b/test/fixtures/es2015/modules/export-default-function-expression/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -93,7 +95,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 15 } } } diff --git a/test/fixtures/es2015/regression/186/expected.json b/test/fixtures/es2015/regression/186/expected.json index fc3a010f4e..080e9bbb8d 100644 --- a/test/fixtures/es2015/regression/186/expected.json +++ b/test/fixtures/es2015/regression/186/expected.json @@ -122,6 +122,7 @@ }, "name": "async" }, + "computed": false, "value": { "type": "Identifier", "start": 11, diff --git a/test/fixtures/es2015/uncategorised/.191/expected.json b/test/fixtures/es2015/uncategorised/.191/expected.json deleted file mode 100644 index 2b36873e36..0000000000 --- a/test/fixtures/es2015/uncategorised/.191/expected.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": { - "type": "ArrayPattern", - "start": 4, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "elements": [ - { - "type": "Identifier", - "start": 5, - "end": 6, - "loc": { - "start": { - "line": 1, - "column": 5 - }, - "end": { - "line": 1, - "column": 6 - } - }, - "name": "a" - }, - { - "type": "RestElement", - "start": 8, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "argument": { - "type": "ArrayPattern", - "start": 11, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "elements": [ - { - "type": "Identifier", - "start": 12, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "name": "b" - }, - { - "type": "Identifier", - "start": 15, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 16 - } - }, - "name": "c" - } - ] - } - } - ] - }, - "init": { - "type": "Identifier", - "start": 21, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "name": "d" - } - } - ], - "kind": "var" - } - ] - }, - "comments": [] -} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/.335/expected.json b/test/fixtures/es2015/uncategorised/.335/expected.json deleted file mode 100644 index 5e726736c7..0000000000 --- a/test/fixtures/es2015/uncategorised/.335/expected.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "y" - }, - "generator": true, - "expression": false, - "params": [ - { - "type": "ObjectPattern", - "start": 12, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "properties": [ - { - "type": "Property", - "start": 13, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "method": false, - "shorthand": true, - "computed": false, - "key": { - "type": "Identifier", - "start": 13, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "yield" - }, - "kind": "init", - "value": { - "type": "Identifier", - "start": 13, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "yield" - } - } - ] - } - ], - "body": { - "type": "BlockStatement", - "start": 21, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "body": [] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/.343/expected.json b/test/fixtures/es2015/uncategorised/.343/expected.json deleted file mode 100644 index dd64dc845d..0000000000 --- a/test/fixtures/es2015/uncategorised/.343/expected.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "expression": { - "type": "Literal", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "raw": "/\\u{110000}/u", - "regex": { - "pattern": "\\u{110000}", - "flags": "u" - } - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/100/expected.json b/test/fixtures/es2015/uncategorised/100/expected.json index 6cf9d34539..dca7e84e4b 100644 --- a/test/fixtures/es2015/uncategorised/100/expected.json +++ b/test/fixtures/es2015/uncategorised/100/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -133,7 +134,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "v" }, "name": "v" } @@ -142,7 +144,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/101/expected.json b/test/fixtures/es2015/uncategorised/101/expected.json index 474fa746b1..19da0b61bb 100644 --- a/test/fixtures/es2015/uncategorised/101/expected.json +++ b/test/fixtures/es2015/uncategorised/101/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "v" }, "name": "v" } @@ -126,7 +128,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/102/expected.json b/test/fixtures/es2015/uncategorised/102/expected.json index 313a50f769..44a42a67a3 100644 --- a/test/fixtures/es2015/uncategorised/102/expected.json +++ b/test/fixtures/es2015/uncategorised/102/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,16 +119,18 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "v" }, "name": "v" } } } - ] + ], + "directives": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/103/expected.json b/test/fixtures/es2015/uncategorised/103/expected.json index 1397cc5c38..fc3feab5f7 100644 --- a/test/fixtures/es2015/uncategorised/103/expected.json +++ b/test/fixtures/es2015/uncategorised/103/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "test" }, "name": "test" }, @@ -125,6 +127,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -182,7 +185,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/104/expected.json b/test/fixtures/es2015/uncategorised/104/expected.json index 953225b56f..c06f76fd9b 100644 --- a/test/fixtures/es2015/uncategorised/104/expected.json +++ b/test/fixtures/es2015/uncategorised/104/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "console" }, "name": "console" }, @@ -146,7 +149,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "log" }, "name": "log" }, @@ -173,9 +177,11 @@ ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/105/expected.json b/test/fixtures/es2015/uncategorised/105/expected.json index cf48cd61b8..a9aed1c3aa 100644 --- a/test/fixtures/es2015/uncategorised/105/expected.json +++ b/test/fixtures/es2015/uncategorised/105/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "t" }, "name": "t" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,10 +77,11 @@ "column": 16 } }, - "body": [] + "body": [], + "directives": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/106/expected.json b/test/fixtures/es2015/uncategorised/106/expected.json index 375a738193..d31bc5cfdb 100644 --- a/test/fixtures/es2015/uncategorised/106/expected.json +++ b/test/fixtures/es2015/uncategorised/106/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -146,7 +147,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/107/expected.json b/test/fixtures/es2015/uncategorised/107/expected.json index 0b5fab146f..80d2b3dc47 100644 --- a/test/fixtures/es2015/uncategorised/107/expected.json +++ b/test/fixtures/es2015/uncategorised/107/expected.json @@ -42,6 +42,7 @@ "column": 26 } }, + "await": false, "left": { "type": "Identifier", "start": 4, @@ -54,7 +55,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -70,7 +72,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -114,7 +117,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -131,7 +135,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "x" }, "name": "x" } @@ -139,7 +144,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/108/expected.json b/test/fixtures/es2015/uncategorised/108/expected.json index 135f7e34c7..b14f0cd72e 100644 --- a/test/fixtures/es2015/uncategorised/108/expected.json +++ b/test/fixtures/es2015/uncategorised/108/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,7 +178,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/110/expected.json b/test/fixtures/es2015/uncategorised/110/expected.json index 121d7f9753..cbcba6f392 100644 --- a/test/fixtures/es2015/uncategorised/110/expected.json +++ b/test/fixtures/es2015/uncategorised/110/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,7 +178,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/111/expected.json b/test/fixtures/es2015/uncategorised/111/expected.json index 4f7aa5c5a4..d9d53207f6 100644 --- a/test/fixtures/es2015/uncategorised/111/expected.json +++ b/test/fixtures/es2015/uncategorised/111/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -125,7 +127,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/112/expected.json b/test/fixtures/es2015/uncategorised/112/expected.json index 0a8f8339c4..8a601083eb 100644 --- a/test/fixtures/es2015/uncategorised/112/expected.json +++ b/test/fixtures/es2015/uncategorised/112/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -100,7 +102,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "C" }, "name": "C" }, @@ -138,7 +141,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/113/expected.json b/test/fixtures/es2015/uncategorised/113/expected.json index d5b033e029..cad16d40f7 100644 --- a/test/fixtures/es2015/uncategorised/113/expected.json +++ b/test/fixtures/es2015/uncategorised/113/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 17 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "get" }, "name": "get" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/114/expected.json b/test/fixtures/es2015/uncategorised/114/expected.json index 6601d59d6d..8af6dc0f92 100644 --- a/test/fixtures/es2015/uncategorised/114/expected.json +++ b/test/fixtures/es2015/uncategorised/114/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 25 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "get" }, "name": "get" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/115/expected.json b/test/fixtures/es2015/uncategorised/115/expected.json index 75c400a2a7..17580d67f8 100644 --- a/test/fixtures/es2015/uncategorised/115/expected.json +++ b/test/fixtures/es2015/uncategorised/115/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 31 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/116/expected.json b/test/fixtures/es2015/uncategorised/116/expected.json index c3fa277a2f..1296990414 100644 --- a/test/fixtures/es2015/uncategorised/116/expected.json +++ b/test/fixtures/es2015/uncategorised/116/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 39 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/117/expected.json b/test/fixtures/es2015/uncategorised/117/expected.json index d607a58aad..f00e0c107d 100644 --- a/test/fixtures/es2015/uncategorised/117/expected.json +++ b/test/fixtures/es2015/uncategorised/117/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 20 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/118/expected.json b/test/fixtures/es2015/uncategorised/118/expected.json index 54e7adf346..312d1c4e77 100644 --- a/test/fixtures/es2015/uncategorised/118/expected.json +++ b/test/fixtures/es2015/uncategorised/118/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 28 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/119/expected.json b/test/fixtures/es2015/uncategorised/119/expected.json index e47c5c6942..622579925b 100644 --- a/test/fixtures/es2015/uncategorised/119/expected.json +++ b/test/fixtures/es2015/uncategorised/119/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 18 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "set" }, "name": "set" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/120/expected.json b/test/fixtures/es2015/uncategorised/120/expected.json index 873df88c9f..6159a166d3 100644 --- a/test/fixtures/es2015/uncategorised/120/expected.json +++ b/test/fixtures/es2015/uncategorised/120/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 26 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "set" }, "name": "set" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/121/expected.json b/test/fixtures/es2015/uncategorised/121/expected.json index f1e8a83082..9dbb7f0244 100644 --- a/test/fixtures/es2015/uncategorised/121/expected.json +++ b/test/fixtures/es2015/uncategorised/121/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,8 @@ "column": 29 } }, + "static": false, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "gen" }, "name": "gen" }, - "static": false, - "kind": "method", "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "v" }, "name": "v" } @@ -184,7 +188,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/122/expected.json b/test/fixtures/es2015/uncategorised/122/expected.json index 0c6728f1b8..df6337f1f3 100644 --- a/test/fixtures/es2015/uncategorised/122/expected.json +++ b/test/fixtures/es2015/uncategorised/122/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,8 @@ "column": 37 } }, + "static": true, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "gen" }, "name": "gen" }, - "static": true, - "kind": "method", "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "v" }, "name": "v" } @@ -184,7 +188,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/123/expected.json b/test/fixtures/es2015/uncategorised/123/expected.json index 2b8ddddaf7..1685cc9b6e 100644 --- a/test/fixtures/es2015/uncategorised/123/expected.json +++ b/test/fixtures/es2015/uncategorised/123/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -102,6 +103,7 @@ "column": 49 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -115,15 +117,16 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -193,7 +196,8 @@ ] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 14 } } } diff --git a/test/fixtures/es2015/uncategorised/124/expected.json b/test/fixtures/es2015/uncategorised/124/expected.json index 7c01cad6f1..264271977f 100644 --- a/test/fixtures/es2015/uncategorised/124/expected.json +++ b/test/fixtures/es2015/uncategorised/124/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 27 } }, + "static": false, "computed": false, "key": { "type": "StringLiteral", @@ -109,11 +111,11 @@ }, "value": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/128/expected.json b/test/fixtures/es2015/uncategorised/128/expected.json index 937272b468..fc2058a420 100644 --- a/test/fixtures/es2015/uncategorised/128/expected.json +++ b/test/fixtures/es2015/uncategorised/128/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 24 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/129/expected.json b/test/fixtures/es2015/uncategorised/129/expected.json index bb30c8aa84..5454ccebf1 100644 --- a/test/fixtures/es2015/uncategorised/129/expected.json +++ b/test/fixtures/es2015/uncategorised/129/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 17 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 33 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/131/expected.json b/test/fixtures/es2015/uncategorised/131/expected.json index 8c38e200c5..ec906dfe00 100644 --- a/test/fixtures/es2015/uncategorised/131/expected.json +++ b/test/fixtures/es2015/uncategorised/131/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 18 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 27 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/132/expected.json b/test/fixtures/es2015/uncategorised/132/expected.json index 7468edee54..2dd984cc0f 100644 --- a/test/fixtures/es2015/uncategorised/132/expected.json +++ b/test/fixtures/es2015/uncategorised/132/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 22 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 36 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -178,7 +183,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/133/expected.json b/test/fixtures/es2015/uncategorised/133/expected.json index 7e8a2075c5..199a299f92 100644 --- a/test/fixtures/es2015/uncategorised/133/expected.json +++ b/test/fixtures/es2015/uncategorised/133/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 29 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 42 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/134/expected.json b/test/fixtures/es2015/uncategorised/134/expected.json index d81ed33228..b9dd2520bd 100644 --- a/test/fixtures/es2015/uncategorised/134/expected.json +++ b/test/fixtures/es2015/uncategorised/134/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 29 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 49 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 44 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/135/expected.json b/test/fixtures/es2015/uncategorised/135/expected.json index 834c4dccf7..903738ff2c 100644 --- a/test/fixtures/es2015/uncategorised/135/expected.json +++ b/test/fixtures/es2015/uncategorised/135/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 29 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 50 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 44 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -178,7 +183,8 @@ "end": { "line": 1, "column": 46 - } + }, + "identifierName": "v" }, "name": "v" } @@ -215,6 +221,7 @@ "column": 63 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -228,15 +235,16 @@ "end": { "line": 1, "column": 58 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -270,6 +278,7 @@ "column": 77 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -283,15 +292,16 @@ "end": { "line": 1, "column": 71 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -305,7 +315,8 @@ "end": { "line": 1, "column": 73 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/136/expected.json b/test/fixtures/es2015/uncategorised/136/expected.json index 22216e8a4d..c01494b7de 100644 --- a/test/fixtures/es2015/uncategorised/136/expected.json +++ b/test/fixtures/es2015/uncategorised/136/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 27 } }, + "static": true, "computed": true, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/137/expected.json b/test/fixtures/es2015/uncategorised/137/expected.json index 379914b948..0864f451f7 100644 --- a/test/fixtures/es2015/uncategorised/137/expected.json +++ b/test/fixtures/es2015/uncategorised/137/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 31 } }, + "static": true, "computed": true, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/138/expected.json b/test/fixtures/es2015/uncategorised/138/expected.json index 36e95c1207..e8baafdc74 100644 --- a/test/fixtures/es2015/uncategorised/138/expected.json +++ b/test/fixtures/es2015/uncategorised/138/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 23 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "v" }, "name": "v" } @@ -160,6 +164,7 @@ "column": 36 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -173,15 +178,16 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/139/expected.json b/test/fixtures/es2015/uncategorised/139/expected.json index ada61eb661..b61e6d560f 100644 --- a/test/fixtures/es2015/uncategorised/139/expected.json +++ b/test/fixtures/es2015/uncategorised/139/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 18 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 31 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/140/expected.json b/test/fixtures/es2015/uncategorised/140/expected.json index bb91764245..54d6adf996 100644 --- a/test/fixtures/es2015/uncategorised/140/expected.json +++ b/test/fixtures/es2015/uncategorised/140/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "Semicolon" }, "name": "Semicolon" }, @@ -76,7 +77,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/141/expected.json b/test/fixtures/es2015/uncategorised/141/expected.json index d5c3f29651..eddaee3cad 100644 --- a/test/fixtures/es2015/uncategorised/141/expected.json +++ b/test/fixtures/es2015/uncategorised/141/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -113,7 +114,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/142/expected.json b/test/fixtures/es2015/uncategorised/142/expected.json index f32ac33468..15b8f684ff 100644 --- a/test/fixtures/es2015/uncategorised/142/expected.json +++ b/test/fixtures/es2015/uncategorised/142/expected.json @@ -153,7 +153,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/143/expected.json b/test/fixtures/es2015/uncategorised/143/expected.json index cc0ab8afc8..aaa1c78fe5 100644 --- a/test/fixtures/es2015/uncategorised/143/expected.json +++ b/test/fixtures/es2015/uncategorised/143/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -107,6 +108,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -129,7 +131,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/144/expected.json b/test/fixtures/es2015/uncategorised/144/expected.json index 50af14c530..3e8c0bd2cf 100644 --- a/test/fixtures/es2015/uncategorised/144/expected.json +++ b/test/fixtures/es2015/uncategorised/144/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -140,7 +141,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -167,7 +169,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/145/expected.json b/test/fixtures/es2015/uncategorised/145/expected.json index c87f359ecb..39d0f02fc4 100644 --- a/test/fixtures/es2015/uncategorised/145/expected.json +++ b/test/fixtures/es2015/uncategorised/145/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -142,7 +144,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -150,6 +153,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -163,7 +167,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "v" }, "name": "v" } @@ -188,7 +193,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/146/expected.json b/test/fixtures/es2015/uncategorised/146/expected.json index 8ab9dd27fd..7c8df52528 100644 --- a/test/fixtures/es2015/uncategorised/146/expected.json +++ b/test/fixtures/es2015/uncategorised/146/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +117,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/147/expected.json b/test/fixtures/es2015/uncategorised/147/expected.json index e9263cf600..3605b59b78 100644 --- a/test/fixtures/es2015/uncategorised/147/expected.json +++ b/test/fixtures/es2015/uncategorised/147/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } @@ -168,7 +170,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -184,9 +187,13 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/148/expected.json b/test/fixtures/es2015/uncategorised/148/expected.json index c2c6fcf107..dfea488504 100644 --- a/test/fixtures/es2015/uncategorised/148/expected.json +++ b/test/fixtures/es2015/uncategorised/148/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -105,7 +107,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -121,7 +124,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/es2015/uncategorised/149/expected.json b/test/fixtures/es2015/uncategorised/149/expected.json index 2b533c4b95..531feae88a 100644 --- a/test/fixtures/es2015/uncategorised/149/expected.json +++ b/test/fixtures/es2015/uncategorised/149/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "test" }, "name": "test" }, @@ -125,6 +127,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -182,7 +185,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "v" }, "name": "v" } diff --git a/test/fixtures/es2015/uncategorised/150/expected.json b/test/fixtures/es2015/uncategorised/150/expected.json index 77889bf067..2e9d46b456 100644 --- a/test/fixtures/es2015/uncategorised/150/expected.json +++ b/test/fixtures/es2015/uncategorised/150/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 17 } }, + "static": false, "computed": true, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/152/expected.json b/test/fixtures/es2015/uncategorised/152/expected.json index 19aeb74f7d..4577cf0204 100644 --- a/test/fixtures/es2015/uncategorised/152/expected.json +++ b/test/fixtures/es2015/uncategorised/152/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/es2015/uncategorised/153/expected.json b/test/fixtures/es2015/uncategorised/153/expected.json index 2d01d0b275..2876aa00ee 100644 --- a/test/fixtures/es2015/uncategorised/153/expected.json +++ b/test/fixtures/es2015/uncategorised/153/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -119,7 +121,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -135,9 +138,13 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -186,7 +193,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/es2015/uncategorised/154/expected.json b/test/fixtures/es2015/uncategorised/154/expected.json index 371e5cb174..47be23ad0b 100644 --- a/test/fixtures/es2015/uncategorised/154/expected.json +++ b/test/fixtures/es2015/uncategorised/154/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -149,7 +151,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -165,9 +168,13 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -216,7 +223,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/es2015/uncategorised/155/expected.json b/test/fixtures/es2015/uncategorised/155/expected.json index 8ba65a825d..40fd9771cf 100644 --- a/test/fixtures/es2015/uncategorised/155/expected.json +++ b/test/fixtures/es2015/uncategorised/155/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -107,6 +108,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -166,7 +168,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -182,9 +185,13 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -233,7 +240,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -283,7 +291,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/156/expected.json b/test/fixtures/es2015/uncategorised/156/expected.json index 44938263b8..287d7e8771 100644 --- a/test/fixtures/es2015/uncategorised/156/expected.json +++ b/test/fixtures/es2015/uncategorised/156/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -153,7 +155,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -169,9 +172,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -220,7 +227,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -269,7 +277,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/157/expected.json b/test/fixtures/es2015/uncategorised/157/expected.json index 247de16217..6075b1827f 100644 --- a/test/fixtures/es2015/uncategorised/157/expected.json +++ b/test/fixtures/es2015/uncategorised/157/expected.json @@ -87,6 +87,7 @@ "column": 27 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -100,15 +101,16 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "f" }, "name": "f" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -168,7 +170,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -184,9 +187,13 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -235,7 +242,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -285,7 +293,8 @@ ] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/158/expected.json b/test/fixtures/es2015/uncategorised/158/expected.json index f5d344c43a..88d65a30fb 100644 --- a/test/fixtures/es2015/uncategorised/158/expected.json +++ b/test/fixtures/es2015/uncategorised/158/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -118,7 +119,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -134,9 +136,13 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -185,7 +191,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -232,7 +239,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/159/expected.json b/test/fixtures/es2015/uncategorised/159/expected.json index 62a790d784..e1465d0c7d 100644 --- a/test/fixtures/es2015/uncategorised/159/expected.json +++ b/test/fixtures/es2015/uncategorised/159/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/es2015/uncategorised/160/expected.json b/test/fixtures/es2015/uncategorised/160/expected.json index b6a422f551..a0c1096c6f 100644 --- a/test/fixtures/es2015/uncategorised/160/expected.json +++ b/test/fixtures/es2015/uncategorised/160/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/es2015/uncategorised/161/expected.json b/test/fixtures/es2015/uncategorised/161/expected.json index 71590f27e6..9d6157c40e 100644 --- a/test/fixtures/es2015/uncategorised/161/expected.json +++ b/test/fixtures/es2015/uncategorised/161/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -138,6 +140,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -165,7 +168,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/es2015/uncategorised/162/expected.json b/test/fixtures/es2015/uncategorised/162/expected.json index a1ce797365..7d167b78cf 100644 --- a/test/fixtures/es2015/uncategorised/162/expected.json +++ b/test/fixtures/es2015/uncategorised/162/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -152,7 +155,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/es2015/uncategorised/163/expected.json b/test/fixtures/es2015/uncategorised/163/expected.json index ec815ca77b..07716be5ae 100644 --- a/test/fixtures/es2015/uncategorised/163/expected.json +++ b/test/fixtures/es2015/uncategorised/163/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" } @@ -123,10 +127,11 @@ "column": 22 } }, - "body": [] + "body": [], + "directives": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/164/expected.json b/test/fixtures/es2015/uncategorised/164/expected.json index 6cf3d81740..a42e8c8b1d 100644 --- a/test/fixtures/es2015/uncategorised/164/expected.json +++ b/test/fixtures/es2015/uncategorised/164/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -104,7 +107,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "b" }, "name": "b" } @@ -125,10 +129,11 @@ "column": 22 } }, - "body": [] + "body": [], + "directives": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/165/expected.json b/test/fixtures/es2015/uncategorised/165/expected.json index 08cb8d6662..f6be853aa4 100644 --- a/test/fixtures/es2015/uncategorised/165/expected.json +++ b/test/fixtures/es2015/uncategorised/165/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -105,7 +107,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -121,9 +124,13 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -155,7 +162,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -171,9 +179,13 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "b" }, "name": "b" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/166/expected.json b/test/fixtures/es2015/uncategorised/166/expected.json index fecc14e44a..4d1f380f71 100644 --- a/test/fixtures/es2015/uncategorised/166/expected.json +++ b/test/fixtures/es2015/uncategorised/166/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -121,7 +124,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -137,9 +141,13 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/169/expected.json b/test/fixtures/es2015/uncategorised/169/expected.json index 7aa4a008d7..349715bcfa 100644 --- a/test/fixtures/es2015/uncategorised/169/expected.json +++ b/test/fixtures/es2015/uncategorised/169/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -118,7 +121,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" } @@ -143,7 +147,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/170/expected.json b/test/fixtures/es2015/uncategorised/170/expected.json index 50b9811fd9..4053df70fa 100644 --- a/test/fixtures/es2015/uncategorised/170/expected.json +++ b/test/fixtures/es2015/uncategorised/170/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -119,7 +121,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -135,9 +138,13 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -169,7 +176,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -185,9 +193,13 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" + }, + "extra": { + "shorthand": true } } ] @@ -211,7 +223,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/173/expected.json b/test/fixtures/es2015/uncategorised/173/expected.json index 35b8ef2474..8cbad3c24a 100644 --- a/test/fixtures/es2015/uncategorised/173/expected.json +++ b/test/fixtures/es2015/uncategorised/173/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -122,7 +124,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "b" }, "name": "b" } @@ -165,7 +169,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/176/expected.json b/test/fixtures/es2015/uncategorised/176/expected.json index 00ea0f3c2a..a8af6c1f54 100644 --- a/test/fixtures/es2015/uncategorised/176/expected.json +++ b/test/fixtures/es2015/uncategorised/176/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" } @@ -106,11 +108,12 @@ "column": 12 } }, - "body": [] + "body": [], + "directives": [] } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/177/expected.json b/test/fixtures/es2015/uncategorised/177/expected.json index 4051c8ff14..b6621bcdef 100644 --- a/test/fixtures/es2015/uncategorised/177/expected.json +++ b/test/fixtures/es2015/uncategorised/177/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } @@ -122,11 +125,12 @@ "column": 15 } }, - "body": [] + "body": [], + "directives": [] } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/178/expected.json b/test/fixtures/es2015/uncategorised/178/expected.json index 15f1e7078a..1019f36221 100644 --- a/test/fixtures/es2015/uncategorised/178/expected.json +++ b/test/fixtures/es2015/uncategorised/178/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -120,9 +122,13 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/179/expected.json b/test/fixtures/es2015/uncategorised/179/expected.json index ce3a65a9ee..1483adeab3 100644 --- a/test/fixtures/es2015/uncategorised/179/expected.json +++ b/test/fixtures/es2015/uncategorised/179/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -120,9 +122,13 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] @@ -153,7 +159,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/18/expected.json b/test/fixtures/es2015/uncategorised/18/expected.json index 066751d992..ad16fe02ef 100644 --- a/test/fixtures/es2015/uncategorised/18/expected.json +++ b/test/fixtures/es2015/uncategorised/18/expected.json @@ -81,7 +81,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/182/expected.json b/test/fixtures/es2015/uncategorised/182/expected.json index 35cdf77789..403a007d36 100644 --- a/test/fixtures/es2015/uncategorised/182/expected.json +++ b/test/fixtures/es2015/uncategorised/182/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -135,7 +137,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -151,7 +154,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "b" }, "name": "b" } @@ -186,7 +190,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "c" }, "name": "c" } diff --git a/test/fixtures/es2015/uncategorised/183/expected.json b/test/fixtures/es2015/uncategorised/183/expected.json index 79bc67b569..e6a04cd66b 100644 --- a/test/fixtures/es2015/uncategorised/183/expected.json +++ b/test/fixtures/es2015/uncategorised/183/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -120,7 +122,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "b" }, "name": "b" } @@ -154,7 +157,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -170,9 +174,13 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "c" }, "name": "c" + }, + "extra": { + "shorthand": true } } ] @@ -204,7 +212,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "d" }, "name": "d" }, @@ -220,7 +229,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "e" }, "name": "e" } @@ -252,7 +262,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "f" }, "name": "f" } diff --git a/test/fixtures/es2015/uncategorised/184/expected.json b/test/fixtures/es2015/uncategorised/184/expected.json index ce8b5406ef..ba02725ad0 100644 --- a/test/fixtures/es2015/uncategorised/184/expected.json +++ b/test/fixtures/es2015/uncategorised/184/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" } @@ -117,13 +118,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "b" }, "name": "b" } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/185/expected.json b/test/fixtures/es2015/uncategorised/185/expected.json index 7876d116e8..ed0b4ee13d 100644 --- a/test/fixtures/es2015/uncategorised/185/expected.json +++ b/test/fixtures/es2015/uncategorised/185/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } @@ -133,13 +135,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "c" }, "name": "c" } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/186/expected.json b/test/fixtures/es2015/uncategorised/186/expected.json index 16d0a3f561..6164999ca8 100644 --- a/test/fixtures/es2015/uncategorised/186/expected.json +++ b/test/fixtures/es2015/uncategorised/186/expected.json @@ -116,7 +116,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -132,9 +133,13 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -166,7 +171,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -182,9 +188,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "b" }, "name": "b" + }, + "extra": { + "shorthand": true } } ] @@ -215,7 +225,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "c" }, "name": "c" } @@ -234,7 +245,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "d" }, "name": "d" } diff --git a/test/fixtures/es2015/uncategorised/187/expected.json b/test/fixtures/es2015/uncategorised/187/expected.json index 89c48e2bde..6c7430e634 100644 --- a/test/fixtures/es2015/uncategorised/187/expected.json +++ b/test/fixtures/es2015/uncategorised/187/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -129,7 +130,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -145,7 +147,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "c" }, "name": "c" } @@ -166,13 +169,14 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "d" }, "name": "d" } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/188/expected.json b/test/fixtures/es2015/uncategorised/188/expected.json index ae113e8e2d..3e27df2792 100644 --- a/test/fixtures/es2015/uncategorised/188/expected.json +++ b/test/fixtures/es2015/uncategorised/188/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" } @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "b" }, "name": "b" } @@ -125,7 +127,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/189/expected.json b/test/fixtures/es2015/uncategorised/189/expected.json index abe4eaeff9..11ca896f80 100644 --- a/test/fixtures/es2015/uncategorised/189/expected.json +++ b/test/fixtures/es2015/uncategorised/189/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "b" }, "name": "b" } @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "c" }, "name": "c" } @@ -141,7 +144,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/19/expected.json b/test/fixtures/es2015/uncategorised/19/expected.json index dcf190a44c..6b4305de3b 100644 --- a/test/fixtures/es2015/uncategorised/19/expected.json +++ b/test/fixtures/es2015/uncategorised/19/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -112,7 +113,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/190/expected.json b/test/fixtures/es2015/uncategorised/190/expected.json index dc0dd1b374..2968812946 100644 --- a/test/fixtures/es2015/uncategorised/190/expected.json +++ b/test/fixtures/es2015/uncategorised/190/expected.json @@ -116,7 +116,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -132,9 +133,13 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -166,7 +171,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -182,9 +188,13 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "b" }, "name": "b" + }, + "extra": { + "shorthand": true } } ] @@ -215,7 +225,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "c" }, "name": "c" } @@ -234,7 +245,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "d" }, "name": "d" } diff --git a/test/fixtures/es2015/uncategorised/192/expected.json b/test/fixtures/es2015/uncategorised/192/expected.json index 0b70371d47..c644dc8e95 100644 --- a/test/fixtures/es2015/uncategorised/192/expected.json +++ b/test/fixtures/es2015/uncategorised/192/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "func" }, "name": "func" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" } @@ -107,7 +109,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/193/expected.json b/test/fixtures/es2015/uncategorised/193/expected.json index 98f7082d88..80d1838cd2 100644 --- a/test/fixtures/es2015/uncategorised/193/expected.json +++ b/test/fixtures/es2015/uncategorised/193/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "func" }, "name": "func" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -115,7 +117,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "b" }, "name": "b" } @@ -123,7 +126,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/194/expected.json b/test/fixtures/es2015/uncategorised/194/expected.json index 8c0a47724f..1339fd84db 100644 --- a/test/fixtures/es2015/uncategorised/194/expected.json +++ b/test/fixtures/es2015/uncategorised/194/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "func" }, "name": "func" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" } @@ -116,14 +118,15 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "b" }, "name": "b" } ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/197/expected.json b/test/fixtures/es2015/uncategorised/197/expected.json index ca35fe564c..7d10bbaad4 100644 --- a/test/fixtures/es2015/uncategorised/197/expected.json +++ b/test/fixtures/es2015/uncategorised/197/expected.json @@ -116,7 +116,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "foo" }, "name": "foo" }, diff --git a/test/fixtures/es2015/uncategorised/20/expected.json b/test/fixtures/es2015/uncategorised/20/expected.json index 245e390fe6..9b083f0902 100644 --- a/test/fixtures/es2015/uncategorised/20/expected.json +++ b/test/fixtures/es2015/uncategorised/20/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "name" }, "name": "name" } @@ -149,7 +151,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/21/expected.json b/test/fixtures/es2015/uncategorised/21/expected.json index 6f192feca1..8b41104a7b 100644 --- a/test/fixtures/es2015/uncategorised/21/expected.json +++ b/test/fixtures/es2015/uncategorised/21/expected.json @@ -81,7 +81,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/22/expected.json b/test/fixtures/es2015/uncategorised/22/expected.json index a0a63138db..9946fcaf1d 100644 --- a/test/fixtures/es2015/uncategorised/22/expected.json +++ b/test/fixtures/es2015/uncategorised/22/expected.json @@ -81,7 +81,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/23/expected.json b/test/fixtures/es2015/uncategorised/23/expected.json index f02b70e9aa..61a17dec4f 100644 --- a/test/fixtures/es2015/uncategorised/23/expected.json +++ b/test/fixtures/es2015/uncategorised/23/expected.json @@ -81,7 +81,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/24/expected.json b/test/fixtures/es2015/uncategorised/24/expected.json index fb84640ac8..6c38d1e510 100644 --- a/test/fixtures/es2015/uncategorised/24/expected.json +++ b/test/fixtures/es2015/uncategorised/24/expected.json @@ -81,7 +81,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/25/expected.json b/test/fixtures/es2015/uncategorised/25/expected.json index 483c9211ab..76377676ec 100644 --- a/test/fixtures/es2015/uncategorised/25/expected.json +++ b/test/fixtures/es2015/uncategorised/25/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -128,7 +129,7 @@ "arguments": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/256/expected.json b/test/fixtures/es2015/uncategorised/256/expected.json index 2420931359..f9d81e9d99 100644 --- a/test/fixtures/es2015/uncategorised/256/expected.json +++ b/test/fixtures/es2015/uncategorised/256/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "yield" }, "name": "yield" }, diff --git a/test/fixtures/es2015/uncategorised/257/expected.json b/test/fixtures/es2015/uncategorised/257/expected.json index 86d0362c7a..177e044e8d 100644 --- a/test/fixtures/es2015/uncategorised/257/expected.json +++ b/test/fixtures/es2015/uncategorised/257/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "yield" }, "name": "yield" }, diff --git a/test/fixtures/es2015/uncategorised/259/expected.json b/test/fixtures/es2015/uncategorised/259/expected.json index 4984077118..98b14d48e2 100644 --- a/test/fixtures/es2015/uncategorised/259/expected.json +++ b/test/fixtures/es2015/uncategorised/259/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -146,7 +148,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/26/expected.json b/test/fixtures/es2015/uncategorised/26/expected.json index bf79d99f09..b4c0e8bc2d 100644 --- a/test/fixtures/es2015/uncategorised/26/expected.json +++ b/test/fixtures/es2015/uncategorised/26/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -149,7 +150,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -211,6 +213,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/27/expected.json b/test/fixtures/es2015/uncategorised/27/expected.json index 929eaa9eab..5841ab30aa 100644 --- a/test/fixtures/es2015/uncategorised/27/expected.json +++ b/test/fixtures/es2015/uncategorised/27/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "t" }, "name": "t" }, diff --git a/test/fixtures/es2015/uncategorised/28/expected.json b/test/fixtures/es2015/uncategorised/28/expected.json index 6b22652418..9910aa18c4 100644 --- a/test/fixtures/es2015/uncategorised/28/expected.json +++ b/test/fixtures/es2015/uncategorised/28/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [], "body": { "type": "StringLiteral", diff --git a/test/fixtures/es2015/uncategorised/288/options.json b/test/fixtures/es2015/uncategorised/288/options.json deleted file mode 100644 index d8b91465e5..0000000000 --- a/test/fixtures/es2015/uncategorised/288/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "throws": "Invalid left-hand side in assignment expression (1:1)" -} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/29/expected.json b/test/fixtures/es2015/uncategorised/29/expected.json index 070478ffa3..b6a6ef550a 100644 --- a/test/fixtures/es2015/uncategorised/29/expected.json +++ b/test/fixtures/es2015/uncategorised/29/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/es2015/uncategorised/292/expected.json b/test/fixtures/es2015/uncategorised/292/expected.json index c53f6a5581..d0b363d523 100644 --- a/test/fixtures/es2015/uncategorised/292/expected.json +++ b/test/fixtures/es2015/uncategorised/292/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" } @@ -117,13 +118,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "b" }, "name": "b" } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/299/expected.json b/test/fixtures/es2015/uncategorised/299/expected.json index 67a0f6223a..1ba2b86107 100644 --- a/test/fixtures/es2015/uncategorised/299/expected.json +++ b/test/fixtures/es2015/uncategorised/299/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "doSmth" }, "name": "doSmth" }, @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -146,7 +149,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -163,7 +167,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "y" }, "name": "y" } @@ -255,6 +260,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/30/expected.json b/test/fixtures/es2015/uncategorised/30/expected.json index 71885e218e..0d66821115 100644 --- a/test/fixtures/es2015/uncategorised/30/expected.json +++ b/test/fixtures/es2015/uncategorised/30/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/es2015/uncategorised/300/expected.json b/test/fixtures/es2015/uncategorised/300/expected.json index 928d53b6a0..ac195d7470 100644 --- a/test/fixtures/es2015/uncategorised/300/expected.json +++ b/test/fixtures/es2015/uncategorised/300/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "normal" }, "name": "normal" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/es2015/uncategorised/301/expected.json b/test/fixtures/es2015/uncategorised/301/expected.json index 2e575ba5c1..f061eeb9cd 100644 --- a/test/fixtures/es2015/uncategorised/301/expected.json +++ b/test/fixtures/es2015/uncategorised/301/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/es2015/uncategorised/302/expected.json b/test/fixtures/es2015/uncategorised/302/expected.json index 835ebf5398..ed08a21975 100644 --- a/test/fixtures/es2015/uncategorised/302/expected.json +++ b/test/fixtures/es2015/uncategorised/302/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +174,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/303/expected.json b/test/fixtures/es2015/uncategorised/303/expected.json index 64493bca6c..935f87201b 100644 --- a/test/fixtures/es2015/uncategorised/303/expected.json +++ b/test/fixtures/es2015/uncategorised/303/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "get" }, "name": "get" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "get" }, "name": "get" + }, + "extra": { + "shorthand": true } } ] @@ -136,7 +141,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "obj" }, "name": "obj" } diff --git a/test/fixtures/es2015/uncategorised/304/expected.json b/test/fixtures/es2015/uncategorised/304/expected.json index b66e1b6640..28602311f9 100644 --- a/test/fixtures/es2015/uncategorised/304/expected.json +++ b/test/fixtures/es2015/uncategorised/304/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "propName" }, "name": "propName" }, @@ -131,7 +132,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "localVar" }, "name": "localVar" }, @@ -147,7 +149,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "defaultValue" }, "name": "defaultValue" } @@ -167,7 +170,8 @@ "end": { "line": 1, "column": 45 - } + }, + "identifierName": "obj" }, "name": "obj" } diff --git a/test/fixtures/es2015/uncategorised/305/expected.json b/test/fixtures/es2015/uncategorised/305/expected.json index 07fa4a6986..2da5b72f13 100644 --- a/test/fixtures/es2015/uncategorised/305/expected.json +++ b/test/fixtures/es2015/uncategorised/305/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "propName" }, "name": "propName" }, @@ -131,7 +132,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "propName" }, "name": "propName" }, @@ -147,10 +149,14 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "defaultValue" }, "name": "defaultValue" } + }, + "extra": { + "shorthand": true } } ] @@ -167,7 +173,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "obj" }, "name": "obj" } diff --git a/test/fixtures/es2015/uncategorised/306/expected.json b/test/fixtures/es2015/uncategorised/306/expected.json index 7a38265d31..6e86c3f9b4 100644 --- a/test/fixtures/es2015/uncategorised/306/expected.json +++ b/test/fixtures/es2015/uncategorised/306/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "localVar" }, "name": "localVar" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "defaultValue" }, "name": "defaultValue" } @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "obj" }, "name": "obj" } @@ -141,7 +144,7 @@ ], "kind": "var" } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/307/expected.json b/test/fixtures/es2015/uncategorised/307/expected.json index 17da2fe775..b4df0a2a30 100644 --- a/test/fixtures/es2015/uncategorised/307/expected.json +++ b/test/fixtures/es2015/uncategorised/307/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -131,7 +132,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -155,6 +157,9 @@ }, "value": 0 } + }, + "extra": { + "shorthand": true } } ] @@ -171,12 +176,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "obj" }, "name": "obj" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/308/expected.json b/test/fixtures/es2015/uncategorised/308/expected.json index 1b90586b94..a983e9498e 100644 --- a/test/fixtures/es2015/uncategorised/308/expected.json +++ b/test/fixtures/es2015/uncategorised/308/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -134,7 +136,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -158,6 +161,9 @@ }, "value": 0 } + }, + "extra": { + "shorthand": true } } ] @@ -175,7 +181,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/es2015/uncategorised/309/expected.json b/test/fixtures/es2015/uncategorised/309/expected.json index fa310c051a..adf09ef4d3 100644 --- a/test/fixtures/es2015/uncategorised/309/expected.json +++ b/test/fixtures/es2015/uncategorised/309/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -132,7 +133,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -180,7 +182,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -210,7 +213,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -234,6 +238,9 @@ }, "value": 1 } + }, + "extra": { + "shorthand": true } } ] @@ -255,7 +262,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "arr" }, "name": "arr" } diff --git a/test/fixtures/es2015/uncategorised/31/expected.json b/test/fixtures/es2015/uncategorised/31/expected.json index 57366e881f..36e04398ee 100644 --- a/test/fixtures/es2015/uncategorised/31/expected.json +++ b/test/fixtures/es2015/uncategorised/31/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/310/expected.json b/test/fixtures/es2015/uncategorised/310/expected.json index 3c759ccbfc..facb5febd6 100644 --- a/test/fixtures/es2015/uncategorised/310/expected.json +++ b/test/fixtures/es2015/uncategorised/310/expected.json @@ -42,6 +42,7 @@ "column": 21 } }, + "await": false, "left": { "type": "ObjectPattern", "start": 5, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -140,6 +143,9 @@ }, "value": 0 } + }, + "extra": { + "shorthand": true } } ] @@ -156,7 +162,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "arr" }, "name": "arr" }, diff --git a/test/fixtures/es2015/uncategorised/313/expected.json b/test/fixtures/es2015/uncategorised/313/expected.json index 9a9139b799..67a25aed7f 100644 --- a/test/fixtures/es2015/uncategorised/313/expected.json +++ b/test/fixtures/es2015/uncategorised/313/expected.json @@ -117,7 +117,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "message" }, "name": "message" }, @@ -133,9 +134,13 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "message" }, "name": "message" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/314/expected.json b/test/fixtures/es2015/uncategorised/314/expected.json index 859c4a7b48..fbe0b1f788 100644 --- a/test/fixtures/es2015/uncategorised/314/expected.json +++ b/test/fixtures/es2015/uncategorised/314/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,8 @@ "column": 21 } }, + "static": false, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "static" }, "name": "static" }, - "static": false, - "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/315/expected.json b/test/fixtures/es2015/uncategorised/315/expected.json index a379342239..643da678b1 100644 --- a/test/fixtures/es2015/uncategorised/315/expected.json +++ b/test/fixtures/es2015/uncategorised/315/expected.json @@ -42,6 +42,7 @@ "column": 33 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,7 +178,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/316/expected.json b/test/fixtures/es2015/uncategorised/316/expected.json index ec67c88b06..a80e13719d 100644 --- a/test/fixtures/es2015/uncategorised/316/expected.json +++ b/test/fixtures/es2015/uncategorised/316/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,8 @@ "column": 22 } }, + "static": false, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "static" }, "name": "static" }, - "static": false, - "kind": "method", "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/317/expected.json b/test/fixtures/es2015/uncategorised/317/expected.json index 96d4c0c179..d6851714da 100644 --- a/test/fixtures/es2015/uncategorised/317/expected.json +++ b/test/fixtures/es2015/uncategorised/317/expected.json @@ -131,7 +131,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "exec" }, "name": "exec" }, diff --git a/test/fixtures/es2015/uncategorised/318/expected.json b/test/fixtures/es2015/uncategorised/318/expected.json index 7120ba7201..7359f5f6ed 100644 --- a/test/fixtures/es2015/uncategorised/318/expected.json +++ b/test/fixtures/es2015/uncategorised/318/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "_𐒦" }, "name": "_𐒦" }, diff --git a/test/fixtures/es2015/uncategorised/319/expected.json b/test/fixtures/es2015/uncategorised/319/expected.json index 8c74c8dbfb..5fbbef420e 100644 --- a/test/fixtures/es2015/uncategorised/319/expected.json +++ b/test/fixtures/es2015/uncategorised/319/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "_𐒦" }, "name": "_𐒦" }, diff --git a/test/fixtures/es2015/uncategorised/32/expected.json b/test/fixtures/es2015/uncategorised/32/expected.json index 5644e19a05..54989111af 100644 --- a/test/fixtures/es2015/uncategorised/32/expected.json +++ b/test/fixtures/es2015/uncategorised/32/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/es2015/uncategorised/320/expected.json b/test/fixtures/es2015/uncategorised/320/expected.json index e314fc139a..e543312c78 100644 --- a/test/fixtures/es2015/uncategorised/320/expected.json +++ b/test/fixtures/es2015/uncategorised/320/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/es2015/uncategorised/321/expected.json b/test/fixtures/es2015/uncategorised/321/expected.json index 304fea8a0d..0aed7ab433 100644 --- a/test/fixtures/es2015/uncategorised/321/expected.json +++ b/test/fixtures/es2015/uncategorised/321/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ] @@ -136,7 +141,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/es2015/uncategorised/322/expected.json b/test/fixtures/es2015/uncategorised/322/expected.json index c8d11ad5e5..5b0a800f93 100644 --- a/test/fixtures/es2015/uncategorised/322/expected.json +++ b/test/fixtures/es2015/uncategorised/322/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/es2015/uncategorised/323/expected.json b/test/fixtures/es2015/uncategorised/323/expected.json index 6473ce385e..158a4615bd 100644 --- a/test/fixtures/es2015/uncategorised/323/expected.json +++ b/test/fixtures/es2015/uncategorised/323/expected.json @@ -42,6 +42,7 @@ "column": 33 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "name" }, "name": "name" }, @@ -114,7 +116,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "value" }, "name": "value" } @@ -137,7 +140,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -155,9 +159,11 @@ "column": 33 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/33/expected.json b/test/fixtures/es2015/uncategorised/33/expected.json index d79ff6492c..0931f56cf1 100644 --- a/test/fixtures/es2015/uncategorised/33/expected.json +++ b/test/fixtures/es2015/uncategorised/33/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } @@ -121,7 +123,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "property" }, "name": "property" }, @@ -148,7 +151,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 5 } } } diff --git a/test/fixtures/es2015/uncategorised/338/expected.json b/test/fixtures/es2015/uncategorised/338/expected.json index 909735dfe5..ff0188633a 100644 --- a/test/fixtures/es2015/uncategorised/338/expected.json +++ b/test/fixtures/es2015/uncategorised/338/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/34/expected.json b/test/fixtures/es2015/uncategorised/34/expected.json index a7d846ffb6..93d45404a4 100644 --- a/test/fixtures/es2015/uncategorised/34/expected.json +++ b/test/fixtures/es2015/uncategorised/34/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } @@ -153,7 +155,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "label" }, "name": "label" } diff --git a/test/fixtures/es2015/uncategorised/35/expected.json b/test/fixtures/es2015/uncategorised/35/expected.json index 8eea5108a9..78728a0062 100644 --- a/test/fixtures/es2015/uncategorised/35/expected.json +++ b/test/fixtures/es2015/uncategorised/35/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/350/expected.json b/test/fixtures/es2015/uncategorised/350/expected.json index 9e26dfeeb6..e0f955220c 100644 --- a/test/fixtures/es2015/uncategorised/350/expected.json +++ b/test/fixtures/es2015/uncategorised/350/expected.json @@ -1 +1,183 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "expression": { + "type": "ObjectExpression", + "start": 1, + "end": 35, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 35 + } + }, + "properties": [ + { + "type": "ObjectProperty", + "start": 3, + "end": 19, + "loc": { + "start": { + "line": 1, + "column": 3 + }, + "end": { + "line": 1, + "column": 19 + } + }, + "method": false, + "shorthand": false, + "computed": true, + "key": { + "type": "StringLiteral", + "start": 4, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 15 + } + }, + "extra": { + "rawValue": "__proto__", + "raw": "'__proto__'" + }, + "value": "__proto__" + }, + "value": { + "type": "NumericLiteral", + "start": 18, + "end": 19, + "loc": { + "start": { + "line": 1, + "column": 18 + }, + "end": { + "line": 1, + "column": 19 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + }, + { + "type": "ObjectProperty", + "start": 21, + "end": 33, + "loc": { + "start": { + "line": 1, + "column": 21 + }, + "end": { + "line": 1, + "column": 33 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 21, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 21 + }, + "end": { + "line": 1, + "column": 30 + }, + "identifierName": "__proto__" + }, + "name": "__proto__" + }, + "value": { + "type": "NumericLiteral", + "start": 32, + "end": 33, + "loc": { + "start": { + "line": 1, + "column": 32 + }, + "end": { + "line": 1, + "column": 33 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + ], + "extra": { + "parenthesized": true, + "parenStart": 0 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/351/expected.json b/test/fixtures/es2015/uncategorised/351/expected.json index 9e26dfeeb6..2c0aacecab 100644 --- a/test/fixtures/es2015/uncategorised/351/expected.json +++ b/test/fixtures/es2015/uncategorised/351/expected.json @@ -1 +1,219 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 44, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 44 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 44, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 44 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 44, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 44 + } + }, + "expression": { + "type": "ObjectExpression", + "start": 1, + "end": 43, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 43 + } + }, + "properties": [ + { + "type": "ObjectMethod", + "start": 3, + "end": 27, + "loc": { + "start": { + "line": 1, + "column": 3 + }, + "end": { + "line": 1, + "column": 27 + } + }, + "method": true, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 3, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 3 + }, + "end": { + "line": 1, + "column": 12 + }, + "identifierName": "__proto__" + }, + "name": "__proto__" + }, + "kind": "method", + "id": null, + "generator": false, + "expression": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 15, + "end": 27, + "loc": { + "start": { + "line": 1, + "column": 15 + }, + "end": { + "line": 1, + "column": 27 + } + }, + "body": [ + { + "type": "ReturnStatement", + "start": 17, + "end": 25, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 25 + } + }, + "argument": { + "type": "NumericLiteral", + "start": 24, + "end": 25, + "loc": { + "start": { + "line": 1, + "column": 24 + }, + "end": { + "line": 1, + "column": 25 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + ], + "directives": [] + } + }, + { + "type": "ObjectProperty", + "start": 29, + "end": 41, + "loc": { + "start": { + "line": 1, + "column": 29 + }, + "end": { + "line": 1, + "column": 41 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 29, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 29 + }, + "end": { + "line": 1, + "column": 38 + }, + "identifierName": "__proto__" + }, + "name": "__proto__" + }, + "value": { + "type": "NumericLiteral", + "start": 40, + "end": 41, + "loc": { + "start": { + "line": 1, + "column": 40 + }, + "end": { + "line": 1, + "column": 41 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + ], + "extra": { + "parenthesized": true, + "parenStart": 0 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/352/expected.json b/test/fixtures/es2015/uncategorised/352/expected.json index 9e26dfeeb6..8fc9a7d3a2 100644 --- a/test/fixtures/es2015/uncategorised/352/expected.json +++ b/test/fixtures/es2015/uncategorised/352/expected.json @@ -1 +1,219 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 48, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 48 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 48, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 48 + } + }, + "sourceType": "script", + "body": [ + { + "type": "ExpressionStatement", + "start": 0, + "end": 48, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 48 + } + }, + "expression": { + "type": "ObjectExpression", + "start": 1, + "end": 47, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 47 + } + }, + "properties": [ + { + "type": "ObjectMethod", + "start": 3, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 3 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 7, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "__proto__" + }, + "name": "__proto__" + }, + "kind": "get", + "id": null, + "generator": false, + "expression": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 19, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 19 + }, + "end": { + "line": 1, + "column": 31 + } + }, + "body": [ + { + "type": "ReturnStatement", + "start": 21, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 21 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "argument": { + "type": "NumericLiteral", + "start": 28, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 28 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "extra": { + "rawValue": 1, + "raw": "1" + }, + "value": 1 + } + } + ], + "directives": [] + } + }, + { + "type": "ObjectProperty", + "start": 33, + "end": 45, + "loc": { + "start": { + "line": 1, + "column": 33 + }, + "end": { + "line": 1, + "column": 45 + } + }, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 33, + "end": 42, + "loc": { + "start": { + "line": 1, + "column": 33 + }, + "end": { + "line": 1, + "column": 42 + }, + "identifierName": "__proto__" + }, + "name": "__proto__" + }, + "value": { + "type": "NumericLiteral", + "start": 44, + "end": 45, + "loc": { + "start": { + "line": 1, + "column": 44 + }, + "end": { + "line": 1, + "column": 45 + } + }, + "extra": { + "rawValue": 2, + "raw": "2" + }, + "value": 2 + } + } + ], + "extra": { + "parenthesized": true, + "parenStart": 0 + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/354/expected.json b/test/fixtures/es2015/uncategorised/354/expected.json index 9e26dfeeb6..74e2c8a1e4 100644 --- a/test/fixtures/es2015/uncategorised/354/expected.json +++ b/test/fixtures/es2015/uncategorised/354/expected.json @@ -1 +1,69 @@ -{} \ No newline at end of file +{ + "type": "File", + "start": 0, + "end": 20, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 20 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 20, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 20 + } + }, + "sourceType": "module", + "body": [ + { + "type": "ExportDefaultDeclaration", + "start": 0, + "end": 20, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 20 + } + }, + "declaration": { + "type": "RegExpLiteral", + "start": 15, + "end": 20, + "loc": { + "start": { + "line": 1, + "column": 15 + }, + "end": { + "line": 1, + "column": 20 + } + }, + "extra": { + "raw": "/foo/" + }, + "pattern": "foo", + "flags": "" + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/355/expected.json b/test/fixtures/es2015/uncategorised/355/expected.json index f77b5a851a..f916983e29 100644 --- a/test/fixtures/es2015/uncategorised/355/expected.json +++ b/test/fixtures/es2015/uncategorised/355/expected.json @@ -1,503 +1,190 @@ { - "type": "File", + "type": "File", + "start": 0, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "program": { + "type": "Program", "start": 0, "end": 29, "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 29 - } + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 29 + } }, - "program": { - "type": "Program", + "sourceType": "script", + "body": [ + { + "type": "FunctionDeclaration", "start": 0, "end": 29, "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 29 + } + }, + "id": { + "type": "Identifier", + "start": 9, + "end": 10, + "loc": { "start": { - "line": 1, - "column": 0 + "line": 1, + "column": 9 }, "end": { - "line": 1, - "column": 29 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "id": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - }, - "identifierName": "x" - }, - "name": "x" - }, - "generator": false, - "expression": false, - "async": false, - "params": [ - { - "type": "ObjectPattern", - "start": 11, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "properties": [ - { - "type": "ObjectProperty", - "start": 13, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "method": false, - "shorthand": true, - "computed": false, - "key": { - "type": "Identifier", - "start": 13, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 16 - }, - "identifierName": "set" - }, - "name": "set" - }, - "value": { - "type": "AssignmentPattern", - "start": 13, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "left": { - "type": "Identifier", - "start": 13, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 16 - }, - "identifierName": "set" - }, - "name": "set" - }, - "right": { - "type": "NullLiteral", - "start": 19, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 19 - }, - "end": { - "line": 1, - "column": 23 - } - } - } - }, - "extra": { - "shorthand": true - } - } - ] - } - ], - "body": { - "type": "BlockStatement", - "start": 27, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 27 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "body": [], - "directives": [] - } - } - ], - "directives": [] - }, - "comments": [], - "tokens": [ - { - "type": { - "label": "function", - "keyword": "function", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null + "line": 1, + "column": 10 }, - "value": "function", - "start": 0, - "end": 8, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 8 - } - } + "identifierName": "x" + }, + "name": "x" }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "x", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - } - }, - { - "type": { - "label": "(", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - } - }, - { - "type": { - "label": "{", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, + "generator": false, + "expression": false, + "async": false, + "params": [ + { + "type": "ObjectPattern", "start": 11, - "end": 12, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 12 - } - } - }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "set", - "start": 13, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 16 - } - } - }, - { - "type": { - "label": "=", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": true, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "value": "=", - "start": 17, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 18 - } - } - }, - { - "type": { - "label": "null", - "keyword": "null", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "value": "null", - "start": 19, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 19 - }, - "end": { - "line": 1, - "column": 23 - } - } - }, - { - "type": { - "label": "}", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 24, "end": 25, "loc": { - "start": { - "line": 1, - "column": 24 - }, - "end": { - "line": 1, - "column": 25 - } - } - }, - { - "type": { - "label": ")", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null + "start": { + "line": 1, + "column": 11 + }, + "end": { + "line": 1, + "column": 25 + } }, - "start": 25, - "end": 26, - "loc": { - "start": { + "properties": [ + { + "type": "ObjectProperty", + "start": 13, + "end": 23, + "loc": { + "start": { "line": 1, - "column": 25 + "column": 13 + }, + "end": { + "line": 1, + "column": 23 + } }, - "end": { - "line": 1, - "column": 26 + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 13, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 13 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "set" + }, + "name": "set" + }, + "value": { + "type": "AssignmentPattern", + "start": 13, + "end": 23, + "loc": { + "start": { + "line": 1, + "column": 13 + }, + "end": { + "line": 1, + "column": 23 + } + }, + "left": { + "type": "Identifier", + "start": 13, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 13 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "set" + }, + "name": "set" + }, + "right": { + "type": "NullLiteral", + "start": 19, + "end": 23, + "loc": { + "start": { + "line": 1, + "column": 19 + }, + "end": { + "line": 1, + "column": 23 + } + } + } + }, + "extra": { + "shorthand": true } - } - }, - { - "type": { - "label": "{", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null + } + ] + } + ], + "body": { + "type": "BlockStatement", + "start": 27, + "end": 29, + "loc": { + "start": { + "line": 1, + "column": 27 }, - "start": 27, - "end": 28, - "loc": { - "start": { - "line": 1, - "column": 27 - }, - "end": { - "line": 1, - "column": 28 - } - } - }, - { - "type": { - "label": "}", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 28, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 28 - }, - "end": { - "line": 1, - "column": 29 - } - } - }, - { - "type": { - "label": "eof", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 29, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 29 - }, - "end": { - "line": 1, - "column": 29 - } + "end": { + "line": 1, + "column": 29 } + }, + "body": [], + "directives": [] } - ] -} + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/36/expected.json b/test/fixtures/es2015/uncategorised/36/expected.json index af79a9f970..cdb2f5c52e 100644 --- a/test/fixtures/es2015/uncategorised/36/expected.json +++ b/test/fixtures/es2015/uncategorised/36/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/39/expected.json b/test/fixtures/es2015/uncategorised/39/expected.json index d3ed02a634..e47019cdb6 100644 --- a/test/fixtures/es2015/uncategorised/39/expected.json +++ b/test/fixtures/es2015/uncategorised/39/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -138,7 +140,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -155,7 +158,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/es2015/uncategorised/40/expected.json b/test/fixtures/es2015/uncategorised/40/expected.json index 6e5b95dce8..b7e7b61001 100644 --- a/test/fixtures/es2015/uncategorised/40/expected.json +++ b/test/fixtures/es2015/uncategorised/40/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } diff --git a/test/fixtures/es2015/uncategorised/41/expected.json b/test/fixtures/es2015/uncategorised/41/expected.json index 556e95a3ac..1f49c57e2d 100644 --- a/test/fixtures/es2015/uncategorised/41/expected.json +++ b/test/fixtures/es2015/uncategorised/41/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } diff --git a/test/fixtures/es2015/uncategorised/42/expected.json b/test/fixtures/es2015/uncategorised/42/expected.json index 6ba8419a8b..a2bf196ca0 100644 --- a/test/fixtures/es2015/uncategorised/42/expected.json +++ b/test/fixtures/es2015/uncategorised/42/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/es2015/uncategorised/43/expected.json b/test/fixtures/es2015/uncategorised/43/expected.json index 6e06ca49e2..d912fa2794 100644 --- a/test/fixtures/es2015/uncategorised/43/expected.json +++ b/test/fixtures/es2015/uncategorised/43/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/es2015/uncategorised/44/expected.json b/test/fixtures/es2015/uncategorised/44/expected.json index f280cb57bf..84f8889f2f 100644 --- a/test/fixtures/es2015/uncategorised/44/expected.json +++ b/test/fixtures/es2015/uncategorised/44/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, diff --git a/test/fixtures/es2015/uncategorised/45/expected.json b/test/fixtures/es2015/uncategorised/45/expected.json index 43ee9f5e11..31928b1851 100644 --- a/test/fixtures/es2015/uncategorised/45/expected.json +++ b/test/fixtures/es2015/uncategorised/45/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/es2015/uncategorised/46/expected.json b/test/fixtures/es2015/uncategorised/46/expected.json index b565e367ee..cab6510eaf 100644 --- a/test/fixtures/es2015/uncategorised/46/expected.json +++ b/test/fixtures/es2015/uncategorised/46/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" } @@ -89,12 +91,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2015/uncategorised/47/expected.json b/test/fixtures/es2015/uncategorised/47/expected.json index 03125c85dd..5b9f51fa62 100644 --- a/test/fixtures/es2015/uncategorised/47/expected.json +++ b/test/fixtures/es2015/uncategorised/47/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } @@ -94,6 +96,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -107,7 +110,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/es2015/uncategorised/48/expected.json b/test/fixtures/es2015/uncategorised/48/expected.json index 7d5558cdaf..864245ed88 100644 --- a/test/fixtures/es2015/uncategorised/48/expected.json +++ b/test/fixtures/es2015/uncategorised/48/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" } @@ -94,6 +96,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -107,7 +110,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -123,7 +127,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "z" }, "name": "z" } @@ -155,7 +160,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -171,7 +177,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -187,17 +194,20 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "z" }, "name": "z" } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 18 } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 7 } } } diff --git a/test/fixtures/es2015/uncategorised/49/expected.json b/test/fixtures/es2015/uncategorised/49/expected.json index 5722472386..d6a7efe40f 100644 --- a/test/fixtures/es2015/uncategorised/49/expected.json +++ b/test/fixtures/es2015/uncategorised/49/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -105,13 +107,14 @@ "column": 12 } }, - "body": [] + "body": [], + "directives": [] } } ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/5/expected.json b/test/fixtures/es2015/uncategorised/5/expected.json index f95c3acfdb..8a3dd5608b 100644 --- a/test/fixtures/es2015/uncategorised/5/expected.json +++ b/test/fixtures/es2015/uncategorised/5/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/50/expected.json b/test/fixtures/es2015/uncategorised/50/expected.json index a27dc04bfa..e5022056df 100644 --- a/test/fixtures/es2015/uncategorised/50/expected.json +++ b/test/fixtures/es2015/uncategorised/50/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -119,7 +122,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "y" }, "name": "y" } @@ -138,13 +142,14 @@ "column": 16 } }, - "body": [] + "body": [], + "directives": [] } } ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/52/expected.json b/test/fixtures/es2015/uncategorised/52/expected.json index 880dce74c2..ce0016fdc3 100644 --- a/test/fixtures/es2015/uncategorised/52/expected.json +++ b/test/fixtures/es2015/uncategorised/52/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/53/expected.json b/test/fixtures/es2015/uncategorised/53/expected.json index 7d5dce4954..403f65e101 100644 --- a/test/fixtures/es2015/uncategorised/53/expected.json +++ b/test/fixtures/es2015/uncategorised/53/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "test" }, "name": "test" } diff --git a/test/fixtures/es2015/uncategorised/54/expected.json b/test/fixtures/es2015/uncategorised/54/expected.json index 1030bf0af2..cc11812169 100644 --- a/test/fixtures/es2015/uncategorised/54/expected.json +++ b/test/fixtures/es2015/uncategorised/54/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/55/expected.json b/test/fixtures/es2015/uncategorised/55/expected.json index 0b0d3f1c10..a8769bfc25 100644 --- a/test/fixtures/es2015/uncategorised/55/expected.json +++ b/test/fixtures/es2015/uncategorised/55/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "get" }, "name": "get" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/56/expected.json b/test/fixtures/es2015/uncategorised/56/expected.json index b118b76443..98450690a7 100644 --- a/test/fixtures/es2015/uncategorised/56/expected.json +++ b/test/fixtures/es2015/uncategorised/56/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "set" }, "name": "set" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/61/expected.json b/test/fixtures/es2015/uncategorised/61/expected.json index 660265dd75..17d1d997d4 100644 --- a/test/fixtures/es2015/uncategorised/61/expected.json +++ b/test/fixtures/es2015/uncategorised/61/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -133,9 +135,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "shorthand": true } }, { @@ -167,7 +173,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" }, @@ -183,9 +190,13 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/62/expected.json b/test/fixtures/es2015/uncategorised/62/expected.json index 6e74cfdbcb..65027d5460 100644 --- a/test/fixtures/es2015/uncategorised/62/expected.json +++ b/test/fixtures/es2015/uncategorised/62/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -149,7 +152,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" } @@ -157,7 +161,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/63/expected.json b/test/fixtures/es2015/uncategorised/63/expected.json index f17d4e7f50..b52b7efed4 100644 --- a/test/fixtures/es2015/uncategorised/63/expected.json +++ b/test/fixtures/es2015/uncategorised/63/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/64/expected.json b/test/fixtures/es2015/uncategorised/64/expected.json index d970cbce76..56160d2041 100644 --- a/test/fixtures/es2015/uncategorised/64/expected.json +++ b/test/fixtures/es2015/uncategorised/64/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" } @@ -110,7 +111,7 @@ ], "kind": "const" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/65/expected.json b/test/fixtures/es2015/uncategorised/65/expected.json index d449479dc0..8f76a24663 100644 --- a/test/fixtures/es2015/uncategorised/65/expected.json +++ b/test/fixtures/es2015/uncategorised/65/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/66/expected.json b/test/fixtures/es2015/uncategorised/66/expected.json index 58be00e51c..104284ae40 100644 --- a/test/fixtures/es2015/uncategorised/66/expected.json +++ b/test/fixtures/es2015/uncategorised/66/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" } @@ -110,7 +111,7 @@ ], "kind": "let" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/67/expected.json b/test/fixtures/es2015/uncategorised/67/expected.json index 5847b666e3..f166d30898 100644 --- a/test/fixtures/es2015/uncategorised/67/expected.json +++ b/test/fixtures/es2015/uncategorised/67/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2015/uncategorised/68/expected.json b/test/fixtures/es2015/uncategorised/68/expected.json index aabef1030c..19bdfa758b 100644 --- a/test/fixtures/es2015/uncategorised/68/expected.json +++ b/test/fixtures/es2015/uncategorised/68/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" } @@ -110,7 +111,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/69/expected.json b/test/fixtures/es2015/uncategorised/69/expected.json index f2577d66d0..d4b8dda2a4 100644 --- a/test/fixtures/es2015/uncategorised/69/expected.json +++ b/test/fixtures/es2015/uncategorised/69/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/70/expected.json b/test/fixtures/es2015/uncategorised/70/expected.json index a9efc0fea7..6ae7f4bf7f 100644 --- a/test/fixtures/es2015/uncategorised/70/expected.json +++ b/test/fixtures/es2015/uncategorised/70/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/71/expected.json b/test/fixtures/es2015/uncategorised/71/expected.json index 0615d247ab..2175291efc 100644 --- a/test/fixtures/es2015/uncategorised/71/expected.json +++ b/test/fixtures/es2015/uncategorised/71/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2015/uncategorised/72/expected.json b/test/fixtures/es2015/uncategorised/72/expected.json index 1bd46b7ac0..2a45478e63 100644 --- a/test/fixtures/es2015/uncategorised/72/expected.json +++ b/test/fixtures/es2015/uncategorised/72/expected.json @@ -42,6 +42,8 @@ "column": 19 } }, + "specifiers": [], + "source": null, "declaration": { "type": "VariableDeclaration", "start": 7, @@ -83,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "document" }, "name": "document" }, @@ -91,11 +94,9 @@ } ], "kind": "var" - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/73/expected.json b/test/fixtures/es2015/uncategorised/73/expected.json index 3bfdd45a05..df0ab00a10 100644 --- a/test/fixtures/es2015/uncategorised/73/expected.json +++ b/test/fixtures/es2015/uncategorised/73/expected.json @@ -42,6 +42,8 @@ "column": 25 } }, + "specifiers": [], + "source": null, "declaration": { "type": "VariableDeclaration", "start": 7, @@ -83,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "document" }, "name": "document" }, @@ -106,11 +109,9 @@ } ], "kind": "var" - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/74/expected.json b/test/fixtures/es2015/uncategorised/74/expected.json index 83501be44d..02defa9c2f 100644 --- a/test/fixtures/es2015/uncategorised/74/expected.json +++ b/test/fixtures/es2015/uncategorised/74/expected.json @@ -42,6 +42,8 @@ "column": 19 } }, + "specifiers": [], + "source": null, "declaration": { "type": "VariableDeclaration", "start": 7, @@ -83,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "document" }, "name": "document" }, @@ -91,11 +94,9 @@ } ], "kind": "let" - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/75/expected.json b/test/fixtures/es2015/uncategorised/75/expected.json index fe06e4b03e..080ac3a873 100644 --- a/test/fixtures/es2015/uncategorised/75/expected.json +++ b/test/fixtures/es2015/uncategorised/75/expected.json @@ -42,6 +42,8 @@ "column": 25 } }, + "specifiers": [], + "source": null, "declaration": { "type": "VariableDeclaration", "start": 7, @@ -83,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "document" }, "name": "document" }, @@ -106,11 +109,9 @@ } ], "kind": "let" - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/76/expected.json b/test/fixtures/es2015/uncategorised/76/expected.json index ff09e9c318..7047c35c8e 100644 --- a/test/fixtures/es2015/uncategorised/76/expected.json +++ b/test/fixtures/es2015/uncategorised/76/expected.json @@ -42,6 +42,8 @@ "column": 27 } }, + "specifiers": [], + "source": null, "declaration": { "type": "VariableDeclaration", "start": 7, @@ -83,7 +85,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "document" }, "name": "document" }, @@ -106,11 +109,9 @@ } ], "kind": "const" - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/77/expected.json b/test/fixtures/es2015/uncategorised/77/expected.json index 9eada77464..43573a5711 100644 --- a/test/fixtures/es2015/uncategorised/77/expected.json +++ b/test/fixtures/es2015/uncategorised/77/expected.json @@ -42,6 +42,8 @@ "column": 27 } }, + "specifiers": [], + "source": null, "declaration": { "type": "FunctionDeclaration", "start": 7, @@ -68,12 +70,14 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "parse" }, "name": "parse" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -89,13 +93,12 @@ "column": 27 } }, - "body": [] + "body": [], + "directives": [] } - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/78/expected.json b/test/fixtures/es2015/uncategorised/78/expected.json index 013eb146ba..8dd1cb816a 100644 --- a/test/fixtures/es2015/uncategorised/78/expected.json +++ b/test/fixtures/es2015/uncategorised/78/expected.json @@ -42,6 +42,8 @@ "column": 21 } }, + "specifiers": [], + "source": null, "declaration": { "type": "ClassDeclaration", "start": 7, @@ -68,7 +70,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "Class" }, "name": "Class" }, @@ -89,11 +92,9 @@ }, "body": [] } - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/80/expected.json b/test/fixtures/es2015/uncategorised/80/expected.json index 364e85431c..3c9a9fc01d 100644 --- a/test/fixtures/es2015/uncategorised/80/expected.json +++ b/test/fixtures/es2015/uncategorised/80/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/81/expected.json b/test/fixtures/es2015/uncategorised/81/expected.json index 2bcb3a0d57..2296dba4c1 100644 --- a/test/fixtures/es2015/uncategorised/81/expected.json +++ b/test/fixtures/es2015/uncategorised/81/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -89,11 +91,12 @@ "column": 30 } }, - "body": [] + "body": [], + "directives": [] } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/83/expected.json b/test/fixtures/es2015/uncategorised/83/expected.json index fe765d760c..6e81e442fa 100644 --- a/test/fixtures/es2015/uncategorised/83/expected.json +++ b/test/fixtures/es2015/uncategorised/83/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -91,7 +92,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/86/expected.json b/test/fixtures/es2015/uncategorised/86/expected.json index ae2d126022..ec59c9ee3d 100644 --- a/test/fixtures/es2015/uncategorised/86/expected.json +++ b/test/fixtures/es2015/uncategorised/86/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" } @@ -94,7 +96,7 @@ ], "source": null } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/87/expected.json b/test/fixtures/es2015/uncategorised/87/expected.json index 7b44c44875..e702916375 100644 --- a/test/fixtures/es2015/uncategorised/87/expected.json +++ b/test/fixtures/es2015/uncategorised/87/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" } @@ -141,7 +145,7 @@ ], "source": null } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/88/expected.json b/test/fixtures/es2015/uncategorised/88/expected.json index afbd89b3af..69f3a20244 100644 --- a/test/fixtures/es2015/uncategorised/88/expected.json +++ b/test/fixtures/es2015/uncategorised/88/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "default" }, "name": "default" } @@ -94,7 +96,7 @@ ], "source": null } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/89/expected.json b/test/fixtures/es2015/uncategorised/89/expected.json index a0329fee1e..a7fbc886d2 100644 --- a/test/fixtures/es2015/uncategorised/89/expected.json +++ b/test/fixtures/es2015/uncategorised/89/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "dec" }, "name": "dec" } @@ -141,7 +145,7 @@ ], "source": null } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2015/uncategorised/9/expected.json b/test/fixtures/es2015/uncategorised/9/expected.json index 8fe8a8579a..95b01a403f 100644 --- a/test/fixtures/es2015/uncategorised/9/expected.json +++ b/test/fixtures/es2015/uncategorised/9/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2015/uncategorised/90/expected.json b/test/fixtures/es2015/uncategorised/90/expected.json index 2ca5064302..a00392fd81 100644 --- a/test/fixtures/es2015/uncategorised/90/expected.json +++ b/test/fixtures/es2015/uncategorised/90/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "default" }, "name": "default" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "default" }, "name": "default" } diff --git a/test/fixtures/es2015/uncategorised/92/expected.json b/test/fixtures/es2015/uncategorised/92/expected.json index d1465085b3..cf96958292 100644 --- a/test/fixtures/es2015/uncategorised/92/expected.json +++ b/test/fixtures/es2015/uncategorised/92/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "$" }, "name": "$" } diff --git a/test/fixtures/es2015/uncategorised/93/expected.json b/test/fixtures/es2015/uncategorised/93/expected.json index a6757e53fe..b411707a75 100644 --- a/test/fixtures/es2015/uncategorised/93/expected.json +++ b/test/fixtures/es2015/uncategorised/93/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" }, @@ -132,7 +135,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" } diff --git a/test/fixtures/es2015/uncategorised/94/expected.json b/test/fixtures/es2015/uncategorised/94/expected.json index 2ab3fc92e8..9de2ba1112 100644 --- a/test/fixtures/es2015/uncategorised/94/expected.json +++ b/test/fixtures/es2015/uncategorised/94/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "enc" }, "name": "enc" } diff --git a/test/fixtures/es2015/uncategorised/95/expected.json b/test/fixtures/es2015/uncategorised/95/expected.json index 9b9cd83bc5..0ae46ee594 100644 --- a/test/fixtures/es2015/uncategorised/95/expected.json +++ b/test/fixtures/es2015/uncategorised/95/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "crypto" }, "name": "crypto" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "decrypt" }, "name": "decrypt" } @@ -147,7 +150,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "encrypt" }, "name": "encrypt" }, @@ -163,7 +167,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "enc" }, "name": "enc" } diff --git a/test/fixtures/es2015/uncategorised/97/expected.json b/test/fixtures/es2015/uncategorised/97/expected.json index 378e45b83b..518aaeb40a 100644 --- a/test/fixtures/es2015/uncategorised/97/expected.json +++ b/test/fixtures/es2015/uncategorised/97/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "null" }, "name": "null" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "nil" }, "name": "nil" } diff --git a/test/fixtures/es2015/uncategorised/98/expected.json b/test/fixtures/es2015/uncategorised/98/expected.json index d29972d512..24bc22c1fb 100644 --- a/test/fixtures/es2015/uncategorised/98/expected.json +++ b/test/fixtures/es2015/uncategorised/98/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "crypto" }, "name": "crypto" } diff --git a/test/fixtures/es2015/uncategorised/99/expected.json b/test/fixtures/es2015/uncategorised/99/expected.json index 0e1df863cc..6370008347 100644 --- a/test/fixtures/es2015/uncategorised/99/expected.json +++ b/test/fixtures/es2015/uncategorised/99/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "v" }, "name": "v" } @@ -126,7 +128,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2016/exponentiation-operator/2/expected.json b/test/fixtures/es2016/exponentiation-operator/2/expected.json index 7908853db6..a1034e6eab 100644 --- a/test/fixtures/es2016/exponentiation-operator/2/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/2/expected.json @@ -117,10 +117,13 @@ "parenthesized": true, "parenStart": 1 } + }, + "extra": { + "parenthesizedArgument": false } } } ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2016/exponentiation-operator/3/expected.json b/test/fixtures/es2016/exponentiation-operator/3/expected.json index b5656e2456..9f2b2bf906 100644 --- a/test/fixtures/es2016/exponentiation-operator/3/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/es2016/exponentiation-operator/4/expected.json b/test/fixtures/es2016/exponentiation-operator/4/expected.json index 0df9404a78..80baa26315 100644 --- a/test/fixtures/es2016/exponentiation-operator/4/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "squared" }, "name": "squared" }, diff --git a/test/fixtures/es2016/exponentiation-operator/5/expected.json b/test/fixtures/es2016/exponentiation-operator/5/expected.json index e8ad51d1b7..22286c57b0 100644 --- a/test/fixtures/es2016/exponentiation-operator/5/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/5/expected.json @@ -133,7 +133,8 @@ "value": 2 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 5 } } } diff --git a/test/fixtures/es2016/exponentiation-operator/7/expected.json b/test/fixtures/es2016/exponentiation-operator/7/expected.json index f61979779e..c8dbba2bbd 100644 --- a/test/fixtures/es2016/exponentiation-operator/7/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/7/expected.json @@ -126,10 +126,14 @@ "raw": "1" }, "value": 1 + }, + "extra": { + "parenthesizedArgument": false } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "operator": "*", diff --git a/test/fixtures/es2016/exponentiation-operator/8/expected.json b/test/fixtures/es2016/exponentiation-operator/8/expected.json index 154543b04b..11a204dbe5 100644 --- a/test/fixtures/es2016/exponentiation-operator/8/expected.json +++ b/test/fixtures/es2016/exponentiation-operator/8/expected.json @@ -126,6 +126,9 @@ "raw": "1" }, "value": 1 + }, + "extra": { + "parenthesizedArgument": false } } }, diff --git a/test/fixtures/es2017/async-functions/11/expected.json b/test/fixtures/es2017/async-functions/11/expected.json index 519910a604..3d14dde860 100644 --- a/test/fixtures/es2017/async-functions/11/expected.json +++ b/test/fixtures/es2017/async-functions/11/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "async" }, "name": "async" } @@ -85,12 +86,14 @@ "end": { "line": 2, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/es2017/async-functions/12/expected.json b/test/fixtures/es2017/async-functions/12/expected.json index 1624ec0050..8398464169 100644 --- a/test/fixtures/es2017/async-functions/12/expected.json +++ b/test/fixtures/es2017/async-functions/12/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -74,7 +75,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -134,15 +136,18 @@ "end": { "line": 1, "column": 43 - } + }, + "identifierName": "promise" }, "name": "promise" } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/13/expected.json b/test/fixtures/es2017/async-functions/13/expected.json index 7656d8bdf0..02dbad929b 100644 --- a/test/fixtures/es2017/async-functions/13/expected.json +++ b/test/fixtures/es2017/async-functions/13/expected.json @@ -73,7 +73,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" } @@ -119,7 +120,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "inner" }, "name": "inner" }, @@ -182,7 +184,8 @@ "end": { "line": 1, "column": 47 - } + }, + "identifierName": "x" }, "name": "x" } @@ -196,11 +199,12 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/14/expected.json b/test/fixtures/es2017/async-functions/14/expected.json index 236d7969c2..f02a870e41 100644 --- a/test/fixtures/es2017/async-functions/14/expected.json +++ b/test/fixtures/es2017/async-functions/14/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -164,19 +166,22 @@ "end": { "line": 1, "column": 49 - } + }, + "identifierName": "promise" }, "name": "promise" } } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/15/expected.json b/test/fixtures/es2017/async-functions/15/expected.json index 3e9c3b4608..fe07c7f6de 100644 --- a/test/fixtures/es2017/async-functions/15/expected.json +++ b/test/fixtures/es2017/async-functions/15/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "o" }, "name": "o" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -193,7 +196,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -253,7 +257,8 @@ "end": { "line": 1, "column": 50 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -272,4 +277,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/16/expected.json b/test/fixtures/es2017/async-functions/16/expected.json index b845c0fb22..186ab6f31f 100644 --- a/test/fixtures/es2017/async-functions/16/expected.json +++ b/test/fixtures/es2017/async-functions/16/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 48 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, @@ -124,7 +126,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -184,7 +187,8 @@ "end": { "line": 1, "column": 46 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -200,4 +204,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/17/expected.json b/test/fixtures/es2017/async-functions/17/expected.json index e84017c870..a5afb02270 100644 --- a/test/fixtures/es2017/async-functions/17/expected.json +++ b/test/fixtures/es2017/async-functions/17/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -120,7 +122,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -151,7 +154,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -160,6 +164,7 @@ ] } } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/18/expected.json b/test/fixtures/es2017/async-functions/18/expected.json index 44b482a1e8..2b5f4bdab0 100644 --- a/test/fixtures/es2017/async-functions/18/expected.json +++ b/test/fixtures/es2017/async-functions/18/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "promise" }, "name": "promise" } @@ -164,18 +166,21 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "promise" }, "name": "promise" } } } - ] + ], + "directives": [] } } ] } } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/19/expected.json b/test/fixtures/es2017/async-functions/19/expected.json index f427340e7c..d10cdb5808 100644 --- a/test/fixtures/es2017/async-functions/19/expected.json +++ b/test/fixtures/es2017/async-functions/19/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -115,7 +117,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "async" }, "name": "async" }, @@ -174,7 +177,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/es2017/async-functions/20/expected.json b/test/fixtures/es2017/async-functions/20/expected.json index 235acc93f8..da3b22f11f 100644 --- a/test/fixtures/es2017/async-functions/20/expected.json +++ b/test/fixtures/es2017/async-functions/20/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "ok" }, "name": "ok" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "async" }, "name": "async" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "x" }, "name": "x" } @@ -126,7 +129,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/21/expected.json b/test/fixtures/es2017/async-functions/21/expected.json index 8c6bec9861..e881d2604b 100644 --- a/test/fixtures/es2017/async-functions/21/expected.json +++ b/test/fixtures/es2017/async-functions/21/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "async" }, "name": "async" }, @@ -166,7 +168,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "async" }, "name": "async" }, @@ -196,7 +199,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/es2017/async-functions/22/expected.json b/test/fixtures/es2017/async-functions/22/expected.json index 0c05743d58..6975fdfe3b 100644 --- a/test/fixtures/es2017/async-functions/22/expected.json +++ b/test/fixtures/es2017/async-functions/22/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Test" }, "name": "Test" }, @@ -88,6 +89,7 @@ "column": 23 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "async" }, "name": "async" }, - "static": false, "kind": "method", "id": null, "generator": false, diff --git a/test/fixtures/es2017/async-functions/23/expected.json b/test/fixtures/es2017/async-functions/23/expected.json index a5e072a934..3890646e01 100644 --- a/test/fixtures/es2017/async-functions/23/expected.json +++ b/test/fixtures/es2017/async-functions/23/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -116,10 +117,12 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "async" }, "name": "async" }, + "computed": false, "value": { "type": "StringLiteral", "start": 19, diff --git a/test/fixtures/es2017/async-functions/24/expected.json b/test/fixtures/es2017/async-functions/24/expected.json index 1078686a77..bdd29cecde 100644 --- a/test/fixtures/es2017/async-functions/24/expected.json +++ b/test/fixtures/es2017/async-functions/24/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -116,10 +117,12 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "async" }, "name": "async" }, + "computed": false, "kind": "method", "id": null, "generator": false, diff --git a/test/fixtures/es2017/async-functions/25/expected.json b/test/fixtures/es2017/async-functions/25/expected.json index 9b136c3ea4..a3bcbae858 100644 --- a/test/fixtures/es2017/async-functions/25/expected.json +++ b/test/fixtures/es2017/async-functions/25/expected.json @@ -42,6 +42,8 @@ "column": 30 } }, + "specifiers": [], + "source": null, "declaration": { "type": "FunctionDeclaration", "start": 7, @@ -68,7 +70,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,12 +93,12 @@ "column": 30 } }, - "body": [] + "body": [], + "directives": [] } - }, - "specifiers": [], - "source": null + } } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/27/expected.json b/test/fixtures/es2017/async-functions/27/expected.json index ccacb5ffa3..1e70bd9615 100644 --- a/test/fixtures/es2017/async-functions/27/expected.json +++ b/test/fixtures/es2017/async-functions/27/expected.json @@ -141,6 +141,7 @@ }, "name": "async" }, + "computed": false, "value": { "type": "AssignmentPattern", "start": 15, diff --git a/test/fixtures/es2017/async-functions/28/expected.json b/test/fixtures/es2017/async-functions/28/expected.json index bde4093e1f..d90f600a88 100644 --- a/test/fixtures/es2017/async-functions/28/expected.json +++ b/test/fixtures/es2017/async-functions/28/expected.json @@ -141,6 +141,7 @@ }, "name": "async" }, + "computed": false, "value": { "type": "Identifier", "start": 22, diff --git a/test/fixtures/es2017/async-functions/31/expected.json b/test/fixtures/es2017/async-functions/31/expected.json index 92d6c16d7a..b4f0aea8b8 100644 --- a/test/fixtures/es2017/async-functions/31/expected.json +++ b/test/fixtures/es2017/async-functions/31/expected.json @@ -141,6 +141,7 @@ }, "name": "async" }, + "computed": false, "value": { "type": "Identifier", "start": 28, diff --git a/test/fixtures/es2017/async-functions/32/expected.json b/test/fixtures/es2017/async-functions/32/expected.json index 8c778ed135..7cdfabffe3 100644 --- a/test/fixtures/es2017/async-functions/32/expected.json +++ b/test/fixtures/es2017/async-functions/32/expected.json @@ -141,6 +141,7 @@ }, "name": "async" }, + "computed": false, "value": { "type": "AssignmentPattern", "start": 21, diff --git a/test/fixtures/es2017/async-functions/7/expected.json b/test/fixtures/es2017/async-functions/7/expected.json index bd3c1e7695..a896663d5d 100644 --- a/test/fixtures/es2017/async-functions/7/expected.json +++ b/test/fixtures/es2017/async-functions/7/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -116,10 +117,12 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "async" }, "name": "async" }, + "computed": false, "value": { "type": "Identifier", "start": 6, @@ -132,9 +135,13 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "async" }, "name": "async" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/es2017/async-functions/8/expected.json b/test/fixtures/es2017/async-functions/8/expected.json index 339a3925ef..b1aba60ea4 100644 --- a/test/fixtures/es2017/async-functions/8/expected.json +++ b/test/fixtures/es2017/async-functions/8/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "async" }, "name": "async" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "async" }, "name": "async" + }, + "extra": { + "shorthand": true } } ] @@ -150,7 +155,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "require" }, "name": "require" }, diff --git a/test/fixtures/es2017/async-functions/export-arrow/actual.js b/test/fixtures/es2017/async-functions/export-arrow/actual.js new file mode 100644 index 0000000000..b5d8066db5 --- /dev/null +++ b/test/fixtures/es2017/async-functions/export-arrow/actual.js @@ -0,0 +1 @@ +export default async () => await foo() diff --git a/test/fixtures/es2017/async-functions/export-arrow/expected.json b/test/fixtures/es2017/async-functions/export-arrow/expected.json new file mode 100644 index 0000000000..dd7fe7275a --- /dev/null +++ b/test/fixtures/es2017/async-functions/export-arrow/expected.json @@ -0,0 +1,117 @@ +{ + "type": "File", + "start": 0, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "sourceType": "module", + "body": [ + { + "type": "ExportDefaultDeclaration", + "start": 0, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "declaration": { + "type": "ArrowFunctionExpression", + "start": 15, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 15 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "id": null, + "generator": false, + "expression": true, + "async": true, + "params": [], + "body": { + "type": "AwaitExpression", + "start": 27, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 27 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "argument": { + "type": "CallExpression", + "start": 33, + "end": 38, + "loc": { + "start": { + "line": 1, + "column": 33 + }, + "end": { + "line": 1, + "column": 38 + } + }, + "callee": { + "type": "Identifier", + "start": 33, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 33 + }, + "end": { + "line": 1, + "column": 36 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + "arguments": [] + } + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/export-arrow/options.json b/test/fixtures/es2017/async-functions/export-arrow/options.json new file mode 100644 index 0000000000..2104ca4328 --- /dev/null +++ b/test/fixtures/es2017/async-functions/export-arrow/options.json @@ -0,0 +1,3 @@ +{ + "sourceType": "module" +} diff --git a/test/fixtures/es2017/async-functions/export/actual.js b/test/fixtures/es2017/async-functions/export/actual.js new file mode 100644 index 0000000000..3f043e6176 --- /dev/null +++ b/test/fixtures/es2017/async-functions/export/actual.js @@ -0,0 +1,2 @@ +export async function foo() {} +export default async function bar() {} diff --git a/test/fixtures/es2017/async-functions/export/expected.json b/test/fixtures/es2017/async-functions/export/expected.json new file mode 100644 index 0000000000..68a60db703 --- /dev/null +++ b/test/fixtures/es2017/async-functions/export/expected.json @@ -0,0 +1,172 @@ +{ + "type": "File", + "start": 0, + "end": 69, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 38 + } + }, + "program": { + "type": "Program", + "start": 0, + "end": 69, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 2, + "column": 38 + } + }, + "sourceType": "module", + "body": [ + { + "type": "ExportNamedDeclaration", + "start": 0, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 1, + "column": 30 + } + }, + "specifiers": [], + "source": null, + "declaration": { + "type": "FunctionDeclaration", + "start": 7, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 7 + }, + "end": { + "line": 1, + "column": 30 + } + }, + "id": { + "type": "Identifier", + "start": 22, + "end": 25, + "loc": { + "start": { + "line": 1, + "column": 22 + }, + "end": { + "line": 1, + "column": 25 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + "generator": false, + "expression": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 28, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 28 + }, + "end": { + "line": 1, + "column": 30 + } + }, + "body": [], + "directives": [] + } + } + }, + { + "type": "ExportDefaultDeclaration", + "start": 31, + "end": 69, + "loc": { + "start": { + "line": 2, + "column": 0 + }, + "end": { + "line": 2, + "column": 38 + } + }, + "declaration": { + "type": "FunctionDeclaration", + "start": 46, + "end": 69, + "loc": { + "start": { + "line": 2, + "column": 15 + }, + "end": { + "line": 2, + "column": 38 + } + }, + "id": { + "type": "Identifier", + "start": 61, + "end": 64, + "loc": { + "start": { + "line": 2, + "column": 30 + }, + "end": { + "line": 2, + "column": 33 + }, + "identifierName": "bar" + }, + "name": "bar" + }, + "generator": false, + "expression": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 67, + "end": 69, + "loc": { + "start": { + "line": 2, + "column": 36 + }, + "end": { + "line": 2, + "column": 38 + } + }, + "body": [], + "directives": [] + } + } + } + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/es2017/async-functions/export/options.json b/test/fixtures/es2017/async-functions/export/options.json new file mode 100644 index 0000000000..2104ca4328 --- /dev/null +++ b/test/fixtures/es2017/async-functions/export/options.json @@ -0,0 +1,3 @@ +{ + "sourceType": "module" +} diff --git a/test/fixtures/es2017/async-functions/.no-method-asi/actual.js b/test/fixtures/es2017/async-functions/no-method-asi/actual.js similarity index 100% rename from test/fixtures/es2017/async-functions/.no-method-asi/actual.js rename to test/fixtures/es2017/async-functions/no-method-asi/actual.js diff --git a/test/fixtures/es2017/async-functions/.no-method-asi/options.json b/test/fixtures/es2017/async-functions/no-method-asi/options.json similarity index 100% rename from test/fixtures/es2017/async-functions/.no-method-asi/options.json rename to test/fixtures/es2017/async-functions/no-method-asi/options.json diff --git a/test/fixtures/es2017/trailing-function-commas/1/expected.json b/test/fixtures/es2017/trailing-function-commas/1/expected.json index e4e327f6b7..af9edda08a 100644 --- a/test/fixtures/es2017/trailing-function-commas/1/expected.json +++ b/test/fixtures/es2017/trailing-function-commas/1/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "log" }, "name": "log" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "n" }, "name": "n" }, diff --git a/test/fixtures/es2017/trailing-function-commas/2/expected.json b/test/fixtures/es2017/trailing-function-commas/2/expected.json index 31ecdf84a7..99e64d2352 100644 --- a/test/fixtures/es2017/trailing-function-commas/2/expected.json +++ b/test/fixtures/es2017/trailing-function-commas/2/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "log" }, "name": "log" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "n" }, "name": "n" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "op" }, "name": "op" }, @@ -105,7 +109,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "val" }, "name": "val" } @@ -124,9 +129,11 @@ "column": 29 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/es2017/trailing-function-commas/3/expected.json b/test/fixtures/es2017/trailing-function-commas/3/expected.json index 84ddd9f145..333b273272 100644 --- a/test/fixtures/es2017/trailing-function-commas/3/expected.json +++ b/test/fixtures/es2017/trailing-function-commas/3/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 23 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/es2017/trailing-function-commas/4/expected.json b/test/fixtures/es2017/trailing-function-commas/4/expected.json index 74c2247c3f..53f94b690d 100644 --- a/test/fixtures/es2017/trailing-function-commas/4/expected.json +++ b/test/fixtures/es2017/trailing-function-commas/4/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0000/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0000/expected.json index bab8079535..855b9666cc 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0000/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,14 +117,20 @@ "end": { "line": 2, "column": 3 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0001/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0001/expected.json index e7aa5f92ff..f531eb96b4 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0001/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,14 +117,20 @@ "end": { "line": 2, "column": 3 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0002/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0002/expected.json index b80d317427..3840e25325 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0002/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null, diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0003/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0003/expected.json index 0c955c4730..3881fa499d 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0003/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0003/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -189,7 +191,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "z" }, "name": "z" } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0004/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0004/expected.json index 1c02f6ef66..84e28f3bd9 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0004/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0004/expected.json @@ -115,7 +115,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there" } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0005/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0005/expected.json index 675fe056a3..fd7f41293b 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0005/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0005/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0006/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0006/expected.json index dfef6b5c50..820264c6d1 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0006/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0006/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0007/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0007/expected.json index 2b8d9fef9f..560762d177 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0007/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0007/expected.json @@ -115,7 +115,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there" } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0008/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0008/expected.json index 21c911cbbc..b5794cac3a 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0008/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0008/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0009/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0009/expected.json index 55ac6a29a8..62b72404df 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0009/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0009/expected.json @@ -134,7 +134,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "there" }, "name": "there", "leadingComments": null diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0010/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0010/expected.json index 7d4c8d5bb6..e5fa9ec260 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0010/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0010/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,7 +118,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } @@ -126,7 +128,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0011/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0011/expected.json index f0cf8a4b53..3b50dd8b73 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0011/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0011/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -136,7 +137,8 @@ "end": { "line": 2, "column": 1 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null @@ -164,7 +166,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0012/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0012/expected.json index 975bfdf605..6ae21e8aa6 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0012/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0012/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -136,7 +137,8 @@ "end": { "line": 2, "column": 11 - } + }, + "identifierName": "x" }, "name": "x", "leadingComments": null @@ -164,7 +166,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0013/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0013/expected.json index d55af430c7..d1fb3ac429 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0013/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0013/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error" } @@ -100,13 +101,16 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "error" }, "name": "error" } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0014/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0014/expected.json index 1340d70360..55562ff024 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0014/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0014/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null, @@ -120,7 +121,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null diff --git a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0015/expected.json b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0015/expected.json index fcf481f414..acb5183a09 100644 --- a/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0015/expected.json +++ b/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0015/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null, @@ -120,7 +121,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "error" }, "name": "error", "leadingComments": null diff --git a/test/fixtures/esprima/declaration-const/migrated_0000/expected.json b/test/fixtures/esprima/declaration-const/migrated_0000/expected.json index e194cd4fc2..5b8946932d 100644 --- a/test/fixtures/esprima/declaration-const/migrated_0000/expected.json +++ b/test/fixtures/esprima/declaration-const/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/declaration-const/migrated_0001/expected.json b/test/fixtures/esprima/declaration-const/migrated_0001/expected.json index a68a9f9594..72f1b62331 100644 --- a/test/fixtures/esprima/declaration-const/migrated_0001/expected.json +++ b/test/fixtures/esprima/declaration-const/migrated_0001/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/declaration-const/migrated_0002/expected.json b/test/fixtures/esprima/declaration-const/migrated_0002/expected.json index 3df4bb7dd4..3a4b88e0fc 100644 --- a/test/fixtures/esprima/declaration-const/migrated_0002/expected.json +++ b/test/fixtures/esprima/declaration-const/migrated_0002/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -186,7 +188,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/esprima/declaration-function/migrated_0000/expected.json b/test/fixtures/esprima/declaration-function/migrated_0000/expected.json index 8de460e887..89d8911652 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0000/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0000/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,16 +118,19 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0001/expected.json b/test/fixtures/esprima/declaration-function/migrated_0001/expected.json index d8bcde0844..01acb188ed 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0001/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0001/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 19 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0002/expected.json b/test/fixtures/esprima/declaration-function/migrated_0002/expected.json index 086e1ef65b..93d4d923bf 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0002/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0002/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0003/expected.json b/test/fixtures/esprima/declaration-function/migrated_0003/expected.json index c081c978ea..05cce3b8f3 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0003/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0003/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "t" }, "name": "t" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "t" }, "name": "t" } @@ -108,9 +112,11 @@ "column": 23 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0004/expected.json b/test/fixtures/esprima/declaration-function/migrated_0004/expected.json index a9c517251e..4b79120694 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0004/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0004/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "t" }, "name": "t" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "t" }, "name": "t" } @@ -126,7 +130,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/declaration-function/migrated_0005/expected.json b/test/fixtures/esprima/declaration-function/migrated_0005/expected.json index 5924cefb02..1b08145eb9 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0005/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0005/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -102,12 +104,14 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "inner" }, "name": "inner" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/declaration-function/migrated_0006/expected.json b/test/fixtures/esprima/declaration-function/migrated_0006/expected.json index 3d1b214f48..a5373f5a79 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0006/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0006/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" } @@ -133,16 +136,19 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0007/expected.json b/test/fixtures/esprima/declaration-function/migrated_0007/expected.json index 8bc6714852..cdfeb7b019 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0007/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0007/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "hello" }, "name": "hello" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "b" }, "name": "b" } @@ -149,16 +153,19 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0008/expected.json b/test/fixtures/esprima/declaration-function/migrated_0008/expected.json index 6483debdcd..7df304a88a 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0008/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0008/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -146,20 +148,23 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0009/expected.json b/test/fixtures/esprima/declaration-function/migrated_0009/expected.json index b4b770ef03..ce5cb42288 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0009/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0009/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "eval" }, "name": "eval" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -120,13 +123,15 @@ "column": 28 } }, - "body": [] + "body": [], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0010/expected.json b/test/fixtures/esprima/declaration-function/migrated_0010/expected.json index 75abd7b81c..2b88f0d953 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0010/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0010/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "hi" }, "name": "hi" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -120,13 +123,15 @@ "column": 33 } }, - "body": [] + "body": [], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0011/expected.json b/test/fixtures/esprima/declaration-function/migrated_0011/expected.json index 71c7365c51..f3e529622f 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0011/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0011/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "hello" }, "name": "hello" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "hi" }, "name": "hi" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -161,20 +164,23 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "sayHi" }, "name": "sayHi" }, "arguments": [] } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0012/expected.json b/test/fixtures/esprima/declaration-function/migrated_0012/expected.json index fac0f4b32c..f79af90cc1 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0012/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0012/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -78,7 +79,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/declaration-function/migrated_0013/expected.json b/test/fixtures/esprima/declaration-function/migrated_0013/expected.json index e9af076d07..511cc1461a 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0013/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0013/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "universe" }, "name": "universe" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } @@ -92,9 +95,11 @@ "column": 32 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-function/migrated_0014/expected.json b/test/fixtures/esprima/declaration-function/migrated_0014/expected.json index cc976d4819..9b336de80e 100644 --- a/test/fixtures/esprima/declaration-function/migrated_0014/expected.json +++ b/test/fixtures/esprima/declaration-function/migrated_0014/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/declaration-let/migrated_0000/expected.json b/test/fixtures/esprima/declaration-let/migrated_0000/expected.json index 9e7caa0016..76753120a1 100644 --- a/test/fixtures/esprima/declaration-let/migrated_0000/expected.json +++ b/test/fixtures/esprima/declaration-let/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -78,6 +79,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-let/migrated_0001/expected.json b/test/fixtures/esprima/declaration-let/migrated_0001/expected.json index 1e0f4d8fa5..25e1548716 100644 --- a/test/fixtures/esprima/declaration-let/migrated_0001/expected.json +++ b/test/fixtures/esprima/declaration-let/migrated_0001/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -93,8 +94,10 @@ ], "kind": "let" } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/declaration-let/migrated_0002/expected.json b/test/fixtures/esprima/declaration-let/migrated_0002/expected.json index e34ed2023b..1e45a1303f 100644 --- a/test/fixtures/esprima/declaration-let/migrated_0002/expected.json +++ b/test/fixtures/esprima/declaration-let/migrated_0002/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/declaration-let/migrated_0003/expected.json b/test/fixtures/esprima/declaration-let/migrated_0003/expected.json index 6cf98a59bd..75f9f04288 100644 --- a/test/fixtures/esprima/declaration-let/migrated_0003/expected.json +++ b/test/fixtures/esprima/declaration-let/migrated_0003/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -186,7 +188,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/esprima/directive-prolog/migrated_0000/expected.json b/test/fixtures/esprima/directive-prolog/migrated_0000/expected.json index c6d4b5de2b..e7c92d32b5 100644 --- a/test/fixtures/esprima/directive-prolog/migrated_0000/expected.json +++ b/test/fixtures/esprima/directive-prolog/migrated_0000/expected.json @@ -73,6 +73,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "i" }, "name": "i" }, @@ -177,7 +179,8 @@ }, "arguments": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/directive-prolog/migrated_0001/expected.json b/test/fixtures/esprima/directive-prolog/migrated_0001/expected.json index 1acd32f8f8..4530bdb97f 100644 --- a/test/fixtures/esprima/directive-prolog/migrated_0001/expected.json +++ b/test/fixtures/esprima/directive-prolog/migrated_0001/expected.json @@ -73,6 +73,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "i" }, "name": "i" }, @@ -177,7 +179,8 @@ }, "arguments": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/.invalid-elision-after-rest/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/.invalid-elision-after-rest/expected.json deleted file mode 100644 index aa98014263..0000000000 --- a/test/fixtures/esprima/es2015-array-binding-pattern/.invalid-elision-after-rest/expected.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "expression": { - "type": "ArrowFunctionExpression", - "start": 0, - "end": 14, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 14 - } - }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "ArrayPattern", - "start": 1, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "elements": [ - { - "type": "Identifier", - "start": 2, - "end": 3, - "loc": { - "start": { - "line": 1, - "column": 2 - }, - "end": { - "line": 1, - "column": 3 - } - }, - "name": "a" - }, - { - "type": "RestElement", - "start": 4, - "end": 8, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 8 - } - }, - "argument": { - "type": "Identifier", - "start": 7, - "end": 8, - "loc": { - "start": { - "line": 1, - "column": 7 - }, - "end": { - "line": 1, - "column": 8 - } - }, - "name": "b" - } - } - ] - } - ], - "body": { - "type": "Literal", - "start": 13, - "end": 14, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 14 - } - }, - "value": 0, - "rawValue": 0, - "raw": "0" - } - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-01/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-01/expected.json index 24fe25f6c7..592f6f4c3a 100644 --- a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-01/expected.json +++ b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-01/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-02/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-02/expected.json index 38ef2920e8..40992a4383 100644 --- a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-02/expected.json +++ b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-02/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-03/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-03/expected.json index 74654fe30a..99f74f62d8 100644 --- a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-03/expected.json +++ b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-03/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-empty/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-empty/expected.json index fe13d83e4a..bf9322b67a 100644 --- a/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-empty/expected.json +++ b/test/fixtures/esprima/es2015-array-binding-pattern/array-binding-pattern-empty/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", diff --git a/test/fixtures/esprima/es2015-array-binding-pattern/elision/expected.json b/test/fixtures/esprima/es2015-array-binding-pattern/elision/expected.json index 293ba53fee..cf5275647d 100644 --- a/test/fixtures/esprima/es2015-array-binding-pattern/elision/expected.json +++ b/test/fixtures/esprima/es2015-array-binding-pattern/elision/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "ArrayPattern", diff --git a/test/fixtures/esprima/es2015-array-pattern/elision/expected.json b/test/fixtures/esprima/es2015-array-pattern/elision/expected.json index 33b9e60b18..c87cb31e23 100644 --- a/test/fixtures/esprima/es2015-array-pattern/elision/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/elision/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/expected.json b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/expected.json index 85e1ffb837..fcf997f128 100644 --- a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -102,12 +103,14 @@ "column": 21 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-fn/expected.json b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-fn/expected.json index 495f1eefe4..eba23577ef 100644 --- a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-fn/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-fn/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -92,9 +94,11 @@ "column": 17 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-lexical/expected.json b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-lexical/expected.json index 969c550a6a..abda652078 100644 --- a/test/fixtures/esprima/es2015-array-pattern/empty-pattern-lexical/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/empty-pattern-lexical/expected.json @@ -93,6 +93,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-array-pattern/hole/expected.json b/test/fixtures/esprima/es2015-array-pattern/hole/expected.json index af02d62272..1c73e74ba2 100644 --- a/test/fixtures/esprima/es2015-array-pattern/hole/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/hole/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json b/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json index aa2233a73e..c9f2745187 100644 --- a/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json @@ -100,7 +100,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -164,7 +166,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -180,9 +183,13 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "c" }, "name": "c" + }, + "extra": { + "shorthand": true } }, { @@ -214,7 +221,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "d" }, "name": "d" }, @@ -244,7 +252,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -299,7 +308,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -329,7 +339,8 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "g" }, "name": "g" }, @@ -384,7 +395,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "h" }, "name": "h" }, @@ -414,7 +426,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "h" }, "name": "h" }, @@ -430,10 +443,14 @@ "end": { "line": 1, "column": 43 - } + }, + "identifierName": "i" }, "name": "i" } + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-array-pattern/rest/expected.json b/test/fixtures/esprima/es2015-array-pattern/rest/expected.json index 2c0a36d06f..89324548bf 100644 --- a/test/fixtures/esprima/es2015-array-pattern/rest/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/rest/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-array-pattern/tailing-hold/expected.json b/test/fixtures/esprima/es2015-array-pattern/tailing-hold/expected.json index 6cd7a04e5a..cfeb0c0e53 100644 --- a/test/fixtures/esprima/es2015-array-pattern/tailing-hold/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/tailing-hold/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/expected.json b/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/expected.json index 8d669b0c72..1d7d31be70 100644 --- a/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/expected.json @@ -114,7 +114,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-array-pattern/with-default-fn/expected.json b/test/fixtures/esprima/es2015-array-pattern/with-default-fn/expected.json index 0e0ab6da3b..187faa482d 100644 --- a/test/fixtures/esprima/es2015-array-pattern/with-default-fn/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/with-default-fn/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json b/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json index 5e393f5bf2..7b5862ff98 100644 --- a/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json +++ b/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json @@ -116,7 +116,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -132,9 +133,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-arg-and-rest/expected.json b/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-arg-and-rest/expected.json index 8a16817fc6..937d51b638 100644 --- a/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-arg-and-rest/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-arg-and-rest/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -118,7 +121,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "c" }, "name": "c" } diff --git a/test/fixtures/esprima/es2015-arrow-function/arrow-with-only-rest/expected.json b/test/fixtures/esprima/es2015-arrow-function/arrow-with-only-rest/expected.json index 30aa46f59e..1ab3f26f36 100644 --- a/test/fixtures/esprima/es2015-arrow-function/arrow-with-only-rest/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/arrow-with-only-rest/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "RestElement", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0000/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0000/expected.json index 6b22652418..9910aa18c4 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0000/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [], "body": { "type": "StringLiteral", diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0001/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0001/expected.json index 070478ffa3..b6a6ef550a 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0001/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0001/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0002/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0002/expected.json index 71885e218e..0d66821115 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0002/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0003/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0003/expected.json index 57366e881f..36e04398ee 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0003/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0003/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0004/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0004/expected.json index 5644e19a05..54989111af 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0004/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0004/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json index d79ff6492c..0931f56cf1 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } @@ -121,7 +123,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "property" }, "name": "property" }, @@ -148,7 +151,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 5 } } } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0006/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0006/expected.json index a7d846ffb6..93d45404a4 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0006/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0006/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "e" }, "name": "e" } @@ -153,7 +155,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "label" }, "name": "label" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0007/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0007/expected.json index 8eea5108a9..78728a0062 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0007/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0007/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0008/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0008/expected.json index d3ed02a634..e47019cdb6 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0008/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0008/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -138,7 +140,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -155,7 +158,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0009/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0009/expected.json index 6e5b95dce8..b7e7b61001 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0009/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0009/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0010/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0010/expected.json index 556e95a3ac..1f49c57e2d 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0010/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0010/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0011/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0011/expected.json index 6ba8419a8b..a2bf196ca0 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0011/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0011/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0012/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0012/expected.json index 6e06ca49e2..d912fa2794 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0012/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0012/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0013/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0013/expected.json index f280cb57bf..84f8889f2f 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0013/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0013/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0014/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0014/expected.json index 43ee9f5e11..31928b1851 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0014/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0014/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0015/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0015/expected.json index b565e367ee..cab6510eaf 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0015/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0015/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" } @@ -89,12 +91,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0016/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0016/expected.json index 03125c85dd..5b9f51fa62 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0016/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0016/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } @@ -94,6 +96,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -107,7 +110,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0017/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0017/expected.json index 7d5558cdaf..864245ed88 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0017/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0017/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" } @@ -94,6 +96,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -107,7 +110,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -123,7 +127,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "z" }, "name": "z" } @@ -155,7 +160,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -171,7 +177,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -187,17 +194,20 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "z" }, "name": "z" } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 18 } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 7 } } } diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0018/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0018/expected.json index 001ee4b78f..d6a7efe40f 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0018/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0018/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -105,12 +107,14 @@ "column": 12 } }, - "body": [] + "body": [], + "directives": [] } } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0019/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0019/expected.json index 6abd542b88..e5022056df 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0019/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0019/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -119,7 +122,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "y" }, "name": "y" } @@ -138,12 +142,14 @@ "column": 16 } }, - "body": [] + "body": [], + "directives": [] } } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0020/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0020/expected.json index c0edf43c28..b8563aeaae 100644 --- a/test/fixtures/esprima/es2015-arrow-function/migrated_0020/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0020/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "sun" }, "name": "sun" } @@ -89,12 +91,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "earth" }, "name": "earth" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/expected.json b/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/expected.json +++ b/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-class/.migrated_0026/expected.json b/test/fixtures/esprima/es2015-class/.migrated_0026/expected.json deleted file mode 100644 index c69f6a312a..0000000000 --- a/test/fixtures/esprima/es2015-class/.migrated_0026/expected.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ClassDeclaration", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - } - }, - "name": "A" - }, - "superClass": null, - "body": { - "type": "ClassBody", - "start": 8, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "body": [ - { - "type": "ClassMethod", - "start": 9, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "computed": false, - "key": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "a" - }, - "static": false, - "kind": "method", - "value": { - "type": "FunctionExpression", - "start": 10, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 11, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "name": "eval" - } - ], - "body": { - "type": "BlockStatement", - "start": 16, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "body": [] - } - } - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-class/migrated_0000/expected.json b/test/fixtures/esprima/es2015-class/migrated_0000/expected.json index 9be73d0dda..79c113a526 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0000/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -76,6 +77,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-class/migrated_0001/expected.json b/test/fixtures/esprima/es2015-class/migrated_0001/expected.json index 0884478b03..e97e6d4957 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0001/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0001/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, diff --git a/test/fixtures/esprima/es2015-class/migrated_0002/expected.json b/test/fixtures/esprima/es2015-class/migrated_0002/expected.json index 13ae4c94f1..4827f6ca09 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0002/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -76,6 +77,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-class/migrated_0003/expected.json b/test/fixtures/esprima/es2015-class/migrated_0003/expected.json index dbd2563e9f..e6f951248c 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0003/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0003/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -76,6 +77,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-class/migrated_0004/expected.json b/test/fixtures/esprima/es2015-class/migrated_0004/expected.json index 3e510efdc1..1998fa25fd 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0004/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0004/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 14 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0005/expected.json b/test/fixtures/esprima/es2015-class/migrated_0005/expected.json index 1ec03c3f48..899e4f89fc 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0005/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0005/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 14 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 19 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0006/expected.json b/test/fixtures/esprima/es2015-class/migrated_0006/expected.json index c883c50114..aee3a382dc 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0006/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0006/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 14 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 20 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0007/expected.json b/test/fixtures/esprima/es2015-class/migrated_0007/expected.json index 57df44f925..30c3a5f4e6 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0007/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0007/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 14 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 20 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0008/expected.json b/test/fixtures/esprima/es2015-class/migrated_0008/expected.json index 129657a7fc..fc5dd03053 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0008/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0008/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 15 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 21 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0009/expected.json b/test/fixtures/esprima/es2015-class/migrated_0009/expected.json index aa0a5f9344..163cde64f1 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0009/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0009/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,8 @@ "column": 19 } }, + "static": false, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "static" }, "name": "static" }, - "static": false, - "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0010/expected.json b/test/fixtures/esprima/es2015-class/migrated_0010/expected.json index 92e8ef8e43..123b5826fe 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0010/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0010/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 18 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 29 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -178,7 +183,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "c" }, "name": "c" } diff --git a/test/fixtures/esprima/es2015-class/migrated_0011/expected.json b/test/fixtures/esprima/es2015-class/migrated_0011/expected.json index c6498e9b27..08bf6cfa7a 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0011/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0011/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 21 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 38 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -198,6 +203,7 @@ "column": 56 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -211,15 +217,16 @@ "end": { "line": 1, "column": 51 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -233,7 +240,8 @@ "end": { "line": 1, "column": 53 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-class/migrated_0012/expected.json b/test/fixtures/esprima/es2015-class/migrated_0012/expected.json index fa54d94267..cf546974f2 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0012/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0012/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 21 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0013/expected.json b/test/fixtures/esprima/es2015-class/migrated_0013/expected.json index c7ff2d5228..f0fd394ac8 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0013/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0013/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 23 } }, + "static": true, "computed": true, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0014/expected.json b/test/fixtures/esprima/es2015-class/migrated_0014/expected.json index 3a78f1bd7d..1ff1dcca26 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0014/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0014/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 22 } }, + "static": true, "computed": true, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 37 } }, + "static": true, "computed": true, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "b" }, "name": "b" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0015/expected.json b/test/fixtures/esprima/es2015-class/migrated_0015/expected.json index ade3ae124b..fffddf1e76 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0015/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0015/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 26 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "static" }, "name": "static" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0016/expected.json b/test/fixtures/esprima/es2015-class/migrated_0016/expected.json index 376ca238f8..f382b98ada 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0016/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0016/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, diff --git a/test/fixtures/esprima/es2015-class/migrated_0017/expected.json b/test/fixtures/esprima/es2015-class/migrated_0017/expected.json index 2a2d1f81f9..ae929ebe00 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0017/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0017/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 22 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "prototype" }, "name": "prototype" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0018/expected.json b/test/fixtures/esprima/es2015-class/migrated_0018/expected.json index 8a0d50c2c6..ef96011b27 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0018/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0018/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 24 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0019/expected.json b/test/fixtures/esprima/es2015-class/migrated_0019/expected.json index 72bb521716..9fc80e5ba4 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0019/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0019/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 26 } }, + "static": false, "computed": false, "key": { "type": "StringLiteral", @@ -109,11 +111,11 @@ }, "value": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -147,6 +149,7 @@ "column": 46 } }, + "static": false, "computed": true, "key": { "type": "StringLiteral", @@ -168,11 +171,11 @@ }, "value": "constructor" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0020/expected.json b/test/fixtures/esprima/es2015-class/migrated_0020/expected.json index 8ee060397d..ae2168a01e 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0020/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0020/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 31 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -143,6 +146,7 @@ "column": 54 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -156,15 +160,16 @@ "end": { "line": 1, "column": 50 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0021/expected.json b/test/fixtures/esprima/es2015-class/migrated_0021/expected.json index 05b3f0a4ac..3b05492ff7 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0021/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0021/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ "column": 33 } }, + "static": true, "computed": true, "key": { "type": "StringLiteral", @@ -109,11 +111,11 @@ }, "value": "prototype" }, - "static": true, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-class/migrated_0022/expected.json b/test/fixtures/esprima/es2015-class/migrated_0022/expected.json index 0df98d2cb5..1fd506aabc 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0022/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0022/expected.json @@ -75,7 +75,8 @@ "body": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-class/migrated_0023/expected.json b/test/fixtures/esprima/es2015-class/migrated_0023/expected.json index f639d9d497..10c2f74536 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0023/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0023/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -90,7 +91,8 @@ "body": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-class/migrated_0024/expected.json b/test/fixtures/esprima/es2015-class/migrated_0024/expected.json index 79fb874e63..a7903dab31 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0024/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0024/expected.json @@ -94,7 +94,8 @@ "body": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-class/migrated_0025/expected.json b/test/fixtures/esprima/es2015-class/migrated_0025/expected.json index 0e93246761..fd18daa3e9 100644 --- a/test/fixtures/esprima/es2015-class/migrated_0025/expected.json +++ b/test/fixtures/esprima/es2015-class/migrated_0025/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -109,7 +110,8 @@ "body": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0000/expected.json b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0000/expected.json index 62a790d784..e1465d0c7d 100644 --- a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0001/expected.json b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0001/expected.json index b6a422f551..a0c1096c6f 100644 --- a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0001/expected.json +++ b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0001/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json index 71590f27e6..9d6157c40e 100644 --- a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -138,6 +140,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -165,7 +168,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/dup-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/dup-assignment/expected.json index 21bd961454..0821544b30 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/dup-assignment/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/dup-assignment/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -131,7 +133,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/member-expr-in-rest/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/member-expr-in-rest/expected.json index bdac56e368..759556e093 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/member-expr-in-rest/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/member-expr-in-rest/expected.json @@ -112,7 +112,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-assignment/expected.json index c7ff8b5b5c..226440f306 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-assignment/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-assignment/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -180,7 +182,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -224,7 +227,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json index 8420dbe0e7..fc37f6abce 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json @@ -116,7 +116,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -146,7 +147,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -162,10 +164,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "b" }, "name": "b" } + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/simple-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/simple-assignment/expected.json index a27719de05..7da592c59d 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/simple-assignment/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/simple-assignment/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "a" }, "name": "a" } diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/empty-object-pattern-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/empty-object-pattern-assignment/expected.json index 96aef38f6b..fc3579f72d 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/empty-object-pattern-assignment/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/empty-object-pattern-assignment/expected.json @@ -94,7 +94,8 @@ "value": 0 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json index 4bc7411940..327467fdf6 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json @@ -401,7 +401,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -431,7 +432,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -461,7 +463,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -487,6 +490,9 @@ }, "computed": true } + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json index 8e0054a6b2..7bd635bfb1 100644 --- a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json +++ b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json @@ -101,7 +101,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -151,7 +156,8 @@ "end": { "line": 3, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -167,7 +173,8 @@ "end": { "line": 3, "column": 7 - } + }, + "identifierName": "a" }, "name": "a" } @@ -201,7 +208,8 @@ "end": { "line": 4, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -231,7 +239,8 @@ "end": { "line": 4, "column": 7 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -247,7 +256,8 @@ "end": { "line": 4, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" } @@ -282,7 +292,8 @@ "end": { "line": 5, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -330,7 +341,8 @@ "end": { "line": 5, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -346,9 +358,13 @@ "end": { "line": 5, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] @@ -383,7 +399,8 @@ "end": { "line": 6, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -427,7 +444,8 @@ "end": { "line": 6, "column": 15 - } + }, + "identifierName": "some_call" }, "name": "some_call" }, @@ -445,7 +463,8 @@ "end": { "line": 6, "column": 19 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -481,7 +500,8 @@ "end": { "line": 7, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -526,7 +546,8 @@ "end": { "line": 7, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -556,7 +577,8 @@ "value": 0 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-const-number/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-const-number/expected.json index 388b1fb864..db5aee3169 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-const-number/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-const-number/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" }, diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-array/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-array/expected.json index 50cc489ebb..b811865d67 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-array/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-array/expected.json @@ -59,6 +59,7 @@ "elements": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-expression/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-expression/expected.json index abeb127a32..faff2790a2 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-expression/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-expression/expected.json @@ -98,7 +98,8 @@ "value": 2 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 15 } } } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-function/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-function/expected.json index 364e85431c..3c9a9fc01d 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-function/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-function/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-named-function/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-named-function/expected.json index 904f0ed8d9..73c18e7a0a 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-named-function/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-named-function/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -89,10 +91,12 @@ "column": 32 } }, - "body": [] + "body": [], + "directives": [] } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json index dc93997faf..f9028639b0 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "foo" }, "name": "foo" }, diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-value/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-value/expected.json index 7425436e1f..67d273649e 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-default-value/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-default-value/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-default/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-default/expected.json index 0a6a723e7b..4ff2253518 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-default/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-default/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "default" }, "name": "default" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "default" }, "name": "default" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-default/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-default/expected.json index 466e385f0b..f5e6ca5f81 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-default/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-default/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "default" }, "name": "default" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifier/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifier/expected.json index 7ae9c17b81..e7ef95b227 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifier/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifier/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifiers/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifiers/expected.json index 65c0fa29ea..a9e74dbdaa 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-named-as-specifiers/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "default" }, "name": "default" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-specifier/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-specifier/expected.json index 396665ef21..afc8737489 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-specifier/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-specifier/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-from-specifiers/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-from-specifiers/expected.json index 09fc23f85e..565c75960d 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-from-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-from-specifiers/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-export-declaration/export-function-declaration/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-function-declaration/expected.json index d9b4d3f5a5..a83b57f9d5 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-function-declaration/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-function-declaration/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-export-declaration/export-function/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-function/expected.json index 88b3e7b5b3..8a4161daa4 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-function/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-function/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -91,10 +93,12 @@ "column": 25 } }, - "body": [] + "body": [], + "directives": [] } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-let-number/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-let-number/expected.json index a70b2d4788..b263cee065 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-let-number/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-let-number/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/expected.json index 9c84a45187..31cb80c31f 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "default" }, "name": "default" } @@ -94,6 +96,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/expected.json index 0b4b274d42..1ed1c02a52 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -94,6 +96,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/expected.json index 35d224c0d9..d23e39b3e5 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "default" }, "name": "default" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -141,6 +145,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-empty/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-empty/expected.json index 7c7d2cfb8b..393a47ca6e 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-empty/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-empty/expected.json @@ -46,6 +46,7 @@ "specifiers": [], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/expected.json index 923c934a26..b2d26747cb 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -94,6 +96,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/expected.json index 0694002dce..7344150952 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -141,6 +145,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/expected.json index 745d2e9d0b..96213b5828 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/expected.json @@ -70,7 +70,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -141,6 +145,7 @@ ], "source": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-var-anonymous-function/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-var-anonymous-function/expected.json index 130b99c96e..22cb4bf78a 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-var-anonymous-function/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-var-anonymous-function/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -106,6 +107,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -121,7 +123,8 @@ "column": 31 } }, - "body": [] + "body": [], + "directives": [] } } } @@ -129,6 +132,7 @@ "kind": "var" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-export-declaration/export-var-number/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-var-number/expected.json index 7290654ceb..ce76b426cc 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-var-number/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-var-number/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, diff --git a/test/fixtures/esprima/es2015-export-declaration/export-var/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-var/expected.json index 22ba6ec97b..2ef2274598 100644 --- a/test/fixtures/esprima/es2015-export-declaration/export-var/expected.json +++ b/test/fixtures/esprima/es2015-export-declaration/export-var/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -95,6 +96,7 @@ "kind": "var" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of-array-pattern-let/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-array-pattern-let/expected.json index f81b113841..22a362cc56 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-array-pattern-let/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-array-pattern-let/expected.json @@ -42,6 +42,7 @@ "column": 22 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "p" }, "name": "p" }, @@ -114,7 +116,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "q" }, "name": "q" } @@ -137,7 +140,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "r" }, "name": "r" }, @@ -157,6 +161,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of-array-pattern/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-array-pattern/expected.json index c174207c6b..f3e791fa62 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-array-pattern/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-array-pattern/expected.json @@ -42,6 +42,7 @@ "column": 18 } }, + "await": false, "left": { "type": "ArrayPattern", "start": 5, @@ -69,7 +70,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "p" }, "name": "p" }, @@ -85,7 +87,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "q" }, "name": "q" } @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "r" }, "name": "r" }, @@ -123,6 +127,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json index bf3b9e73b7..2f0291d7fa 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json @@ -42,6 +42,7 @@ "column": 24 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -131,9 +133,13 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } }, { @@ -165,7 +171,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -181,9 +188,13 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "shorthand": true } } ] @@ -205,7 +216,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json index 025d0acd2b..a9ec1dc8a2 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json @@ -42,6 +42,7 @@ "column": 18 } }, + "await": false, "left": { "type": "ObjectPattern", "start": 5, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -102,9 +104,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } }, { @@ -136,7 +142,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -152,9 +159,13 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "shorthand": true } } ] @@ -171,7 +182,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/esprima/es2015-for-of/for-of-with-const/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-with-const/expected.json index 7608d6e366..7633fb27cc 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-with-const/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-with-const/expected.json @@ -42,6 +42,7 @@ "column": 22 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -124,6 +127,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of-with-let/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-with-let/expected.json index f48045b006..640ebe2cbf 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-with-let/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-with-let/expected.json @@ -42,6 +42,7 @@ "column": 20 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -124,6 +127,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of-with-var/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-with-var/expected.json index 75eaef11cf..0333623699 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of-with-var/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of-with-var/expected.json @@ -42,6 +42,7 @@ "column": 20 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -124,6 +127,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/for-of/expected.json b/test/fixtures/esprima/es2015-for-of/for-of/expected.json index 32de26d7ac..f068e87b71 100644 --- a/test/fixtures/esprima/es2015-for-of/for-of/expected.json +++ b/test/fixtures/esprima/es2015-for-of/for-of/expected.json @@ -42,6 +42,7 @@ "column": 13 } }, + "await": false, "left": { "type": "Identifier", "start": 5, @@ -54,7 +55,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "p" }, "name": "p" }, @@ -70,7 +72,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "q" }, "name": "q" }, @@ -90,6 +93,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-for-of/let-of-of/expected.json b/test/fixtures/esprima/es2015-for-of/let-of-of/expected.json index 1af67a2a58..08ac0ccfbd 100644 --- a/test/fixtures/esprima/es2015-for-of/let-of-of/expected.json +++ b/test/fixtures/esprima/es2015-for-of/let-of-of/expected.json @@ -42,6 +42,7 @@ "column": 20 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "of" }, "name": "of" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "xyz" }, "name": "xyz" }, @@ -124,6 +127,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-generator/.generator-parameter-binding-property-reserved/expected.json b/test/fixtures/esprima/es2015-generator/.generator-parameter-binding-property-reserved/expected.json deleted file mode 100644 index 4b57db559b..0000000000 --- a/test/fixtures/esprima/es2015-generator/.generator-parameter-binding-property-reserved/expected.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "expression": { - "type": "FunctionExpression", - "start": 1, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": null, - "generator": true, - "expression": false, - "params": [ - { - "type": "ObjectPattern", - "start": 11, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "properties": [ - { - "type": "Property", - "start": 12, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "method": false, - "shorthand": true, - "computed": false, - "key": { - "type": "Identifier", - "start": 12, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "name": "yield" - }, - "kind": "init", - "value": { - "type": "Identifier", - "start": 12, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "name": "yield" - } - } - ] - } - ], - "body": { - "type": "BlockStatement", - "start": 20, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 20 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "body": [] - }, - "parenthesizedExpression": true - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-generator/generator-declaration-with-params/expected.json b/test/fixtures/esprima/es2015-generator/generator-declaration-with-params/expected.json index 94810ff25f..2423e57fcf 100644 --- a/test/fixtures/esprima/es2015-generator/generator-declaration-with-params/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-declaration-with-params/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -105,7 +109,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "z" }, "name": "z" } @@ -124,9 +129,11 @@ "column": 25 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield-delegate/expected.json b/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield-delegate/expected.json index 12653936f3..58db0aae3b 100644 --- a/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield-delegate/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield-delegate/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield/expected.json b/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield/expected.json index ca953c366a..be45b3da43 100644 --- a/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-declaration-with-yield/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-generator/generator-declaration/expected.json b/test/fixtures/esprima/es2015-generator/generator-declaration/expected.json index a222c7d25a..1218c2a65b 100644 --- a/test/fixtures/esprima/es2015-generator/generator-declaration/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-declaration/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 18 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-generator/generator-expression-rest-param/expected.json b/test/fixtures/esprima/es2015-generator/generator-expression-rest-param/expected.json index edd55ba2ea..db8af8e978 100644 --- a/test/fixtures/esprima/es2015-generator/generator-expression-rest-param/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-expression-rest-param/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" } @@ -110,7 +112,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-expression-with-params/expected.json b/test/fixtures/esprima/es2015-generator/generator-expression-with-params/expected.json index dcddd48350..f7443b2b26 100644 --- a/test/fixtures/esprima/es2015-generator/generator-expression-with-params/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-expression-with-params/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -104,7 +107,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "z" }, "name": "z" } @@ -127,7 +131,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-expression-with-yield-delegate/expected.json b/test/fixtures/esprima/es2015-generator/generator-expression-with-yield-delegate/expected.json index 15d56c524b..68ae729a2b 100644 --- a/test/fixtures/esprima/es2015-generator/generator-expression-with-yield-delegate/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-expression-with-yield-delegate/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -104,7 +107,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "z" }, "name": "z" } @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "x" }, "name": "x" } @@ -175,7 +180,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-expression-with-yield/expected.json b/test/fixtures/esprima/es2015-generator/generator-expression-with-yield/expected.json index 8a6fe27484..7ae471dd07 100644 --- a/test/fixtures/esprima/es2015-generator/generator-expression-with-yield/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-expression-with-yield/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -130,7 +131,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-expression/expected.json b/test/fixtures/esprima/es2015-generator/generator-expression/expected.json index 9cb0b17ba1..c5418c003a 100644 --- a/test/fixtures/esprima/es2015-generator/generator-expression/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-expression/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -78,7 +79,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json index ef567c630d..74705225ac 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -107,7 +109,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -123,7 +126,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -139,7 +143,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "z" }, "name": "z" } @@ -164,7 +169,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json index 419afbd644..e002528905 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -167,7 +169,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json index e9df81eaa9..bbadbbe669 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -167,7 +169,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json index 2b1db06974..d700b2546d 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -183,7 +185,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json index 9bd0e0fc9b..addc5c802c 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -148,7 +150,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/generator-method/expected.json b/test/fixtures/esprima/es2015-generator/generator-method/expected.json index 1edf3cf6b7..9b2aa0b7c9 100644 --- a/test/fixtures/esprima/es2015-generator/generator-method/expected.json +++ b/test/fixtures/esprima/es2015-generator/generator-method/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +117,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-generator/static-generator-method-with-computed-name/expected.json b/test/fixtures/esprima/es2015-generator/static-generator-method-with-computed-name/expected.json index 39c163121b..d6bde8049a 100644 --- a/test/fixtures/esprima/es2015-generator/static-generator-method-with-computed-name/expected.json +++ b/test/fixtures/esprima/es2015-generator/static-generator-method-with-computed-name/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,8 @@ "column": 30 } }, + "static": true, + "kind": "method", "computed": true, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, - "kind": "method", "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-generator/static-generator-method/expected.json b/test/fixtures/esprima/es2015-generator/static-generator-method/expected.json index 655985c272..14762b81ab 100644 --- a/test/fixtures/esprima/es2015-generator/static-generator-method/expected.json +++ b/test/fixtures/esprima/es2015-generator/static-generator-method/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,8 @@ "column": 28 } }, + "static": true, + "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -101,15 +104,15 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, - "kind": "method", "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-identifier/.invalid_function_wait/expected.json b/test/fixtures/esprima/es2015-identifier/.invalid_function_wait/expected.json deleted file mode 100644 index e1bd544880..0000000000 --- a/test/fixtures/esprima/es2015-identifier/.invalid_function_wait/expected.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 9, - "end": 14, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 14 - } - }, - "name": "await" - }, - "generator": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 17, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "body": [] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/expected.json b/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/expected.json deleted file mode 100644 index 8a8057346c..0000000000 --- a/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "value": "�!", - "rawValue": "�!", - "raw": "'\\uD800!'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/dakuten_handakuten/expected.json b/test/fixtures/esprima/es2015-identifier/dakuten_handakuten/expected.json index 777d6344e3..f7072bac2a 100644 --- a/test/fixtures/esprima/es2015-identifier/dakuten_handakuten/expected.json +++ b/test/fixtures/esprima/es2015-identifier/dakuten_handakuten/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "゛" }, "name": "゛" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "゜" }, "name": "゜" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_all/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_all/expected.json index e71aacfe96..396895acb2 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_all/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_all/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "ABC" }, "name": "ABC" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_math_alef/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_math_alef/expected.json index 720e46270b..3f41b58b16 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_math_alef/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_math_alef/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "𞸀" }, "name": "𞸀" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_math_dal_part/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_math_dal_part/expected.json index aac895c761..07a2586b54 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_math_dal_part/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_math_dal_part/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "_𞸃" }, "name": "_𞸃" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_math_kaf_lam/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_math_kaf_lam/expected.json index aeab4c908f..026501e396 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_math_kaf_lam/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_math_kaf_lam/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "𞸊𞸋" }, "name": "𞸊𞸋" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_math_zain_start/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_math_zain_start/expected.json index f3f71d5dd7..358d88dfa9 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_math_zain_start/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_math_zain_start/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "𞸆_$" }, "name": "𞸆_$" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_part/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_part/expected.json index 538f851879..9e722d28de 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_part/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_part/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "ABC" }, "name": "ABC" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/escaped_start/expected.json b/test/fixtures/esprima/es2015-identifier/escaped_start/expected.json index 538f851879..9e722d28de 100644 --- a/test/fixtures/esprima/es2015-identifier/escaped_start/expected.json +++ b/test/fixtures/esprima/es2015-identifier/escaped_start/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "ABC" }, "name": "ABC" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/estimated/expected.json b/test/fixtures/esprima/es2015-identifier/estimated/expected.json index 52b66afb75..52be45f00f 100644 --- a/test/fixtures/esprima/es2015-identifier/estimated/expected.json +++ b/test/fixtures/esprima/es2015-identifier/estimated/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "℮" }, "name": "℮" }, @@ -78,6 +79,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/ethiopic_digits/expected.json b/test/fixtures/esprima/es2015-identifier/ethiopic_digits/expected.json index 3c1f5449e8..9e5692748e 100644 --- a/test/fixtures/esprima/es2015-identifier/ethiopic_digits/expected.json +++ b/test/fixtures/esprima/es2015-identifier/ethiopic_digits/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "_፩፪፫፬፭፮፯፰፱" }, "name": "_፩፪፫፬፭፮፯፰፱" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/math_alef/expected.json b/test/fixtures/esprima/es2015-identifier/math_alef/expected.json index 95e4a8ea91..5f832197cf 100644 --- a/test/fixtures/esprima/es2015-identifier/math_alef/expected.json +++ b/test/fixtures/esprima/es2015-identifier/math_alef/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "𞸀" }, "name": "𞸀" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/math_dal_part/expected.json b/test/fixtures/esprima/es2015-identifier/math_dal_part/expected.json index 177536551c..4b704fd162 100644 --- a/test/fixtures/esprima/es2015-identifier/math_dal_part/expected.json +++ b/test/fixtures/esprima/es2015-identifier/math_dal_part/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "_𞸃" }, "name": "_𞸃" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/math_kaf_lam/expected.json b/test/fixtures/esprima/es2015-identifier/math_kaf_lam/expected.json index d3db5f5c03..0cebe40a6d 100644 --- a/test/fixtures/esprima/es2015-identifier/math_kaf_lam/expected.json +++ b/test/fixtures/esprima/es2015-identifier/math_kaf_lam/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "𞸊𞸋" }, "name": "𞸊𞸋" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/math_zain_start/expected.json b/test/fixtures/esprima/es2015-identifier/math_zain_start/expected.json index 5124087f99..50094cc9b8 100644 --- a/test/fixtures/esprima/es2015-identifier/math_zain_start/expected.json +++ b/test/fixtures/esprima/es2015-identifier/math_zain_start/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "𞸆_$" }, "name": "𞸆_$" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/module_await/expected.json b/test/fixtures/esprima/es2015-identifier/module_await/expected.json index 33d6f24353..bd12000aa5 100644 --- a/test/fixtures/esprima/es2015-identifier/module_await/expected.json +++ b/test/fixtures/esprima/es2015-identifier/module_await/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "await" }, "name": "await" }, diff --git a/test/fixtures/esprima/es2015-identifier/valid_await/expected.json b/test/fixtures/esprima/es2015-identifier/valid_await/expected.json index 26afe27079..096230269c 100644 --- a/test/fixtures/esprima/es2015-identifier/valid_await/expected.json +++ b/test/fixtures/esprima/es2015-identifier/valid_await/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "await" }, "name": "await" }, @@ -104,11 +105,13 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "await" }, "name": "await", "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 11 } } } diff --git a/test/fixtures/esprima/es2015-identifier/weierstrass/expected.json b/test/fixtures/esprima/es2015-identifier/weierstrass/expected.json index 0fb54a0f5f..574f473102 100644 --- a/test/fixtures/esprima/es2015-identifier/weierstrass/expected.json +++ b/test/fixtures/esprima/es2015-identifier/weierstrass/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "℘" }, "name": "℘" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-identifier/weierstrass_weierstrass/expected.json b/test/fixtures/esprima/es2015-identifier/weierstrass_weierstrass/expected.json index b6bb7d481d..73debf7d79 100644 --- a/test/fixtures/esprima/es2015-identifier/weierstrass_weierstrass/expected.json +++ b/test/fixtures/esprima/es2015-identifier/weierstrass_weierstrass/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "℘℘" }, "name": "℘℘" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-import-declaration/import-default-and-named-specifiers/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-default-and-named-specifiers/expected.json index 918d5dc76f..c66526e4bd 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-default-and-named-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-default-and-named-specifiers/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-default-and-namespace-specifiers/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-default-and-namespace-specifiers/expected.json index 1481257a6e..2fba15cd78 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-default-and-namespace-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-default-and-namespace-specifiers/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-default-as/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-default-as/expected.json index 90e760b5d0..5e065a6338 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-default-as/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-default-as/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "default" }, "name": "default" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-default/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-default/expected.json index 68eab4b614..f7c22db61e 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-default/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-default/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-jquery/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-jquery/expected.json index d1465085b3..cf96958292 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-jquery/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-jquery/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "$" }, "name": "$" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifier/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifier/expected.json index 158d42da07..da89ac26b6 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifier/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifier/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "baz" }, "name": "baz" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifiers/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifiers/expected.json index a3c950ab9c..ca548c6d5c 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-named-as-specifiers/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "baz" }, "name": "baz" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "xyz" }, "name": "xyz" }, @@ -132,7 +135,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "xyz" }, "name": "xyz" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-named-specifier/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-named-specifier/expected.json index d328366be5..26095a68b1 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-named-specifier/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-named-specifier/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers-comma/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers-comma/expected.json index fa924672aa..95522ee106 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers-comma/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers-comma/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "baz" }, "name": "baz" }, @@ -132,7 +135,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "baz" }, "name": "baz" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers/expected.json index 4cffe066fd..b4885c5259 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-named-specifiers/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "baz" }, "name": "baz" }, @@ -132,7 +135,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "baz" }, "name": "baz" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-namespace-specifier/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-namespace-specifier/expected.json index cdb990cbdc..9cbe3e0b32 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-namespace-specifier/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-namespace-specifier/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-import-declaration/import-null-as-nil/expected.json b/test/fixtures/esprima/es2015-import-declaration/import-null-as-nil/expected.json index 378e45b83b..518aaeb40a 100644 --- a/test/fixtures/esprima/es2015-import-declaration/import-null-as-nil/expected.json +++ b/test/fixtures/esprima/es2015-import-declaration/import-null-as-nil/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "null" }, "name": "null" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "nil" }, "name": "nil" } diff --git a/test/fixtures/esprima/es2015-lexical-declaration/migrated_0000/expected.json b/test/fixtures/esprima/es2015-lexical-declaration/migrated_0000/expected.json index 929eaa9eab..5841ab30aa 100644 --- a/test/fixtures/esprima/es2015-lexical-declaration/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-lexical-declaration/migrated_0000/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "t" }, "name": "t" }, diff --git a/test/fixtures/esprima/es2015-meta-property/.invalid-new-target/expected.json b/test/fixtures/esprima/es2015-meta-property/.invalid-new-target/expected.json deleted file mode 100644 index c2ab0aba1b..0000000000 --- a/test/fixtures/esprima/es2015-meta-property/.invalid-new-target/expected.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "name": "x" - }, - "init": { - "type": "MetaProperty", - "start": 8, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "meta": { - "type": "Identifier", - "start": 8, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "new" - }, - "property": { - "type": "Identifier", - "start": 12, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "target" - } - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/assign-new-target/expected.json b/test/fixtures/esprima/es2015-meta-property/assign-new-target/expected.json index e909c85c33..98424401bd 100644 --- a/test/fixtures/esprima/es2015-meta-property/assign-new-target/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/assign-new-target/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,7 +119,8 @@ "end": { "line": 2, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -147,7 +150,8 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -163,7 +167,8 @@ "end": { "line": 2, "column": 22 - } + }, + "identifierName": "target" }, "name": "target" } @@ -172,9 +177,11 @@ ], "kind": "let" } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/new-new-target/expected.json b/test/fixtures/esprima/es2015-meta-property/new-new-target/expected.json index 545d3f05a9..be413af467 100644 --- a/test/fixtures/esprima/es2015-meta-property/new-new-target/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/new-new-target/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -130,7 +132,8 @@ "end": { "line": 2, "column": 11 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -146,7 +149,8 @@ "end": { "line": 2, "column": 18 - } + }, + "identifierName": "target" }, "name": "target" } @@ -154,9 +158,11 @@ "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/new-target-declaration/expected.json b/test/fixtures/esprima/es2015-meta-property/new-target-declaration/expected.json index 154850a47c..1bac964983 100644 --- a/test/fixtures/esprima/es2015-meta-property/new-target-declaration/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/new-target-declaration/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +118,8 @@ "end": { "line": 2, "column": 7 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -132,15 +135,18 @@ "end": { "line": 2, "column": 14 - } + }, + "identifierName": "target" }, "name": "target" } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/new-target-expression/expected.json b/test/fixtures/esprima/es2015-meta-property/new-target-expression/expected.json index fdf1e48cdb..08af3f07a0 100644 --- a/test/fixtures/esprima/es2015-meta-property/new-target-expression/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/new-target-expression/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -146,7 +148,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -162,19 +165,22 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "target" }, "name": "target" } } } - ] + ], + "directives": [] } } } ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/new-target-invoke/expected.json b/test/fixtures/esprima/es2015-meta-property/new-target-invoke/expected.json index 4480d5f16b..78ccbda879 100644 --- a/test/fixtures/esprima/es2015-meta-property/new-target-invoke/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/new-target-invoke/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -130,7 +132,8 @@ "end": { "line": 2, "column": 7 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -146,7 +149,8 @@ "end": { "line": 2, "column": 14 - } + }, + "identifierName": "target" }, "name": "target" } @@ -154,9 +158,11 @@ "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-meta-property/new-target-precedence/expected.json b/test/fixtures/esprima/es2015-meta-property/new-target-precedence/expected.json index 3a85fec1a1..bc3f8206fa 100644 --- a/test/fixtures/esprima/es2015-meta-property/new-target-precedence/expected.json +++ b/test/fixtures/esprima/es2015-meta-property/new-target-precedence/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -144,7 +146,8 @@ "end": { "line": 2, "column": 11 - } + }, + "identifierName": "new" }, "name": "new" }, @@ -160,7 +163,8 @@ "end": { "line": 2, "column": 18 - } + }, + "identifierName": "target" }, "name": "target" } @@ -170,9 +174,11 @@ "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json index 880dce74c2..ce0016fdc3 100644 --- a/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json index 7d5dce4954..403f65e101 100644 --- a/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json +++ b/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "test" }, "name": "test" } diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json index 1030bf0af2..cc11812169 100644 --- a/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -129,6 +130,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json index 0b0d3f1c10..a8769bfc25 100644 --- a/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json +++ b/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "get" }, "name": "get" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json index b118b76443..98450690a7 100644 --- a/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json +++ b/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "set" }, "name": "set" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json index 41fa69789a..194bb1af4a 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -143,6 +145,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 52 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -199,6 +203,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -212,7 +217,8 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "x" }, "name": "x" } @@ -237,7 +243,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json index 73ee6c7acf..0cce78e2c4 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -143,6 +145,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -164,7 +167,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json index 8213ba1bb4..afab4b37f8 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -143,6 +145,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -164,7 +167,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json index 3e06b6b52c..920dce0155 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -135,7 +136,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -143,6 +145,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -156,7 +159,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "x" }, "name": "x" } @@ -181,7 +185,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json index a1524c4a1f..82b235c2bb 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json @@ -139,7 +139,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -147,6 +148,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -195,7 +197,8 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -203,6 +206,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -216,7 +220,8 @@ "end": { "line": 1, "column": 56 - } + }, + "identifierName": "x" }, "name": "x" } @@ -241,7 +246,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json index 5fe032f20e..d5af9e236d 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json @@ -139,7 +139,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -147,6 +148,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -168,7 +170,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json index 2a6d87e4c9..b77f23777c 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json @@ -139,7 +139,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -147,6 +148,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -168,7 +170,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json index d0c7453baa..7efe87207c 100644 --- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json +++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json @@ -139,7 +139,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" }, @@ -147,6 +148,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -160,7 +162,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "x" }, "name": "x" } @@ -185,7 +188,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json b/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json index 660265dd75..17d1d997d4 100644 --- a/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -133,9 +135,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" + }, + "extra": { + "shorthand": true } }, { @@ -167,7 +173,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" }, @@ -183,9 +190,13 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-object-pattern/elision/expected.json b/test/fixtures/esprima/es2015-object-pattern/elision/expected.json index 5aa022ac3f..567e7248c2 100644 --- a/test/fixtures/esprima/es2015-object-pattern/elision/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/elision/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/expected.json b/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/expected.json index 360729bf4f..33414a4e30 100644 --- a/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -102,12 +103,14 @@ "column": 21 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-object-pattern/empty-fn/expected.json b/test/fixtures/esprima/es2015-object-pattern/empty-fn/expected.json index fc8aa6cdb9..62f2520c8c 100644 --- a/test/fixtures/esprima/es2015-object-pattern/empty-fn/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/empty-fn/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -92,9 +94,11 @@ "column": 17 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-object-pattern/empty-for-lex/expected.json b/test/fixtures/esprima/es2015-object-pattern/empty-for-lex/expected.json index 85430cc73f..69927b7511 100644 --- a/test/fixtures/esprima/es2015-object-pattern/empty-for-lex/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/empty-for-lex/expected.json @@ -42,6 +42,7 @@ "column": 18 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, diff --git a/test/fixtures/esprima/es2015-object-pattern/nested/expected.json b/test/fixtures/esprima/es2015-object-pattern/nested/expected.json index 2b66d83815..e4bc4272b8 100644 --- a/test/fixtures/esprima/es2015-object-pattern/nested/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/nested/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, diff --git a/test/fixtures/esprima/es2015-object-pattern/properties/expected.json b/test/fixtures/esprima/es2015-object-pattern/properties/expected.json index 45e9261374..4fff32b6b5 100644 --- a/test/fixtures/esprima/es2015-object-pattern/properties/expected.json +++ b/test/fixtures/esprima/es2015-object-pattern/properties/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } }, { @@ -151,7 +156,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -181,7 +187,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -205,6 +212,9 @@ }, "value": 0 } + }, + "extra": { + "shorthand": true } }, { @@ -236,7 +246,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -252,7 +263,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "d" }, "name": "d" } @@ -286,7 +298,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -316,7 +329,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -371,7 +385,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "g" }, "name": "g" }, @@ -402,7 +417,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "h" }, "name": "h" } diff --git a/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0002/expected.json b/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0002/expected.json index f95c3acfdb..8a3dd5608b 100644 --- a/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0002/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0006/expected.json b/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0006/expected.json index 8fe8a8579a..95b01a403f 100644 --- a/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0006/expected.json +++ b/test/fixtures/esprima/es2015-octal-integer-literal/migrated_0006/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "test" }, "name": "test" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-rest-parameter/function-declaration/expected.json b/test/fixtures/esprima/es2015-rest-parameter/function-declaration/expected.json index 4a17d865f7..07716be5ae 100644 --- a/test/fixtures/esprima/es2015-rest-parameter/function-declaration/expected.json +++ b/test/fixtures/esprima/es2015-rest-parameter/function-declaration/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "b" }, "name": "b" } @@ -123,9 +127,11 @@ "column": 22 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-rest-parameter/function-expression/expected.json b/test/fixtures/esprima/es2015-rest-parameter/function-expression/expected.json index d524d90df1..8c72a24d81 100644 --- a/test/fixtures/esprima/es2015-rest-parameter/function-expression/expected.json +++ b/test/fixtures/esprima/es2015-rest-parameter/function-expression/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "b" }, "name": "b" } @@ -153,11 +157,13 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json b/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json index b5c022b8a6..44a231cab5 100644 --- a/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json +++ b/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "o" }, "name": "o" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -138,6 +140,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -151,7 +154,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -181,7 +185,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "b" }, "name": "b" } diff --git a/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json b/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json index 18295991cb..2d6b8d4961 100644 --- a/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json +++ b/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -152,7 +155,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "test" }, "name": "test" } diff --git a/test/fixtures/esprima/es2015-spread-element/call-multi-spread/expected.json b/test/fixtures/esprima/es2015-spread-element/call-multi-spread/expected.json index 2610b26d4f..da5f595f34 100644 --- a/test/fixtures/esprima/es2015-spread-element/call-multi-spread/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/call-multi-spread/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" } @@ -161,7 +164,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "z" }, "name": "z" } @@ -169,6 +173,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/call-spread-default/expected.json b/test/fixtures/esprima/es2015-spread-element/call-spread-default/expected.json index dbf33a3d90..acb386ac7c 100644 --- a/test/fixtures/esprima/es2015-spread-element/call-spread-default/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/call-spread-default/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "g" }, "name": "g" }, @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "h" }, "name": "h" }, @@ -146,7 +149,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "i" }, "name": "i" } @@ -155,6 +159,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/call-spread-first/expected.json b/test/fixtures/esprima/es2015-spread-element/call-spread-first/expected.json index 4200d9b278..3f66a557a0 100644 --- a/test/fixtures/esprima/es2015-spread-element/call-spread-first/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/call-spread-first/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -132,13 +135,15 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "z" }, "name": "z" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/call-spread-number/expected.json b/test/fixtures/esprima/es2015-spread-element/call-spread-number/expected.json index bd72b46cfa..3d2342021a 100644 --- a/test/fixtures/esprima/es2015-spread-element/call-spread-number/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/call-spread-number/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, diff --git a/test/fixtures/esprima/es2015-spread-element/call-spread/expected.json b/test/fixtures/esprima/es2015-spread-element/call-spread/expected.json index f85b3967a4..c1106662f9 100644 --- a/test/fixtures/esprima/es2015-spread-element/call-spread/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/call-spread/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "g" }, "name": "g" } @@ -107,6 +109,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/new-multi-spread/expected.json b/test/fixtures/esprima/es2015-spread-element/new-multi-spread/expected.json index 8a3987d6e0..2289f83586 100644 --- a/test/fixtures/esprima/es2015-spread-element/new-multi-spread/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/new-multi-spread/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" } @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" } @@ -161,7 +164,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "z" }, "name": "z" } @@ -169,6 +173,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/new-spread-default/expected.json b/test/fixtures/esprima/es2015-spread-element/new-spread-default/expected.json index 79688da6aa..2281e8e385 100644 --- a/test/fixtures/esprima/es2015-spread-element/new-spread-default/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/new-spread-default/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "g" }, "name": "g" }, @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "h" }, "name": "h" }, @@ -146,7 +149,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "i" }, "name": "i" } @@ -155,6 +159,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/new-spread-first/expected.json b/test/fixtures/esprima/es2015-spread-element/new-spread-first/expected.json index 7075fa833c..c015f67ef3 100644 --- a/test/fixtures/esprima/es2015-spread-element/new-spread-first/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/new-spread-first/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" } @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -132,13 +135,15 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "z" }, "name": "z" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-spread-element/new-spread-number/expected.json b/test/fixtures/esprima/es2015-spread-element/new-spread-number/expected.json index 0b6b85b9b7..1fe99acde7 100644 --- a/test/fixtures/esprima/es2015-spread-element/new-spread-number/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/new-spread-number/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, diff --git a/test/fixtures/esprima/es2015-spread-element/new-spread/expected.json b/test/fixtures/esprima/es2015-spread-element/new-spread/expected.json index a5a4974201..72ba2c94f2 100644 --- a/test/fixtures/esprima/es2015-spread-element/new-spread/expected.json +++ b/test/fixtures/esprima/es2015-spread-element/new-spread/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "g" }, "name": "g" } @@ -107,6 +109,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-super-property/.invalid_super_id/expected.json b/test/fixtures/esprima/es2015-super-property/.invalid_super_id/expected.json deleted file mode 100644 index 051ec3a5b8..0000000000 --- a/test/fixtures/esprima/es2015-super-property/.invalid_super_id/expected.json +++ /dev/null @@ -1,232 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 39, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 39, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ClassDeclaration", - "start": 0, - "end": 39, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "id": { - "type": "Identifier", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - } - }, - "name": "A" - }, - "superClass": null, - "body": { - "type": "ClassBody", - "start": 8, - "end": 39, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "body": [ - { - "type": "ClassMethod", - "start": 14, - "end": 37, - "loc": { - "start": { - "line": 2, - "column": 4 - }, - "end": { - "line": 2, - "column": 27 - } - }, - "computed": false, - "key": { - "type": "Identifier", - "start": 14, - "end": 17, - "loc": { - "start": { - "line": 2, - "column": 4 - }, - "end": { - "line": 2, - "column": 7 - } - }, - "name": "foo" - }, - "static": false, - "kind": "method", - "value": { - "type": "FunctionExpression", - "start": 17, - "end": 37, - "loc": { - "start": { - "line": 2, - "column": 7 - }, - "end": { - "line": 2, - "column": 27 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 20, - "end": 37, - "loc": { - "start": { - "line": 2, - "column": 10 - }, - "end": { - "line": 2, - "column": 27 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 22, - "end": 35, - "loc": { - "start": { - "line": 2, - "column": 12 - }, - "end": { - "line": 2, - "column": 25 - } - }, - "expression": { - "type": "BinaryExpression", - "start": 22, - "end": 35, - "loc": { - "start": { - "line": 2, - "column": 12 - }, - "end": { - "line": 2, - "column": 25 - } - }, - "left": { - "type": "NewExpression", - "start": 22, - "end": 31, - "loc": { - "start": { - "line": 2, - "column": 12 - }, - "end": { - "line": 2, - "column": 21 - } - }, - "callee": { - "type": "Super", - "start": 26, - "end": 31, - "loc": { - "start": { - "line": 2, - "column": 16 - }, - "end": { - "line": 2, - "column": 21 - } - } - }, - "arguments": [] - }, - "operator": "+", - "right": { - "type": "Literal", - "start": 34, - "end": 35, - "loc": { - "start": { - "line": 2, - "column": 24 - }, - "end": { - "line": 2, - "column": 25 - } - }, - "value": 3, - "rawValue": 3, - "raw": "3" - } - } - } - ] - } - } - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-super-property/arrow_super/expected.json b/test/fixtures/esprima/es2015-super-property/arrow_super/expected.json index 76dcbec057..6f97b22f32 100644 --- a/test/fixtures/esprima/es2015-super-property/arrow_super/expected.json +++ b/test/fixtures/esprima/es2015-super-property/arrow_super/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -172,6 +176,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [], "body": { "type": "CallExpression", diff --git a/test/fixtures/esprima/es2015-super-property/constructor_super/expected.json b/test/fixtures/esprima/es2015-super-property/constructor_super/expected.json index aad408ba61..1e275d8625 100644 --- a/test/fixtures/esprima/es2015-super-property/constructor_super/expected.json +++ b/test/fixtures/esprima/es2015-super-property/constructor_super/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 2, "column": 15 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-super-property/new_super/expected.json b/test/fixtures/esprima/es2015-super-property/new_super/expected.json index 4bf3b459c2..270481875a 100644 --- a/test/fixtures/esprima/es2015-super-property/new_super/expected.json +++ b/test/fixtures/esprima/es2015-super-property/new_super/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 2, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -210,7 +214,8 @@ "end": { "line": 3, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/esprima/es2015-super-property/super_computed/expected.json b/test/fixtures/esprima/es2015-super-property/super_computed/expected.json index 5e81ff357e..0fc729cbe9 100644 --- a/test/fixtures/esprima/es2015-super-property/super_computed/expected.json +++ b/test/fixtures/esprima/es2015-super-property/super_computed/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "X" }, "name": "X" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/esprima/es2015-super-property/super_member/expected.json b/test/fixtures/esprima/es2015-super-property/super_member/expected.json index 9b939e582b..7b48047fec 100644 --- a/test/fixtures/esprima/es2015-super-property/super_member/expected.json +++ b/test/fixtures/esprima/es2015-super-property/super_member/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "X" }, "name": "X" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -196,7 +200,8 @@ "end": { "line": 3, "column": 22 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/esprima/es2015-template-literals/.octal-literal/expected.json b/test/fixtures/esprima/es2015-template-literals/.octal-literal/expected.json deleted file mode 100644 index 9ebd9cc590..0000000000 --- a/test/fixtures/esprima/es2015-template-literals/.octal-literal/expected.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 6, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 6 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 6, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 6 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 6, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 6 - } - }, - "expression": { - "type": "TemplateLiteral", - "start": 0, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "expressions": [], - "quasis": [ - { - "type": "TemplateElement", - "start": 1, - "end": 4, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 4 - } - }, - "value": { - "raw": "\\00", - "cooked": "\u0000" - }, - "tail": true - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/.strict-octal-literal/expected.json b/test/fixtures/esprima/es2015-template-literals/.strict-octal-literal/expected.json deleted file mode 100644 index 7ffc243c53..0000000000 --- a/test/fixtures/esprima/es2015-template-literals/.strict-octal-literal/expected.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "expression": { - "type": "Literal", - "start": 0, - "end": 12, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 12 - } - }, - "value": "use strict", - "rawValue": "use strict", - "raw": "'use strict'" - } - }, - { - "type": "ExpressionStatement", - "start": 14, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "expression": { - "type": "TemplateLiteral", - "start": 14, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "expressions": [], - "quasis": [ - { - "type": "TemplateElement", - "start": 15, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "value": { - "raw": "\\00", - "cooked": "\u0000" - }, - "tail": true - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/dollar-sign/expected.json b/test/fixtures/esprima/es2015-template-literals/dollar-sign/expected.json index 094ec18811..8b41104a7b 100644 --- a/test/fixtures/esprima/es2015-template-literals/dollar-sign/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/dollar-sign/expected.json @@ -81,6 +81,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/escape-sequences/expected.json b/test/fixtures/esprima/es2015-template-literals/escape-sequences/expected.json index 3afaacea6e..3653254bf5 100644 --- a/test/fixtures/esprima/es2015-template-literals/escape-sequences/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/escape-sequences/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-template-literals/line-terminators/expected.json b/test/fixtures/esprima/es2015-template-literals/line-terminators/expected.json index 836d521625..11aeefbebd 100644 --- a/test/fixtures/esprima/es2015-template-literals/line-terminators/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/line-terminators/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/expected.json b/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/expected.json index 1a1ed2bb2a..46f2eb813d 100644 --- a/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-template-literals/new-expression/expected.json b/test/fixtures/esprima/es2015-template-literals/new-expression/expected.json index 08da84c059..76377676ec 100644 --- a/test/fixtures/esprima/es2015-template-literals/new-expression/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/new-expression/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -128,6 +129,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/tagged-interpolation/expected.json b/test/fixtures/esprima/es2015-template-literals/tagged-interpolation/expected.json index 1308a48aaa..9b083f0902 100644 --- a/test/fixtures/esprima/es2015-template-literals/tagged-interpolation/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/tagged-interpolation/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "name" }, "name": "name" } @@ -149,6 +151,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/tagged-nested-with-object-literal/expected.json b/test/fixtures/esprima/es2015-template-literals/tagged-nested-with-object-literal/expected.json index dd145facf5..38d9108763 100644 --- a/test/fixtures/esprima/es2015-template-literals/tagged-nested-with-object-literal/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/tagged-nested-with-object-literal/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -262,6 +263,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/tagged/expected.json b/test/fixtures/esprima/es2015-template-literals/tagged/expected.json index 3eabcd73c8..6b4305de3b 100644 --- a/test/fixtures/esprima/es2015-template-literals/tagged/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/tagged/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "raw" }, "name": "raw" }, @@ -112,6 +113,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-template-literals/untagged/expected.json b/test/fixtures/esprima/es2015-template-literals/untagged/expected.json index f0f8b0bf3c..ad16fe02ef 100644 --- a/test/fixtures/esprima/es2015-template-literals/untagged/expected.json +++ b/test/fixtures/esprima/es2015-template-literals/untagged/expected.json @@ -81,6 +81,7 @@ ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/expected.json b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/expected.json index c6f9f2ce0e..8dd034ae3c 100644 --- a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/expected.json +++ b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/expected.json b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/expected.json index 5c97440415..8f6e279539 100644 --- a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/expected.json +++ b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/expected.json b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/expected.json index 05e4851182..b61b0b1bdc 100644 --- a/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/expected.json +++ b/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-arrow-default/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-arrow-default/expected.json deleted file mode 100644 index dd6a552b65..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-arrow-default/expected.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 38, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 38 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 38, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 38 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 38, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 38 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "g" - }, - "generator": true, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 14, - "end": 38, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 38 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 16, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "expression": { - "type": "ArrowFunctionExpression", - "start": 16, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "AssignmentPattern", - "start": 17, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "left": { - "type": "Identifier", - "start": 17, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "x" - }, - "right": { - "type": "YieldExpression", - "start": 21, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "delegate": false, - "argument": { - "type": "Literal", - "start": 27, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 27 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "value": 42, - "rawValue": 42, - "raw": "42" - } - } - } - ], - "body": { - "type": "BlockStatement", - "start": 34, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 34 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "body": [] - } - } - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-name/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-name/expected.json deleted file mode 100644 index 608a26d547..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-name/expected.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "expression": { - "type": "FunctionExpression", - "start": 1, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "name": "yield" - }, - "generator": true, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 17, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "body": [] - }, - "parenthesizedExpression": true - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-parameter/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-parameter/expected.json deleted file mode 100644 index df826e036e..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-parameter/expected.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 21 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 21 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 21 - } - }, - "expression": { - "type": "FunctionExpression", - "start": 1, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "id": null, - "generator": true, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "name": "yield" - } - ], - "body": { - "type": "BlockStatement", - "start": 18, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 18 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "body": [] - }, - "parenthesizedExpression": true - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-rest/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-rest/expected.json deleted file mode 100644 index e99f09b954..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-expression-rest/expected.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "expression": { - "type": "FunctionExpression", - "start": 1, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "id": null, - "generator": true, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "name": "x" - }, - { - "type": "RestElement", - "start": 15, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "argument": { - "type": "Identifier", - "start": 18, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 18 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "name": "yield" - } - } - ], - "body": { - "type": "BlockStatement", - "start": 24, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 24 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "body": [] - }, - "parenthesizedExpression": true - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-parameter/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-parameter/expected.json deleted file mode 100644 index a5588e4e19..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-parameter/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "g" - }, - "generator": true, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 17, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 17 - } - }, - "name": "yield" - } - ], - "body": { - "type": "BlockStatement", - "start": 18, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 18 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "body": [] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-rest/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-rest/expected.json deleted file mode 100644 index eb042938fb..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-generator-rest/expected.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "g" - }, - "generator": true, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "name": "a" - }, - { - "type": "Identifier", - "start": 15, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 16 - } - }, - "name": "b" - }, - { - "type": "Identifier", - "start": 18, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 18 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "name": "c" - }, - { - "type": "RestElement", - "start": 21, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "argument": { - "type": "Identifier", - "start": 24, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 24 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "name": "yield" - } - } - ], - "body": { - "type": "BlockStatement", - "start": 30, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 30 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "body": [] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-array-pattern/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-array-pattern/expected.json deleted file mode 100644 index 9f91e65aeb..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-array-pattern/expected.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 14, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "expression": { - "type": "AssignmentExpression", - "start": 15, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "operator": "=", - "left": { - "type": "ArrayPattern", - "start": 15, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "elements": [ - { - "type": "Identifier", - "start": 16, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 21 - } - }, - "name": "yield" - } - ] - }, - "right": { - "type": "Identifier", - "start": 25, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 25 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "name": "x" - }, - "extra": { - "parenthesized": true - } - } - } - ], - "directives": [ - { - "type": "Directive", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "value": { - "type": "DirectiveLiteral", - "start": 0, - "end": 12, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 12 - } - }, - "raw": "\"use strict\"", - "value": "use strict" - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-default/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-default/expected.json deleted file mode 100644 index cab8ff9322..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-default/expected.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "expression": { - "type": "Literal", - "start": 0, - "end": 12, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 12 - } - }, - "value": "use strict", - "rawValue": "use strict", - "raw": "\"use strict\"" - } - }, - { - "type": "ExpressionStatement", - "start": 14, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "expression": { - "type": "ArrowFunctionExpression", - "start": 14, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "AssignmentPattern", - "start": 15, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "left": { - "type": "Identifier", - "start": 15, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 16 - } - }, - "name": "x" - }, - "right": { - "type": "Identifier", - "start": 19, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 19 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "name": "yield" - } - } - ], - "body": { - "type": "BlockStatement", - "start": 29, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 29 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "body": [] - } - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-name/expected.json b/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-name/expected.json deleted file mode 100644 index ce0cbfa1fb..0000000000 --- a/test/fixtures/esprima/es2015-yield/.invalid-yield-strict-arrow-parameter-name/expected.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 14, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "expression": { - "type": "ArrowFunctionExpression", - "start": 14, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "Identifier", - "start": 15, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "name": "yield" - } - ], - "body": { - "type": "NumericLiteral", - "start": 25, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 25 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "value": 42, - "rawValue": 42, - "raw": "42" - } - } - } - ], - "directives": [ - { - "type": "Directive", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "value": { - "type": "DirectiveLiteral", - "start": 0, - "end": 12, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 12 - } - }, - "raw": "\"use strict\"", - "value": "use strict" - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.yield-generator-arrow-concise-body/expected.json b/test/fixtures/esprima/es2015-yield/.yield-generator-arrow-concise-body/expected.json deleted file mode 100644 index 4887c0fc44..0000000000 --- a/test/fixtures/esprima/es2015-yield/.yield-generator-arrow-concise-body/expected.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "g" - }, - "generator": true, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 14, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 16, - "end": 33, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 33 - } - }, - "expression": { - "type": "ArrowFunctionExpression", - "start": 16, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "Identifier", - "start": 17, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "x" - } - ], - "body": { - "type": "BinaryExpression", - "start": 23, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 23 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "left": { - "type": "Identifier", - "start": 23, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 23 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "name": "x" - }, - "operator": "*", - "right": { - "type": "Identifier", - "start": 27, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 27 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "name": "yield" - } - } - } - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/.yield-generator-function-parameter/expected.json b/test/fixtures/esprima/es2015-yield/.yield-generator-function-parameter/expected.json deleted file mode 100644 index e8b2f8224a..0000000000 --- a/test/fixtures/esprima/es2015-yield/.yield-generator-function-parameter/expected.json +++ /dev/null @@ -1,185 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 44, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 44 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 44, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 44 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 44, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 44 - } - }, - "id": { - "type": "Identifier", - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - }, - "name": "g" - }, - "generator": true, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 14, - "end": 44, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 44 - } - }, - "body": [ - { - "type": "VariableDeclaration", - "start": 16, - "end": 42, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 42 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 20, - "end": 42, - "loc": { - "start": { - "line": 1, - "column": 20 - }, - "end": { - "line": 1, - "column": 42 - } - }, - "id": { - "type": "Identifier", - "start": 20, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 20 - }, - "end": { - "line": 1, - "column": 21 - } - }, - "name": "z" - }, - "init": { - "type": "FunctionExpression", - "start": 24, - "end": 42, - "loc": { - "start": { - "line": 1, - "column": 24 - }, - "end": { - "line": 1, - "column": 42 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 33, - "end": 38, - "loc": { - "start": { - "line": 1, - "column": 33 - }, - "end": { - "line": 1, - "column": 38 - } - }, - "name": "yield" - } - ], - "body": { - "type": "BlockStatement", - "start": 40, - "end": 42, - "loc": { - "start": { - "line": 1, - "column": 40 - }, - "end": { - "line": 1, - "column": 42 - } - }, - "body": [] - } - } - } - ], - "kind": "var" - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-array-pattern/expected.json b/test/fixtures/esprima/es2015-yield/yield-array-pattern/expected.json index 7a4fbd86f6..965e2ec8ef 100644 --- a/test/fixtures/esprima/es2015-yield/yield-array-pattern/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-array-pattern/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -102,12 +103,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-arrow-concise-body/expected.json b/test/fixtures/esprima/es2015-yield/yield-arrow-concise-body/expected.json index 81505c98aa..979a5b2d8f 100644 --- a/test/fixtures/esprima/es2015-yield/yield-arrow-concise-body/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-arrow-concise-body/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" } @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,13 +123,15 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "yield" }, "name": "yield" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-arrow-function-body/expected.json b/test/fixtures/esprima/es2015-yield/yield-arrow-function-body/expected.json index 524a90fb9e..f21f16b122 100644 --- a/test/fixtures/esprima/es2015-yield/yield-arrow-function-body/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-arrow-function-body/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "z" }, "name": "z" } @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -149,16 +152,19 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-default/expected.json b/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-default/expected.json index 2058074918..4e9be7eb6c 100644 --- a/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-default/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-default/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -122,10 +125,12 @@ "column": 17 } }, - "body": [] + "body": [], + "directives": [] } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-name/expected.json b/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-name/expected.json index ac4ee8bf0c..482f30d4af 100644 --- a/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-name/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-arrow-parameter-name/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "yield" }, "name": "yield" } diff --git a/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json b/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json index 09eb1bcbb8..3cf2edca58 100644 --- a/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -136,7 +138,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json index 7b85a9fef5..0799aa00f4 100644 --- a/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x" } @@ -136,7 +138,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-yield/yield-call-expression-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-call-expression-property/expected.json index 2e11c61b3c..96faaad623 100644 --- a/test/fixtures/esprima/es2015-yield/yield-call-expression-property/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-call-expression-property/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -146,7 +149,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -155,9 +159,11 @@ "arguments": [] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-catch-parameter/expected.json b/test/fixtures/esprima/es2015-yield/yield-catch-parameter/expected.json index 3cba41671f..1aaf0aa249 100644 --- a/test/fixtures/esprima/es2015-yield/yield-catch-parameter/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-catch-parameter/expected.json @@ -56,7 +56,8 @@ "column": 6 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -102,12 +104,14 @@ "column": 23 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-expression-precedence/expected.json b/test/fixtures/esprima/es2015-yield/yield-expression-precedence/expected.json index 8a39ff485d..0af9249a29 100644 --- a/test/fixtures/esprima/es2015-yield/yield-expression-precedence/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-expression-precedence/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -147,7 +149,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -163,7 +166,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "b" }, "name": "b" } @@ -211,7 +215,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -227,7 +232,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "d" }, "name": "d" } @@ -245,16 +251,19 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-function-declaration-formal-parameter/expected.json b/test/fixtures/esprima/es2015-yield/yield-function-declaration-formal-parameter/expected.json index f16d4b50a4..1bcf0b31b8 100644 --- a/test/fixtures/esprima/es2015-yield/yield-function-declaration-formal-parameter/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-function-declaration-formal-parameter/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -92,9 +95,11 @@ "column": 20 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-function-declaration/expected.json b/test/fixtures/esprima/es2015-yield/yield-function-declaration/expected.json index 18ef7bd43a..7a94e29140 100644 --- a/test/fixtures/esprima/es2015-yield/yield-function-declaration/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-function-declaration/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "yield" }, "name": "yield" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 18 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-function-expression-parameter/expected.json b/test/fixtures/esprima/es2015-yield/yield-function-expression-parameter/expected.json index 72a06d9cce..792d4b5170 100644 --- a/test/fixtures/esprima/es2015-yield/yield-function-expression-parameter/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-function-expression-parameter/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -72,7 +73,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -95,7 +97,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-function-expression/expected.json b/test/fixtures/esprima/es2015-yield/yield-function-expression/expected.json index a2138f73ef..69b03706fd 100644 --- a/test/fixtures/esprima/es2015-yield/yield-function-expression/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-function-expression/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "yield" }, "name": "yield" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -93,7 +95,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/expected.json index f9c4899032..92d1ed64ad 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -107,6 +109,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -134,7 +137,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -171,13 +175,16 @@ "column": 33 } }, - "body": [] + "body": [], + "directives": [] } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-arrow-function-body/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-arrow-function-body/expected.json index 8ee47195d3..5e171cab8f 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-arrow-function-body/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-arrow-function-body/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -107,6 +109,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -120,7 +123,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "z" }, "name": "z" } @@ -180,7 +184,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -197,19 +202,23 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-declaration/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-declaration/expected.json index 76d7225d05..b8920d91bb 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-declaration/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-declaration/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "yield" }, "name": "yield" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -75,9 +77,11 @@ "column": 19 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-default-parameter/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-default-parameter/expected.json index 272c0b0c3d..d9dc1ed5e4 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-default-parameter/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-default-parameter/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [ { "type": "AssignmentPattern", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -103,7 +106,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -123,9 +127,11 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json index 660094298e..9625fd5709 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -94,6 +95,7 @@ "id": null, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +117,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json index b212d5a14f..ac7d7b8b51 100644 --- a/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -105,7 +107,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -121,7 +124,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/es2015-yield/yield-lexical-declaration/expected.json b/test/fixtures/esprima/es2015-yield/yield-lexical-declaration/expected.json index ecbe7ba7c5..6de43b2eb8 100644 --- a/test/fixtures/esprima/es2015-yield/yield-lexical-declaration/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-lexical-declaration/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "yield" }, "name": "yield" }, diff --git a/test/fixtures/esprima/es2015-yield/yield-member-expression-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-member-expression-property/expected.json index 091dac5d5d..fe001abdb5 100644 --- a/test/fixtures/esprima/es2015-yield/yield-member-expression-property/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-member-expression-property/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -131,7 +133,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -147,7 +150,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -155,9 +159,11 @@ } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-method/expected.json index 73a6d2827d..b10ddb8590 100644 --- a/test/fixtures/esprima/es2015-yield/yield-method/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-method/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +117,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json b/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json index f0dc7b4f27..b5c586eeee 100644 --- a/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -105,7 +107,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -121,7 +124,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/es2015-yield/yield-rest-parameter/expected.json b/test/fixtures/esprima/es2015-yield/yield-rest-parameter/expected.json index bfd5f8f9d2..90d608359f 100644 --- a/test/fixtures/esprima/es2015-yield/yield-rest-parameter/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-rest-parameter/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "yield" }, "name": "yield" } @@ -107,9 +110,11 @@ "column": 23 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json index 687e8f341a..d88ed08060 100644 --- a/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "x" }, "name": "x" } @@ -136,7 +138,8 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json index e71a000bbe..bf006185f0 100644 --- a/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -94,6 +95,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +117,8 @@ } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 14 } } } diff --git a/test/fixtures/esprima/es2015-yield/yield-super-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-super-property/expected.json index ef8158ed4e..0801ae0ade 100644 --- a/test/fixtures/esprima/es2015-yield/yield-super-property/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-super-property/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -103,6 +105,7 @@ "column": 39 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -116,15 +119,16 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "X" }, "name": "X" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -196,7 +200,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "yield" }, "name": "yield" }, diff --git a/test/fixtures/esprima/es2015-yield/yield-variable-declaration/expected.json b/test/fixtures/esprima/es2015-yield/yield-variable-declaration/expected.json index 2c21f2ba38..48b5015bb8 100644 --- a/test/fixtures/esprima/es2015-yield/yield-variable-declaration/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-variable-declaration/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "yield" }, "name": "yield" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-yield-expression-delegate/expected.json b/test/fixtures/esprima/es2015-yield/yield-yield-expression-delegate/expected.json index be7cde28c8..d0d73e72ff 100644 --- a/test/fixtures/esprima/es2015-yield/yield-yield-expression-delegate/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-yield-expression-delegate/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -124,9 +126,11 @@ } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/es2015-yield/yield-yield-expression/expected.json b/test/fixtures/esprima/es2015-yield/yield-yield-expression/expected.json index 299cd23813..d5adbff2e1 100644 --- a/test/fixtures/esprima/es2015-yield/yield-yield-expression/expected.json +++ b/test/fixtures/esprima/es2015-yield/yield-yield-expression/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "g" }, "name": "g" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -124,9 +126,11 @@ } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-additive/migrated_0000/expected.json b/test/fixtures/esprima/expression-additive/migrated_0000/expected.json index 951a2c8573..4f4281d12b 100644 --- a/test/fixtures/esprima/expression-additive/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-additive/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-additive/migrated_0001/expected.json b/test/fixtures/esprima/expression-additive/migrated_0001/expected.json index 4be8cd12bf..e715c38ccb 100644 --- a/test/fixtures/esprima/expression-additive/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-additive/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-assignment/migrated_0000/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0000/expected.json index 712d4fd6c1..0f7d218b48 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0001/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0001/expected.json index 01bf6f0d71..08e10f09be 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0002/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0002/expected.json index 691796ca2f..588a74e579 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0003/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0003/expected.json index 4a01dfd629..3a99ca3eb6 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0003/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0004/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0004/expected.json index 1382a9b238..ec473b3207 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0004/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0005/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0005/expected.json index e2a6524e00..812fb07cc1 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0005/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0006/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0006/expected.json index 3fb8e6a109..4d6b358971 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0006/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0006/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0007/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0007/expected.json index 8b681331b0..26b624a7d4 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0007/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0007/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0008/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0008/expected.json index 827b99dbe0..441330c54c 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0008/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0008/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0009/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0009/expected.json index d27aeea8cc..1d99f52655 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0009/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0009/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0010/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0010/expected.json index ea2c4e00ff..10665e9e41 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0010/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0010/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0011/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0011/expected.json index 12db3bd78f..ffab2697d0 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0011/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0011/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0012/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0012/expected.json index 2b34e74553..a4a9088d93 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0012/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0012/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-assignment/migrated_0013/expected.json b/test/fixtures/esprima/expression-assignment/migrated_0013/expected.json index ef886d2c97..173d746401 100644 --- a/test/fixtures/esprima/expression-assignment/migrated_0013/expected.json +++ b/test/fixtures/esprima/expression-assignment/migrated_0013/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/expected.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/expected.json index a21f7900f7..a479164a06 100644 --- a/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/expected.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/expected.json index 9ff129d06b..e22094073c 100644 --- a/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/expected.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/expected.json index 2c6c6a71aa..7cd159ef07 100644 --- a/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0000/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0000/expected.json index 43821da431..3dbff25ba9 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0001/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0001/expected.json index 7b3dce0fdb..b4327fea4a 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0002/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0002/expected.json index 313205c734..3e277f2fb0 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0002/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0003/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0003/expected.json index 076e9826f5..759ef90eeb 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0003/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0004/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0004/expected.json index 39a92de27e..51c2a9cc9c 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0004/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0005/expected.json b/test/fixtures/esprima/expression-binary-logical/migrated_0005/expected.json index 27399a9c53..663534b1b4 100644 --- a/test/fixtures/esprima/expression-binary-logical/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-binary-logical/migrated_0005/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0000/expected.json b/test/fixtures/esprima/expression-binary/migrated_0000/expected.json index 102f5d3d69..8d5866efa2 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0000/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0001/expected.json b/test/fixtures/esprima/expression-binary/migrated_0001/expected.json index de56597e6a..bcc48922f6 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0001/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0002/expected.json b/test/fixtures/esprima/expression-binary/migrated_0002/expected.json index edc0351968..d4924593c3 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0002/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0003/expected.json b/test/fixtures/esprima/expression-binary/migrated_0003/expected.json index 74e0ab65b8..3b53c28f8f 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0003/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0004/expected.json b/test/fixtures/esprima/expression-binary/migrated_0004/expected.json index 510073e483..3eab6d0286 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0004/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0005/expected.json b/test/fixtures/esprima/expression-binary/migrated_0005/expected.json index 5e5fca2313..e929279a89 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0005/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0006/expected.json b/test/fixtures/esprima/expression-binary/migrated_0006/expected.json index dc0ac6b9bf..e0124c982f 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0006/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0006/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0007/expected.json b/test/fixtures/esprima/expression-binary/migrated_0007/expected.json index 4beef8dd3d..d891a4741e 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0007/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0007/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0008/expected.json b/test/fixtures/esprima/expression-binary/migrated_0008/expected.json index 9d743b0d39..07dfb3ff15 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0008/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0008/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0009/expected.json b/test/fixtures/esprima/expression-binary/migrated_0009/expected.json index 3e5a22a223..a251fd60d7 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0009/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0009/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0010/expected.json b/test/fixtures/esprima/expression-binary/migrated_0010/expected.json index 2174559e10..63a295482e 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0010/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0010/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0011/expected.json b/test/fixtures/esprima/expression-binary/migrated_0011/expected.json index 92c65557e6..8384ff1b91 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0011/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0011/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0012/expected.json b/test/fixtures/esprima/expression-binary/migrated_0012/expected.json index 188c481bfc..11335ea1d3 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0012/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0012/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0013/expected.json b/test/fixtures/esprima/expression-binary/migrated_0013/expected.json index 3c6c2f0817..1cfab365e3 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0013/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0013/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0014/expected.json b/test/fixtures/esprima/expression-binary/migrated_0014/expected.json index 48e47e4198..e819fc3506 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0014/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0014/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0015/expected.json b/test/fixtures/esprima/expression-binary/migrated_0015/expected.json index 0fa66acc0b..f14d54ace0 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0015/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0015/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0016/expected.json b/test/fixtures/esprima/expression-binary/migrated_0016/expected.json index c8df10d3d8..481b96d976 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0016/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0016/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-binary/migrated_0017/expected.json b/test/fixtures/esprima/expression-binary/migrated_0017/expected.json index c66d330503..ff26c296d7 100644 --- a/test/fixtures/esprima/expression-binary/migrated_0017/expected.json +++ b/test/fixtures/esprima/expression-binary/migrated_0017/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/expected.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/expected.json index 7da984159e..1d480a3e1a 100644 --- a/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/expected.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/expected.json index 51b1fefd9e..80210cee23 100644 --- a/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/expected.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/expected.json index c61c63d02d..5edfbca9c7 100644 --- a/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-complex/migrated_0000/expected.json b/test/fixtures/esprima/expression-complex/migrated_0000/expected.json index 2158045bd1..d6a6a6320e 100644 --- a/test/fixtures/esprima/expression-complex/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-complex/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "c" }, "name": "c" }, @@ -161,7 +164,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "d" }, "name": "d" }, @@ -192,7 +196,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -223,7 +228,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -254,7 +260,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "g" }, "name": "g" }, @@ -285,7 +292,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "h" }, "name": "h" }, @@ -316,7 +324,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "i" }, "name": "i" }, @@ -347,7 +356,8 @@ "end": { "line": 1, "column": 42 - } + }, + "identifierName": "j" }, "name": "j" }, @@ -364,7 +374,8 @@ "end": { "line": 1, "column": 46 - } + }, + "identifierName": "k" }, "name": "k" } @@ -379,6 +390,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-conditional/migrated_0000/expected.json b/test/fixtures/esprima/expression-conditional/migrated_0000/expected.json index 11b669b4ea..ca2df57148 100644 --- a/test/fixtures/esprima/expression-conditional/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-conditional/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/esprima/expression-conditional/migrated_0001/expected.json b/test/fixtures/esprima/expression-conditional/migrated_0001/expected.json index 32682fb46d..7ec28110ed 100644 --- a/test/fixtures/esprima/expression-conditional/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-conditional/migrated_0001/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/expression-conditional/migrated_0002/expected.json b/test/fixtures/esprima/expression-conditional/migrated_0002/expected.json index 0cbf738808..efb8e82279 100644 --- a/test/fixtures/esprima/expression-conditional/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-conditional/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +105,8 @@ "extra": { "rawValue": 0, "raw": "0", - "parenthesized": true + "parenthesized": true, + "parenStart": 4 }, "value": 0 }, diff --git a/test/fixtures/esprima/expression-equality/migrated_0000/expected.json b/test/fixtures/esprima/expression-equality/migrated_0000/expected.json index c1e5bf26af..582e04e0dc 100644 --- a/test/fixtures/esprima/expression-equality/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-equality/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-equality/migrated_0001/expected.json b/test/fixtures/esprima/expression-equality/migrated_0001/expected.json index 8eb45e6a10..507ec12519 100644 --- a/test/fixtures/esprima/expression-equality/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-equality/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-equality/migrated_0002/expected.json b/test/fixtures/esprima/expression-equality/migrated_0002/expected.json index 2610f3986a..aada50d79c 100644 --- a/test/fixtures/esprima/expression-equality/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-equality/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-equality/migrated_0003/expected.json b/test/fixtures/esprima/expression-equality/migrated_0003/expected.json index ab3b9424ab..a22ceaea6a 100644 --- a/test/fixtures/esprima/expression-equality/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-equality/migrated_0003/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-grouping/migrated_0000/expected.json b/test/fixtures/esprima/expression-grouping/migrated_0000/expected.json index 6971eb4e8a..12f91e395e 100644 --- a/test/fixtures/esprima/expression-grouping/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-grouping/migrated_0000/expected.json @@ -87,7 +87,8 @@ "extra": { "rawValue": 1, "raw": "1", - "parenthesized": true + "parenthesized": true, + "parenStart": 0 }, "value": 1 }, @@ -109,7 +110,8 @@ "extra": { "rawValue": 2, "raw": "2", - "parenthesized": true + "parenthesized": true, + "parenStart": 6 }, "value": 2 } diff --git a/test/fixtures/esprima/expression-grouping/migrated_0001/expected.json b/test/fixtures/esprima/expression-grouping/migrated_0001/expected.json index 8e7823f478..b38c445344 100644 --- a/test/fixtures/esprima/expression-grouping/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-grouping/migrated_0001/expected.json @@ -130,7 +130,8 @@ "extra": { "rawValue": 6, "raw": "6", - "parenthesized": true + "parenthesized": true, + "parenStart": 9 }, "value": 6 } diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0000/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0000/expected.json index 08c175955a..8a400eec78 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0000/expected.json @@ -68,13 +68,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Button" }, "name": "Button" }, "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0001/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0001/expected.json index 782d5ea7e4..05c9a2e459 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0001/expected.json @@ -68,13 +68,15 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Button" }, "name": "Button" }, "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0002/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0002/expected.json index 376081c391..42758a1f4e 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0002/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -91,6 +92,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0003/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0003/expected.json index 5c476aa6cf..99a0eebd01 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0003/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -91,6 +92,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0004/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0004/expected.json index 1b87993df9..b7777dc84a 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0004/expected.json @@ -96,7 +96,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -123,6 +125,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0005/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0005/expected.json index 952d418f50..ee47879eca 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0005/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -107,6 +109,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0006/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0006/expected.json index 7ace856b56..dc595a854e 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0006/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0006/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -107,6 +109,7 @@ "arguments": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0007/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0007/expected.json index 5e0c9c3c30..36a8e9983d 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0007/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0007/expected.json @@ -96,13 +96,15 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "foo" }, "name": "foo" }, "arguments": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "property": { @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0008/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0008/expected.json index c20918ced6..14abd247cf 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0008/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0008/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -101,13 +103,15 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "baz" }, "name": "baz" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0009/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0009/expected.json index 2a92530d73..55989c03bf 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0009/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0009/expected.json @@ -68,11 +68,13 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "foo" }, "name": "foo", "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "arguments": [] diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0010/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0010/expected.json index 937e364bb2..85def70954 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0010/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0010/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0011/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0011/expected.json index 9b9c988c91..9b29fb40a0 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0011/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0011/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, @@ -116,13 +118,15 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "solarsystem" }, "name": "solarsystem" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0012/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0012/expected.json index e160672e6a..3a03cde9b1 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0012/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0012/expected.json @@ -96,7 +96,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -112,7 +113,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, @@ -130,7 +132,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "solarsystem" }, "name": "solarsystem" }, @@ -148,13 +151,15 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "Earth" }, "name": "Earth" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0013/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0013/expected.json index 269aad8658..fcc39e4ecc 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0013/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0013/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "galaxyName" }, "name": "galaxyName" }, @@ -115,7 +117,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "otherUselessName" }, "name": "otherUselessName" } @@ -124,6 +127,7 @@ "computed": true } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0014/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0014/expected.json index fd2ad08336..6a6c95e194 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0014/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0014/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "galaxyName" }, "name": "galaxyName" }, "computed": true } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0015/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0015/expected.json index ff93859240..7dbf01ef02 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0015/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0015/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0016/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0016/expected.json index a12ebbfc91..a732436290 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0016/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0016/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -121,7 +122,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0017/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0017/expected.json index a8ceaa9228..fa67fb5375 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0017/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0017/expected.json @@ -110,7 +110,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -149,7 +150,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "galaxies" }, "name": "galaxies" }, @@ -230,7 +232,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "milkyway" }, "name": "milkyway" }, diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0018/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0018/expected.json index 0286b0ea65..edbf36b172 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0018/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0018/expected.json @@ -110,7 +110,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "earth" }, "name": "earth" }, @@ -126,7 +127,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "asia" }, "name": "asia" }, @@ -144,7 +146,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "Indonesia" }, "name": "Indonesia" }, @@ -162,7 +165,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "prepareForElection" }, "name": "prepareForElection" }, diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0019/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0019/expected.json index 41129f5624..92b467b8e9 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0019/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0019/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "if" }, "name": "if" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0020/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0020/expected.json index b31bc7542a..43038cf090 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0020/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0020/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "true" }, "name": "true" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0021/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0021/expected.json index 5bc538a2b9..76fd57dc7a 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0021/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0021/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "false" }, "name": "false" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-left-hand-side/migrated_0022/expected.json b/test/fixtures/esprima/expression-left-hand-side/migrated_0022/expected.json index a8f3caddc1..1e0fe82f7b 100644 --- a/test/fixtures/esprima/expression-left-hand-side/migrated_0022/expected.json +++ b/test/fixtures/esprima/expression-left-hand-side/migrated_0022/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "universe" }, "name": "universe" }, @@ -84,13 +85,15 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "null" }, "name": "null" }, "computed": false } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-multiplicative/migrated_0000/expected.json b/test/fixtures/esprima/expression-multiplicative/migrated_0000/expected.json index 89022ede9f..e4544003c4 100644 --- a/test/fixtures/esprima/expression-multiplicative/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-multiplicative/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-multiplicative/migrated_0001/expected.json b/test/fixtures/esprima/expression-multiplicative/migrated_0001/expected.json index 8a860dd890..328a727dec 100644 --- a/test/fixtures/esprima/expression-multiplicative/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-multiplicative/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-multiplicative/migrated_0002/expected.json b/test/fixtures/esprima/expression-multiplicative/migrated_0002/expected.json index 2887a84d0e..ee2eb7b83f 100644 --- a/test/fixtures/esprima/expression-multiplicative/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-multiplicative/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0000/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0000/expected.json index 0712715b16..6cff980e29 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0000/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0001/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0001/expected.json index c4ea608985..b402ef1d3f 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0001/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0002/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0002/expected.json index b1909f3acc..4436502a54 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0002/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0003/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0003/expected.json index aaebc648e7..28309341ef 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0003/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "eval" }, "name": "eval" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0004/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0004/expected.json index bb07286fc5..397833c9f4 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0004/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-postfix/migrated_0005/expected.json b/test/fixtures/esprima/expression-postfix/migrated_0005/expected.json index 5fdbf545d2..b27829eedc 100644 --- a/test/fixtures/esprima/expression-postfix/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-postfix/migrated_0005/expected.json @@ -70,12 +70,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "arguments" }, "name": "arguments" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-primary/array/expected.json b/test/fixtures/esprima/expression-primary/array/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/esprima/expression-primary/array/expected.json +++ b/test/fixtures/esprima/expression-primary/array/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-primary/literal/expected.json b/test/fixtures/esprima/expression-primary/literal/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/esprima/expression-primary/literal/expected.json +++ b/test/fixtures/esprima/expression-primary/literal/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-primary/object/expected.json b/test/fixtures/esprima/expression-primary/object/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/esprima/expression-primary/object/expected.json +++ b/test/fixtures/esprima/expression-primary/object/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-primary/other/expected.json b/test/fixtures/esprima/expression-primary/other/expected.json index 10130f3578..1df1b8a0fb 100644 --- a/test/fixtures/esprima/expression-primary/other/expected.json +++ b/test/fixtures/esprima/expression-primary/other/expected.json @@ -27,6 +27,7 @@ } }, "sourceType": "script", - "body": [] + "body": [], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0000/expected.json b/test/fixtures/esprima/expression-relational/migrated_0000/expected.json index da2300c3ba..39ed4b1c81 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0000/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0001/expected.json b/test/fixtures/esprima/expression-relational/migrated_0001/expected.json index d036898e8d..edbe85495e 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0002/expected.json b/test/fixtures/esprima/expression-relational/migrated_0002/expected.json index 21272df967..f4fd2421d9 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0003/expected.json b/test/fixtures/esprima/expression-relational/migrated_0003/expected.json index 4eba25fa96..fab9884151 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0003/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0004/expected.json b/test/fixtures/esprima/expression-relational/migrated_0004/expected.json index 179ec5032f..09804a0b7c 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0004/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0005/expected.json b/test/fixtures/esprima/expression-relational/migrated_0005/expected.json index 8edd71168c..992fb876e2 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0005/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-relational/migrated_0006/expected.json b/test/fixtures/esprima/expression-relational/migrated_0006/expected.json index 855baa45d7..39e74f7d29 100644 --- a/test/fixtures/esprima/expression-relational/migrated_0006/expected.json +++ b/test/fixtures/esprima/expression-relational/migrated_0006/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "y" }, "name": "y" } @@ -117,12 +119,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "z" }, "name": "z" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0000/expected.json b/test/fixtures/esprima/expression-unary/migrated_0000/expected.json index b8e60e420d..a072a29131 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0000/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0000/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0001/expected.json b/test/fixtures/esprima/expression-unary/migrated_0001/expected.json index 74d0f506ec..29f62109f3 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0001/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0001/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0002/expected.json b/test/fixtures/esprima/expression-unary/migrated_0002/expected.json index 892974799e..164c7de5e1 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0002/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0002/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "eval" }, "name": "eval" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0003/expected.json b/test/fixtures/esprima/expression-unary/migrated_0003/expected.json index f82908bc2b..e24ebd8ae3 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0003/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0003/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "eval" }, "name": "eval" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0004/expected.json b/test/fixtures/esprima/expression-unary/migrated_0004/expected.json index e190c488dd..f8c24a6e5c 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0004/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0004/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "arguments" }, "name": "arguments" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0005/expected.json b/test/fixtures/esprima/expression-unary/migrated_0005/expected.json index 8451361753..7c9d3dd0a4 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0005/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0005/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "arguments" }, "name": "arguments" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0006/expected.json b/test/fixtures/esprima/expression-unary/migrated_0006/expected.json index 62ee624c4c..8c0aefbb8e 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0006/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0006/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0007/expected.json b/test/fixtures/esprima/expression-unary/migrated_0007/expected.json index 4b614da625..d0695f2e20 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0007/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0007/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0008/expected.json b/test/fixtures/esprima/expression-unary/migrated_0008/expected.json index 326a3d6c51..900b160cf8 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0008/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0008/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0009/expected.json b/test/fixtures/esprima/expression-unary/migrated_0009/expected.json index 5db05c771f..47e35ce89d 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0009/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0009/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 2 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0010/expected.json b/test/fixtures/esprima/expression-unary/migrated_0010/expected.json index 776ed71df2..9c3d31a745 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0010/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0010/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0011/expected.json b/test/fixtures/esprima/expression-unary/migrated_0011/expected.json index f5edc45759..87f98df461 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0011/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0011/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/expression-unary/migrated_0012/expected.json b/test/fixtures/esprima/expression-unary/migrated_0012/expected.json index 137dc642bc..644e2e6689 100644 --- a/test/fixtures/esprima/expression-unary/migrated_0012/expected.json +++ b/test/fixtures/esprima/expression-unary/migrated_0012/expected.json @@ -70,12 +70,17 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "parenthesizedArgument": false } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.GH-1106-09/expected.json b/test/fixtures/esprima/invalid-syntax/.GH-1106-09/expected.json deleted file mode 100644 index 0d183a7bf6..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.GH-1106-09/expected.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ExpressionStatement", - "start": 0, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "expression": { - "type": "Literal", - "start": 0, - "end": 4, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 4 - } - }, - "value": "9", - "rawValue": "9", - "raw": "\"\\9\"" - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0033/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0033/expected.json deleted file mode 100644 index f4fe7d7ce4..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0033/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "value": "x\\u005c", - "rawValue": "x\\u005c", - "raw": "'x\\\\u005c'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0034/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0034/expected.json deleted file mode 100644 index bc71c475ce..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0034/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 24, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 24 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "value": "x\\u002a", - "rawValue": "x\\u002a", - "raw": "'x\\\\u002a'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0035/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0035/expected.json deleted file mode 100644 index 798f613862..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0035/expected.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 5 - } - }, - "name": "x" - }, - "init": { - "type": "Literal", - "start": 8, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 13 - } - }, - "raw": "/(s/g", - "regex": { - "pattern": "(s", - "flags": "g" - } - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0036/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0036/expected.json deleted file mode 100644 index ee388c0ff8..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0036/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "value": "a\\u", - "rawValue": "a\\u", - "raw": "'a\\\\u'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0037/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0037/expected.json deleted file mode 100644 index 1e4947ba6c..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0037/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "value": "\\ua", - "rawValue": "\\ua", - "raw": "'\\\\ua'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0041/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0041/expected.json deleted file mode 100644 index 432370bc2e..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0041/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 35 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 34, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 34 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 34, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 34 - } - }, - "value": "var x = /[a-z]/\\ux", - "rawValue": "var x = /[a-z]/\\ux", - "raw": "'var x = /[a-z]/\\\\ux'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0042/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0042/expected.json deleted file mode 100644 index 88d96a096a..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0042/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "value": "var x = /[a-z\n]/\\ux", - "rawValue": "var x = /[a-z\n]/\\ux", - "raw": "'var x = /[a-z\\n]/\\\\ux'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0043/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0043/expected.json deleted file mode 100644 index 5dccf2df66..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0043/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "value": "var x = /[a-z]/\\\\ux", - "rawValue": "var x = /[a-z]/\\\\ux", - "raw": "'var x = /[a-z]/\\\\\\\\ux'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0044/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0044/expected.json deleted file mode 100644 index 7b451084c4..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0044/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 41, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 41 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 41, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 41 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 41, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 41 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 40, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 40 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 40, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 40 - } - }, - "value": "var x = /[P QR]/\\\\u0067", - "rawValue": "var x = /[P QR]/\\\\u0067", - "raw": "'var x = /[P QR]/\\\\\\\\u0067'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0048/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0048/expected.json deleted file mode 100644 index c74b8f4b9d..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0048/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 29, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 29 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 28, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 28 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 28, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 28 - } - }, - "value": "\"\\u{110000}\"", - "rawValue": "\"\\u{110000}\"", - "raw": "'\"\\\\u{110000}\"'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0049/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0049/expected.json deleted file mode 100644 index 0d8aed2410..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0049/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "value": "\"\\u{}\"", - "rawValue": "\"\\u{}\"", - "raw": "'\"\\\\u{}\"'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0050/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0050/expected.json deleted file mode 100644 index fc597b32c5..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0050/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "value": "\"\\u{FFFF\"", - "rawValue": "\"\\u{FFFF\"", - "raw": "'\"\\\\u{FFFF\"'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0051/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0051/expected.json deleted file mode 100644 index e22bc63888..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0051/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "value": "\"\\u{FFZ}\"", - "rawValue": "\"\\u{FFZ}\"", - "raw": "'\"\\\\u{FFZ}\"'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0137/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0137/expected.json deleted file mode 100644 index c910512d1a..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0137/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "value": "‿ = 10", - "rawValue": "‿ = 10", - "raw": "'\\u203F = 10'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0163/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0163/expected.json deleted file mode 100644 index e3f4ea1270..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0163/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "value": "\\u005c", - "rawValue": "\\u005c", - "raw": "'\\\\u005c'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0165/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0165/expected.json deleted file mode 100644 index 968d4f6a66..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0165/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "value": "\\u0000", - "rawValue": "\\u0000", - "raw": "'\\\\u0000'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0166/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0166/expected.json deleted file mode 100644 index f9b68dd718..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0166/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "value": "‌ = []", - "rawValue": "‌ = []", - "raw": "'\\u200C = []'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0167/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0167/expected.json deleted file mode 100644 index 238759889e..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0167/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 27, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 27 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "value": "‍ = []", - "rawValue": "‍ = []", - "raw": "'\\u200D = []'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0169/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0169/expected.json deleted file mode 100644 index 5dcccc5d34..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0169/expected.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "source" - }, - "init": { - "type": "Literal", - "start": 13, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "value": "\"\\u", - "rawValue": "\"\\u", - "raw": "'\"\\\\u'" - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0277/expected.json b/test/fixtures/esprima/invalid-syntax/.migrated_0277/expected.json deleted file mode 100644 index 374479f48a..0000000000 --- a/test/fixtures/esprima/invalid-syntax/.migrated_0277/expected.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ClassDeclaration", - "start": 0, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "id": { - "type": "Identifier", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - } - }, - "name": "A" - }, - "superClass": null, - "body": { - "type": "ClassBody", - "start": 8, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 8 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "body": [ - { - "type": "ClassMethod", - "start": 9, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "computed": false, - "key": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "a" - }, - "static": false, - "kind": "method", - "value": { - "type": "FunctionExpression", - "start": 10, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 11, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "name": "enum" - } - ], - "body": { - "type": "BlockStatement", - "start": 16, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 16 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "body": [] - } - } - } - ] - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/statement-block/migrated_0000/expected.json b/test/fixtures/esprima/statement-block/migrated_0000/expected.json index 5d5053da91..ca5a5fb0eb 100644 --- a/test/fixtures/esprima/statement-block/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-block/migrated_0000/expected.json @@ -69,13 +69,16 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "foo" }, "name": "foo" } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-block/migrated_0001/expected.json b/test/fixtures/esprima/statement-block/migrated_0001/expected.json index eec6775871..b271f0a04c 100644 --- a/test/fixtures/esprima/statement-block/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-block/migrated_0001/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "doThis" }, "name": "doThis" }, @@ -130,15 +131,18 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-block/migrated_0002/expected.json b/test/fixtures/esprima/statement-block/migrated_0002/expected.json index 5792211240..d209b58703 100644 --- a/test/fixtures/esprima/statement-block/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-block/migrated_0002/expected.json @@ -42,8 +42,10 @@ "column": 2 } }, - "body": [] + "body": [], + "directives": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-break/migrated_0001/expected.json b/test/fixtures/esprima/statement-break/migrated_0001/expected.json index 930203bdfe..b46b8cecc6 100644 --- a/test/fixtures/esprima/statement-break/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-break/migrated_0001/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/esprima/statement-break/migrated_0002/expected.json b/test/fixtures/esprima/statement-break/migrated_0002/expected.json index 207d4cf4c5..75ce4af774 100644 --- a/test/fixtures/esprima/statement-break/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-break/migrated_0002/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/esprima/statement-break/migrated_0003/expected.json b/test/fixtures/esprima/statement-break/migrated_0003/expected.json index 694def79b2..91efaf586f 100644 --- a/test/fixtures/esprima/statement-break/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-break/migrated_0003/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } diff --git a/test/fixtures/esprima/statement-continue/migrated_0002/expected.json b/test/fixtures/esprima/statement-continue/migrated_0002/expected.json index 3d3611769c..7b69d3e398 100644 --- a/test/fixtures/esprima/statement-continue/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-continue/migrated_0002/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/esprima/statement-continue/migrated_0003/expected.json b/test/fixtures/esprima/statement-continue/migrated_0003/expected.json index e2eede95cf..73a3847e0b 100644 --- a/test/fixtures/esprima/statement-continue/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-continue/migrated_0003/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "done" }, "name": "done" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "done" }, "name": "done" } diff --git a/test/fixtures/esprima/statement-continue/migrated_0004/expected.json b/test/fixtures/esprima/statement-continue/migrated_0004/expected.json index 076d4478b5..3c78b5f5bc 100644 --- a/test/fixtures/esprima/statement-continue/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-continue/migrated_0004/expected.json @@ -113,7 +113,8 @@ "end": { "line": 1, "column": 44 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } diff --git a/test/fixtures/esprima/statement-debugger/migrated_0000/expected.json b/test/fixtures/esprima/statement-debugger/migrated_0000/expected.json index bf36100cfe..c70dc07eb5 100644 --- a/test/fixtures/esprima/statement-debugger/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-debugger/migrated_0000/expected.json @@ -43,6 +43,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-empty/migrated_0000/expected.json b/test/fixtures/esprima/statement-empty/migrated_0000/expected.json index d76894f1aa..e48902c158 100644 --- a/test/fixtures/esprima/statement-empty/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-empty/migrated_0000/expected.json @@ -43,6 +43,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-expression/migrated_0000/expected.json b/test/fixtures/esprima/statement-expression/migrated_0000/expected.json index 470ad995ab..7d660bdda7 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0000/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-expression/migrated_0001/expected.json b/test/fixtures/esprima/statement-expression/migrated_0001/expected.json index a1f0e67018..a8a40d3c2b 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,13 +86,15 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "y" }, "name": "y" } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-expression/migrated_0002/expected.json b/test/fixtures/esprima/statement-expression/migrated_0002/expected.json index 03f4a58cb3..96f353ac3f 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/statement-expression/migrated_0003/expected.json b/test/fixtures/esprima/statement-expression/migrated_0003/expected.json index d292e2317d..367ca3f2a4 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0003/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/statement-expression/migrated_0004/expected.json b/test/fixtures/esprima/statement-expression/migrated_0004/expected.json index 58b1ca21f8..598c8c3a94 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0004/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/statement-expression/migrated_0005/expected.json b/test/fixtures/esprima/statement-expression/migrated_0005/expected.json index b9ab7766f2..d368ff1a7f 100644 --- a/test/fixtures/esprima/statement-expression/migrated_0005/expected.json +++ b/test/fixtures/esprima/statement-expression/migrated_0005/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "source" }, "name": "source" }, diff --git a/test/fixtures/esprima/statement-if/migrated_0000/expected.json b/test/fixtures/esprima/statement-if/migrated_0000/expected.json index 61f0887961..18f37a7b65 100644 --- a/test/fixtures/esprima/statement-if/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0000/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "goodMorning" }, "name": "goodMorning" }, @@ -107,6 +109,7 @@ }, "alternate": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-if/migrated_0001/expected.json b/test/fixtures/esprima/statement-if/migrated_0001/expected.json index 640c5691c2..38198e3d25 100644 --- a/test/fixtures/esprima/statement-if/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0001/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -89,6 +90,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -108,7 +110,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 13 } } }, diff --git a/test/fixtures/esprima/statement-if/migrated_0002/expected.json b/test/fixtures/esprima/statement-if/migrated_0002/expected.json index bf2044c42a..492f0ac62c 100644 --- a/test/fixtures/esprima/statement-if/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0002/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-if/migrated_0004/expected.json b/test/fixtures/esprima/statement-if/migrated_0004/expected.json index 720f53798d..453c4e700d 100644 --- a/test/fixtures/esprima/statement-if/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0004/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "morning" }, "name": "morning" }, @@ -98,7 +99,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "goodMorning" }, "name": "goodMorning" }, @@ -145,7 +147,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "goodDay" }, "name": "goodDay" }, @@ -153,6 +156,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-if/migrated_0005/expected.json b/test/fixtures/esprima/statement-if/migrated_0005/expected.json index baa36356a5..efb3af5fec 100644 --- a/test/fixtures/esprima/statement-if/migrated_0005/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0005/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "that" }, "name": "that" }, diff --git a/test/fixtures/esprima/statement-if/migrated_0006/expected.json b/test/fixtures/esprima/statement-if/migrated_0006/expected.json index 2f9b5c6964..0cfad45c37 100644 --- a/test/fixtures/esprima/statement-if/migrated_0006/expected.json +++ b/test/fixtures/esprima/statement-if/migrated_0006/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "that" }, "name": "that" }, diff --git a/test/fixtures/esprima/statement-iteration/.migrated_0021/expected.json b/test/fixtures/esprima/statement-iteration/.migrated_0021/expected.json deleted file mode 100644 index 20d1b7032f..0000000000 --- a/test/fixtures/esprima/statement-iteration/.migrated_0021/expected.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ForInStatement", - "start": 0, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "left": { - "type": "VariableDeclaration", - "start": 5, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 5 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 9, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "id": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "name": "x" - }, - "init": { - "type": "AssignmentExpression", - "start": 13, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "operator": "=", - "left": { - "type": "Identifier", - "start": 13, - "end": 14, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 14 - } - }, - "name": "y" - }, - "right": { - "type": "Identifier", - "start": 17, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "name": "z" - } - } - } - ], - "kind": "var" - }, - "right": { - "type": "Identifier", - "start": 22, - "end": 23, - "loc": { - "start": { - "line": 1, - "column": 22 - }, - "end": { - "line": 1, - "column": 23 - } - }, - "name": "q" - }, - "body": { - "type": "EmptyStatement", - "start": 24, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 24 - }, - "end": { - "line": 1, - "column": 25 - } - } - } - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/const_forin/expected.json b/test/fixtures/esprima/statement-iteration/const_forin/expected.json index 24f754ab5a..aea7786f71 100644 --- a/test/fixtures/esprima/statement-iteration/const_forin/expected.json +++ b/test/fixtures/esprima/statement-iteration/const_forin/expected.json @@ -42,6 +42,7 @@ "column": 33 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +178,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/for-statement-with-seq/expected.json b/test/fixtures/esprima/statement-iteration/for-statement-with-seq/expected.json index caaf4a9a96..da4f943e81 100644 --- a/test/fixtures/esprima/statement-iteration/for-statement-with-seq/expected.json +++ b/test/fixtures/esprima/statement-iteration/for-statement-with-seq/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -101,7 +103,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "c" }, "name": "c" } @@ -125,6 +128,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0000/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0000/expected.json index 52f64a4d6b..6b99345c09 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0000/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "keep" }, "name": "keep" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0001/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0001/expected.json index 04998adb58..a131703fce 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0001/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "keep" }, "name": "keep" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0002/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0002/expected.json index 9814bc6039..e2f50113d3 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0002/expected.json @@ -99,7 +99,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } @@ -147,7 +148,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } @@ -182,7 +184,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0004/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0004/expected.json index 746642c0a5..b8d3fb1e01 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0004/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "that" }, "name": "that" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0005/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0005/expected.json index 5019d62edd..a618237dc9 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0005/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0005/expected.json @@ -82,7 +82,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "that" }, "name": "that" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0006/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0006/expected.json index b154f386f7..1cd371f080 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0006/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0006/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "doSomething" }, "name": "doSomething" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0007/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0007/expected.json index 8ca1322823..f08d3a9485 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0007/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0007/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -151,7 +152,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" } @@ -199,7 +201,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/esprima/statement-iteration/migrated_0008/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0008/expected.json index 9474ed02f5..5f4998d8a0 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0008/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0008/expected.json @@ -61,6 +61,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0009/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0009/expected.json index ee4511c5df..67a281d20e 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0009/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0009/expected.json @@ -59,9 +59,11 @@ "column": 9 } }, - "body": [] + "body": [], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0010/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0010/expected.json index 96e6163073..ac885ace49 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0010/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0010/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0011/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0011/expected.json index 06e23e5726..424fedd8b8 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0011/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0011/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0012/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0012/expected.json index ced9b7da30..a1ccc73433 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0012/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0012/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0013/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0013/expected.json index 9703da41dc..f701a8cc20 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0013/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0013/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "y" }, "name": "y" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0014/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0014/expected.json index 799bca6bd8..019c93da93 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0014/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0014/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0015/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0015/expected.json index bab630bd14..d44ae9616d 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0015/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0015/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -174,7 +176,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/esprima/statement-iteration/migrated_0016/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0016/expected.json index 88e0fa1c9f..bd932cf468 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0016/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0016/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -174,7 +176,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "x" }, "name": "x" } @@ -219,7 +222,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -236,7 +240,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/esprima/statement-iteration/migrated_0017/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0017/expected.json index f95b2f15a7..9c7cdebe0f 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0017/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0017/expected.json @@ -42,6 +42,7 @@ "column": 26 } }, + "await": false, "left": { "type": "Identifier", "start": 4, @@ -54,7 +55,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -70,7 +72,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -114,7 +117,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -131,7 +135,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "x" }, "name": "x" } @@ -139,6 +144,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0018/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0018/expected.json index 50d29b5d32..4a3a0ecfda 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0018/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0018/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +178,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0020/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0020/expected.json index 12d30b3dd3..c86ced2dd6 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0020/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0020/expected.json @@ -42,6 +42,7 @@ "column": 31 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 5, @@ -83,7 +84,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "list" }, "name": "list" }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "process" }, "name": "process" }, @@ -165,7 +169,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "x" }, "name": "x" } @@ -173,6 +178,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0024/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0024/expected.json index 5eba72f1c0..9bb6c3e3fc 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0024/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0024/expected.json @@ -42,6 +42,7 @@ "column": 21 } }, + "await": false, "left": { "type": "MemberExpression", "start": 5, @@ -68,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -98,7 +100,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -115,7 +118,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "c" }, "name": "c" } @@ -134,7 +138,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "d" }, "name": "d" }, @@ -154,6 +159,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-iteration/migrated_0025/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0025/expected.json index c0f69f2729..a50e44182a 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0025/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0025/expected.json @@ -42,6 +42,7 @@ "column": 24 } }, + "await": false, "left": { "type": "MemberExpression", "start": 5, @@ -82,7 +83,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -113,7 +115,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -130,7 +133,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "c" }, "name": "c" } @@ -171,7 +175,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "d" }, "name": "d" }, diff --git a/test/fixtures/esprima/statement-iteration/migrated_0026/expected.json b/test/fixtures/esprima/statement-iteration/migrated_0026/expected.json index df5bd2f21b..dc3c4e3104 100644 --- a/test/fixtures/esprima/statement-iteration/migrated_0026/expected.json +++ b/test/fixtures/esprima/statement-iteration/migrated_0026/expected.json @@ -42,6 +42,7 @@ "column": 16 } }, + "await": false, "left": { "type": "MemberExpression", "start": 5, @@ -68,7 +69,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -84,7 +86,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "in" }, "name": "in" }, @@ -102,7 +105,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -122,6 +126,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-labelled/migrated_0000/expected.json b/test/fixtures/esprima/statement-labelled/migrated_0000/expected.json index ea2201a00e..0edfa7e1e6 100644 --- a/test/fixtures/esprima/statement-labelled/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-labelled/migrated_0000/expected.json @@ -85,7 +85,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "start" }, "name": "start" } @@ -103,11 +104,13 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "start" }, "name": "start" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-labelled/migrated_0001/expected.json b/test/fixtures/esprima/statement-labelled/migrated_0001/expected.json index 5157602658..0c49d0e8f9 100644 --- a/test/fixtures/esprima/statement-labelled/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-labelled/migrated_0001/expected.json @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "start" }, "name": "start" } @@ -116,7 +117,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "start" }, "name": "start" } diff --git a/test/fixtures/esprima/statement-labelled/migrated_0002/expected.json b/test/fixtures/esprima/statement-labelled/migrated_0002/expected.json index c1996f9d1b..7f81100ffa 100644 --- a/test/fixtures/esprima/statement-labelled/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-labelled/migrated_0002/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "test" }, "name": "test" } @@ -85,11 +86,13 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "__proto__" }, "name": "__proto__" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-return/migrated_0000/expected.json b/test/fixtures/esprima/statement-return/migrated_0000/expected.json index 3811851cf2..fe9666a99e 100644 --- a/test/fixtures/esprima/statement-return/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-return/migrated_0000/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -95,7 +96,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/statement-return/migrated_0001/expected.json b/test/fixtures/esprima/statement-return/migrated_0001/expected.json index cfc30f8e34..1f4ff8a16a 100644 --- a/test/fixtures/esprima/statement-return/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-return/migrated_0001/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -95,7 +96,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/statement-return/migrated_0002/expected.json b/test/fixtures/esprima/statement-return/migrated_0002/expected.json index 7e253235fc..05b71f8cff 100644 --- a/test/fixtures/esprima/statement-return/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-return/migrated_0002/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" } @@ -110,7 +112,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/statement-return/migrated_0003/expected.json b/test/fixtures/esprima/statement-return/migrated_0003/expected.json index d4f71c39ad..bd73928291 100644 --- a/test/fixtures/esprima/statement-return/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-return/migrated_0003/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "y" }, "name": "y" } @@ -142,7 +145,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/esprima/statement-switch/migrated_0000/expected.json b/test/fixtures/esprima/statement-switch/migrated_0000/expected.json index e48fd0f035..b77f94e94a 100644 --- a/test/fixtures/esprima/statement-switch/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-switch/migrated_0000/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" }, "cases": [] } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-switch/migrated_0001/expected.json b/test/fixtures/esprima/statement-switch/migrated_0001/expected.json index 54b7c12792..3c3a42b257 100644 --- a/test/fixtures/esprima/statement-switch/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-switch/migrated_0001/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "hi" }, "name": "hi" }, diff --git a/test/fixtures/esprima/statement-switch/migrated_0002/expected.json b/test/fixtures/esprima/statement-switch/migrated_0002/expected.json index ce967090f0..f474c77e7d 100644 --- a/test/fixtures/esprima/statement-switch/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-switch/migrated_0002/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "answer" }, "name": "answer" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "hi" }, "name": "hi" }, diff --git a/test/fixtures/esprima/statement-throw/migrated_0000/expected.json b/test/fixtures/esprima/statement-throw/migrated_0000/expected.json index 0e9f3c0da0..a5a7fc11ac 100644 --- a/test/fixtures/esprima/statement-throw/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-throw/migrated_0000/expected.json @@ -54,11 +54,13 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-throw/migrated_0001/expected.json b/test/fixtures/esprima/statement-throw/migrated_0001/expected.json index 91f3d0ffa7..fbc9ab8952 100644 --- a/test/fixtures/esprima/statement-throw/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-throw/migrated_0001/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -85,12 +86,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "y" }, "name": "y" } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-throw/migrated_0002/expected.json b/test/fixtures/esprima/statement-throw/migrated_0002/expected.json index 1586888a8b..e0ef904785 100644 --- a/test/fixtures/esprima/statement-throw/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-throw/migrated_0002/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "message" }, "name": "message" }, diff --git a/test/fixtures/esprima/statement-try/migrated_0000/expected.json b/test/fixtures/esprima/statement-try/migrated_0000/expected.json index 49a3324324..e5753c7cc2 100644 --- a/test/fixtures/esprima/statement-try/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0000/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -102,12 +104,14 @@ "column": 21 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0001/expected.json b/test/fixtures/esprima/statement-try/migrated_0001/expected.json index 4fa8f999b5..7a8e08f5e0 100644 --- a/test/fixtures/esprima/statement-try/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0001/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -102,12 +104,14 @@ "column": 24 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0002/expected.json b/test/fixtures/esprima/statement-try/migrated_0002/expected.json index 42cc2e8bf7..a6eb4ec45b 100644 --- a/test/fixtures/esprima/statement-try/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0002/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, @@ -102,12 +104,14 @@ "column": 29 } }, - "body": [] + "body": [], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0003/expected.json b/test/fixtures/esprima/statement-try/migrated_0003/expected.json index bb353db32f..2e17e596c6 100644 --- a/test/fixtures/esprima/statement-try/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0003/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": { "type": "CatchClause", @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -143,7 +145,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -160,19 +163,22 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0004/expected.json b/test/fixtures/esprima/statement-try/migrated_0004/expected.json index ca8f6bd080..4f92072de7 100644 --- a/test/fixtures/esprima/statement-try/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0004/expected.json @@ -56,7 +56,8 @@ "column": 7 } }, - "body": [] + "body": [], + "directives": [] }, "handler": null, "guardedHandlers": [], @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "cleanup" }, "name": "cleanup" }, @@ -132,16 +134,19 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "stuff" }, "name": "stuff" } ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0005/expected.json b/test/fixtures/esprima/statement-try/migrated_0005/expected.json index 291705c18b..6024793dbd 100644 --- a/test/fixtures/esprima/statement-try/migrated_0005/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0005/expected.json @@ -97,14 +97,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] }, "handler": { "type": "CatchClause", @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -208,19 +212,22 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], "finalizer": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-try/migrated_0006/expected.json b/test/fixtures/esprima/statement-try/migrated_0006/expected.json index 9dd799f3ee..c73f720c72 100644 --- a/test/fixtures/esprima/statement-try/migrated_0006/expected.json +++ b/test/fixtures/esprima/statement-try/migrated_0006/expected.json @@ -97,14 +97,16 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "doThat" }, "name": "doThat" }, "arguments": [] } } - ] + ], + "directives": [] }, "handler": { "type": "CatchClause", @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "e" }, "name": "e" }, @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "say" }, "name": "say" }, @@ -208,14 +212,16 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "e" }, "name": "e" } ] } } - ] + ], + "directives": [] } }, "guardedHandlers": [], @@ -274,7 +280,8 @@ "end": { "line": 1, "column": 56 - } + }, + "identifierName": "cleanup" }, "name": "cleanup" }, @@ -291,16 +298,19 @@ "end": { "line": 1, "column": 62 - } + }, + "identifierName": "stuff" }, "name": "stuff" } ] } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-variable/migrated_0000/expected.json b/test/fixtures/esprima/statement-variable/migrated_0000/expected.json index ec2dadfcf0..2dc156600a 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0000/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -78,6 +79,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-variable/migrated_0001/expected.json b/test/fixtures/esprima/statement-variable/migrated_0001/expected.json index 4ed5077fe0..efb47e7394 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0001/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -110,6 +112,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-variable/migrated_0002/expected.json b/test/fixtures/esprima/statement-variable/migrated_0002/expected.json index fceb7088d9..8515e2fd31 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0002/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/esprima/statement-variable/migrated_0003/expected.json b/test/fixtures/esprima/statement-variable/migrated_0003/expected.json index 0937c1b68d..c43470cfea 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0003/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0003/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "eval" }, "name": "eval" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "arguments" }, "name": "arguments" }, diff --git a/test/fixtures/esprima/statement-variable/migrated_0004/expected.json b/test/fixtures/esprima/statement-variable/migrated_0004/expected.json index 4c14f501ea..880833c662 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0004/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0004/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -171,7 +173,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "z" }, "name": "z" }, diff --git a/test/fixtures/esprima/statement-variable/migrated_0005/expected.json b/test/fixtures/esprima/statement-variable/migrated_0005/expected.json index 17a5559327..3b4811d947 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0005/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0005/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "implements" }, "name": "implements" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "interface" }, "name": "interface" }, @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "package" }, "name": "package" }, @@ -142,6 +145,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-variable/migrated_0006/expected.json b/test/fixtures/esprima/statement-variable/migrated_0006/expected.json index 8744560249..1afee34c9e 100644 --- a/test/fixtures/esprima/statement-variable/migrated_0006/expected.json +++ b/test/fixtures/esprima/statement-variable/migrated_0006/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "private" }, "name": "private" }, @@ -101,7 +102,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "protected" }, "name": "protected" }, @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "public" }, "name": "public" }, @@ -165,7 +168,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "static" }, "name": "static" }, @@ -174,6 +178,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-with/migrated_0000/expected.json b/test/fixtures/esprima/statement-with/migrated_0000/expected.json index f4e3da9d15..c1ca938f16 100644 --- a/test/fixtures/esprima/statement-with/migrated_0000/expected.json +++ b/test/fixtures/esprima/statement-with/migrated_0000/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,13 +117,15 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-with/migrated_0001/expected.json b/test/fixtures/esprima/statement-with/migrated_0001/expected.json index 9e895a7f45..bca8b9d7da 100644 --- a/test/fixtures/esprima/statement-with/migrated_0001/expected.json +++ b/test/fixtures/esprima/statement-with/migrated_0001/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,13 +117,15 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" } } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/esprima/statement-with/migrated_0002/expected.json b/test/fixtures/esprima/statement-with/migrated_0002/expected.json index d9e30cca90..e44e902aa7 100644 --- a/test/fixtures/esprima/statement-with/migrated_0002/expected.json +++ b/test/fixtures/esprima/statement-with/migrated_0002/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -130,15 +132,18 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" } } } - ] + ], + "directives": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/estree/class-method/basic/expected.json b/test/fixtures/estree/class-method/basic/expected.json index 87805524b4..8b70b14f6d 100644 --- a/test/fixtures/estree/class-method/basic/expected.json +++ b/test/fixtures/estree/class-method/basic/expected.json @@ -89,6 +89,7 @@ "column": 10 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -107,7 +108,6 @@ }, "name": "foo" }, - "static": false, "kind": "method", "value": { "type": "FunctionExpression", @@ -125,6 +125,7 @@ }, "id": null, "generator": false, + "expression": false, "async": false, "params": [], "body": { @@ -142,8 +143,7 @@ } }, "body": [] - }, - "expression": false + } } } ] @@ -151,4 +151,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/literal/boolean/expected.json b/test/fixtures/estree/literal/boolean/expected.json index 9cb28a78b5..0fb347fbd5 100644 --- a/test/fixtures/estree/literal/boolean/expected.json +++ b/test/fixtures/estree/literal/boolean/expected.json @@ -164,4 +164,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/literal/null/expected.json b/test/fixtures/estree/literal/null/expected.json index 3d8f657e41..f333081a50 100644 --- a/test/fixtures/estree/literal/null/expected.json +++ b/test/fixtures/estree/literal/null/expected.json @@ -97,4 +97,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/literal/number/expected.json b/test/fixtures/estree/literal/number/expected.json index 4a0f809cc1..f27bafff6e 100644 --- a/test/fixtures/estree/literal/number/expected.json +++ b/test/fixtures/estree/literal/number/expected.json @@ -97,4 +97,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/literal/regexp/expected.json b/test/fixtures/estree/literal/regexp/expected.json index 1cc7f34829..dd522b9e9c 100644 --- a/test/fixtures/estree/literal/regexp/expected.json +++ b/test/fixtures/estree/literal/regexp/expected.json @@ -101,4 +101,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/literal/string/expected.json b/test/fixtures/estree/literal/string/expected.json index eb0a80831e..5e91d5d539 100644 --- a/test/fixtures/estree/literal/string/expected.json +++ b/test/fixtures/estree/literal/string/expected.json @@ -97,4 +97,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/estree/object-property/basic/expected.json b/test/fixtures/estree/object-property/basic/expected.json index 61a0aaeb62..650d82af47 100644 --- a/test/fixtures/estree/object-property/basic/expected.json +++ b/test/fixtures/estree/object-property/basic/expected.json @@ -150,4 +150,4 @@ } ] } -} +} \ No newline at end of file diff --git a/test/fixtures/experimental/async-generators/class-method-2/expected.json b/test/fixtures/experimental/async-generators/class-method-2/expected.json index d0dfc49fa8..ea451fd3cb 100644 --- a/test/fixtures/experimental/async-generators/class-method-2/expected.json +++ b/test/fixtures/experimental/async-generators/class-method-2/expected.json @@ -90,7 +90,6 @@ } }, "static": false, - "kind": "method", "computed": false, "key": { "type": "Identifier", @@ -109,6 +108,7 @@ }, "name": "a" }, + "kind": "method", "id": null, "generator": true, "expression": false, diff --git a/test/fixtures/experimental/async-generators/.class-method-no-asi/actual.js b/test/fixtures/experimental/async-generators/class-method-no-asi/actual.js similarity index 100% rename from test/fixtures/experimental/async-generators/.class-method-no-asi/actual.js rename to test/fixtures/experimental/async-generators/class-method-no-asi/actual.js diff --git a/test/fixtures/experimental/async-generators/.class-method-no-asi/options.json b/test/fixtures/experimental/async-generators/class-method-no-asi/options.json similarity index 100% rename from test/fixtures/experimental/async-generators/.class-method-no-asi/options.json rename to test/fixtures/experimental/async-generators/class-method-no-asi/options.json diff --git a/test/fixtures/experimental/async-generators/class-method/expected.json b/test/fixtures/experimental/async-generators/class-method/expected.json index f1a8cb05c1..82b6bd579f 100644 --- a/test/fixtures/experimental/async-generators/class-method/expected.json +++ b/test/fixtures/experimental/async-generators/class-method/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "Query" }, "name": "Query" }, @@ -88,6 +89,7 @@ "column": 5 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 2, "column": 19 - } + }, + "identifierName": "queryAll" }, "name": "queryAll" }, - "static": false, "kind": "method", "id": null, "generator": true, @@ -124,7 +126,8 @@ "end": { "line": 2, "column": 23 - } + }, + "identifierName": "ids" }, "name": "ids" } @@ -158,6 +161,7 @@ "column": 9 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 54, @@ -199,7 +203,8 @@ "end": { "line": 3, "column": 21 - } + }, + "identifierName": "id" }, "name": "id" }, @@ -220,7 +225,8 @@ "end": { "line": 3, "column": 28 - } + }, + "identifierName": "ids" }, "name": "ids" }, @@ -337,7 +343,8 @@ "end": { "line": 4, "column": 34 - } + }, + "identifierName": "query" }, "name": "query" }, @@ -356,7 +363,8 @@ "end": { "line": 4, "column": 37 - } + }, + "identifierName": "id" }, "name": "id" } @@ -379,4 +387,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/experimental/async-generators/for-await/expected.json b/test/fixtures/experimental/async-generators/for-await/expected.json index 1551481f51..b69586316e 100644 --- a/test/fixtures/experimental/async-generators/for-await/expected.json +++ b/test/fixtures/experimental/async-generators/for-await/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -78,7 +79,7 @@ }, "body": [ { - "type": "ForAwaitStatement", + "type": "ForOfStatement", "start": 23, "end": 46, "loc": { @@ -91,6 +92,7 @@ "column": 25 } }, + "await": true, "left": { "type": "VariableDeclaration", "start": 34, @@ -132,7 +134,8 @@ "end": { "line": 2, "column": 18 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -153,7 +156,8 @@ "end": { "line": 2, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -180,4 +184,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/experimental/async-generators/object-method/expected.json b/test/fixtures/experimental/async-generators/object-method/expected.json index 5a25c2ce85..79413a2d47 100644 --- a/test/fixtures/experimental/async-generators/object-method/expected.json +++ b/test/fixtures/experimental/async-generators/object-method/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "query" }, "name": "query" }, @@ -117,7 +118,8 @@ "end": { "line": 2, "column": 19 - } + }, + "identifierName": "queryAll" }, "name": "queryAll" }, @@ -139,7 +141,8 @@ "end": { "line": 2, "column": 23 - } + }, + "identifierName": "ids" }, "name": "ids" } @@ -173,6 +176,7 @@ "column": 9 } }, + "await": false, "left": { "type": "VariableDeclaration", "start": 56, @@ -214,7 +218,8 @@ "end": { "line": 3, "column": 21 - } + }, + "identifierName": "id" }, "name": "id" }, @@ -235,7 +240,8 @@ "end": { "line": 3, "column": 28 - } + }, + "identifierName": "ids" }, "name": "ids" }, @@ -352,7 +358,8 @@ "end": { "line": 4, "column": 34 - } + }, + "identifierName": "query" }, "name": "query" }, @@ -371,7 +378,8 @@ "end": { "line": 4, "column": 37 - } + }, + "identifierName": "id" }, "name": "id" } @@ -397,4 +405,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/experimental/class-constructor-call/.duplicate/actual.js b/test/fixtures/experimental/class-constructor-call/.duplicate/actual.js deleted file mode 100644 index 6fd5dd7d11..0000000000 --- a/test/fixtures/experimental/class-constructor-call/.duplicate/actual.js +++ /dev/null @@ -1,4 +0,0 @@ -class Foo { - call constructor() {} - call constructor() {} -} diff --git a/test/fixtures/experimental/class-constructor-call/disallow-decorator/actual.js b/test/fixtures/experimental/class-constructor-call/disallow-decorator/actual.js deleted file mode 100644 index c63f1e9880..0000000000 --- a/test/fixtures/experimental/class-constructor-call/disallow-decorator/actual.js +++ /dev/null @@ -1,4 +0,0 @@ -class Foo { - @dec - call constructor() {} -} diff --git a/test/fixtures/experimental/class-constructor-call/disallow-decorator/options.json b/test/fixtures/experimental/class-constructor-call/disallow-decorator/options.json deleted file mode 100644 index 75152c7974..0000000000 --- a/test/fixtures/experimental/class-constructor-call/disallow-decorator/options.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "throws": "You can't attach decorators to a class constructor (3:2)", - "plugins": ["classConstructorCall", "decorators"] -} \ No newline at end of file diff --git a/test/fixtures/experimental/class-constructor-call/disallow-duplicate/actual.js b/test/fixtures/experimental/class-constructor-call/disallow-duplicate/actual.js deleted file mode 100644 index 6fd5dd7d11..0000000000 --- a/test/fixtures/experimental/class-constructor-call/disallow-duplicate/actual.js +++ /dev/null @@ -1,4 +0,0 @@ -class Foo { - call constructor() {} - call constructor() {} -} diff --git a/test/fixtures/experimental/class-constructor-call/disallow-duplicate/options.json b/test/fixtures/experimental/class-constructor-call/disallow-duplicate/options.json deleted file mode 100644 index e13cd0e258..0000000000 --- a/test/fixtures/experimental/class-constructor-call/disallow-duplicate/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "throws": "Duplicate constructor call in the same class (3:2)" -} \ No newline at end of file diff --git a/test/fixtures/experimental/class-constructor-call/illegal-generator/actual.js b/test/fixtures/experimental/class-constructor-call/illegal-generator/actual.js deleted file mode 100644 index 9a3bd5d8d6..0000000000 --- a/test/fixtures/experimental/class-constructor-call/illegal-generator/actual.js +++ /dev/null @@ -1,5 +0,0 @@ -class Foo { - *call constructor() { - foo(); - } -} diff --git a/test/fixtures/experimental/class-constructor-call/illegal-generator/options.json b/test/fixtures/experimental/class-constructor-call/illegal-generator/options.json deleted file mode 100644 index db35c194d3..0000000000 --- a/test/fixtures/experimental/class-constructor-call/illegal-generator/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "throws": "Unexpected token, expected ( (2:8)" -} diff --git a/test/fixtures/experimental/class-constructor-call/illegal-key/actual.js b/test/fixtures/experimental/class-constructor-call/illegal-key/actual.js deleted file mode 100644 index e3155a24a8..0000000000 --- a/test/fixtures/experimental/class-constructor-call/illegal-key/actual.js +++ /dev/null @@ -1,5 +0,0 @@ -class Foo { - call foobar() { - foo(); - } -} diff --git a/test/fixtures/experimental/class-constructor-call/illegal-key/options.json b/test/fixtures/experimental/class-constructor-call/illegal-key/options.json deleted file mode 100644 index 4e84114247..0000000000 --- a/test/fixtures/experimental/class-constructor-call/illegal-key/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "throws": "Unexpected token (2:7)" -} diff --git a/test/fixtures/experimental/class-constructor-call/options.json b/test/fixtures/experimental/class-constructor-call/options.json deleted file mode 100644 index 253cf5199b..0000000000 --- a/test/fixtures/experimental/class-constructor-call/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["classConstructorCall"] -} diff --git a/test/fixtures/experimental/class-constructor-call/plain/actual.js b/test/fixtures/experimental/class-constructor-call/plain/actual.js deleted file mode 100644 index 1f8b64ef4a..0000000000 --- a/test/fixtures/experimental/class-constructor-call/plain/actual.js +++ /dev/null @@ -1,5 +0,0 @@ -class Foo { - call constructor() { - foo(); - } -} diff --git a/test/fixtures/experimental/class-constructor-call/plain/expected.json b/test/fixtures/experimental/class-constructor-call/plain/expected.json deleted file mode 100644 index 49c89dadbc..0000000000 --- a/test/fixtures/experimental/class-constructor-call/plain/expected.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 51, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 5, - "column": 1 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 51, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 5, - "column": 1 - } - }, - "sourceType": "script", - "body": [ - { - "type": "ClassDeclaration", - "start": 0, - "end": 51, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 5, - "column": 1 - } - }, - "id": { - "type": "Identifier", - "start": 6, - "end": 9, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 9 - } - }, - "name": "Foo" - }, - "superClass": null, - "body": { - "type": "ClassBody", - "start": 10, - "end": 51, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 5, - "column": 1 - } - }, - "body": [ - { - "type": "ClassMethod", - "start": 14, - "end": 49, - "loc": { - "start": { - "line": 2, - "column": 2 - }, - "end": { - "line": 4, - "column": 3 - } - }, - "computed": false, - "key": { - "type": "Identifier", - "start": 19, - "end": 30, - "loc": { - "start": { - "line": 2, - "column": 7 - }, - "end": { - "line": 2, - "column": 18 - } - }, - "name": "constructor" - }, - "static": false, - "kind": "constructorCall", - "id": null, - "generator": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 33, - "end": 49, - "loc": { - "start": { - "line": 2, - "column": 21 - }, - "end": { - "line": 4, - "column": 3 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 39, - "end": 45, - "loc": { - "start": { - "line": 3, - "column": 4 - }, - "end": { - "line": 3, - "column": 10 - } - }, - "expression": { - "type": "CallExpression", - "start": 39, - "end": 44, - "loc": { - "start": { - "line": 3, - "column": 4 - }, - "end": { - "line": 3, - "column": 9 - } - }, - "callee": { - "type": "Identifier", - "start": 39, - "end": 42, - "loc": { - "start": { - "line": 3, - "column": 4 - }, - "end": { - "line": 3, - "column": 7 - } - }, - "name": "foo" - }, - "arguments": [] - } - } - ], - "directives": [] - } - } - ] - } - } - ], - "directives": [] - } -} \ No newline at end of file diff --git a/test/fixtures/experimental/class-properties/asi-success/expected.json b/test/fixtures/experimental/class-properties/asi-success/expected.json index c78a521f9c..180c9fa44d 100644 --- a/test/fixtures/experimental/class-properties/asi-success/expected.json +++ b/test/fixtures/experimental/class-properties/asi-success/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 2, "column": 3 - } + }, + "identifierName": "x" }, "name": "x" }, - "static": false, "value": null }, { @@ -122,6 +124,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -135,11 +138,11 @@ "end": { "line": 3, "column": 3 - } + }, + "identifierName": "y" }, "name": "y" }, - "static": false, "value": null } ] @@ -171,7 +174,8 @@ "end": { "line": 6, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -205,6 +209,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -218,11 +223,11 @@ "end": { "line": 7, "column": 3 - } + }, + "identifierName": "p" }, "name": "p" }, - "static": false, "value": null }, { @@ -239,6 +244,7 @@ "column": 11 } }, + "static": false, "computed": true, "key": { "type": "Identifier", @@ -252,15 +258,16 @@ "end": { "line": 8, "column": 4 - } + }, + "identifierName": "m" }, "name": "m" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/experimental/class-properties/computed/expected.json b/test/fixtures/experimental/class-properties/computed/expected.json index 763fedb8d0..dcdd64b2d8 100644 --- a/test/fixtures/experimental/class-properties/computed/expected.json +++ b/test/fixtures/experimental/class-properties/computed/expected.json @@ -89,6 +89,7 @@ "column": 5 } }, + "static": false, "computed": true, "key": { "type": "Identifier", @@ -107,7 +108,6 @@ }, "name": "x" }, - "static": false, "value": null }, { @@ -124,6 +124,7 @@ "column": 7 } }, + "static": false, "computed": true, "key": { "type": "StringLiteral", @@ -145,7 +146,6 @@ }, "value": "y" }, - "static": false, "value": null } ] @@ -212,6 +212,7 @@ "column": 5 } }, + "static": false, "computed": true, "key": { "type": "Identifier", @@ -230,7 +231,6 @@ }, "name": "p" }, - "static": false, "value": null }, { @@ -247,6 +247,7 @@ "column": 11 } }, + "static": false, "computed": true, "key": { "type": "Identifier", @@ -265,7 +266,6 @@ }, "name": "m" }, - "static": false, "kind": "method", "id": null, "generator": false, diff --git a/test/fixtures/experimental/class-properties/edge-cases/expected.json b/test/fixtures/experimental/class-properties/edge-cases/expected.json index 3a41800a0b..e029628a70 100644 --- a/test/fixtures/experimental/class-properties/edge-cases/expected.json +++ b/test/fixtures/experimental/class-properties/edge-cases/expected.json @@ -1335,7 +1335,6 @@ } }, "static": false, - "kind": "get", "computed": true, "key": { "type": "StringLiteral", @@ -1357,6 +1356,7 @@ }, "value": "a" }, + "kind": "get", "id": null, "generator": false, "expression": false, @@ -1445,7 +1445,6 @@ } }, "static": true, - "kind": "get", "computed": false, "key": { "type": "Identifier", @@ -1464,6 +1463,7 @@ }, "name": "static" }, + "kind": "get", "id": null, "generator": false, "expression": false, diff --git a/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/actual.js b/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/actual.js new file mode 100644 index 0000000000..f82f8d51d7 --- /dev/null +++ b/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/actual.js @@ -0,0 +1,3 @@ +class Foo { + bar: string = 'bizz'; +} diff --git a/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json b/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json new file mode 100644 index 0000000000..e185feb80a --- /dev/null +++ b/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json @@ -0,0 +1,4 @@ +{ + "plugins": ["flow"], + "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:14)" +} diff --git a/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/actual.js b/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/actual.js new file mode 100644 index 0000000000..fa80e3af68 --- /dev/null +++ b/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/actual.js @@ -0,0 +1,3 @@ +class Foo { + bar = 'bizz'; +} diff --git a/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json b/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json new file mode 100644 index 0000000000..af38bd1530 --- /dev/null +++ b/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json @@ -0,0 +1,3 @@ +{ + "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)" +} diff --git a/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/actual.js b/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/actual.js new file mode 100644 index 0000000000..a36cdd975c --- /dev/null +++ b/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/actual.js @@ -0,0 +1,3 @@ +class Foo { + bar; +} diff --git a/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json b/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json new file mode 100644 index 0000000000..af38bd1530 --- /dev/null +++ b/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json @@ -0,0 +1,3 @@ +{ + "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)" +} diff --git a/test/fixtures/experimental/decorators/class-method-parameter/expected.json b/test/fixtures/experimental/decorators/class-method-parameter/expected.json index db2bccbfcb..4a401fa758 100644 --- a/test/fixtures/experimental/decorators/class-method-parameter/expected.json +++ b/test/fixtures/experimental/decorators/class-method-parameter/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 53 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,15 +103,16 @@ "end": { "line": 2, "column": 13 - } + }, + "identifierName": "constructor" }, "name": "constructor" }, - "static": false, "kind": "constructor", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -123,7 +126,8 @@ "end": { "line": 2, "column": 22 - } + }, + "identifierName": "x" }, "name": "x", "decorators": [ @@ -167,7 +171,8 @@ "end": { "line": 2, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -188,7 +193,8 @@ "end": { "line": 2, "column": 49 - } + }, + "identifierName": "y" }, "name": "y", "decorators": [ @@ -232,7 +238,8 @@ "end": { "line": 2, "column": 28 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -281,7 +288,8 @@ "end": { "line": 2, "column": 32 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -351,7 +359,8 @@ "end": { "line": 2, "column": 45 - } + }, + "identifierName": "baz" }, "name": "baz" }, diff --git a/test/fixtures/experimental/decorators/computed-member-expr-on-prop/expected.json b/test/fixtures/experimental/decorators/computed-member-expr-on-prop/expected.json index 184415bff7..16385a68fc 100644 --- a/test/fixtures/experimental/decorators/computed-member-expr-on-prop/expected.json +++ b/test/fixtures/experimental/decorators/computed-member-expr-on-prop/expected.json @@ -156,6 +156,7 @@ } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -174,7 +175,6 @@ }, "name": "a" }, - "static": false, "value": { "type": "NumericLiteral", "start": 28, diff --git a/test/fixtures/experimental/decorators/computed-member-expression/expected.json b/test/fixtures/experimental/decorators/computed-member-expression/expected.json index d0c4947e9b..71b00fd8a1 100644 --- a/test/fixtures/experimental/decorators/computed-member-expression/expected.json +++ b/test/fixtures/experimental/decorators/computed-member-expression/expected.json @@ -156,6 +156,7 @@ } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -174,7 +175,6 @@ }, "name": "abc" }, - "static": false, "kind": "method", "id": null, "generator": false, diff --git a/test/fixtures/experimental/decorators/export-decorators-on-class/expected.json b/test/fixtures/experimental/decorators/export-decorators-on-class/expected.json index 343060fcaf..6933de60e7 100644 --- a/test/fixtures/experimental/decorators/export-decorators-on-class/expected.json +++ b/test/fixtures/experimental/decorators/export-decorators-on-class/expected.json @@ -56,24 +56,6 @@ "column": 23 } }, - "id": null, - "superClass": null, - "body": { - "type": "ClassBody", - "start": 26, - "end": 28, - "loc": { - "start": { - "line": 2, - "column": 21 - }, - "end": { - "line": 2, - "column": 23 - } - }, - "body": [] - }, "decorators": [ { "type": "Decorator", @@ -107,7 +89,25 @@ "name": "foo" } } - ] + ], + "id": null, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 26, + "end": 28, + "loc": { + "start": { + "line": 2, + "column": 21 + }, + "end": { + "line": 2, + "column": 23 + } + }, + "body": [] + } } } ], diff --git a/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json b/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json index 7905089635..a936f5fee4 100644 --- a/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json +++ b/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json @@ -68,12 +68,14 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "func" }, "name": "func" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "x" }, "name": "x", "decorators": [ @@ -131,7 +134,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -152,7 +156,8 @@ "end": { "line": 1, "column": 64 - } + }, + "identifierName": "y" }, "name": "y", "decorators": [ @@ -196,7 +201,8 @@ "end": { "line": 1, "column": 43 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -245,7 +251,8 @@ "end": { "line": 1, "column": 47 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -315,7 +322,8 @@ "end": { "line": 1, "column": 60 - } + }, + "identifierName": "baz" }, "name": "baz" }, diff --git a/test/fixtures/experimental/decorators/export-default-with-nested-class/expected.json b/test/fixtures/experimental/decorators/export-default-with-nested-class/expected.json index 8fc784a7a3..2c797decfc 100644 --- a/test/fixtures/experimental/decorators/export-default-with-nested-class/expected.json +++ b/test/fixtures/experimental/decorators/export-default-with-nested-class/expected.json @@ -56,23 +56,6 @@ "column": 1 } }, - "id": { - "type": "Identifier", - "start": 38, - "end": 49, - "loc": { - "start": { - "line": 2, - "column": 21 - }, - "end": { - "line": 2, - "column": 32 - }, - "identifierName": "ParentClass" - }, - "name": "ParentClass" - }, "decorators": [ { "type": "Decorator", @@ -107,6 +90,23 @@ } } ], + "id": { + "type": "Identifier", + "start": 38, + "end": 49, + "loc": { + "start": { + "line": 2, + "column": 21 + }, + "end": { + "line": 2, + "column": 32 + }, + "identifierName": "ParentClass" + }, + "name": "ParentClass" + }, "superClass": null, "body": { "type": "ClassBody", @@ -137,6 +137,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -155,7 +156,6 @@ }, "name": "makeNestedClass" }, - "static": false, "kind": "method", "id": null, "generator": false, diff --git a/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json b/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json index 8d6e1bf9f3..2949fbdb5c 100644 --- a/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json +++ b/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "func" }, "name": "func" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "x" }, "name": "x", "decorators": [ @@ -117,7 +120,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -138,7 +142,8 @@ "end": { "line": 1, "column": 49 - } + }, + "identifierName": "y" }, "name": "y", "decorators": [ @@ -182,7 +187,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -231,7 +237,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -301,7 +308,8 @@ "end": { "line": 1, "column": 45 - } + }, + "identifierName": "baz" }, "name": "baz" }, diff --git a/test/fixtures/experimental/decorators/function-expression-parameter/expected.json b/test/fixtures/experimental/decorators/function-expression-parameter/expected.json index 8c82bbc2f3..652a728e04 100644 --- a/test/fixtures/experimental/decorators/function-expression-parameter/expected.json +++ b/test/fixtures/experimental/decorators/function-expression-parameter/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "func" }, "name": "func" }, @@ -90,6 +91,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "x" }, "name": "x", "decorators": [ @@ -147,7 +150,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -168,7 +172,8 @@ "end": { "line": 1, "column": 58 - } + }, + "identifierName": "y" }, "name": "y", "decorators": [ @@ -212,7 +217,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -261,7 +267,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -331,7 +338,8 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "baz" }, "name": "baz" }, diff --git a/test/fixtures/experimental/decorators/object-method-parameter/expected.json b/test/fixtures/experimental/decorators/object-method-parameter/expected.json index 08600db91a..5a22cd58ee 100644 --- a/test/fixtures/experimental/decorators/object-method-parameter/expected.json +++ b/test/fixtures/experimental/decorators/object-method-parameter/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -117,7 +118,8 @@ "end": { "line": 2, "column": 8 - } + }, + "identifierName": "method" }, "name": "method" }, @@ -125,6 +127,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -138,7 +141,8 @@ "end": { "line": 2, "column": 17 - } + }, + "identifierName": "x" }, "name": "x", "decorators": [ @@ -182,7 +186,8 @@ "end": { "line": 2, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -203,7 +208,8 @@ "end": { "line": 2, "column": 44 - } + }, + "identifierName": "y" }, "name": "y", "decorators": [ @@ -247,7 +253,8 @@ "end": { "line": 2, "column": 23 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -296,7 +303,8 @@ "end": { "line": 2, "column": 27 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -366,7 +374,8 @@ "end": { "line": 2, "column": 40 - } + }, + "identifierName": "baz" }, "name": "baz" }, diff --git a/test/fixtures/experimental/function-sent/inside-generator/expected.json b/test/fixtures/experimental/function-sent/inside-generator/expected.json index c0692c9a9d..bfacd5b28e 100644 --- a/test/fixtures/experimental/function-sent/inside-generator/expected.json +++ b/test/fixtures/experimental/function-sent/inside-generator/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": true, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -116,7 +118,8 @@ "end": { "line": 2, "column": 17 - } + }, + "identifierName": "function" }, "name": "function" }, @@ -132,7 +135,8 @@ "end": { "line": 2, "column": 22 - } + }, + "identifierName": "sent" }, "name": "sent" } diff --git a/test/fixtures/experimental/object-rest-spread/1/expected.json b/test/fixtures/experimental/object-rest-spread/1/expected.json index 5ee0540170..5a26deddd0 100644 --- a/test/fixtures/experimental/object-rest-spread/1/expected.json +++ b/test/fixtures/experimental/object-rest-spread/1/expected.json @@ -73,7 +73,7 @@ }, "properties": [ { - "type": "RestProperty", + "type": "RestElement", "start": 5, "end": 9, "loc": { @@ -98,7 +98,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "x" }, "name": "x" } @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "z" }, "name": "z" } diff --git a/test/fixtures/experimental/object-rest-spread/16/expected.json b/test/fixtures/experimental/object-rest-spread/16/expected.json index 6f6be6d836..cd68bed7a3 100644 --- a/test/fixtures/experimental/object-rest-spread/16/expected.json +++ b/test/fixtures/experimental/object-rest-spread/16/expected.json @@ -73,7 +73,7 @@ }, "properties": [ { - "type": "RestProperty", + "type": "RestElement", "start": 5, "end": 11, "loc": { diff --git a/test/fixtures/experimental/object-rest-spread/17/expected.json b/test/fixtures/experimental/object-rest-spread/17/expected.json index 0c15cfbe9c..c6d9695d8b 100644 --- a/test/fixtures/experimental/object-rest-spread/17/expected.json +++ b/test/fixtures/experimental/object-rest-spread/17/expected.json @@ -73,7 +73,7 @@ }, "properties": [ { - "type": "RestProperty", + "type": "RestElement", "start": 6, "end": 18, "loc": { diff --git a/test/fixtures/experimental/object-rest-spread/2/expected.json b/test/fixtures/experimental/object-rest-spread/2/expected.json index f017a9cc8e..77ad59f8cb 100644 --- a/test/fixtures/experimental/object-rest-spread/2/expected.json +++ b/test/fixtures/experimental/object-rest-spread/2/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,13 +118,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } }, { - "type": "RestProperty", + "type": "RestElement", "start": 8, "end": 12, "loc": { @@ -148,7 +153,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" } @@ -167,7 +173,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "z" }, "name": "z" } diff --git a/test/fixtures/experimental/object-rest-spread/3/expected.json b/test/fixtures/experimental/object-rest-spread/3/expected.json index 64c2046836..bb0cd7a162 100644 --- a/test/fixtures/experimental/object-rest-spread/3/expected.json +++ b/test/fixtures/experimental/object-rest-spread/3/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ObjectPattern", @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -120,13 +122,17 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } }, { - "type": "RestProperty", + "type": "RestElement", "start": 14, "end": 18, "loc": { @@ -151,7 +157,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "y" }, "name": "y" } @@ -177,7 +184,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/experimental/object-rest-spread/4/expected.json b/test/fixtures/experimental/object-rest-spread/4/expected.json index 0a777c2a2f..8b971ee635 100644 --- a/test/fixtures/experimental/object-rest-spread/4/expected.json +++ b/test/fixtures/experimental/object-rest-spread/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "z" }, "name": "z" }, @@ -89,7 +90,7 @@ }, "properties": [ { - "type": "SpreadProperty", + "type": "SpreadElement", "start": 9, "end": 13, "loc": { @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" } @@ -125,6 +127,7 @@ ], "kind": "let" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/object-rest-spread/5/expected.json b/test/fixtures/experimental/object-rest-spread/5/expected.json index 13c6c8dc0c..efbc0e3f05 100644 --- a/test/fixtures/experimental/object-rest-spread/5/expected.json +++ b/test/fixtures/experimental/object-rest-spread/5/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "z" }, "name": "z" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -133,13 +135,17 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } }, { - "type": "SpreadProperty", + "type": "SpreadElement", "start": 8, "end": 12, "loc": { @@ -164,7 +170,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "y" }, "name": "y" } diff --git a/test/fixtures/experimental/object-rest-spread/6/expected.json b/test/fixtures/experimental/object-rest-spread/6/expected.json index 748d406185..0584ebbbe7 100644 --- a/test/fixtures/experimental/object-rest-spread/6/expected.json +++ b/test/fixtures/experimental/object-rest-spread/6/expected.json @@ -113,7 +113,7 @@ } }, { - "type": "SpreadProperty", + "type": "SpreadElement", "start": 5, "end": 9, "loc": { @@ -200,7 +200,7 @@ } }, { - "type": "SpreadProperty", + "type": "SpreadElement", "start": 14, "end": 18, "loc": { diff --git a/test/fixtures/experimental/object-rest-spread/8/expected.json b/test/fixtures/experimental/object-rest-spread/8/expected.json deleted file mode 100644 index f97a0ab95c..0000000000 --- a/test/fixtures/experimental/object-rest-spread/8/expected.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "sourceType": "script", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 26, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 26 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "id": { - "type": "ObjectPattern", - "start": 4, - "end": 19, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 19 - } - }, - "properties": [ - { - "type": "ObjectProperty", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - } - }, - "method": false, - "shorthand": true, - "computed": false, - "key": { - "type": "Identifier", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - }, - "identifierName": "x" - }, - "name": "x" - }, - "value": { - "type": "Identifier", - "start": 6, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 7 - }, - "identifierName": "x" - }, - "name": "x" - }, - "extra": { - "shorthand": true - } - }, - { - "type": "ObjectProperty", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - }, - "method": false, - "shorthand": true, - "computed": false, - "key": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - }, - "identifierName": "y" - }, - "name": "y" - }, - "value": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - }, - "identifierName": "y" - }, - "name": "y" - }, - "extra": { - "shorthand": true - } - }, - { - "type": "RestProperty", - "start": 12, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 16 - } - }, - "argument": { - "type": "Identifier", - "start": 15, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 15 - }, - "end": { - "line": 1, - "column": 16 - }, - "identifierName": "z" - }, - "name": "z" - } - } - ] - }, - "init": { - "type": "Identifier", - "start": 22, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 22 - }, - "end": { - "line": 1, - "column": 25 - }, - "identifierName": "obj" - }, - "name": "obj" - } - } - ], - "kind": "let" - } - ], - "directives": [] - } -} \ No newline at end of file diff --git a/test/fixtures/experimental/object-rest-spread/8/options.json b/test/fixtures/experimental/object-rest-spread/8/options.json new file mode 100644 index 0000000000..4a97ac85ea --- /dev/null +++ b/test/fixtures/experimental/object-rest-spread/8/options.json @@ -0,0 +1,3 @@ +{ + "throws": "A trailing comma is not permitted after the rest element (1:16)" +} diff --git a/test/fixtures/experimental/uncategorised/33/expected.json b/test/fixtures/experimental/uncategorised/33/expected.json index 11f4e10cdb..027ed9cf62 100644 --- a/test/fixtures/experimental/uncategorised/33/expected.json +++ b/test/fixtures/experimental/uncategorised/33/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -109,6 +111,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/uncategorised/34/expected.json b/test/fixtures/experimental/uncategorised/34/expected.json index 8186beeeb5..923fccd749 100644 --- a/test/fixtures/experimental/uncategorised/34/expected.json +++ b/test/fixtures/experimental/uncategorised/34/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -114,7 +115,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -158,6 +161,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/uncategorised/35/expected.json b/test/fixtures/experimental/uncategorised/35/expected.json index ff000260aa..99edaedb74 100644 --- a/test/fixtures/experimental/uncategorised/35/expected.json +++ b/test/fixtures/experimental/uncategorised/35/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,12 +116,14 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -134,15 +137,16 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/experimental/uncategorised/36/expected.json b/test/fixtures/experimental/uncategorised/36/expected.json index 118d2b69c5..74f8fb569a 100644 --- a/test/fixtures/experimental/uncategorised/36/expected.json +++ b/test/fixtures/experimental/uncategorised/36/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,12 +116,14 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -134,15 +137,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "set", "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -156,7 +160,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "f" }, "name": "f" } diff --git a/test/fixtures/experimental/uncategorised/37/expected.json b/test/fixtures/experimental/uncategorised/37/expected.json index ad67c94592..cc23bfd6b2 100644 --- a/test/fixtures/experimental/uncategorised/37/expected.json +++ b/test/fixtures/experimental/uncategorised/37/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,12 +116,14 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -134,15 +137,16 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "get", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/experimental/uncategorised/38/expected.json b/test/fixtures/experimental/uncategorised/38/expected.json index d55670aa51..621411c8b8 100644 --- a/test/fixtures/experimental/uncategorised/38/expected.json +++ b/test/fixtures/experimental/uncategorised/38/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -146,12 +148,14 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -165,15 +169,16 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", diff --git a/test/fixtures/experimental/uncategorised/39/expected.json b/test/fixtures/experimental/uncategorised/39/expected.json index b8e2fae3e8..29893aa8b2 100644 --- a/test/fixtures/experimental/uncategorised/39/expected.json +++ b/test/fixtures/experimental/uncategorised/39/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -144,7 +145,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -165,7 +167,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -221,7 +224,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -239,7 +243,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, diff --git a/test/fixtures/experimental/uncategorised/40/expected.json b/test/fixtures/experimental/uncategorised/40/expected.json index 561ed2763d..1303f6d2b6 100644 --- a/test/fixtures/experimental/uncategorised/40/expected.json +++ b/test/fixtures/experimental/uncategorised/40/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -132,7 +134,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -150,7 +153,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -189,6 +193,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/uncategorised/43/expected.json b/test/fixtures/experimental/uncategorised/43/expected.json index f1956ad133..b5e0eed1ee 100644 --- a/test/fixtures/experimental/uncategorised/43/expected.json +++ b/test/fixtures/experimental/uncategorised/43/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 24 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "value": { "type": "StringLiteral", "start": 18, diff --git a/test/fixtures/experimental/uncategorised/44/expected.json b/test/fixtures/experimental/uncategorised/44/expected.json index f0a0229229..0bd96ae88c 100644 --- a/test/fixtures/experimental/uncategorised/44/expected.json +++ b/test/fixtures/experimental/uncategorised/44/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 16 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,16 +103,17 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "value": null } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/uncategorised/45/expected.json b/test/fixtures/experimental/uncategorised/45/expected.json index 5b0f534e52..9c603e0ed1 100644 --- a/test/fixtures/experimental/uncategorised/45/expected.json +++ b/test/fixtures/experimental/uncategorised/45/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 23 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,16 +103,17 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "value": null } ] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/experimental/uncategorised/46/expected.json b/test/fixtures/experimental/uncategorised/46/expected.json index ade2f517c1..221e6c8c0a 100644 --- a/test/fixtures/experimental/uncategorised/46/expected.json +++ b/test/fixtures/experimental/uncategorised/46/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 31 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "value": { "type": "StringLiteral", "start": 25, diff --git a/test/fixtures/experimental/uncategorised/47/expected.json b/test/fixtures/experimental/uncategorised/47/expected.json index e13785eb68..d638426ba2 100644 --- a/test/fixtures/experimental/uncategorised/47/expected.json +++ b/test/fixtures/experimental/uncategorised/47/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,12 +116,14 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } } ], + "static": false, "computed": false, "key": { "type": "Identifier", @@ -134,11 +137,11 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "value": { "type": "StringLiteral", "start": 23, diff --git a/test/fixtures/experimental/uncategorised/48/expected.json b/test/fixtures/experimental/uncategorised/48/expected.json index 9f756cd6cb..2dfeed15ab 100644 --- a/test/fixtures/experimental/uncategorised/48/expected.json +++ b/test/fixtures/experimental/uncategorised/48/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -115,12 +116,14 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "bar" }, "name": "bar" } } ], + "static": true, "computed": false, "key": { "type": "Identifier", @@ -134,11 +137,11 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": true, "value": { "type": "StringLiteral", "start": 30, diff --git a/test/fixtures/experimental/uncategorised/49/expected.json b/test/fixtures/experimental/uncategorised/49/expected.json index 1186fc6b42..a339588287 100644 --- a/test/fixtures/experimental/uncategorised/49/expected.json +++ b/test/fixtures/experimental/uncategorised/49/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "obj" }, "name": "obj" }, @@ -129,7 +130,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -150,7 +152,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/experimental/uncategorised/50/expected.json b/test/fixtures/experimental/uncategorised/50/expected.json index c901163da6..7d5e584066 100644 --- a/test/fixtures/experimental/uncategorised/50/expected.json +++ b/test/fixtures/experimental/uncategorised/50/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/experimental/uncategorised/51/expected.json b/test/fixtures/experimental/uncategorised/51/expected.json index cf777d23e3..c3ff5e5a66 100644 --- a/test/fixtures/experimental/uncategorised/51/expected.json +++ b/test/fixtures/experimental/uncategorised/51/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -100,7 +101,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/experimental/uncategorised/52/expected.json b/test/fixtures/experimental/uncategorised/52/expected.json index 56f6998476..fb3dbdc979 100644 --- a/test/fixtures/experimental/uncategorised/52/expected.json +++ b/test/fixtures/experimental/uncategorised/52/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/experimental/uncategorised/53/expected.json b/test/fixtures/experimental/uncategorised/53/expected.json index 8e1fc31aea..72a96cf589 100644 --- a/test/fixtures/experimental/uncategorised/53/expected.json +++ b/test/fixtures/experimental/uncategorised/53/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "default" }, "name": "default" } diff --git a/test/fixtures/experimental/uncategorised/54/expected.json b/test/fixtures/experimental/uncategorised/54/expected.json index 90607f31ac..b92718dd1b 100644 --- a/test/fixtures/experimental/uncategorised/54/expected.json +++ b/test/fixtures/experimental/uncategorised/54/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/experimental/uncategorised/62/expected.json b/test/fixtures/experimental/uncategorised/62/expected.json index 8b52f4f5bb..e8bfb35773 100644 --- a/test/fixtures/experimental/uncategorised/62/expected.json +++ b/test/fixtures/experimental/uncategorised/62/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "decorate" }, "name": "decorate" }, @@ -105,6 +106,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -118,7 +120,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "arg" }, "name": "arg" } @@ -155,7 +158,8 @@ "end": { "line": 2, "column": 8 - } + }, + "identifierName": "Ex" }, "name": "Ex" }, @@ -177,6 +181,7 @@ "body": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/flow/anonymous-function-no-parens-types/good_03/expected.json b/test/fixtures/flow/anonymous-function-no-parens-types/good_03/expected.json index a09644e718..15898b8a3f 100644 --- a/test/fixtures/flow/anonymous-function-no-parens-types/good_03/expected.json +++ b/test/fixtures/flow/anonymous-function-no-parens-types/good_03/expected.json @@ -116,7 +116,8 @@ "column": 18 } } - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-no-parens-types/good_04/expected.json b/test/fixtures/flow/anonymous-function-no-parens-types/good_04/expected.json index 7383572fa8..4826089df7 100644 --- a/test/fixtures/flow/anonymous-function-no-parens-types/good_04/expected.json +++ b/test/fixtures/flow/anonymous-function-no-parens-types/good_04/expected.json @@ -148,7 +148,8 @@ } } ] - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-no-parens-types/good_05/expected.json b/test/fixtures/flow/anonymous-function-no-parens-types/good_05/expected.json index 073bb795bf..4aac5e5b7b 100644 --- a/test/fixtures/flow/anonymous-function-no-parens-types/good_05/expected.json +++ b/test/fixtures/flow/anonymous-function-no-parens-types/good_05/expected.json @@ -164,7 +164,7 @@ ], "rest": null, "returnType": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 24, "end": 27, "loc": { @@ -177,14 +177,15 @@ "column": 27 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "123" - } + }, + "value": 123 }, "typeParameters": null - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-types/good_01/expected.json b/test/fixtures/flow/anonymous-function-types/good_01/expected.json index 49ef79cba3..f81ca57295 100644 --- a/test/fixtures/flow/anonymous-function-types/good_01/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_01/expected.json @@ -185,7 +185,8 @@ } } } - } + }, + "predicate": null } } } diff --git a/test/fixtures/flow/anonymous-function-types/good_10/expected.json b/test/fixtures/flow/anonymous-function-types/good_10/expected.json index e522809a4c..6f6b8d5c5f 100644 --- a/test/fixtures/flow/anonymous-function-types/good_10/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_10/expected.json @@ -168,7 +168,7 @@ ], "rest": null, "returnType": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 28, "end": 31, "loc": { @@ -181,14 +181,15 @@ "column": 31 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "123" - } + }, + "value": 123 }, "typeParameters": null - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-types/good_11/expected.json b/test/fixtures/flow/anonymous-function-types/good_11/expected.json index 0cdbecd783..f4bff8d5de 100644 --- a/test/fixtures/flow/anonymous-function-types/good_11/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_11/expected.json @@ -116,7 +116,8 @@ "column": 19 } } - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-types/good_12/expected.json b/test/fixtures/flow/anonymous-function-types/good_12/expected.json index cd8dec7223..862a858093 100644 --- a/test/fixtures/flow/anonymous-function-types/good_12/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_12/expected.json @@ -148,7 +148,8 @@ } } ] - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-types/good_13/expected.json b/test/fixtures/flow/anonymous-function-types/good_13/expected.json index 0448cdbd22..ea21215b6a 100644 --- a/test/fixtures/flow/anonymous-function-types/good_13/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_13/expected.json @@ -158,7 +158,7 @@ ], "rest": null, "returnType": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 26, "end": 29, "loc": { @@ -171,14 +171,15 @@ "column": 29 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "123" - } + }, + "value": 123 }, "typeParameters": null - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/anonymous-function-types/good_14/expected.json b/test/fixtures/flow/anonymous-function-types/good_14/expected.json index 3aa12410f0..d61b3e631d 100644 --- a/test/fixtures/flow/anonymous-function-types/good_14/expected.json +++ b/test/fixtures/flow/anonymous-function-types/good_14/expected.json @@ -118,7 +118,7 @@ }, "types": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 15, "end": 16, "loc": { @@ -131,14 +131,14 @@ "column": 16 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 19, "end": 20, "loc": { @@ -151,14 +151,15 @@ "column": 20 } }, - "value": 2, "extra": { "rawValue": 2, "raw": "2" - } + }, + "value": 2 } ] - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/array-types/1/expected.json b/test/fixtures/flow/array-types/1/expected.json index ec761b745f..4a628f8b88 100644 --- a/test/fixtures/flow/array-types/1/expected.json +++ b/test/fixtures/flow/array-types/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -123,7 +124,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/2/expected.json b/test/fixtures/flow/array-types/2/expected.json index 1c35be8908..ac973c42c3 100644 --- a/test/fixtures/flow/array-types/2/expected.json +++ b/test/fixtures/flow/array-types/2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -138,7 +139,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/3/expected.json b/test/fixtures/flow/array-types/3/expected.json index 3bc1a328ed..97f2e67bb2 100644 --- a/test/fixtures/flow/array-types/3/expected.json +++ b/test/fixtures/flow/array-types/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -138,7 +139,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/4/expected.json b/test/fixtures/flow/array-types/4/expected.json index 9af2946b1c..1e607ecb92 100644 --- a/test/fixtures/flow/array-types/4/expected.json +++ b/test/fixtures/flow/array-types/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -141,7 +142,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/5/expected.json b/test/fixtures/flow/array-types/5/expected.json index 3c6ed8b705..1d9bb7f09e 100644 --- a/test/fixtures/flow/array-types/5/expected.json +++ b/test/fixtures/flow/array-types/5/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -141,7 +142,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/6/expected.json b/test/fixtures/flow/array-types/6/expected.json index 07cd5aeb7a..75d9b0ed40 100644 --- a/test/fixtures/flow/array-types/6/expected.json +++ b/test/fixtures/flow/array-types/6/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -141,7 +142,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" } @@ -155,7 +157,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/array-types/7/expected.json b/test/fixtures/flow/array-types/7/expected.json index dc3060e046..075d711fea 100644 --- a/test/fixtures/flow/array-types/7/expected.json +++ b/test/fixtures/flow/array-types/7/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -138,7 +139,7 @@ ], "kind": "var" } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/flow/array-types/8/expected.json b/test/fixtures/flow/array-types/8/expected.json index 624bd8732a..5942211299 100644 --- a/test/fixtures/flow/array-types/8/expected.json +++ b/test/fixtures/flow/array-types/8/expected.json @@ -26,6 +26,7 @@ "column": 19 } }, + "sourceType": "module", "body": [ { "type": "VariableDeclaration", @@ -68,7 +69,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -152,7 +154,7 @@ ], "kind": "var" } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/flow/array-types/9/expected.json b/test/fixtures/flow/array-types/9/expected.json index 9ac33d433a..fffc354953 100644 --- a/test/fixtures/flow/array-types/9/expected.json +++ b/test/fixtures/flow/array-types/9/expected.json @@ -26,6 +26,7 @@ "column": 2 } }, + "sourceType": "module", "body": [ { "type": "VariableDeclaration", @@ -68,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -138,7 +140,7 @@ "elements": [] } } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/flow/bounded-polymorphism/1/expected.json b/test/fixtures/flow/bounded-polymorphism/1/expected.json index dd5b6e120d..5f53d9572e 100644 --- a/test/fixtures/flow/bounded-polymorphism/1/expected.json +++ b/test/fixtures/flow/bounded-polymorphism/1/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -88,6 +89,7 @@ } }, "name": "T", + "variance": null, "bound": { "type": "TypeAnnotation", "start": 9, @@ -129,7 +131,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "Foo" }, "name": "Foo" } diff --git a/test/fixtures/flow/bounded-polymorphism/2/expected.json b/test/fixtures/flow/bounded-polymorphism/2/expected.json index cce66b9065..e7f5ee680d 100644 --- a/test/fixtures/flow/bounded-polymorphism/2/expected.json +++ b/test/fixtures/flow/bounded-polymorphism/2/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -91,6 +92,7 @@ } }, "name": "T", + "variance": null, "bound": { "type": "TypeAnnotation", "start": 14, diff --git a/test/fixtures/flow/call-properties/1/expected.json b/test/fixtures/flow/call-properties/1/expected.json index 35b90b3c11..6ea3d1e4bb 100644 --- a/test/fixtures/flow/call-properties/1/expected.json +++ b/test/fixtures/flow/call-properties/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -115,6 +116,7 @@ "column": 20 } }, + "static": false, "value": { "type": "FunctionTypeAnnotation", "start": 10, @@ -151,7 +153,8 @@ } ], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -160,7 +163,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/call-properties/2/expected.json b/test/fixtures/flow/call-properties/2/expected.json index ddb97cd917..2efe8bd9d6 100644 --- a/test/fixtures/flow/call-properties/2/expected.json +++ b/test/fixtures/flow/call-properties/2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -115,6 +116,7 @@ "column": 21 } }, + "static": false, "value": { "type": "FunctionTypeAnnotation", "start": 10, @@ -151,7 +153,8 @@ } ], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -160,7 +163,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/call-properties/3/expected.json b/test/fixtures/flow/call-properties/3/expected.json index cd2eadb7d0..e1c7645c97 100644 --- a/test/fixtures/flow/call-properties/3/expected.json +++ b/test/fixtures/flow/call-properties/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -115,6 +116,7 @@ "column": 21 } }, + "static": false, "value": { "type": "FunctionTypeAnnotation", "start": 10, @@ -163,6 +165,7 @@ "column": 52 } }, + "static": false, "value": { "type": "FunctionTypeAnnotation", "start": 33, @@ -204,7 +207,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -273,7 +277,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -293,10 +298,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -305,7 +312,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/call-properties/4/expected.json b/test/fixtures/flow/call-properties/4/expected.json index 4fefc20fda..bbfa2011f1 100644 --- a/test/fixtures/flow/call-properties/4/expected.json +++ b/test/fixtures/flow/call-properties/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -115,6 +116,7 @@ "column": 28 } }, + "static": false, "value": { "type": "FunctionTypeAnnotation", "start": 10, @@ -156,7 +158,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -188,7 +191,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "T" }, "name": "T" } @@ -225,7 +229,8 @@ "column": 12 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -248,7 +253,8 @@ } ], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } }, diff --git a/test/fixtures/flow/call-properties/5/expected.json b/test/fixtures/flow/call-properties/5/expected.json index 4815e902bc..c836470490 100644 --- a/test/fixtures/flow/call-properties/5/expected.json +++ b/test/fixtures/flow/call-properties/5/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 12, @@ -126,10 +128,11 @@ } ], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-module/1/expected.json b/test/fixtures/flow/declare-module/1/expected.json index 6c62e08565..543af8e16b 100644 --- a/test/fixtures/flow/declare-module/1/expected.json +++ b/test/fixtures/flow/declare-module/1/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -75,7 +76,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-module/3/expected.json b/test/fixtures/flow/declare-module/3/expected.json index 8654fdf948..b390a8eba8 100644 --- a/test/fixtures/flow/declare-module/3/expected.json +++ b/test/fixtures/flow/declare-module/3/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -137,7 +139,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-module/4/expected.json b/test/fixtures/flow/declare-module/4/expected.json index e53817230a..89bdb1f60c 100644 --- a/test/fixtures/flow/declare-module/4/expected.json +++ b/test/fixtures/flow/declare-module/4/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 49 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -148,14 +150,15 @@ } } } - } + }, + "predicate": null } } } ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-module/5/expected.json b/test/fixtures/flow/declare-module/5/expected.json index 5da254c476..2933f44c40 100644 --- a/test/fixtures/flow/declare-module/5/expected.json +++ b/test/fixtures/flow/declare-module/5/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -99,12 +100,14 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "B" }, "name": "B" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 35, @@ -168,6 +171,7 @@ } } }, + "static": false, "key": { "type": "Identifier", "start": 37, @@ -180,20 +184,22 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "foo" }, "name": "foo" }, "optional": false } ], - "indexers": [] + "indexers": [], + "exact": false } } ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-module/6/expected.json b/test/fixtures/flow/declare-module/6/expected.json index 713a1d71c1..cd42bf7057 100644 --- a/test/fixtures/flow/declare-module/6/expected.json +++ b/test/fixtures/flow/declare-module/6/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -164,6 +165,7 @@ } } }, + "static": false, "key": { "type": "Identifier", "start": 45, @@ -176,14 +178,16 @@ "end": { "line": 1, "column": 48 - } + }, + "identifierName": "foo" }, "name": "foo" }, "optional": false } ], - "indexers": [] + "indexers": [], + "exact": false } } } diff --git a/test/fixtures/flow/declare-statements/1/expected.json b/test/fixtures/flow/declare-statements/1/expected.json index c09b84fcf9..de51d0d730 100644 --- a/test/fixtures/flow/declare-statements/1/expected.json +++ b/test/fixtures/flow/declare-statements/1/expected.json @@ -54,12 +54,13 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/10/expected.json b/test/fixtures/flow/declare-statements/10/expected.json index 9254cba4fe..a047f9c004 100644 --- a/test/fixtures/flow/declare-statements/10/expected.json +++ b/test/fixtures/flow/declare-statements/10/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 16, @@ -136,7 +138,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -168,7 +171,8 @@ "end": { "line": 1, "column": 48 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -192,10 +196,11 @@ "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/11/expected.json b/test/fixtures/flow/declare-statements/11/expected.json index cbc8903f9e..6c57828705 100644 --- a/test/fixtures/flow/declare-statements/11/expected.json +++ b/test/fixtures/flow/declare-statements/11/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 16, @@ -104,7 +106,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "indexer" }, "name": "indexer" }, @@ -140,10 +143,11 @@ }, "variance": null } - ] + ], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/12/expected.json b/test/fixtures/flow/declare-statements/12/expected.json index 5ff774491c..d7e3836060 100644 --- a/test/fixtures/flow/declare-statements/12/expected.json +++ b/test/fixtures/flow/declare-statements/12/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 16, @@ -126,10 +128,11 @@ } ], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/13/expected.json b/test/fixtures/flow/declare-statements/13/expected.json index 28eabe6252..2e0f0e768e 100644 --- a/test/fixtures/flow/declare-statements/13/expected.json +++ b/test/fixtures/flow/declare-statements/13/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -87,7 +88,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -133,7 +135,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "T" }, "name": "T" } @@ -167,7 +170,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "C" }, "name": "C" }, @@ -190,7 +194,8 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } ], diff --git a/test/fixtures/flow/declare-statements/14/expected.json b/test/fixtures/flow/declare-statements/14/expected.json index a43cb40adf..ea11ee2d77 100644 --- a/test/fixtures/flow/declare-statements/14/expected.json +++ b/test/fixtures/flow/declare-statements/14/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -101,7 +102,8 @@ "end": { "line": 2, "column": 14 - } + }, + "identifierName": "T" }, "name": "T" }, @@ -134,7 +136,8 @@ "column": 16 } }, - "name": "U" + "name": "U", + "variance": null } ] }, @@ -169,6 +172,7 @@ "column": 35 } }, + "static": false, "id": { "type": "Identifier", "start": 48, @@ -181,7 +185,8 @@ "end": { "line": 2, "column": 24 - } + }, + "identifierName": "k" }, "name": "k" }, @@ -227,14 +232,16 @@ "end": { "line": 2, "column": 35 - } + }, + "identifierName": "U" }, "name": "U" } }, "variance": null } - ] + ], + "exact": false } } ], diff --git a/test/fixtures/flow/declare-statements/15/expected.json b/test/fixtures/flow/declare-statements/15/expected.json index 81024f30bd..0b5376ca37 100644 --- a/test/fixtures/flow/declare-statements/15/expected.json +++ b/test/fixtures/flow/declare-statements/15/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "I" }, "name": "I" }, @@ -103,7 +104,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -123,10 +125,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } }, { @@ -155,7 +159,8 @@ "end": { "line": 2, "column": 19 - } + }, + "identifierName": "I" }, "name": "I" }, @@ -188,7 +193,8 @@ "column": 21 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -236,7 +242,8 @@ "end": { "line": 2, "column": 28 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -267,16 +274,19 @@ "end": { "line": 2, "column": 31 - } + }, + "identifierName": "T" }, "name": "T" } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } ], diff --git a/test/fixtures/flow/declare-statements/16/expected.json b/test/fixtures/flow/declare-statements/16/expected.json index 4fbc1787d4..63647f77c7 100644 --- a/test/fixtures/flow/declare-statements/16/expected.json +++ b/test/fixtures/flow/declare-statements/16/expected.json @@ -176,7 +176,8 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } ], diff --git a/test/fixtures/flow/declare-statements/2/expected.json b/test/fixtures/flow/declare-statements/2/expected.json index bed757d73f..f5ce52dc9e 100644 --- a/test/fixtures/flow/declare-statements/2/expected.json +++ b/test/fixtures/flow/declare-statements/2/expected.json @@ -54,12 +54,13 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/3/expected.json b/test/fixtures/flow/declare-statements/3/expected.json index f77a398e93..ff4d67ffd4 100644 --- a/test/fixtures/flow/declare-statements/3/expected.json +++ b/test/fixtures/flow/declare-statements/3/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -103,11 +104,12 @@ } } } - } + }, + "predicate": null } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/4/expected.json b/test/fixtures/flow/declare-statements/4/expected.json index f5aaaa9224..a5c4e3c553 100644 --- a/test/fixtures/flow/declare-statements/4/expected.json +++ b/test/fixtures/flow/declare-statements/4/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -103,11 +104,12 @@ } } } - } + }, + "predicate": null } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/5/expected.json b/test/fixtures/flow/declare-statements/5/expected.json index c391cadcac..b93e58be9b 100644 --- a/test/fixtures/flow/declare-statements/5/expected.json +++ b/test/fixtures/flow/declare-statements/5/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -114,7 +115,8 @@ "column": 22 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -135,7 +137,8 @@ } } } - } + }, + "predicate": null } } } diff --git a/test/fixtures/flow/declare-statements/6/expected.json b/test/fixtures/flow/declare-statements/6/expected.json index c61da189d6..8c803e35a3 100644 --- a/test/fixtures/flow/declare-statements/6/expected.json +++ b/test/fixtures/flow/declare-statements/6/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 48 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -113,7 +114,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -160,7 +162,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -198,11 +201,12 @@ } } } - } + }, + "predicate": null } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/7/expected.json b/test/fixtures/flow/declare-statements/7/expected.json index 04218670c8..1fd92b3412 100644 --- a/test/fixtures/flow/declare-statements/7/expected.json +++ b/test/fixtures/flow/declare-statements/7/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "IViewFactory" }, "name": "IViewFactory" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 27, @@ -131,7 +133,8 @@ "end": { "line": 1, "column": 44 - } + }, + "identifierName": "view" }, "name": "view" }, @@ -163,7 +166,8 @@ "end": { "line": 1, "column": 51 - } + }, + "identifierName": "Object" }, "name": "Object" } @@ -195,7 +199,8 @@ "end": { "line": 1, "column": 57 - } + }, + "identifierName": "prop" }, "name": "prop" }, @@ -235,6 +240,7 @@ } } }, + "static": false, "key": { "type": "Identifier", "start": 29, @@ -247,17 +253,19 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "didAnimate" }, "name": "didAnimate" }, "optional": false } ], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/8/expected.json b/test/fixtures/flow/declare-statements/8/expected.json index 18bc5e8955..3f5d39aa5f 100644 --- a/test/fixtures/flow/declare-statements/8/expected.json +++ b/test/fixtures/flow/declare-statements/8/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 16, @@ -76,10 +78,11 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/declare-statements/9/expected.json b/test/fixtures/flow/declare-statements/9/expected.json index d3d340e972..1ac09b01e8 100644 --- a/test/fixtures/flow/declare-statements/9/expected.json +++ b/test/fixtures/flow/declare-statements/9/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -87,7 +88,8 @@ "column": 17 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -118,7 +120,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -164,7 +167,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "T" }, "name": "T" } @@ -216,7 +220,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -236,10 +241,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } ], diff --git a/test/fixtures/flow/def-site-variance/1/expected.json b/test/fixtures/flow/def-site-variance/1/expected.json index ad7acee460..2ee9a406c5 100644 --- a/test/fixtures/flow/def-site-variance/1/expected.json +++ b/test/fixtures/flow/def-site-variance/1/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "C" }, "name": "C" }, @@ -87,8 +88,23 @@ "column": 10 } }, - "variance": "plus", - "name": "T" + "name": "T", + "variance": { + "type": "Variance", + "start": 8, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 8 + }, + "end": { + "line": 1, + "column": 9 + } + }, + "kind": "plus" + } }, { "type": "TypeParameter", @@ -104,8 +120,23 @@ "column": 13 } }, - "variance": "minus", - "name": "U" + "name": "U", + "variance": { + "type": "Variance", + "start": 11, + "end": 12, + "loc": { + "start": { + "line": 1, + "column": 11 + }, + "end": { + "line": 1, + "column": 12 + } + }, + "kind": "minus" + } } ] }, @@ -153,7 +184,8 @@ "end": { "line": 2, "column": 10 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -189,8 +221,23 @@ "column": 13 } }, - "variance": "plus", - "name": "T" + "name": "T", + "variance": { + "type": "Variance", + "start": 29, + "end": 30, + "loc": { + "start": { + "line": 2, + "column": 11 + }, + "end": { + "line": 2, + "column": 12 + } + }, + "kind": "plus" + } }, { "type": "TypeParameter", @@ -206,8 +253,23 @@ "column": 16 } }, - "variance": "minus", - "name": "U" + "name": "U", + "variance": { + "type": "Variance", + "start": 32, + "end": 33, + "loc": { + "start": { + "line": 2, + "column": 14 + }, + "end": { + "line": 2, + "column": 15 + } + }, + "kind": "minus" + } } ] }, @@ -256,7 +318,8 @@ "end": { "line": 3, "column": 6 - } + }, + "identifierName": "T" }, "name": "T" }, @@ -289,8 +352,23 @@ "column": 9 } }, - "variance": "plus", - "name": "T" + "name": "T", + "variance": { + "type": "Variance", + "start": 48, + "end": 49, + "loc": { + "start": { + "line": 3, + "column": 7 + }, + "end": { + "line": 3, + "column": 8 + } + }, + "kind": "plus" + } }, { "type": "TypeParameter", @@ -306,8 +384,23 @@ "column": 12 } }, - "variance": "minus", - "name": "U" + "name": "U", + "variance": { + "type": "Variance", + "start": 51, + "end": 52, + "loc": { + "start": { + "line": 3, + "column": 10 + }, + "end": { + "line": 3, + "column": 11 + } + }, + "kind": "minus" + } } ] }, @@ -327,10 +420,11 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/1/expected.json b/test/fixtures/flow/interfaces-module-and-script/1/expected.json index f6196760be..005f5ae9d3 100644 --- a/test/fixtures/flow/interfaces-module-and-script/1/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/1/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 12, @@ -76,10 +78,11 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/2/expected.json b/test/fixtures/flow/interfaces-module-and-script/2/expected.json index 953e5928d5..044027ca74 100644 --- a/test/fixtures/flow/interfaces-module-and-script/2/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/2/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -86,13 +87,15 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "B" }, "name": "B" }, "typeParameters": null } ], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 22, @@ -109,10 +112,11 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/3/expected.json b/test/fixtures/flow/interfaces-module-and-script/3/expected.json index ce900a2e99..2f896014d6 100644 --- a/test/fixtures/flow/interfaces-module-and-script/3/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/3/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -87,7 +88,8 @@ "column": 13 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -118,7 +120,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "B" }, "name": "B" }, @@ -164,7 +167,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "T" }, "name": "T" } @@ -198,7 +202,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "C" }, "name": "C" }, @@ -244,7 +249,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "T" }, "name": "T" } @@ -270,7 +276,8 @@ }, "callProperties": [], "properties": [], - "indexers": [] + "indexers": [], + "exact": false } } ], diff --git a/test/fixtures/flow/interfaces-module-and-script/4/expected.json b/test/fixtures/flow/interfaces-module-and-script/4/expected.json index 922afad5c6..b6b9f6d2c7 100644 --- a/test/fixtures/flow/interfaces-module-and-script/4/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/4/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "A" }, "name": "A" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 12, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -140,13 +143,15 @@ "typeParameters": null }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/5/expected.json b/test/fixtures/flow/interfaces-module-and-script/5/expected.json index 23bbe6bc92..58cbc95f06 100644 --- a/test/fixtures/flow/interfaces-module-and-script/5/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/5/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "Dictionary" }, "name": "Dictionary" }, "typeParameters": null, "extends": [], + "mixins": [], "body": { "type": "ObjectTypeAnnotation", "start": 21, @@ -102,7 +104,8 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "length" }, "name": "length" }, @@ -122,6 +125,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -129,7 +133,7 @@ { "type": "ObjectTypeIndexer", "start": 23, - "end": 47, + "end": 46, "loc": { "start": { "line": 1, @@ -137,9 +141,10 @@ }, "end": { "line": 1, - "column": 47 + "column": 46 } }, + "static": false, "id": { "type": "Identifier", "start": 24, @@ -152,7 +157,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "index" }, "name": "index" }, @@ -188,10 +194,11 @@ }, "variance": null } - ] + ], + "exact": false } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/6/expected.json b/test/fixtures/flow/interfaces-module-and-script/6/expected.json index e2c90567fb..bb54189558 100644 --- a/test/fixtures/flow/interfaces-module-and-script/6/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/6/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -110,7 +112,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/7/expected.json b/test/fixtures/flow/interfaces-module-and-script/7/expected.json index edfbf9f89b..faeb81e32f 100644 --- a/test/fixtures/flow/interfaces-module-and-script/7/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/7/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -70,7 +71,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -101,7 +103,8 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "Bat" }, "name": "Bat" }, @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "Man" }, "name": "Man" }, @@ -188,7 +192,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/8/expected.json b/test/fixtures/flow/interfaces-module-and-script/8/expected.json index 64e39ba8ff..c06be5f984 100644 --- a/test/fixtures/flow/interfaces-module-and-script/8/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/8/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 42 - } + }, + "identifierName": "Bat" }, "name": "Bat" }, @@ -157,7 +160,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/interfaces-module-and-script/9/expected.json b/test/fixtures/flow/interfaces-module-and-script/9/expected.json index d68a71a9c4..25a172c9ca 100644 --- a/test/fixtures/flow/interfaces-module-and-script/9/expected.json +++ b/test/fixtures/flow/interfaces-module-and-script/9/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -84,7 +85,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 42 - } + }, + "identifierName": "Bat" }, "name": "Bat" }, @@ -167,7 +170,8 @@ "end": { "line": 1, "column": 60 - } + }, + "identifierName": "Man" }, "name": "Man" }, @@ -191,7 +195,7 @@ "body": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/boolean-false/expected.json b/test/fixtures/flow/literal-types/boolean-false/expected.json index 6cc01d01a9..7b3dbda941 100644 --- a/test/fixtures/flow/literal-types/boolean-false/expected.json +++ b/test/fixtures/flow/literal-types/boolean-false/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -109,6 +110,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/boolean-true/expected.json b/test/fixtures/flow/literal-types/boolean-true/expected.json index b05db87966..74fbf09ae1 100644 --- a/test/fixtures/flow/literal-types/boolean-true/expected.json +++ b/test/fixtures/flow/literal-types/boolean-true/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -109,6 +110,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/null/expected.json b/test/fixtures/flow/literal-types/null/expected.json index 78ebec7ba0..9eefed3e90 100644 --- a/test/fixtures/flow/literal-types/null/expected.json +++ b/test/fixtures/flow/literal-types/null/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -109,6 +110,7 @@ ], "kind": "var" } - ] + ], + "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/number-binary/expected.json b/test/fixtures/flow/literal-types/number-binary/expected.json index 44d455a56d..0490f1092c 100644 --- a/test/fixtures/flow/literal-types/number-binary/expected.json +++ b/test/fixtures/flow/literal-types/number-binary/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 16, "loc": { @@ -100,11 +101,11 @@ "column": 16 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "0b1111011" - } + }, + "value": 123 } } }, diff --git a/test/fixtures/flow/literal-types/number-float/expected.json b/test/fixtures/flow/literal-types/number-float/expected.json index 4cdb637a55..2ef1aa9f66 100644 --- a/test/fixtures/flow/literal-types/number-float/expected.json +++ b/test/fixtures/flow/literal-types/number-float/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 12, "loc": { @@ -100,11 +101,11 @@ "column": 12 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "123.0" - } + }, + "value": 123 } } }, diff --git a/test/fixtures/flow/literal-types/number-integer/expected.json b/test/fixtures/flow/literal-types/number-integer/expected.json index 9b9a6da608..009266cb9a 100644 --- a/test/fixtures/flow/literal-types/number-integer/expected.json +++ b/test/fixtures/flow/literal-types/number-integer/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 10, "loc": { @@ -100,11 +101,11 @@ "column": 10 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "123" - } + }, + "value": 123 } } }, diff --git a/test/fixtures/flow/literal-types/number-negative-binary/expected.json b/test/fixtures/flow/literal-types/number-negative-binary/expected.json index a97406933e..d0e43e2b7c 100644 --- a/test/fixtures/flow/literal-types/number-negative-binary/expected.json +++ b/test/fixtures/flow/literal-types/number-negative-binary/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 17, "loc": { @@ -100,11 +101,11 @@ "column": 17 } }, - "value": -123, "extra": { "rawValue": -123, "raw": "-0b1111011" - } + }, + "value": -123 } } }, @@ -116,4 +117,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/number-negative-float/expected.json b/test/fixtures/flow/literal-types/number-negative-float/expected.json index 25ac6b0013..e1f7c14aba 100644 --- a/test/fixtures/flow/literal-types/number-negative-float/expected.json +++ b/test/fixtures/flow/literal-types/number-negative-float/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 13, "loc": { @@ -100,11 +101,11 @@ "column": 13 } }, - "value": -123, "extra": { "rawValue": -123, "raw": "-123.0" - } + }, + "value": -123 } } }, @@ -116,4 +117,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/number-negative-octal-2/expected.json b/test/fixtures/flow/literal-types/number-negative-octal-2/expected.json index 136224babb..b694f2aff6 100644 --- a/test/fixtures/flow/literal-types/number-negative-octal-2/expected.json +++ b/test/fixtures/flow/literal-types/number-negative-octal-2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 13, "loc": { @@ -100,11 +101,11 @@ "column": 13 } }, - "value": -123, "extra": { "rawValue": -123, "raw": "-0o173" - } + }, + "value": -123 } } }, @@ -116,4 +117,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/number-negative-octal/expected.json b/test/fixtures/flow/literal-types/number-negative-octal/expected.json index aaa9ab4cce..9b95a16a64 100644 --- a/test/fixtures/flow/literal-types/number-negative-octal/expected.json +++ b/test/fixtures/flow/literal-types/number-negative-octal/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 12, "loc": { @@ -100,11 +101,11 @@ "column": 12 } }, - "value": -123, "extra": { "rawValue": -123, "raw": "-0x7B" - } + }, + "value": -123 } } }, @@ -116,4 +117,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/literal-types/number-octal-2/expected.json b/test/fixtures/flow/literal-types/number-octal-2/expected.json index 7c7b41adc3..4da3b6ff0c 100644 --- a/test/fixtures/flow/literal-types/number-octal-2/expected.json +++ b/test/fixtures/flow/literal-types/number-octal-2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 12, "loc": { @@ -100,11 +101,11 @@ "column": 12 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "0o173" - } + }, + "value": 123 } } }, diff --git a/test/fixtures/flow/literal-types/number-octal/expected.json b/test/fixtures/flow/literal-types/number-octal/expected.json index 608b0731b2..ecb707cc9a 100644 --- a/test/fixtures/flow/literal-types/number-octal/expected.json +++ b/test/fixtures/flow/literal-types/number-octal/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 7, "end": 11, "loc": { @@ -100,11 +101,11 @@ "column": 11 } }, - "value": 123, "extra": { "rawValue": 123, "raw": "0x7B" - } + }, + "value": 123 } } }, diff --git a/test/fixtures/flow/literal-types/string-double/expected.json b/test/fixtures/flow/literal-types/string-double/expected.json index 75c50aa13a..7ced64b71c 100644 --- a/test/fixtures/flow/literal-types/string-double/expected.json +++ b/test/fixtures/flow/literal-types/string-double/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "createElement" }, "name": "createElement" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "tagName" }, "name": "tagName", "typeAnnotation": { @@ -104,11 +107,11 @@ "column": 37 } }, - "value": "div", "extra": { "rawValue": "div", "raw": "\"div\"" - } + }, + "value": "div" } } } @@ -154,11 +157,13 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "HTMLDivElement" }, "name": "HTMLDivElement" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/literal-types/string-single/expected.json b/test/fixtures/flow/literal-types/string-single/expected.json index e168fb2f91..c968bebd4b 100644 --- a/test/fixtures/flow/literal-types/string-single/expected.json +++ b/test/fixtures/flow/literal-types/string-single/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "createElement" }, "name": "createElement" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "tagName" }, "name": "tagName", "typeAnnotation": { @@ -104,11 +107,11 @@ "column": 37 } }, - "value": "div", "extra": { "rawValue": "div", "raw": "'div'" - } + }, + "value": "div" } } } @@ -154,11 +157,13 @@ "end": { "line": 1, "column": 54 - } + }, + "identifierName": "HTMLDivElement" }, "name": "HTMLDivElement" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/optional-type/1/expected.json b/test/fixtures/flow/optional-type/1/expected.json index 14de301f7b..da459cf18d 100644 --- a/test/fixtures/flow/optional-type/1/expected.json +++ b/test/fixtures/flow/optional-type/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x", "optional": true diff --git a/test/fixtures/flow/optional-type/3/expected.json b/test/fixtures/flow/optional-type/3/expected.json index 4958cf281a..338ba4dbb9 100644 --- a/test/fixtures/flow/optional-type/3/expected.json +++ b/test/fixtures/flow/optional-type/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "x" }, "name": "x", "optional": true @@ -135,7 +137,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "y" }, "name": "y", "optional": true, @@ -180,7 +183,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Object" }, "name": "Object" } diff --git a/test/fixtures/flow/optional-type/4/expected.json b/test/fixtures/flow/optional-type/4/expected.json index a570eafd13..8a9c1e5b99 100644 --- a/test/fixtures/flow/optional-type/4/expected.json +++ b/test/fixtures/flow/optional-type/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -118,7 +119,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/flow/predicates/1/expected.json b/test/fixtures/flow/predicates/1/expected.json index eb81514fc4..0c21887783 100644 --- a/test/fixtures/flow/predicates/1/expected.json +++ b/test/fixtures/flow/predicates/1/expected.json @@ -223,4 +223,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/predicates/2/expected.json b/test/fixtures/flow/predicates/2/expected.json index 64df4c2006..fb45d0dad1 100644 --- a/test/fixtures/flow/predicates/2/expected.json +++ b/test/fixtures/flow/predicates/2/expected.json @@ -253,4 +253,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/predicates/3/expected.json b/test/fixtures/flow/predicates/3/expected.json index 8553cc335f..8bdfbef015 100644 --- a/test/fixtures/flow/predicates/3/expected.json +++ b/test/fixtures/flow/predicates/3/expected.json @@ -267,4 +267,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/predicates/6/expected.json b/test/fixtures/flow/predicates/6/expected.json index 0805a80bd3..2916a3cf54 100644 --- a/test/fixtures/flow/predicates/6/expected.json +++ b/test/fixtures/flow/predicates/6/expected.json @@ -178,7 +178,7 @@ }, "params": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 39, "end": 40, "loc": { @@ -191,11 +191,11 @@ "column": 40 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 } ] }, @@ -530,7 +530,7 @@ } }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 82, "end": 83, "loc": { @@ -543,11 +543,11 @@ "column": 83 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 } ] }, @@ -589,11 +589,12 @@ "name": "Array" } } - } + }, + "predicate": null } } } ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/qualified-generic-type/1/expected.json b/test/fixtures/flow/qualified-generic-type/1/expected.json index 74c8b20f8e..073d4776b7 100644 --- a/test/fixtures/flow/qualified-generic-type/1/expected.json +++ b/test/fixtures/flow/qualified-generic-type/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -127,7 +128,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -143,7 +145,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "B" }, "name": "B" } @@ -156,7 +159,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/qualified-generic-type/2/expected.json b/test/fixtures/flow/qualified-generic-type/2/expected.json index 56ec96bee3..511e2495e0 100644 --- a/test/fixtures/flow/qualified-generic-type/2/expected.json +++ b/test/fixtures/flow/qualified-generic-type/2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -141,7 +142,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -157,7 +159,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "B" }, "name": "B" } @@ -174,7 +177,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "C" }, "name": "C" } @@ -187,7 +191,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/qualified-generic-type/3/expected.json b/test/fixtures/flow/qualified-generic-type/3/expected.json index 5cd3ae50df..aba60b3aeb 100644 --- a/test/fixtures/flow/qualified-generic-type/3/expected.json +++ b/test/fixtures/flow/qualified-generic-type/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -142,7 +143,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "T" }, "name": "T" } @@ -175,7 +177,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -191,7 +194,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "B" }, "name": "B" } @@ -204,7 +208,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/qualified-generic-type/4/expected.json b/test/fixtures/flow/qualified-generic-type/4/expected.json index 4a826a0f2a..5fd9813013 100644 --- a/test/fixtures/flow/qualified-generic-type/4/expected.json +++ b/test/fixtures/flow/qualified-generic-type/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -156,7 +157,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "T" }, "name": "T" } @@ -189,7 +191,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" }, @@ -205,7 +208,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "B" }, "name": "B" } @@ -219,7 +223,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/regression/.arrow-function-parens-with-return-type/expected.json b/test/fixtures/flow/regression/.arrow-function-parens-with-return-type/expected.json deleted file mode 100644 index 4fba0bba88..0000000000 --- a/test/fixtures/flow/regression/.arrow-function-parens-with-return-type/expected.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "sourceType": "module", - "body": [ - { - "type": "VariableDeclaration", - "start": 0, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 4, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "id": { - "type": "Identifier", - "start": 4, - "end": 7, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 7 - } - }, - "name": "foo" - }, - "init": { - "type": "ArrowFunctionExpression", - "start": 10, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "id": null, - "generator": false, - "expression": false, - "async": false, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "name": "foo", - "parenthesizedExpression": true - } - ], - "body": { - "type": "BlockStatement", - "start": 29, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 29 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "body": [] - }, - "returnType": { - "type": "TypeAnnotation", - "start": 17, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 25 - } - }, - "typeAnnotation": { - "type": "StringTypeAnnotation", - "start": 19, - "end": 25, - "loc": { - "start": { - "line": 1, - "column": 19 - }, - "end": { - "line": 1, - "column": 25 - } - } - } - } - } - } - ], - "kind": "var" - } - ] - } -} \ No newline at end of file diff --git a/test/fixtures/flow/regression/issue-2083/expected.json b/test/fixtures/flow/regression/issue-2083/expected.json index 9b59a8861e..ff7b01c2f5 100644 --- a/test/fixtures/flow/regression/issue-2083/expected.json +++ b/test/fixtures/flow/regression/issue-2083/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "foo" }, "name": "foo" }, - "static": false, "kind": "method", "id": null, "generator": false, @@ -217,7 +219,8 @@ "end": { "line": 4, "column": 22 - } + }, + "identifierName": "MatrixType" }, "name": "MatrixType" }, @@ -233,7 +236,8 @@ "end": { "line": 4, "column": 32 - } + }, + "identifierName": "IsScaling" }, "name": "IsScaling" }, @@ -266,7 +270,8 @@ "end": { "line": 4, "column": 45 - } + }, + "identifierName": "MatrixType" }, "name": "MatrixType" }, @@ -282,14 +287,16 @@ "end": { "line": 4, "column": 59 - } + }, + "identifierName": "IsTranslation" }, "name": "IsTranslation" }, "computed": false }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 50 } } } @@ -313,6 +320,7 @@ "column": 3 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -326,11 +334,11 @@ "end": { "line": 8, "column": 5 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, "generator": false, @@ -406,7 +414,8 @@ "end": { "line": 9, "column": 18 - } + }, + "identifierName": "typeA" }, "name": "typeA" }, @@ -432,7 +441,8 @@ "value": 4 }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 134 } }, "operator": "|", @@ -448,7 +458,8 @@ "end": { "line": 9, "column": 32 - } + }, + "identifierName": "typeB" }, "name": "typeB" } diff --git a/test/fixtures/flow/regression/issue-2493/expected.json b/test/fixtures/flow/regression/issue-2493/expected.json index 7442f6e26f..412bb96edd 100644 --- a/test/fixtures/flow/regression/issue-2493/expected.json +++ b/test/fixtures/flow/regression/issue-2493/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "hello" }, "name": "hello" }, @@ -87,6 +88,37 @@ "column": 1 } }, + "returnType": { + "type": "TypeAnnotation", + "start": 41, + "end": 49, + "loc": { + "start": { + "line": 1, + "column": 41 + }, + "end": { + "line": 1, + "column": 49 + } + }, + "typeAnnotation": { + "type": "StringTypeAnnotation", + "start": 43, + "end": 49, + "loc": { + "start": { + "line": 1, + "column": 43 + }, + "end": { + "line": 1, + "column": 49 + } + } + }, + "predicate": null + }, "id": null, "generator": false, "expression": false, @@ -118,7 +150,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "greeting" }, "name": "greeting", "typeAnnotation": { @@ -243,7 +276,8 @@ "end": { "line": 2, "column": 9 - } + }, + "identifierName": "console" }, "name": "console" }, @@ -259,7 +293,8 @@ "end": { "line": 2, "column": 13 - } + }, + "identifierName": "log" }, "name": "log" }, @@ -313,7 +348,8 @@ "end": { "line": 2, "column": 32 - } + }, + "identifierName": "greeting" }, "name": "greeting" } @@ -323,36 +359,6 @@ } ], "directives": [] - }, - "returnType": { - "type": "TypeAnnotation", - "start": 41, - "end": 49, - "loc": { - "start": { - "line": 1, - "column": 41 - }, - "end": { - "line": 1, - "column": 49 - } - }, - "typeAnnotation": { - "type": "StringTypeAnnotation", - "start": 43, - "end": 49, - "loc": { - "start": { - "line": 1, - "column": 43 - }, - "end": { - "line": 1, - "column": 49 - } - } - } } } } @@ -399,7 +405,8 @@ "end": { "line": 5, "column": 5 - } + }, + "identifierName": "hello" }, "name": "hello" }, diff --git a/test/fixtures/flow/trailing-function-commas-type/1/expected.json b/test/fixtures/flow/trailing-function-commas-type/1/expected.json index 114d371dff..765744fb3f 100644 --- a/test/fixtures/flow/trailing-function-commas-type/1/expected.json +++ b/test/fixtures/flow/trailing-function-commas-type/1/expected.json @@ -56,6 +56,55 @@ "column": 42 } }, + "returnType": { + "type": "TypeAnnotation", + "start": 21, + "end": 33, + "loc": { + "start": { + "line": 1, + "column": 21 + }, + "end": { + "line": 1, + "column": 33 + } + }, + "typeAnnotation": { + "type": "GenericTypeAnnotation", + "start": 23, + "end": 33, + "loc": { + "start": { + "line": 1, + "column": 23 + }, + "end": { + "line": 1, + "column": 33 + } + }, + "typeParameters": null, + "id": { + "type": "Identifier", + "start": 23, + "end": 33, + "loc": { + "start": { + "line": 1, + "column": 23 + }, + "end": { + "line": 1, + "column": 33 + }, + "identifierName": "ReturnType" + }, + "name": "ReturnType" + } + }, + "predicate": null + }, "id": null, "generator": false, "expression": true, @@ -73,7 +122,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "props" }, "name": "props", "typeAnnotation": { @@ -117,7 +167,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "SomeType" }, "name": "SomeType" } @@ -146,53 +197,6 @@ "parenStart": 37 }, "value": 3 - }, - "returnType": { - "type": "TypeAnnotation", - "start": 21, - "end": 33, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 33 - } - }, - "typeAnnotation": { - "type": "GenericTypeAnnotation", - "start": 23, - "end": 33, - "loc": { - "start": { - "line": 1, - "column": 23 - }, - "end": { - "line": 1, - "column": 33 - } - }, - "typeParameters": null, - "id": { - "type": "Identifier", - "start": 23, - "end": 33, - "loc": { - "start": { - "line": 1, - "column": 23 - }, - "end": { - "line": 1, - "column": 33 - } - }, - "name": "ReturnType" - } - } } } } diff --git a/test/fixtures/flow/tuples/1/expected.json b/test/fixtures/flow/tuples/1/expected.json index a5dd1a823b..7694ca00f1 100644 --- a/test/fixtures/flow/tuples/1/expected.json +++ b/test/fixtures/flow/tuples/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -124,7 +125,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/tuples/2/expected.json b/test/fixtures/flow/tuples/2/expected.json index 628e2579d4..6044a8c8d9 100644 --- a/test/fixtures/flow/tuples/2/expected.json +++ b/test/fixtures/flow/tuples/2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -157,7 +158,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "T" }, "name": "T" } @@ -176,7 +178,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "Foo" }, "name": "Foo" } @@ -212,7 +215,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -222,7 +226,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/tuples/3/expected.json b/test/fixtures/flow/tuples/3/expected.json index 175fca2fdf..a358df13e8 100644 --- a/test/fixtures/flow/tuples/3/expected.json +++ b/test/fixtures/flow/tuples/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { diff --git a/test/fixtures/flow/tuples/4/expected.json b/test/fixtures/flow/tuples/4/expected.json index 5a29b26f34..9cd18d0a93 100644 --- a/test/fixtures/flow/tuples/4/expected.json +++ b/test/fixtures/flow/tuples/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { diff --git a/test/fixtures/flow/type-alias/1/expected.json b/test/fixtures/flow/type-alias/1/expected.json index a889ed041a..f6591175a3 100644 --- a/test/fixtures/flow/type-alias/1/expected.json +++ b/test/fixtures/flow/type-alias/1/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "FBID" }, "name": "FBID" }, @@ -75,7 +76,7 @@ } } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-alias/2/expected.json b/test/fixtures/flow/type-alias/2/expected.json index f44d030159..974e65eb4d 100644 --- a/test/fixtures/flow/type-alias/2/expected.json +++ b/test/fixtures/flow/type-alias/2/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 8 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -87,7 +88,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -147,7 +149,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "T" }, "name": "T" } @@ -166,7 +169,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "Bar" }, "name": "Bar" } diff --git a/test/fixtures/flow/type-alias/3/expected.json b/test/fixtures/flow/type-alias/3/expected.json index 411a17ad35..cda0b600d3 100644 --- a/test/fixtures/flow/type-alias/3/expected.json +++ b/test/fixtures/flow/type-alias/3/expected.json @@ -42,6 +42,9 @@ "column": 25 } }, + "specifiers": [], + "source": null, + "exportKind": "type", "declaration": { "type": "TypeAlias", "start": 7, @@ -68,7 +71,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,11 +92,9 @@ } } } - }, - "specifiers": [], - "source": null + } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-alias/4/expected.json b/test/fixtures/flow/type-alias/4/expected.json index 829a4048e2..42a84bca7b 100644 --- a/test/fixtures/flow/type-alias/4/expected.json +++ b/test/fixtures/flow/type-alias/4/expected.json @@ -136,11 +136,11 @@ "column": 13 } }, - "value": "A", "extra": { "rawValue": "A", "raw": "\"A\"" - } + }, + "value": "A" }, "optional": false, "static": false, @@ -211,11 +211,11 @@ "column": 13 } }, - "value": "B", "extra": { "rawValue": "B", "raw": "\"B\"" - } + }, + "value": "B" }, "optional": false, "static": false, @@ -597,11 +597,11 @@ "column": 16 } }, - "value": "A", "extra": { "rawValue": "A", "raw": "\"A\"" - } + }, + "value": "A" }, "optional": false, "static": false, @@ -672,11 +672,11 @@ "column": 16 } }, - "value": "B", "extra": { "rawValue": "B", "raw": "\"B\"" - } + }, + "value": "B" }, "optional": false, "static": false, @@ -852,11 +852,11 @@ "column": 16 } }, - "value": "A", "extra": { "rawValue": "A", "raw": "\"A\"" - } + }, + "value": "A" }, "optional": false, "static": false, @@ -927,11 +927,11 @@ "column": 16 } }, - "value": "B", "extra": { "rawValue": "B", "raw": "\"B\"" - } + }, + "value": "B" }, "optional": false, "static": false, diff --git a/test/fixtures/flow/type-annotations/1/expected.json b/test/fixtures/flow/type-annotations/1/expected.json index 4d022b66ad..ae49055627 100644 --- a/test/fixtures/flow/type-annotations/1/expected.json +++ b/test/fixtures/flow/type-annotations/1/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { @@ -119,7 +122,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "otherVal" }, "name": "otherVal", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/10/expected.json b/test/fixtures/flow/type-annotations/10/expected.json index 6aae036622..9e46f1b9bf 100644 --- a/test/fixtures/flow/type-annotations/10/expected.json +++ b/test/fixtures/flow/type-annotations/10/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 53 - } + }, + "identifierName": "callback" }, "name": "callback", "typeAnnotation": { @@ -131,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "_1" }, "name": "_1" }, @@ -178,7 +182,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "_2" }, "name": "_2" }, diff --git a/test/fixtures/flow/type-annotations/100/expected.json b/test/fixtures/flow/type-annotations/100/expected.json index 5efdb76d0e..41ea4f70df 100644 --- a/test/fixtures/flow/type-annotations/100/expected.json +++ b/test/fixtures/flow/type-annotations/100/expected.json @@ -1,4 +1,3 @@ - { "type": "File", "start": 0, @@ -55,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -89,6 +89,7 @@ "column": 39 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -102,99 +103,102 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "id": null, - "generator": false, - "expression": false, - "async": false, - "params": [], - "returnType": { - "type": "TypeAnnotation", - "start": 17, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 22 - } - }, - "typeAnnotation": { - "type": "ThisTypeAnnotation", - "start": 18, - "end": 22, - "loc": { - "start": { - "line": 1, - "column": 18 - }, - "end": { - "line": 1, - "column": 22 - } - } - } - }, - "body": { - "type": "BlockStatement", - "start": 23, - "end": 39, - "loc": { - "start": { - "line": 1, - "column": 23 - }, - "end": { - "line": 1, - "column": 39 - } - }, - "body": [ - { - "type": "ReturnStatement", - "start": 25, - "end": 37, - "loc": { - "start": { - "line": 1, - "column": 25 - }, - "end": { - "line": 1, - "column": 37 - } - }, - "argument": { - "type": "ThisExpression", - "start": 32, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 32 - }, - "end": { - "line": 1, - "column": 36 - } - } - } - } - ] - } + "generator": false, + "expression": false, + "async": false, + "params": [], + "returnType": { + "type": "TypeAnnotation", + "start": 17, + "end": 22, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 22 + } + }, + "typeAnnotation": { + "type": "ThisTypeAnnotation", + "start": 18, + "end": 22, + "loc": { + "start": { + "line": 1, + "column": 18 + }, + "end": { + "line": 1, + "column": 22 + } + }, + "value": true + }, + "predicate": null + }, + "body": { + "type": "BlockStatement", + "start": 23, + "end": 39, + "loc": { + "start": { + "line": 1, + "column": 23 + }, + "end": { + "line": 1, + "column": 39 + } + }, + "body": [ + { + "type": "ReturnStatement", + "start": 25, + "end": 37, + "loc": { + "start": { + "line": 1, + "column": 25 + }, + "end": { + "line": 1, + "column": 37 + } + }, + "argument": { + "type": "ThisExpression", + "start": 32, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 32 + }, + "end": { + "line": 1, + "column": 36 + } + } + } + } + ], + "directives": [] + } } ] } } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/101/expected.json b/test/fixtures/flow/type-annotations/101/expected.json index ae370710de..dd76a3f6b4 100644 --- a/test/fixtures/flow/type-annotations/101/expected.json +++ b/test/fixtures/flow/type-annotations/101/expected.json @@ -111,12 +111,14 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "ReturnType" }, "name": "ReturnType" } } - } + }, + "predicate": null }, "id": null, "generator": false, @@ -149,7 +151,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "props" }, "name": "props" }, @@ -194,7 +197,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "SomeType" }, "name": "SomeType" } @@ -229,4 +233,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/102/expected.json b/test/fixtures/flow/type-annotations/102/expected.json index 4af93bb673..c03c26b03d 100644 --- a/test/fixtures/flow/type-annotations/102/expected.json +++ b/test/fixtures/flow/type-annotations/102/expected.json @@ -128,11 +128,13 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "Array" }, "name": "Array" } - } + }, + "predicate": null }, "id": null, "generator": false, @@ -165,7 +167,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "modifiers" }, "name": "modifiers" } @@ -193,4 +196,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/103/expected.json b/test/fixtures/flow/type-annotations/103/expected.json index 0ef3fc5e61..9824789642 100644 --- a/test/fixtures/flow/type-annotations/103/expected.json +++ b/test/fixtures/flow/type-annotations/103/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "parser" }, "name": "parser" }, @@ -128,11 +129,13 @@ "end": { "line": 1, "column": 67 - } + }, + "identifierName": "a" }, "name": "a" } - } + }, + "predicate": null }, "id": null, "generator": false, @@ -151,7 +154,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "rootPath" }, "name": "rootPath", "typeAnnotation": { @@ -211,7 +215,8 @@ "end": { "line": 1, "column": 49 - } + }, + "identifierName": "filesToParse" }, "name": "filesToParse" }, @@ -287,7 +292,8 @@ "end": { "line": 1, "column": 56 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/104/expected.json b/test/fixtures/flow/type-annotations/104/expected.json index d1bef6ae76..6ff300d7c7 100644 --- a/test/fixtures/flow/type-annotations/104/expected.json +++ b/test/fixtures/flow/type-annotations/104/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 13 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "get" }, "name": "get" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -136,7 +138,8 @@ "column": 7 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -192,7 +195,8 @@ "end": { "line": 5, "column": 9 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -226,6 +230,7 @@ "column": 13 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -239,11 +244,11 @@ "end": { "line": 6, "column": 5 - } + }, + "identifierName": "set" }, "name": "set" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -274,7 +279,8 @@ "column": 7 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -307,4 +313,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/107/expected.json b/test/fixtures/flow/type-annotations/107/expected.json index b17400628a..9f972ee738 100644 --- a/test/fixtures/flow/type-annotations/107/expected.json +++ b/test/fixtures/flow/type-annotations/107/expected.json @@ -256,4 +256,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/108/expected.json b/test/fixtures/flow/type-annotations/108/expected.json index 4d147cf4f4..ae2c71d275 100644 --- a/test/fixtures/flow/type-annotations/108/expected.json +++ b/test/fixtures/flow/type-annotations/108/expected.json @@ -150,6 +150,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -199,6 +200,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -460,6 +462,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -509,6 +512,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -917,6 +921,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -966,6 +971,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -973,6 +979,7 @@ "exact": true }, "optional": false, + "static": false, "variance": null }, { @@ -1022,6 +1029,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -1433,6 +1441,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -1482,6 +1491,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -1489,6 +1499,7 @@ "exact": false }, "optional": false, + "static": false, "variance": null }, { @@ -1538,6 +1549,7 @@ } }, "optional": false, + "static": false, "variance": null } ], diff --git a/test/fixtures/flow/type-annotations/11/expected.json b/test/fixtures/flow/type-annotations/11/expected.json index 5de62117eb..10d10e3696 100644 --- a/test/fixtures/flow/type-annotations/11/expected.json +++ b/test/fixtures/flow/type-annotations/11/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 64 - } + }, + "identifierName": "callback" }, "name": "callback", "typeAnnotation": { @@ -131,7 +134,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "_1" }, "name": "_1" }, @@ -179,7 +183,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -242,7 +247,8 @@ "end": { "line": 1, "column": 45 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/110/expected.json b/test/fixtures/flow/type-annotations/110/expected.json index 6556914731..f637eb85b6 100644 --- a/test/fixtures/flow/type-annotations/110/expected.json +++ b/test/fixtures/flow/type-annotations/110/expected.json @@ -142,7 +142,22 @@ }, "optional": false, "static": false, - "variance": "plus" + "variance": { + "type": "Variance", + "start": 10, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "kind": "plus" + } } ], "indexers": [], @@ -152,4 +167,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/111/expected.json b/test/fixtures/flow/type-annotations/111/expected.json index 8dde23737d..088ac9c758 100644 --- a/test/fixtures/flow/type-annotations/111/expected.json +++ b/test/fixtures/flow/type-annotations/111/expected.json @@ -142,7 +142,22 @@ }, "optional": false, "static": false, - "variance": "minus" + "variance": { + "type": "Variance", + "start": 10, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "kind": "minus" + } } ], "indexers": [], @@ -152,4 +167,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/114/expected.json b/test/fixtures/flow/type-annotations/114/expected.json index 6279284056..5cbe3ec43a 100644 --- a/test/fixtures/flow/type-annotations/114/expected.json +++ b/test/fixtures/flow/type-annotations/114/expected.json @@ -175,7 +175,22 @@ "name": "V" } }, - "variance": "plus" + "variance": { + "type": "Variance", + "start": 10, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "kind": "plus" + } } ], "exact": false @@ -184,4 +199,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/115/expected.json b/test/fixtures/flow/type-annotations/115/expected.json index 2ed71ae23e..cdb32af1e6 100644 --- a/test/fixtures/flow/type-annotations/115/expected.json +++ b/test/fixtures/flow/type-annotations/115/expected.json @@ -175,7 +175,22 @@ "name": "V" } }, - "variance": "minus" + "variance": { + "type": "Variance", + "start": 10, + "end": 11, + "loc": { + "start": { + "line": 1, + "column": 10 + }, + "end": { + "line": 1, + "column": 11 + } + }, + "kind": "minus" + } } ], "exact": false @@ -184,4 +199,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/118/expected.json b/test/fixtures/flow/type-annotations/118/expected.json index 3197ff95a7..86dba55ab3 100644 --- a/test/fixtures/flow/type-annotations/118/expected.json +++ b/test/fixtures/flow/type-annotations/118/expected.json @@ -89,6 +89,7 @@ "column": 13 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -107,8 +108,22 @@ }, "name": "p" }, - "variance": "plus", - "static": false, + "variance": { + "type": "Variance", + "start": 9, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 10 + } + }, + "kind": "plus" + }, "typeAnnotation": { "type": "TypeAnnotation", "start": 11, @@ -165,4 +180,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/119/expected.json b/test/fixtures/flow/type-annotations/119/expected.json index 601ec1663f..b975624266 100644 --- a/test/fixtures/flow/type-annotations/119/expected.json +++ b/test/fixtures/flow/type-annotations/119/expected.json @@ -89,6 +89,7 @@ "column": 13 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -107,8 +108,22 @@ }, "name": "p" }, - "variance": "minus", - "static": false, + "variance": { + "type": "Variance", + "start": 9, + "end": 10, + "loc": { + "start": { + "line": 1, + "column": 9 + }, + "end": { + "line": 1, + "column": 10 + } + }, + "kind": "minus" + }, "typeAnnotation": { "type": "TypeAnnotation", "start": 11, @@ -165,4 +180,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/12/expected.json b/test/fixtures/flow/type-annotations/12/expected.json index fddf075029..9b0105cae1 100644 --- a/test/fixtures/flow/type-annotations/12/expected.json +++ b/test/fixtures/flow/type-annotations/12/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "returnType": { "type": "TypeAnnotation", @@ -89,7 +91,8 @@ "column": 21 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/129/expected.json b/test/fixtures/flow/type-annotations/129/expected.json index e55c90e118..ecffbbf855 100644 --- a/test/fixtures/flow/type-annotations/129/expected.json +++ b/test/fixtures/flow/type-annotations/129/expected.json @@ -103,7 +103,7 @@ }, "types": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 10, "end": 11, "loc": { @@ -116,14 +116,14 @@ "column": 4 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 15, "end": 16, "loc": { @@ -136,11 +136,11 @@ "column": 4 } }, - "value": 2, "extra": { "rawValue": 2, "raw": "2" - } + }, + "value": 2 } ] } diff --git a/test/fixtures/flow/type-annotations/13/expected.json b/test/fixtures/flow/type-annotations/13/expected.json index 1070cfbe37..4e216e438a 100644 --- a/test/fixtures/flow/type-annotations/13/expected.json +++ b/test/fixtures/flow/type-annotations/13/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "returnType": { "type": "TypeAnnotation", @@ -107,7 +109,8 @@ } }, "typeParameters": null - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/130/expected.json b/test/fixtures/flow/type-annotations/130/expected.json index 2a823858a4..04fcde6a9b 100644 --- a/test/fixtures/flow/type-annotations/130/expected.json +++ b/test/fixtures/flow/type-annotations/130/expected.json @@ -109,7 +109,7 @@ }, "types": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 16, "end": 17, "loc": { @@ -122,14 +122,14 @@ "column": 17 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 20, "end": 21, "loc": { @@ -142,11 +142,11 @@ "column": 21 } }, - "value": 2, "extra": { "rawValue": 2, "raw": "2" - } + }, + "value": 2 } ] } @@ -198,7 +198,7 @@ }, "types": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 28, "end": 29, "loc": { @@ -211,14 +211,14 @@ "column": 29 } }, - "value": 3, "extra": { "rawValue": 3, "raw": "3" - } + }, + "value": 3 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 32, "end": 33, "loc": { @@ -231,11 +231,11 @@ "column": 33 } }, - "value": 4, "extra": { "rawValue": 4, "raw": "4" - } + }, + "value": 4 } ] } @@ -270,7 +270,8 @@ "column": 42 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/14/expected.json b/test/fixtures/flow/type-annotations/14/expected.json index 96fb6480b2..df8525c0d6 100644 --- a/test/fixtures/flow/type-annotations/14/expected.json +++ b/test/fixtures/flow/type-annotations/14/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "returnType": { "type": "TypeAnnotation", @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "_" }, "name": "_" }, @@ -155,7 +158,8 @@ } }, "typeParameters": null - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/15/expected.json b/test/fixtures/flow/type-annotations/15/expected.json index 310bd0ca0c..a6da914974 100644 --- a/test/fixtures/flow/type-annotations/15/expected.json +++ b/test/fixtures/flow/type-annotations/15/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "returnType": { "type": "TypeAnnotation", @@ -116,7 +118,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "_" }, "name": "_" }, @@ -155,7 +158,8 @@ } }, "typeParameters": null - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/16/expected.json b/test/fixtures/flow/type-annotations/16/expected.json index 392f618655..3f39468f6a 100644 --- a/test/fixtures/flow/type-annotations/16/expected.json +++ b/test/fixtures/flow/type-annotations/16/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [], "returnType": { "type": "TypeAnnotation", @@ -91,8 +93,10 @@ }, "callProperties": [], "properties": [], - "indexers": [] - } + "indexers": [], + "exact": false + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/17/expected.json b/test/fixtures/flow/type-annotations/17/expected.json index 79b5a0eac8..ca24d0c90a 100644 --- a/test/fixtures/flow/type-annotations/17/expected.json +++ b/test/fixtures/flow/type-annotations/17/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,7 +91,8 @@ "column": 14 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/18/expected.json b/test/fixtures/flow/type-annotations/18/expected.json index 914cf6d4a7..56d24c9789 100644 --- a/test/fixtures/flow/type-annotations/18/expected.json +++ b/test/fixtures/flow/type-annotations/18/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -90,7 +91,8 @@ "column": 14 } }, - "name": "T" + "name": "T", + "variance": null }, { "type": "TypeParameter", @@ -106,7 +108,8 @@ "column": 16 } }, - "name": "S" + "name": "S", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/19/expected.json b/test/fixtures/flow/type-annotations/19/expected.json index efca68b2de..6155d2e0f5 100644 --- a/test/fixtures/flow/type-annotations/19/expected.json +++ b/test/fixtures/flow/type-annotations/19/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -120,7 +121,8 @@ "column": 12 } }, - "name": "T" + "name": "T", + "variance": null }, { "type": "TypeParameter", @@ -136,7 +138,8 @@ "column": 14 } }, - "name": "S" + "name": "S", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/2/expected.json b/test/fixtures/flow/type-annotations/2/expected.json index 9f0c84fa45..39c2e55c4f 100644 --- a/test/fixtures/flow/type-annotations/2/expected.json +++ b/test/fixtures/flow/type-annotations/2/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/20/expected.json b/test/fixtures/flow/type-annotations/20/expected.json index e21b48d766..cf418c1dd4 100644 --- a/test/fixtures/flow/type-annotations/20/expected.json +++ b/test/fixtures/flow/type-annotations/20/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,11 +118,13 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, "kind": "set", + "variance": null, "id": null, "generator": false, "expression": false, @@ -139,7 +142,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "value" }, "name": "value", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/21/expected.json b/test/fixtures/flow/type-annotations/21/expected.json index d1ddc78e40..9a7b0f628b 100644 --- a/test/fixtures/flow/type-annotations/21/expected.json +++ b/test/fixtures/flow/type-annotations/21/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,11 +118,13 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, "kind": "set", + "variance": null, "id": null, "generator": false, "expression": false, @@ -139,7 +142,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "value" }, "name": "value", "typeAnnotation": { @@ -202,7 +206,8 @@ "column": 33 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/22/expected.json b/test/fixtures/flow/type-annotations/22/expected.json index 4725285737..f851043cf5 100644 --- a/test/fixtures/flow/type-annotations/22/expected.json +++ b/test/fixtures/flow/type-annotations/22/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,11 +118,13 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, "kind": "get", + "variance": null, "id": null, "generator": false, "expression": false, @@ -155,7 +158,8 @@ "column": 23 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/23/expected.json b/test/fixtures/flow/type-annotations/23/expected.json index 3cb0c90897..26289cb8bf 100644 --- a/test/fixtures/flow/type-annotations/23/expected.json +++ b/test/fixtures/flow/type-annotations/23/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "id" }, "name": "id" }, @@ -139,7 +141,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -183,7 +186,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "T" }, "name": "T" } @@ -232,11 +236,13 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "T" }, "name": "T" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", @@ -284,7 +290,8 @@ "column": 7 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-annotations/24/expected.json b/test/fixtures/flow/type-annotations/24/expected.json index 8d2e85d6c2..cb9a6c5fbc 100644 --- a/test/fixtures/flow/type-annotations/24/expected.json +++ b/test/fixtures/flow/type-annotations/24/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "id" }, "name": "id" }, @@ -139,7 +141,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -183,7 +186,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "T" }, "name": "T" } @@ -232,11 +236,13 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "T" }, "name": "T" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", @@ -284,7 +290,8 @@ "column": 8 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-annotations/25/expected.json b/test/fixtures/flow/type-annotations/25/expected.json index cc26713d44..b5e58e017c 100644 --- a/test/fixtures/flow/type-annotations/25/expected.json +++ b/test/fixtures/flow/type-annotations/25/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -117,7 +118,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "id" }, "name": "id" }, @@ -139,7 +141,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -183,7 +186,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "T" }, "name": "T" } @@ -232,11 +236,13 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "T" }, "name": "T" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", @@ -284,7 +290,8 @@ "column": 13 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-annotations/26/expected.json b/test/fixtures/flow/type-annotations/26/expected.json index 0507d3b4dc..e2c02a54a5 100644 --- a/test/fixtures/flow/type-annotations/26/expected.json +++ b/test/fixtures/flow/type-annotations/26/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -143,7 +144,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -187,7 +189,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "T" }, "name": "T" } @@ -236,11 +239,13 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "T" }, "name": "T" } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", @@ -288,7 +293,8 @@ "column": 8 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-annotations/27/expected.json b/test/fixtures/flow/type-annotations/27/expected.json index 71c96e968a..07d8b8fd2d 100644 --- a/test/fixtures/flow/type-annotations/27/expected.json +++ b/test/fixtures/flow/type-annotations/27/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 38 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, - "static": false, "kind": "set", "id": null, "generator": false, @@ -124,7 +126,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "value" }, "name": "value", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/28/expected.json b/test/fixtures/flow/type-annotations/28/expected.json index ba9b916990..b5c04ffc8d 100644 --- a/test/fixtures/flow/type-annotations/28/expected.json +++ b/test/fixtures/flow/type-annotations/28/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 43 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, - "static": false, "kind": "set", "id": null, "generator": false, @@ -124,7 +126,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "value" }, "name": "value", "typeAnnotation": { @@ -187,7 +190,8 @@ "column": 41 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/29/expected.json b/test/fixtures/flow/type-annotations/29/expected.json index b675422aca..1f35974d10 100644 --- a/test/fixtures/flow/type-annotations/29/expected.json +++ b/test/fixtures/flow/type-annotations/29/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 33 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "fooProp" }, "name": "fooProp" }, - "static": false, "kind": "get", "id": null, "generator": false, @@ -140,7 +142,8 @@ "column": 31 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/3/expected.json b/test/fixtures/flow/type-annotations/3/expected.json index 6c069ca9dd..ad0533f545 100644 --- a/test/fixtures/flow/type-annotations/3/expected.json +++ b/test/fixtures/flow/type-annotations/3/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { @@ -119,7 +122,8 @@ "end": { "line": 1, "column": 43 - } + }, + "identifierName": "strVal" }, "name": "strVal", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/30/expected.json b/test/fixtures/flow/type-annotations/30/expected.json index f2d9219592..3bf70055fa 100644 --- a/test/fixtures/flow/type-annotations/30/expected.json +++ b/test/fixtures/flow/type-annotations/30/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { @@ -108,7 +109,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/31/expected.json b/test/fixtures/flow/type-annotations/31/expected.json index c885a0e4d9..654148cf75 100644 --- a/test/fixtures/flow/type-annotations/31/expected.json +++ b/test/fixtures/flow/type-annotations/31/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { @@ -115,7 +116,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "otherNumVal" }, "name": "otherNumVal" } @@ -123,7 +125,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/32/expected.json b/test/fixtures/flow/type-annotations/32/expected.json index 272d0ef394..ce82a0dbf1 100644 --- a/test/fixtures/flow/type-annotations/32/expected.json +++ b/test/fixtures/flow/type-annotations/32/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "numVal" }, "name": "numVal" }, @@ -148,10 +150,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -160,7 +164,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/33/expected.json b/test/fixtures/flow/type-annotations/33/expected.json index 0debe1f0b4..9c2bc6c2da 100644 --- a/test/fixtures/flow/type-annotations/33/expected.json +++ b/test/fixtures/flow/type-annotations/33/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "numVal" }, "name": "numVal" }, @@ -148,10 +150,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -160,7 +164,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/34/expected.json b/test/fixtures/flow/type-annotations/34/expected.json index dda3fa64e2..a9ca235616 100644 --- a/test/fixtures/flow/type-annotations/34/expected.json +++ b/test/fixtures/flow/type-annotations/34/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 50 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "numVal" }, "name": "numVal" }, @@ -148,6 +150,7 @@ } }, "optional": false, + "static": false, "variance": null } ], @@ -166,6 +169,7 @@ "column": 49 } }, + "static": false, "id": { "type": "Identifier", "start": 25, @@ -178,7 +182,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "indexer" }, "name": "indexer" }, @@ -214,7 +219,8 @@ }, "variance": null } - ] + ], + "exact": false } } }, @@ -223,7 +229,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/35/expected.json b/test/fixtures/flow/type-annotations/35/expected.json index 9b7e857b25..226236359b 100644 --- a/test/fixtures/flow/type-annotations/35/expected.json +++ b/test/fixtures/flow/type-annotations/35/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -142,7 +143,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "numVal" }, "name": "numVal" }, @@ -162,10 +164,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } } @@ -175,7 +179,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/36/expected.json b/test/fixtures/flow/type-annotations/36/expected.json index 564ecad3f2..4ef8af37d3 100644 --- a/test/fixtures/flow/type-annotations/36/expected.json +++ b/test/fixtures/flow/type-annotations/36/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "numVal" }, "name": "numVal" }, @@ -148,6 +150,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -176,7 +179,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "strVal" }, "name": "strVal" }, @@ -196,10 +200,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -208,7 +214,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/37/expected.json b/test/fixtures/flow/type-annotations/37/expected.json index b28c546643..ef13a1423d 100644 --- a/test/fixtures/flow/type-annotations/37/expected.json +++ b/test/fixtures/flow/type-annotations/37/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "subObj" }, "name": "subObj" }, @@ -174,7 +176,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "strVal" }, "name": "strVal" }, @@ -194,16 +197,20 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -212,7 +219,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/38/expected.json b/test/fixtures/flow/type-annotations/38/expected.json index d9a1247969..a37a224c5e 100644 --- a/test/fixtures/flow/type-annotations/38/expected.json +++ b/test/fixtures/flow/type-annotations/38/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "subObj" }, "name": "subObj" }, @@ -188,7 +190,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "strVal" }, "name": "strVal" }, @@ -208,17 +211,21 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -227,7 +234,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/39/expected.json b/test/fixtures/flow/type-annotations/39/expected.json index 4e263242a8..aeb80942b7 100644 --- a/test/fixtures/flow/type-annotations/39/expected.json +++ b/test/fixtures/flow/type-annotations/39/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "param1" }, "name": "param1" }, @@ -148,6 +150,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -176,7 +179,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "param2" }, "name": "param2" }, @@ -196,10 +200,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -208,7 +214,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/4/expected.json b/test/fixtures/flow/type-annotations/4/expected.json index c888bafd92..5535d3d0de 100644 --- a/test/fixtures/flow/type-annotations/4/expected.json +++ b/test/fixtures/flow/type-annotations/4/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { @@ -119,7 +122,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "untypedVal" }, "name": "untypedVal" } diff --git a/test/fixtures/flow/type-annotations/40/expected.json b/test/fixtures/flow/type-annotations/40/expected.json index 14d938827c..57f986dc1b 100644 --- a/test/fixtures/flow/type-annotations/40/expected.json +++ b/test/fixtures/flow/type-annotations/40/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "param1" }, "name": "param1" }, @@ -148,6 +150,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -176,7 +179,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "param2" }, "name": "param2" }, @@ -196,10 +200,12 @@ } }, "optional": true, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -208,7 +214,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/41/expected.json b/test/fixtures/flow/type-annotations/41/expected.json index 11f1b5529a..af45a70ad3 100644 --- a/test/fixtures/flow/type-annotations/41/expected.json +++ b/test/fixtures/flow/type-annotations/41/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 52 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -106,7 +107,7 @@ { "type": "ObjectTypeIndexer", "start": 9, - "end": 29, + "end": 28, "loc": { "start": { "line": 1, @@ -114,9 +115,10 @@ }, "end": { "line": 1, - "column": 29 + "column": 28 } }, + "static": false, "id": { "type": "Identifier", "start": 10, @@ -129,7 +131,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -162,12 +165,13 @@ "column": 28 } } - } + }, + "variance": null }, { "type": "ObjectTypeIndexer", "start": 30, - "end": 50, + "end": 49, "loc": { "start": { "line": 1, @@ -175,9 +179,10 @@ }, "end": { "line": 1, - "column": 50 + "column": 49 } }, + "static": false, "id": { "type": "Identifier", "start": 31, @@ -190,7 +195,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -226,7 +232,8 @@ }, "variance": null } - ] + ], + "exact": false } } }, @@ -235,7 +242,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/42/expected.json b/test/fixtures/flow/type-annotations/42/expected.json index 41e59eda82..c02588c4e6 100644 --- a/test/fixtures/flow/type-annotations/42/expected.json +++ b/test/fixtures/flow/type-annotations/42/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 48 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -157,7 +158,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -205,7 +207,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -268,7 +271,8 @@ "end": { "line": 1, "column": 32 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -291,6 +295,7 @@ } } }, + "static": false, "key": { "type": "Identifier", "start": 8, @@ -303,14 +308,16 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "add" }, "name": "add" }, "optional": false } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -319,7 +326,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/43/expected.json b/test/fixtures/flow/type-annotations/43/expected.json index 5c47531465..f74ef8a76c 100644 --- a/test/fixtures/flow/type-annotations/43/expected.json +++ b/test/fixtures/flow/type-annotations/43/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -157,7 +158,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -189,7 +191,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "T" }, "name": "T" } @@ -226,7 +229,8 @@ "column": 13 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -257,12 +261,14 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "T" }, "name": "T" } } }, + "static": false, "key": { "type": "Identifier", "start": 9, @@ -275,14 +281,16 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "id" }, "name": "id" }, "optional": false } ], - "indexers": [] + "indexers": [], + "exact": false } } }, diff --git a/test/fixtures/flow/type-annotations/44/expected.json b/test/fixtures/flow/type-annotations/44/expected.json index fe5e161b5b..2859b99a3d 100644 --- a/test/fixtures/flow/type-annotations/44/expected.json +++ b/test/fixtures/flow/type-annotations/44/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -144,7 +145,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/45/expected.json b/test/fixtures/flow/type-annotations/45/expected.json index b56df4cd7d..369cc5973e 100644 --- a/test/fixtures/flow/type-annotations/45/expected.json +++ b/test/fixtures/flow/type-annotations/45/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -132,7 +134,8 @@ "column": 15 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/46/expected.json b/test/fixtures/flow/type-annotations/46/expected.json index e14dc6e612..22ae4951bf 100644 --- a/test/fixtures/flow/type-annotations/46/expected.json +++ b/test/fixtures/flow/type-annotations/46/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 1 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -132,7 +134,8 @@ "column": 15 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -148,7 +151,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -194,7 +198,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "T" }, "name": "T" } diff --git a/test/fixtures/flow/type-annotations/47/expected.json b/test/fixtures/flow/type-annotations/47/expected.json index 00836457fd..911bf4b32b 100644 --- a/test/fixtures/flow/type-annotations/47/expected.json +++ b/test/fixtures/flow/type-annotations/47/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -87,7 +88,8 @@ "column": 11 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/48/expected.json b/test/fixtures/flow/type-annotations/48/expected.json index e47282901d..aedd16db88 100644 --- a/test/fixtures/flow/type-annotations/48/expected.json +++ b/test/fixtures/flow/type-annotations/48/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -87,7 +88,8 @@ "column": 11 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -103,7 +105,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Bar" }, "name": "Bar" }, @@ -149,7 +152,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "T" }, "name": "T" } diff --git a/test/fixtures/flow/type-annotations/49/expected.json b/test/fixtures/flow/type-annotations/49/expected.json index caeb365866..d75e33a263 100644 --- a/test/fixtures/flow/type-annotations/49/expected.json +++ b/test/fixtures/flow/type-annotations/49/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -87,7 +88,8 @@ "column": 11 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "mixin" }, "name": "mixin" }, @@ -134,7 +137,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "Bar" }, "name": "Bar" } diff --git a/test/fixtures/flow/type-annotations/5/expected.json b/test/fixtures/flow/type-annotations/5/expected.json index f68cf9d341..17d938d5d6 100644 --- a/test/fixtures/flow/type-annotations/5/expected.json +++ b/test/fixtures/flow/type-annotations/5/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "untypedVal" }, "name": "untypedVal" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "numVal" }, "name": "numVal", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/50/expected.json b/test/fixtures/flow/type-annotations/50/expected.json index 31174046a3..ded300b573 100644 --- a/test/fixtures/flow/type-annotations/50/expected.json +++ b/test/fixtures/flow/type-annotations/50/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -87,7 +88,8 @@ "column": 11 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -121,6 +123,7 @@ "column": 45 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -134,11 +137,11 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "bar" }, "name": "bar" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -169,7 +172,8 @@ "column": 20 } }, - "name": "U" + "name": "U", + "variance": null } ] }, @@ -206,7 +210,8 @@ "column": 30 } } - } + }, + "predicate": null }, "body": { "type": "BlockStatement", diff --git a/test/fixtures/flow/type-annotations/51/expected.json b/test/fixtures/flow/type-annotations/51/expected.json index a17c526b21..333398285e 100644 --- a/test/fixtures/flow/type-annotations/51/expected.json +++ b/test/fixtures/flow/type-annotations/51/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 26 } }, + "static": false, "computed": false, "key": { "type": "StringLiteral", @@ -109,7 +111,6 @@ }, "value": "bar" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -140,7 +141,8 @@ "column": 19 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/52/expected.json b/test/fixtures/flow/type-annotations/52/expected.json index 6a7b1c6f37..ccd862000e 100644 --- a/test/fixtures/flow/type-annotations/52/expected.json +++ b/test/fixtures/flow/type-annotations/52/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "requiredParam" }, "name": "requiredParam" }, @@ -89,7 +92,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "optParam" }, "name": "optParam", "optional": true diff --git a/test/fixtures/flow/type-annotations/53/expected.json b/test/fixtures/flow/type-annotations/53/expected.json index 92988c85ef..c07a57c007 100644 --- a/test/fixtures/flow/type-annotations/53/expected.json +++ b/test/fixtures/flow/type-annotations/53/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 25 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,12 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "prop1" }, "name": "prop1" }, - "static": false, + "variance": null, "typeAnnotation": { "type": "TypeAnnotation", "start": 17, @@ -152,6 +155,7 @@ "column": 39 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -165,11 +169,12 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "prop2" }, "name": "prop2" }, - "static": false, + "variance": null, "typeAnnotation": { "type": "TypeAnnotation", "start": 31, @@ -205,7 +210,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/54/expected.json b/test/fixtures/flow/type-annotations/54/expected.json index 02529f9695..4090718b15 100644 --- a/test/fixtures/flow/type-annotations/54/expected.json +++ b/test/fixtures/flow/type-annotations/54/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "Foo" }, "name": "Foo" }, @@ -88,6 +89,7 @@ "column": 32 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,12 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "prop1" }, "name": "prop1" }, - "static": true, + "variance": null, "typeAnnotation": { "type": "TypeAnnotation", "start": 24, @@ -152,6 +155,7 @@ "column": 46 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -165,11 +169,12 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "prop2" }, "name": "prop2" }, - "static": false, + "variance": null, "typeAnnotation": { "type": "TypeAnnotation", "start": 38, @@ -205,7 +210,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/55/expected.json b/test/fixtures/flow/type-annotations/55/expected.json index 5bc636b4dc..a80a013230 100644 --- a/test/fixtures/flow/type-annotations/55/expected.json +++ b/test/fixtures/flow/type-annotations/55/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/56/expected.json b/test/fixtures/flow/type-annotations/56/expected.json index 91bd2b0584..e21a5ba16d 100644 --- a/test/fixtures/flow/type-annotations/56/expected.json +++ b/test/fixtures/flow/type-annotations/56/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "Array" }, "name": "Array" }, @@ -88,6 +89,7 @@ "column": 46 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -101,11 +103,11 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "concat" }, "name": "concat" }, - "static": false, "kind": "method", "id": null, "generator": false, @@ -124,7 +126,8 @@ "end": { "line": 1, "column": 42 - } + }, + "identifierName": "items" }, "name": "items", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/57/expected.json b/test/fixtures/flow/type-annotations/57/expected.json index b151b8b6f8..263c1d403d 100644 --- a/test/fixtures/flow/type-annotations/57/expected.json +++ b/test/fixtures/flow/type-annotations/57/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -183,7 +184,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "fn" }, "name": "fn" } @@ -191,7 +193,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/58/expected.json b/test/fixtures/flow/type-annotations/58/expected.json index ffcb523252..04cfd23ca8 100644 --- a/test/fixtures/flow/type-annotations/58/expected.json +++ b/test/fixtures/flow/type-annotations/58/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -127,7 +128,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "Y" }, "name": "Y" } @@ -147,7 +149,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "Y" }, "name": "Y" } @@ -155,7 +158,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/59/expected.json b/test/fixtures/flow/type-annotations/59/expected.json index d512092524..a91682b647 100644 --- a/test/fixtures/flow/type-annotations/59/expected.json +++ b/test/fixtures/flow/type-annotations/59/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -142,7 +143,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "Y" }, "name": "Y" } @@ -179,7 +181,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "Y" }, "name": "Y" } @@ -187,7 +190,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/6/expected.json b/test/fixtures/flow/type-annotations/6/expected.json index 9cfdcd0139..9e785ac1c7 100644 --- a/test/fixtures/flow/type-annotations/6/expected.json +++ b/test/fixtures/flow/type-annotations/6/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "nullableNum" }, "name": "nullableNum", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/60/expected.json b/test/fixtures/flow/type-annotations/60/expected.json index c7c805bc0d..41854c7041 100644 --- a/test/fixtures/flow/type-annotations/60/expected.json +++ b/test/fixtures/flow/type-annotations/60/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ], @@ -179,7 +184,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -199,10 +205,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -250,7 +258,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/flow/type-annotations/61/expected.json b/test/fixtures/flow/type-annotations/61/expected.json index 5745269b9c..b08974f765 100644 --- a/test/fixtures/flow/type-annotations/61/expected.json +++ b/test/fixtures/flow/type-annotations/61/expected.json @@ -101,7 +101,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -117,9 +118,13 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ], @@ -179,7 +184,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -199,10 +205,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -250,7 +258,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/flow/type-annotations/62/expected.json b/test/fixtures/flow/type-annotations/62/expected.json index 7201193e8a..b858b1634b 100644 --- a/test/fixtures/flow/type-annotations/62/expected.json +++ b/test/fixtures/flow/type-annotations/62/expected.json @@ -84,7 +84,8 @@ "end": { "line": 1, "column": 6 - } + }, + "identifierName": "x" }, "name": "x" } @@ -161,7 +162,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/63/expected.json b/test/fixtures/flow/type-annotations/63/expected.json index 085e483fb1..e9bbce62ed 100644 --- a/test/fixtures/flow/type-annotations/63/expected.json +++ b/test/fixtures/flow/type-annotations/63/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -106,7 +107,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -122,9 +124,13 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" + }, + "extra": { + "shorthand": true } } ], @@ -184,7 +190,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -204,10 +211,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } } diff --git a/test/fixtures/flow/type-annotations/64/expected.json b/test/fixtures/flow/type-annotations/64/expected.json index 8c9d19d6c2..fe08875e33 100644 --- a/test/fixtures/flow/type-annotations/64/expected.json +++ b/test/fixtures/flow/type-annotations/64/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "ArrayPattern", @@ -88,7 +90,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "x" }, "name": "x" } @@ -165,7 +168,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/65/expected.json b/test/fixtures/flow/type-annotations/65/expected.json index 17d3f9e5c0..4b88153abb 100644 --- a/test/fixtures/flow/type-annotations/65/expected.json +++ b/test/fixtures/flow/type-annotations/65/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -87,7 +89,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "rest" }, "name": "rest" }, @@ -163,7 +166,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "Array" }, "name": "Array" } diff --git a/test/fixtures/flow/type-annotations/66/expected.json b/test/fixtures/flow/type-annotations/66/expected.json index 33bccbd102..e384b2d0cd 100644 --- a/test/fixtures/flow/type-annotations/66/expected.json +++ b/test/fixtures/flow/type-annotations/66/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": false, + "async": false, "params": [ { "type": "RestElement", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "rest" }, "name": "rest" }, @@ -162,7 +164,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -188,7 +191,8 @@ "directives": [] }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/flow/type-annotations/67/expected.json b/test/fixtures/flow/type-annotations/67/expected.json index 29c7ecb1b2..3e63de0f6d 100644 --- a/test/fixtures/flow/type-annotations/67/expected.json +++ b/test/fixtures/flow/type-annotations/67/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,11 +116,13 @@ "column": 20 } } - } + }, + "predicate": null }, "id": null, "generator": false, "expression": true, + "async": false, "params": [], "body": { "type": "Identifier", @@ -133,7 +136,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/flow/type-annotations/68/expected.json b/test/fixtures/flow/type-annotations/68/expected.json index 433bc78a8f..9e256a6a4d 100644 --- a/test/fixtures/flow/type-annotations/68/expected.json +++ b/test/fixtures/flow/type-annotations/68/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -87,43 +88,6 @@ "column": 30 } }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "Identifier", - "start": 11, - "end": 14, - "loc": { - "start": { - "line": 1, - "column": 11 - }, - "end": { - "line": 1, - "column": 14 - } - }, - "name": "bar" - } - ], - "body": { - "type": "Identifier", - "start": 27, - "end": 30, - "loc": { - "start": { - "line": 1, - "column": 27 - }, - "end": { - "line": 1, - "column": 30 - } - }, - "name": "bar" - }, "returnType": { "type": "TypeAnnotation", "start": 15, @@ -152,7 +116,48 @@ "column": 23 } } + }, + "predicate": null + }, + "id": null, + "generator": false, + "expression": true, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 11, + "end": 14, + "loc": { + "start": { + "line": 1, + "column": 11 + }, + "end": { + "line": 1, + "column": 14 + }, + "identifierName": "bar" + }, + "name": "bar" } + ], + "body": { + "type": "Identifier", + "start": 27, + "end": 30, + "loc": { + "start": { + "line": 1, + "column": 27 + }, + "end": { + "line": 1, + "column": 30 + }, + "identifierName": "bar" + }, + "name": "bar" } } } diff --git a/test/fixtures/flow/type-annotations/69/expected.json b/test/fixtures/flow/type-annotations/69/expected.json index 81386821a4..9a862eea68 100644 --- a/test/fixtures/flow/type-annotations/69/expected.json +++ b/test/fixtures/flow/type-annotations/69/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -104,7 +105,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "foo" }, "name": "foo", "typeAnnotation": { @@ -148,7 +150,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -167,7 +170,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "bar" }, "name": "bar", "typeAnnotation": { @@ -211,7 +215,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -244,4 +249,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/7/expected.json b/test/fixtures/flow/type-annotations/7/expected.json index 6a7ceea68d..3233cf98e6 100644 --- a/test/fixtures/flow/type-annotations/7/expected.json +++ b/test/fixtures/flow/type-annotations/7/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "callback" }, "name": "callback", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/70/expected.json b/test/fixtures/flow/type-annotations/70/expected.json index 9efcc0ee81..349a54e218 100644 --- a/test/fixtures/flow/type-annotations/70/expected.json +++ b/test/fixtures/flow/type-annotations/70/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/flow/type-annotations/71/expected.json b/test/fixtures/flow/type-annotations/71/expected.json index cdb81eb204..635549a0b6 100644 --- a/test/fixtures/flow/type-annotations/71/expected.json +++ b/test/fixtures/flow/type-annotations/71/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -151,7 +153,8 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/flow/type-annotations/72/expected.json b/test/fixtures/flow/type-annotations/72/expected.json index f6ceb4484c..c13a951af4 100644 --- a/test/fixtures/flow/type-annotations/72/expected.json +++ b/test/fixtures/flow/type-annotations/72/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -115,11 +116,13 @@ "column": 21 } } - } + }, + "predicate": null }, "id": null, "generator": false, "expression": true, + "async": false, "params": [], "body": { "type": "Identifier", @@ -133,12 +136,14 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "bar" }, "name": "bar" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 10 } } } diff --git a/test/fixtures/flow/type-annotations/73/expected.json b/test/fixtures/flow/type-annotations/73/expected.json index 3b2f689738..a1b6cfa22b 100644 --- a/test/fixtures/flow/type-annotations/73/expected.json +++ b/test/fixtures/flow/type-annotations/73/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -87,43 +88,6 @@ "column": 31 } }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "Identifier", - "start": 12, - "end": 15, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 15 - } - }, - "name": "bar" - } - ], - "body": { - "type": "Identifier", - "start": 28, - "end": 31, - "loc": { - "start": { - "line": 1, - "column": 28 - }, - "end": { - "line": 1, - "column": 31 - } - }, - "name": "bar" - }, "returnType": { "type": "TypeAnnotation", "start": 16, @@ -152,10 +116,52 @@ "column": 24 } } + }, + "predicate": null + }, + "id": null, + "generator": false, + "expression": true, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 12, + "end": 15, + "loc": { + "start": { + "line": 1, + "column": 12 + }, + "end": { + "line": 1, + "column": 15 + }, + "identifierName": "bar" + }, + "name": "bar" } + ], + "body": { + "type": "Identifier", + "start": 28, + "end": 31, + "loc": { + "start": { + "line": 1, + "column": 28 + }, + "end": { + "line": 1, + "column": 31 + }, + "identifierName": "bar" + }, + "name": "bar" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 10 } } } diff --git a/test/fixtures/flow/type-annotations/74/expected.json b/test/fixtures/flow/type-annotations/74/expected.json index 2abdde67da..4d9adf8da2 100644 --- a/test/fixtures/flow/type-annotations/74/expected.json +++ b/test/fixtures/flow/type-annotations/74/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -101,43 +102,6 @@ "column": 32 } }, - "id": null, - "generator": false, - "expression": true, - "params": [ - { - "type": "Identifier", - "start": 13, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 1, - "column": 16 - } - }, - "name": "bar" - } - ], - "body": { - "type": "Identifier", - "start": 29, - "end": 32, - "loc": { - "start": { - "line": 1, - "column": 29 - }, - "end": { - "line": 1, - "column": 32 - } - }, - "name": "bar" - }, "returnType": { "type": "TypeAnnotation", "start": 17, @@ -166,10 +130,52 @@ "column": 25 } } + }, + "predicate": null + }, + "id": null, + "generator": false, + "expression": true, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 13, + "end": 16, + "loc": { + "start": { + "line": 1, + "column": 13 + }, + "end": { + "line": 1, + "column": 16 + }, + "identifierName": "bar" + }, + "name": "bar" } + ], + "body": { + "type": "Identifier", + "start": 29, + "end": 32, + "loc": { + "start": { + "line": 1, + "column": 29 + }, + "end": { + "line": 1, + "column": 32 + }, + "identifierName": "bar" + }, + "name": "bar" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 11 } }, "typeAnnotation": { @@ -203,7 +209,8 @@ } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 10 } } } diff --git a/test/fixtures/flow/type-annotations/75/expected.json b/test/fixtures/flow/type-annotations/75/expected.json index cf53aaad99..7c9d750b34 100644 --- a/test/fixtures/flow/type-annotations/75/expected.json +++ b/test/fixtures/flow/type-annotations/75/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/flow/type-annotations/76/expected.json b/test/fixtures/flow/type-annotations/76/expected.json index 2201b81b00..0da85e881f 100644 --- a/test/fixtures/flow/type-annotations/76/expected.json +++ b/test/fixtures/flow/type-annotations/76/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -134,7 +135,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -151,7 +153,8 @@ "end": { "line": 1, "column": 37 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/flow/type-annotations/77/expected.json b/test/fixtures/flow/type-annotations/77/expected.json index 43b02e527c..04a3bb7902 100644 --- a/test/fixtures/flow/type-annotations/77/expected.json +++ b/test/fixtures/flow/type-annotations/77/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -148,7 +149,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "bar" }, "name": "bar" } @@ -165,7 +167,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "bar" }, "name": "bar" }, diff --git a/test/fixtures/flow/type-annotations/78/expected.json b/test/fixtures/flow/type-annotations/78/expected.json index eec39a30b0..53f958f35d 100644 --- a/test/fixtures/flow/type-annotations/78/expected.json +++ b/test/fixtures/flow/type-annotations/78/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -115,11 +117,13 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "foo" }, "name": "foo", "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 16 } }, "alternate": { @@ -134,7 +138,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "number" }, "name": "number" } diff --git a/test/fixtures/flow/type-annotations/79/expected.json b/test/fixtures/flow/type-annotations/79/expected.json index fe1dab6354..6975ffcfda 100644 --- a/test/fixtures/flow/type-annotations/79/expected.json +++ b/test/fixtures/flow/type-annotations/79/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -99,7 +100,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -117,44 +119,6 @@ "column": 36 } }, - "id": null, - "generator": false, - "expression": false, - "params": [ - { - "type": "Identifier", - "start": 17, - "end": 20, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 20 - } - }, - "name": "foo" - } - ], - "body": { - "type": "BlockStatement", - "start": 34, - "end": 36, - "loc": { - "start": { - "line": 1, - "column": 34 - }, - "end": { - "line": 1, - "column": 36 - } - }, - "body": [], - "directives": [] - }, "returnType": { "type": "TypeAnnotation", "start": 22, @@ -183,7 +147,48 @@ "column": 30 } } + }, + "predicate": null + }, + "id": null, + "generator": false, + "expression": false, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 17, + "end": 20, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 20 + }, + "identifierName": "foo" + }, + "name": "foo" } + ], + "body": { + "type": "BlockStatement", + "start": 34, + "end": 36, + "loc": { + "start": { + "line": 1, + "column": 34 + }, + "end": { + "line": 1, + "column": 36 + } + }, + "body": [], + "directives": [] } }, "alternate": { @@ -198,7 +203,8 @@ "end": { "line": 1, "column": 42 - } + }, + "identifierName": "baz" }, "name": "baz" } diff --git a/test/fixtures/flow/type-annotations/8/expected.json b/test/fixtures/flow/type-annotations/8/expected.json index 55750a0092..2d082a8233 100644 --- a/test/fixtures/flow/type-annotations/8/expected.json +++ b/test/fixtures/flow/type-annotations/8/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 35 - } + }, + "identifierName": "callback" }, "name": "callback", "typeAnnotation": { diff --git a/test/fixtures/flow/type-annotations/80/expected.json b/test/fixtures/flow/type-annotations/80/expected.json index 5df2f5ec56..a86ca15185 100644 --- a/test/fixtures/flow/type-annotations/80/expected.json +++ b/test/fixtures/flow/type-annotations/80/expected.json @@ -59,6 +59,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "RestElement", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "rest" }, "name": "rest" }, @@ -162,7 +164,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -182,16 +185,18 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "rest" }, "name": "rest" }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/81/expected.json b/test/fixtures/flow/type-annotations/81/expected.json index 3c84d22193..1dcedf1a3e 100644 --- a/test/fixtures/flow/type-annotations/81/expected.json +++ b/test/fixtures/flow/type-annotations/81/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -188,7 +189,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -207,7 +209,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Map" }, "name": "Map" } @@ -219,7 +222,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/82/expected.json b/test/fixtures/flow/type-annotations/82/expected.json index f7e3aa404c..9ddf85cb5a 100644 --- a/test/fixtures/flow/type-annotations/82/expected.json +++ b/test/fixtures/flow/type-annotations/82/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 33 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -188,7 +189,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -207,7 +209,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Map" }, "name": "Map" } @@ -219,7 +222,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/83/expected.json b/test/fixtures/flow/type-annotations/83/expected.json index ec761b745f..4a628f8b88 100644 --- a/test/fixtures/flow/type-annotations/83/expected.json +++ b/test/fixtures/flow/type-annotations/83/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -123,7 +124,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/84/expected.json b/test/fixtures/flow/type-annotations/84/expected.json index 72f1dcf9d6..cc9842db23 100644 --- a/test/fixtures/flow/type-annotations/84/expected.json +++ b/test/fixtures/flow/type-annotations/84/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -138,7 +139,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/85/expected.json b/test/fixtures/flow/type-annotations/85/expected.json index 2ec29ac271..82341068bc 100644 --- a/test/fixtures/flow/type-annotations/85/expected.json +++ b/test/fixtures/flow/type-annotations/85/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -158,7 +159,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "Promise" }, "name": "Promise" } @@ -171,7 +173,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/86/expected.json b/test/fixtures/flow/type-annotations/86/expected.json index 910267d15d..63ccb81eb2 100644 --- a/test/fixtures/flow/type-annotations/86/expected.json +++ b/test/fixtures/flow/type-annotations/86/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -127,7 +128,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "rest" }, "name": "rest" }, @@ -190,7 +192,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "Array" }, "name": "Array" } @@ -220,7 +223,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/87/expected.json b/test/fixtures/flow/type-annotations/87/expected.json index fcb3f099e8..d6b70d48e8 100644 --- a/test/fixtures/flow/type-annotations/87/expected.json +++ b/test/fixtures/flow/type-annotations/87/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "identity" }, "name": "identity", "typeAnnotation": { @@ -129,7 +130,8 @@ "column": 16 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -160,7 +162,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -192,7 +195,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "T" }, "name": "T" } @@ -227,7 +231,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "T" }, "name": "T" } diff --git a/test/fixtures/flow/type-annotations/88/expected.json b/test/fixtures/flow/type-annotations/88/expected.json index 703ae28f97..e7495a1ba3 100644 --- a/test/fixtures/flow/type-annotations/88/expected.json +++ b/test/fixtures/flow/type-annotations/88/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "identity" }, "name": "identity", "typeAnnotation": { @@ -129,7 +130,8 @@ "column": 16 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -160,7 +162,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -192,7 +195,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "T" }, "name": "T" } @@ -225,7 +229,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "y" }, "name": "y" }, @@ -271,7 +276,8 @@ "end": { "line": 1, "column": 30 - } + }, + "identifierName": "T" }, "name": "T" } @@ -305,7 +311,8 @@ "end": { "line": 1, "column": 38 - } + }, + "identifierName": "T" }, "name": "T" } diff --git a/test/fixtures/flow/type-annotations/89/expected.json b/test/fixtures/flow/type-annotations/89/expected.json index fafb7c0a97..8e0461be54 100644 --- a/test/fixtures/flow/type-annotations/89/expected.json +++ b/test/fixtures/flow/type-annotations/89/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/flow/type-annotations/9/expected.json b/test/fixtures/flow/type-annotations/9/expected.json index d2393788e5..a966a64756 100644 --- a/test/fixtures/flow/type-annotations/9/expected.json +++ b/test/fixtures/flow/type-annotations/9/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "foo" }, "name": "foo" }, "generator": false, "expression": false, + "async": false, "params": [ { "type": "Identifier", @@ -73,7 +75,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "callback" }, "name": "callback", "typeAnnotation": { @@ -131,7 +134,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "_" }, "name": "_" }, diff --git a/test/fixtures/flow/type-annotations/90/expected.json b/test/fixtures/flow/type-annotations/90/expected.json index d18d05b185..d098b0cce8 100644 --- a/test/fixtures/flow/type-annotations/90/expected.json +++ b/test/fixtures/flow/type-annotations/90/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/flow/type-annotations/91/expected.json b/test/fixtures/flow/type-annotations/91/expected.json index 508d8b7fd6..d92c31cc91 100644 --- a/test/fixtures/flow/type-annotations/91/expected.json +++ b/test/fixtures/flow/type-annotations/91/expected.json @@ -69,10 +69,12 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" }, + "importKind": null, "local": { "type": "Identifier", "start": 13, @@ -85,7 +87,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "foo" }, "name": "foo" } @@ -116,10 +119,12 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" }, + "importKind": null, "local": { "type": "Identifier", "start": 18, @@ -132,7 +137,8 @@ "end": { "line": 1, "column": 21 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/flow/type-annotations/92/expected.json b/test/fixtures/flow/type-annotations/92/expected.json index 3bf07813d5..f655b4ac19 100644 --- a/test/fixtures/flow/type-annotations/92/expected.json +++ b/test/fixtures/flow/type-annotations/92/expected.json @@ -69,10 +69,12 @@ "end": { "line": 1, "column": 18 - } + }, + "identifierName": "foo" }, "name": "foo" }, + "importKind": null, "local": { "type": "Identifier", "start": 22, @@ -85,7 +87,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "bar" }, "name": "bar" } diff --git a/test/fixtures/flow/type-annotations/93/expected.json b/test/fixtures/flow/type-annotations/93/expected.json index 588d644b5a..f28a6ae4c4 100644 --- a/test/fixtures/flow/type-annotations/93/expected.json +++ b/test/fixtures/flow/type-annotations/93/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "type" }, "name": "type" } diff --git a/test/fixtures/flow/type-annotations/94/expected.json b/test/fixtures/flow/type-annotations/94/expected.json index 71f88f5ecd..75eb3f453a 100644 --- a/test/fixtures/flow/type-annotations/94/expected.json +++ b/test/fixtures/flow/type-annotations/94/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 11 - } + }, + "identifierName": "type" }, "name": "type" } @@ -100,10 +101,12 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, + "importKind": null, "local": { "type": "Identifier", "start": 14, @@ -116,7 +119,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/flow/type-annotations/95/expected.json b/test/fixtures/flow/type-annotations/95/expected.json index d90a424b63..ba8c5759bb 100644 --- a/test/fixtures/flow/type-annotations/95/expected.json +++ b/test/fixtures/flow/type-annotations/95/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "namespace" }, "name": "namespace" } diff --git a/test/fixtures/flow/type-annotations/96/expected.json b/test/fixtures/flow/type-annotations/96/expected.json index 11ed46da39..b102606c92 100644 --- a/test/fixtures/flow/type-annotations/96/expected.json +++ b/test/fixtures/flow/type-annotations/96/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "namespace" }, "name": "namespace" } diff --git a/test/fixtures/flow/type-annotations/97/expected.json b/test/fixtures/flow/type-annotations/97/expected.json index 4b3c3b2da9..6021547089 100644 --- a/test/fixtures/flow/type-annotations/97/expected.json +++ b/test/fixtures/flow/type-annotations/97/expected.json @@ -86,7 +86,8 @@ "end": { "line": 1, "column": 3 - } + }, + "identifierName": "f" }, "name": "f" }, @@ -137,7 +138,8 @@ "column": 16 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-annotations/98/expected.json b/test/fixtures/flow/type-annotations/98/expected.json index 953654304c..230760de3a 100644 --- a/test/fixtures/flow/type-annotations/98/expected.json +++ b/test/fixtures/flow/type-annotations/98/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 57 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -128,7 +129,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "param1" }, "name": "param1" }, @@ -148,6 +150,7 @@ } }, "optional": true, + "static": false, "variance": null }, { @@ -176,7 +179,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "param2" }, "name": "param2" }, @@ -196,6 +200,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -224,7 +229,8 @@ "end": { "line": 1, "column": 47 - } + }, + "identifierName": "param3" }, "name": "param3" }, @@ -244,10 +250,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -256,7 +264,7 @@ ], "kind": "var" } - ] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/99/expected.json b/test/fixtures/flow/type-annotations/99/expected.json index b261c3eff9..90620eca01 100644 --- a/test/fixtures/flow/type-annotations/99/expected.json +++ b/test/fixtures/flow/type-annotations/99/expected.json @@ -56,59 +56,6 @@ "column": 21 } }, - "id": null, - "generator": false, - "expression": true, - "async": false, - "params": [ - { - "type": "Identifier", - "start": 1, - "end": 4, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 4 - } - }, - "name": "foo" - }, - { - "type": "Identifier", - "start": 6, - "end": 9, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 9 - } - }, - "name": "bar" - } - ], - "body": { - "type": "NullLiteral", - "start": 17, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 21 - } - } - }, "returnType": { "type": "TypeAnnotation", "start": 10, @@ -150,280 +97,72 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "z" }, "name": "z" } + }, + "predicate": null + }, + "id": null, + "generator": false, + "expression": true, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 1, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 4 + }, + "identifierName": "foo" + }, + "name": "foo" + }, + { + "type": "Identifier", + "start": 6, + "end": 9, + "loc": { + "start": { + "line": 1, + "column": 6 + }, + "end": { + "line": 1, + "column": 9 + }, + "identifierName": "bar" + }, + "name": "bar" + } + ], + "body": { + "type": "NullLiteral", + "start": 17, + "end": 21, + "loc": { + "start": { + "line": 1, + "column": 17 + }, + "end": { + "line": 1, + "column": 21 + } } } } } ], "directives": [] - }, - "comments": [], - "tokens": [ - { - "type": { - "label": "(", - "beforeExpr": true, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 0, - "end": 1, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 1, - "column": 1 - } - } - }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "foo", - "start": 1, - "end": 4, - "loc": { - "start": { - "line": 1, - "column": 1 - }, - "end": { - "line": 1, - "column": 4 - } - } - }, - { - "type": { - "label": ",", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 4, - "end": 5, - "loc": { - "start": { - "line": 1, - "column": 4 - }, - "end": { - "line": 1, - "column": 5 - } - } - }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "bar", - "start": 6, - "end": 9, - "loc": { - "start": { - "line": 1, - "column": 6 - }, - "end": { - "line": 1, - "column": 9 - } - } - }, - { - "type": { - "label": ")", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - } - } - }, - { - "type": { - "label": ":", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 10, - "end": 11, - "loc": { - "start": { - "line": 1, - "column": 10 - }, - "end": { - "line": 1, - "column": 11 - } - } - }, - { - "type": { - "label": "name", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null - }, - "value": "z", - "start": 12, - "end": 13, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 13 - } - } - }, - { - "type": { - "label": "=>", - "beforeExpr": true, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 14, - "end": 16, - "loc": { - "start": { - "line": 1, - "column": 14 - - - }, - "end": { - "line": 1, - "column": 16 - } - } - }, - { - "type": { - "label": "null", - "keyword": "null", - "beforeExpr": false, - "startsExpr": true, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "value": "null", - "start": 17, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 17 - }, - "end": { - "line": 1, - "column": 21 - } - } - }, - { - "type": { - "label": "eof", - "beforeExpr": false, - "startsExpr": false, - "rightAssociative": false, - "isLoop": false, - "isAssign": false, - "prefix": false, - "postfix": false, - "binop": null, - "updateContext": null - }, - "start": 21, - "end": 21, - "loc": { - "start": { - "line": 1, - "column": 21 - }, - "end": { - "line": 1, - "column": 21 - } - } - } - ] -} + } +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/arrow-func-return-newline/expected.json b/test/fixtures/flow/type-annotations/arrow-func-return-newline/expected.json index cf9973aad7..5ed4f9d38d 100644 --- a/test/fixtures/flow/type-annotations/arrow-func-return-newline/expected.json +++ b/test/fixtures/flow/type-annotations/arrow-func-return-newline/expected.json @@ -116,7 +116,8 @@ "column": 8 } } - } + }, + "predicate": null }, "id": null, "generator": false, diff --git a/test/fixtures/flow/type-annotations/builtin/expected.json b/test/fixtures/flow/type-annotations/builtin/expected.json index 8c51c73f05..c60b595377 100644 --- a/test/fixtures/flow/type-annotations/builtin/expected.json +++ b/test/fixtures/flow/type-annotations/builtin/expected.json @@ -597,11 +597,11 @@ "column": 11 } }, - "value": "", "extra": { "rawValue": "", "raw": "\"\"" - } + }, + "value": "" } }, { @@ -637,7 +637,7 @@ }, "typeParameters": null, "right": { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 215, "end": 216, "loc": { @@ -650,11 +650,11 @@ "column": 10 } }, - "value": 0, "extra": { "rawValue": 0, "raw": "0" - } + }, + "value": 0 } }, { diff --git a/test/fixtures/flow/type-annotations/existential-type-param-2/expected.json b/test/fixtures/flow/type-annotations/existential-type-param-2/expected.json index 12bf9c1462..8a6e657af3 100644 --- a/test/fixtures/flow/type-annotations/existential-type-param-2/expected.json +++ b/test/fixtures/flow/type-annotations/existential-type-param-2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "f" }, "name": "f", "typeAnnotation": { @@ -87,7 +88,7 @@ } }, "typeAnnotation": { - "type": "ExistentialTypeParam", + "type": "ExistsTypeAnnotation", "start": 8, "end": 9, "loc": { @@ -132,7 +133,7 @@ } }, "typeAnnotation": { - "type": "ExistentialTypeParam", + "type": "ExistsTypeAnnotation", "start": 30, "end": 31, "loc": { @@ -145,7 +146,8 @@ "column": 31 } } - } + }, + "predicate": null }, "id": null, "generator": false, @@ -164,7 +166,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -213,7 +216,7 @@ "value": true }, { - "type": "ExistentialTypeParam", + "type": "ExistsTypeAnnotation", "start": 24, "end": 25, "loc": { @@ -257,4 +260,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-annotations/existential-type-param/expected.json b/test/fixtures/flow/type-annotations/existential-type-param/expected.json index d9e6a9657d..af0ae0e2bd 100644 --- a/test/fixtures/flow/type-annotations/existential-type-param/expected.json +++ b/test/fixtures/flow/type-annotations/existential-type-param/expected.json @@ -54,7 +54,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "Maybe" }, "name": "Maybe" }, @@ -87,7 +88,8 @@ "column": 12 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -147,13 +149,14 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "T" }, "name": "T" } }, { - "type": "ExistentialTypeParam", + "type": "ExistsTypeAnnotation", "start": 26, "end": 27, "loc": { @@ -181,7 +184,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "_Maybe" }, "name": "_Maybe" } diff --git a/test/fixtures/flow/type-annotations/negative-number-literal/expected.json b/test/fixtures/flow/type-annotations/negative-number-literal/expected.json index 21f2b225e8..e3fe56e9dc 100644 --- a/test/fixtures/flow/type-annotations/negative-number-literal/expected.json +++ b/test/fixtures/flow/type-annotations/negative-number-literal/expected.json @@ -76,7 +76,7 @@ }, "types": [ { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 45, "end": 47, "loc": { @@ -89,14 +89,14 @@ "column": 6 } }, - "value": -1, "extra": { "rawValue": -1, "raw": "-1" - } + }, + "value": -1 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 52, "end": 53, "loc": { @@ -109,14 +109,14 @@ "column": 5 } }, - "value": 0, "extra": { "rawValue": 0, "raw": "0" - } + }, + "value": 0 }, { - "type": "NumericLiteralTypeAnnotation", + "type": "NumberLiteralTypeAnnotation", "start": 58, "end": 59, "loc": { @@ -129,11 +129,11 @@ "column": 5 } }, - "value": 1, "extra": { "rawValue": 1, "raw": "1" - } + }, + "value": 1 } ] }, @@ -417,4 +417,4 @@ } } ] -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-exports/alias/expected.json b/test/fixtures/flow/type-exports/alias/expected.json index 7387d671c4..cf8a9daf6e 100644 --- a/test/fixtures/flow/type-exports/alias/expected.json +++ b/test/fixtures/flow/type-exports/alias/expected.json @@ -42,9 +42,9 @@ "column": 23 } }, - "exportKind": "type", "specifiers": [], "source": null, + "exportKind": "type", "declaration": { "type": "TypeAlias", "start": 7, @@ -71,7 +71,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -93,6 +94,7 @@ } } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/flow/type-exports/interface/expected.json b/test/fixtures/flow/type-exports/interface/expected.json index ee9953051b..45366de3c4 100644 --- a/test/fixtures/flow/type-exports/interface/expected.json +++ b/test/fixtures/flow/type-exports/interface/expected.json @@ -71,7 +71,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -120,7 +121,8 @@ "end": { "line": 1, "column": 24 - } + }, + "identifierName": "p" }, "name": "p" }, @@ -140,10 +142,12 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -205,7 +209,8 @@ "end": { "line": 2, "column": 20 - } + }, + "identifierName": "bar" }, "name": "bar" }, @@ -238,7 +243,8 @@ "column": 22 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -286,7 +292,8 @@ "end": { "line": 2, "column": 27 - } + }, + "identifierName": "p" }, "name": "p" }, @@ -317,16 +324,19 @@ "end": { "line": 2, "column": 30 - } + }, + "identifierName": "T" }, "name": "T" } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } } }, @@ -348,4 +358,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-exports/specifier-from/expected.json b/test/fixtures/flow/type-exports/specifier-from/expected.json index 583326b8a1..79e5af591c 100644 --- a/test/fixtures/flow/type-exports/specifier-from/expected.json +++ b/test/fixtures/flow/type-exports/specifier-from/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -85,7 +86,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" } diff --git a/test/fixtures/flow/type-exports/specifier/expected.json b/test/fixtures/flow/type-exports/specifier/expected.json index 37900069e8..7715724c0d 100644 --- a/test/fixtures/flow/type-exports/specifier/expected.json +++ b/test/fixtures/flow/type-exports/specifier/expected.json @@ -42,7 +42,6 @@ "column": 20 } }, - "exportKind": "type", "specifiers": [ { "type": "ExportSpecifier", @@ -70,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" }, @@ -86,15 +86,18 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "foo" }, "name": "foo" } } ], "source": null, + "exportKind": "type", "declaration": null } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/flow/type-grouping/1/expected.json b/test/fixtures/flow/type-grouping/1/expected.json index 7b9b6309f8..b88c7b544c 100644 --- a/test/fixtures/flow/type-grouping/1/expected.json +++ b/test/fixtures/flow/type-grouping/1/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -108,7 +109,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-grouping/2/expected.json b/test/fixtures/flow/type-grouping/2/expected.json index 60fb976af8..9e84a8c5c1 100644 --- a/test/fixtures/flow/type-grouping/2/expected.json +++ b/test/fixtures/flow/type-grouping/2/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 36 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -176,7 +177,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-grouping/3/expected.json b/test/fixtures/flow/type-grouping/3/expected.json index a51a1dce92..fe1a494b08 100644 --- a/test/fixtures/flow/type-grouping/3/expected.json +++ b/test/fixtures/flow/type-grouping/3/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 31 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -172,7 +173,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-grouping/4/expected.json b/test/fixtures/flow/type-grouping/4/expected.json index 3a2c2d5359..817a0c95f3 100644 --- a/test/fixtures/flow/type-grouping/4/expected.json +++ b/test/fixtures/flow/type-grouping/4/expected.json @@ -69,7 +69,8 @@ "end": { "line": 1, "column": 17 - } + }, + "identifierName": "a" }, "name": "a", "typeAnnotation": { @@ -127,7 +128,8 @@ "end": { "line": 1, "column": 16 - } + }, + "identifierName": "A" }, "name": "A" } @@ -140,7 +142,7 @@ ], "kind": "var" } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/flow/type-imports/import-type-shorthand/expected.json b/test/fixtures/flow/type-imports/import-type-shorthand/expected.json index 7b3d80f439..6c0fc4995b 100644 --- a/test/fixtures/flow/type-imports/import-type-shorthand/expected.json +++ b/test/fixtures/flow/type-imports/import-type-shorthand/expected.json @@ -647,4 +647,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-imports/import-type/expected.json b/test/fixtures/flow/type-imports/import-type/expected.json index 2b23f221b3..af41bafe4d 100644 --- a/test/fixtures/flow/type-imports/import-type/expected.json +++ b/test/fixtures/flow/type-imports/import-type/expected.json @@ -144,6 +144,7 @@ }, "name": "named" }, + "importKind": null, "local": { "type": "Identifier", "start": 39, @@ -263,6 +264,7 @@ }, "name": "named" }, + "importKind": null, "local": { "type": "Identifier", "start": 74, diff --git a/test/fixtures/flow/type-parameter-declaration/arrow_with_jsx/expected.json b/test/fixtures/flow/type-parameter-declaration/arrow_with_jsx/expected.json index 5040de57dc..357be6ee1e 100644 --- a/test/fixtures/flow/type-parameter-declaration/arrow_with_jsx/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/arrow_with_jsx/expected.json @@ -110,7 +110,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -161,7 +162,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" } @@ -215,7 +217,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -266,7 +269,8 @@ "end": { "line": 3, "column": 13 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -350,7 +354,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -401,7 +406,8 @@ "end": { "line": 4, "column": 13 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -518,7 +524,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -527,4 +534,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-parameter-declaration/arrow_without_jsx/expected.json b/test/fixtures/flow/type-parameter-declaration/arrow_without_jsx/expected.json index 5040de57dc..357be6ee1e 100644 --- a/test/fixtures/flow/type-parameter-declaration/arrow_without_jsx/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/arrow_without_jsx/expected.json @@ -110,7 +110,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -161,7 +162,8 @@ "end": { "line": 2, "column": 5 - } + }, + "identifierName": "x" }, "name": "x" } @@ -215,7 +217,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -266,7 +269,8 @@ "end": { "line": 3, "column": 13 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -350,7 +354,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -401,7 +406,8 @@ "end": { "line": 4, "column": 13 - } + }, + "identifierName": "x" }, "name": "x", "typeAnnotation": { @@ -518,7 +524,8 @@ "column": 2 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -527,4 +534,4 @@ ], "directives": [] } -} +} \ No newline at end of file diff --git a/test/fixtures/flow/type-parameter-declaration/class-method-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/class-method-reserved-word/expected.json index 6e0dc70ef3..a836b16d41 100644 --- a/test/fixtures/flow/type-parameter-declaration/class-method-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/class-method-reserved-word/expected.json @@ -89,6 +89,7 @@ "column": 16 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -107,7 +108,6 @@ }, "name": "foobar" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -138,7 +138,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -179,6 +180,7 @@ "column": 16 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -197,7 +199,6 @@ }, "name": "delete" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -228,7 +229,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -269,6 +271,7 @@ "column": 15 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -287,7 +290,6 @@ }, "name": "yield" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -318,7 +320,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -359,6 +362,7 @@ "column": 12 } }, + "static": false, "computed": false, "key": { "type": "Identifier", @@ -377,7 +381,6 @@ }, "name": "do" }, - "static": false, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -408,7 +411,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -449,6 +453,7 @@ "column": 23 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -467,7 +472,6 @@ }, "name": "foobar" }, - "static": true, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -498,7 +502,8 @@ "column": 17 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -539,6 +544,7 @@ "column": 23 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -557,7 +563,6 @@ }, "name": "delete" }, - "static": true, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -588,7 +593,8 @@ "column": 17 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -629,6 +635,7 @@ "column": 22 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -647,7 +654,6 @@ }, "name": "yield" }, - "static": true, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -678,7 +684,8 @@ "column": 16 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -719,6 +726,7 @@ "column": 19 } }, + "static": true, "computed": false, "key": { "type": "Identifier", @@ -737,7 +745,6 @@ }, "name": "do" }, - "static": true, "kind": "method", "typeParameters": { "type": "TypeParameterDeclaration", @@ -768,7 +775,8 @@ "column": 13 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-parameter-declaration/declare-class-method-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/declare-class-method-reserved-word/expected.json index 9c4ed2864e..a18b53c12e 100644 --- a/test/fixtures/flow/type-parameter-declaration/declare-class-method-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/declare-class-method-reserved-word/expected.json @@ -137,7 +137,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -236,7 +237,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -335,7 +337,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -434,7 +437,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -533,7 +537,8 @@ "column": 17 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -632,7 +637,8 @@ "column": 17 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -731,7 +737,8 @@ "column": 16 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -830,7 +837,8 @@ "column": 13 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-parameter-declaration/declare-interface-method-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/declare-interface-method-reserved-word/expected.json index 7fe3231b43..834cc17454 100644 --- a/test/fixtures/flow/type-parameter-declaration/declare-interface-method-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/declare-interface-method-reserved-word/expected.json @@ -137,7 +137,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -236,7 +237,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -335,7 +337,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -434,7 +437,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-parameter-declaration/default/expected.json b/test/fixtures/flow/type-parameter-declaration/default/expected.json index 65e1d32891..56cf6e37d7 100644 --- a/test/fixtures/flow/type-parameter-declaration/default/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/default/expected.json @@ -205,7 +205,7 @@ "name": "T", "variance": null, "default": { - "type": "ExistentialTypeParam", + "type": "ExistsTypeAnnotation", "start": 34, "end": 35, "loc": { diff --git a/test/fixtures/flow/type-parameter-declaration/interface-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/interface-reserved-word/expected.json index f0c82175f1..61ca321ecd 100644 --- a/test/fixtures/flow/type-parameter-declaration/interface-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/interface-reserved-word/expected.json @@ -137,7 +137,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -236,7 +237,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -335,7 +337,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -434,7 +437,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json b/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json index 801f8ff09c..07d8e1ebe8 100644 --- a/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json @@ -258,7 +258,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json index f57adb86f2..c89615b382 100644 --- a/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json @@ -175,7 +175,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -266,7 +267,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -357,7 +359,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] } @@ -448,7 +451,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] } diff --git a/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/expected.json index 2d85dca630..3f2bac500b 100644 --- a/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/expected.json +++ b/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/expected.json @@ -135,7 +135,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -234,7 +235,8 @@ "column": 10 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -333,7 +335,8 @@ "column": 9 } }, - "name": "T" + "name": "T", + "variance": null } ] }, @@ -432,7 +435,8 @@ "column": 6 } }, - "name": "T" + "name": "T", + "variance": null } ] }, diff --git a/test/fixtures/flow/typecasts/1/expected.json b/test/fixtures/flow/typecasts/1/expected.json index 87ffc46fab..a73129c312 100644 --- a/test/fixtures/flow/typecasts/1/expected.json +++ b/test/fixtures/flow/typecasts/1/expected.json @@ -68,7 +68,8 @@ "end": { "line": 1, "column": 4 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -103,7 +104,8 @@ } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/flow/typecasts/2/expected.json b/test/fixtures/flow/typecasts/2/expected.json index 7f2c10a412..5e58fe24de 100644 --- a/test/fixtures/flow/typecasts/2/expected.json +++ b/test/fixtures/flow/typecasts/2/expected.json @@ -100,7 +100,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -154,7 +155,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "yyy" }, "name": "yyy" }, @@ -237,7 +239,8 @@ "end": { "line": 1, "column": 27 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -257,6 +260,7 @@ } }, "optional": false, + "static": false, "variance": null }, { @@ -285,7 +289,8 @@ "end": { "line": 1, "column": 40 - } + }, + "identifierName": "yyy" }, "name": "yyy" }, @@ -305,14 +310,17 @@ } }, "optional": false, + "static": false, "variance": null } ], - "indexers": [] + "indexers": [], + "exact": false } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/flow/typecasts/3/expected.json b/test/fixtures/flow/typecasts/3/expected.json index ff1d6fa436..b47396af29 100644 --- a/test/fixtures/flow/typecasts/3/expected.json +++ b/test/fixtures/flow/typecasts/3/expected.json @@ -73,6 +73,7 @@ "id": null, "generator": false, "expression": true, + "async": false, "params": [ { "type": "Identifier", @@ -86,7 +87,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "xxx" }, "name": "xxx" } @@ -117,7 +119,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -199,7 +202,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -241,7 +245,8 @@ } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/flow/typecasts/4/expected.json b/test/fixtures/flow/typecasts/4/expected.json index 3fab1290ea..9253542842 100644 --- a/test/fixtures/flow/typecasts/4/expected.json +++ b/test/fixtures/flow/typecasts/4/expected.json @@ -83,7 +83,8 @@ "end": { "line": 1, "column": 5 - } + }, + "identifierName": "xxx" }, "name": "xxx" }, @@ -118,7 +119,8 @@ } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 1 } }, { @@ -147,7 +149,8 @@ "end": { "line": 1, "column": 20 - } + }, + "identifierName": "yyy" }, "name": "yyy" }, @@ -182,12 +185,14 @@ } }, "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 16 } } ], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } } } diff --git a/test/fixtures/jsx/basic/1/expected.json b/test/fixtures/jsx/basic/1/expected.json index cc297bc62f..74febd56c0 100644 --- a/test/fixtures/jsx/basic/1/expected.json +++ b/test/fixtures/jsx/basic/1/expected.json @@ -93,7 +93,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/14/expected.json b/test/fixtures/jsx/basic/14/expected.json index 283763cbac..397403e48f 100644 --- a/test/fixtures/jsx/basic/14/expected.json +++ b/test/fixtures/jsx/basic/14/expected.json @@ -185,7 +185,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/15/expected.json b/test/fixtures/jsx/basic/15/expected.json index 7fc17dcca5..2ac2b7f338 100644 --- a/test/fixtures/jsx/basic/15/expected.json +++ b/test/fixtures/jsx/basic/15/expected.json @@ -247,7 +247,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/16/expected.json b/test/fixtures/jsx/basic/16/expected.json index d5331fba92..c3124de3ee 100644 --- a/test/fixtures/jsx/basic/16/expected.json +++ b/test/fixtures/jsx/basic/16/expected.json @@ -106,7 +106,8 @@ "closingElement": null, "children": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 0 } }, "operator": "<", @@ -122,7 +123,8 @@ "end": { "line": 1, "column": 13 - } + }, + "identifierName": "x" }, "name": "x" } diff --git a/test/fixtures/jsx/basic/17/expected.json b/test/fixtures/jsx/basic/17/expected.json index cf55b33ede..f6d8f748c1 100644 --- a/test/fixtures/jsx/basic/17/expected.json +++ b/test/fixtures/jsx/basic/17/expected.json @@ -97,7 +97,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "props" }, "name": "props" } @@ -125,7 +126,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/18/expected.json b/test/fixtures/jsx/basic/18/expected.json index 643ebce2f5..ecbc6076b7 100644 --- a/test/fixtures/jsx/basic/18/expected.json +++ b/test/fixtures/jsx/basic/18/expected.json @@ -97,7 +97,8 @@ "end": { "line": 1, "column": 14 - } + }, + "identifierName": "props" }, "name": "props" } diff --git a/test/fixtures/jsx/basic/19/expected.json b/test/fixtures/jsx/basic/19/expected.json index e9df7bec55..e18fa97fd0 100644 --- a/test/fixtures/jsx/basic/19/expected.json +++ b/test/fixtures/jsx/basic/19/expected.json @@ -193,7 +193,8 @@ "end": { "line": 1, "column": 45 - } + }, + "identifierName": "props" }, "name": "props" } diff --git a/test/fixtures/jsx/basic/2/expected.json b/test/fixtures/jsx/basic/2/expected.json index ba17f6adcf..971d21320c 100644 --- a/test/fixtures/jsx/basic/2/expected.json +++ b/test/fixtures/jsx/basic/2/expected.json @@ -188,7 +188,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/20/expected.json b/test/fixtures/jsx/basic/20/expected.json index 67be9032eb..aa201aac33 100644 --- a/test/fixtures/jsx/basic/20/expected.json +++ b/test/fixtures/jsx/basic/20/expected.json @@ -155,7 +155,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "aa" }, "name": "aa" }, @@ -171,7 +172,8 @@ "end": { "line": 1, "column": 12 - } + }, + "identifierName": "bb" }, "name": "bb" }, @@ -189,7 +191,8 @@ "end": { "line": 1, "column": 15 - } + }, + "identifierName": "cc" }, "name": "cc" }, @@ -281,7 +284,8 @@ "end": { "line": 1, "column": 23 - } + }, + "identifierName": "bb" }, "name": "bb" }, @@ -297,7 +301,8 @@ "end": { "line": 1, "column": 26 - } + }, + "identifierName": "cc" }, "name": "cc" }, @@ -315,7 +320,8 @@ "end": { "line": 1, "column": 29 - } + }, + "identifierName": "dd" }, "name": "dd" }, @@ -493,7 +499,8 @@ "end": { "line": 1, "column": 39 - } + }, + "identifierName": "aa" }, "name": "aa" }, @@ -509,7 +516,8 @@ "end": { "line": 1, "column": 41 - } + }, + "identifierName": "b" }, "name": "b" }, @@ -521,7 +529,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/21/expected.json b/test/fixtures/jsx/basic/21/expected.json index 8a6cfbda2c..25fba8ed09 100644 --- a/test/fixtures/jsx/basic/21/expected.json +++ b/test/fixtures/jsx/basic/21/expected.json @@ -97,7 +97,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "c" }, "name": "c" } @@ -196,7 +197,8 @@ "end": { "line": 1, "column": 25 - } + }, + "identifierName": "children" }, "name": "children" } @@ -227,7 +229,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "a" }, "name": "a" } @@ -258,7 +261,8 @@ "end": { "line": 1, "column": 34 - } + }, + "identifierName": "b" }, "name": "b" } @@ -268,6 +272,5 @@ } ], "directives": [] - }, - "comments": [] -} + } +} \ No newline at end of file diff --git a/test/fixtures/jsx/basic/3/expected.json b/test/fixtures/jsx/basic/3/expected.json index a5cebe4764..7fef3da7b3 100644 --- a/test/fixtures/jsx/basic/3/expected.json +++ b/test/fixtures/jsx/basic/3/expected.json @@ -244,7 +244,8 @@ "end": { "line": 1, "column": 22 - } + }, + "identifierName": "value" }, "name": "value" } diff --git a/test/fixtures/jsx/basic/5/expected.json b/test/fixtures/jsx/basic/5/expected.json index a9db746b35..31316dc183 100644 --- a/test/fixtures/jsx/basic/5/expected.json +++ b/test/fixtures/jsx/basic/5/expected.json @@ -93,7 +93,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/6/expected.json b/test/fixtures/jsx/basic/6/expected.json index 94b18bbb71..98750bdb3f 100644 --- a/test/fixtures/jsx/basic/6/expected.json +++ b/test/fixtures/jsx/basic/6/expected.json @@ -123,7 +123,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/8/expected.json b/test/fixtures/jsx/basic/8/expected.json index 06bfadfee7..695a507bb4 100644 --- a/test/fixtures/jsx/basic/8/expected.json +++ b/test/fixtures/jsx/basic/8/expected.json @@ -141,7 +141,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, @@ -271,7 +272,7 @@ "children": [] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/asi/expected.json b/test/fixtures/jsx/basic/asi/expected.json index 73e695d2a6..120125cf19 100644 --- a/test/fixtures/jsx/basic/asi/expected.json +++ b/test/fixtures/jsx/basic/asi/expected.json @@ -54,12 +54,14 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "x" }, "name": "x" }, "generator": false, "expression": false, + "async": false, "params": [], "body": { "type": "BlockStatement", @@ -117,7 +119,8 @@ "end": { "line": 2, "column": 7 - } + }, + "identifierName": "x" }, "name": "x" }, diff --git a/test/fixtures/jsx/basic/empty-expression-container/expected.json b/test/fixtures/jsx/basic/empty-expression-container/expected.json index 157403e9bf..816a67616f 100644 --- a/test/fixtures/jsx/basic/empty-expression-container/expected.json +++ b/test/fixtures/jsx/basic/empty-expression-container/expected.json @@ -137,7 +137,18 @@ }, "expression": { "type": "JSXEmptyExpression", - "loc": {} + "start": 4, + "end": 4, + "loc": { + "start": { + "line": 1, + "column": 4 + }, + "end": { + "line": 1, + "column": 4 + } + } } } ] diff --git a/test/fixtures/jsx/basic/keyword-tag/expected.json b/test/fixtures/jsx/basic/keyword-tag/expected.json index 310e29dd35..a3131a33e9 100644 --- a/test/fixtures/jsx/basic/keyword-tag/expected.json +++ b/test/fixtures/jsx/basic/keyword-tag/expected.json @@ -123,6 +123,7 @@ "children": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/namespace-tag/expected.json b/test/fixtures/jsx/basic/namespace-tag/expected.json index 9070b5a80f..e16d5de485 100644 --- a/test/fixtures/jsx/basic/namespace-tag/expected.json +++ b/test/fixtures/jsx/basic/namespace-tag/expected.json @@ -281,6 +281,7 @@ "children": [] } } - ] + ], + "directives": [] } } \ No newline at end of file diff --git a/test/fixtures/jsx/basic/yield-tag/expected.json b/test/fixtures/jsx/basic/yield-tag/expected.json index 79a13273e6..3cb2a5908c 100644 --- a/test/fixtures/jsx/basic/yield-tag/expected.json +++ b/test/fixtures/jsx/basic/yield-tag/expected.json @@ -1,198 +1,199 @@ { - "type": "File", - "start": 0, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "program": { - "type": "Program", + "type": "File", "start": 0, "end": 35, "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } + "start": { + "line": 1, + "column": 0 + }, + "end": { + "line": 3, + "column": 1 + } }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", + "program": { + "type": "Program", "start": 0, "end": 35, "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "id": { - "type": "Identifier", - "start": 9, - "end": 11, - "loc": { "start": { - "line": 1, - "column": 9 + "line": 1, + "column": 0 }, "end": { - "line": 1, - "column": 11 + "line": 3, + "column": 1 } - }, - "name": "it" }, - "generator": true, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 13, - "end": 35, - "loc": { - "start": { - "line": 1, - "column": 13 - }, - "end": { - "line": 3, - "column": 1 - } - }, - "body": [ + "sourceType": "script", + "body": [ { - "type": "ExpressionStatement", - "start": 19, - "end": 33, - "loc": { - "start": { - "line": 2, - "column": 4 - }, - "end": { - "line": 2, - "column": 18 - } - }, - "expression": { - "type": "YieldExpression", - "start": 19, - "end": 32, + "type": "FunctionDeclaration", + "start": 0, + "end": 35, "loc": { - "start": { - "line": 2, - "column": 4 - }, - "end": { - "line": 2, - "column": 17 - } - }, - "delegate": false, - "argument": { - "type": "JSXElement", - "start": 25, - "end": 32, - "loc": { "start": { - "line": 2, - "column": 10 + "line": 1, + "column": 0 }, "end": { - "line": 2, - "column": 17 + "line": 3, + "column": 1 } - }, - "openingElement": { - "type": "JSXOpeningElement", - "start": 25, - "end": 28, + }, + "id": { + "type": "Identifier", + "start": 9, + "end": 11, "loc": { - "start": { - "line": 2, - "column": 10 - }, - "end": { - "line": 2, - "column": 13 - } - }, - "attributes": [], - "name": { - "type": "JSXIdentifier", - "start": 26, - "end": 27, - "loc": { "start": { - "line": 2, - "column": 11 + "line": 1, + "column": 9 }, "end": { - "line": 2, - "column": 12 - } - }, - "name": "a" + "line": 1, + "column": 11 + }, + "identifierName": "it" }, - "selfClosing": false - }, - "closingElement": { - "type": "JSXClosingElement", - "start": 28, - "end": 32, + "name": "it" + }, + "generator": true, + "expression": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 13, + "end": 35, "loc": { - "start": { - "line": 2, - "column": 13 - }, - "end": { - "line": 2, - "column": 17 - } - }, - "name": { - "type": "JSXIdentifier", - "start": 30, - "end": 31, - "loc": { "start": { - "line": 2, - "column": 15 + "line": 1, + "column": 13 }, "end": { - "line": 2, - "column": 16 + "line": 3, + "column": 1 } - }, - "name": "a" - } - }, - "children": [] + }, + "body": [ + { + "type": "ExpressionStatement", + "start": 19, + "end": 33, + "loc": { + "start": { + "line": 2, + "column": 4 + }, + "end": { + "line": 2, + "column": 18 + } + }, + "expression": { + "type": "YieldExpression", + "start": 19, + "end": 32, + "loc": { + "start": { + "line": 2, + "column": 4 + }, + "end": { + "line": 2, + "column": 17 + } + }, + "delegate": false, + "argument": { + "type": "JSXElement", + "start": 25, + "end": 32, + "loc": { + "start": { + "line": 2, + "column": 10 + }, + "end": { + "line": 2, + "column": 17 + } + }, + "openingElement": { + "type": "JSXOpeningElement", + "start": 25, + "end": 28, + "loc": { + "start": { + "line": 2, + "column": 10 + }, + "end": { + "line": 2, + "column": 13 + } + }, + "attributes": [], + "name": { + "type": "JSXIdentifier", + "start": 26, + "end": 27, + "loc": { + "start": { + "line": 2, + "column": 11 + }, + "end": { + "line": 2, + "column": 12 + } + }, + "name": "a" + }, + "selfClosing": false + }, + "closingElement": { + "type": "JSXClosingElement", + "start": 28, + "end": 32, + "loc": { + "start": { + "line": 2, + "column": 13 + }, + "end": { + "line": 2, + "column": 17 + } + }, + "name": { + "type": "JSXIdentifier", + "start": 30, + "end": 31, + "loc": { + "start": { + "line": 2, + "column": 15 + }, + "end": { + "line": 2, + "column": 16 + } + }, + "name": "a" + } + }, + "children": [] + } + } + } + ], + "directives": [] } - } } - ], - "directives": [] - } - } - ], - "directives": [] - }, - "comments": [] -} + ], + "directives": [] + } +} \ No newline at end of file diff --git a/test/fixtures/jsx/regression/2/expected.json b/test/fixtures/jsx/regression/2/expected.json index 4983e54932..33898ea946 100644 --- a/test/fixtures/jsx/regression/2/expected.json +++ b/test/fixtures/jsx/regression/2/expected.json @@ -190,7 +190,8 @@ "end": { "line": 1, "column": 19 - } + }, + "identifierName": "test" }, "name": "test" } @@ -221,7 +222,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/regression/3/expected.json b/test/fixtures/jsx/regression/3/expected.json index d4081dc212..e952ae4a2b 100644 --- a/test/fixtures/jsx/regression/3/expected.json +++ b/test/fixtures/jsx/regression/3/expected.json @@ -179,7 +179,8 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" }, @@ -195,9 +196,13 @@ "end": { "line": 1, "column": 9 - } + }, + "identifierName": "a" }, "name": "a" + }, + "extra": { + "shorthand": true } } ] diff --git a/test/fixtures/jsx/regression/5/expected.json b/test/fixtures/jsx/regression/5/expected.json index aaf2e26a1d..5e8ebf8b82 100644 --- a/test/fixtures/jsx/regression/5/expected.json +++ b/test/fixtures/jsx/regression/5/expected.json @@ -147,7 +147,8 @@ "end": { "line": 1, "column": 7 - } + }, + "identifierName": "a" }, "name": "a" } @@ -178,7 +179,8 @@ "end": { "line": 1, "column": 10 - } + }, + "identifierName": "b" }, "name": "b" } @@ -186,7 +188,7 @@ ] } } - ] - }, - "comments": [] + ], + "directives": [] + } } \ No newline at end of file diff --git a/test/fixtures/jsx/regression/6/expected.json b/test/fixtures/jsx/regression/6/expected.json index 44b08551ed..fbfd450b91 100644 --- a/test/fixtures/jsx/regression/6/expected.json +++ b/test/fixtures/jsx/regression/6/expected.json @@ -145,7 +145,8 @@ "end": { "line": 1, "column": 28 - } + }, + "identifierName": "props" }, "name": "props" } diff --git a/test/fixtures/jsx/regression/issue-2083/expected.json b/test/fixtures/jsx/regression/issue-2083/expected.json index eeb0a95cc9..3f7dd61fd2 100644 --- a/test/fixtures/jsx/regression/issue-2083/expected.json +++ b/test/fixtures/jsx/regression/issue-2083/expected.json @@ -122,7 +122,8 @@ "closingElement": null, "children": [], "extra": { - "parenthesized": true + "parenthesized": true, + "parenStart": 7 } }, "alternate": { diff --git a/test/fixtures/jsx/regression/test-star-option/actual.js b/test/fixtures/jsx/regression/test-star-option/actual.js deleted file mode 100644 index 7aeab8e0ec..0000000000 --- a/test/fixtures/jsx/regression/test-star-option/actual.js +++ /dev/null @@ -1,4 +0,0 @@ -function A(): void { - a::b; -
; -} diff --git a/test/fixtures/jsx/regression/test-star-option/expected.json b/test/fixtures/jsx/regression/test-star-option/expected.json deleted file mode 100644 index 1d0e4b71f8..0000000000 --- a/test/fixtures/jsx/regression/test-star-option/expected.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "type": "File", - "start": 0, - "end": 45, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 4, - "column": 1 - } - }, - "program": { - "type": "Program", - "start": 0, - "end": 45, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 4, - "column": 1 - } - }, - "sourceType": "script", - "body": [ - { - "type": "FunctionDeclaration", - "start": 0, - "end": 45, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 4, - "column": 1 - } - }, - "id": { - "type": "Identifier", - "start": 9, - "end": 10, - "loc": { - "start": { - "line": 1, - "column": 9 - }, - "end": { - "line": 1, - "column": 10 - }, - "identifierName": "A" - }, - "name": "A" - }, - "generator": false, - "expression": false, - "async": false, - "params": [], - "returnType": { - "type": "TypeAnnotation", - "start": 12, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 12 - }, - "end": { - "line": 1, - "column": 18 - } - }, - "typeAnnotation": { - "type": "VoidTypeAnnotation", - "start": 14, - "end": 18, - "loc": { - "start": { - "line": 1, - "column": 14 - }, - "end": { - "line": 1, - "column": 18 - } - } - } - }, - "body": { - "type": "BlockStatement", - "start": 19, - "end": 45, - "loc": { - "start": { - "line": 1, - "column": 19 - }, - "end": { - "line": 4, - "column": 1 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 23, - "end": 28, - "loc": { - "start": { - "line": 2, - "column": 2 - }, - "end": { - "line": 2, - "column": 7 - } - }, - "expression": { - "type": "BindExpression", - "start": 23, - "end": 27, - "loc": { - "start": { - "line": 2, - "column": 2 - }, - "end": { - "line": 2, - "column": 6 - } - }, - "object": { - "type": "Identifier", - "start": 23, - "end": 24, - "loc": { - "start": { - "line": 2, - "column": 2 - }, - "end": { - "line": 2, - "column": 3 - }, - "identifierName": "a" - }, - "name": "a" - }, - "callee": { - "type": "Identifier", - "start": 26, - "end": 27, - "loc": { - "start": { - "line": 2, - "column": 5 - }, - "end": { - "line": 2, - "column": 6 - }, - "identifierName": "b" - }, - "name": "b" - } - } - }, - { - "type": "ExpressionStatement", - "start": 31, - "end": 43, - "loc": { - "start": { - "line": 3, - "column": 2 - }, - "end": { - "line": 3, - "column": 14 - } - }, - "expression": { - "type": "JSXElement", - "start": 31, - "end": 42, - "loc": { - "start": { - "line": 3, - "column": 2 - }, - "end": { - "line": 3, - "column": 13 - } - }, - "openingElement": { - "type": "JSXOpeningElement", - "start": 31, - "end": 36, - "loc": { - "start": { - "line": 3, - "column": 2 - }, - "end": { - "line": 3, - "column": 7 - } - }, - "attributes": [], - "name": { - "type": "JSXIdentifier", - "start": 32, - "end": 35, - "loc": { - "start": { - "line": 3, - "column": 3 - }, - "end": { - "line": 3, - "column": 6 - } - }, - "name": "div" - }, - "selfClosing": false - }, - "closingElement": { - "type": "JSXClosingElement", - "start": 36, - "end": 42, - "loc": { - "start": { - "line": 3, - "column": 7 - }, - "end": { - "line": 3, - "column": 13 - } - }, - "name": { - "type": "JSXIdentifier", - "start": 38, - "end": 41, - "loc": { - "start": { - "line": 3, - "column": 9 - }, - "end": { - "line": 3, - "column": 12 - } - }, - "name": "div" - } - }, - "children": [] - } - } - ], - "directives": [] - } - } - ], - "directives": [] - } -} \ No newline at end of file diff --git a/test/fixtures/jsx/regression/test-star-option/options.json b/test/fixtures/jsx/regression/test-star-option/options.json deleted file mode 100644 index 2f56a201da..0000000000 --- a/test/fixtures/jsx/regression/test-star-option/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["*"] -} diff --git a/test/utils/runFixtureTests.js b/test/utils/runFixtureTests.js index c391632f84..723c3051e7 100644 --- a/test/utils/runFixtureTests.js +++ b/test/utils/runFixtureTests.js @@ -49,9 +49,6 @@ exports.runThrowTestsWithEstree = function runThrowTestsWithEstree(fixturesPath, }; function save(test, ast) { - delete ast.tokens; - if (ast.comments && !ast.comments.length) delete ast.comments; - // Ensure that RegExp are serialized as strings const toJSON = RegExp.prototype.toJSON; RegExp.prototype.toJSON = RegExp.prototype.toString; @@ -61,8 +58,6 @@ function save(test, ast) { function runTest(test, parseFunction) { var opts = test.options; - opts.locations = true; - opts.ranges = true; if (opts.throws && test.expect.code) { throw new Error("File expected.json exists although options specify throws. Remove expected.json."); @@ -83,6 +78,9 @@ function runTest(test, parseFunction) { throw err; } + delete ast.tokens; + if (ast.comments && !ast.comments.length) delete ast.comments; + if (!test.expect.code && !opts.throws && !process.env.CI) { test.expect.loc += "on"; return save(test, ast); @@ -131,5 +129,15 @@ function misMatch(exp, act) { var mis = misMatch(exp[prop], act[prop]); if (mis) return addPath(mis, prop); } + + for (var prop in act) { + if (prop === "__clone") { + continue; + } + + if (!(prop in exp) && act[prop] !== undefined) { + return `Did not expect a property '${prop}'`; + } + } } } diff --git a/yarn.lock b/yarn.lock index e3c07cc87c..c6ceaa3310 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,38 @@ # yarn lockfile v1 +"@ava/babel-preset-stage-4@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.0.0.tgz#a613b5e152f529305422546b072d47facfb26291" + dependencies: + babel-plugin-check-es2015-constants "^6.8.0" + babel-plugin-syntax-trailing-function-commas "^6.20.0" + babel-plugin-transform-async-to-generator "^6.16.0" + babel-plugin-transform-es2015-destructuring "^6.19.0" + babel-plugin-transform-es2015-function-name "^6.9.0" + babel-plugin-transform-es2015-modules-commonjs "^6.18.0" + babel-plugin-transform-es2015-parameters "^6.21.0" + babel-plugin-transform-es2015-spread "^6.8.0" + babel-plugin-transform-es2015-sticky-regex "^6.8.0" + babel-plugin-transform-es2015-unicode-regex "^6.11.0" + babel-plugin-transform-exponentiation-operator "^6.8.0" + package-hash "^1.2.0" + +"@ava/babel-preset-transform-test-files@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@ava/babel-preset-transform-test-files/-/babel-preset-transform-test-files-2.0.1.tgz#d75232cc6d71dc9c7eae4b76a9004fd81501d0c1" + dependencies: + babel-plugin-ava-throws-helper "^1.0.0" + babel-plugin-espower "^2.3.2" + package-hash "^1.2.0" + +"@ava/pretty-format@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@ava/pretty-format/-/pretty-format-1.1.0.tgz#d0a57d25eb9aeab9643bdd1a030642b91c123e28" + dependencies: + ansi-styles "^2.2.1" + esutils "^2.0.2" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -99,10 +131,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argv@>=0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab" - arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" @@ -167,109 +195,94 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" -auto-bind@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-0.1.0.tgz#7a29efc8c2388d3d578e02fc2df531c81ffc1ee1" +auto-bind@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.1.0.tgz#93b864dc7ee01a326281775d5c75ca0a751e5961" -ava-files@^0.2.0: +ava-init@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/ava-files/-/ava-files-0.2.0.tgz#c7b8b6e2e0cea63b57a6e27e0db145c7c19cfe20" - dependencies: - auto-bind "^0.1.0" - bluebird "^3.4.1" - globby "^6.0.0" - ignore-by-default "^1.0.1" - lodash.flatten "^4.2.0" - multimatch "^2.1.0" - slash "^1.0.0" - -ava-init@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.1.6.tgz#ef19ed0b24b6bf359dad6fbadf1a05d836395c91" + resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.0.tgz#9304c8b4c357d66e3dfdae1fbff47b1199d5c55d" dependencies: arr-exclude "^1.0.0" - cross-spawn "^4.0.0" - pinkie-promise "^2.0.0" - read-pkg-up "^1.0.1" - the-argv "^1.0.0" - write-pkg "^1.0.0" + execa "^0.5.0" + has-yarn "^1.0.0" + read-pkg-up "^2.0.0" + write-pkg "^2.0.0" -ava@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/ava/-/ava-0.17.0.tgz#359e2a89616801ef03929c3cf10a9d4f8e451d02" +ava@^0.18.0: + version "0.18.2" + resolved "https://registry.yarnpkg.com/ava/-/ava-0.18.2.tgz#79253d1636077034a2780bb55b5c3e6c3d7f312f" dependencies: + "@ava/babel-preset-stage-4" "^1.0.0" + "@ava/babel-preset-transform-test-files" "^2.0.0" + "@ava/pretty-format" "^1.1.0" arr-flatten "^1.0.1" array-union "^1.0.1" array-uniq "^1.0.2" arrify "^1.0.0" - auto-bind "^0.1.0" - ava-files "^0.2.0" - ava-init "^0.1.0" + auto-bind "^1.1.0" + ava-init "^0.2.0" babel-code-frame "^6.16.0" babel-core "^6.17.0" - babel-plugin-ava-throws-helper "^0.1.0" - babel-plugin-detective "^2.0.0" - babel-plugin-espower "^2.3.1" - babel-plugin-transform-runtime "^6.15.0" - babel-preset-es2015 "^6.16.0" - babel-preset-es2015-node4 "^2.1.0" - babel-preset-stage-2 "^6.17.0" - babel-runtime "^6.11.6" bluebird "^3.0.0" caching-transform "^1.0.0" chalk "^1.0.0" chokidar "^1.4.2" + clean-stack "^1.1.1" clean-yaml-object "^0.1.0" - cli-cursor "^1.0.2" - cli-spinners "^0.1.2" + cli-cursor "^2.1.0" + cli-spinners "^1.0.0" cli-truncate "^0.2.0" co-with-promise "^4.6.0" + code-excerpt "^2.1.0" common-path-prefix "^1.0.0" convert-source-map "^1.2.0" core-assert "^0.2.0" currently-unhandled "^0.4.1" debug "^2.2.0" + diff "^3.0.1" + dot-prop "^4.1.0" empower-core "^0.6.1" - figures "^1.4.0" + equal-length "^1.0.0" + figures "^2.0.0" find-cache-dir "^0.1.1" fn-name "^2.0.0" get-port "^2.1.0" + globby "^6.0.0" has-flag "^2.0.0" ignore-by-default "^1.0.0" + indent-string "^3.0.0" is-ci "^1.0.7" is-generator-fn "^1.0.0" is-obj "^1.0.0" is-observable "^0.2.0" is-promise "^2.1.0" + jest-snapshot "^18.1.0" last-line-stream "^1.0.0" lodash.debounce "^4.0.3" lodash.difference "^4.3.0" - lodash.isequal "^4.4.0" + lodash.flatten "^4.2.0" + lodash.isequal "^4.5.0" loud-rejection "^1.2.0" matcher "^0.1.1" max-timeout "^1.0.0" - md5-hex "^1.2.0" + md5-hex "^2.0.0" meow "^3.7.0" ms "^0.7.1" - object-assign "^4.0.1" + multimatch "^2.1.0" observable-to-promise "^0.4.0" option-chain "^0.1.0" - package-hash "^1.1.0" - pkg-conf "^1.0.1" + package-hash "^1.2.0" + pkg-conf "^2.0.0" plur "^2.0.0" - power-assert-context-formatter "^1.0.4" - power-assert-renderer-assertion "^1.0.1" - power-assert-renderer-succinct "^1.0.1" pretty-ms "^2.0.0" - repeating "^2.0.0" require-precompiled "^0.1.0" resolve-cwd "^1.0.0" - semver "^5.3.0" - set-immediate-shim "^1.0.1" + slash "^1.0.0" source-map-support "^0.4.0" - stack-utils "^0.4.0" + stack-utils "^1.0.0" strip-ansi "^3.0.1" - strip-bom "^2.0.0" + strip-bom-buf "^1.0.0" time-require "^0.1.2" unique-temp-dir "^1.0.0" update-notifier "^1.0.0" @@ -490,24 +503,20 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-ava-throws-helper@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-ava-throws-helper/-/babel-plugin-ava-throws-helper-0.1.0.tgz#951107708a12208026bf8ca4cef18a87bc9b0cfe" +babel-plugin-ava-throws-helper@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ava-throws-helper/-/babel-plugin-ava-throws-helper-1.0.0.tgz#8fe6e79d2fd19838b5c3649f89cfb03fd563e241" dependencies: babel-template "^6.7.0" babel-types "^6.7.2" -babel-plugin-check-es2015-constants@^6.22.0: +babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.8.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" dependencies: babel-runtime "^6.22.0" -babel-plugin-detective@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-detective/-/babel-plugin-detective-2.0.0.tgz#6e642e83c22a335279754ebe2d754d2635f49f13" - -babel-plugin-espower@^2.3.1: +babel-plugin-espower@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz#5516b8fcdb26c9f0e1d8160749f6e4c65e71271e" dependencies: @@ -525,14 +534,13 @@ babel-plugin-external-helpers@^6.18.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-istanbul@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-3.1.2.tgz#11d5abde18425ec24b5d648c7e0b5d25cd354a22" +babel-plugin-istanbul@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10" dependencies: - find-up "^1.1.2" + find-up "^2.1.0" istanbul-lib-instrument "^1.4.2" - object-assign "^4.1.0" - test-exclude "^3.3.0" + test-exclude "^4.0.0" babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" @@ -582,7 +590,7 @@ babel-plugin-syntax-object-rest-spread@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" -babel-plugin-syntax-trailing-function-commas@^6.22.0: +babel-plugin-syntax-trailing-function-commas@^6.20.0, babel-plugin-syntax-trailing-function-commas@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" @@ -594,7 +602,7 @@ babel-plugin-transform-async-generator-functions@^6.22.0: babel-plugin-syntax-async-generators "^6.5.0" babel-runtime "^6.22.0" -babel-plugin-transform-async-to-generator@^6.22.0: +babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e" dependencies: @@ -679,7 +687,7 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0: babel-runtime "^6.22.0" babel-template "^6.22.0" -babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.5: +babel-plugin-transform-es2015-destructuring@^6.19.0, babel-plugin-transform-es2015-destructuring@^6.22.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" dependencies: @@ -698,7 +706,7 @@ babel-plugin-transform-es2015-for-of@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.5.0: +babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.9.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104" dependencies: @@ -720,7 +728,7 @@ babel-plugin-transform-es2015-modules-amd@^6.24.0: babel-runtime "^6.22.0" babel-template "^6.22.0" -babel-plugin-transform-es2015-modules-commonjs@^6.24.0, babel-plugin-transform-es2015-modules-commonjs@^6.7.4: +babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f" dependencies: @@ -752,7 +760,7 @@ babel-plugin-transform-es2015-object-super@^6.22.0: babel-helper-replace-supers "^6.22.0" babel-runtime "^6.22.0" -babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.7.0: +babel-plugin-transform-es2015-parameters@^6.21.0, babel-plugin-transform-es2015-parameters@^6.22.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b" dependencies: @@ -763,20 +771,20 @@ babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015- babel-traverse "^6.23.0" babel-types "^6.23.0" -babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.5.0: +babel-plugin-transform-es2015-shorthand-properties@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723" dependencies: babel-runtime "^6.22.0" babel-types "^6.22.0" -babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.6.5: +babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.8.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.5.0: +babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.8.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593" dependencies: @@ -796,7 +804,7 @@ babel-plugin-transform-es2015-typeof-symbol@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.5.0: +babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es2015-unicode-regex@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20" dependencies: @@ -804,7 +812,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es20 babel-runtime "^6.22.0" regexpu-core "^2.0.0" -babel-plugin-transform-exponentiation-operator@^6.22.0: +babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.8.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d" dependencies: @@ -846,12 +854,6 @@ babel-plugin-transform-regenerator@^6.22.0: dependencies: regenerator-transform "0.9.8" -babel-plugin-transform-runtime@^6.15.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee" - dependencies: - babel-runtime "^6.22.0" - babel-plugin-transform-strict-mode@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c" @@ -867,20 +869,7 @@ babel-polyfill@^6.23.0: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-preset-es2015-node4@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/babel-preset-es2015-node4/-/babel-preset-es2015-node4-2.1.1.tgz#e31f290859b58619c8cfa241d1b0bc900f941cdb" - dependencies: - babel-plugin-transform-es2015-destructuring "^6.6.5" - babel-plugin-transform-es2015-function-name "^6.5.0" - babel-plugin-transform-es2015-modules-commonjs "^6.7.4" - babel-plugin-transform-es2015-parameters "^6.7.0" - babel-plugin-transform-es2015-shorthand-properties "^6.5.0" - babel-plugin-transform-es2015-spread "^6.6.5" - babel-plugin-transform-es2015-sticky-regex "^6.5.0" - babel-plugin-transform-es2015-unicode-regex "^6.5.0" - -babel-preset-es2015@^6.14.0, babel-preset-es2015@^6.16.0: +babel-preset-es2015@^6.14.0: version "6.24.0" resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.0.tgz#c162d68b1932696e036cd3110dc1ccd303d2673a" dependencies: @@ -925,7 +914,7 @@ babel-preset-stage-1@^6.22.0: babel-plugin-transform-export-extensions "^6.22.0" babel-preset-stage-2 "^6.22.0" -babel-preset-stage-2@^6.17.0, babel-preset-stage-2@^6.22.0: +babel-preset-stage-2@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07" dependencies: @@ -956,7 +945,7 @@ babel-register@^6.24.0: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0: +babel-runtime@^6.18.0, babel-runtime@^6.22.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: @@ -1020,7 +1009,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.0.0, bluebird@^3.4.1: +bluebird@^3.0.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" @@ -1183,6 +1172,10 @@ circular-json@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d" +clean-stack@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.1.1.tgz#a1b3711122df162df7c7cb9b3c0470f28cb58adb" + clean-yaml-object@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68" @@ -1191,15 +1184,21 @@ cli-boxes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" -cli-cursor@^1.0.1, cli-cursor@^1.0.2: +cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" dependencies: restore-cursor "^1.0.1" -cli-spinners@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + dependencies: + restore-cursor "^2.0.0" + +cli-spinners@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a" cli-truncate@^0.2.0: version "0.2.1" @@ -1238,19 +1237,16 @@ co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" +code-excerpt@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-2.1.0.tgz#5dcc081e88f4a7e3b554e9e35d7ef232d47f8147" + dependencies: + convert-to-spaces "^1.0.1" + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codecov@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/codecov/-/codecov-1.0.1.tgz#97260ceac0e96b8eda8d562006558a53a139dffd" - dependencies: - argv ">=0.0.2" - execSync "1.0.2" - request ">=2.42.0" - urlgrey ">=0.4.0" - combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" @@ -1305,6 +1301,10 @@ convert-source-map@^1.1.0, convert-source-map@^1.2.0, convert-source-map@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" +convert-to-spaces@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715" + core-assert@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f" @@ -1326,19 +1326,12 @@ create-error-class@^3.0.1: dependencies: capture-stack-trace "^1.0.0" -cross-env@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-2.0.1.tgz#f283b4039ea759ada9ab7e987ad3bddb241b79a6" +cross-env@^3.1.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-3.2.4.tgz#9e0585f277864ed421ce756f81a980ff0d698aba" dependencies: - cross-spawn "^3.0.1" - lodash.assign "^3.2.0" - -cross-spawn@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" + cross-spawn "^5.1.0" + is-windows "^1.0.0" cross-spawn@^4, cross-spawn@^4.0.0: version "4.0.2" @@ -1347,6 +1340,14 @@ cross-spawn@^4, cross-spawn@^4.0.0: lru-cache "^4.0.1" which "^1.2.9" +cross-spawn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -1439,6 +1440,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +diff@^3.0.0, diff@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" + doctrine@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" @@ -1452,16 +1457,18 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" +dot-prop@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1" + dependencies: + is-obj "^1.0.0" + duplexer2@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" dependencies: readable-stream "^2.0.2" -eastasianwidth@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.1.1.tgz#44d656de9da415694467335365fb3147b8572b7c" - ecc-jsbn@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" @@ -1475,6 +1482,10 @@ empower-core@^0.6.1: call-signature "0.0.2" core-js "^2.0.0" +equal-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c" + error-ex@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" @@ -1635,7 +1646,7 @@ esrecurse@^4.1.0: estraverse "~4.1.0" object-assign "^4.0.1" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -1658,11 +1669,17 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -execSync@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/execSync/-/execSync-1.0.2.tgz#1f42eda582225180053224ecdd3fd1960fdb3139" +execa@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36" dependencies: - temp "~0.5.1" + cross-spawn "^4.0.0" + get-stream "^2.2.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" exit-hook@^1.0.0: version "1.1.1" @@ -1698,13 +1715,19 @@ fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" -figures@^1.3.5, figures@^1.4.0: +figures@^1.3.5: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" dependencies: escape-string-regexp "^1.0.5" object-assign "^4.1.0" +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" @@ -1745,6 +1768,12 @@ find-up@^1.0.0, find-up@^1.1.2: path-exists "^2.0.0" pinkie-promise "^2.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + flat-cache@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96" @@ -1754,9 +1783,9 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flow-bin@^0.42.0: - version "0.42.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.42.0.tgz#05dd754b6b052de7b150f9210e2160746961e3cf" +flow-bin@^0.41.0: + version "0.41.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.41.0.tgz#8badac9a19da45004997e599bd316518db489b2e" fn-name@^2.0.0: version "2.0.1" @@ -1860,6 +1889,13 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + getpass@^0.1.1: version "0.1.6" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6" @@ -1935,14 +1971,10 @@ got@^5.0.0: unzip-response "^1.0.2" url-parse-lax "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graceful-fs@~1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" - "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" @@ -1990,6 +2022,10 @@ has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" +has-yarn@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7" + hawk@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" @@ -2022,7 +2058,7 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" -ignore-by-default@^1.0.0, ignore-by-default@^1.0.1: +ignore-by-default@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -2040,6 +2076,10 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" +indent-string@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.1.0.tgz#08ff4334603388399b329e6b9538dc7a3cf5de7d" + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2244,7 +2284,7 @@ is-retry-allowed@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" -is-stream@^1.0.0: +is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -2256,10 +2296,14 @@ is-url@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26" -is-utf8@^0.2.0: +is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" +is-windows@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.0.tgz#c61d61020c3ebe99261b781bd3d1622395f547f8" + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -2326,6 +2370,52 @@ istanbul-reports@^1.0.0: dependencies: handlebars "^4.0.3" +jest-diff@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.1.0.tgz#4ff79e74dd988c139195b365dc65d87f606f4803" + dependencies: + chalk "^1.1.3" + diff "^3.0.0" + jest-matcher-utils "^18.1.0" + pretty-format "^18.1.0" + +jest-file-exists@^17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169" + +jest-matcher-utils@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.1.0.tgz#1ac4651955ee2a60cef1e7fcc98cdfd773c0f932" + dependencies: + chalk "^1.1.3" + pretty-format "^18.1.0" + +jest-mock@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-18.0.0.tgz#5c248846ea33fa558b526f5312ab4a6765e489b3" + +jest-snapshot@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.1.0.tgz#55b96d2ee639c9bce76f87f2a3fd40b71c7a5916" + dependencies: + jest-diff "^18.1.0" + jest-file-exists "^17.0.0" + jest-matcher-utils "^18.1.0" + jest-util "^18.1.0" + natural-compare "^1.4.0" + pretty-format "^18.1.0" + +jest-util@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.1.0.tgz#3a99c32114ab17f84be094382527006e6d4bfc6a" + dependencies: + chalk "^1.1.1" + diff "^3.0.0" + graceful-fs "^4.1.6" + jest-file-exists "^17.0.0" + jest-mock "^18.0.0" + mkdirp "^0.5.1" + jodid25519@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967" @@ -2429,7 +2519,7 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -load-json-file@^1.0.0, load-json-file@^1.1.0: +load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" dependencies: @@ -2439,44 +2529,21 @@ load-json-file@^1.0.0, load-json-file@^1.1.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + strip-bom "^3.0.0" -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._bindcallback@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - -lodash._createassigner@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" dependencies: - lodash._bindcallback "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash.restparam "^3.0.0" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - -lodash.assign@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa" - dependencies: - lodash._baseassign "^3.0.0" - lodash._createassigner "^3.0.0" - lodash.keys "^3.0.0" + p-locate "^2.0.0" + path-exists "^3.0.0" lodash.debounce@^4.0.3: version "4.0.8" @@ -2490,34 +2557,14 @@ lodash.flatten@^4.2.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.isequal@^4.4.0: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.pickby@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - lodash@^4.0.0, lodash@^4.15.0, lodash@^4.2.0, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -2570,6 +2617,12 @@ md5-hex@^1.2.0, md5-hex@^1.3.0: dependencies: md5-o-matic "^0.1.1" +md5-hex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33" + dependencies: + md5-o-matic "^0.1.1" + md5-o-matic@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3" @@ -2623,6 +2676,10 @@ mime-types@^2.1.12, mime-types@~2.1.7: dependencies: mime-db "~1.26.0" +mimic-fn@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" + minimatch@^3.0.0, minimatch@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" @@ -2713,6 +2770,12 @@ normalize-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + npmlog@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" @@ -2796,6 +2859,12 @@ onetime@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" +onetime@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.0.tgz#52aa8110e52fc5126ffc667bd8ec21c2ed209ce6" + dependencies: + mimic-fn "^1.0.0" + optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" @@ -2849,7 +2918,21 @@ output-file-sync@^1.1.0: mkdirp "^0.5.1" object-assign "^4.1.0" -package-hash@^1.1.0: +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +p-limit@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + dependencies: + p-limit "^1.1.0" + +package-hash@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44" dependencies: @@ -2893,6 +2976,10 @@ path-exists@^2.0.0: dependencies: pinkie-promise "^2.0.0" +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -2901,6 +2988,10 @@ path-is-inside@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + path-parse@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" @@ -2913,6 +3004,12 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +path-type@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + dependencies: + pify "^2.0.0" + performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" @@ -2941,14 +3038,12 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -pkg-conf@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-1.1.3.tgz#378e56d6fd13e88bfb6f4a25df7a83faabddba5b" +pkg-conf@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279" dependencies: - find-up "^1.0.0" - load-json-file "^1.1.0" - object-assign "^4.0.1" - symbol "^0.2.1" + find-up "^2.0.0" + load-json-file "^2.0.0" pkg-dir@^1.0.0: version "1.0.0" @@ -2970,53 +3065,6 @@ pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" -power-assert-context-formatter@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz#edba352d3ed8a603114d667265acce60d689ccdf" - dependencies: - core-js "^2.0.0" - power-assert-context-traversal "^1.1.1" - -power-assert-context-traversal@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz#88cabca0d13b6359f07d3d3e8afa699264577ed9" - dependencies: - core-js "^2.0.0" - estraverse "^4.1.0" - -power-assert-renderer-assertion@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.1.1.tgz#cbfc0e77e0086a8f96af3f1d8e67b9ee7e28ce98" - dependencies: - power-assert-renderer-base "^1.1.1" - power-assert-util-string-width "^1.1.1" - -power-assert-renderer-base@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-renderer-base/-/power-assert-renderer-base-1.1.1.tgz#96a650c6fd05ee1bc1f66b54ad61442c8b3f63eb" - -power-assert-renderer-diagram@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.1.tgz#7e0c82cc08a84b155e51b5ae94f59709778a65fb" - dependencies: - core-js "^2.0.0" - power-assert-renderer-base "^1.1.1" - power-assert-util-string-width "^1.1.1" - stringifier "^1.3.0" - -power-assert-renderer-succinct@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-renderer-succinct/-/power-assert-renderer-succinct-1.1.1.tgz#c2a468b23822abd6f80e2aba5322347b09df476e" - dependencies: - core-js "^2.0.0" - power-assert-renderer-diagram "^1.1.1" - -power-assert-util-string-width@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/power-assert-util-string-width/-/power-assert-util-string-width-1.1.1.tgz#be659eb7937fdd2e6c9a77268daaf64bd5b7c592" - dependencies: - eastasianwidth "^0.1.1" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -3029,6 +3077,12 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" +pretty-format@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.1.0.tgz#fb65a86f7a7f9194963eee91865c1bcf1039e284" + dependencies: + ansi-styles "^2.2.1" + pretty-ms@^0.2.1: version "0.2.2" resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6" @@ -3097,6 +3151,13 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" +read-pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + dependencies: + find-up "^2.0.0" + read-pkg "^2.0.0" + read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" @@ -3105,6 +3166,14 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +read-pkg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + dependencies: + load-json-file "^2.0.0" + normalize-package-data "^2.3.2" + path-type "^2.0.0" + readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" @@ -3226,7 +3295,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@>=2.42.0, request@^2.79.0: +request@^2.79.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -3307,6 +3376,13 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" @@ -3319,12 +3395,6 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2. dependencies: glob "^7.0.5" -rimraf@~2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.1.4.tgz#5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2" - optionalDependencies: - graceful-fs "~1" - rimraf@~2.5.1, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" @@ -3399,6 +3469,16 @@ set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + shelljs@^0.7.5: version "0.7.7" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" @@ -3411,7 +3491,7 @@ signal-exit@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-2.1.2.tgz#375879b1f92ebc3b334480d038dc546a6d558564" -signal-exit@^3.0.0, signal-exit@^3.0.1: +signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -3433,7 +3513,7 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -sort-keys@^1.1.1: +sort-keys@^1.1.1, sort-keys@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" dependencies: @@ -3499,9 +3579,9 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -stack-utils@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-0.4.0.tgz#940cb82fccfa84e8ff2f3fdf293fe78016beccd1" +stack-utils@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.0.tgz#2392cd8ddbd222492ed6c047960f7414b46c0f83" string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" @@ -3522,14 +3602,6 @@ string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -stringifier@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/stringifier/-/stringifier-1.3.0.tgz#def18342f6933db0f2dbfc9aa02175b448c17959" - dependencies: - core-js "^2.0.0" - traverse "^0.6.6" - type-name "^2.0.1" - stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -3544,6 +3616,12 @@ strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" +strip-bom-buf@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572" + dependencies: + is-utf8 "^0.2.1" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -3554,6 +3632,10 @@ strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" @@ -3578,10 +3660,6 @@ symbol-observable@^0.2.2: version "0.2.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" -symbol@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/symbol/-/symbol-0.2.3.tgz#3b9873b8a901e47c6efe21526a3ac372ef28bbc7" - table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -3614,12 +3692,6 @@ tar@~2.2.1: fstream "^1.0.2" inherits "2" -temp@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/temp/-/temp-0.5.1.tgz#77ab19c79aa7b593cbe4fac2441768cad987b8df" - dependencies: - rimraf "~2.1.4" - test-exclude@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977" @@ -3630,14 +3702,20 @@ test-exclude@^3.3.0: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" +test-exclude@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.0.tgz#0ddc0100b8ae7e88b34eb4fd98a907e961991900" + dependencies: + arrify "^1.0.1" + micromatch "^2.3.11" + object-assign "^4.1.0" + read-pkg-up "^1.0.1" + require-main-filename "^1.0.1" + text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -the-argv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/the-argv/-/the-argv-1.0.0.tgz#0084705005730dd84db755253c931ae398db9522" - through2@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" @@ -3672,10 +3750,6 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -traverse@^0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -3708,17 +3782,13 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-name@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/type-name/-/type-name-2.0.2.tgz#efe7d4123d8ac52afff7f40c7e4dec5266008fb4" - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" uglify-js@^2.6: - version "2.8.14" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.14.tgz#25b15d1af39b21752ee33703adbf432e8bc8f77d" + version "2.8.13" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.13.tgz#d0cdf02f3c661484fac601b7e723207b735a374c" dependencies: source-map "~0.5.1" uglify-to-browserify "~1.0.0" @@ -3771,10 +3841,6 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -urlgrey@>=0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f" - user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" @@ -3873,23 +3939,22 @@ write-file-atomic@^1.1.2, write-file-atomic@^1.1.4: imurmurhash "^0.1.4" slide "^1.1.5" -write-json-file@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-1.2.0.tgz#2d5dfe96abc3c889057c93971aa4005efb548134" +write-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.0.0.tgz#0eaec981fcf9288dbc2806cbd26e06ab9bdca4ed" dependencies: graceful-fs "^4.1.2" mkdirp "^0.5.1" - object-assign "^4.0.1" pify "^2.0.0" - pinkie-promise "^2.0.0" sort-keys "^1.1.1" write-file-atomic "^1.1.2" -write-pkg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-1.0.0.tgz#aeb8aa9d4d788e1d893dfb0854968b543a919f57" +write-pkg@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-2.1.0.tgz#353aa44c39c48c21440f5c08ce6abd46141c9c08" dependencies: - write-json-file "^1.1.0" + sort-keys "^1.1.2" + write-json-file "^2.0.0" write@^0.2.1: version "0.2.1"