[NTI] Migrate delegate coding conventions to use NominalTypeBuilder.

This paves the way for calling these conventions from GlobalTypeInfoCollector.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170775519

src/com/google/javascript/jscomp/CodingConvention.java

@@ -22,12 +22,11 @@
 import com.google.javascript.rhino.FunctionTypeI;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.NominalTypeBuilder;
+import com.google.javascript.rhino.ObjectTypeI;
 import com.google.javascript.rhino.StaticSourceFile;
-import com.google.javascript.rhino.jstype.FunctionType;
+import com.google.javascript.rhino.TypeIRegistry;
 import com.google.javascript.rhino.jstype.JSTypeNative;
 import com.google.javascript.rhino.jstype.JSTypeRegistry;
-import com.google.javascript.rhino.jstype.ObjectType;
-import com.google.javascript.rhino.jstype.StaticTypedScope;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
@@ -260,9 +259,11 @@ public void applySingletonGetter(
    * also adds properties to the delegator and delegate base.
    */
   public void applyDelegateRelationship(
-      ObjectType delegateSuperclass, ObjectType delegateBase,
-      ObjectType delegator, FunctionType delegateProxy,
-      FunctionType findDelegate);
+      NominalTypeBuilder delegateSuperclass,
+      NominalTypeBuilder delegateBase,
+      NominalTypeBuilder delegator,
+      ObjectTypeI delegateProxy,
+      FunctionTypeI findDelegate);
 
   /**
    * @return the name of the delegate superclass.
@@ -279,12 +280,11 @@ public void checkForCallingConventionDefinitions(
    * Defines the delegate proxy prototype properties. Their types depend on
    * properties of the delegate base methods.
    *
-   * @param delegateProxyPrototypes List of delegate proxy prototypes.
+   * @param delegateProxies List of delegate proxy types.
    */
   public void defineDelegateProxyPrototypeProperties(
-      JSTypeRegistry registry,
-      StaticTypedScope<com.google.javascript.rhino.jstype.JSType> scope,
-      List<ObjectType> delegateProxyPrototypes,
+      TypeIRegistry registry,
+      List<NominalTypeBuilder> delegateProxies,
       Map<String, String> delegateCallingConventions);
 
   /**

src/com/google/javascript/jscomp/CodingConventions.java

@@ -23,11 +23,10 @@
 import com.google.javascript.rhino.FunctionTypeI;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.NominalTypeBuilder;
+import com.google.javascript.rhino.ObjectTypeI;
 import com.google.javascript.rhino.StaticSourceFile;
+import com.google.javascript.rhino.TypeIRegistry;
 import com.google.javascript.rhino.jstype.FunctionType;
-import com.google.javascript.rhino.jstype.JSTypeRegistry;
-import com.google.javascript.rhino.jstype.ObjectType;
-import com.google.javascript.rhino.jstype.StaticTypedScope;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -232,12 +231,13 @@ public DelegateRelationship getDelegateRelationship(Node callNode) {
 
     @Override
     public void applyDelegateRelationship(
-        ObjectType delegateSuperclass, ObjectType delegateBase,
-        ObjectType delegator, FunctionType delegateProxy,
-        FunctionType findDelegate) {
+        NominalTypeBuilder delegateSuperclass,
+        NominalTypeBuilder delegateBase,
+        NominalTypeBuilder delegator,
+        ObjectTypeI delegateProxy,
+        FunctionTypeI findDelegate) {
       nextConvention.applyDelegateRelationship(
-          delegateSuperclass, delegateBase, delegator,
-          delegateProxy, findDelegate);
+          delegateSuperclass, delegateBase, delegator, delegateProxy, findDelegate);
     }
 
     @Override
@@ -254,12 +254,11 @@ public void checkForCallingConventionDefinitions(
 
     @Override
     public void defineDelegateProxyPrototypeProperties(
-        JSTypeRegistry registry,
-        StaticTypedScope<com.google.javascript.rhino.jstype.JSType> scope,
-        List<ObjectType> delegateProxyPrototypes,
+        TypeIRegistry registry,
+        List<NominalTypeBuilder> delegateProxies,
         Map<String, String> delegateCallingConventions) {
       nextConvention.defineDelegateProxyPrototypeProperties(
-          registry, scope, delegateProxyPrototypes, delegateCallingConventions);
+          registry, delegateProxies, delegateCallingConventions);
     }
 
     @Override
@@ -490,9 +489,11 @@ public DelegateRelationship getDelegateRelationship(Node callNode) {
 
     @Override
     public void applyDelegateRelationship(
-        ObjectType delegateSuperclass, ObjectType delegateBase,
-        ObjectType delegator, FunctionType delegateProxy,
-        FunctionType findDelegate) {
+        NominalTypeBuilder delegateSuperclass,
+        NominalTypeBuilder delegateBase,
+        NominalTypeBuilder delegator,
+        ObjectTypeI delegateProxy,
+        FunctionTypeI findDelegate) {
       // do nothing.
     }
 
@@ -509,9 +510,8 @@ public void checkForCallingConventionDefinitions(Node n,
 
     @Override
     public void defineDelegateProxyPrototypeProperties(
-        JSTypeRegistry registry,
-        StaticTypedScope<com.google.javascript.rhino.jstype.JSType> scope,
-        List<ObjectType> delegateProxyPrototypes,
+        TypeIRegistry registry,
+        List<NominalTypeBuilder> delegateProxies,
         Map<String, String> delegateCallingConventions) {
       // do nothing.
     }

src/com/google/javascript/jscomp/TypedScopeCreator.java

@@ -64,6 +64,7 @@
 import com.google.javascript.rhino.InputId;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
+import com.google.javascript.rhino.NominalTypeBuilder;
 import com.google.javascript.rhino.Token;
 import com.google.javascript.rhino.jstype.EnumType;
 import com.google.javascript.rhino.jstype.FunctionParamBuilder;
@@ -155,7 +156,7 @@ final class TypedScopeCreator implements ScopeCreator {
   private final TypeValidator validator;
   private final CodingConvention codingConvention;
   private final JSTypeRegistry typeRegistry;
-  private final List<ObjectType> delegateProxyPrototypes = new ArrayList<>();
+  private final List<FunctionType> delegateProxyCtors = new ArrayList<>();
   private final Map<String, String> delegateCallingConventions = new HashMap<>();
   private final boolean runsAfterNTI;
 
@@ -255,9 +256,15 @@ public TypedScope createScope(Node root, Scope parent) {
     scopeBuilder.resolveStubDeclarations();
 
     if (typedParent == null) {
-      codingConvention.defineDelegateProxyPrototypeProperties(
-          typeRegistry, newScope, delegateProxyPrototypes,
-          delegateCallingConventions);
+      try (NominalTypeBuilderOti.Factory factory = new NominalTypeBuilderOti.Factory()) {
+        List<NominalTypeBuilder> delegateProxies = new ArrayList<>();
+        for (FunctionType delegateProxyCtor : delegateProxyCtors) {
+          delegateProxies.add(
+              factory.builder(delegateProxyCtor, delegateProxyCtor.getInstanceType()));
+        }
+        codingConvention.defineDelegateProxyPrototypeProperties(
+            typeRegistry, delegateProxies, delegateCallingConventions);
+      }
     }
 
     newScope.setTypeResolver(scopeBuilder);
@@ -1588,10 +1595,15 @@ private void applyDelegateRelationship(
                   false /* isAbstract */);
           delegateProxy.setPrototypeBasedOn(delegateBaseObject);
 
-          codingConvention.applyDelegateRelationship(
-              delegateSuperObject, delegateBaseObject, delegatorObject,
-              delegateProxy, findDelegate);
-          delegateProxyPrototypes.add(delegateProxy.getPrototype());
+          try (NominalTypeBuilderOti.Factory factory = new NominalTypeBuilderOti.Factory()) {
+            codingConvention.applyDelegateRelationship(
+                factory.builder(delegateSuperCtor, delegateSuperObject),
+                factory.builder(delegateBaseCtor, delegateBaseObject),
+                factory.builder(delegatorCtor, delegatorObject),
+                (ObjectType) delegateProxy.getTypeOfThis(),
+                findDelegate);
+            delegateProxyCtors.add(delegateProxy);
+          }
         }
       }
     }

src/com/google/javascript/jscomp/newtypes/NominalTypeBuilderNti.java

@@ -77,6 +77,12 @@ public void beforeFreeze(Runnable runnable, NominalTypeBuilder... prerequisites)
     props.runnables.put(raw, runnable);
   }
 
+  @Override
+  public NominalTypeBuilder superClass() {
+    NominalType nt = raw.getSuperClass();
+    return nt != null ? new NominalTypeBuilderNti(props, nt.getRawNominalType()) : null;
+  }
+
   @Override
   public ObjectBuilder constructor() {
     return new ObjectBuilderImpl(PropertySlot.CONSTRUCTOR);

src/com/google/javascript/rhino/NominalTypeBuilder.java

@@ -80,6 +80,9 @@ interface ObjectBuilder {
    */
   void beforeFreeze(Runnable task, NominalTypeBuilder... prerequisites);
 
+  /** Returns a nominal type builder for the super class. */
+  NominalTypeBuilder superClass();
+
   /** Returns the object builder for declaring properties on the constructor function. */
   ObjectBuilder constructor();
 

src/com/google/javascript/rhino/jstype/NominalTypeBuilderOti.java

@@ -109,6 +109,15 @@ public void beforeFreeze(Runnable task, NominalTypeBuilder... prerequisites) {
     callbacks.add(task);
   }
 
+  @Override
+  public NominalTypeBuilder superClass() {
+    FunctionType ctor = instance.object.getSuperClassConstructor();
+    if (ctor == null) {
+      return null;
+    }
+    return new NominalTypeBuilderOti(callbacks, ctor, ctor.getInstanceType());
+  }
+
   @Override
   public ObjectBuilder constructor() {
     return constructor;