chore: cleanups

src/typegate/src/runtimes/typegraph.ts

@@ -20,7 +20,6 @@ export type DeprecatedArg = { includeDeprecated?: boolean };
 export class TypeGraphRuntime extends Runtime {
   tg: TypeGraphDS;
   #typeGen: IntrospectionTypeEmitter | null = null;
-  #visibility: TypeVisibility | null = null;
 
   private constructor(tg: TypeGraphDS) {
     super(TypeGraph.formatName(tg));
@@ -63,18 +62,22 @@ export class TypeGraphRuntime extends Runtime {
     ];
   }
 
-  initFormatter(
+  initTypeGenerator(
     config: TypegateConfigBase,
     denoRuntime: DenoRuntime,
   ) {
-    this.#visibility = new TypeVisibility(this.tg, denoRuntime, config);
     this.#typeGen = new IntrospectionTypeEmitter(
       this.tg,
-      this.#visibility,
+      new TypeVisibility(this.tg, denoRuntime, config),
     );
   }
 
   get #types() {
+    if (!this.#typeGen) {
+      // Unreachable
+      throw new Error("Invalid state: type generator not initialized");
+    }
+
     return this.#typeGen!;
   }
 
@@ -110,8 +113,8 @@ export class TypeGraphRuntime extends Runtime {
       // https://github.com/graphql/graphql-js/blob/main/src/type/introspection.ts#L36
       description: () => `${root.type} typegraph`,
       types: () => this.#typesResolver(args),
-      queryType: () => this.#types?.getRootSchema("Query"),
-      mutationType: this.#types?.getRootSchema("Mutation"),
+      queryType: () => this.#types.getRootSchema("Query"),
+      mutationType: this.#types.getRootSchema("Mutation"),
       subscriptionType: () => null,
       directives: () => [],
     };
@@ -127,10 +130,7 @@ export class TypeGraphRuntime extends Runtime {
 
   #withPrecomputeVisibility(resolver: Resolver): Resolver {
     return async (args) => {
-      this.#visibility!.reset();
-      await this.#visibility!.preComputeAllPolicies(args ?? {});
-
-      this.#types.reset();
+      await this.#types.resetComputations(args);
       this.#types.emitRoot();
 
       return resolver(args);

src/typegate/src/runtimes/typegraph/type_emitter.ts

@@ -25,7 +25,7 @@ import {
   typeGenericCustomScalar,
 } from "./helpers.ts";
 import { TypeKind } from "graphql";
-import { Resolver } from "../../types.ts";
+import { Resolver, ResolverArgs } from "../../types.ts";
 import { getLogger } from "../../log.ts";
 import { FunctionNode } from "../../typegraph/type_node.ts";
 import { ensure } from "../../utils.ts";
@@ -55,7 +55,12 @@ export class IntrospectionTypeEmitter {
     this.#typesDefined = new Set();
   }
 
-  reset() {
+  async resetComputations(args: ResolverArgs) {
+    if (this.visibility) {
+      this.visibility!.reset();
+      await this.visibility!.preComputeAllPolicies(args ?? {});
+    }
+
     this.#types = [];
     this.#typesDefined = new Set();
   }
@@ -185,6 +190,8 @@ export class IntrospectionTypeEmitter {
     return {
       // Note: this is arbitrary, injections and policies will reduce the field
       // thus making a completely different type
+      // Alternatively, we can return null and make the parent itself invisible (we don't emit an empty object scalar)
+      // but in a way the parent field is accessible
       adhocId: originalEntries.length == entries.length
         ? ""
         : `_f${entries.length == 0 ? "empty" : entries.length}`,
@@ -278,17 +285,15 @@ export class IntrospectionTypeEmitter {
 
     gctx.path.push(type.title);
 
-    let ret = null;
     if (isScalar(type)) {
-      ret = this.#emitScalar(type, gctx);
+      this.#emitScalar(type, gctx);
     } else if (isObject(type)) {
-      ret = this.#emitObject(type, gctx);
+      this.#emitObject(type, gctx);
     } else {
       throw new Error(`Unhandled "${type.type}" of title ${type.title}`);
     }
 
     gctx.path.pop();
-    return ret;
   }
 
   #emitWrapperAndReturnSchema(

src/typegate/src/typegate/mod.ts

@@ -454,7 +454,7 @@ export class Typegate implements AsyncDisposable {
           typegraph: typegraphRuntime,
         },
       );
-      (typegraphRuntime as TypeGraphRuntime).initFormatter(
+      (typegraphRuntime as TypeGraphRuntime).initTypeGenerator(
         this.config.base,
         introspectionRuntimeRefData.denoRuntime as DenoRuntime,
       );