Use object type spreads instead of intersections

The previous code is wrong because an object can't simultaneously satisfy two distinct, exact object types. The correct way is using object type spreads as described here: facebook/flow#2626 I'm not sure why things currently type-check.
mwiencek · Mar 17, 2018 · e371bb1 · e371bb1
1 parent 74408df
commit e371bb1
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 158 deletions.
diff --git a/root/components/Aliases/AliasTable.js b/root/components/Aliases/AliasTable.js
@@ -14,7 +14,7 @@ const {l} = require('../../static/scripts/common/i18n');
 type Props = {
   +aliases: $ReadOnlyArray<AliasT>,
   +allowEditing: boolean,
-  +entity: $Subtype<CoreEntityT>,
+  +entity: CoreEntityT,
 };
 
 const AliasTable = (props: Props) => (

diff --git a/root/components/EntityHeader.js b/root/components/EntityHeader.js
@@ -16,7 +16,7 @@ const SubHeader = require('./SubHeader');
 
 type Props = {|
   +editTab?: React.Node,
-  +entity: $Subtype<CoreEntityT>,
+  +entity: CoreEntityT,
   +headerClass: string,
   +heading?: string | React.Node,
   +page: string,

diff --git a/root/components/EntityTabLink.js b/root/components/EntityTabLink.js
@@ -12,7 +12,7 @@ const EntityLink = require('../static/scripts/common/components/EntityLink');
 
 type Props = {|
   +content: string,
-  +entity: EntityT,
+  +entity: CoreEntityT,
   +selected: boolean,
   +subPath: string,
 |};

diff --git a/root/components/EntityTabs.js b/root/components/EntityTabs.js
@@ -47,7 +47,7 @@ const buildLink = (
 );
 
 function buildLinks(
-  entity: $Subtype<EntityT>,
+  entity: CoreEntityT,
   page: string,
   editTab: React.Node,
   hideEditTab: boolean,
@@ -91,7 +91,7 @@ function buildLinks(
 
 type Props = {|
   +editTab: React.Node,
-  +entity: EntityT,
+  +entity: CoreEntityT,
   +hideEditTab?: boolean,
   +page: string,
 |};

diff --git a/root/static/scripts/common/components/CodeLink.js b/root/static/scripts/common/components/CodeLink.js
@@ -19,6 +19,7 @@ const CodeLink = ({code}: Props) => {
   let link = (
     <a href={entityHref(code)}>
       <bdi>
+        {/* $FlowFixMe */}
         <code>{code[code.entityType]}</code>
       </bdi>
     </a>

diff --git a/root/static/scripts/common/utility/entityHref.js b/root/static/scripts/common/utility/entityHref.js
@@ -14,8 +14,13 @@ const nonEmpty = require('./nonEmpty');
 
 const leadingSlash = /^\/?(.*)/;
 
+type LinkableEntity =
+  | CoreEntityT
+  | IsrcT
+  | IswcT;
+
 function entityHref(
-  entity: EntityT | CoreEntityT,
+  entity: LinkableEntity,
   subPath?: string,
 ) {
   const entityType = entity.entityType;