fix(utils): to match early enough, we need build to be passed

Author: benjie

packages/graphile-utils/src/introspectionHelpers.ts

@@ -7,6 +7,7 @@ import {
   PgProc,
 } from "graphile-build-pg";
 import parseIdentifierParts from "./parseIdentifierParts";
+import { Build } from "graphile-build";
 
 export function isAttribute(obj: PgEntity): obj is PgAttribute {
   return obj.kind === PgEntityKind.ATTRIBUTE;
@@ -26,7 +27,8 @@ export function isProcedure(obj: PgEntity): obj is PgProc {
 
 export function entityIsIdentifiedBy(
   obj: PgEntity,
-  identifier: string
+  identifier: string,
+  build: Build
 ): boolean {
   const parts = parseIdentifierParts(identifier);
   if (parts.length === 1) {
@@ -49,10 +51,16 @@ export function entityIsIdentifiedBy(
     const [grandparentName, parentName, expectedName] = parts;
     if (isAttribute(obj) || isConstraint(obj)) {
       // Parent is a table, grandparent is a schema
+      const klass:
+        | PgClass
+        | undefined = build.pgIntrospectionResultsByKind.class.find(
+        (kls: PgClass) => kls.id === obj.classId
+      );
       return (
         obj.name === expectedName &&
-        obj.class.name === parentName &&
-        obj.class.namespaceName === grandparentName
+        !!klass &&
+        klass.name === parentName &&
+        klass.namespaceName === grandparentName
       );
     } else {
       // Parent is a schema; grandparent doesn't make sense

packages/graphile-utils/src/makePgSmartTagsPlugin.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "graphile-build";
+import { Plugin, Build } from "graphile-build";
 import {
   PgEntityKind,
   PgEntity,
@@ -7,7 +7,7 @@ import {
 import { inspect } from "util";
 import { entityIsIdentifiedBy } from "./introspectionHelpers";
 
-export type PgSmartTagFilterFunction<T> = (input: T) => boolean;
+export type PgSmartTagFilterFunction<T> = (input: T, build: Build) => boolean;
 
 export type PgSmartTagTags = {
   [tagName: string]: null | true | string | string[];
@@ -57,17 +57,17 @@ function compileRule<T extends PgEntity>(
     );
   }
 
-  const match: PgSmartTagFilterFunction<T> = obj => {
+  const match: PgSmartTagFilterFunction<T> = (obj, build) => {
     if (obj.kind !== kind) {
       return false;
     }
 
     if (typeof incomingMatch === "function") {
       // User supplied a match function; delegate to that:
-      return incomingMatch(obj);
+      return incomingMatch(obj, build);
     } else if (typeof incomingMatch === "string") {
       // It's a fully-qualified case-sensitive name of the thing.
-      return entityIsIdentifiedBy(obj, incomingMatch);
+      return entityIsIdentifiedBy(obj, incomingMatch, build);
     } else {
       throw new Error(
         "makePgSmartTagsPlugin rule 'match' is neither a string nor a function"
@@ -140,7 +140,7 @@ export function makePgSmartTagsPlugin(
 
             let hits = 0;
             relevantIntrospectionResults.forEach(entity => {
-              if (!rule.match(entity)) {
+              if (!rule.match(entity, build)) {
                 return;
               }
               hits++;