@notjustcoders/ioc-arise 1.1.9 → 1.1.10

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.
Files changed (6) hide show
  1. package/dist/generator/modular/module-dependency-resolver.js +2 -2
  2. package/dist/generator/modular/module-dependency-resolver.js.map +1 -1
  3. package/dist/generator/shared/instantiation-utils.d.ts.map +1 -1
  4. package/dist/generator/shared/instantiation-utils.js +3 -4
  5. package/dist/generator/shared/instantiation-utils.js.map +1 -1
  6. package/package.json +1 -1
package/dist/generator/modular/module-dependency-resolver.js CHANGED
@@ -50,8 +50,8 @@ class ModuleDependencyResolver {
50
50
  c.abstractClassName === dependency);
51
51
  if (depClass) {
52
52
  const depModuleVarName = shared_1.InstantiationUtils.toCamelCase(depModule) + 'Container';
53
- // Use the interface name if available, otherwise use the class name
54
- const propertyName = depClass.interfaceName || depClass.name;
53
+ // PRIORITIZE interface name, then abstract class name, then class name (for dependency inversion)
54
+ const propertyName = depClass.interfaceName || depClass.abstractClassName || depClass.name;
55
55
  return `${depModuleVarName}.${propertyName}`;
56
56
  }
57
57
  }
package/dist/generator/modular/module-dependency-resolver.js.map CHANGED
@@ -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,4DAA4D;gBAC5D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC,CAAC,aAAa,KAAK,UAAU;oBAC9B,CAAC,CAAC,IAAI,KAAK,UAAU;oBACrB,CAAC,CAAC,iBAAiB,KAAK,UAAU,CACnC,CAAC;gBACF,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;AAjED,4DAiEC"}
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,4DAA4D;gBAC5D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC,CAAC,aAAa,KAAK,UAAU;oBAC9B,CAAC,CAAC,IAAI,KAAK,UAAU;oBACrB,CAAC,CAAC,iBAAiB,KAAK,UAAU,CACnC,CAAC;gBACF,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,gBAAgB,GAAG,2BAAkB,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;oBACjF,kGAAkG;oBAClG,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC,IAAI,CAAC;oBAC3F,OAAO,GAAG,gBAAgB,IAAI,YAAY,EAAE,CAAC;gBAC/C,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AAjED,4DAiEC"}
package/dist/generator/shared/instantiation-utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instantiation-utils.d.ts","sourceRoot":"","sources":["../../../src/generator/shared/instantiation-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instantiation-utils.d.ts","sourceRoot":"","sources":["../../../src/generator/shared/instantiation-utils.ts"],"names":[],"mappings":"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"}
package/dist/generator/shared/instantiation-utils.js CHANGED
@@ -313,11 +313,10 @@ class InstantiationUtils {
313
313
  getters.push(this.generateGetterProperty(classInfo.abstractClassName, className, getterCall, ' '));
314
314
  }
315
315
  }
316
- // Create a getter for the implementation class name as a secondary option
317
- // (only if it's different from interface/abstract class names)
316
+ // ONLY create a getter for the implementation class name if there's NO interface or abstract class
317
+ // This ensures we don't expose redundant getters
318
318
  const hasInterfaceOrAbstractGetter = classInfo.interfaceName || classInfo.abstractClassName;
319
- if (!hasInterfaceOrAbstractGetter ||
320
- (classInfo.name !== classInfo.interfaceName && classInfo.name !== classInfo.abstractClassName)) {
319
+ if (!hasInterfaceOrAbstractGetter) {
321
320
  if (this.isTransient(classInfo)) {
322
321
  const factoryCall = this.generateFunctionCall(this.generateFactoryName(className));
323
322
  getters.push(this.generateGetterProperty(className, className, factoryCall, ' '));
package/dist/generator/shared/instantiation-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instantiation-utils.js","sourceRoot":"","sources":["../../../src/generator/shared/instantiation-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instantiation-utils.js","sourceRoot":"","sources":["../../../src/generator/shared/instantiation-utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@notjustcoders/ioc-arise",
3
- "version": "1.1.9",
3
+ "version": "1.1.10",
4
4
  "description": "Arise type-safe IoC containers from your code. Zero overhead, zero coupling.",
5
5
  "main": "dist/index.js",
6
6
  "bin": {