github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1324 from TrevorBurnham/node-modules

Browse Source 
Use `require.main` instead of loop to get main module
This commit is contained in:
Jeremy Ashkenas
2011-05-15 17:04:40 -07:00
parent f3758e4af0 b9d3bc5b44
commit 01b0cfc8ab
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/coffee-script.js
View File

@@ -45,23 +45,18 @@
}
};
exports.run = function(code, options) {
var Module, root;
root = module;
while (root.parent) {
root = root.parent;
}
root.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
if (root.moduleCache) {
root.moduleCache = {};
}
var Module, mainModule;
mainModule = require.main;
mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
mainModule.moduleCache && (mainModule.moduleCache = {});
if (process.binding('natives').module) {
Module = require('module').Module;
root.paths = Module._nodeModulePaths(path.dirname(options.filename));
mainModule.paths = Module._nodeModulePaths(path.dirname(options.filename));
}
if (path.extname(root.filename) !== '.coffee' || require.extensions) {
return root._compile(compile(code, options), root.filename);
if (path.extname(mainModule.filename) !== '.coffee' || require.extensions) {
return mainModule._compile(compile(code, options), mainModule.filename);
} else {
return root._compile(code, root.filename);
return mainModule._compile(code, mainModule.filename);
}
};
exports.eval = function(code, options) {

17
src/coffee-script.coffee
View File

@@ -54,28 +54,25 @@ exports.nodes = (source, options) ->
# Compile and execute a string of CoffeeScript (on the server), correctly
# setting `__filename`, `__dirname`, and relative `require()`.
exports.run = (code, options) ->
# We want the root module.
root = module
while root.parent
root = root.parent
mainModule = require.main
# Set the filename.
root.filename = process.argv[1] =
mainModule.filename = process.argv[1] =
if options.filename then fs.realpathSync(options.filename) else '.'
# Clear the module cache.
root.moduleCache = {} if root.moduleCache
mainModule.moduleCache and= {}
# Assign paths for node_modules loading
if process.binding('natives').module
{Module} = require 'module'
root.paths = Module._nodeModulePaths path.dirname options.filename
mainModule.paths = Module._nodeModulePaths path.dirname options.filename
# Compile.
if path.extname(root.filename) isnt '.coffee' or require.extensions
root._compile compile(code, options), root.filename
if path.extname(mainModule.filename) isnt '.coffee' or require.extensions
mainModule._compile compile(code, options), mainModule.filename
else
root._compile code, root.filename
mainModule._compile code, mainModule.filename
# Compile and evaluate a string of CoffeeScript (in a Node.js-like environment).
# The CoffeeScript REPL uses this to run the input.