Skip to content

Commit

Permalink
Expose the original resolver if yearn overrides it
Browse files Browse the repository at this point in the history
  • Loading branch information
doctorrustynelson committed Mar 16, 2015
1 parent 31175b7 commit 3b855cf
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions lib/yearn.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var fs = require( 'fs' );
var merge = require( 'merge' ).recursive;

var _yearn = null;
var original_resolver = module.constructor._resolveFilename;

module.exports = function( config ){

Expand All @@ -44,8 +45,6 @@ module.exports = function( config ){

config = require( './utils/config' ).initialize( config );

var old_resolver = module.constructor._resolveFilename;

var yearn_map = { };
var package_dependencies = {};
var yutils = require( './utils/yearn-utils' )( config );
Expand All @@ -60,6 +59,7 @@ module.exports = function( config ){

_yearn = require;
_yearn.resolve = require.resolve;
_yearn._originalResolver = original_resolver;
return _yearn;
}

Expand Down Expand Up @@ -234,10 +234,10 @@ module.exports = function( config ){
case 'string':
if( yutils.isNativeModule( desired ) ){
yutils.LOGGER.info( 'Satiating native yearning for "' + desired + '".' );
return old_resolver( desired, parent );
return original_resolver( desired, parent );
} else if( yutils.isDirectYearning( desired ) ){
yutils.LOGGER.info( 'Satiating direct yearning for "' + desired + '".' );
return old_resolver( desired, parent );
return original_resolver( desired, parent );
} else {
yutils.LOGGER.info( 'Implicit yearning for "' + desired + '".' );
desired = yutils.extractYearningParts( desired );
Expand All @@ -252,7 +252,7 @@ module.exports = function( config ){
var path = determineYearningPath( desired, parent );

yutils.LOGGER.info( 'Satiating yearning for "' + yutils.constructYearningString( desired ) + '" with "' + path + '".' );
return old_resolver( path, parent );
return original_resolver( path, parent );
}

if( config.override === true ){
Expand All @@ -265,6 +265,7 @@ module.exports = function( config ){

_yearn = require;
_yearn.resolve = require.resolve;
_yearn._originalResolver = original_resolver;
} else {

_yearn = function( desired ){
Expand All @@ -275,6 +276,8 @@ module.exports = function( config ){
_yearn.resolve = function( desired ){
return yearn( desired, this );
};

_yearn._originalResolver = undefined;
}

yutils.setLOGGER( config.logger );
Expand Down

0 comments on commit 3b855cf

Please sign in to comment.