From b8b70f2f4acd0ed3772b93a87df3b47584a3992a Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Mon, 4 May 2015 03:57:28 +0100 Subject: [PATCH] rejigger around parse mechanics --- src/babel/api/node.js | 18 +++++++++++++++++- src/babel/helpers/parse.js | 18 ------------------ src/babel/traversal/path/index.js | 2 +- test/core/generation.js | 2 +- test/core/util.js | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/babel/api/node.js b/src/babel/api/node.js index 4c3e512180..8923446029 100644 --- a/src/babel/api/node.js +++ b/src/babel/api/node.js @@ -14,7 +14,6 @@ export { default as TransformerPipeline } from "../transformation/transformer-pi export { default as traverse } from "../traversal"; export { default as buildExternalHelpers } from "../tools/build-external-helpers"; export { version } from "../../../package"; -export { all as parse } from "../helpers/parse"; import * as t from "../types"; export { t as types }; @@ -56,3 +55,20 @@ export function transformFileSync(filename: string, opts?: Object = {}) { opts.filename = filename; return transform(fs.readFileSync(filename), opts); } + +export function parse(code, opts = {}) { + opts.allowHashBang = true; + opts.sourceType = "module"; + opts.ecmaVersion = Infinity; + opts.plugins = { + flow: true, + jsx: true + }; + opts.features = {}; + + for (var key in transform.pipeline.transformers) { + opts.features[key] = true; + } + + return acorn.parse(code, opts); +} diff --git a/src/babel/helpers/parse.js b/src/babel/helpers/parse.js index e8d29aab3c..505a80106c 100644 --- a/src/babel/helpers/parse.js +++ b/src/babel/helpers/parse.js @@ -1,5 +1,4 @@ import normalizeAst from "./normalize-ast"; -import transform from "../transformation"; import estraverse from "estraverse"; import * as acorn from "../../acorn"; @@ -33,20 +32,3 @@ export default function (code, opts = {}) { ast = normalizeAst(ast, comments, tokens); return ast; } - -export function all(code, opts = {}) { - opts.allowHashBang = true; - opts.sourceType = "module"; - opts.ecmaVersion = Infinity; - opts.plugins = { - flow: true, - jsx: true - }; - opts.features = {}; - - for (var key in transform.pipeline.transformers) { - opts.features[key] = true; - } - - return acorn.parse(code, opts); -} diff --git a/src/babel/traversal/path/index.js b/src/babel/traversal/path/index.js index 166e15e964..f6dbfeea31 100644 --- a/src/babel/traversal/path/index.js +++ b/src/babel/traversal/path/index.js @@ -4,7 +4,7 @@ import isNumber from "lodash/lang/isNumber"; import isRegExp from "lodash/lang/isRegExp"; import isString from "lodash/lang/isString"; import codeFrame from "../../helpers/code-frame"; -import { all as parse } from "../../helpers/parse"; +import parse from "../../helpers/parse"; import traverse from "../index"; import includes from "lodash/collection/includes"; import assign from "lodash/object/assign"; diff --git a/test/core/generation.js b/test/core/generation.js index 61f04a445e..fa4dd81017 100644 --- a/test/core/generation.js +++ b/test/core/generation.js @@ -1,7 +1,7 @@ var generate = require("../../lib/babel/generation"); var assert = require("assert"); var helper = require("./_helper"); -var parse = require("../../lib/babel/helpers/parse").default; +var parse = require("../../lib/babel/helpers/parse"); var chai = require("chai"); var t = require("../../lib/babel/types"); var _ = require("lodash"); diff --git a/test/core/util.js b/test/core/util.js index bc971acde9..5c1ec25459 100644 --- a/test/core/util.js +++ b/test/core/util.js @@ -1,6 +1,6 @@ var assert = require("assert"); var util = require("../../lib/babel/util"); -var parse = require("../../lib/babel/helpers/parse").default; +var parse = require("../../lib/babel/helpers/parse"); var t = require("../../lib/babel/types"); suite("util", function () {