@teqfw/di 0.20.0 → 0.21.0

package/src/Parser/Def.js

@@ -1,63 +0,0 @@
-/**
- * Default parser for object keys in format:
- *   - Vnd_Pkg_Prj_Mod$FA
- */
-import Dto from '../Api/ObjectKey.js';
-import Defs from '../Defs.js';
-
-// VARS
-/** @type {RegExp} expression for default object key (Ns_Module[.|#]export$[F|A][S|I]) */
-const REGEXP = /^((([A-Z])[A-Za-z0-9_]*)((#|\.)?([A-Za-z0-9]*)((\$)([F|A])?([S|I])?)?)?)$/;
-
-
-// MAIN
-/**
- * @param {string} objectKey
- * @return {TeqFw_Di_Api_ObjectKey}
- */
-export default function TeqFw_Di_Parser_Def(objectKey) {
-    const res = new Dto();
-    res.value = objectKey;
-    const parts = REGEXP.exec(objectKey);
-    if (parts) {
-        res.moduleName = parts[2];
-        if (parts[5] === '.') {
-            // App_Service.export...
-            if (parts[8] === '$') {
-                // App_Service.export$...
-                res.composition = Defs.COMPOSE_FACTORY;
-                res.exportName = parts[6];
-                res.life = (parts[10] === Defs.LIFE_INSTANCE)
-                    ? Defs.LIFE_INSTANCE : Defs.LIFE_SINGLETON;
-            } else {
-                res.composition = ((parts[8] === undefined) || (parts[8] === Defs.COMPOSE_AS_IS))
-                    ? Defs.COMPOSE_AS_IS : Defs.COMPOSE_FACTORY;
-                res.exportName = parts[6];
-                res.life = ((parts[8] === undefined) || (parts[10] === Defs.LIFE_SINGLETON))
-                    ? Defs.LIFE_SINGLETON : Defs.LIFE_INSTANCE;
-            }
-
-
-        } else if (parts[8] === '$') {
-            // App_Logger$FS
-            res.composition = ((parts[9] === undefined) || (parts[9] === Defs.COMPOSE_FACTORY))
-                ? Defs.COMPOSE_FACTORY : Defs.COMPOSE_AS_IS;
-            res.exportName = 'default';
-            if (parts[10]) {
-                res.life = (parts[10] === Defs.LIFE_SINGLETON) ? Defs.LIFE_SINGLETON : Defs.LIFE_INSTANCE;
-            } else {
-                res.life = (res.composition === Defs.COMPOSE_FACTORY) ? Defs.LIFE_SINGLETON : Defs.LIFE_INSTANCE;
-            }
-        } else {
-            // App_Service
-            res.composition = Defs.COMPOSE_AS_IS;
-            res.exportName = 'default';
-            res.life = Defs.LIFE_SINGLETON;
-        }
-    }
-
-    // we should always use singletons for as-is exports
-    if ((res.composition === Defs.COMPOSE_AS_IS) && (res.life === Defs.LIFE_INSTANCE))
-        throw new Error(`Export is not a function and should be used as a singleton only: '${res.value}'.`);
-    return res;
-}

package/src/Parser/Old.js

@@ -1,108 +0,0 @@
-/**
- * Parser for object keys in old format:
- *   - Vnd_Pkg_Prj_Mod[.|#]export$$
- */
-import Dto from '../Api/ObjectKey.js';
-import Defs from '../Defs.js';
-
-// 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 {string} new instance mark (Ns_Mod.export$$) */
-const INST = '$$';
-/** @type {RegExp} expression for logical namespace IDs (Ns_Module[.|#]export$$@@) */
-const REGEXP = /^((([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 = /^((([a-z])[A-Za-z0-9_]*)(\$\$)?)$/s;
-/** @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 = '$';
-
-// MAIN
-export default function TeqFw_Di_Parser_Old(objectKey) {
-    const res = new Dto();
-    res.value = objectKey;
-    const parts = REGEXP.exec(objectKey);
-    if (parts) {
-        res.moduleName = parts[2];
-        // Ns_Module.name$$[@@] - named instance [proxy]
-        if (
-            ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-            && ((parts[7] === INST) || (parts[7] === P_INST))
-        ) {
-            if (parts[7] === P_INST)
-                res.wrappers.push(Defs.WRAP_PROXY);
-            res.composition = Defs.COMPOSE_FACTORY;
-            res.life = Defs.LIFE_INSTANCE;
-            res.exportName = parts[6];
-        }
-        // Ns_Module.name$[@] - named singleton [proxy]
-        else if (
-            ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-            && ((parts[7] === SNGLT) || (parts[7] === P_SNGLT))
-        ) {
-            if (parts[7] === P_SNGLT)
-                res.wrappers.push(Defs.WRAP_PROXY);
-            res.composition = Defs.COMPOSE_FACTORY;
-            res.life = Defs.LIFE_SINGLETON;
-            res.exportName = parts[6];
-        }
-        // Ns_Module.name - named export
-        else if (
-            ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-            && ((parts[6] !== undefined) && (parts[6] !== ''))
-        ) {
-            res.composition = Defs.COMPOSE_AS_IS;
-            res.exportName = parts[6];
-            res.life = Defs.LIFE_SINGLETON;
-        }
-        // Ns_Module$$[@@]- default instance [proxy]
-        else if ((parts[4] === INST) || (parts[4] === P_INST)) {
-            if (parts[4] === P_INST)
-                res.wrappers.push(Defs.WRAP_PROXY);
-            res.composition = Defs.COMPOSE_FACTORY;
-            res.life = Defs.LIFE_INSTANCE;
-            res.exportName = DEF_EXP;
-        }
-        // Ns_Module$[@] - default singleton [proxy]
-        else if ((parts[4] === SNGLT) || (parts[4] === P_SNGLT)) {
-            if (parts[4] === P_SNGLT)
-                res.wrappers.push(Defs.WRAP_PROXY);
-            res.composition = Defs.COMPOSE_FACTORY;
-            res.life = Defs.LIFE_SINGLETON;
-            res.exportName = DEF_EXP;
-        }
-        // Ns_Module#[.] - default export
-        else if (
-            ((parts[5] === EXP) || (parts[5] === EXP_OLD))
-            && (parts[7] === undefined)
-        ) {
-            res.composition = Defs.COMPOSE_AS_IS;
-            res.life = Defs.LIFE_SINGLETON;
-            res.exportName = DEF_EXP;
-        } else {
-            // just a es6-module (deprecated)
-
-        }
-    } else {
-        const manual = MANUAL.exec(objectKey);
-        if (manual) {
-            if (manual[4] === '$$') {
-                res.composition = Defs.COMPOSE_FACTORY;
-                res.life = Defs.LIFE_INSTANCE;
-            } else {
-                res.life = Defs.LIFE_SINGLETON;
-            }
-        } else {
-            // TODO: add exception
-        }
-    }
-    return res;
-}

package/src/Parser.js

@@ -1,65 +0,0 @@
-/**
- * The root parser for `objectKeys` contains all other parsers.
- * It calls the other parser one by one to parse the object key as a structure.
- * Every npm package can have its own format for an `objectKey`.
- */
-import defaultParser from './Parser/Def.js';
-
-// VARS
-const KEY_PARSER = 'parser';
-const KEY_VALIDATOR = 'validator';
-
-// MAIN
-export default class TeqFw_Di_Parser {
-
-    constructor() {
-        // VARS
-        /**
-         * Default parsing function.
-         * @type {(function(string): TeqFw_Di_Api_ObjectKey)}
-         */
-        let _defaultParser = defaultParser;
-        /**
-         * The array of the pairs {validator, parser} to parse objectKeys.
-         * @type {Object<validator:function, parser:function>[]}
-         */
-        const _parsers = [];
-
-        // INSTANCE METHODS
-
-        /**
-         *
-         * @param {function(string):boolean} validator
-         * @param {function(string):TeqFw_Di_Api_ObjectKey} parser
-         */
-        this.addParser = function (validator, parser) {
-            _parsers.push({[KEY_VALIDATOR]: validator, [KEY_PARSER]: parser});
-        };
-
-        /**
-         * @param {string} objectKey
-         * @return {TeqFw_Di_Api_ObjectKey}
-         */
-        this.parse = function (objectKey) {
-            let res;
-            for (const one of _parsers) {
-                if (one[KEY_VALIDATOR](objectKey)) {
-                    res = one[KEY_PARSER](objectKey);
-                    break;
-                }
-            }
-            if (!res)
-                res = _defaultParser(objectKey);
-            return res;
-        };
-
-        /**
-         * @param {function(string):TeqFw_Di_Api_ObjectKey} parser
-         */
-        this.setDefaultParser = function (parser) {
-            _defaultParser = parser;
-        };
-
-        // MAIN
-    }
-};

package/src/PreProcessor/Replace.js

@@ -1,48 +0,0 @@
-/**
- * Pre-processor handler to replace one object key with another.
- */
-
-/**
- * Factory function to create pre-processor handler.
- * @return {function(*): *}
- */
-export default function () {
-    // VARS
-    /**
-     * Storage for ES modules replacements (interface => implementation).
-     * Sample: {['Vnd_Plug_Interface']:'Vnd_Plug_Impl', ...}
-     * @type {Object<string, string>}
-     */
-    const replacements = {};
-
-    // FUNCS
-    /**
-     * @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;
-        while (replacements[module]) module = replacements[module];
-        if (module !== objectKey.moduleName) {
-            const res = Object.assign({}, objectKey);
-            res.moduleName = module;
-            return res;
-        } else
-            return objectKey;
-    }
-
-    /**
-     * Add replacement for ES6 modules.
-     *
-     * @param {string} orig ('Vnd_Plug_Interface')
-     * @param {string} alter ('Vnd_Plug_Impl')
-     */
-    TeqFw_Di_PreProcessor_Replace.add = function (orig, alter) {
-        replacements[orig] = alter;
-    };
-
-    // MAIN
-    return TeqFw_Di_PreProcessor_Replace;
-}

package/src/PreProcessor.js

@@ -1,45 +0,0 @@
-/**
- * The preprocessor handles object keys after the parsing but before creating any objects.
- * A replacement rules can be implemented here.
- * Every handler is a function with 2 arguments:
- *  - objectKey: current key after processing with other handlers;
- *  - originalKey: the key before any processing;
- */
-export default class TeqFw_Di_PreProcessor {
-
-    constructor() {
-        // VARS
-        /**
-         * The array of handlers in the dependency order (from the basic (di) up to the app).
-         * @type {Array<function(TeqFw_Di_Api_ObjectKey, TeqFw_Di_Api_ObjectKey):TeqFw_Di_Api_ObjectKey>}
-         */
-        const _handlers = [];
-
-        // INSTANCE METHODS
-
-        /**
-         *
-         * @param {function(TeqFw_Di_Api_ObjectKey, TeqFw_Di_Api_ObjectKey):TeqFw_Di_Api_ObjectKey} hndl
-         */
-        this.addHandler = function (hndl) {
-            _handlers.push(hndl);
-        };
-
-        /**
-         * Get all pre-processing handlers.
-         * @return {Array<function(TeqFw_Di_Api_ObjectKey, TeqFw_Di_Api_ObjectKey): TeqFw_Di_Api_ObjectKey>}
-         */
-        this.getHandlers = () => _handlers;
-
-        /**
-         * @param {TeqFw_Di_Api_ObjectKey} objectKey
-         * @return {TeqFw_Di_Api_ObjectKey}
-         */
-        this.process = function (objectKey) {
-            let res = objectKey;
-            for (const one of _handlers)
-                res = one(res, objectKey);
-            return res;
-        };
-    }
-};

package/src/Spec/Parser.mjs

@@ -1,101 +0,0 @@
-/**
- * This is default parser that converts dependencies specification into array of depIds.
- * @namespace Spec.Parser
- */
-// IMPORTS
-
-// VARS
-const FN_ARW = /^.*\((\{[^}]*}|[^)]*)\)\s* =>.*$/s;
-const FN_CLASS = /class.*constructor.*\((.*)\).*/s;
-const FN_REG = /^function.*\((\{[^}]*}|[^)]*)\)\s*\{[^}]*}$/s;
-
-// FUNCS
-
-/**
- * Extract spec arguments from the class constructor '({...}=>{})
- * @param {string} spec
- * @return {null|string}
- */
-function specClass(spec) {
-    const parts = FN_CLASS.exec(spec);
-    if (parts?.[1]) {
-        return parts[1].replace('{', '')
-            .replace('}', '')
-            .replace(/\n/g, ' ');
-    }
-    return null;
-}
-
-/**
- * Extract spec arguments from the arrow '({...}=>{})
- * @param {string} spec
- * @return {null|string}
- */
-function specFnArrow(spec) {
-    const parts = FN_ARW.exec(spec);
-    if (parts?.[1]) {
-        return parts[1].replace('{', '')
-            .replace('}', '')
-            .replace(/\n/g, ' ');
-    }
-    return null;
-}
-
-/**
- * Extract spec arguments from the regular 'function({...})
- * @param {string} spec
- * @return {null|string}
- */
-function specFnRegular(spec) {
-    const parts = FN_REG.exec(spec);
-    if (parts?.[1]) {
-        return parts[1].replace('{', '')
-            .replace('}', '')
-            .replace(/\n/g, ' ');
-    }
-    return null;
-}
-
-function argsComplex(args) {
-    const res = [];
-    /** @type {string[]} */
-    const all = args.split(',');
-    for (const one of all) {
-        let arg = one.trim();
-        if (arg.includes('[')) {
-            // ['Vendor_App_Mod.arg1$$#adp']: arg1,
-            const norm = arg.replaceAll('\'', '')
-                .replaceAll('"', '')
-                .replace('[', '')
-                .replace(']', '');
-            const parts = norm.split(':');
-            res.push(parts[0]);
-        } else if (arg.includes(':')) {
-            // Vendor_App_Mod$$: arg1,
-            const parts = arg.split(':');
-            res.push(parts[0]);
-        } else if (arg.length) {
-            // Vendor_App_Mod$$
-            res.push(arg);
-        }
-    }
-    return res;
-}
-
-/**
- * @param {Object} factory
- * @return {string[]}
- */
-export default function (factory) {
-    const res = [];
-    if (typeof factory === 'function') {
-        const def = factory.toString();
-        let spec = specFnRegular(def);
-        if (spec) return argsComplex(spec);
-        spec = specFnArrow(def);
-        if (spec) return argsComplex(spec);
-        spec = specClass(def);
-        if (spec) return argsComplex(spec);
-    }
-    return res;
-}