diff --git a/src/language-js/parser-angular.js b/src/language-js/parser-angular.js index 3df11f3f3..197acdcb7 100644 --- a/src/language-js/parser-angular.js +++ b/src/language-js/parser-angular.js @@ -1,6 +1,6 @@ "use strict"; -const locFns = require("./loc"); +const { locStart, locEnd } = require("./loc"); function createParser(_parse) { const parse = (text, parsers, options) => { @@ -14,7 +14,7 @@ function createParser(_parse) { : node, }; }; - return { astFormat: "estree", parse, ...locFns }; + return { astFormat: "estree", parse, locStart, locEnd }; } module.exports = { diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js index 2efa38f77..cb242db28 100644 --- a/src/language-js/parser-babel.js +++ b/src/language-js/parser-babel.js @@ -2,7 +2,7 @@ const createError = require("../common/parser-create-error"); const { hasPragma } = require("./pragma"); -const locFns = require("./loc"); +const { locStart, locEnd } = require("./loc"); const postprocess = require("./postprocess"); function babelOptions({ sourceType, extraPlugins = [] }) { @@ -225,7 +225,7 @@ function assertJsonNode(node, parent) { } } -const babel = { parse, astFormat: "estree", hasPragma, ...locFns }; +const babel = { parse, astFormat: "estree", hasPragma, locStart, locEnd }; const babelFlow = { ...babel, parse: parseFlow }; const babelTypeScript = { ...babel, parse: parseTypeScript }; const babelExpression = { ...babel, parse: parseExpression }; @@ -246,7 +246,8 @@ module.exports = { "json-stringify": { parse: parseJson, astFormat: "estree-json", - ...locFns, + locStart, + locEnd, }, /** @internal */ __js_expression: babelExpression, diff --git a/src/language-js/parser-flow.js b/src/language-js/parser-flow.js index 84d94363a..82f2962fc 100644 --- a/src/language-js/parser-flow.js +++ b/src/language-js/parser-flow.js @@ -2,7 +2,7 @@ const createError = require("../common/parser-create-error"); const { hasPragma } = require("./pragma"); -const locFns = require("./loc"); +const { locStart, locEnd } = require("./loc"); const postprocess = require("./postprocess"); function parse(text, parsers, opts) { @@ -33,6 +33,6 @@ function parse(text, parsers, opts) { // Export as a plugin so we can reuse the same bundle for UMD loading module.exports = { parsers: { - flow: { parse, astFormat: "estree", hasPragma, ...locFns }, + flow: { parse, astFormat: "estree", hasPragma, locStart, locEnd }, }, }; diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js index 16e73384e..e2fe70577 100644 --- a/src/language-js/parser-typescript.js +++ b/src/language-js/parser-typescript.js @@ -2,7 +2,7 @@ const createError = require("../common/parser-create-error"); const { hasPragma } = require("./pragma"); -const locFns = require("./loc"); +const { locStart, locEnd } = require("./loc"); const postprocess = require("./postprocess"); function parse(text, parsers, opts) { @@ -56,7 +56,7 @@ function isProbablyJsx(text) { ).test(text); } -const parser = { parse, astFormat: "estree", hasPragma, ...locFns }; +const parser = { parse, astFormat: "estree", hasPragma, locStart, locEnd }; // Export as a plugin so we can reuse the same bundle for UMD loading module.exports = {