From 2d9610b309d5ca356ecfbefb09e3c295524e3f9a Mon Sep 17 00:00:00 2001
From: Dennis Lin <me@dennislin.io>
Date: Fri, 2 Nov 2018 15:00:45 -0700
Subject: [PATCH] Fix aliasing with optional tokens

https://github.com/fusionjs/fusion-core/pull/335
---
 src/__tests__/dependency-resolution.js | 83 ++++++++++++++++++++++++++
 src/base-app.js                        |  6 +-
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/__tests__/dependency-resolution.js b/src/__tests__/dependency-resolution.js
index c68c6801..664e6f27 100644
--- a/src/__tests__/dependency-resolution.js
+++ b/src/__tests__/dependency-resolution.js
@@ -183,6 +183,89 @@ tape('dependency registration with aliases', t => {
   t.end();
 });
 
+tape('optional dependency registration with aliases', t => {
+  const app = new App('el', el => el);
+  t.ok(app, 'creates an app');
+  const counters = {
+    a: 0,
+    b: 0,
+    c: 0,
+    d: 0,
+  };
+
+  const PluginA: FusionPlugin<void, AType> = createPlugin({
+    provides: () => {
+      counters.a++;
+      t.equal(counters.a, 1, 'only instantiates once');
+      return {
+        a: 'PluginA',
+      };
+    },
+  });
+  const PluginB: FusionPlugin<{a: Token<AType>}, BType> = createPlugin({
+    deps: {
+      a: TokenA,
+    },
+    provides: deps => {
+      counters.b++;
+      t.equal(deps.a.a, 'PluginA');
+      t.equal(counters.b, 1, 'only instantiates once');
+      return {
+        b: 'PluginB',
+      };
+    },
+  });
+
+  type PluginCType = FusionPlugin<
+    {a: typeof TokenA, b: typeof TokenB.optional},
+    CType
+  >;
+  const PluginC: PluginCType = createPlugin({
+    deps: {
+      a: TokenA,
+      b: TokenB.optional,
+    },
+    provides: deps => {
+      counters.c++;
+      t.equal(deps.a.a, 'PluginA');
+      t.equal(deps.b && deps.b.b, 'PluginD', 'uses correct alias');
+      t.equal(counters.c, 1, 'only instantiates once');
+      return {
+        c: 'PluginC',
+      };
+    },
+  });
+
+  const PluginD: FusionPlugin<{a: Token<AType>}, BType> = createPlugin({
+    deps: {
+      a: TokenA,
+    },
+    provides: deps => {
+      counters.d++;
+      t.equal(deps.a.a, 'PluginA');
+      t.equal(counters.d, 1, 'only instantiates once');
+      return {
+        b: 'PluginD',
+      };
+    },
+  });
+
+  app.register(TokenA, PluginA);
+  app.register(TokenB, PluginB);
+  app.register(TokenC, PluginC).alias(TokenB, TokenD);
+  app.register(TokenD, PluginD);
+  t.equal(counters.a, 0, 'does not instantiate until resolve is called');
+  t.equal(counters.b, 0, 'does not instantiate until resolve is called');
+  t.equal(counters.c, 0, 'does not instantiate until resolve is called');
+  t.equal(counters.d, 0, 'does not instantiate until resolve is called');
+  app.resolve();
+  t.equal(counters.a, 1, 'only instantiates once');
+  t.equal(counters.b, 1, 'only instantiates once');
+  t.equal(counters.c, 1, 'only instantiates once');
+  t.equal(counters.d, 1, 'only instantiates once');
+  t.end();
+});
+
 tape('dependency registration with aliasing non-plugins', t => {
   const app = new App('el', el => el);
   t.ok(app, 'creates an app');
diff --git a/src/base-app.js b/src/base-app.js
index 6e4eaa2e..02d31473 100644
--- a/src/base-app.js
+++ b/src/base-app.js
@@ -92,7 +92,7 @@ class FusionApp {
     const alias = (sourceToken: *, destToken: *) => {
       this._dependedOn.add(getTokenRef(destToken));
       if (aliases) {
-        aliases.set(sourceToken, destToken);
+        aliases.set(getTokenRef(sourceToken), destToken);
       }
       return {alias};
     };
@@ -140,8 +140,8 @@ class FusionApp {
     const appliedEnhancers = [];
     const resolveToken = (token: Token<TResolved>, tokenAliases) => {
       // Base: if we have already resolved the type, return it
-      if (tokenAliases && tokenAliases.has(token)) {
-        const newToken = tokenAliases.get(token);
+      if (tokenAliases && tokenAliases.has(getTokenRef(token))) {
+        const newToken = tokenAliases.get(getTokenRef(token));
         if (newToken) {
           token = newToken;
         }