add Module._getCompilingModule method. close seajs#223

soda-x · Jun 23, 2012 · f11c90a · f11c90a
1 parent 2288ba3
commit f11c90a
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 7 deletions.
diff --git a/dist/sea-debug.js b/dist/sea-debug.js
@@ -718,6 +718,7 @@ seajs._config = {
 
   var cachedModules = {}
   var cachedModifiers = {}
+  var compilingModules = []
 
   var STATUS = {
     'FETCHED': 0,  // The module file has been downloaded to the browser.
@@ -855,7 +856,9 @@ seajs._config = {
     var factory = module.factory
 
     if (util.isFunction(factory)) {
+      compilingModules.push(module)
       runInModuleContext(factory, module)
+      compilingModules.pop()
     }
     else if (factory !== undefined) {
       module.exports = factory
@@ -928,6 +931,11 @@ seajs._config = {
   }
 
 
+  Module._getCompilingModule = function() {
+    return compilingModules[compilingModules.length - 1]
+  }
+
+
   // For plugin developers
   Module._resolve = util.id2Uri
   Module._fetch = util.fetch

diff --git a/dist/sea.js b/dist/sea.js
diff --git a/src/module.js b/src/module.js
@@ -5,6 +5,7 @@
 
   var cachedModules = {}
   var cachedModifiers = {}
+  var compilingModules = []
 
   var STATUS = {
     'FETCHED': 0,  // The module file has been downloaded to the browser.
@@ -142,7 +143,9 @@
     var factory = module.factory
 
     if (util.isFunction(factory)) {
+      compilingModules.push(module)
       runInModuleContext(factory, module)
+      compilingModules.pop()
     }
     else if (factory !== undefined) {
       module.exports = factory
@@ -215,6 +218,11 @@
   }
 
 
+  Module._getCompilingModule = function() {
+    return compilingModules[compilingModules.length - 1]
+  }
+
+
   // For plugin developers
   Module._resolve = util.id2Uri
   Module._fetch = util.fetch

diff --git a/test/config.js b/test/config.js
@@ -43,6 +43,7 @@
     ,'issues/anywhere'
     ,'issues/charset'
     ,'issues/combo-use'
+    ,'issues/compiling-module'
     ,'issues/config-base'
     ,'issues/config-conflict'
     ,'issues/data-main'

diff --git a/test/issues/compiling-module/animal.js b/test/issues/compiling-module/animal.js
@@ -0,0 +1,14 @@
+define(function(require) {
+
+  var oo = require('./oo')
+
+
+  function Animal() {
+  }
+
+  oo.inherits(Animal, Object)
+
+  Animal.prototype.isAnimal = true
+  return Animal
+
+})
diff --git a/test/issues/compiling-module/dog.js b/test/issues/compiling-module/dog.js
@@ -0,0 +1,15 @@
+define(function(require) {
+
+  var oo = require('./oo')
+  var Animal = require('./animal')
+
+
+  function Dog() {
+  }
+
+  oo.inherits(Dog, Animal)
+
+  Dog.prototype.isDog = true
+  return Dog
+
+})
diff --git a/test/issues/compiling-module/main.js b/test/issues/compiling-module/main.js
@@ -0,0 +1,17 @@
+define(function(require) {
+
+  var test = require('../../test')
+
+  var Dog = require('./dog')
+  var dog = new Dog()
+
+  seajs.log(dog, 'dir')
+
+  test.assert(dog.isAnimal === true, dog.isAnimal)
+  test.assert(dog.isDog === true, dog.isDog)
+  test.assert(dog.__filename === 'dog.js', dog.__filename)
+  test.assert(dog.__module.dependencies.length === 2, dog.__module.dependencies)
+
+  test.done()
+
+})
diff --git a/test/issues/compiling-module/oo.js b/test/issues/compiling-module/oo.js
@@ -0,0 +1,39 @@
+define(function(require, exports) {
+
+
+  exports.inherits = function(ctor, superCtor) {
+
+    ctor.prototype = createProto(superCtor.prototype)
+
+    // Adds meta info
+    var compilingModule = seajs.pluginSDK.Module._getCompilingModule()
+    var filename = compilingModule.uri.split(/[\/\\]/).pop()
+
+    if (Object.defineProperties) {
+      Object.defineProperties(ctor.prototype, {
+        __module: { value: compilingModule },
+        __filename: { value:  filename }
+      })
+    }
+    else {
+      ctor.prototype.__module = compilingModule
+      ctor.prototype.__filename = filename
+    }
+  }
+
+
+  // Shared empty constructor function to aid in prototype-chain creation.
+  function Ctor() {
+  }
+
+  // See: http://jsperf.com/object-create-vs-new-ctor
+  var createProto = Object.__proto__ ?
+      function(proto) {
+        return { __proto__: proto }
+      } :
+      function(proto) {
+        Ctor.prototype = proto
+        return new Ctor()
+      }
+
+})
diff --git a/test/issues/compiling-module/test.html b/test/issues/compiling-module/test.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Issue Test</title>
+<script>
+  function printResults(txt, style) {
+    var d = document.createElement('div');
+    d.innerHTML = txt;
+    d.className = style;
+    document.getElementById('out').appendChild(d);
+  }
+</script>
+</head>
+<body>
+
+<p><a href="https://github.com/seajs/seajs/issues/223">#223</a></p>
+<div id="out"></div>
+
+<script src="../../../dist/sea-debug.js"></script>
+<script>
+  seajs.use('./main')
+</script>
+
+</body>
+</html>
diff --git a/test/issues/public-api/a.js b/test/issues/public-api/a.js
@@ -33,7 +33,8 @@ define(function(require, exports, module) {
   test.assert(Module._define, 'Module._define')
   test.assert(Module._fetch, 'Module._fetch')
   test.assert(Module._resolve, 'Module._resolve')
-  test.assert(getOwnPropertyCount(Module) === 4, getOwnPropertyCount(Module))
+  test.assert(Module._getCompilingModule, 'Module._getCompilingModule')
+  test.assert(getOwnPropertyCount(Module) === 5, getOwnPropertyCount(Module))
 
   // seajs.pluginSDK.Module.prototype
   var MP = Module.prototype