lukechilds
/
rollup
mirror of https://github.com/lukechilds/rollup.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Extract namespace lookup optimisation into separate pass

better-aggressive
Oskar Segersvärd 9 years ago
parent
9f8806213d
commit
6e839f2d38
8 changed files with 140 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Bundle.js
  2. 107
      src/Statement.js
  3. 114
      src/optimise/namespace-lookup.js
  4. 5
      test/function/namespace-optimisation-before-exports/_config.js
  5. 1
      test/function/namespace-optimisation-before-exports/bar.js
  6. 1
      test/function/namespace-optimisation-before-exports/foo.js
  7. 6
      test/function/namespace-optimisation-before-exports/main.js
  8. 7
      test/function/namespace-optimisation-before-exports/zoo.js

6
src/Bundle.js
View File

@ -12,6 +12,8 @@ import getIndentString from './utils/getIndentString';
import { unixizePath } from './utils/normalizePlatform.js';
import Scope from './Scope';
import optimiseNamespaceLookups from './optimise/namespace-lookup.js';
export default class Bundle {
constructor ( options ) {
this.entry = options.entry;
@ -61,6 +63,10 @@ export default class Bundle {
return Promise.resolve( this.resolveId( this.entry, undefined, this.resolveOptions ) )
.then( id => this.fetchModule( id ) )
.then( entryModule => {
this.modules.forEach( module => {
module.statements.forEach( optimiseNamespaceLookups );
});
this.entryModule = entryModule;
this.exports = entryModule.exports;

107
src/Statement.js
View File

@ -25,21 +25,6 @@ function isFunctionDeclaration ( node, parent ) {
if ( node.type === 'FunctionExpression' && parent.type === 'VariableDeclarator' ) return true;
}
// Extract the property access from a MemberExpression.
function property ( node ) {
return node.name ? `.${node.name}` : `[${node.value}]`;
}
// Recursively traverse the chain of member expressions from `node`,
// returning the access, e.g. `foo.bar[17]`
function chainedMemberExpression ( node ) {
if ( node.object.type === 'MemberExpression' ) {
return chainedMemberExpression( node.object ) + property( node.property );
}
return node.object.name + property( node.property );
}
export default class Statement {
constructor ( node, module, start, end ) {
this.node = node;
@ -169,11 +154,6 @@ export default class Statement {
// /update expressions) need to be captured
let writeDepth = 0;
// Used to track and optimize lookups through namespaces.
let localName; // The local name of the top-most imported namespace.
let topNode = null; // The top-node of the member expression.
let namespace = null; // An instance of `Module`.
if ( !this.isImportDeclaration ) {
walk( this.node, {
enter: ( node, parent ) => {
@ -190,93 +170,6 @@ export default class Statement {
if ( /Function/.test( node.type ) && !isIife( node, parent ) ) readDepth -= 1;
if ( node._scope ) scope = scope.parent;
// Optimize namespace lookups, which manifest as MemberExpressions.
if ( node.type === 'MemberExpression' && ( !topNode || node.object === topNode ) ) {
// Ignore anything that doesn't begin with an identifier.
if ( !topNode && node.object.type !== 'Identifier') return;
topNode = node;
// If we don't already have a namespace,
// we aren't currently exploring any chain of member expressions.
if ( !namespace ) {
localName = node.object.name;
// At first, we don't have a namespace, so we'll try to look one up.
const id = this.module.locals.lookup( localName );
// It only counts if it exists, is a module, and isn't external.
if ( !id || !id.isModule || id.isExternal ) return;
namespace = id;
}
// If a namespace is the left hand side of an assignment, throw an error.
if ( parent.type === 'AssignmentExpression' && parent.left === node ||
parent.type === 'UpdateExpression' && parent.argument === node ) {
const err = new Error( `Illegal reassignment to import '${chainedMemberExpression( node )}'` );
err.file = this.module.id;
err.loc = getLocation( this.module.magicString.toString(), node.start );
throw err;
}
// Extract the name of the accessed property, from and Identifier or Literal.
// Any eventual Literal value is converted to a string.
const name = !node.computed ? node.property.name :
( node.property.type === 'Literal' ? String( node.property.value ) : null );
// If we can't resolve the name being accessed statically,
// we mark the whole namespace for inclusion in the bundle.
//
// // resolvable
// console.log( javascript.keywords.for )
// console.log( javascript.keywords[ 'for' ] )
// console.log( javascript.keywords[ 6 ] )
//
// // unresolvable
// console.log( javascript.keywords[ index ] )
// console.log( javascript.keywords[ 1 + 5 ] )
if ( name === null ) {
namespace.mark();
namespace = null;
topNode = null;
return;
}
const id = namespace.exports.lookup( name );
// If the namespace doesn't export the given name,
// we can throw an error (even for nested namespaces).
if ( !id ) {
throw new Error( `Module "${namespace.id}" doesn't export "${name}"!` );
}
// We can't resolve deeper. Replace the member chain.
if ( parent.type !== 'MemberExpression' || !( id.isModule && !id.isExternal ) ) {
if ( !~this.dependantIds.indexOf( id ) ) {
this.dependantIds.push( id );
}
// FIXME: do this better
// If an earlier stage detected that we depend on this name...
if ( this.dependsOn[ localName ] ) {
// ... decrement the count...
if ( !--this.dependsOn[ localName ] ) {
// ... and remove it if the count is 0.
delete this.dependsOn[ localName ];
}
}
this.namespaceReplacements.push( [ topNode, id ] );
namespace = null;
topNode = null;
return;
}
namespace = id;
}
}
});
}

114
src/optimise/namespace-lookup.js
View File

@ -0,0 +1,114 @@
import walk from '../ast/walk.js';
import getLocation from '../utils/getLocation.js';
// Extract the property access from a MemberExpression.
function property ( node ) {
return node.name ? `.${node.name}` : `[${node.value}]`;
}
// Recursively traverse the chain of member expressions from `node`,
// returning the access, e.g. `foo.bar[17]`
function chainedMemberExpression ( node ) {
if ( node.object.type === 'MemberExpression' ) {
return chainedMemberExpression( node.object ) + property( node.property );
}
return node.object.name + property( node.property );
}
export default function ( statement ) {
let localName; // The local name of the top-most imported namespace.
let topNode = null; // The top-node of the member expression.
let namespace = null; // An instance of `Module`.
walk( statement.node, {
leave ( node, parent ) {
// Optimize namespace lookups, which manifest as MemberExpressions.
if ( node.type === 'MemberExpression' && ( !topNode || node.object === topNode ) ) {
// Ignore anything that doesn't begin with an identifier.
if ( !topNode && node.object.type !== 'Identifier') return;
topNode = node;
// If we don't already have a namespace,
// we aren't currently exploring any chain of member expressions.
if ( !namespace ) {
localName = node.object.name;
// At first, we don't have a namespace, so we'll try to look one up.
const id = statement.module.locals.lookup( localName );
// It only counts if it exists, is a module, and isn't external.
if ( !id || !id.isModule || id.isExternal ) return;
namespace = id;
}
// If a namespace is the left hand side of an assignment, throw an error.
if ( parent.type === 'AssignmentExpression' && parent.left === node ||
parent.type === 'UpdateExpression' && parent.argument === node ) {
const err = new Error( `Illegal reassignment to import '${chainedMemberExpression( node )}'` );
err.file = statement.module.id;
err.loc = getLocation( statement.module.magicString.toString(), node.start );
throw err;
}
// Extract the name of the accessed property, from and Identifier or Literal.
// Any eventual Literal value is converted to a string.
const name = !node.computed ? node.property.name :
( node.property.type === 'Literal' ? String( node.property.value ) : null );
// If we can't resolve the name being accessed statically,
// we mark the whole namespace for inclusion in the bundle.
//
// // resolvable
// console.log( javascript.keywords.for )
// console.log( javascript.keywords[ 'for' ] )
// console.log( javascript.keywords[ 6 ] )
//
// // unresolvable
// console.log( javascript.keywords[ index ] )
// console.log( javascript.keywords[ 1 + 5 ] )
if ( name === null ) {
namespace.mark();
namespace = null;
topNode = null;
return;
}
const id = namespace.exports.lookup( name );
// If the namespace doesn't export the given name,
// we can throw an error (even for nested namespaces).
if ( !id ) {
throw new Error( `Module "${namespace.id}" doesn't export "${name}"!` );
}
// We can't resolve deeper. Replace the member chain.
if ( parent.type !== 'MemberExpression' || !( id.isModule && !id.isExternal ) ) {
if ( !~statement.dependantIds.indexOf( id ) ) {
statement.dependantIds.push( id );
}
// FIXME: do this better
// If an earlier stage detected that we depend on this name...
if ( statement.dependsOn[ localName ] ) {
// ... decrement the count...
if ( !--statement.dependsOn[ localName ] ) {
// ... and remove it if the count is 0.
delete statement.dependsOn[ localName ];
}
}
statement.namespaceReplacements.push( [ topNode, id ] );
namespace = null;
topNode = null;
return;
}
namespace = id;
}
}
});
}

5
test/function/namespace-optimisation-before-exports/_config.js
View File

@ -0,0 +1,5 @@
module.exports = {
description: 'namespace optimisation must be done after all exports are defined'
};
// See: https://github.com/rollup/rollup/issues/148

1
test/function/namespace-optimisation-before-exports/bar.js
View File

@ -0,0 +1 @@
export default function bar () {}

1
test/function/namespace-optimisation-before-exports/foo.js
View File

@ -0,0 +1 @@
export { default as bar } from './bar.js';

6
test/function/namespace-optimisation-before-exports/main.js
View File

@ -0,0 +1,6 @@
import * as foo from './foo';
import './zoo';
export default {
foo: foo
};

7
test/function/namespace-optimisation-before-exports/zoo.js
View File

@ -0,0 +1,7 @@
import * as foo from './foo';
function wah () {
foo.bar();
}
wah();
Write Preview
Loading…
Cancel
Save