fix: Fix filtering on the wrong subtype. (#1082)

packages/orm/src/configure.ts

@@ -10,9 +10,11 @@ import { ReactiveReferenceImpl, Reference } from "./relations";
 import { ReactiveFieldImpl } from "./relations/ReactiveField";
 import { ReactiveQueryFieldImpl } from "./relations/ReactiveQueryField";
 import { isCannotBeUpdatedRule } from "./rules";
+import { fail } from "./utils";
 
 const tagToConstructorMap = new Map<string, MaybeAbstractEntityConstructor<any>>();
 const tableToMetaMap = new Map<string, EntityMetadata>();
+const typeToMetaMap = new Map<string, EntityMetadata>();
 
 /** Performs our boot-time initialization, i.e. hooking up reactivity. */
 export function configureMetadata(metas: EntityMetadata[]): void {
@@ -40,6 +42,10 @@ export function getMetadataForTable(tableName: string): EntityMetadata {
   return tableToMetaMap.get(tableName) ?? fail(`Unknown table ${tableName}`);
 }
 
+export function getMetadataForType(typeName: string): EntityMetadata {
+  return typeToMetaMap.get(typeName) ?? fail(`Unknown type ${typeName}`);
+}
+
 export function maybeGetConstructorFromReference(
   value: string | Entity | Reference<any, any, any> | undefined,
 ): MaybeAbstractEntityConstructor<any> | undefined {
@@ -53,6 +59,7 @@ function populateConstructorMaps(metas: EntityMetadata[]): void {
     if (!meta.baseType) tagToConstructorMap.set(meta.tagName, meta.cstr);
     // Same for tables, but include subclass tables
     tableToMetaMap.set(meta.tableName, meta);
+    typeToMetaMap.set(meta.type, meta);
   }
 }
 

packages/orm/src/reactiveHints.ts

@@ -12,6 +12,7 @@ import {
   getSubMetas,
 } from "./EntityMetadata";
 import { Changes, FieldStatus, ManyToOneFieldStatus } from "./changes";
+import { getMetadataForType } from "./configure";
 import { isChangeableField } from "./fields";
 import { getProperties } from "./getProperties";
 import { LoadHint, Loadable, Loaded } from "./loadHints";
@@ -424,7 +425,7 @@ function isTypeOrSubType(entity: Entity, typeName: string): boolean {
   if (meta.type === typeName) return true;
   // Otherwise see if the entity is a subtype of the typeName, i.e. if our poly/type
   // filter is `@Publisher`, and we're a `SmallPublisher`, that's valid to traverse.
-  for (const other of getSubMetas(meta)) {
+  for (const other of getSubMetas(getMetadataForType(typeName))) {
     if (other.type === typeName) return true;
   }
   return false;