Enhance seajs.require to support executing module. close seajs#944

wangybbj · Sep 16, 2013 · 7d70d9a · 7d70d9a
1 parent 35657fd
commit 7d70d9a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/dist/sea-debug.js b/dist/sea-debug.js
@@ -854,7 +854,11 @@ data.fetchedList = fetchedList
 data.cid = cid
 
 seajs.require = function(id) {
-  return (cachedMods[Module.resolve(id)] || {}).exports
+  var mod = Module.get(Module.resolve(id))
+  if (mod.status < STATUS.EXECUTING) {
+    mod.exec()
+  }
+  return mod.exports
 }
 
 

diff --git a/dist/sea.js b/dist/sea.js
diff --git a/src/module.js b/src/module.js
@@ -393,6 +393,10 @@ data.fetchedList = fetchedList
 data.cid = cid
 
 seajs.require = function(id) {
-  return (cachedMods[Module.resolve(id)] || {}).exports
+  var mod = Module.get(Module.resolve(id))
+  if (mod.status < STATUS.EXECUTING) {
+    mod.exec()
+  }
+  return mod.exports
 }
 
diff --git a/tests/specs/module/require-global/combo.js b/tests/specs/module/require-global/combo.js
@@ -0,0 +1,3 @@
+define('combo-a', ['combo-b', 'combo-c'], { name: 'a' });
+define('combo-b', [], { name: 'b' });
+define('combo-c', [], { name: 'c' });
diff --git a/tests/specs/module/require-global/main.js b/tests/specs/module/require-global/main.js
@@ -7,19 +7,32 @@ seajs.config({
 })
 
 
-define(function(require) {
+define(function(_require) {
 
-  var test = require('../../../test')
+  var test = _require('../../../test')
 
-  require('a')
-  require('b')
-  require('biz/c')
+  _require('a')
+  _require('b')
+  _require('biz/c')
 
-  test.assert(seajs.require('a') === require('a'), 'a')
-  test.assert(seajs.require('b') === require('b'), 'b')
-  test.assert(seajs.require('biz/c') === require('biz/c'), 'c')
+  test.assert(seajs.require('a') === _require('a'), 'a')
+  test.assert(seajs.require('b') === _require('b'), 'b')
+  test.assert(seajs.require('biz/c') === _require('biz/c'), 'c')
 
-  test.next()
+
+  if (typeof require === 'function') {
+    require('./combo.js')
+    done()
+  } else {
+    seajs.request('./require-global/combo.js', done)
+  }
+
+  function done() {
+    test.assert(seajs.require('combo-a').name === 'a')
+    test.assert(seajs.require('combo-b').name === 'b')
+    test.assert(seajs.require('combo-c').name === 'c')
+    test.next()
+  }
 
 })