diff --git a/packages/parser/src/analyze-scope.ts b/packages/parser/src/analyze-scope.ts
index 27e90a46565d..67d553fac465 100644
--- a/packages/parser/src/analyze-scope.ts
+++ b/packages/parser/src/analyze-scope.ts
@@ -7,7 +7,7 @@ import { getKeys as fallback } from 'eslint-visitor-keys';
import { ParserOptions } from './parser-options';
import { ScopeManager } from './scope/scope-manager';
-import { visitorKeys as childVisitorKeys } from './visitor-keys';
+import { visitorKeys as childVisitorKeys } from '@typescript-eslint/typescript-estree';
/**
* Define the override function of `Scope#__define` for global augmentation.
diff --git a/packages/parser/src/parser.ts b/packages/parser/src/parser.ts
index bcb6dde759a4..46878a9cdea7 100644
--- a/packages/parser/src/parser.ts
+++ b/packages/parser/src/parser.ts
@@ -5,10 +5,10 @@ import {
ParserServices,
TSESTreeOptions,
TSESTree,
+ simpleTraverse,
+ visitorKeys,
} from '@typescript-eslint/typescript-estree';
import { analyzeScope } from './analyze-scope';
-import { simpleTraverse } from './simple-traverse';
-import { visitorKeys } from './visitor-keys';
type ParserOptions = TSESLint.ParserOptions;
diff --git a/packages/typescript-estree/package.json b/packages/typescript-estree/package.json
index 85a3a2b92b10..45386970cfa2 100644
--- a/packages/typescript-estree/package.json
+++ b/packages/typescript-estree/package.json
@@ -40,6 +40,7 @@
},
"dependencies": {
"debug": "^4.1.1",
+ "eslint-visitor-keys": "^1.1.0",
"glob": "^7.1.4",
"is-glob": "^4.0.1",
"lodash.unescape": "4.0.1",
diff --git a/packages/typescript-estree/src/ast-converter.ts b/packages/typescript-estree/src/ast-converter.ts
index fffb9ea15cfd..270d50dde3f7 100644
--- a/packages/typescript-estree/src/ast-converter.ts
+++ b/packages/typescript-estree/src/ast-converter.ts
@@ -4,6 +4,7 @@ import { convertComments } from './convert-comments';
import { convertTokens } from './node-utils';
import { Extra } from './parser-options';
import { TSESTree } from './ts-estree';
+import { simpleTraverse } from './simple-traverse';
export function astConverter(
ast: SourceFile,
@@ -32,6 +33,22 @@ export function astConverter(
const estree = instance.convertProgram();
+ /**
+ * Optionally remove range and loc if specified
+ */
+ if (extra.range || extra.loc) {
+ simpleTraverse(estree, {
+ enter: node => {
+ if (!extra.range) {
+ delete node.range;
+ }
+ if (!extra.loc) {
+ delete node.loc;
+ }
+ },
+ });
+ }
+
/**
* Optionally convert and include all tokens in the AST
*/
diff --git a/packages/typescript-estree/src/parser.ts b/packages/typescript-estree/src/parser.ts
index 141ba25cce6a..0ef765ed8b64 100644
--- a/packages/typescript-estree/src/parser.ts
+++ b/packages/typescript-estree/src/parser.ts
@@ -419,5 +419,7 @@ export {
TSESTreeOptions,
version,
};
+export { simpleTraverse } from './simple-traverse';
+export { visitorKeys } from './visitor-keys';
export * from './ts-estree';
export { clearCaches } from './create-program/createWatchProgram';
diff --git a/packages/parser/src/simple-traverse.ts b/packages/typescript-estree/src/simple-traverse.ts
similarity index 95%
rename from packages/parser/src/simple-traverse.ts
rename to packages/typescript-estree/src/simple-traverse.ts
index a616f239a7b4..e21d24d0de8b 100644
--- a/packages/parser/src/simple-traverse.ts
+++ b/packages/typescript-estree/src/simple-traverse.ts
@@ -1,4 +1,4 @@
-import { TSESTree } from '@typescript-eslint/typescript-estree';
+import { TSESTree } from './ts-estree';
import { visitorKeys } from './visitor-keys';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/parser/src/visitor-keys.ts b/packages/typescript-estree/src/visitor-keys.ts
similarity index 100%
rename from packages/parser/src/visitor-keys.ts
rename to packages/typescript-estree/src/visitor-keys.ts
diff --git a/packages/typescript-estree/tests/lib/__snapshots__/parse.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/parse.ts.snap
index e953f852a8e9..c09d5159cd4b 100644
--- a/packages/typescript-estree/tests/lib/__snapshots__/parse.ts.snap
+++ b/packages/typescript-estree/tests/lib/__snapshots__/parse.ts.snap
@@ -1,5 +1,127 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`parse() general output should not contain loc 1`] = `
+Object {
+ "body": Array [
+ Object {
+ "declarations": Array [
+ Object {
+ "id": Object {
+ "name": "foo",
+ "range": Array [
+ 4,
+ 7,
+ ],
+ "type": "Identifier",
+ },
+ "init": Object {
+ "name": "bar",
+ "range": Array [
+ 10,
+ 13,
+ ],
+ "type": "Identifier",
+ },
+ "range": Array [
+ 4,
+ 13,
+ ],
+ "type": "VariableDeclarator",
+ },
+ ],
+ "kind": "let",
+ "range": Array [
+ 0,
+ 14,
+ ],
+ "type": "VariableDeclaration",
+ },
+ ],
+ "range": Array [
+ 0,
+ 14,
+ ],
+ "sourceType": "script",
+ "type": "Program",
+}
+`;
+
+exports[`parse() general output should not contain range 1`] = `
+Object {
+ "body": Array [
+ Object {
+ "declarations": Array [
+ Object {
+ "id": Object {
+ "loc": Object {
+ "end": Object {
+ "column": 7,
+ "line": 1,
+ },
+ "start": Object {
+ "column": 4,
+ "line": 1,
+ },
+ },
+ "name": "foo",
+ "type": "Identifier",
+ },
+ "init": Object {
+ "loc": Object {
+ "end": Object {
+ "column": 13,
+ "line": 1,
+ },
+ "start": Object {
+ "column": 10,
+ "line": 1,
+ },
+ },
+ "name": "bar",
+ "type": "Identifier",
+ },
+ "loc": Object {
+ "end": Object {
+ "column": 13,
+ "line": 1,
+ },
+ "start": Object {
+ "column": 4,
+ "line": 1,
+ },
+ },
+ "type": "VariableDeclarator",
+ },
+ ],
+ "kind": "let",
+ "loc": Object {
+ "end": Object {
+ "column": 14,
+ "line": 1,
+ },
+ "start": Object {
+ "column": 0,
+ "line": 1,
+ },
+ },
+ "type": "VariableDeclaration",
+ },
+ ],
+ "loc": Object {
+ "end": Object {
+ "column": 14,
+ "line": 1,
+ },
+ "start": Object {
+ "column": 0,
+ "line": 1,
+ },
+ },
+ "sourceType": "script",
+ "type": "Program",
+}
+`;
+
exports[`parse() general output tokens, comments, locs, and ranges when called with those options 1`] = `
Object {
"body": Array [
diff --git a/packages/typescript-estree/tests/lib/parse.ts b/packages/typescript-estree/tests/lib/parse.ts
index 53197b7a73d8..ebfb922b8392 100644
--- a/packages/typescript-estree/tests/lib/parse.ts
+++ b/packages/typescript-estree/tests/lib/parse.ts
@@ -37,6 +37,22 @@ describe('parse()', () => {
'output tokens, comments, locs, and ranges when called with those options',
createSnapshotTestBlock(code, config),
);
+
+ it(
+ 'output should not contain loc',
+ createSnapshotTestBlock(code, {
+ range: true,
+ loc: false,
+ }),
+ );
+
+ it(
+ 'output should not contain range',
+ createSnapshotTestBlock(code, {
+ range: false,
+ loc: true,
+ }),
+ );
});
describe('non string code', () => {
diff --git a/packages/parser/tests/lib/visitor-keys.ts b/packages/typescript-estree/tests/lib/visitor-keys.ts
similarity index 92%
rename from packages/parser/tests/lib/visitor-keys.ts
rename to packages/typescript-estree/tests/lib/visitor-keys.ts
index fd8ab4970f9b..6d16e90d00bf 100644
--- a/packages/parser/tests/lib/visitor-keys.ts
+++ b/packages/typescript-estree/tests/lib/visitor-keys.ts
@@ -1,4 +1,4 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/typescript-estree';
+import { AST_NODE_TYPES } from '../../src/ts-estree';
import { visitorKeys } from '../../src/visitor-keys';
//------------------------------------------------------------------------------
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy