@spinajs/configuration 1.0.12 → 1.1.2

package/lib/config/configuration.js

@@ -0,0 +1,7 @@
+module.exports = {
+    configuration: {
+        isDevelopment: process.env.NODE_ENV === "development",
+        isProduction: process.env.NODE_ENV === "production"
+    }
+};
+//# sourceMappingURL=configuration.js.map

package/lib/config/configuration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/config/configuration.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,aAAa,EAAE;QACX,aAAa,EAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;QACtD,YAAY,EAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;KACxD;CACJ,CAAA"}

package/lib/configuration.d.ts

@@ -0,0 +1,45 @@
+import { IContainer } from '@spinajs/di';
+import { ConfigurationSource } from './sources';
+import { Configuration, ConfigurationOptions } from './types';
+export declare class FrameworkConfiguration extends Configuration {
+    /**
+     * Apps configuration base dir, where to look for app config
+     */
+    AppBaseDir: string;
+    /**
+     * Current running app name
+     */
+    RunApp: string;
+    /**
+     * Loaded & merged configuration
+     */
+    protected Config: any;
+    protected CustomConfigPaths: string[];
+    protected Sources: ConfigurationSource[];
+    /**
+     *
+     * @param app application name, pass it when you run in application mode
+     * @param baseDir configuration base dir, where to look for application configs
+     * @param cfgCustomPaths custom cfg paths eg. to load config from non standard folders ( usefull in tests )
+     */
+    constructor(options?: ConfigurationOptions);
+    /**
+     * Get config value for given property. If value not exists it returns default value, if default value is not provided returns undefined
+     *
+     * @param path - path to property eg. ["system","dirs"]
+     * @param defaultValue - optional, if value at specified path not exists returns default value
+     * @returns { T | undefined }
+     */
+    get<T>(path: string[] | string, defaultValue?: T): T;
+    resolveAsync(container: IContainer): Promise<void>;
+    protected dir(toJoin: string): string;
+    /**
+     * adds app dirs to system.dirs config
+     */
+    protected applyAppDirs(): void;
+    /**
+     * runs configuration func on files
+     * eg. when you want to configure stuff at beginning eq. external libs
+     */
+    protected configure(): void;
+}

package/lib/configuration.js

@@ -0,0 +1,121 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FrameworkConfiguration = void 0;
+const di_1 = require("@spinajs/di");
+const exceptions_1 = require("@spinajs/exceptions");
+const path_1 = require("path");
+const sources_1 = require("./sources");
+const types_1 = require("./types");
+const log_1 = require("@spinajs/log");
+const util_1 = require("./util");
+const _ = __importStar(require("lodash"));
+let FrameworkConfiguration = class FrameworkConfiguration extends types_1.Configuration {
+    /**
+     *
+     * @param app application name, pass it when you run in application mode
+     * @param baseDir configuration base dir, where to look for application configs
+     * @param cfgCustomPaths custom cfg paths eg. to load config from non standard folders ( usefull in tests )
+     */
+    constructor(options) {
+        var _a, _b, _c, _d;
+        super();
+        /**
+         * Apps configuration base dir, where to look for app config
+         */
+        this.AppBaseDir = './';
+        /**
+         * Current running app name
+         */
+        this.RunApp = "";
+        /**
+         * Loaded & merged configuration
+         */
+        this.Config = {};
+        this.CustomConfigPaths = (_a = options === null || options === void 0 ? void 0 : options.cfgCustomPaths) !== null && _a !== void 0 ? _a : [];
+        this.RunApp = (_b = options === null || options === void 0 ? void 0 : options.app) !== null && _b !== void 0 ? _b : (0, util_1.parseArgv)('--app');
+        this.AppBaseDir = (_d = (_c = options === null || options === void 0 ? void 0 : options.appBaseDir) !== null && _c !== void 0 ? _c : (0, util_1.parseArgv)('--apppath')) !== null && _d !== void 0 ? _d : (0, path_1.join)(__dirname, '../apps/');
+    }
+    /**
+     * Get config value for given property. If value not exists it returns default value, if default value is not provided returns undefined
+     *
+     * @param path - path to property eg. ["system","dirs"]
+     * @param defaultValue - optional, if value at specified path not exists returns default value
+     * @returns { T | undefined }
+     */
+    get(path, defaultValue) {
+        return _.get(this.Config, path, defaultValue);
+    }
+    async resolveAsync(container) {
+        if (!container.hasRegistered(sources_1.ConfigurationSource)) {
+            throw new exceptions_1.InvalidOperation("No configuration sources configured. Please ensure that config module have any source to read from !");
+        }
+        this.Sources = await container.resolve(Array.ofType(sources_1.ConfigurationSource), [this.RunApp, this.CustomConfigPaths, this.AppBaseDir]);
+        log_1.Log.trace(`Found ${this.Sources.map(x => x.constructor.name)} log sources`, "Configuration");
+        await Promise.all(this.Sources.map(s => s.Load())).then(result => {
+            result.map(c => _.merge(this.Config, c));
+        });
+        this.applyAppDirs();
+        this.configure();
+        await super.resolveAsync(container);
+    }
+    dir(toJoin) {
+        return (0, path_1.normalize)((0, path_1.join)((0, path_1.resolve)(this.BaseDir), toJoin));
+    }
+    /**
+     * adds app dirs to system.dirs config
+     */
+    applyAppDirs() {
+        if (!this.RunApp) {
+            return;
+        }
+        for (const prop of Object.keys(this.get(['system', 'dirs'], []))) {
+            this.get(['system', 'dirs', prop]).push(this.dir(`/${this.RunApp}/${prop}`));
+        }
+    }
+    /**
+     * runs configuration func on files
+     * eg. when you want to configure stuff at beginning eq. external libs
+     */
+    configure() {
+        for (const prop of Object.keys(this.Config)) {
+            const subconfig = this.Config[prop];
+            if (_.isFunction(subconfig.configure)) {
+                subconfig.configure.apply(this.Config, [subconfig]);
+            }
+        }
+    }
+};
+FrameworkConfiguration = __decorate([
+    (0, di_1.Injectable)(types_1.Configuration),
+    __metadata("design:paramtypes", [Object])
+], FrameworkConfiguration);
+exports.FrameworkConfiguration = FrameworkConfiguration;
+//# sourceMappingURL=configuration.js.map

package/lib/configuration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"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"}

package/lib/decorators.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Injects configuration value to given class property
+ *
+ * @param path path to configuration value eg. "app.dirs.stats"
+ * @param dafaultValue default value if path not exists
+ * @returns
+ */
+export declare function Config(path: string, dafaultValue?: any): (target?: any, key?: string) => any;

package/lib/decorators.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
+const di_1 = require("@spinajs/di");
+const types_1 = require("./types");
+/**
+ * Injects configuration value to given class property
+ *
+ * @param path path to configuration value eg. "app.dirs.stats"
+ * @param dafaultValue default value if path not exists
+ * @returns
+ */
+function Config(path, dafaultValue) {
+    return (target, key) => {
+        let config = null;
+        const getter = () => {
+            if (!config) {
+                config = di_1.DI.get(types_1.Configuration);
+            }
+            return config.get(path, dafaultValue);
+        };
+        Object.defineProperty(target, key, {
+            get: getter,
+            enumerable: false,
+            configurable: false
+        });
+    };
+}
+exports.Config = Config;
+//# sourceMappingURL=decorators.js.map

package/lib/decorators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AACjC,mCAAuC;AAEvC;;;;;;GAMG;AACH,SAAgB,MAAM,CAAC,IAAY,EAAE,YAAkB;IACnD,OAAO,CAAC,MAAY,EAAE,GAAY,EAAO,EAAE;QAEvC,IAAI,MAAM,GAAkB,IAAI,CAAC;QAEjC,MAAM,MAAM,GAAG,GAAG,EAAE;YAChB,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,GAAG,OAAE,CAAC,GAAG,CAAC,qBAAa,CAAC,CAAC;aAClC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC1C,CAAC,CAAA;QAED,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE;YAC/B,GAAG,EAAE,MAAM;YACX,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;SACtB,CAAC,CAAC;IACP,CAAC,CAAA;AACL,CAAC;AAlBD,wBAkBC"}

package/lib/index.d.ts

@@ -1,69 +1,4 @@
-import { IContainer, SyncModule } from '@spinajs/di';
-export declare abstract class Configuration extends SyncModule {
-    /**
-     * Configuration base dir, where to look for app config
-     */
-    BaseDir: string;
-    /**
-     * Current running app name
-     */
-    RunApp: string;
-    /**
-     * Get config value for given property. Returns any if value is present, default value if provided or null when empty
-     *
-     * @param path - path to property eg. ["system","dirs"] or "system" or "system.dirs"
-     */
-    abstract get<T>(path: string[] | string, defaultValue?: T): T;
-}
-export declare class FrameworkConfiguration extends Configuration {
-    /**
-     * Configuration base dir, where to look for app config
-     */
-    BaseDir: string;
-    /**
-     * Current running app name
-     */
-    RunApp: string;
-    /**
-     * Default dirs to check for  configuration files
-     */
-    protected CONFIG_DIRS: string[];
-    /**
-     * Loaded & merged configuration
-     */
-    protected Config: any;
-    /**
-     *
-     * @param app application name, pass it when you run in application mode
-     * @param baseDir configuration base dir, where to look for application configs
-     * @param cfgCustomPaths custom cfg paths eg. to load config from non standard folders ( usefull in tests )
-     */
-    constructor(app?: string, appBaseDir?: string, cfgCustomPaths?: string[]);
-    /**
-     * Get config value for given property. Returns Maybe<any> if value is present or Maybe<null> when empty
-     *
-     * @param path - path to property eg. ["system","dirs"]
-     * @param defaultValue - optional, if value at specified path not exists returns default value
-     */
-    get<T>(path: string[] | string, defaultValue?: T): T;
-    resolve(_container: IContainer): void;
-    protected load(extension: string, callback: (file: string) => any): void;
-    protected dir(toJoin: string): string;
-    /**
-     * adds app dirs to system.dirs config
-     */
-    protected _appDirs(): void;
-    /**
-     * runs configuration func on files
-     * eg. when you want to configure stuff at beginning eq. external libs
-     */
-    protected configure(): void;
-    /**
-     * Just prints framework version
-     */
-    protected version(): void;
-    /**
-     * Gets app name passed to CLI & adds proper config dirs to merge
-     */
-    protected configureApp(): void;
-}
+export * from "./types";
+export * from "./sources";
+export * from "./decorators";
+export * from "./configuration";

package/lib/index.js

@@ -1,204 +1,17 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FrameworkConfiguration = exports.Configuration = void 0;
-const di_1 = require("@spinajs/di");
-const fs = require("fs");
-const glob = require("glob");
-const _ = require("lodash");
-const path_1 = require("path");
-function log(message) {
-    if (typeof jasmine === 'undefined') {
-        console.log('[ CONFIGURATION ] ' + message);
-    }
-}
-function merge(to, from) {
-    _.mergeWith(to, from, (src, dest) => {
-        if (_.isArray(src) && _.isArray(dest)) {
-            const tmp = src.concat(dest);
-            return _.uniqWith(tmp, _.isEqual);
-        }
-        else if (!src) {
-            return dest;
-        }
-    });
-    return to;
-}
-// clean require cache config
-// http://stackoverflow.com/questions/9210542/node-js-require-cache-possible-to-invalidate
-function uncache(file) {
-    delete require.cache[file];
-    return file;
-}
-function filterDirs(dir) {
-    if (fs.existsSync(dir)) {
-        log(`Found config dir at ${dir}`);
-        return true;
-    }
-    return false;
-}
-class Configuration extends di_1.SyncModule {
-}
-exports.Configuration = Configuration;
-let FrameworkConfiguration = class FrameworkConfiguration extends Configuration {
-    /**
-     *
-     * @param app application name, pass it when you run in application mode
-     * @param baseDir configuration base dir, where to look for application configs
-     * @param cfgCustomPaths custom cfg paths eg. to load config from non standard folders ( usefull in tests )
-     */
-    constructor(app, appBaseDir, cfgCustomPaths) {
-        var _a;
-        super();
-        /**
-         * Configuration base dir, where to look for app config
-         */
-        this.BaseDir = './';
-        /**
-         * Current running app name
-         */
-        this.RunApp = undefined;
-        /**
-         * Default dirs to check for  configuration files
-         */
-        this.CONFIG_DIRS = [
-            // this module path
-            path_1.normalize(path_1.join(path_1.resolve(__dirname), '/../config')),
-            // other @spinajs modules paths
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/orm/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/orm-sqlite/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/orm-sql/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/log/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/intl/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/cli/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/acl/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/http/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/acl-http/lib/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/node_modules/@spinajs/jobs/lib/config')),
-            // project paths - last to allow overwrite @spinajs conf
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/dist/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/build/config')),
-            path_1.normalize(path_1.join(path_1.resolve(__dirname).split(path_1.sep + 'node_modules')[0], '/config')),
-        ];
-        /**
-         * Loaded & merged configuration
-         */
-        this.Config = {};
-        this.RunApp = app !== null && app !== void 0 ? app : parseArgv('--app');
-        this.BaseDir = (_a = appBaseDir !== null && appBaseDir !== void 0 ? appBaseDir : parseArgv('--appPath')) !== null && _a !== void 0 ? _a : path_1.join(__dirname, '../apps/');
-        log(`Running app: ${this.RunApp}`);
-        log(`Base dir at: ${this.BaseDir}`);
-        if (cfgCustomPaths) {
-            this.CONFIG_DIRS = this.CONFIG_DIRS.concat(cfgCustomPaths);
-        }
-        function parseArgv(param) {
-            const index = process.argv.indexOf(param);
-            if (index === -1 || process.argv.length <= index + 1) {
-                return undefined;
-            }
-            return process.argv[index + 1];
-        }
-    }
-    /**
-     * Get config value for given property. Returns Maybe<any> if value is present or Maybe<null> when empty
-     *
-     * @param path - path to property eg. ["system","dirs"]
-     * @param defaultValue - optional, if value at specified path not exists returns default value
-     */
-    get(path, defaultValue) {
-        return _.get(this.Config, path, defaultValue);
-    }
-    resolve(_container) {
-        this.configureApp();
-        this.load('js', (file) => {
-            uncache(file);
-            return require(file);
-        });
-        this.load('json', (file) => {
-            return JSON.parse(fs.readFileSync(file, 'utf-8'));
-        });
-        this.version();
-        this._appDirs();
-        this.configure();
-    }
-    load(extension, callback) {
-        this.CONFIG_DIRS.filter(filterDirs)
-            // get all config files
-            .map(d => glob.sync(d + `/**/*.${extension}`))
-            // flatten files
-            .reduce((prev, current) => {
-            return prev.concat(_.flattenDeep(current));
-        }, [])
-            // normalize & resolve paths to be sure
-            .map((f) => path_1.normalize(path_1.resolve(f)))
-            // info about files about to load
-            .map(f => {
-            log(`Found file at: ${f}`);
-            return f;
-        })
-            .map(callback)
-            // load & merge configs
-            .map(_.curry(merge)(this.Config));
-    }
-    dir(toJoin) {
-        return path_1.normalize(path_1.join(path_1.resolve(this.BaseDir), toJoin));
-    }
-    /**
-     * adds app dirs to system.dirs config
-     */
-    _appDirs() {
-        if (_.isEmpty(this.RunApp)) {
-            return;
-        }
-        for (const prop of Object.keys(this.get(['system', 'dirs'], []))) {
-            this.get(['system', 'dirs', prop]).push(this.dir(`/${this.RunApp}/${prop}`));
-        }
-    }
-    /**
-     * runs configuration func on files
-     * eg. when you want to configure stuff at beginning eq. external libs
-     */
-    configure() {
-        for (const prop of Object.keys(this.Config)) {
-            const subconfig = this.Config[prop];
-            if (_.isFunction(subconfig.configure)) {
-                subconfig.configure.call(subconfig);
-            }
-        }
-    }
-    /**
-     * Just prints framework version
-     */
-    version() {
-        const version = this.get('system.version', undefined);
-        if (version) {
-            log(`APP VERSION: ${version.major}.${version.minor}`);
-        }
-        else {
-            log('APP VERSION UNKNOWN');
-        }
-    }
-    /**
-     * Gets app name passed to CLI & adds proper config dirs to merge
-     */
-    configureApp() {
-        if (typeof this.RunApp === 'string') {
-            log(`Application to run: ${this.RunApp}`);
-            this.CONFIG_DIRS.push(this.dir(`/${this.RunApp}/config`));
-        }
-    }
-};
-FrameworkConfiguration = __decorate([
-    di_1.Injectable(Configuration),
-    __metadata("design:paramtypes", [String, String, Array])
-], FrameworkConfiguration);
-exports.FrameworkConfiguration = FrameworkConfiguration;
+__exportStar(require("./types"), exports);
+__exportStar(require("./sources"), exports);
+__exportStar(require("./decorators"), exports);
+__exportStar(require("./configuration"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiE;AACjE,yBAAyB;AACzB,6BAA6B;AAC7B,4BAA4B;AAC5B,+BAAqD;AAerD,SAAS,GAAG,CAAC,OAAe;IAC1B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,OAAO,CAAC,CAAC;KAC7C;AACH,CAAC;AAED,SAAS,KAAK,CAAC,EAAO,EAAE,IAAS;IAC/B,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAClC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7B,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SACnC;aAAM,IAAI,CAAC,GAAG,EAAE;YACf,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,6BAA6B;AAC7B,0FAA0F;AAC1F,SAAS,OAAO,CAAC,IAAY;IAC3B,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAsB,aAAc,SAAQ,eAAU;CAiBrD;AAjBD,sCAiBC;AAGD,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,aAAa;IA2CvD;;;;;OAKG;IACH,YAAY,GAAY,EAAE,UAAmB,EAAE,cAAyB;;QACtE,KAAK,EAAE,CAAC;QAjDV;;WAEG;QACI,YAAO,GAAW,IAAI,CAAC;QAE9B;;WAEG;QACI,WAAM,GAAW,SAAS,CAAC;QAElC;;WAEG;QACO,gBAAW,GAAa;YAChC,mBAAmB;YACnB,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;YAEjD,+BAA+B;YAC/B,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC3G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,8CAA8C,CAAC,CAAC;YAClH,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,2CAA2C,CAAC,CAAC;YAC/G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC3G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,wCAAwC,CAAC,CAAC;YAC5G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC3G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAC3G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,wCAAwC,CAAC,CAAC;YAC5G,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,4CAA4C,CAAC,CAAC;YAChH,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,wCAAwC,CAAC,CAAC;YAI5G,wDAAwD;YACxD,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAClF,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;YACnF,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;SAC9E,CAAC;QAEF;;WAEG;QACO,WAAM,GAAQ,EAAE,CAAC;QAWzB,IAAI,CAAC,MAAM,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,SAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,SAAS,CAAC,WAAW,CAAC,mCAAI,WAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEnF,GAAG,CAAC,gBAAgB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACnC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC5D;QAED,SAAS,SAAS,CAAC,KAAa;YAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAE1C,IAAI,KAAK,KAAK,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,EAAE;gBACpD,OAAO,SAAS,CAAC;aAClB;YAED,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,GAAG,CAAI,IAAuB,EAAE,YAAgB;QACrD,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC;IAEM,OAAO,CAAC,UAAsB;QACnC,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAES,IAAI,CAAC,SAAiB,EAAE,QAA+B;QAC/D,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;YACjC,uBAAuB;aACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,SAAS,EAAE,CAAC,CAAC;YAC9C,gBAAgB;aACf,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7C,CAAC,EAAE,EAAE,CAAC;YACN,uCAAuC;aACtC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,gBAAS,CAAC,cAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,iCAAiC;aAChC,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YAC3B,OAAO,CAAC,CAAC;QACX,CAAC,CAAC;aACD,GAAG,CAAC,QAAQ,CAAC;YACd,uBAAuB;aACtB,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC;IAES,GAAG,CAAC,MAAc;QAC1B,OAAO,gBAAS,CAAC,WAAI,CAAC,cAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACO,QAAQ;QAChB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE;YAChE,IAAI,CAAC,GAAG,CAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;SACxF;IACH,CAAC;IAED;;;OAGG;IACO,SAAS;QACjB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEpC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;gBACrC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACrC;SACF;IACH,CAAC;IAED;;OAEG;IACO,OAAO;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAoB,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAEzE,IAAI,OAAO,EAAE;YACX,GAAG,CAAC,gBAAgB,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;SACvD;aAAM;YACL,GAAG,CAAC,qBAAqB,CAAC,CAAC;SAC5B;IACH,CAAC;IAED;;OAEG;IACO,YAAY;QACpB,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;YACnC,GAAG,CAAC,uBAAuB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC;SAC3D;IACH,CAAC;CACF,CAAA;AA7KY,sBAAsB;IADlC,eAAU,CAAC,aAAa,CAAC;;GACb,sBAAsB,CA6KlC;AA7KY,wDAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,+CAA6B;AAC7B,kDAAgC"}

package/lib/sources.d.ts

@@ -0,0 +1,32 @@
+export declare abstract class ConfigurationSource {
+    abstract Load(): Promise<any>;
+}
+export declare abstract class BaseFileSource extends ConfigurationSource {
+    protected RunApp?: string;
+    protected CustomConfigPaths?: string[];
+    protected appBaseDir?: string;
+    /**
+     * Configuration base dir, where to look for app config
+     */
+    BaseDir: string;
+    /**
+     * Default dirs to check for  configuration files
+     */
+    protected CONFIG_DIRS: string[];
+    constructor(RunApp?: string, CustomConfigPaths?: string[], appBaseDir?: string);
+    protected load(extension: string, callback: (file: string) => any): {};
+}
+export declare class JsFileSource extends BaseFileSource {
+    /**
+     * Default dirs to check for  configuration files
+     */
+    protected CONFIG_DIRS: string[];
+    Load(): Promise<any>;
+}
+export declare class JsonFileSource extends BaseFileSource {
+    /**
+     * Default dirs to check for  configuration files
+     */
+    protected CONFIG_DIRS: string[];
+    Load(): Promise<any>;
+}

package/lib/sources.js

@@ -0,0 +1,165 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonFileSource = exports.JsFileSource = exports.BaseFileSource = exports.ConfigurationSource = void 0;
+const di_1 = require("@spinajs/di");
+const glob_1 = require("glob");
+const _ = require("lodash");
+const path_1 = require("path");
+const util_1 = require("./util");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const log_1 = require("@spinajs/log");
+function mergeArrays(target, source) {
+    if (_.isArray(target)) {
+        return target.concat(source);
+    }
+}
+const DEFAULT_CONFIG_DIRS = [
+    // this module path
+    (0, path_1.normalize)((0, path_1.join)((0, path_1.resolve)(__dirname), '/../config')),
+    // for tests, in src dir
+    (0, path_1.normalize)((0, path_1.join)((0, path_1.resolve)(__dirname), '/config')),
+    // other @spinajs modules paths
+    'node_modules/@spinajs/*/lib/config',
+    // project paths - last to allow overwrite @spinajs conf
+    'lib/config',
+    'dist/config',
+    'build/config',
+    'config',
+];
+class ConfigurationSource {
+}
+exports.ConfigurationSource = ConfigurationSource;
+class BaseFileSource extends ConfigurationSource {
+    constructor(RunApp, CustomConfigPaths, appBaseDir) {
+        super();
+        this.RunApp = RunApp;
+        this.CustomConfigPaths = CustomConfigPaths;
+        this.appBaseDir = appBaseDir;
+        /**
+         * Configuration base dir, where to look for app config
+         */
+        this.BaseDir = './';
+        /**
+         * Default dirs to check for  configuration files
+         */
+        this.CONFIG_DIRS = [];
+    }
+    load(extension, callback) {
+        const config = {};
+        let dirs = this.CONFIG_DIRS;
+        const basePath = (0, util_1.findBasePath)(process.cwd());
+        if (this.RunApp) {
+            dirs = dirs.concat([(0, path_1.join)(this.appBaseDir, `/${this.RunApp}/config`)]);
+        }
+        if (this.CustomConfigPaths) {
+            dirs = dirs.concat(this.CustomConfigPaths);
+        }
+        dirs.map(f => path.isAbsolute(f) ? f : (0, path_1.join)(basePath, f))
+            // get all config files
+            .map(d => glob_1.glob.sync(d + `/**/${extension}`))
+            // flatten files
+            .reduce((prev, current) => {
+            return prev.concat(_.flattenDeep(current));
+        }, [])
+            // normalize & resolve paths to be sure
+            .map((f) => (0, path_1.normalize)((0, path_1.resolve)(f)))
+            .map(callback)
+            .filter((v) => v !== null)
+            // load & merge configs
+            .map((c) => _.mergeWith(config, c, mergeArrays));
+        return config;
+    }
+}
+exports.BaseFileSource = BaseFileSource;
+let JsFileSource = class JsFileSource extends BaseFileSource {
+    constructor() {
+        super(...arguments);
+        /**
+         * Default dirs to check for  configuration files
+         */
+        this.CONFIG_DIRS = DEFAULT_CONFIG_DIRS;
+    }
+    async Load() {
+        const common = this.load('!(*.dev|*.prod).js', _load);
+        if (process.env.NODE_ENV) {
+            if (process.env.NODE_ENV === "development") {
+                return _.mergeWith(common, this.load("*.dev.js", _load), mergeArrays);
+            }
+            else if (process.env.NODE_ENV === "production") {
+                return _.mergeWith(common, this.load("*.prod.js", _load), mergeArrays);
+            }
+        }
+        return common;
+        function _load(file) {
+            log_1.Log.trace(`Found configuration file at ${file}`, "Configuration");
+            (0, util_1.uncache)(file);
+            return require(file);
+        }
+    }
+};
+JsFileSource = __decorate([
+    (0, di_1.Injectable)(ConfigurationSource)
+], JsFileSource);
+exports.JsFileSource = JsFileSource;
+let JsonFileSource = class JsonFileSource extends BaseFileSource {
+    constructor() {
+        super(...arguments);
+        /**
+         * Default dirs to check for  configuration files
+         */
+        this.CONFIG_DIRS = DEFAULT_CONFIG_DIRS;
+    }
+    async Load() {
+        const common = this.load('!(*.dev|*.prod).json', _load);
+        if (process.env.NODE_ENV) {
+            if (process.env.NODE_ENV === "development") {
+                return _.merge(common, this.load("*.dev.json", _load));
+            }
+            else if (process.env.NODE_ENV === "production") {
+                return _.merge(common, this.load("*.prod.json", _load));
+            }
+        }
+        return common;
+        function _load(file) {
+            try {
+                log_1.Log.trace(`Found configuration file at ${file}`, "Configuration");
+                return JSON.parse(fs.readFileSync(file, "utf-8"));
+            }
+            catch (err) {
+                log_1.Log.error(err, `Config ${file} invalid !`, "Configuration");
+                return null;
+            }
+        }
+    }
+};
+JsonFileSource = __decorate([
+    (0, di_1.Injectable)(ConfigurationSource)
+], JsonFileSource);
+exports.JsonFileSource = JsonFileSource;
+//# sourceMappingURL=sources.js.map

package/lib/sources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -0,0 +1,46 @@
+import { AsyncModule } from '@spinajs/di';
+/**
+ * App version struct
+ */
+export interface IFrameworkVersion {
+    minor: number;
+    major: number;
+}
+export interface ConfigurationOptions {
+    /**
+     * application name, pass it when you run in application mode
+     */
+    app?: string;
+    /**
+     * configuration base dir, where to look for application configs
+     */
+    appBaseDir?: string;
+    /**
+     * custom cfg paths eg. to load config from non standard folders ( usefull in tests )
+     */
+    cfgCustomPaths?: string[];
+    /**
+     * Should watch for changes in config files
+     */
+    watchFileChanges?: boolean;
+}
+export declare abstract class Configuration extends AsyncModule {
+    /**
+     * Configuration base dir, where to look for app config
+     */
+    BaseDir: string;
+    /**
+     * Current running app name
+     */
+    RunApp: string;
+    /**
+     * Apps configuration base dir, where to look for app config
+     */
+    AppBaseDir: string;
+    /**
+     * Get config value for given property. Returns any if value is present, default value if provided or null when empty
+     *
+     * @param path - path to property eg. ["system","dirs"] or "system" or "system.dirs"
+     */
+    abstract get<T>(path: string[] | string, defaultValue?: T): T;
+}

package/lib/types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Configuration = void 0;
+const di_1 = require("@spinajs/di");
+class Configuration extends di_1.AsyncModule {
+}
+exports.Configuration = Configuration;
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAgC1C,MAAsB,aAAc,SAAQ,gBAAW;CAuBtD;AAvBD,sCAuBC"}

package/lib/util.d.ts

@@ -0,0 +1,5 @@
+export declare function parseArgv(param: string): string;
+export declare function findBasePath(path: string): string;
+export declare function merge(to: any, from: any): void;
+export declare function uncache(file: string): string;
+export declare function filterDirs(dir: string): boolean;

package/lib/util.js

@@ -0,0 +1,68 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterDirs = exports.uncache = exports.merge = exports.findBasePath = exports.parseArgv = void 0;
+const fs = __importStar(require("fs"));
+const _ = require("lodash");
+const path_1 = require("path");
+function parseArgv(param) {
+    const index = process.argv.indexOf(param);
+    if (index === -1 || process.argv.length <= index + 1) {
+        return undefined;
+    }
+    return process.argv[index + 1];
+}
+exports.parseArgv = parseArgv;
+function findBasePath(path) {
+    if (fs.existsSync((0, path_1.join)(path, 'node_modules'))) {
+        return path;
+    }
+    return findBasePath((0, path_1.resolve)(path, '..'));
+}
+exports.findBasePath = findBasePath;
+function merge(to, from) {
+    _.mergeWith(to, from, (src, dest) => {
+        if (_.isArray(src) && _.isArray(dest)) {
+            const tmp = src.concat(dest);
+            return _.uniqWith(tmp, _.isEqual);
+        }
+        else if (!src) {
+            return dest;
+        }
+    });
+    return to;
+}
+exports.merge = merge;
+// clean require cache config
+// http://stackoverflow.com/questions/9210542/node-js-require-cache-possible-to-invalidate
+function uncache(file) {
+    delete require.cache[file];
+    return file;
+}
+exports.uncache = uncache;
+function filterDirs(dir) {
+    if (fs.existsSync(dir)) {
+        return true;
+    }
+    return false;
+}
+exports.filterDirs = filterDirs;
+//# sourceMappingURL=util.js.map

package/lib/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,4BAA6B;AAC7B,+BAAqC;AAOrC,SAAgB,SAAS,CAAC,KAAa;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAE1C,IAAI,KAAK,KAAK,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,EAAE;QAClD,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AARD,8BAQC;AAED,SAAgB,YAAY,CAAC,IAAY;IACrC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;QAC3C,OAAO,IAAI,CAAC;KACf;IAED,OAAO,YAAY,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAND,oCAMC;AAED,SAAgB,KAAK,CAAC,EAAO,EAAE,IAAS;IACpC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7B,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SACrC;aAAM,IAAI,CAAC,GAAG,EAAE;YACb,OAAO,IAAI,CAAC;SACf;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,CAAC;AACd,CAAC;AAXD,sBAWC;AAGD,6BAA6B;AAC7B,0FAA0F;AAC1F,SAAgB,OAAO,CAAC,IAAY;IAChC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,IAAI,CAAC;AAChB,CAAC;AAHD,0BAGC;AAED,SAAgB,UAAU,CAAC,GAAW;IAClC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AALD,gCAKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/configuration",
-  "version": "1.0.12",
+  "version": "1.1.2",
   "description": "framework configuration module",
   "main": "lib/index.js",
   "private": false,
@@ -8,11 +8,12 @@
     "test": "ts-mocha -p tsconfig.json test/**/*.test.ts",
     "coverage": "nyc npm run test",
     "build-docs": "rimraf docs && typedoc --options typedoc.json src/",
-    "build": "tsc",
+    "build": "",
+    "build-watch": "tsc -w",
     "prepare": "npm run build",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "tslint -p tsconfig.json",
-    "prepublishOnly": "npm test && npm run lint",
+    
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"
@@ -20,6 +21,7 @@
   "files": [
     "lib/**/*"
   ],
+  "types": "lib",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/spinajs/configuration.git"
@@ -37,7 +39,9 @@
   },
   "homepage": "https://github.com/spinajs/configuration#readme",
   "dependencies": {
-    "@spinajs/di": "^1.0.16",
+    "@spinajs/di": "^1.1.7",
+    "@spinajs/exceptions": "^1.0.5",
+    "@spinajs/log": "^1.1.0",
     "glob": "^7.1.4",
     "lodash": "^4.17.14"
   },
@@ -45,23 +49,24 @@
     "@types/bunyan": "^1.8.6",
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
+    "@types/glob": "^7.2.0",
     "@types/lodash": "^4.14.136",
-    "@types/mocha": "^5.2.7",
-    "@types/sinon": "^7.0.13",
+    "@types/mocha": "^9.1.0",
+    "@types/sinon": "^10.0.8",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
-    "prettier": "^1.18.2",
-    "sinon": "^7.3.2",
-    "ts-mocha": "^6.0.0",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.20.1",
+    "mocha": "^9.2.0",
+    "nyc": "^15.1.0",
+    "prettier": "^2.5.1",
+    "sinon": "^12.0.1",
+    "ts-mocha": "^9.0.2",
+    "ts-node": "^10.4.0",
+    "tslint": "^6.1.3",
     "tslint-circular-dependencies": "^0.1.0",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-config-standard": "^8.0.1",
+    "tslint-config-standard": "^9.0.0",
     "tslint-no-unused-expression-chai": "^0.1.4",
-    "typedoc": "^0.14.2",
-    "typescript": "^3.7.3"
+    "typedoc": "^0.22.11",
+    "typescript": "^4.2.3"
   }
 }