microframework
Advanced tools
Comparing version 0.2.4 to 0.2.5
@@ -187,7 +187,6 @@ declare module 'microframework/MicroFrameworkConfig' { | ||
export class MicroFrameworkBootstrapper { | ||
private nameOrSettings; | ||
private settings; | ||
private _configurator; | ||
private modulesRegistry; | ||
private _name; | ||
private settings; | ||
private configuration; | ||
@@ -194,0 +193,0 @@ constructor(settings: MicroFrameworkSettings); |
@@ -37,21 +37,19 @@ "use strict"; | ||
this.nameOrSettings = nameOrSettings; | ||
this.settings = settings; | ||
this._configurator = _configurator; | ||
this.modulesRegistry = modulesRegistry; | ||
var name = undefined; | ||
if (typeof nameOrSettings === 'string') { | ||
name = nameOrSettings; | ||
this._name = nameOrSettings; | ||
this.settings = settings; | ||
} else { | ||
settings = nameOrSettings; | ||
this._name = 'default'; | ||
this.settings = nameOrSettings; | ||
} | ||
// normalize settings | ||
settings.srcDirectory = path.normalize(settings.srcDirectory); | ||
if (!settings.baseDirectory) settings.baseDirectory = require('find-root')(settings.srcDirectory); | ||
this.settings.srcDirectory = path.normalize(this.settings.srcDirectory); | ||
if (!this.settings.baseDirectory) this.settings.baseDirectory = require('find-root')(this.settings.srcDirectory); | ||
if (!_configurator) this._configurator = _configuratorTsConfigurator.defaultConfigurator; | ||
if (!configLoader) configLoader = new _ConfigLoader.ConfigLoader(settings); | ||
if (!configLoader) configLoader = new _ConfigLoader.ConfigLoader(this.settings); | ||
configLoader.load(); | ||
this.configuration = this._configurator.get('framework'); | ||
this.setName(name); | ||
if (settings && !modulesRegistry) this.modulesRegistry = new _ModulesRegistry.ModuleRegistry(settings, this.configuration, this._configurator); | ||
if (this.settings && !modulesRegistry) this.modulesRegistry = new _ModulesRegistry.ModuleRegistry(this.settings, this.configuration, this._configurator); | ||
} | ||
@@ -58,0 +56,0 @@ |
{ | ||
"name": "microframework", | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
"description": "Micro framework is a bundle of express.js, mongodb ODM, validator, dependancy injection framework and restful controllers for your apps using Typescript", | ||
@@ -5,0 +5,0 @@ "license": "Apache-2.0", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
59930
1054