@teqfw/di 0.20.0 → 0.20.1

package/RELEASE.md

@@ -1,5 +1,11 @@
 # @teqfw/di releases
 
+## 0.20.1
+
+* Changed regex for parameter extraction in the Spec Analyzer.
+* Removed leading namespace separator in the Resolver.
+* Added `teqfw.json` descriptor to add npm-package to DI container as a sources root in `teqfw/web`.
+
 ## 0.20.0
 
 * Fully redesigned package with simplified composition of objects in the container. Spec Analyzer is used instead of a
@@ -34,4 +40,4 @@
 * docs for plugin's teq-descriptor (see in `main` branch);
 * use object notation instead of array notation in namespace replacement statements of
   teq-descriptor (`@teqfw/di.replace` node format is changed in `./teqfw.json`);
-* array is used as a container for upline dependencies in [SpecProxy](./src/Shared/SpecProxy.mjs) (object was);
+* array is used as a container for upline dependencies in the 'SpecProxy' (object was);

package/dist/di.cjs.js

@@ -113,7 +113,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/**\n * Pre-processor handler to replace one object key with another.\n */\n\n/**\n * Factory function to create pre-processor handler.\n * @return {function(*): *}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__() {\n    // VARS\n    /**\n     * Storage for ES modules replacements (interface => implementation).\n     * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}\n     * @type {Object<string, string>}\n     */\n    const replacements = {};\n\n    // FUNCS\n    /**\n     * @param {TeqFw_Di_Api_ObjectKey} objectKey\n     * @param {TeqFw_Di_Api_ObjectKey} originalKey\n     * @return {TeqFw_Di_Api_ObjectKey}\n     * @namespace\n     */\n    function TeqFw_Di_PreProcessor_Replace(objectKey, originalKey) {\n        let module = objectKey.moduleName;\n        while (replacements[module]) module = replacements[module];\n        if (module !== objectKey.moduleName) {\n            const res = Object.assign({}, objectKey);\n            res.moduleName = module;\n            return res;\n        } else\n            return objectKey;\n    }\n\n    /**\n     * Add replacement for ES6 modules.\n     *\n     * @param {string} orig ('Vnd_Plug_Interface')\n     * @param {string} alter ('Vnd_Plug_Impl')\n     */\n    TeqFw_Di_PreProcessor_Replace.add = function (orig, alter) {\n        replacements[orig] = alter;\n    };\n\n    // MAIN\n    return TeqFw_Di_PreProcessor_Replace;\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/PreProcessor/Replace.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/**\n * Pre-processor handler to replace one object key with another.\n * @namespace TeqFw_Di_PreProcessor_Replace\n */\n\n/**\n * Factory function to create pre-processor handler.\n * @return {function(*): *}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__() {\n    // VARS\n    /**\n     * Storage for ES modules replacements (interface => implementation).\n     * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}\n     * @type {Object<string, string>}\n     */\n    const replacements = {};\n\n    // FUNCS\n    /**\n     * @param {TeqFw_Di_Api_ObjectKey} objectKey\n     * @param {TeqFw_Di_Api_ObjectKey} originalKey\n     * @return {TeqFw_Di_Api_ObjectKey}\n     */\n    function TeqFw_Di_PreProcessor_Replace(objectKey, originalKey) {\n        let module = objectKey.moduleName;\n        while (replacements[module]) module = replacements[module];\n        if (module !== objectKey.moduleName) {\n            const res = Object.assign({}, objectKey);\n            res.moduleName = module;\n            return res;\n        } else\n            return objectKey;\n    }\n\n    /**\n     * Add replacement for ES6 modules.\n     *\n     * @param {string} orig ('Vnd_Plug_Interface')\n     * @param {string} alter ('Vnd_Plug_Impl')\n     */\n    TeqFw_Di_PreProcessor_Replace.add = function (orig, alter) {\n        replacements[orig] = alter;\n    };\n\n    // MAIN\n    return TeqFw_Di_PreProcessor_Replace;\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/PreProcessor/Replace.js?");
 
 /***/ }),
 
@@ -124,7 +124,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* binding */ TeqFw_Di_Resolver)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * The Resolver should convert ES6 module name into the path to the sources (file path or URL).\n *\n * This is a base resolver that considers that:\n *  - module name is Zend1-compatible ('Vendor_Package_Module')\n *  - every namespace is bound to some real path ('Vendor_Package_' => '.../node_modules/@vendor/package/src/...)\n *  - every package has sources with the same extensions (*.js, *.mjs, *.es6, ...)\n *  - namespaces can be nested (App_Web_ => ./@app/web/..., App_Web_Api_ => ./@app/web_api/...)\n */\n\n\n// VARS\nconst KEY_EXT = 'ext';\nconst KEY_NS = 'ns';\nconst KEY_PATH = 'root';\n/**\n * Namespace parts separator.\n *\n * @type {string}\n */\nconst NSS = '_';\n\n// MAIN\nclass TeqFw_Di_Resolver {\n\n    constructor() {\n        // VARS\n        const _regNs = {};\n        let _namespaces = [];\n        let _ps = '/'; // web & unix path separator\n\n        // INSTANCE METHODS\n\n        this.addNamespaceRoot = function (ns, path, ext) {\n            _regNs[ns] = {\n                [KEY_EXT]: ext ?? _Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].EXT,\n                [KEY_NS]: ns,\n                [KEY_PATH]: path,\n            };\n            _namespaces = Object.keys(_regNs).sort((a, b) => b.localeCompare(a));\n        };\n\n        /**\n         * Convert the module name to the path of the source files .\n         * @param {string} moduleName 'Vendor_Package_Module'\n         * @return {string} '/home/user/app/node_modules/@vendor/package/src/Module.js'\n         */\n        this.resolve = function (moduleName) {\n            let root, ext, ns;\n            for (ns of _namespaces) {\n                if (moduleName.startsWith(ns)) {\n                    root = _regNs[ns][KEY_PATH];\n                    ext = _regNs[ns][KEY_EXT];\n                    break;\n                }\n            }\n            if (root && ext) {\n                const tail = moduleName.replace(ns, '');\n                const file = tail.replaceAll(NSS, _ps);\n                return `${root}${_ps}${file}.${ext}`;\n            } else return moduleName;\n        };\n    }\n};\n\n//# sourceURL=webpack://@teqfw/di/./src/Resolver.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* binding */ TeqFw_Di_Resolver)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * The Resolver should convert ES6 module name into the path to the sources (file path or URL).\n *\n * This is a base resolver that considers that:\n *  - module name is Zend1-compatible ('Vendor_Package_Module')\n *  - every namespace is bound to some real path ('Vendor_Package_' => '.../node_modules/@vendor/package/src/...)\n *  - every package has sources with the same extensions (*.js, *.mjs, *.es6, ...)\n *  - namespaces can be nested (App_Web_ => ./@app/web/..., App_Web_Api_ => ./@app/web_api/...)\n */\n\n\n// VARS\nconst KEY_EXT = 'ext';\nconst KEY_NS = 'ns';\nconst KEY_PATH = 'root';\n/**\n * Namespace parts separator.\n *\n * @type {string}\n */\nconst NSS = '_';\n\n// MAIN\nclass TeqFw_Di_Resolver {\n\n    constructor() {\n        // VARS\n        const _regNs = {};\n        let _namespaces = [];\n        let _ps = '/'; // web & unix path separator\n\n        // INSTANCE METHODS\n\n        this.addNamespaceRoot = function (ns, path, ext) {\n            _regNs[ns] = {\n                [KEY_EXT]: ext ?? _Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].EXT,\n                [KEY_NS]: ns,\n                [KEY_PATH]: path,\n            };\n            _namespaces = Object.keys(_regNs).sort((a, b) => b.localeCompare(a));\n        };\n\n        /**\n         * Convert the module name to the path of the source files .\n         * @param {string} moduleName 'Vendor_Package_Module'\n         * @return {string} '/home/user/app/node_modules/@vendor/package/src/Module.js'\n         */\n        this.resolve = function (moduleName) {\n            let root, ext, ns;\n            for (ns of _namespaces) {\n                if (moduleName.startsWith(ns)) {\n                    root = _regNs[ns][KEY_PATH];\n                    ext = _regNs[ns][KEY_EXT];\n                    break;\n                }\n            }\n            if (root && ext) {\n                let tail = moduleName.replace(ns, '');\n                if (tail.indexOf(NSS) === 0) tail = tail.replace(NSS, '');\n                const file = tail.replaceAll(NSS, _ps);\n                return `${root}${_ps}${file}.${ext}`;\n            } else return moduleName;\n        };\n    }\n};\n\n//# sourceURL=webpack://@teqfw/di/./src/Resolver.js?");
 
 /***/ }),
 
@@ -135,7 +135,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * This function analyzes specification of dependencies extracted from the text definition of the function itself.\n */\n\n\n// VARS\nconst FUNC = /function\\s*\\w*\\s*\\((\\s*\\{.+\\}\\s*)\\)/s;\nconst CLASS = /constructor\\s*\\((\\s*\\{.+\\}\\s*)\\)/s;\n\n// FUNCS\n\n/**\n * Internal function to analyze extracted parameters.\n *\n * @param {string} params\n * @return {string[]}\n * @private\n */\nfunction _analyze(params) {\n    const res = [];\n    // create wrapper for arguments and collect dependencies using Proxy\n    try {\n        const fn = new Function(params, 'return');\n        const spec = new Proxy({}, {\n            get: (target, prop) => res.push(prop),\n        });\n        // run wrapper and return dependencies\n        fn(spec);\n    } catch (e) {\n        const msg = `Cannot analyze the deps specification:${parts[1]}\\n`\n            + `\\nPlease, be sure that spec does not contain extra ')' in a comments.`\n            + `\\n\\nError: ${e}`;\n        throw new Error(msg);\n    }\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeClass(exp) {\n    const res = [];\n    // extract arguments from constructor\n    const def = exp.toString();\n    const parts = CLASS.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeFunc(exp) {\n    const res = [];\n    // extract arguments from factory function\n    const def = exp.toString();\n    const parts = FUNC.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n// MAIN\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(exp) {\n    if (typeof exp === 'function') {\n        if (_Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].isClass(exp)) {\n            return _analyzeClass(exp);\n        } else {\n            return _analyzeFunc(exp);\n        }\n    } else\n        return [];\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/SpecAnalyser.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * This function analyzes specification of dependencies extracted from the text definition of the function itself.\n */\n\n\n// VARS\nconst FUNC = /function\\s*\\w*\\s*\\(\\s*\\{([^\\}]*)\\}/s;\nconst CLASS = /constructor\\s*\\(\\s*\\{([^\\}]*)\\}/s;\n\n// FUNCS\n\n/**\n * Internal function to analyze extracted parameters.\n *\n * @param {string} params\n * @return {string[]}\n * @private\n */\nfunction _analyze(params) {\n    const res = [];\n    // create wrapper for arguments and collect dependencies using Proxy\n    try {\n        const fn = new Function(`{${params}}`, 'return');\n        const spec = new Proxy({}, {\n            get: (target, prop) => res.push(prop),\n        });\n        // run wrapper and return dependencies\n        fn(spec);\n    } catch (e) {\n        const msg = `Cannot analyze the deps specification:${params}\\n`\n            + `\\nPlease, be sure that spec does not contain extra ')' in a comments.`\n            + `\\n\\nError: ${e}`;\n        throw new Error(msg);\n    }\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeClass(exp) {\n    const res = [];\n    // extract arguments from constructor\n    const def = exp.toString();\n    const parts = CLASS.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeFunc(exp) {\n    const res = [];\n    // extract arguments from factory function\n    const def = exp.toString();\n    const parts = FUNC.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n// MAIN\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(exp) {\n    if (typeof exp === 'function') {\n        if (_Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].isClass(exp)) {\n            return _analyzeClass(exp);\n        } else {\n            return _analyzeFunc(exp);\n        }\n    } else\n        return [];\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/SpecAnalyser.js?");
 
 /***/ })
 

package/dist/di.esm.js

@@ -114,7 +114,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/**\n * Pre-processor handler to replace one object key with another.\n */\n\n/**\n * Factory function to create pre-processor handler.\n * @return {function(*): *}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__() {\n    // VARS\n    /**\n     * Storage for ES modules replacements (interface => implementation).\n     * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}\n     * @type {Object<string, string>}\n     */\n    const replacements = {};\n\n    // FUNCS\n    /**\n     * @param {TeqFw_Di_Api_ObjectKey} objectKey\n     * @param {TeqFw_Di_Api_ObjectKey} originalKey\n     * @return {TeqFw_Di_Api_ObjectKey}\n     * @namespace\n     */\n    function TeqFw_Di_PreProcessor_Replace(objectKey, originalKey) {\n        let module = objectKey.moduleName;\n        while (replacements[module]) module = replacements[module];\n        if (module !== objectKey.moduleName) {\n            const res = Object.assign({}, objectKey);\n            res.moduleName = module;\n            return res;\n        } else\n            return objectKey;\n    }\n\n    /**\n     * Add replacement for ES6 modules.\n     *\n     * @param {string} orig ('Vnd_Plug_Interface')\n     * @param {string} alter ('Vnd_Plug_Impl')\n     */\n    TeqFw_Di_PreProcessor_Replace.add = function (orig, alter) {\n        replacements[orig] = alter;\n    };\n\n    // MAIN\n    return TeqFw_Di_PreProcessor_Replace;\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/PreProcessor/Replace.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/**\n * Pre-processor handler to replace one object key with another.\n * @namespace TeqFw_Di_PreProcessor_Replace\n */\n\n/**\n * Factory function to create pre-processor handler.\n * @return {function(*): *}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__() {\n    // VARS\n    /**\n     * Storage for ES modules replacements (interface => implementation).\n     * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}\n     * @type {Object<string, string>}\n     */\n    const replacements = {};\n\n    // FUNCS\n    /**\n     * @param {TeqFw_Di_Api_ObjectKey} objectKey\n     * @param {TeqFw_Di_Api_ObjectKey} originalKey\n     * @return {TeqFw_Di_Api_ObjectKey}\n     */\n    function TeqFw_Di_PreProcessor_Replace(objectKey, originalKey) {\n        let module = objectKey.moduleName;\n        while (replacements[module]) module = replacements[module];\n        if (module !== objectKey.moduleName) {\n            const res = Object.assign({}, objectKey);\n            res.moduleName = module;\n            return res;\n        } else\n            return objectKey;\n    }\n\n    /**\n     * Add replacement for ES6 modules.\n     *\n     * @param {string} orig ('Vnd_Plug_Interface')\n     * @param {string} alter ('Vnd_Plug_Impl')\n     */\n    TeqFw_Di_PreProcessor_Replace.add = function (orig, alter) {\n        replacements[orig] = alter;\n    };\n\n    // MAIN\n    return TeqFw_Di_PreProcessor_Replace;\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/PreProcessor/Replace.js?");
 
 /***/ }),
 
@@ -125,7 +125,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* binding */ TeqFw_Di_Resolver)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * The Resolver should convert ES6 module name into the path to the sources (file path or URL).\n *\n * This is a base resolver that considers that:\n *  - module name is Zend1-compatible ('Vendor_Package_Module')\n *  - every namespace is bound to some real path ('Vendor_Package_' => '.../node_modules/@vendor/package/src/...)\n *  - every package has sources with the same extensions (*.js, *.mjs, *.es6, ...)\n *  - namespaces can be nested (App_Web_ => ./@app/web/..., App_Web_Api_ => ./@app/web_api/...)\n */\n\n\n// VARS\nconst KEY_EXT = 'ext';\nconst KEY_NS = 'ns';\nconst KEY_PATH = 'root';\n/**\n * Namespace parts separator.\n *\n * @type {string}\n */\nconst NSS = '_';\n\n// MAIN\nclass TeqFw_Di_Resolver {\n\n    constructor() {\n        // VARS\n        const _regNs = {};\n        let _namespaces = [];\n        let _ps = '/'; // web & unix path separator\n\n        // INSTANCE METHODS\n\n        this.addNamespaceRoot = function (ns, path, ext) {\n            _regNs[ns] = {\n                [KEY_EXT]: ext ?? _Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].EXT,\n                [KEY_NS]: ns,\n                [KEY_PATH]: path,\n            };\n            _namespaces = Object.keys(_regNs).sort((a, b) => b.localeCompare(a));\n        };\n\n        /**\n         * Convert the module name to the path of the source files .\n         * @param {string} moduleName 'Vendor_Package_Module'\n         * @return {string} '/home/user/app/node_modules/@vendor/package/src/Module.js'\n         */\n        this.resolve = function (moduleName) {\n            let root, ext, ns;\n            for (ns of _namespaces) {\n                if (moduleName.startsWith(ns)) {\n                    root = _regNs[ns][KEY_PATH];\n                    ext = _regNs[ns][KEY_EXT];\n                    break;\n                }\n            }\n            if (root && ext) {\n                const tail = moduleName.replace(ns, '');\n                const file = tail.replaceAll(NSS, _ps);\n                return `${root}${_ps}${file}.${ext}`;\n            } else return moduleName;\n        };\n    }\n};\n\n//# sourceURL=webpack://@teqfw/di/./src/Resolver.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* binding */ TeqFw_Di_Resolver)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * The Resolver should convert ES6 module name into the path to the sources (file path or URL).\n *\n * This is a base resolver that considers that:\n *  - module name is Zend1-compatible ('Vendor_Package_Module')\n *  - every namespace is bound to some real path ('Vendor_Package_' => '.../node_modules/@vendor/package/src/...)\n *  - every package has sources with the same extensions (*.js, *.mjs, *.es6, ...)\n *  - namespaces can be nested (App_Web_ => ./@app/web/..., App_Web_Api_ => ./@app/web_api/...)\n */\n\n\n// VARS\nconst KEY_EXT = 'ext';\nconst KEY_NS = 'ns';\nconst KEY_PATH = 'root';\n/**\n * Namespace parts separator.\n *\n * @type {string}\n */\nconst NSS = '_';\n\n// MAIN\nclass TeqFw_Di_Resolver {\n\n    constructor() {\n        // VARS\n        const _regNs = {};\n        let _namespaces = [];\n        let _ps = '/'; // web & unix path separator\n\n        // INSTANCE METHODS\n\n        this.addNamespaceRoot = function (ns, path, ext) {\n            _regNs[ns] = {\n                [KEY_EXT]: ext ?? _Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].EXT,\n                [KEY_NS]: ns,\n                [KEY_PATH]: path,\n            };\n            _namespaces = Object.keys(_regNs).sort((a, b) => b.localeCompare(a));\n        };\n\n        /**\n         * Convert the module name to the path of the source files .\n         * @param {string} moduleName 'Vendor_Package_Module'\n         * @return {string} '/home/user/app/node_modules/@vendor/package/src/Module.js'\n         */\n        this.resolve = function (moduleName) {\n            let root, ext, ns;\n            for (ns of _namespaces) {\n                if (moduleName.startsWith(ns)) {\n                    root = _regNs[ns][KEY_PATH];\n                    ext = _regNs[ns][KEY_EXT];\n                    break;\n                }\n            }\n            if (root && ext) {\n                let tail = moduleName.replace(ns, '');\n                if (tail.indexOf(NSS) === 0) tail = tail.replace(NSS, '');\n                const file = tail.replaceAll(NSS, _ps);\n                return `${root}${_ps}${file}.${ext}`;\n            } else return moduleName;\n        };\n    }\n};\n\n//# sourceURL=webpack://@teqfw/di/./src/Resolver.js?");
 
 /***/ }),
 
@@ -136,7 +136,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * This function analyzes specification of dependencies extracted from the text definition of the function itself.\n */\n\n\n// VARS\nconst FUNC = /function\\s*\\w*\\s*\\((\\s*\\{.+\\}\\s*)\\)/s;\nconst CLASS = /constructor\\s*\\((\\s*\\{.+\\}\\s*)\\)/s;\n\n// FUNCS\n\n/**\n * Internal function to analyze extracted parameters.\n *\n * @param {string} params\n * @return {string[]}\n * @private\n */\nfunction _analyze(params) {\n    const res = [];\n    // create wrapper for arguments and collect dependencies using Proxy\n    try {\n        const fn = new Function(params, 'return');\n        const spec = new Proxy({}, {\n            get: (target, prop) => res.push(prop),\n        });\n        // run wrapper and return dependencies\n        fn(spec);\n    } catch (e) {\n        const msg = `Cannot analyze the deps specification:${parts[1]}\\n`\n            + `\\nPlease, be sure that spec does not contain extra ')' in a comments.`\n            + `\\n\\nError: ${e}`;\n        throw new Error(msg);\n    }\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeClass(exp) {\n    const res = [];\n    // extract arguments from constructor\n    const def = exp.toString();\n    const parts = CLASS.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeFunc(exp) {\n    const res = [];\n    // extract arguments from factory function\n    const def = exp.toString();\n    const parts = FUNC.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n// MAIN\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(exp) {\n    if (typeof exp === 'function') {\n        if (_Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].isClass(exp)) {\n            return _analyzeClass(exp);\n        } else {\n            return _analyzeFunc(exp);\n        }\n    } else\n        return [];\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/SpecAnalyser.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   \"default\": () => (/* export default binding */ __WEBPACK_DEFAULT_EXPORT__)\n/* harmony export */ });\n/* harmony import */ var _Defs_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Defs.js */ \"./src/Defs.js\");\n/**\n * This function analyzes specification of dependencies extracted from the text definition of the function itself.\n */\n\n\n// VARS\nconst FUNC = /function\\s*\\w*\\s*\\(\\s*\\{([^\\}]*)\\}/s;\nconst CLASS = /constructor\\s*\\(\\s*\\{([^\\}]*)\\}/s;\n\n// FUNCS\n\n/**\n * Internal function to analyze extracted parameters.\n *\n * @param {string} params\n * @return {string[]}\n * @private\n */\nfunction _analyze(params) {\n    const res = [];\n    // create wrapper for arguments and collect dependencies using Proxy\n    try {\n        const fn = new Function(`{${params}}`, 'return');\n        const spec = new Proxy({}, {\n            get: (target, prop) => res.push(prop),\n        });\n        // run wrapper and return dependencies\n        fn(spec);\n    } catch (e) {\n        const msg = `Cannot analyze the deps specification:${params}\\n`\n            + `\\nPlease, be sure that spec does not contain extra ')' in a comments.`\n            + `\\n\\nError: ${e}`;\n        throw new Error(msg);\n    }\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeClass(exp) {\n    const res = [];\n    // extract arguments from constructor\n    const def = exp.toString();\n    const parts = CLASS.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\nfunction _analyzeFunc(exp) {\n    const res = [];\n    // extract arguments from factory function\n    const def = exp.toString();\n    const parts = FUNC.exec(def);\n    if (parts) {\n        res.push(..._analyze(parts[1]));\n    } // else: constructor does not have arguments\n    return res;\n}\n\n// MAIN\n/**\n * @param {Function|Object} exp\n * @return {string[]}\n */\n/* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(exp) {\n    if (typeof exp === 'function') {\n        if (_Defs_js__WEBPACK_IMPORTED_MODULE_0__[\"default\"].isClass(exp)) {\n            return _analyzeClass(exp);\n        } else {\n            return _analyzeFunc(exp);\n        }\n    } else\n        return [];\n}\n\n//# sourceURL=webpack://@teqfw/di/./src/SpecAnalyser.js?");
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teqfw/di",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "Dependency Injection container based on logical namespaces for ES6 modules.",
   "keywords": [
     "dependency injection",
@@ -30,6 +30,8 @@
     "build": "rm -fr ./dist/ && webpack build"
   },
   "devDependencies": {
+    "babel-eslint": "*",
+    "eslint": "*",
     "esm": "*",
     "mocha": "*",
     "webpack": "^5.88.1",

package/src/PreProcessor/Replace.js

@@ -1,5 +1,6 @@
 /**
  * Pre-processor handler to replace one object key with another.
+ * @namespace TeqFw_Di_PreProcessor_Replace
  */
 
 /**
@@ -20,7 +21,6 @@ export default function () {
      * @param {TeqFw_Di_Api_ObjectKey} objectKey
      * @param {TeqFw_Di_Api_ObjectKey} originalKey
      * @return {TeqFw_Di_Api_ObjectKey}
-     * @namespace
      */
     function TeqFw_Di_PreProcessor_Replace(objectKey, originalKey) {
         let module = objectKey.moduleName;

package/src/Resolver.js

@@ -55,7 +55,8 @@ export default class TeqFw_Di_Resolver {
                 }
             }
             if (root && ext) {
-                const tail = moduleName.replace(ns, '');
+                let tail = moduleName.replace(ns, '');
+                if (tail.indexOf(NSS) === 0) tail = tail.replace(NSS, '');
                 const file = tail.replaceAll(NSS, _ps);
                 return `${root}${_ps}${file}.${ext}`;
             } else return moduleName;

package/src/SpecAnalyser.js

@@ -4,8 +4,8 @@
 import Defs from './Defs.js';
 
 // VARS
-const FUNC = /function\s*\w*\s*\((\s*\{.+\}\s*)\)/s;
-const CLASS = /constructor\s*\((\s*\{.+\}\s*)\)/s;
+const FUNC = /function\s*\w*\s*\(\s*\{([^\}]*)\}/s;
+const CLASS = /constructor\s*\(\s*\{([^\}]*)\}/s;
 
 // FUNCS
 
@@ -20,14 +20,14 @@ function _analyze(params) {
     const res = [];
     // create wrapper for arguments and collect dependencies using Proxy
     try {
-        const fn = new Function(params, 'return');
+        const fn = new Function(`{${params}}`, 'return');
         const spec = new Proxy({}, {
             get: (target, prop) => res.push(prop),
         });
         // run wrapper and return dependencies
         fn(spec);
     } catch (e) {
-        const msg = `Cannot analyze the deps specification:${parts[1]}\n`
+        const msg = `Cannot analyze the deps specification:${params}\n`
             + `\nPlease, be sure that spec does not contain extra ')' in a comments.`
             + `\n\nError: ${e}`;
         throw new Error(msg);

package/teqfw.json

@@ -0,0 +1,9 @@
+{
+  "@teqfw/di": {
+    "autoload": {
+      "ns": "TeqFw_Di",
+      "path": "./src",
+      "ext": "js"
+    }
+  }
+}