@travetto/di 2.0.0 → 2.1.0

package/README.md

@@ -11,7 +11,7 @@ npm install @travetto/di
 [Dependency injection](https://en.wikipedia.org/wiki/Dependency_injection) is a framework primitive.  When used in conjunction with automatic file scanning, it provides for handling of application dependency wiring. Due to the nature of [Typescript](https://typescriptlang.org) and type erasure of interfaces, dependency injection only supports `class`es as type signafiers. The primary goal of dependency injection is to allow for separation of concerns of object creation and it's usage.
 
 ## Declaration
-The [@Injectable](https://github.com/travetto/travetto/tree/main/module/di/src/decorator.ts#L30) and [@InjectableFactory](https://github.com/travetto/travetto/tree/main/module/di/src/decorator.ts#L72) decorators provide the registration of dependencies.   Dependency declaration revolves around exposing `class`es and subtypes thereof to provide necessary functionality.  Additionally, the framework will utilize dependencies to satisfy contracts with various implementations (e.g. [MongoModelService](https://github.com/travetto/travetto/tree/main/module/model-mongo/src/service.ts#L42) provides itself as an injectable candidate for [ModelCrudSupport](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts).
+The [@Injectable](https://github.com/travetto/travetto/tree/main/module/di/src/decorator.ts#L30) and [@InjectableFactory](https://github.com/travetto/travetto/tree/main/module/di/src/decorator.ts#L72) decorators provide the registration of dependencies.   Dependency declaration revolves around exposing `class`es and subtypes thereof to provide necessary functionality.  Additionally, the framework will utilize dependencies to satisfy contracts with various implementations (e.g. [MongoModelService](https://github.com/travetto/travetto/tree/main/module/model-mongo/src/service.ts#L44) provides itself as an injectable candidate for [ModelCrudSupport](https://github.com/travetto/travetto/tree/main/module/model/src/service/crud.ts).
 
 **Code: Example Injectable**
 ```typescript

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/di",
   "displayName": "Dependency Injection",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Dependency registration/management and injection support.",
   "keywords": [
     "ast-transformations",
@@ -29,12 +29,12 @@
     "directory": "module/di"
   },
   "dependencies": {
-    "@travetto/transformer": "^2.0.0",
-    "@travetto/registry": "^2.0.0"
+    "@travetto/transformer": "^2.1.0",
+    "@travetto/registry": "^2.1.0"
   },
   "devDependencies": {
-    "@travetto/config": "^2.0.0",
-    "@travetto/schema": "^2.0.0"
+    "@travetto/config": "^2.1.0",
+    "@travetto/schema": "^2.1.0"
   },
   "docDependencies": {
     "@travetto/model-mongo": true,

package/src/decorator.ts

@@ -52,7 +52,7 @@ export function InjectArgs(configs?: InjectConfig[][]) {
  * @augments `@trv:di/Inject`
  */
 export function Inject(first?: InjectConfig | symbol, ...args: (InjectConfig | undefined)[]) {
-  return (target: unknown, propertyKey: string | symbol, idx?: number) => {
+  return (target: unknown, propertyKey: string | symbol, idx?: number | PropertyDescriptor) => {
     if (typeof idx !== 'number') { // Only register if on property
       const config: InjectConfig = collapseConfig(first, ...args);
 

package/support/transformer.injectable.ts

@@ -1,7 +1,7 @@
 import * as ts from 'typescript';
 
 import {
-  TransformerState, DecoratorMeta, OnClass, OnProperty, OnStaticMethod, DecoratorUtil, LiteralUtil, TransformerId
+  TransformerState, DecoratorMeta, OnClass, OnProperty, OnStaticMethod, DecoratorUtil, LiteralUtil, TransformerId, OnSetter
 } from '@travetto/transformer';
 
 const INJECTABLE_MOD = '@travetto/di/src/decorator';
@@ -16,7 +16,7 @@ export class InjectableTransformer {
   /**
    * Handle a specific declaration param/property
    */
-  static processDeclaration(state: TransformerState, param: ts.ParameterDeclaration | ts.PropertyDeclaration) {
+  static processDeclaration(state: TransformerState, param: ts.ParameterDeclaration | ts.SetAccessorDeclaration | ts.PropertyDeclaration) {
     const existing = state.findDecorator(this, param, 'Inject', INJECTABLE_MOD);
 
     if (!(existing || ts.isParameter(param))) {
@@ -32,7 +32,7 @@ export class InjectableTransformer {
     }
 
     args.unshift(state.fromLiteral({
-      target: state.getOrImport(state.resolveExternalType(param)),
+      target: state.getOrImport(state.resolveExternalType(ts.isSetAccessorDeclaration(param) ? param.parameters[0] : param)),
       optional
     }));
 
@@ -102,6 +102,26 @@ export class InjectableTransformer {
     );
   }
 
+  /**
+  * Handle Inject annotations for fields/args
+  */
+  @OnSetter('Inject')
+  static registerInjectSetter(state: TransformerState, node: ts.SetAccessorDeclaration, dm?: DecoratorMeta) {
+    const decl = state.findDecorator(this, node, 'Inject', INJECTABLE_MOD);
+
+    // Doing decls
+    return state.factory.updateSetAccessorDeclaration(
+      node,
+      DecoratorUtil.spliceDecorators(node, decl, [
+        state.createDecorator(INJECTABLE_MOD, 'Inject', ...this.processDeclaration(state, node)),
+      ], 0),
+      node.modifiers,
+      node.name,
+      node.parameters,
+      node.body
+    );
+  }
+
   /**
    * Handle InjectableFactory creation
    */