@teqfw/di 0.32.0 → 0.34.0

package/RELEASE.md

@@ -1,5 +1,22 @@
 # @teqfw/di releases
 
+## 0.34.0 – Strict Mode and Test Support
+
+- Removed outdated interface `TeqFw_Di_Api_Container` and associated documentation.
+- Unified the `get()` and `compose()` methods for dependency retrieval.
+- Introduced strict mode by default: manual registration of dependencies is now **disabled** unless explicitly allowed.
+- Added `enableTestMode()` method to the container, enabling safe, test-specific manual registration of singleton
+  dependencies.
+- Improved error messages and safeguards against accidental overwrites in `register()`.
+- Updated internal naming and documentation for better clarity and alignment with the platform's principles.
+- Cleaned up ESLint and JSDoc inconsistencies in internal files.
+
+## 0.33.0 – Cleanup and Enhancements
+
+- Removed deprecated documentation.
+- Updated ESLint rules for consistency with current platform practices.
+- Introduced `#` as a separator (in addition to `.`) between namespace and export names.
+
 ## 0.32.0 - added support for the `node:` prefix
 
 - **Added ability** to manually register objects in the container (`register`).
@@ -78,6 +95,6 @@
 ## 0.8.0
 
 * 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`);
+* 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 the 'SpecProxy' (object was);

package/bin/release/clean.sh

@@ -9,5 +9,6 @@ rm -fr "${DIR_ROOT}/doc/"
 rm -fr "${DIR_ROOT}/docs/"
 rm -fr "${DIR_ROOT}/example/"
 rm -fr "${DIR_ROOT}/node_modules/"
+rm -fr "${DIR_ROOT}/package-lock.json"
 rm -fr "${DIR_ROOT}/test/"
 rm -fr "${DIR_ROOT}/tmp/"

package/dist/esm.js

@@ -1 +1 @@
-var e={COMP_A:"A",COMP_F:"F",ID:"container",ID_FQN:"TeqFw_Di_Container$",LIFE_I:"I",LIFE_S:"S",isClass(e){const t=Object.getOwnPropertyDescriptor(e,"prototype");return t&&!t.writable}};const t=/(function)*\s*\w*\s*\(\s*\{([^\}]*)\}/s,o=/constructor\s*\(\s*\{([^\}]*)\}/s;function s(e){const t=[];try{const o=new Function(`{${e}}`,"return");o(new Proxy({},{get:(e,o)=>t.push(o)}))}catch(t){throw new Error(`Cannot analyze the deps specification:${e}\n\nPlease, be sure that spec does not contain extra ')' in a comments.\n\nError: ${t}`)}return t}function n(n){return"function"==typeof n?e.isClass(n)?function(e){const t=[],n=e.toString(),r=o.exec(n);return r&&t.push(...s(r[1])),t}(n):function(e){const o=[],n=e.toString(),r=t.exec(n);return r&&o.push(...s(r[2])),o}(n):[]}class r{constructor(){let t=!1;this.create=async function(o,s,r,i){if(r.includes(o.value))throw new Error(`Circular dependency for '${o.value}'. Parents are: ${JSON.stringify(r)}`);if(o.exportName){const a=[...r,o.value],{[o.exportName]:u}=s;if(o.composition===e.COMP_F){if("function"==typeof u){const s=n(u);s.length&&(c=`Deps for object '${o.value}' are: ${JSON.stringify(s)}`,t&&console.log(c));const r={};for(const e of s)r[e]=await i.compose(e,a);const l=e.isClass(u)?new u(r):u(r);return l instanceof Promise?await l:l}return Object.assign({},u)}return u}return s;var c},this.setDebug=function(e){t=e}}}class i{exportName;composition;life;moduleName;value;wrappers=[]}const c=/^((([A-Z])[A-Za-z0-9_]*)((\.)?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?)$/;class a{canParse(e){return!0}parse(t){const o=new i;o.value=t;const s=c.exec(t);if(s&&(o.moduleName=s[2],"."===s[5]?"$"===s[7]||"$$"===s[7]?(o.composition=e.COMP_F,o.exportName=s[6],o.life="$"===s[7]?e.LIFE_S:e.LIFE_I):(o.composition=e.COMP_A,o.life=e.LIFE_S,o.exportName=""!==s[6]?s[6]:"default"):"$"===s[7]||"$$"===s[7]?(o.composition=e.COMP_F,o.exportName="default",o.life="$"===s[7]?e.LIFE_S:e.LIFE_I):(o.composition=void 0,o.exportName=void 0,o.life=void 0),s[11]&&(o.wrappers=s[11].split(","))),o.composition===e.COMP_A&&o.life===e.LIFE_I)throw new Error(`Export is not a function and should be used as a singleton only: '${o.value}'.`);return o}}class u{constructor(){let e=new a;const t=[];this.addChunk=function(e){t.push(e)},this.parse=function(o){let s;for(const e of t)if(e.canParse(o)){s=e.parse(o);break}return s||(s=e?.parse(o)),s},this.setDefaultChunk=function(t){e=t}}}class l{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=function(t,o){let s=t;for(const n of e)s=n.modify(s,t,o);return s}}}class f{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=async function(t,o,s){let n=t;for(const t of e)n=t.modify(n,o,s),n instanceof Promise&&(n=await n);return n}}}const p="root";class m{constructor(){const e={};let t=!1,o=[],s="/";this.addNamespaceRoot=function(s,n,r){const i=(t?n.replace(/^\\/,""):n).replace(/\\/g,"/"),c=t?`file://${i}`:i;e[s]={ext:r??"js",ns:s,[p]:c},o=Object.keys(e).sort(((e,t)=>t.localeCompare(e)))},this.resolve=function(t){let n,r,i;for(i of o)if(t.startsWith(i)){n=e[i][p],r=e[i].ext;break}if(n&&r){let e=t.replace(i,"");0===e.indexOf("_")&&(e=e.replace("_",""));const o=e.replaceAll("_",s);return`${n}${s}${o}.${r}`}return t},this.setWindowsEnv=function(e=!0){t=e,s=e?"\\":"/"}}}function d(e){return`${e.moduleName}#${e.exportName}`}class h{constructor(){let t=new r,o=!1,s=new u,n=new l,i=new f;const c={},a={};let p=new m;function h(){o&&console.log(...arguments)}this.get=async function(e,t=[]){return this.compose(e,t)},this.compose=async function(o,r=[]){if(h(`Object '${o}' is requested.`),o===e.ID||o===e.ID_FQN)return h("Container itself is returned."),a[e.ID];const u=s.parse(o),l=n.modify(u,r);if(l.life===e.LIFE_S){const e=d(l);if(a[e])return h(`Existing singleton '${e}' is returned.`),a[e]}let f;c[l.moduleName]||(h(`ES6 module '${l.moduleName}' is not resolved yet`),c[l.moduleName]=p.resolve(l.moduleName));const m=c[l.moduleName];try{f=await import(m),h(`ES6 module '${l.moduleName}' is loaded from '${m}'.`)}catch(e){throw console.error(e?.message,`Object key: "${o}".`,`Path: "${m}".`,`Stack: ${JSON.stringify(r)}`),e}let $=await t.create(l,f,r,this);if($=await i.modify($,l,r),h(`Object '${o}' is created.`),l.life===e.LIFE_S){const e=d(l);a[e]=$,h(`Object '${o}' is saved as singleton.`)}return $},this.getParser=()=>s,this.getPreProcessor=()=>n,this.getPostProcessor=()=>i,this.getResolver=()=>p,this.setDebug=function(e){o=e,t.setDebug(e)},this.setParser=e=>s=e,this.setPreProcessor=e=>n=e,this.setPostProcessor=e=>i=e,this.setResolver=e=>p=e,a[e.ID]=this}}export{h as default};
+var e={CA:"A",CF:"F",ID:"container",ID_FQN:"TeqFw_Di_Container$",LI:"I",LS:"S",isClass(e){const t=Object.getOwnPropertyDescriptor(e,"prototype");return t&&!t.writable}};const t=/(function)*\s*\w*\s*\(\s*\{([^}]*)}/s,o=/constructor\s*\(\s*\{([^}]*)}/s;function n(e){const t=[];try{const o=new Function(`{${e}}`,"return");o(new Proxy({},{get:(e,o)=>t.push(o)}))}catch(t){throw new Error(`Cannot analyze the deps specification:${e}\n\nPlease, be sure that spec does not contain extra ')' in a comments.\n\nError: ${t}`)}return t}function s(s){return"function"==typeof s?e.isClass(s)?function(e){const t=[],s=e.toString(),r=o.exec(s);return r&&t.push(...n(r[1])),t}(s):function(e){const o=[],s=e.toString(),r=t.exec(s);return r&&o.push(...n(r[2])),o}(s):[]}class r{constructor(){let t=!1;this.create=async function(o,n,r,i){if(r.includes(o.origin))throw new Error(`Circular dependency for '${o.origin}'. Parents are: ${JSON.stringify(r)}`);if(o.exportName){const a=[...r,o.origin],{[o.exportName]:l}=n;if(o.composition===e.CF){if("function"==typeof l){const n=s(l);n.length&&(c=`Deps for object '${o.origin}' are: ${JSON.stringify(n)}`,t&&console.log(c));const r={};for(const e of n)r[e]=await i.get(e,a);const u=e.isClass(l)?new l(r):l(r);return u instanceof Promise?await u:u}return Object.assign({},l)}return l}return n;var c},this.setDebug=function(e){t=e}}}class i{exportName;composition;life;moduleName;origin;wrappers=[]}const c=/^(node:)?(@?[A-Za-z0-9_-]+\/?[A-Za-z0-9_-]*)(([.#])?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?$/;class a{canParse(){return!0}parse(t){const o=new i;o.origin=t;const n=c.exec(t);if(n&&(o.isNodeModule=Boolean(n[1]),o.moduleName=n[2].replace(/^node:/,""),"."===n[4]||"#"===n[4]?"$"===n[6]||"$$"===n[6]?(o.composition=e.CF,o.exportName=n[5],o.life="$"===n[6]?e.LS:e.LI):(o.composition=e.CA,o.life=e.LS,o.exportName=""!==n[5]?n[5]:"default"):"$"===n[6]||"$$"===n[6]?(o.composition=e.CF,o.exportName="default",o.life="$"===n[6]?e.LS:e.LI):(o.composition=void 0,o.exportName=void 0,o.life=void 0),n[10]&&(o.wrappers=n[10].split(","))),o.composition===e.CA&&o.life===e.LI)throw new Error(`Export is not a function and should be used as a singleton only: '${o.origin}'.`);return o}}class l{constructor(){let e=new a;const t=[];this.addChunk=function(e){t.push(e)},this.parse=function(o){let n;for(const e of t)if(e.canParse(o)){n=e.parse(o);break}return n||(n=e?.parse(o)),n},this.setDefaultChunk=function(t){e=t}}}class u{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=function(t,o){let n=t;for(const s of e)n=s.modify(n,t,o);return n}}}class f{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=async function(t,o,n){let s=t;for(const t of e)s=t.modify(s,o,n),s instanceof Promise&&(s=await s);return s}}}const d="ext",p="ns",h="root";class m{constructor(){const e={};let t=!1,o=[],n="/";this.addNamespaceRoot=function(n,s,r){const i=(t?s.replace(/^\\/,""):s).replace(/\\/g,"/"),c=t?`file://${i}`:i;e[n]={[d]:r??"js",[p]:n,[h]:c},o=Object.keys(e).sort(((e,t)=>t.localeCompare(e)))},this.resolve=function(t){let s,r,i;for(i of o)if(t.startsWith(i)){s=e[i][h],r=e[i].ext;break}if(s&&r){let e=t.replace(i,"");0===e.indexOf("_")&&(e=e.replace("_",""));const o=e.replaceAll("_",n);return`${s}${n}${o}.${r}`}return t},this.setWindowsEnv=function(e=!0){t=e,n=e?"\\":"/"}}}function $(e){return`${e.moduleName}#${e.exportName}`}class g{constructor(){let t=new r,o=!1,n=new l,s=new f,i=new u,c=!1;const a={},d={};let p=new m;function h(){o&&console.log(...arguments)}this.get=async function(o,r=[]){if(h(`Object '${o}' is requested.`),o===e.ID||o===e.ID_FQN)return h("Container itself is returned."),d[e.ID];const c=n.parse(o),l=i.modify(c,r);if(l.life===e.LS){const e=$(l);if(d[e])return h(`Existing singleton '${e}' is returned.`),d[e]}let u;a[l.moduleName]||(h(`ES6 module '${l.moduleName}' is not resolved yet`),a[l.moduleName]=p.resolve(l.moduleName));const f=a[l.moduleName];try{u=await import(f),h(`ES6 module '${l.moduleName}' is loaded from '${f}'.`)}catch(e){throw console.error(e?.message,`Object key: "${o}".`,`Path: "${f}".`,`Stack: ${JSON.stringify(r)}`),e}let m=await t.create(l,u,r,this);var g;if(null===(g=m)||"object"!=typeof g&&"function"!=typeof g||"[object Module]"===Object.prototype.toString.call(g)||Object.isFrozen(g)||Object.freeze(m),m=await s.modify(m,l,r),h(`Object '${o}' is created.`),l.life===e.LS){const e=$(l);d[e]=m,h(`Object '${o}' is saved as singleton.`)}return m},this.enableTestMode=function(){c=!0,h("Test mode enabled")},this.getParser=()=>n,this.getPreProcessor=()=>i,this.getPostProcessor=()=>s,this.getResolver=()=>p,this.register=function(t,o){if(!c)throw new Error("Use enableTestMode() to allow it");if(!t||!o)throw new Error("Both params are required");const s=n.parse(t);if(s.life!==e.LS)throw new Error(`Only singletons can be registered: '${t}'`);const r=$(s);if(d[r])throw new Error(`'${t}' is already registered`);d[r]=o,h(`'${t}' is registered`)},this.setDebug=function(e){o=e,t.setDebug(e)},this.setParser=e=>n=e,this.setPreProcessor=e=>i=e,this.setPostProcessor=e=>s=e,this.setResolver=e=>p=e,d[e.ID]=this}}export{g as default};

package/dist/umd.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).TeqFw_Di_Container=t()}(this,(function(){"use strict";var e={COMP_A:"A",COMP_F:"F",ID:"container",ID_FQN:"TeqFw_Di_Container$",LIFE_I:"I",LIFE_S:"S",isClass(e){const t=Object.getOwnPropertyDescriptor(e,"prototype");return t&&!t.writable}};const t=/(function)*\s*\w*\s*\(\s*\{([^\}]*)\}/s,o=/constructor\s*\(\s*\{([^\}]*)\}/s;function n(e){const t=[];try{const o=new Function(`{${e}}`,"return");o(new Proxy({},{get:(e,o)=>t.push(o)}))}catch(t){throw new Error(`Cannot analyze the deps specification:${e}\n\nPlease, be sure that spec does not contain extra ')' in a comments.\n\nError: ${t}`)}return t}function s(s){return"function"==typeof s?e.isClass(s)?function(e){const t=[],s=e.toString(),r=o.exec(s);return r&&t.push(...n(r[1])),t}(s):function(e){const o=[],s=e.toString(),r=t.exec(s);return r&&o.push(...n(r[2])),o}(s):[]}class r{constructor(){let t=!1;this.create=async function(o,n,r,i){if(r.includes(o.value))throw new Error(`Circular dependency for '${o.value}'. Parents are: ${JSON.stringify(r)}`);if(o.exportName){const a=[...r,o.value],{[o.exportName]:u}=n;if(o.composition===e.COMP_F){if("function"==typeof u){const n=s(u);n.length&&(c=`Deps for object '${o.value}' are: ${JSON.stringify(n)}`,t&&console.log(c));const r={};for(const e of n)r[e]=await i.compose(e,a);const l=e.isClass(u)?new u(r):u(r);return l instanceof Promise?await l:l}return Object.assign({},u)}return u}return n;var c},this.setDebug=function(e){t=e}}}class i{exportName;composition;life;moduleName;value;wrappers=[]}const c=/^((([A-Z])[A-Za-z0-9_]*)((\.)?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?)$/;class a{canParse(e){return!0}parse(t){const o=new i;o.value=t;const n=c.exec(t);if(n&&(o.moduleName=n[2],"."===n[5]?"$"===n[7]||"$$"===n[7]?(o.composition=e.COMP_F,o.exportName=n[6],o.life="$"===n[7]?e.LIFE_S:e.LIFE_I):(o.composition=e.COMP_A,o.life=e.LIFE_S,o.exportName=""!==n[6]?n[6]:"default"):"$"===n[7]||"$$"===n[7]?(o.composition=e.COMP_F,o.exportName="default",o.life="$"===n[7]?e.LIFE_S:e.LIFE_I):(o.composition=void 0,o.exportName=void 0,o.life=void 0),n[11]&&(o.wrappers=n[11].split(","))),o.composition===e.COMP_A&&o.life===e.LIFE_I)throw new Error(`Export is not a function and should be used as a singleton only: '${o.value}'.`);return o}}class u{constructor(){let e=new a;const t=[];this.addChunk=function(e){t.push(e)},this.parse=function(o){let n;for(const e of t)if(e.canParse(o)){n=e.parse(o);break}return n||(n=e?.parse(o)),n},this.setDefaultChunk=function(t){e=t}}}class l{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=function(t,o){let n=t;for(const s of e)n=s.modify(n,t,o);return n}}}class f{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=async function(t,o,n){let s=t;for(const t of e)s=t.modify(s,o,n),s instanceof Promise&&(s=await s);return s}}}const p="root";class d{constructor(){const e={};let t=!1,o=[],n="/";this.addNamespaceRoot=function(n,s,r){const i=(t?s.replace(/^\\/,""):s).replace(/\\/g,"/"),c=t?`file://${i}`:i;e[n]={ext:r??"js",ns:n,[p]:c},o=Object.keys(e).sort(((e,t)=>t.localeCompare(e)))},this.resolve=function(t){let s,r,i;for(i of o)if(t.startsWith(i)){s=e[i][p],r=e[i].ext;break}if(s&&r){let e=t.replace(i,"");0===e.indexOf("_")&&(e=e.replace("_",""));const o=e.replaceAll("_",n);return`${s}${n}${o}.${r}`}return t},this.setWindowsEnv=function(e=!0){t=e,n=e?"\\":"/"}}}function m(e){return`${e.moduleName}#${e.exportName}`}return class{constructor(){let t=new r,o=!1,n=new u,s=new l,i=new f;const c={},a={};let p=new d;function h(){o&&console.log(...arguments)}this.get=async function(e,t=[]){return this.compose(e,t)},this.compose=async function(o,r=[]){if(h(`Object '${o}' is requested.`),o===e.ID||o===e.ID_FQN)return h("Container itself is returned."),a[e.ID];const u=n.parse(o),l=s.modify(u,r);if(l.life===e.LIFE_S){const e=m(l);if(a[e])return h(`Existing singleton '${e}' is returned.`),a[e]}let f;c[l.moduleName]||(h(`ES6 module '${l.moduleName}' is not resolved yet`),c[l.moduleName]=p.resolve(l.moduleName));const d=c[l.moduleName];try{f=await import(d),h(`ES6 module '${l.moduleName}' is loaded from '${d}'.`)}catch(e){throw console.error(e?.message,`Object key: "${o}".`,`Path: "${d}".`,`Stack: ${JSON.stringify(r)}`),e}let $=await t.create(l,f,r,this);if($=await i.modify($,l,r),h(`Object '${o}' is created.`),l.life===e.LIFE_S){const e=m(l);a[e]=$,h(`Object '${o}' is saved as singleton.`)}return $},this.getParser=()=>n,this.getPreProcessor=()=>s,this.getPostProcessor=()=>i,this.getResolver=()=>p,this.setDebug=function(e){o=e,t.setDebug(e)},this.setParser=e=>n=e,this.setPreProcessor=e=>s=e,this.setPostProcessor=e=>i=e,this.setResolver=e=>p=e,a[e.ID]=this}}}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).TeqFw_Di_Container=t()}(this,(function(){"use strict";var e={CA:"A",CF:"F",ID:"container",ID_FQN:"TeqFw_Di_Container$",LI:"I",LS:"S",isClass(e){const t=Object.getOwnPropertyDescriptor(e,"prototype");return t&&!t.writable}};const t=/(function)*\s*\w*\s*\(\s*\{([^}]*)}/s,o=/constructor\s*\(\s*\{([^}]*)}/s;function n(e){const t=[];try{const o=new Function(`{${e}}`,"return");o(new Proxy({},{get:(e,o)=>t.push(o)}))}catch(t){throw new Error(`Cannot analyze the deps specification:${e}\n\nPlease, be sure that spec does not contain extra ')' in a comments.\n\nError: ${t}`)}return t}function s(s){return"function"==typeof s?e.isClass(s)?function(e){const t=[],s=e.toString(),r=o.exec(s);return r&&t.push(...n(r[1])),t}(s):function(e){const o=[],s=e.toString(),r=t.exec(s);return r&&o.push(...n(r[2])),o}(s):[]}class r{constructor(){let t=!1;this.create=async function(o,n,r,i){if(r.includes(o.origin))throw new Error(`Circular dependency for '${o.origin}'. Parents are: ${JSON.stringify(r)}`);if(o.exportName){const a=[...r,o.origin],{[o.exportName]:u}=n;if(o.composition===e.CF){if("function"==typeof u){const n=s(u);n.length&&(c=`Deps for object '${o.origin}' are: ${JSON.stringify(n)}`,t&&console.log(c));const r={};for(const e of n)r[e]=await i.get(e,a);const l=e.isClass(u)?new u(r):u(r);return l instanceof Promise?await l:l}return Object.assign({},u)}return u}return n;var c},this.setDebug=function(e){t=e}}}class i{exportName;composition;life;moduleName;origin;wrappers=[]}const c=/^(node:)?(@?[A-Za-z0-9_-]+\/?[A-Za-z0-9_-]*)(([.#])?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?$/;class a{canParse(){return!0}parse(t){const o=new i;o.origin=t;const n=c.exec(t);if(n&&(o.isNodeModule=Boolean(n[1]),o.moduleName=n[2].replace(/^node:/,""),"."===n[4]||"#"===n[4]?"$"===n[6]||"$$"===n[6]?(o.composition=e.CF,o.exportName=n[5],o.life="$"===n[6]?e.LS:e.LI):(o.composition=e.CA,o.life=e.LS,o.exportName=""!==n[5]?n[5]:"default"):"$"===n[6]||"$$"===n[6]?(o.composition=e.CF,o.exportName="default",o.life="$"===n[6]?e.LS:e.LI):(o.composition=void 0,o.exportName=void 0,o.life=void 0),n[10]&&(o.wrappers=n[10].split(","))),o.composition===e.CA&&o.life===e.LI)throw new Error(`Export is not a function and should be used as a singleton only: '${o.origin}'.`);return o}}class u{constructor(){let e=new a;const t=[];this.addChunk=function(e){t.push(e)},this.parse=function(o){let n;for(const e of t)if(e.canParse(o)){n=e.parse(o);break}return n||(n=e?.parse(o)),n},this.setDefaultChunk=function(t){e=t}}}class l{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=function(t,o){let n=t;for(const s of e)n=s.modify(n,t,o);return n}}}class f{constructor(){const e=[];this.addChunk=function(t){e.push(t)},this.modify=async function(t,o,n){let s=t;for(const t of e)s=t.modify(s,o,n),s instanceof Promise&&(s=await s);return s}}}const d="ext",p="ns",h="root";class m{constructor(){const e={};let t=!1,o=[],n="/";this.addNamespaceRoot=function(n,s,r){const i=(t?s.replace(/^\\/,""):s).replace(/\\/g,"/"),c=t?`file://${i}`:i;e[n]={[d]:r??"js",[p]:n,[h]:c},o=Object.keys(e).sort(((e,t)=>t.localeCompare(e)))},this.resolve=function(t){let s,r,i;for(i of o)if(t.startsWith(i)){s=e[i][h],r=e[i].ext;break}if(s&&r){let e=t.replace(i,"");0===e.indexOf("_")&&(e=e.replace("_",""));const o=e.replaceAll("_",n);return`${s}${n}${o}.${r}`}return t},this.setWindowsEnv=function(e=!0){t=e,n=e?"\\":"/"}}}function g(e){return`${e.moduleName}#${e.exportName}`}return class{constructor(){let t=new r,o=!1,n=new u,s=new f,i=new l,c=!1;const a={},d={};let p=new m;function h(){o&&console.log(...arguments)}this.get=async function(o,r=[]){if(h(`Object '${o}' is requested.`),o===e.ID||o===e.ID_FQN)return h("Container itself is returned."),d[e.ID];const c=n.parse(o),u=i.modify(c,r);if(u.life===e.LS){const e=g(u);if(d[e])return h(`Existing singleton '${e}' is returned.`),d[e]}let l;a[u.moduleName]||(h(`ES6 module '${u.moduleName}' is not resolved yet`),a[u.moduleName]=p.resolve(u.moduleName));const f=a[u.moduleName];try{l=await import(f),h(`ES6 module '${u.moduleName}' is loaded from '${f}'.`)}catch(e){throw console.error(e?.message,`Object key: "${o}".`,`Path: "${f}".`,`Stack: ${JSON.stringify(r)}`),e}let m=await t.create(u,l,r,this);var w;if(null===(w=m)||"object"!=typeof w&&"function"!=typeof w||"[object Module]"===Object.prototype.toString.call(w)||Object.isFrozen(w)||Object.freeze(m),m=await s.modify(m,u,r),h(`Object '${o}' is created.`),u.life===e.LS){const e=g(u);d[e]=m,h(`Object '${o}' is saved as singleton.`)}return m},this.enableTestMode=function(){c=!0,h("Test mode enabled")},this.getParser=()=>n,this.getPreProcessor=()=>i,this.getPostProcessor=()=>s,this.getResolver=()=>p,this.register=function(t,o){if(!c)throw new Error("Use enableTestMode() to allow it");if(!t||!o)throw new Error("Both params are required");const s=n.parse(t);if(s.life!==e.LS)throw new Error(`Only singletons can be registered: '${t}'`);const r=g(s);if(d[r])throw new Error(`'${t}' is already registered`);d[r]=o,h(`'${t}' is registered`)},this.setDebug=function(e){o=e,t.setDebug(e)},this.setParser=e=>n=e,this.setPreProcessor=e=>i=e,this.setPostProcessor=e=>s=e,this.setResolver=e=>p=e,d[e.ID]=this}}}));

package/eslint.config.js

@@ -0,0 +1,37 @@
+// eslint.config.js
+import js from '@eslint/js';
+
+/** @type {import('eslint').Linter.FlatConfig[]} */
+export default [
+    js.configs.recommended,
+    {
+        languageOptions: {
+            ecmaVersion: 2022, // required for public class fields
+            sourceType: 'module',
+            globals: {
+                console: 'readonly',
+            },
+        },
+        rules: {
+            'camelcase': [
+                'warn',
+                {
+                    properties: 'never',
+                    ignoreDestructuring: true,
+                    allow: ['^([A-Z][a-zA-Z0-9]*_)+[A-Z][a-zA-Z0-9]*$'],
+                },
+            ],
+            'indent': ['error', 4],
+            'linebreak-style': ['error', 'unix'],
+            'quotes': ['error', 'single'],
+            'semi': ['error', 'always'],
+        },
+    },
+    // Special rule override for interface declarations
+    {
+        files: ['./src/Api/**/*.js'],
+        rules: {
+            'no-unused-vars': 'off',
+        },
+    },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teqfw/di",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "Dependency Injection container for ES6 modules that works in both browser and Node.js apps.",
   "keywords": [
     "dependency injection",
@@ -28,13 +28,16 @@
   },
   "scripts": {
     "rollup": "rollup -c",
+    "eslint": "eslint './src/**/*.js'",
     "test": "mocha --recursive './test/**/*.test.mjs'"
   },
   "devDependencies": {
+    "@eslint/js": "^9.25.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-terser": "^0.4.4",
+    "eslint": "^9.25.0",
     "mocha": "^11.1.0",
-    "rollup": "^4.36.0",
-    "@rollup/plugin-terser": "^0.4.4"
+    "rollup": "^4.36.0"
   },
   "mocha": {
     "spec": "./test/**/*.test.mjs",

package/src/Container/A/Composer/A/SpecParser.js

@@ -8,8 +8,8 @@
 import Defs from '../../../../Defs.js';
 
 // VARS
-const FUNC = /(function)*\s*\w*\s*\(\s*\{([^\}]*)\}/s;
-const CLASS = /constructor\s*\(\s*\{([^\}]*)\}/s;
+const FUNC = /(function)*\s*\w*\s*\(\s*\{([^}]*)}/s;
+const CLASS = /constructor\s*\(\s*\{([^}]*)}/s;
 
 // FUNCS
 
@@ -32,7 +32,7 @@ function _analyze(params) {
         fn(spec);
     } catch (e) {
         const msg = `Cannot analyze the deps specification:${params}\n`
-            + `\nPlease, be sure that spec does not contain extra ')' in a comments.`
+            + '\nPlease, be sure that spec does not contain extra \')\' in a comments.'
             + `\n\nError: ${e}`;
         throw new Error(msg);
     }

package/src/Container/A/Composer.js

@@ -23,7 +23,7 @@ export default class TeqFw_Di_Container_A_Composer {
          * Returns or creates and returns the requested object.
          *
          * @param {TeqFw_Di_DepId} depId
-         * @param {Object} module - imported es6 module
+         * @param {object} module - imported es6 module
          * @param {string[]} stack - array of the parent objects IDs to prevent dependency loop
          * @param {TeqFw_Di_Container} container - to create dependencies for requested object
          * @returns {Promise<*>}
@@ -42,7 +42,7 @@ export default class TeqFw_Di_Container_A_Composer {
                         if (deps.length) log(`Deps for object '${depId.origin}' are: ${JSON.stringify(deps)}`);
                         const spec = {};
                         for (const dep of deps)
-                            spec[dep] = await container.compose(dep, stackNew);
+                            spec[dep] = await container.get(dep, stackNew);
                         // create a new object with the factory function
                         const res = (Defs.isClass(exp)) ? new exp(spec) : exp(spec);
                         if (res instanceof Promise)

package/src/Container/A/Parser/Chunk/Def.js

@@ -10,16 +10,16 @@ import Dto from '../../../../DepId.js';
 import Defs from '../../../../Defs.js';
 
 // VARS
-/** @type {RegExp} expression for default object key */
-const REGEXP = /^(node:)?((@?[A-Za-z0-9_\-]+\/?[A-Za-z0-9_\-]*))((\.)?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?$/;
+/** @type {RegExp} expression for a default object key */
+const REGEXP = /^(node:)?(@?[A-Za-z0-9_-]+\/?[A-Za-z0-9_-]*)(([.#])?([A-Za-z0-9_]*)((\$)?(\$)?)?)?(\(([A-Za-z0-9_,]*)\))?$/;
 
 /**
  * @implements TeqFw_Di_Api_Container_Parser_Chunk
  */
 export default class TeqFw_Di_Container_A_Parser_Chunk_Def {
 
-    canParse(depId) {
-        // default parser always tries to parse the depId
+    canParse() {
+        // the default parser always tries to parse the depId
         return true;
     }
 
@@ -31,22 +31,22 @@ export default class TeqFw_Di_Container_A_Parser_Chunk_Def {
             res.isNodeModule = Boolean(parts[1]); // Detect 'node:' prefix
             res.moduleName = parts[2].replace(/^node:/, ''); // Remove 'node:' prefix
 
-            if (parts[5] === '.') {
+            if ((parts[4] === '.') || (parts[4] === '#')) {
                 // Ns_Module.export or node:package.export
-                if ((parts[7] === '$') || (parts[7] === '$$')) {
+                if ((parts[6] === '$') || (parts[6] === '$$')) {
                     res.composition = Defs.CF;
-                    res.exportName = parts[6];
-                    res.life = (parts[7] === '$') ? Defs.LS : Defs.LI;
+                    res.exportName = parts[5];
+                    res.life = (parts[6] === '$') ? Defs.LS : Defs.LI;
                 } else {
                     res.composition = Defs.CA;
                     res.life = Defs.LS;
-                    res.exportName = (parts[6] !== '') ? parts[6] : 'default';
+                    res.exportName = (parts[5] !== '') ? parts[5] : 'default';
                 }
-            } else if ((parts[7] === '$') || parts[7] === '$$') {
+            } else if ((parts[6] === '$') || parts[6] === '$$') {
                 // Ns_Module$$ or node:package$$
                 res.composition = Defs.CF;
                 res.exportName = 'default';
-                res.life = (parts[7] === '$') ? Defs.LS : Defs.LI;
+                res.life = (parts[6] === '$') ? Defs.LS : Defs.LI;
             } else {
                 // Ns_Module or node:package (ES6 module)
                 res.composition = undefined;
@@ -55,8 +55,8 @@ export default class TeqFw_Di_Container_A_Parser_Chunk_Def {
             }
 
             // Wrappers handling
-            if (parts[11]) {
-                res.wrappers = parts[11].split(',');
+            if (parts[10]) {
+                res.wrappers = parts[10].split(',');
             }
         }
 

package/src/Container/A/Parser/Chunk/V02X.js

@@ -9,16 +9,16 @@ import Dto from '../../../../DepId.js';
 import Defs from '../../../../Defs.js';
 
 // VARS
-/** @type {RegExp} expression for default object key */
-const REGEXP = /^(node:)?((([A-Z])[A-Za-z0-9_]*|[a-z][a-z0-9\-]*))((#|\.)?([A-Za-z0-9_]*)((\$)([F|A])?([S|I])?)?)?$/;
+/** @type {RegExp} expression for a default object key */
+const REGEXP = /^(node:)?(([A-Z])[A-Za-z0-9_]*|[a-z][a-z0-9-]*)(([#.])?([A-Za-z0-9_]*)((\$)([F|A])?([S|I])?)?)?$/;
 
 /**
  * @implements TeqFw_Di_Api_Container_Parser_Chunk
  */
 export default class TeqFw_Di_Container_A_Parser_Chunk_V02X {
 
-    canParse(depId) {
-        // default parser always tries to parse the depId
+    canParse() {
+        // the default parser always tries to parse the depId
         return true;
     }
 
@@ -30,29 +30,30 @@ export default class TeqFw_Di_Container_A_Parser_Chunk_V02X {
             res.isNodeModule = Boolean(parts[1]); // Check if it starts with 'node:'
             res.moduleName = parts[2].replace(/^node:/, ''); // Remove 'node:' if present
 
-            if (parts[6] === '.') {
+            if (parts[5] === '.') {
                 // App_Service.export or node:package.export
-                if (parts[9] === '$') {
+                if (parts[8] === '$') {
                     // App_Service.export$ or node:package.export$
                     res.composition = Defs.CF;
-                    res.exportName = parts[7];
-                    res.life = (parts[11] === Defs.LI) ? Defs.LI : Defs.LS;
+                    res.exportName = parts[6];
+                    res.life = (parts[10] === Defs.LI) ? Defs.LI : Defs.LS;
                 } else {
-                    res.composition = (!parts[9] || parts[9] === Defs.CA) ? Defs.CA : Defs.CF;
-                    res.exportName = parts[7];
-                    res.life = (!parts[9] || parts[11] === Defs.LS) ? Defs.LS : Defs.LI;
+                    res.composition = (!parts[8] || parts[8] === Defs.CA) ? Defs.CA : Defs.CF;
+                    res.exportName = parts[6];
+                    res.life = (!parts[8] || parts[10] === Defs.LS) ? Defs.LS : Defs.LI;
                 }
-            } else if (parts[9] === '$') {
+            } else if (parts[8] === '$') {
                 // App_Logger$FS or node:package$
-                res.composition = (!parts[10] || parts[10] === Defs.CF) ? Defs.CF : Defs.CA;
+                res.composition = (!parts[9] || parts[9] === Defs.CF) ? Defs.CF : Defs.CA;
                 res.exportName = 'default';
-                res.life = parts[11] ? (parts[11] === Defs.LS ? Defs.LS : Defs.LI) : (res.composition === Defs.CF ? Defs.LS : Defs.LI);
+                res.life = parts[10] ? (parts[10] === Defs.LS ? Defs.LS : Defs.LI) : (res.composition === Defs.CF ? Defs.LS : Defs.LI);
             } else {
                 // App_Service or node:package (ES6 module)
                 res.composition = undefined;
                 res.exportName = undefined;
                 res.life = undefined;
             }
+
         }
 
         // Enforce singleton for non-factory exports

package/src/Container.js

@@ -1,5 +1,7 @@
 /**
  * The Object Container (composition root).
+ * We can use static imports in the Container.
+ *
  * @namespace TeqFw_Di_Container
  */
 import Composer from './Container/A/Composer.js';
@@ -33,11 +35,7 @@ function canBeFrozen(value) {
     return !Object.isFrozen(value);
 }
 
-
 // MAIN
-/**
- * @implements TeqFw_Di_Api_Container
- */
 export default class TeqFw_Di_Container {
 
     constructor() {
@@ -45,8 +43,9 @@ export default class TeqFw_Di_Container {
         let _composer = new Composer();
         let _debug = false;
         let _parser = new Parser();
-        let _preProcessor = new PreProcessor();
         let _postProcessor = new PostProcessor();
+        let _preProcessor = new PreProcessor();
+        let _testMode = false;
 
         /**
          * Registry for paths for loaded es6 modules.
@@ -56,7 +55,7 @@ export default class TeqFw_Di_Container {
         const _regPaths = {};
         /**
          * Registry to store singletons.
-         * @type {Object<string, *>}
+         * @type {Object<string, object>}
          */
         const _regSingles = {};
         let _resolver = new Resolver();
@@ -69,30 +68,19 @@ export default class TeqFw_Di_Container {
 
         // INSTANCE METHODS
 
-        this.get = async function (runtimeDepId, stack = []) {
-            return this.compose(runtimeDepId, stack);
-        };
-
-        /**
-         * This method is 'private' for the npm package. It is used in the Composer only.
-         *
-         * @param {string} depId runtime dependency ID
-         * @param {string[]} stack set of the depId to detect circular dependencies
-         * @returns {Promise<*>}
-         */
-        this.compose = async function (depId, stack = []) {
+        this.get = async function (depId, stack = []) {
             log(`Object '${depId}' is requested.`);
-            // return container itself if requested
+            // return the container itself if requested
             if (
                 (depId === Defs.ID) ||
                 (depId === Defs.ID_FQN)
             ) {
-                log(`Container itself is returned.`);
+                log('Container itself is returned.');
                 return _regSingles[Defs.ID];
             }
             // parse the `objectKey` and get the structured DTO
             const parsed = _parser.parse(depId);
-            // modify original key according to some rules (replacements, etc.)
+            // modify the original key according to some rules (replacements, etc.)
             const key = _preProcessor.modify(parsed, stack);
             // return existing singleton
             if (key.life === Defs.LS) {
@@ -102,10 +90,10 @@ export default class TeqFw_Di_Container {
                     return _regSingles[singleId];
                 }
             }
-            // resolve path to es6 module if not resolved before
+            // resolve a path to es6 module if not resolved before
             if (!_regPaths[key.moduleName]) {
                 log(`ES6 module '${key.moduleName}' is not resolved yet`);
-                // convert module name to the path to es6-module file with a sources
+                // convert the module name to the path to an es6-module file with a source
                 _regPaths[key.moduleName] = _resolver.resolve(key.moduleName);
             }
 
@@ -124,9 +112,9 @@ export default class TeqFw_Di_Container {
                 );
                 throw e;
             }
-            // create object using the composer then modify it in post-processor
+            // create an object using the composer, then modify it in post-processor
             let res = await _composer.create(key, module, stack, this);
-            // freeze the result to prevent modifications (TODO: should we have configuration for the feature?)
+            // freeze the result to prevent modifications
             if (canBeFrozen(res)) Object.freeze(res);
             res = await _postProcessor.modify(res, key, stack);
             log(`Object '${depId}' is created.`);
@@ -140,6 +128,14 @@ export default class TeqFw_Di_Container {
             return res;
         };
 
+        /**
+         * Enables test mode, allowing manual singleton registration.
+         */
+        this.enableTestMode = function () {
+            _testMode = true;
+            log('Test mode enabled');
+        };
+
         this.getParser = () => _parser;
 
         this.getPreProcessor = () => _preProcessor;
@@ -149,21 +145,28 @@ export default class TeqFw_Di_Container {
         this.getResolver = () => _resolver;
 
         /**
-         * Register new object in the Container.
-         * @param {string} depId
-         * @param {Object} obj
+         * Registers a new singleton object in the Container.
+         *
+         * @param {string} depId - Dependency identifier. Must be a singleton identifier.
+         * @param {object} obj - The object to register.
          */
         this.register = function (depId, obj) {
-            if (!depId || !obj) throw new Error('depId and object are required');
+            if (!_testMode)
+                throw new Error('Use enableTestMode() to allow it');
+
+            if (!depId || !obj)
+                throw new Error('Both params are required');
+
             const key = _parser.parse(depId);
-            if (key.life === Defs.LS) {
-                const singleId = getSingletonId(key);
-                _regSingles[singleId] = obj;
-                log(`Object '${depId}' is registered manually as singleton.`);
-            } else {
-                // TODO: factory function also should be added manually
-                throw new Error(`Only singletons can be registered manually. Given: ${depId}`);
-            }
+            if (key.life !== Defs.LS)
+                throw new Error(`Only singletons can be registered: '${depId}'`);
+
+            const singleId = getSingletonId(key);
+            if (_regSingles[singleId])
+                throw new Error(`'${depId}' is already registered`);
+
+            _regSingles[singleId] = obj;
+            log(`'${depId}' is registered`);
         };
 
         this.setDebug = function (data) {

package/src/Api/Container.js

@@ -1,69 +0,0 @@
-/**
- * Interface for the Object Container.
- *
- * This is not executable code, it is just for documentation purposes (similar to .h files in the C/C++ language).
- * @interface
- */
-export default class TeqFw_Di_Api_Container {
-    /**
-     * Gets or creates a runtime object by ID.
-     *
-     * @param {string} runtimeDepId - The ID of the runtime object.
-     * @param {string[]} [stack]
-     * @returns {Promise<*>} - A promise that resolves to the runtime object.
-     */
-    get(runtimeDepId, stack) {};
-
-    /**
-     * @returns {TeqFw_Di_Api_Container_Parser}
-     */
-    getParser() {};
-
-    /**
-     * @returns {TeqFw_Di_Api_Container_PreProcessor}
-     */
-    getPreProcessor() {};
-
-    /**
-     * @returns {TeqFw_Di_Api_Container_PostProcessor}
-     */
-    getPostProcessor() {};
-
-    /**
-     * @returns {TeqFw_Di_Container_Resolver} - the default resolver
-     */
-    getResolver() {};
-
-    /**
-     * Registers an object (module, singleton, factory, or prototype) by dependency ID.
-     * @param {string} depId
-     * @param {Object} obj
-     */
-    register(depId, obj) {};
-
-    /**
-     * Enable disable debug output for the object composition process.
-     * @param {boolean} data
-     */
-    setDebug(data) {};
-
-    /**
-     * @param {TeqFw_Di_Api_Container_Parser} data
-     */
-    setParser(data) {};
-
-    /**
-     * @param {TeqFw_Di_Api_Container_PreProcessor} data
-     */
-    setPreProcessor(data) {};
-
-    /**
-     * @param {TeqFw_Di_Api_Container_PostProcessor} data
-     */
-    setPostProcessor(data) {};
-
-    /**
-     * @param {TeqFw_Di_Api_Container_Resolver} data
-     */
-    setResolver(data) {};
-};