Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/babel-assertion-visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ var estraverse = require('estraverse');
var cloneWithWhitelist = require('espurify').cloneWithWhitelist;
var babelParser = require('@babel/parser');
var babelgen = require('@babel/generator');
var assign = require('core-js/library/fn/object/assign');
var define = require('./define-properties');
var toBeCaptured = require('./to-be-captured');
var toBeSkipped = require('./to-be-skipped');
Expand Down Expand Up @@ -163,7 +162,7 @@ BabelAssertionVisitor.prototype.parseCanonicalCode = function (file, code) {

function doParse(wrapper) {
var content = wrapper ? wrapper(code) : code;
var output = babelParser.parse(content, assign({}, file.opts.parserOpts, {tokens: true}));
var output = babelParser.parse(content, Object.assign({}, file.opts.parserOpts, {tokens: true}));
if (wrapper) {
ast = output.program.body[0].body;
tokens = output.tokens.slice(6, -2);
Expand Down
9 changes: 3 additions & 6 deletions lib/babel-espower-visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

var CallMatcher = require('call-matcher');
var babelParser = require('@babel/parser');
var assign = require('core-js/library/fn/object/assign');
var find = require('core-js/library/fn/array/find');
var some = require('core-js/library/fn/array/some');
var BabelAssertionVisitor = require('./babel-assertion-visitor');
var isSpreadElement = function (node) {
return node.type === 'SpreadElement';
Expand Down Expand Up @@ -36,15 +33,15 @@ BabelEspowerVisitor.prototype.enter = function (nodePath) {
assertionVisitor.enterArgument(nodePath);
}
} else if (nodePath.isCallExpression()) {
var matcher = find(this.matchers, function (m) { return m.test(currentNode); });
var matcher = this.matchers.find(function (m) { return m.test(currentNode); });
if (matcher) {
// skip modifying argument if SpreadElement appears immediately beneath assert
if (some(currentNode.arguments, isSpreadElement)) {
if (currentNode.arguments.some(isSpreadElement)) {
nodePath.skip();
return;
}
// entering assertion
var espowerOptions = assign({
var espowerOptions = Object.assign({
path: file.opts.filename, // or opts.sourceFileName?
sourceMap: file.inputMap ? file.inputMap.toObject() : false
}, this.options);
Expand Down
3 changes: 1 addition & 2 deletions lib/create-espower-visitor.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
'use strict';

var defaultOptions = require('./default-options');
var assign = require('core-js/library/fn/object/assign');
var BabelEspowerVisitor = require('./babel-espower-visitor');

module.exports = function createEspowerVisitor (babel, options) {
return {
visitor: {
Program: function (path) {
var opts = assign(defaultOptions(), {
var opts = Object.assign(defaultOptions(), {
astWhiteList: babel.types.BUILDER_KEYS,
visitorKeys: babel.types.VISITOR_KEYS,
sourceRoot: process.cwd()
Expand Down
1,297 changes: 1,036 additions & 261 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,16 @@
"dependencies": {
"@babel/generator": "^7.0.0",
"@babel/parser": "^7.0.0",
"call-matcher": "^1.0.0",
"core-js": "^2.0.0",
"espower-location-detector": "^1.0.0",
"espurify": "^1.6.0",
"call-matcher": "^2.0.0",
"espower-location-detector": "^2.0.0",
"espurify": "^2.0.1",
"estraverse": "^4.1.1"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"mocha": "^5.0.0"
"mocha": "^6.1.1"
},
"directories": {
"lib": "./lib",
Expand Down
3 changes: 1 addition & 2 deletions test/fixtures-with-presets-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ var assert = require('assert');
var fs = require('fs');
var path = require('path');
var babel = require('@babel/core');
var assign = require('core-js/library/fn/object/assign');
var createEspowerPlugin = require('../create');

function testTransform (fixtureName, extraSuffix, extraOptions) {
Expand All @@ -11,7 +10,7 @@ function testTransform (fixtureName, extraSuffix, extraOptions) {
var fixtureFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'fixture.js');
var expectedFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'expected' + suffix + '.js');
var actualFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'actual' + suffix + '.js');
var result = babel.transformFileSync(fixtureFilepath, assign({
var result = babel.transformFileSync(fixtureFilepath, Object.assign({
presets: [
'@babel/env',
'@babel/react'
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/ArrayExpression/expected-presets-env.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/fixtures/ArrowFunctionExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/AssignmentExpression/expected-presets-env.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fixtures/AwaitExpression/expected-presets-env.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions test/fixtures/BinaryExpression/expected-presets-env.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions test/fixtures/CallExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/ClassExpression/expected-presets-env.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/fixtures/FunctionExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/Identifier/expected-presets-env.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fixtures/Literal/expected-presets-env.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions test/fixtures/LogicalExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/MemberExpression/expected-presets-env.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fixtures/Mocha/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/NewExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/ObjectExpression/expected-presets-env.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/fixtures/ObjectRestSpread/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/Property/expected-presets-env.js

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions test/fixtures/React/expected-presets-react.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/fixtures/SequenceExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/SpreadElement/expected-presets-env.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/TemplateLiteral/expected-presets-env.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fixtures/UnaryExpression/expected-presets-env.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/fixtures/UpdateExpression/expected-presets-env.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fixtures/YieldExpression/expected-presets-env.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ var assert = require('assert');
var fs = require('fs');
var path = require('path');
var babel = require('@babel/core');
var assign = require('core-js/library/fn/object/assign');
var createEspowerPlugin = require('../create');

function testTransform (fixtureName, extraOptions) {
it(fixtureName, function () {
var fixtureFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'fixture.js');
var expectedFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'expected.js');
var actualFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'actual.js');
var result = babel.transformFileSync(fixtureFilepath, assign({
var result = babel.transformFileSync(fixtureFilepath, Object.assign({
plugins: [
createEspowerPlugin(babel, {
embedAst: false
Expand Down