removed unused

loading.js

@@ -48,6 +48,7 @@ var internalModuleCache = {}
   };
 
   function loadResolvedModule (id,filename,parent,makeR,moduleCache){
+//  console.log("::::::::: load " + id + "::::::::::")
     //moduleCache = moduleCache || cache
 //    console.log("CACHE (loadResolvedModule):" + moduleCache)
     assert.ok(moduleCache,"loadResolvedModule needs a moduleCache")

remapper.js

@@ -10,29 +10,34 @@ module.exports = Remapper
 function Remapper (_module,remaps){
   var self = this
   modules = modules.useCache({})
-
+  self.flatLoaded = [1,2,3]
+  var super = self
+
 function Maker (depends,loaded,remaps){
   var self = this
   var _depends = {}
     loaded = loaded || {}
 
   self.resolve = function (request,module){
-      log("request = ", request)
-    if(remaps[request]){
-      log("REMAP :", request, " -> ", remaps[request])
+    if(remaps.hasOwnProperty(request) && remaps[request]){
+//      log("REMAP :", request, " -> ", remaps[request])
       request = remaps[request]
     }
     return resolve.resolveModuleFilename(request,module)
   }
 
   self.load = function (id, filename, parent, makeR ){
-    if(!loaded[id])
-      loaded[id] = {}
-      if(loaded[parent.id]){
-        loaded[parent.id][id] = loaded[id]
+
+    if(!loaded[id]) { loaded[id] = {} }
+
+    if(loaded[parent.id]) { loaded[parent.id][id] = loaded[id] }
+
+    if(-1 == super.flatLoaded.indexOf(id)){
+      console.log("ID",id)
+      super.flatLoaded.push(id)
       }
-        
-      return modules.defaultLoad(id, filename, parent, makeR)
+
+    return modules.defaultLoad(id, filename, parent, makeR)
   }
 
   self.make = function (thisModule){
@@ -55,9 +60,6 @@ function Maker (depends,loaded,remaps){
 
   self.require = make()
 
-  console.log("remaps")
-  console.log(self.remaps)
-
   function make(){
     return modules.makeMake(new Maker(self.depends,self.loaded,self.remaps))(_module)
   }

test/modules.asynct.js

@@ -6,16 +6,14 @@ var modules =  require('remap/modules')
 ; // a semi-colon for Ryan Gahl
 
 //var Xexports = {}
-  
+
 exports['Require2 can load a module'] = function (test){
 
   var a1 = require2('./.examples/a')
 
   test.finish()
 }
 
-
-
 exports['loads a module with different module, require'] = function (test){
 
   var mirror = require2('./.examples/mirror')
@@ -60,15 +58,14 @@ exports['modules.loadModule accepts a function which is assigned to module and c
       return r
     }
 
-      /*  applications of this crazy module:
-          1. reroute resolve, so that it loads a different module.
-          2. return before calling loadModule, i.e. return a mock instead.
-          3. modify module loaded. 
-            i.e. wrap it and record what is called.
-            or wrap all db queries in a transaction and revert it after the test. 
-          4. change the makeRequire method for children...
-      */
-
+    /*  applications of this crazy module:
+        1. reroute resolve, so that it loads a different module.
+        2. return before calling loadModule, i.e. return a mock instead.
+        3. modify module loaded. 
+          i.e. wrap it and record what is called.
+          or wrap all db queries in a transaction and revert it after the test. 
+        4. change the makeRequire method for children...
+    */
 }
 
 exports['modules can uncache a loaded module'] = function (test){

test/remapper.depends.asynct.js

@@ -9,7 +9,7 @@ var Remapper = require('remap/remapper')
   , describe = require('should').describe
   , helper = require('./.helper/helper')
   , inspect = require('util').inspect //require('inspect')
-  , log = console.log
+  , log = require('logger')  
   , a_fn = 'remap/test/.examples/a'
   , b_fn = 'remap/test/.examples/b'
   , c_fn = 'remap/test/.examples/c'
@@ -124,6 +124,9 @@ exports ['can retrive the dependencies of multiple require()s (more complex)'] =
   shouldLoaded(r,'remap/test/.examples/d',d)
   shouldLoaded(r,'remap/test/.examples/e',e)
 
+  log('depends\n',r.depends)
+
+
   shouldDepends(r,e_fn,depends,loaded)
 
   test.finish()

test/remapper.remaps.asynct.js

@@ -60,8 +60,6 @@ exports ['can remap the dependencies of a single require()'] = function (test){
   test.finish()
 }
 
-
-
 exports ['can remap the dependencies of multiple require()s'] = function (test){
 
   var remaps = {'./c': './a' }