DicRequireLoader - module prefix

matuszeman · Aug 11, 2016 · 823b8b3 · 823b8b3
1 parent 784cf25
commit 823b8b3
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/examples/bootstrap.js b/examples/bootstrap.js
@@ -10,6 +10,16 @@ const requireLoader = new DicRequireLoader({
 }, dic);
 requireLoader.enable();
 
+//app config
+dic.instance('./service-config', {
+  cache: {
+    ttl: 1000
+  },
+  consumer: {
+    my: 'APP options'
+  }
+});
+
 module.exports = {
   dic
 };
diff --git a/examples/index.js b/examples/index.js
@@ -5,7 +5,7 @@ const { dic } = require('./bootstrap');
 console.log('====================== APP =======================');//XXX
 
 const fn = require('./services/function');
-dic.alias('services/function', 'function');
+//dic.alias('./services/function', 'function');
 
 console.log('====================== RUN =======================');//XXX
 

diff --git a/examples/services/cache.js b/examples/services/cache.js
@@ -1,2 +1,3 @@
 const Cache = require('../src/cache');
-module.exports = new Cache();
+const config = require('./../service-config');
+module.exports = new Cache(config.cache);
diff --git a/examples/services/consumer.js b/examples/services/consumer.js
@@ -1,2 +1,3 @@
 const Consumer = require('../src/consumer');
-module.exports = new Consumer(require('./cache'));
+const config = require('../service-config');
+module.exports = new Consumer(config.consumer, require('./cache'));
diff --git a/examples/src/cache.js b/examples/src/cache.js
@@ -1,6 +1,10 @@
 module.exports = class Cache {
+  constructor(options) {
+    this.options = options;
+  }
+
   *asyncInit() {
-    console.log('>>> Cache async initialization');//XXX
+    console.log('>>> Cache async init. Options: ', this.options);//XXX
     this.dbConnection = true;
   }
 

diff --git a/examples/src/consumer.js b/examples/src/consumer.js
@@ -1,11 +1,12 @@
 module.exports = class Consumer {
-  constructor(cache) {
+  constructor(options, cache) {
+    this.options = options;
     this.cache = cache;
     this.init = false;
   }
 
   *asyncInit() {
-    console.log('>>> Consumer async initialization');//XXX
+    console.log('>>> Consumer async init. Options: ', this.options);//XXX
     this.init = true;
   }
 

diff --git a/examples/test/bootstrap.js b/examples/test/bootstrap.js
@@ -1,12 +1,15 @@
 const { dic } = require('../bootstrap');
 
 //test stubs replacing real application services
-dic.instance('services/cache', {
+dic.instance('./services/cache', {
   get: function(key) {
     return 'TEST CACHE VALUE';
   }
 });
 
+const config = dic.get('./service-config');
+config.consumer.my = 'TEST options';
+
 before(function*() {
   yield dic.asyncInit();
 });

diff --git a/src/dic-require-loader.js b/src/dic-require-loader.js
@@ -3,7 +3,9 @@ const path = require('path');
 
 module.exports = class DicRequireLoader {
   constructor(opts, dic) {
-    this.options = opts;
+    this.options = _.defaults(opts, {
+      modulePrefix: './'
+    });
     this.dic = dic;
   }
 
@@ -27,7 +29,7 @@ module.exports = class DicRequireLoader {
         this.filename.indexOf('/node_modules/') !== -1 ||       //requires from system modules (mocha)
         requestedModulePath.indexOf('/node_modules/') !== -1) { //app requires of system modules (mocha)
         if (self.dic.has(requestedModulePath)) {
-          console.log(`DicRequireLoader: System module "${moduleId}" loaded from Dic [${this.filename}]`);//XXX
+          console.log(`DicRequireLoader: System module "${requestedModulePath}" loaded from Dic [${this.filename}]`);//XXX
           return self.getInstance(requestedModulePath);
         }
 
@@ -37,12 +39,13 @@ module.exports = class DicRequireLoader {
 
       const currentDir = path.dirname(this.filename);
       const modulePath = path.resolve(currentDir + '/' + requestedModulePath);
-      const moduleId = path.relative(self.options.rootDir, modulePath);
+      const relativeModulePath = path.relative(self.options.rootDir, modulePath);
+      const moduleId = self.options.modulePrefix + relativeModulePath;
 
       if (self.options.exclude) {
         for (const exc of self.options.exclude) {
           //TODO this should be done much smarter - glob?
-          if (moduleId.indexOf(exc) === 0) {
+          if (relativeModulePath.indexOf(exc) === 0) {
             console.log(`DicRequireLoader: Module "${moduleId}" excluded [${this.filename}]`);//XXX
             return DicRequireLoader.originalRequire.apply(this, arguments);
           }