@currentjs/gen 0.5.2 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.5.3] - 2026-04-07
+
+- expand autowiring (DI) for providers
+
 ## [0.5.2] - 2026-03-21
 
 - skip templates on generation; introduced a flag to regenerate templates

package/dist/commands/generateAll.js

@@ -191,14 +191,38 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
             // --- Build DI instantiation order ---
             const providerVarByType = new Map();
             providerVarByType.set('ISqlProvider', (_c = dbVarByKey[allDatabaseKeys[0]]) !== null && _c !== void 0 ? _c : 'dbMysql');
+            // Scan local providers and register their class names + implemented interfaces
+            const providerCastLines = [];
+            if (providersConfig) {
+                const GENERIC_INTERFACES = new Set(['IProvider', 'ISqlProvider']);
+                for (const [provName, mod] of Object.entries(providersConfig)) {
+                    if (!mod || typeof mod !== 'string')
+                        continue;
+                    const isLocal = mod.startsWith('.') || mod.startsWith('/');
+                    if (!isLocal)
+                        continue;
+                    const providerDir = path.resolve(srcDir, mod);
+                    const providerClasses = (0, diResolver_1.scanModuleClasses)(providerDir);
+                    for (const cls of providerClasses) {
+                        const varName = provName.charAt(0).toLowerCase() + provName.slice(1);
+                        providerVarByType.set(cls.className, varName);
+                        for (const iface of cls.implementedInterfaces) {
+                            if (!GENERIC_INTERFACES.has(iface)) {
+                                providerVarByType.set(iface, varName);
+                            }
+                        }
+                        providerCastLines.push(`const ${varName} = providers['${provName}'] as ${cls.className};`);
+                    }
+                }
+            }
             // Per-class provider var: map each class to its module's database variable
             const classProviderVar = new Map();
             for (const scan of moduleScans) {
                 const dbVar = (_d = dbVarByKey[scan.databaseKey]) !== null && _d !== void 0 ? _d : dbVarByKey[Object.keys(dbVarByKey)[0]];
                 const classes = allClasses.filter(c => c.filePath.startsWith(scan.moduleDir + path.sep));
                 for (const cls of classes) {
-                    const hasProviderParam = cls.constructorParams.some(p => providerVarByType.has(p.type));
-                    if (hasProviderParam) {
+                    const hasSqlProviderParam = cls.constructorParams.some(p => p.type === 'ISqlProvider');
+                    if (hasSqlProviderParam) {
                         classProviderVar.set(cls.className, dbVar);
                     }
                 }
@@ -226,6 +250,9 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
             // --- Build wiring block ---
             const wiringLines = [];
             wiringLines.push(dbLines.join('\n'));
+            if (providerCastLines.length > 0) {
+                wiringLines.push(providerCastLines.join('\n'));
+            }
             const nonControllers = steps.filter(s => !s.isController);
             const controllers = steps.filter(s => s.isController);
             for (const step of nonControllers) {

package/dist/utils/diResolver.d.ts

@@ -8,6 +8,7 @@ export interface ClassInfo {
     isController: boolean;
     isInjectable: boolean;
     constructorParams: ConstructorParam[];
+    implementedInterfaces: string[];
 }
 export interface InstantiationStep {
     className: string;

package/dist/utils/diResolver.js

@@ -42,6 +42,7 @@ const path = __importStar(require("path"));
 const INJECTABLE_RE = /@Injectable\s*\(/;
 const CONTROLLER_RE = /@Controller\s*\(/;
 const EXPORT_CLASS_RE = /export\s+class\s+(\w+)/;
+const IMPLEMENTS_RE = /\bimplements\s+([^{]+)/;
 const CONSTRUCTOR_PARAMS_RE = /constructor\s*\(([^)]*)\)/s;
 const PARAM_RE = /(?:private|protected|public)\s+(\w+)\s*:\s*([A-Za-z_]\w*)/g;
 function parseClassFile(filePath) {
@@ -70,7 +71,11 @@ function parseClassFile(filePath) {
             constructorParams.push({ name: match[1], type: match[2] });
         }
     }
-    return { className, filePath, isController, isInjectable, constructorParams };
+    const implMatch = content.match(IMPLEMENTS_RE);
+    const implementedInterfaces = implMatch
+        ? implMatch[1].split(',').map(s => s.trim().replace(/<[^>]*>/g, '').trim()).filter(Boolean)
+        : [];
+    return { className, filePath, isController, isInjectable, constructorParams, implementedInterfaces };
 }
 function walkTsFiles(dir) {
     const results = [];
@@ -135,7 +140,7 @@ function buildInstantiationOrder(classes, providerVarByType, classProviderVar, s
         varNames.set(className, varName);
         const constructorArgs = [];
         for (const param of cls.constructorParams) {
-            if (classProviderVar.has(className) && providerVarByType.has(param.type)) {
+            if (classProviderVar.has(className) && param.type === 'ISqlProvider') {
                 constructorArgs.push(classProviderVar.get(className));
             }
             else if (providerVarByType.has(param.type)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@currentjs/gen",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "CLI code generator",
   "license": "LGPL-3.0",
   "author": "Konstantin Zavalny",