Skip to content
This repository was archived by the owner on Jun 23, 2025. It is now read-only.

Convert to ES6 that is supported on Node 4, commonjs modules and remove Babel #8

Closed
corbinu wants to merge 5 commits into from
Closed

Convert to ES6 that is supported on Node 4, commonjs modules and remove Babel #8

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
020029a
Add check for node.body in referencer
corbinu Jan 14, 2017
402da9e
Fix package name
corbinu Jan 14, 2017
0ad483c
Removes babel and ES Modules needed to run on node 7
corbinu Feb 10, 2017
2acb0d9
Add strict mode and remove destructuring. Now runs on node 4
corbinu Feb 10, 2017
cd289e3
Remove babelrc file
corbinu Feb 10, 2017
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
37 changes: 6 additions & 31 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

var gulp = require('gulp'),
mocha = require('gulp-mocha'),
babel = require('gulp-babel'),
git = require('gulp-git'),
bump = require('gulp-bump'),
filter = require('gulp-filter'),
Expand All @@ -39,10 +38,6 @@ var gulp = require('gulp'),
eslint = require('gulp-eslint'),
fs = require('fs');

require('babel-register')({
only: /escope\/(src|test)\//
});

var TEST = [ 'test/*.js' ];
var SOURCE = [ 'src/**/*.js' ];

Expand All @@ -69,43 +64,23 @@ var ESLINT_OPTION = {
}
};

var BABEL_OPTIONS = JSON.parse(fs.readFileSync('.babelrc', { encoding: 'utf8' }));

var build = lazypipe()
.pipe(sourcemaps.init)
.pipe(babel, BABEL_OPTIONS)
.pipe(sourcemaps.write)
.pipe(gulp.dest, 'lib');

gulp.task('build-for-watch', function () {
return gulp.src(SOURCE).pipe(plumber()).pipe(build());
});

gulp.task('build', function () {
return gulp.src(SOURCE).pipe(build());
});

gulp.task('browserify', [ 'build' ], function () {
gulp.task('browserify', function () {
return browserify({
entries: [ './lib/index.js' ]
entries: [ './src/index.js' ]
})
.bundle()
.pipe(source('bundle.js'))
.pipe(gulp.dest('build'))
});

gulp.task('test', [ 'build' ], function () {
gulp.task('test', function () {
return gulp.src(TEST)
.pipe(mocha({
reporter: 'spec',
timeout: 100000 // 100s
}));
});

gulp.task('watch', [ 'build-for-watch' ], function () {
gulp.watch(SOURCE, [ 'build-for-watch' ]);
});

// Currently, not works for ES6.
gulp.task('lint', function () {
return gulp.src(SOURCE)
Expand Down Expand Up @@ -145,9 +120,9 @@ function inc(importance) {
}));
}

gulp.task('patch', [ 'build' ], function () { return inc('patch'); })
gulp.task('minor', [ 'build' ], function () { return inc('minor'); })
gulp.task('major', [ 'build' ], function () { return inc('major'); })
gulp.task('patch', function () { return inc('patch'); })
gulp.task('minor', function () { return inc('minor'); })
gulp.task('major', function () { return inc('major'); })

gulp.task('travis', [ 'test' ]);
gulp.task('default', [ 'travis' ]);
8 changes: 2 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "escope",
"name": "eslint-scope",
"description": "ECMAScript scope analyzer",
"homepage": "http://github.com/estools/escope",
"main": "lib/index.js",
"main": "src/index.js",
"version": "3.6.0",
"engines": {
"node": ">=0.4.0"
Expand All @@ -25,15 +25,11 @@
"estraverse": "^4.1.1"
},
"devDependencies": {
"babel": "^6.3.26",
"babel-preset-es2015": "^6.3.13",
"babel-register": "^6.3.13",
"browserify": "^13.0.0",
"chai": "^3.4.1",
"espree": "^3.1.1",
"esprima": "^2.7.1",
"gulp": "^3.9.0",
"gulp-babel": "^6.1.1",
"gulp-bump": "^1.0.0",
"gulp-eslint": "^1.1.1",
"gulp-espower": "^1.0.2",
Expand Down
9 changes: 5 additions & 4 deletions src/definition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
"use strict";

import Variable from './variable';
const Variable = require('./variable');

/**
* @class Definition
*/
export default class Definition {
class Definition {
constructor(type, name, node, parent, index, kind) {
/**
* @member {String} Definition#type - type of the occurrence (e.g. "Parameter", "Variable", ...).
Expand Down Expand Up @@ -70,9 +71,9 @@ class ParameterDefinition extends Definition {
}
}

export {
module.exports = {
ParameterDefinition,
Definition
}
};

/* vim: set sw=4 ts=4 et tw=80 : */
22 changes: 12 additions & 10 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,18 @@
* The main interface is the {@link analyze} function.
* @module escope
*/
"use strict";

/*jslint bitwise:true */

import assert from 'assert';
const assert = require('assert');

import ScopeManager from './scope-manager';
import Referencer from './referencer';
import Reference from './reference';
import Variable from './variable';
import Scope from './scope';
import { version } from '../package.json';
const ScopeManager = require('./scope-manager').default;
const Referencer = require('./referencer').default;
const Reference = require('./reference').default;
const Variable = require('./variable').default;
const Scope = require('./scope').default;
Copy link
Member

@not-an-aardvark not-an-aardvark Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use imports like require('./foo') here instead of require('./foo').default? Then the modules could use module.exports = Foo instead of module.exports.default = Foo.

Copy link
Contributor Author

@corbinu corbinu Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was planning to do a style clean up PR at the end that would include this. Wanted to keep changes in each PR to a minimum but can change it now if people would prefer

Copy link
Member

@not-an-aardvark not-an-aardvark Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really have a strong opinion either way, but I think it makes more sense to change this here since it's a direct result of migrating from ES6 modules.

Copy link
Contributor Author

@corbinu corbinu Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok will do!

const version = require('../package.json').version;

function defaultOptions() {
return {
Expand Down Expand Up @@ -114,7 +115,7 @@ function updateDeeply(target, override) {
* @param {string} [providedOptions.fallback='iteration'] - A kind of the fallback in order to encounter with unknown node. See [esrecurse](https://github.com/estools/esrecurse)'s the `fallback` option.
* @return {ScopeManager}
*/
export function analyze(tree, providedOptions) {
function analyze(tree, providedOptions) {
var scopeManager, referencer, options;

options = updateDeeply(defaultOptions(), providedOptions);
Expand All @@ -129,7 +130,7 @@ export function analyze(tree, providedOptions) {
return scopeManager;
}

export {
module.exports = {
/** @name module:escope.version */
version,
/** @name module:escope.Reference */
Expand All @@ -139,7 +140,8 @@ export {
/** @name module:escope.Scope */
Scope,
/** @name module:escope.ScopeManager */
ScopeManager
ScopeManager,
analyze
};


Expand Down
9 changes: 6 additions & 3 deletions src/pattern-visitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
"use strict";

import { Syntax } from 'estraverse';
import esrecurse from 'esrecurse';
const Syntax = require('estraverse').Syntax;
const esrecurse = require('esrecurse');

function getLast(xs) {
return xs[xs.length - 1] || null;
}

export default class PatternVisitor extends esrecurse.Visitor {
class PatternVisitor extends esrecurse.Visitor {
static isPattern(node) {
var nodeType = node.type;
return (
Expand Down Expand Up @@ -131,4 +132,6 @@ export default class PatternVisitor extends esrecurse.Visitor {
}
}

module.exports.default = PatternVisitor;

/* vim: set sw=4 ts=4 et tw=80 : */
5 changes: 4 additions & 1 deletion src/reference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
"use strict";

const READ = 0x1;
const WRITE = 0x2;
Expand All @@ -30,7 +31,7 @@ const RW = READ | WRITE;
* A Reference represents a single occurrence of an identifier in code.
* @class Reference
*/
export default class Reference {
class Reference {
constructor(ident, scope, flag, writeExpr, maybeImplicitGlobal, partial, init) {
/**
* Identifier syntax node.
Expand Down Expand Up @@ -151,4 +152,6 @@ Reference.WRITE = WRITE;
*/
Reference.RW = RW;

module.exports.default = Reference;

/* vim: set sw=4 ts=4 et tw=80 : */
35 changes: 22 additions & 13 deletions src/referencer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import { Syntax } from 'estraverse';
import esrecurse from 'esrecurse';
import Reference from './reference';
import Variable from './variable';
import PatternVisitor from './pattern-visitor';
import { ParameterDefinition, Definition } from './definition';
import assert from 'assert';
"use strict";

const Syntax = require('estraverse').Syntax;
const esrecurse = require('esrecurse');
const Reference = require('./reference').default;
const Variable = require('./variable').default;
const PatternVisitor = require('./pattern-visitor').default;
const definition = require('./definition');
const assert = require('assert');

const ParameterDefinition = definition.ParameterDefinition;
const Definition = definition.Definition;

function traverseIdentifierInPattern(options, rootPattern, referencer, callback) {
// Call the callback at left hand identifier nodes, and Collect right hand nodes.
Expand Down Expand Up @@ -90,7 +95,7 @@ class Importer extends esrecurse.Visitor {
}

// Referencing variables and creating bindings.
export default class Referencer extends esrecurse.Visitor {
class Referencer extends esrecurse.Visitor {
constructor(options, scopeManager) {
super(null, options);
this.options = options;
Expand Down Expand Up @@ -222,11 +227,13 @@ export default class Referencer extends esrecurse.Visitor {
});
}

// Skip BlockStatement to prevent creating BlockStatement scope.
if (node.body.type === Syntax.BlockStatement) {
this.visitChildren(node.body);
} else {
this.visit(node.body);
if (node.body) {
// Skip BlockStatement to prevent creating BlockStatement scope.
if (node.body.type === Syntax.BlockStatement) {
this.visitChildren(node.body);
} else {
this.visit(node.body);
}
}

this.close(node);
Expand Down Expand Up @@ -581,4 +588,6 @@ export default class Referencer extends esrecurse.Visitor {
}
}

module.exports.default = Referencer;

/* vim: set sw=4 ts=4 et tw=80 : */
40 changes: 21 additions & 19 deletions src/scope-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import WeakMap from 'es6-weak-map';
import Scope from './scope';
import assert from 'assert';

import {
GlobalScope,
CatchScope,
WithScope,
ModuleScope,
ClassScope,
SwitchScope,
FunctionScope,
ForScope,
TDZScope,
FunctionExpressionNameScope,
BlockScope
} from './scope';
"use strict";

const WeakMap = require('es6-weak-map');
const ScopeMain = require('./scope');
const Scope = ScopeMain.default;
const assert = require('assert');

const GlobalScope = ScopeMain.GlobalScope;
const CatchScope = ScopeMain.CatchScope;
const WithScope = ScopeMain.WithScope;
const ModuleScope = ScopeMain.ModuleScope;
const ClassScope = ScopeMain.ClassScope;
const SwitchScope = ScopeMain.SwitchScope;
const FunctionScope = ScopeMain.FunctionScope;
const ForScope = ScopeMain.ForScope;
const TDZScope = ScopeMain.TDZScope;
const FunctionExpressionNameScope = ScopeMain.FunctionExpressionNameScope;
const BlockScope = ScopeMain.BlockScope;

/**
* @class ScopeManager
*/
export default class ScopeManager {
class ScopeManager {
constructor(options) {
this.scopes = [];
this.globalScope = null;
Expand Down Expand Up @@ -242,4 +242,6 @@ export default class ScopeManager {
}
}

module.exports.default = ScopeManager;

/* vim: set sw=4 ts=4 et tw=80 : */
Loading