@teqfw/di 0.12.0 → 0.20.0

package/src/Shared/Container.mjs

@@ -1,333 +0,0 @@
-/**
- * Dependency Injection container for Tequila Framework.
- *
- * @namespace TeqFw_Di_Shared_Container
- */
-// MODULE'S IMPORT
-/* don't import ES-modules with nodejs dependencies (will not work in browsers) */
-import DAutoload from './Api/Dto/Plugin/Desc/Autoload.mjs';
-import IdParser from './IdParser.mjs';
-import ModuleLoader from './ModuleLoader.mjs';
-import ParsedId from './IdParser/Dto.mjs';
-import Resolver from './Resolver.mjs';
-import SpecProxy from './SpecProxy.mjs';
-
-// MODULE'S VARS
-const $parser = new IdParser();
-
-// MODULE'S CLASSES
-/**
- *
- */
-export default class TeqFw_Di_Shared_Container {
-    /**
-     * @param {Object} [spec]
-     * @param {TeqFw_Di_Shared_Resolver} [spec.namespaceResolver] custom resolver to map module names to file paths
-     */
-    constructor(spec = {}) {
-        /** @type {TeqFw_Di_Shared_Resolver} Modules loader (given in constructor or empty one). */
-        const resolver = spec.namespaceResolver || new Resolver();
-        /** @type {TeqFw_Di_Shared_ModuleLoader} */
-        const moduleLoader = new ModuleLoader(resolver);
-        /**
-         * Storage for constructors (named or default exports of ES modules) to create new objects.
-         * Module name ('Vendor_Project_Module') is a key in the map.
-         */
-        const factories = new Map();
-        /**
-         * Storage for created instances (singletons).
-         * Module name ('Vendor_Project_Module') or singleton name ('dbConnection') is a key in the map.
-         */
-        const singletons = new Map();
-        /**
-         * Storage for ES modules replacements (interface => implementation).
-         * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}
-         * @type {Object<string, string>}
-         */
-        const replacements = {};
-
-        // set default instance of the DI container
-        singletons.set('container', this); // as singleton
-        singletons.set('TeqFw_Di_Shared_Container', this); // as singleton of the class
-
-        // pin itself for nested functions
-        const me = this;
-
-        /**
-         * Internal function to get/create object|function|class|module by given `id`.
-         *
-         * @param {string} mainId main object ID (singleton, module, new object, default export singleton)
-         * @param {string[]} uplineDeps dependencies registry to prevent circular loop.
-         * @returns {Promise<*>}
-         */
-        async function getObject(mainId, uplineDeps) {
-
-            // FUNCS
-            /**
-             * Add 'spec' proxy as fnConstruct argument and create new object and all deps.
-             *
-             * @param {Function|Object} fnConstruct
-             * @returns {Promise<*>} created object
-             * @private
-             */
-            function _useFactory(fnConstruct) {
-                // This promise will be resolved after all dependencies in spec proxy will be created.
-                return new Promise(function (resolve, reject) {
-                    // MAIN
-                    const constructorType = typeof fnConstruct;
-                    if (constructorType === 'object') {
-                        // `constructor` is an object, clone this fnConstruct and return cloned object
-                        const objClone = Object.assign({}, fnConstruct);
-                        resolve(objClone);
-                    } else if (constructorType === 'function') {
-                        // `constructor` is simple function or class
-
-                        /**
-                         * Create new function to resolve all deps and to create requested object.
-                         * This function will be called from spec proxy for every failed dependency.
-                         */
-                        const fnCreate = function () {
-                            try {
-                                // https://stackoverflow.com/a/29094018/4073821
-                                const proto = Object.getOwnPropertyDescriptor(fnConstruct, 'prototype');
-                                const isClass = proto && !proto.writable;
-                                const instNew = (isClass) ? new fnConstruct(spec) : fnConstruct(spec);
-                                // code line below will be inaccessible until all deps will be created in `spec`
-                                // SpecProxy.EXCEPTION_TO_STEALTH will be thrown for every missed dep in `spec`
-                                if (instNew instanceof Promise) {
-                                    instNew
-                                        .then((asyncInst) => {
-                                                resolve(asyncInst)
-                                            }
-                                        ).catch((e) => {
-                                            // SpecProxy rejects `_useFactory` promise on any error
-                                            if (e === SpecProxy.EXCEPTION_TO_STEALTH) {
-                                                // stealth constructor exceptions to prevent execution interrupt on missed dependency
-                                            } else {
-                                                throw e;
-                                            }
-                                        }
-                                    );
-                                } else {
-                                    resolve(instNew);
-                                }
-                            } catch (e) {
-                                // SpecProxy rejects `_useFactory` promise on any error
-                                if (e === SpecProxy.EXCEPTION_TO_STEALTH) {
-                                    // stealth constructor exceptions to prevent execution interrupt on missed dependency
-                                } else {
-                                    throw e;
-                                }
-                            }
-                        };
-                        // create spec proxy to analyze dependencies of the constructing object in current scope
-                        const spec = new SpecProxy(mainId, uplineDeps, singletons, fnCreate, getObject, reject);
-                        // try to create object and start chain of deps resolving in SpecProxy
-                        fnCreate();
-                    } else {
-                        throw new Error(`Unexpected type of factory function for '${mainId}'.`);
-                    }
-                    // `resolve` for this promise is called from fnCreate
-                    // (fnCreate is recalled from spec proxy on every dep failure)
-                });
-            }
-
-            /**
-             * Lookup for requested dependency in internal storages or create new one if dependency constructor
-             * is available.
-             * @param {TeqFw_Di_Shared_IdParser_Dto} parsed
-             * @returns {*}
-             */
-            async function getFromStorages(parsed) {
-                let result;
-                // get required instance from own registries or load sources and create new one
-                if ((parsed.typeTarget === ParsedId.TYPE_TARGET_SINGLETON) && (singletons.get(parsed.mapKey) !== undefined)) {
-                    // singleton was created before, just return it
-                    result = singletons.get(parsed.mapKey);
-                } else if ((parsed.typeTarget === ParsedId.TYPE_TARGET_FACTORY) && (factories.get(parsed.mapKey) !== undefined)) {
-                    // factory with required `id` was loaded before, create & return new object
-                    const factory = factories.get(parsed.mapKey);
-                    result = await _useFactory(factory);
-                }
-                return result;
-            }
-
-            /**
-             * Replace original ES6 module name (interface) with it's alternative (implementation).
-             * @param {string} orig
-             * @return {string}
-             */
-            function checkReplacements(orig) {
-                while (replacements[orig]) orig = replacements[orig];
-                return orig;
-            }
-
-            // MAIN
-            let result;
-            /** @type {TeqFw_Di_Shared_IdParser_Dto} */
-            const parsed = $parser.parse(mainId);
-            parsed.nameModule = checkReplacements(parsed.nameModule);
-            // try to find requested dependency in local storages
-            if (!parsed.isProxy) result = await getFromStorages(parsed);
-            // if not found then try to load sources and create new one
-            if (result === undefined) {
-                // Sources for requested dependency are not imported or not set manually before.
-                // Get ES6 module from loader.
-                const moduleId = (parsed.typeId === ParsedId.TYPE_ID_FILEPATH) ?
-                    parsed.namePackage + '!' + parsed.nameModule :
-                    parsed.nameModule;
-                const module = await moduleLoader.getModule(moduleId);
-                if (parsed.typeTarget === ParsedId.TYPE_TARGET_MODULE) {
-                    // result as ES6 module
-                    result = module;
-                } else if (parsed.typeTarget === ParsedId.TYPE_TARGET_EXPORT) {
-                    // result as ES6 module export
-                    result = module[parsed.nameExport];
-                } else {
-                    // create new object (singleton or instance) using factory
-                    if (parsed.isProxy) {
-                        // we need to create proxy to resolve deps for the object later
-                        const depId = parsed.orig.replace(/@/gi, '$');
-                        result = new Proxy({dep: undefined, depId}, {
-                            get: async function (base, name) {
-                                if (name === 'create') base.dep = await me.get(base.depId);
-                                return base.dep;
-                            }
-                        });
-                    } else {
-                        // we need use module export as factory for new object or singleton for the first time
-                        const factory = module[parsed.nameExport];
-                        factories.set(parsed.mapKey, factory);
-                        const object = await _useFactory(factory);
-                        // save singleton object in container storage
-                        if (parsed.typeTarget === ParsedId.TYPE_TARGET_SINGLETON) singletons.set(parsed.mapKey, object);
-                        result = object;
-                    }
-                }
-            }
-            return result;
-        }
-
-        /**
-         * Add replacement for ES6 modules.
-         *
-         * @param {string} orig ('Vnd_Plug_Interface')
-         * @param {string} alter ('Vnd_Plug_Impl')
-         */
-        this.addModuleReplacement = function (orig, alter) {
-            replacements[orig] = alter;
-        }
-
-        /**
-         *
-         * @param {string} namespace
-         * @param {string} path
-         * @param {boolean} [is_absolute]
-         * @param {string} [ext]
-         */
-        this.addSourceMapping = function (namespace, path, is_absolute = false, ext = 'mjs') {
-            let parsed = $parser.parseLogicalNsId(namespace);
-            if (!parsed) parsed = $parser.parseFilepathId(namespace);
-            if (
-                (parsed.typeTarget !== ParsedId.TYPE_TARGET_MODULE) &&
-                (parsed.typeTarget !== ParsedId.TYPE_TARGET_PACKAGE)
-            )
-                throw new Error('Namespace cannot contain \'$\' symbol.');
-            const details = new DAutoload();
-            Object.assign(details, {ns: namespace, path, ext, isAbsolute: is_absolute});
-            resolver.addNamespaceRoot(details);
-        };
-
-        /**
-         * Delete stored instance or import result (factory function or object) by `id` (if exist).
-         *
-         * @param {string} depId
-         */
-        this.delete = function (depId) {
-            const parsed = $parser.parse(depId);
-            if (parsed.typeTarget === ParsedId.TYPE_TARGET_SINGLETON) {
-                singletons.delete(parsed.mapKey);
-            } else if (parsed.typeTarget === ParsedId.TYPE_TARGET_FACTORY) {
-                factories.delete(parsed.mapKey);
-            } else {
-                const errMsg = `Dependency ID is not manually inserted factory or singleton: ${depId}. `
-                    + 'See \'https://github.com/teqfw/di/blob/master/docs/identifiers.md\'.';
-                throw new Error(errMsg);
-            }
-        };
-
-        /**
-         * Get/create object|function|class|module by dependency ID (wrapper for internal function).
-         *
-         * @param {string} depId 'namedDep', 'Vendor_Module', 'New_Object_From_Default$', 'Singleton_From_Default$$'
-         * @param {String} context ID of the main object for whom container retrieves the dependency (TODO)
-         * @returns {Promise<*>}
-         *
-         * TODO: we can use context to get significant info from requester (requester depId or prepared deps
-         * TODO: /bootstrap path, for example/).
-         */
-        this.get = async function (depId, context = null) {
-            return await getObject(depId, []);
-        };
-
-        /**
-         * @returns {TeqFw_Di_Shared_Resolver}
-         */
-        this.getNsResolver = function () {
-            return resolver;
-        };
-        /**
-         * Check existence of created instance or imported data in container.
-         *
-         * @param {string} depId
-         * @returns {boolean}
-         */
-        this.has = function (depId) {
-            const parsed = $parser.parse(depId);
-            if (parsed.typeTarget === ParsedId.TYPE_TARGET_SINGLETON) {
-                return singletons.has(parsed.mapKey);
-            } else if (parsed.typeTarget === ParsedId.TYPE_TARGET_FACTORY) {
-                return factories.has(parsed.mapKey);
-            } else {
-                const errMsg = `Dependency ID is not manually inserted factory or singleton: ${depId}. `
-                    + 'See \'https://github.com/teqfw/di/blob/master/docs/identifiers.md\'.';
-                throw new Error(errMsg);
-            }
-        };
-
-        /**
-         * Get list of contained dependencies (created instances and loaded modules).
-         * @returns {{constructors: string[], singletons: string[], modules: string[]}}
-         */
-        this.list = function () {
-            const sItems = Array.from(singletons.keys()).sort();
-            const fItems = Array.from(factories.keys()).sort();
-            return {singletons: sItems, constructors: fItems};
-        };
-
-        /**
-         * Place object into the container. Replace existing instance with the same ID.
-         *
-         * 'object' should correlate with 'depId':
-         *  - singleton ('namedDep'): any object will be stored as singleton;
-         *  - ES module ('Vendor_Module'): will be stored as ES module;
-         *  - constructor ('New_Object_From_Default$'): will be stored as object constructor with key 'New_Object_From_Default';
-         *  - instance ('Singleton_From_Default$$'): will be stored as singleton with key 'Singleton_From_Default';
-         *
-         * @param {string} depId 'namedDep', 'Vendor_Module', 'New_Object_From_Default$', 'Singleton_From_Default$$'.
-         * @param {Object} object
-         */
-        this.set = function (depId, object) {
-            const parsed = $parser.parse(depId);
-            if (parsed.typeTarget === ParsedId.TYPE_TARGET_SINGLETON) {
-                singletons.set(parsed.mapKey, object);
-            } else if (parsed.typeTarget === ParsedId.TYPE_TARGET_FACTORY) {
-                factories.set(parsed.mapKey, object);
-            } else {
-                const errMsg = `Dependency ID is not valid for factory or singleton: ${depId}. `
-                    + 'See \'https://github.com/teqfw/di/blob/master/docs/identifiers.md\'.';
-                throw new Error(errMsg);
-            }
-        };
-    }
-}

package/src/Shared/IdParser/Dto.mjs

@@ -1,96 +0,0 @@
-/**
- * Data transfer object to store parsing results of identifiers for imports and injects:
- *
- * Manually inserted into dependency injection container:
- *  - 'namedSingleton': singleton object stored in container (dependency injection);
- *  - 'namedFactory$$': create new object using stored factory (dependency injection);
- *
- * Filepath based identifiers for dynamic imports and dependency injection:
- *  - '@vendor/package!module': load and get ES module using Filepath Namespaces (dynamic import);
- *  - '@vendor/package!module#': load ES module and get default export (dynamic import);
- *  - '@vendor/package!module$': load ES module, create new object from default export and use as singleton;
- *  - '@vendor/package!module$$': load ES module and use default export as factory for new objects;
- *  - '@vendor/package!module#export': load ES module and get named export;
- *  - '@vendor/package!module#export$': load ES module, create new object from named export and use as singleton;
- *  - '@vendor/package!module#export$$': load ES module and use named export as factory for new objects;
-
- * Logical namespaces identifiers for dependency injection and dynamic imports:
- *  - 'Ns_Module': load and get ES module using Logical Namespaces (dynamic import);
- *  - 'Ns_Module#': load ES module and get default export (dynamic import);
- *  - 'Ns_Module$': load ES module, create new object from default export and use as singleton;
- *  - 'Ns_Module$$': load ES module and use default export as factory for new objects;
- *  - 'Ns_Module#export': load ES module and get named export;
- *  - 'Ns_Module#export$': load ES module, create new object from named export and use as singleton;
- *  - 'Ns_Module#export$$': load ES module and use named export as factory for new objects;
- *
- *  @see https://github.com/teqfw/di/blob/master/docs/identifiers.md
- */
-// MODULE'S CLASSES
-/**
- * Structure to store parsing results of identifiers for imports and injects.
- */
-export default class TeqFw_Di_Shared_IdParser_Dto {
-    /**
-     * 'true' if dependency should be a proxy.
-     * @type {boolean}
-     */
-    isProxy;
-    /**
-     * Key to map object in container's store (singletons, constructors, modules) - original id w/o '$' chars.
-     * @type {string}
-     */
-    mapKey;
-    /**
-     * Name of an export in the ES6-module (export default fn() {}).
-     * @type {string}
-     */
-    nameExport;
-    /**
-     * Module name: 'module', 'Ns_Module'.
-     * @type {string}
-     */
-    nameModule;
-    /**
-     * Package name: '@vendor/package'.
-     * @type {string}
-     */
-    namePackage;
-    /**
-     * Original identifier: namedSingleton, namedConstructor$$, @vendor/package!module#export$$, Ns_Module#export$$.
-     * @type {string}
-     */
-    orig;
-    /**
-     * type of ID (manual, filepath based, logical namespace; see TYPE_ID_...).
-     * @type {symbol}
-     */
-    typeId;
-    /**
-     * Type of target object identified by ID (package, module, export, factory, singleton).
-     * @type {symbol}
-     */
-    typeTarget;
-}
-
-// ES2015 (ES6) 'static' is not compatible with Safari, so add as class props
-/**  @type {symbol} marker for filepath based IDs (@vendor/package!module#exportName$$) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_ID_FILEPATH = Symbol('TYPE_ID_FILEPATH');
-/**  @type {symbol} marker for logical namespace IDs (Ns_Module#exportName$$) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_ID_LOGICAL = Symbol('TYPE_ID_LOGICAL');
-/**  @type {symbol} marker for IDs for manually inserted objects into DI container (singleton, factory$$) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_ID_MANUAL = Symbol('TYPE_ID_MANUAL');
-/**  @type {symbol} marker for export targets (@vendor/package!module#exportName) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_TARGET_EXPORT = Symbol('TYPE_TARGET_EXPORT');
-/**  @type {symbol} marker for factory targets (@vendor/package!module#exportName$$) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_TARGET_FACTORY = Symbol('TYPE_TARGET_FACTORY');
-/**  @type {symbol} marker for module targets (@vendor/package!module) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_TARGET_MODULE = Symbol('TYPE_TARGET_MODULE');
-/**  @type {symbol} marker for package targets (@vendor/package! - RESERVED, NOT USED) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_TARGET_PACKAGE = Symbol('TYPE_TARGET_PACKAGE');
-/**  @type {symbol} marker for singleton targets (@vendor/package!module#exportName$) */
-TeqFw_Di_Shared_IdParser_Dto.TYPE_TARGET_SINGLETON = Symbol('TYPE_TARGET_SINGLETON');
-
-// This DTO does not contain Factory class because it is used internally.
-
-// freeze class to deny attributes changes
-Object.freeze(TeqFw_Di_Shared_IdParser_Dto);

package/src/Shared/IdParser.mjs

@@ -1,187 +0,0 @@
-// MODULE'S IMPORT
-import ParsedId from './IdParser/Dto.mjs';
-
-// MODULE'S VARS
-/** @type {string} default export keyword */
-const DEF_EXP = 'default';
-/** @type {string} logical namespace export mark (Ns_Mod.export) */
-const EXP = '.';
-/** @type {string} filesystem export mark (@vendor/package!module#export$$) and old logical export mark */
-const EXP_OLD = '#';
-/** @type {RegExp} expression for filepath based IDs (@vendor/package!module#export$$) */
-const FILEPATH_ID = /^((([a-z@])([A-Za-z0-9_\-/@]*))(!([A-Za-z0-9_\-/@]*)?((#)?([A-Za-z0-9_]*)(\${1,2})?)?)?)$/;
-/** @type {string} filesystem module mark (@vendor/package!module#export$$) */
-const FSM = '!';
-/** @type {string} new instance mark (Ns_Mod.export$$) */
-const INST = '$$';
-/** @type {RegExp} expression for logical namespace IDs (Ns_Module#export$$) */
-const LOGICAL_NS_ID = /^((([A-Z])[A-Za-z0-9_]*)((#|.)?([A-Za-z0-9_]*)(\${1,2}|@{1,2})?)?)$/;
-/** @type {RegExp} expression for objects that manually added to DI container (singleton, namedFactory$$)  */
-const MANUAL_DI_ID = /^((([a-z])[A-Za-z0-9_]*)(\$\$)?)$/;
-/** @type {string} new instance proxy mark (Ns_Mod.export@@) */
-const P_INST = '@@';
-/** @type {string} singleton proxy mark (Ns_Mod.export@) */
-const P_SNGLT = '@';
-/** @type {string} singleton mark (Ns_Mod.export$) */
-const SNGLT = '$';
-
-// MODULE'S CLASSES
-/**
- * Dependency identifiers parser.
- */
-export default class TeqFw_Di_Shared_IdParser {
-    /**
-     * Validate dependency identifier, parse and return parts of the identifier.
-     *
-     * @param {string} id Dependency identifier to validate and parse.
-     * @returns {TeqFw_Di_Shared_IdParser_Dto} Parsed data for given ID.
-     * @throws {Error} if `id` is not valid.
-     */
-    parse(id) {
-        let result = this.parseManualDiId(id);
-        if (!result) result = this.parseLogicalNsId(id);
-        if (!result) result = this.parseFilepathId(id);
-        if (!result)
-            throw new Error(`Invalid identifier: '${id}'. See 'https://github.com/teqfw/di/blob/master/docs/identifiers.md'.`);
-        return result;
-    }
-
-    /**
-     * Parse filepath based identifiers (@vendor/package!module#exportedFactory$$).
-     * @param {string} id
-     * @returns {null|TeqFw_Di_Shared_IdParser_Dto}
-     */
-    parseFilepathId(id) {
-        let result = null;
-        const parts = FILEPATH_ID.exec(id);
-        if (parts) {
-            result = new ParsedId();
-            result.orig = id;
-            result.typeId = ParsedId.TYPE_ID_FILEPATH;
-            result.namePackage = parts[2];
-            if (!parts[6]) {
-                result.typeTarget = ParsedId.TYPE_TARGET_PACKAGE;
-            } else {
-                result.nameModule = parts[6];
-                result.mapKey = parts[1];
-                result.typeTarget = ParsedId.TYPE_TARGET_MODULE;
-                if (parts[8] === EXP_OLD) {
-                    result.nameExport = DEF_EXP;
-                    result.typeTarget = ParsedId.TYPE_TARGET_EXPORT;
-                    result.mapKey = undefined;
-                }
-                if (parts[9]) {
-                    result.nameExport = parts[9];
-                    result.typeTarget = ParsedId.TYPE_TARGET_EXPORT;
-                    result.mapKey = undefined;
-                }
-                if (parts[10]) {
-                    if (parts[10] === INST) {
-                        result.typeTarget = ParsedId.TYPE_TARGET_FACTORY;
-                    } else if (parts[10] === SNGLT) {
-                        result.typeTarget = ParsedId.TYPE_TARGET_SINGLETON;
-                    }
-                    if (result.nameExport === undefined) {
-                        result.nameExport = DEF_EXP;
-                        result.mapKey = result.namePackage + FSM + result.nameModule;
-                    } else {
-                        result.mapKey = result.namePackage + FSM + result.nameModule + EXP_OLD + result.nameExport;
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Parse logical namespaces identifiers (Ns_Module#exportedFactory$$).
-     * @param {string} id
-     * @returns {null|TeqFw_Di_Shared_IdParser_Dto}
-     */
-    parseLogicalNsId(id) {
-        let result = null;
-        const parts = LOGICAL_NS_ID.exec(id);
-        if (parts) {
-            result = new ParsedId();
-            result.orig = id;
-            result.typeId = ParsedId.TYPE_ID_LOGICAL;
-            result.nameModule = parts[2];
-            result.isProxy = false;
-            result.mapKey = result.nameModule; // init mapKey with module's name
-            result.typeTarget = ParsedId.TYPE_TARGET_MODULE;
-            // Ns_Module.name$$[@@] - named instance [proxy]
-            if (
-                ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-                && ((parts[7] === INST) || (parts[7] === P_INST))
-            ) {
-                result.isProxy = (parts[7] === P_INST);
-                result.nameExport = parts[6];
-                result.typeTarget = ParsedId.TYPE_TARGET_FACTORY;
-                result.mapKey = result.nameModule + EXP + result.nameExport;
-            }
-            // Ns_Module.name$[@] - named singleton [proxy]
-            else if (
-                ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-                && ((parts[7] === SNGLT) || (parts[7] === P_SNGLT))
-            ) {
-                result.isProxy = (parts[7] === P_SNGLT);
-                result.nameExport = parts[6];
-                result.typeTarget = ParsedId.TYPE_TARGET_SINGLETON;
-                result.mapKey = result.nameModule + EXP + result.nameExport;
-            }
-            // Ns_Module.name - named export
-            else if (
-                ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-                && ((parts[6] !== undefined) && (parts[6] !== ''))
-            ) {
-                result.nameExport = parts[6];
-                result.typeTarget = ParsedId.TYPE_TARGET_EXPORT;
-                result.mapKey = undefined;
-            }
-            // Ns_Module$$[@@]- default instance [proxy]
-            else if ((parts[4] === INST) || (parts[4] === P_INST)) {
-                result.isProxy = (parts[4] === P_INST);
-                result.nameExport = DEF_EXP;
-                result.typeTarget = ParsedId.TYPE_TARGET_FACTORY;
-            }
-            // Ns_Module$[@] - default singleton [proxy]
-            else if ((parts[4] === SNGLT) || (parts[4] === P_SNGLT)) {
-                result.isProxy = (parts[4] === P_SNGLT);
-                result.nameExport = DEF_EXP;
-                result.typeTarget = ParsedId.TYPE_TARGET_SINGLETON;
-            }
-            // Ns_Module#[.] - default export
-            else if (
-                ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-                && (parts[7] === undefined)
-            ) {
-                result.nameExport = DEF_EXP;
-                result.typeTarget = ParsedId.TYPE_TARGET_EXPORT;
-                result.mapKey = undefined;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Parse manually inserted identifiers (singleton, factory$$).
-     * @param {string} id
-     * @returns {null|TeqFw_Di_Shared_IdParser_Dto}
-     */
-    parseManualDiId(id) {
-        let result = null;
-        const parts = MANUAL_DI_ID.exec(id);
-        if (parts) {
-            result = new ParsedId();
-            result.orig = id;
-            result.typeId = ParsedId.TYPE_ID_MANUAL;
-            result.mapKey = parts[2];
-            if (parts[4] === '$$') {
-                result.typeTarget = ParsedId.TYPE_TARGET_FACTORY;
-            } else {
-                result.typeTarget = ParsedId.TYPE_TARGET_SINGLETON;
-            }
-        }
-        return result;
-    }
-}

package/src/Shared/ModuleLoader.mjs

@@ -1,38 +0,0 @@
-// MODULE'S CLASSES
-/**
- * Load ES6 module sources and save it to internal registry.
- */
-export default class TeqFw_Di_Shared_ModuleLoader {
-    /** @type {TeqFw_Di_Shared_Resolver} */
-    resolver
-
-    /**
-     * @param {TeqFw_Di_Shared_Resolver} resolver
-     */
-    constructor(resolver) {
-        this.resolver = resolver;
-        /**
-         * Storage for loaded modules.
-         * Module name ('Vendor_Project_Module') is a key in the map.
-         */
-        const _modules = new Map();
-
-        this.getModule = async function (moduleId) {
-            let result, sourceFile;
-            if (_modules[moduleId]) {
-                result = _modules[moduleId];
-            } else {
-                try {
-                    sourceFile = this.resolver.resolveModuleId(moduleId);
-                    result = await import(sourceFile);
-                    _modules.set(moduleId, result);
-                } catch (e) {
-                    let msg = `Cannot load source file '${sourceFile}' (module id: ${moduleId}).`;
-                    if (e.message) msg = `${msg} Error: ${e.message}`;
-                    throw new Error(msg);
-                }
-            }
-            return result;
-        };
-    }
-}

package/src/Shared/README.md

@@ -1 +0,0 @@
-This code can be used in browsers and nodejs apps.