@notjustcoders/ioc-arise 1.1.2 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyser/module-dependency-resolver.d.ts.map +1 -1
- package/dist/analyser/module-dependency-resolver.js +4 -1
- package/dist/analyser/module-dependency-resolver.js.map +1 -1
- package/dist/generator/modular/module-dependency-resolver.d.ts.map +1 -1
- package/dist/generator/modular/module-dependency-resolver.js +5 -2
- package/dist/generator/modular/module-dependency-resolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-dependency-resolver.d.ts","sourceRoot":"","sources":["../../src/analyser/module-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC9C;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;IACvD,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAK1D,OAAO,IAAI,sBAAsB;IAWjC,OAAO,CAAC,yBAAyB;
|
|
1
|
+
{"version":3,"file":"module-dependency-resolver.d.ts","sourceRoot":"","sources":["../../src/analyser/module-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CAC9C;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;IACvD,OAAO,CAAC,oBAAoB,CAAsB;gBAEtC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAK1D,OAAO,IAAI,sBAAsB;IAWjC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,0BAA0B;IA2BlC,OAAO,CAAC,eAAe;IAUvB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;CAKpD"}
|
|
@@ -20,9 +20,12 @@ class ModuleDependencyResolver {
|
|
|
20
20
|
const interfaceToModuleMap = new Map();
|
|
21
21
|
for (const [moduleName, classes] of this.moduleGroupedClasses) {
|
|
22
22
|
for (const classInfo of classes) {
|
|
23
|
+
// Map both interface names and class names to their modules
|
|
23
24
|
if (classInfo.interfaceName) {
|
|
24
25
|
interfaceToModuleMap.set(classInfo.interfaceName, moduleName);
|
|
25
26
|
}
|
|
27
|
+
// Also map class names to their modules for cross-module class dependencies
|
|
28
|
+
interfaceToModuleMap.set(classInfo.name, moduleName);
|
|
26
29
|
}
|
|
27
30
|
}
|
|
28
31
|
return interfaceToModuleMap;
|
|
@@ -38,7 +41,7 @@ class ModuleDependencyResolver {
|
|
|
38
41
|
const moduleDeps = moduleDependencies.get(moduleName);
|
|
39
42
|
for (const classInfo of classes) {
|
|
40
43
|
for (const dependency of classInfo.dependencies) {
|
|
41
|
-
// Check if this dependency is an interface from another module
|
|
44
|
+
// Check if this dependency is an interface or class from another module
|
|
42
45
|
const dependencyModule = this.interfaceToModuleMap.get(dependency.name);
|
|
43
46
|
if (dependencyModule && dependencyModule !== moduleName) {
|
|
44
47
|
moduleDeps.add(dependencyModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-dependency-resolver.js","sourceRoot":"","sources":["../../src/analyser/module-dependency-resolver.ts"],"names":[],"mappings":";;;AACA,oEAAgE;AAQhE,MAAa,wBAAwB;IAInC,YAAY,oBAA8C;QACxD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC/D,CAAC;IAED,OAAO;QACL,MAAM,kBAAkB,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAE5D,OAAO;YACL,aAAa,EAAE,UAAU,CAAC,MAAM;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAEO,yBAAyB;QAC/B,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEvD,KAAK,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9D,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;gBAChC,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;oBAC5B,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;gBAChE,CAAC;
|
|
1
|
+
{"version":3,"file":"module-dependency-resolver.js","sourceRoot":"","sources":["../../src/analyser/module-dependency-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-dependency-resolver.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/module-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;gBAE3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAI1D;;OAEG;IACH,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE;IAarI;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;OAEG;IACH,OAAO,CAAC,4BAA4B;
|
|
1
|
+
{"version":3,"file":"module-dependency-resolver.d.ts","sourceRoot":"","sources":["../../../src/generator/modular/module-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;gBAE3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAI1D;;OAEG;IACH,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE;IAarI;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;OAEG;IACH,OAAO,CAAC,4BAA4B;CAkBrC"}
|
|
@@ -44,10 +44,13 @@ class ModuleDependencyResolver {
|
|
|
44
44
|
for (const depModule of moduleDeps) {
|
|
45
45
|
const depModuleClasses = this.moduleGroupedClasses.get(depModule);
|
|
46
46
|
if (depModuleClasses) {
|
|
47
|
-
|
|
47
|
+
// Check both interface name and class name
|
|
48
|
+
const depClass = depModuleClasses.find(c => c.interfaceName === dependency || c.name === dependency);
|
|
48
49
|
if (depClass) {
|
|
49
50
|
const depModuleVarName = shared_1.InstantiationUtils.toCamelCase(depModule) + 'Container';
|
|
50
|
-
|
|
51
|
+
// Use the interface name if available, otherwise use the class name
|
|
52
|
+
const propertyName = depClass.interfaceName || depClass.name;
|
|
53
|
+
return `${depModuleVarName}.${propertyName}`;
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-dependency-resolver.js","sourceRoot":"","sources":["../../../src/generator/modular/module-dependency-resolver.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAE/C;;;GAGG;AACH,MAAa,wBAAwB;IAGnC,YAAY,oBAA8C;QACxD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,yBAAyB,CAAC,SAAoB,EAAE,aAA0B,EAAE,UAAuB,EAAE,eAAqB;QACxH,MAAM,eAAe,GAAa,EAAE,CAAC;QAErC,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;YAC5G,IAAI,GAAG,EAAE,CAAC;gBACR,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACK,yBAAyB,CAAC,UAAkB,EAAE,aAA0B,EAAE,UAAuB,EAAE,eAAqB,EAAE,eAA2B;QAC3J,6CAA6C;QAC7C,MAAM,iBAAiB,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACpF,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,+DAA+D;QAC/D,MAAM,mBAAmB,GAAG,2BAAkB,CAAC,yBAAyB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAEzG,8CAA8C;QAC9C,OAAO,2BAAkB,CAAC,sBAAsB,CAAC,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IACrI,CAAC;IAED;;OAEG;IACK,4BAA4B,CAAC,UAAkB,EAAE,UAAuB;QAC9E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClE,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"module-dependency-resolver.js","sourceRoot":"","sources":["../../../src/generator/modular/module-dependency-resolver.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAE/C;;;GAGG;AACH,MAAa,wBAAwB;IAGnC,YAAY,oBAA8C;QACxD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,yBAAyB,CAAC,SAAoB,EAAE,aAA0B,EAAE,UAAuB,EAAE,eAAqB;QACxH,MAAM,eAAe,GAAa,EAAE,CAAC;QAErC,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;YAC5G,IAAI,GAAG,EAAE,CAAC;gBACR,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACK,yBAAyB,CAAC,UAAkB,EAAE,aAA0B,EAAE,UAAuB,EAAE,eAAqB,EAAE,eAA2B;QAC3J,6CAA6C;QAC7C,MAAM,iBAAiB,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACpF,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,+DAA+D;QAC/D,MAAM,mBAAmB,GAAG,2BAAkB,CAAC,yBAAyB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAEzG,8CAA8C;QAC9C,OAAO,2BAAkB,CAAC,sBAAsB,CAAC,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IACrI,CAAC;IAED;;OAEG;IACK,4BAA4B,CAAC,UAAkB,EAAE,UAAuB;QAC9E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClE,IAAI,gBAAgB,EAAE,CAAC;gBACrB,2CAA2C;gBAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;gBACrG,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,gBAAgB,GAAG,2BAAkB,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;oBACjF,oEAAoE;oBACpE,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAC;oBAC7D,OAAO,GAAG,gBAAgB,IAAI,YAAY,EAAE,CAAC;gBAC/C,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AA7DD,4DA6DC"}
|