@teqfw/di 0.11.0 → 0.12.1

package/RELEASE.md

@@ -1,5 +1,14 @@
 # @teqfw/di releases
 
+
+## 0.12.1
+
+* Hotfix for Windows delimiters.
+
+## 0.12.0
+
+* Standardized comments style for improved code readability and maintenance.
+
 ## 0.11.0
 
 * Restructure `/@teqfw/di/replace` node in `teqfw.json`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teqfw/di",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "description": "Dependency Injection container based on logical namespaces for ES6 modules.",
   "keywords": [
     "dependency injection",

package/src/Back/Api/Dto/Plugin/Desc.mjs

@@ -27,9 +27,11 @@ TeqFw_Di_Back_Api_Dto_Plugin_Desc.REPLACE = 'replace';
  * @memberOf TeqFw_Di_Back_Api_Dto_Plugin_Desc
  */
 export class Factory {
+    static namespace = NS;
+
     constructor(spec) {
         /** @type {TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload.Factory} */
-        const fAutoload = spec['TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload#Factory$'];
+        const fAutoload = spec['TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload.Factory$'];
 
         /**
          * @param {*} data
@@ -37,7 +39,7 @@ export class Factory {
          */
         this.create = function (data = null) {
 
-            // DEFINE INNER FUNCTIONS
+            // FUNCS
             function parseReplace(data) {
                 const res = {};
                 if (typeof data === 'object')
@@ -55,7 +57,7 @@ export class Factory {
                 return res;
             }
 
-            // MAIN FUNCTIONALITY
+            // MAIN
             const res = new TeqFw_Di_Back_Api_Dto_Plugin_Desc();
             res.autoload = fAutoload.create(data?.autoload);
             res.replace = parseReplace(data?.replace);
@@ -66,4 +68,3 @@ export class Factory {
 
 // freeze DTO class to deny attributes changes and pin namespace
 Object.freeze(TeqFw_Di_Back_Api_Dto_Plugin_Desc);
-Object.defineProperty(Factory, 'name', {value: `${NS}.${Factory.constructor.name}`});

package/src/Back/Plugin/Scanner.mjs

@@ -15,15 +15,15 @@ const TEQFW = 'teqfw.json';
 export default class TeqFw_Di_Back_Plugin_Scanner {
 
     constructor(spec) {
-        // EXTRACT DEPS
+        // DEPS
         /** @type {TeqFw_Di_Back_Defaults} */
         const DEF = spec['TeqFw_Di_Back_Defaults$'];
         /** @type {TeqFw_Di_Back_Api_Dto_Plugin_Desc.Factory} */
-        const fDesc = spec['TeqFw_Di_Back_Api_Dto_Plugin_Desc#Factory$'];
+        const fDesc = spec['TeqFw_Di_Back_Api_Dto_Plugin_Desc.Factory$'];
         /** @type {TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload.Factory} */
-        const fAutoload = spec['TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload#Factory$'];
+        const fAutoload = spec['TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload.Factory$'];
 
-        // DEFINE INSTANCE METHODS
+        // INSTANCE METHODS
 
         this.getDescriptors = async function (path) {
             const result = [];
@@ -75,9 +75,9 @@ export default class TeqFw_Di_Back_Plugin_Scanner {
      * @return {Promise<Object.<string, TeqFw_Di_Back_Api_Dto_Scanned>>} Object-to-path map for found plugins
      */
     async scanFilesystem(path) {
-        // DEFINE INNER FUNCTIONS
+        // FUNCS
         function readData(path) {
-            // DEFINE INNER FUNCTIONS
+            // FUNCS
             /**
              * Check existence of JSON file, read content, parse JSON and return data.
              *
@@ -106,7 +106,7 @@ export default class TeqFw_Di_Back_Plugin_Scanner {
                 return result;
             }
 
-            // MAIN FUNCTIONALITY
+            // MAIN
             let result = null;
             const pathTeqfw = join(path, TEQFW);
             const pathPkg = join(path, PACKAGE);
@@ -121,7 +121,7 @@ export default class TeqFw_Di_Back_Plugin_Scanner {
             return result;
         }
 
-        // MAIN FUNCTIONALITY
+        // MAIN
         const result = {};
         // get scan data for root folder (application itself)
         const dataRoot = readData(path);

package/src/Shared/Api/Dto/Plugin/Desc/Autoload.mjs

@@ -28,6 +28,8 @@ TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload.PATH = 'path';
  * @memberOf TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload
  */
 export class Factory {
+    static namespace = NS;
+
     constructor() {
         /**
          * @param {TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload|null} data
@@ -46,4 +48,3 @@ export class Factory {
 
 // freeze DTO class to deny attributes changes and pin namespace
 Object.freeze(TeqFw_Di_Shared_Api_Dto_Plugin_Desc_Autoload);
-Object.defineProperty(Factory, 'name', {value: `${NS}.${Factory.constructor.name}`});

package/src/Shared/Container.mjs

@@ -62,7 +62,7 @@ export default class TeqFw_Di_Shared_Container {
          */
         async function getObject(mainId, uplineDeps) {
 
-            // DEFINE INNER FUNCTIONS
+            // FUNCS
             /**
              * Add 'spec' proxy as fnConstruct argument and create new object and all deps.
              *
@@ -73,7 +73,7 @@ export default class TeqFw_Di_Shared_Container {
             function _useFactory(fnConstruct) {
                 // This promise will be resolved after all dependencies in spec proxy will be created.
                 return new Promise(function (resolve, reject) {
-                    // MAIN FUNCTIONALITY
+                    // MAIN
                     const constructorType = typeof fnConstruct;
                     if (constructorType === 'object') {
                         // `constructor` is an object, clone this fnConstruct and return cloned object
@@ -162,7 +162,7 @@ export default class TeqFw_Di_Shared_Container {
                 return orig;
             }
 
-            // MAIN FUNCTIONALITY
+            // MAIN
             let result;
             /** @type {TeqFw_Di_Shared_IdParser_Dto} */
             const parsed = $parser.parse(mainId);

package/src/Shared/Resolver.mjs

@@ -12,9 +12,12 @@ const LOGICAL_NS = /^((([A-Z])[A-Za-z0-9_]*)?)$/;
  */
 export default class TeqFw_Di_Shared_Resolver {
     /** @type {TeqFw_Di_Shared_Resolver_LogicalNs} */
-    logicalNs = new LogicalNs()
+    logicalNs = new LogicalNs();
     /** @type {TeqFw_Di_Shared_Resolver_FilepathNs} */
-    filepathNs = new FilepathNs()
+    filepathNs = new FilepathNs();
+    // TODO: this is a hotfix
+    /** @type {boolean} */
+    isWindows = false;
 
     /**
      * Registry sources path mapping details for namespace.
@@ -50,6 +53,10 @@ export default class TeqFw_Di_Shared_Resolver {
             // this is file path based namespace
             result = this.filepathNs.resolveModuleId(moduleId);
         }
+        // TODO: tmp fix for windows
+        if (this.isWindows) {
+            result = 'file://' + result.replace(/\//g, '\\');
+        }
         return result;
     }