fix(context): instantiate class with non-injected arguments

loopbackio · Apr 11, 2019 · 6699825 · 6699825
1 parent 7a372a8
commit 6699825
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/context/src/__tests__/unit/resolver.unit.ts b/packages/context/src/__tests__/unit/resolver.unit.ts
@@ -33,6 +33,23 @@ describe('constructor injection', () => {
     expect(t.foo).to.eql('FOO');
   });
 
+  it('allows non-injected arguments in constructor', () => {
+    class TestClass {
+      constructor(
+        @inject('foo') public foo: string,
+        public nonInjectedArg: string,
+      ) {}
+    }
+
+    let theNonInjectedArg = 'BAZ';
+
+    const test = instantiateClass(TestClass, ctx, undefined, [
+      theNonInjectedArg,
+    ]) as TestClass;
+    expect(test.foo).to.eql('FOO');
+    expect(test.nonInjectedArg).to.eql('BAZ');
+  });
+
   it('can report error for missing binding key', () => {
     class TestClass {
       constructor(@inject('', {x: 'bar'}) public fooBar: string) {}

diff --git a/packages/context/src/resolver.ts b/packages/context/src/resolver.ts
@@ -55,7 +55,13 @@ export function instantiateClass<T>(
       debug('Non-injected arguments:', nonInjectedArgs);
     }
   }
-  const argsOrPromise = resolveInjectedArguments(ctor, '', ctx, session);
+  const argsOrPromise = resolveInjectedArguments(
+    ctor,
+    '',
+    ctx,
+    session,
+    nonInjectedArgs,
+  );
   const propertiesOrPromise = resolveInjectedProperties(ctor, ctx, session);
   const inst: ValueOrPromise<T> = transformValueOrPromise(
     argsOrPromise,