reduce member visibility in gents where possible (#919)

Author: DominicKramer

src/main/java/com/google/javascript/gents/CollectModuleMetadata.java

@@ -28,9 +28,9 @@ public final class CollectModuleMetadata extends AbstractTopLevelCallback implem
   private final AbstractCompiler compiler;
   private final NameUtil nameUtil;
 
-  final Set<String> filesToConvert;
-  final Map<String, FileModule> fileToModule = new LinkedHashMap<>();
-  final Map<String, FileModule> namespaceToModule = new LinkedHashMap<>();
+  private final Set<String> filesToConvert;
+  private final Map<String, FileModule> fileToModule = new LinkedHashMap<>();
+  private final Map<String, FileModule> namespaceToModule = new LinkedHashMap<>();
 
   Map<String, FileModule> getFileMap() {
     return fileToModule;
@@ -57,8 +57,7 @@ Map<String, FileModule> getSymbolMap() {
     return out;
   }
 
-  public CollectModuleMetadata(
-      AbstractCompiler compiler, NameUtil nameUtil, Set<String> filesToConvert) {
+  CollectModuleMetadata(AbstractCompiler compiler, NameUtil nameUtil, Set<String> filesToConvert) {
     this.compiler = compiler;
     this.nameUtil = nameUtil;
     this.filesToConvert = filesToConvert;
@@ -152,7 +151,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
   }
 
   /** Registers a goog.module namespace for future lookup. */
-  void registerGoogModule(Node n, String file, String namespace) {
+  private void registerGoogModule(Node n, String file, String namespace) {
     if (fileToModule.containsKey(file)) {
       compiler.report(
           JSError.make(

src/main/java/com/google/javascript/gents/CommentLinkingPass.java

@@ -77,7 +77,7 @@ public final class CommentLinkingPass implements CompilerPass {
   private final Compiler compiler;
   private final NodeComments nodeComments;
 
-  public CommentLinkingPass(Compiler compiler) {
+  CommentLinkingPass(Compiler compiler) {
     this.compiler = compiler;
     this.nodeComments = new NodeComments();
   }

src/main/java/com/google/javascript/gents/GentsCodeGenerator.java

@@ -16,7 +16,7 @@ public class GentsCodeGenerator extends CodeGenerator {
   private final NodeComments nodeComments;
   private final Map<String, String> externsMap;
 
-  protected GentsCodeGenerator(
+  GentsCodeGenerator(
       CodeConsumer consumer,
       CompilerOptions options,
       NodeComments nodeComments,
@@ -108,7 +108,7 @@ private boolean isPreviousEmptyAndHasComment(Node n) {
    *
    * @return true if no further code generation on this node is needed.
    */
-  boolean maybeOverrideCodeGen(Node n) {
+  private boolean maybeOverrideCodeGen(Node n) {
     @Nullable Node parent = n.getParent();
     switch (n.getToken()) {
       case INDEX_SIGNATURE:

src/main/java/com/google/javascript/gents/ModuleConversionPass.java

@@ -65,11 +65,11 @@ public final class ModuleConversionPass implements CompilerPass {
   // full module imports.
   private final Table<String, String, Node> destructuringAssignments = HashBasedTable.create();
 
-  public Table<String, String, String> getTypeRewrite() {
+  Table<String, String, String> getTypeRewrite() {
     return typeRewrite;
   }
 
-  public ModuleConversionPass(
+  ModuleConversionPass(
       AbstractCompiler compiler,
       PathUtil pathUtil,
       NameUtil nameUtil,
@@ -331,7 +331,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
   }
 
   /** A single statement containing {@code goog.require(...)}. */
-  class ModuleImport {
+  private class ModuleImport {
     /** require statement Node. */
     private Node originalImportNode;
 
@@ -451,7 +451,7 @@ private boolean isFullModuleImport() {
    *   import "./sideEffectsOnly"
    * </pre>
    */
-  void convertNonDestructuringRequireToImportStatements(Node n, ModuleImport moduleImport) {
+  private void convertNonDestructuringRequireToImportStatements(Node n, ModuleImport moduleImport) {
     // The imported file is already in TS
     if (moduleImport.isAlreadyConverted()) {
       convertRequireForAlreadyConverted(moduleImport);
@@ -538,7 +538,7 @@ void convertNonDestructuringRequireToImportStatements(Node n, ModuleImport modul
    *   import {A as localName, B} from "./valueExports";
    * </pre>
    */
-  void convertDestructuringRequireToImportStatements(Node n, ModuleImport moduleImport) {
+  private void convertDestructuringRequireToImportStatements(Node n, ModuleImport moduleImport) {
     // The imported file is already in TS
     if (moduleImport.isAlreadyConverted()) {
       convertRequireForAlreadyConverted(moduleImport);
@@ -673,7 +673,7 @@ private void convertRequireForSideEffectOnlyImport(ModuleImport moduleImport) {
    *     convertExportAssignment(pre.fix = ..., "pre.fix", "name") <-> export const name = ...
    *     convertExportAssignment(pre.fix.foo = ..., "pre.fix", "name") <-> name.foo = ...
    */
-  void convertExportAssignment(
+  private void convertExportAssignment(
       Node assign, String exportedNamespace, String exportedSymbol, String fileName) {
     checkState(assign.isAssign());
     checkState(assign.getParent().isExprResult());

src/main/java/com/google/javascript/gents/NameUtil.java

@@ -9,10 +9,10 @@
 import javax.annotation.Nullable;
 
 /** Utility methods for variable naming. */
-public class NameUtil {
+class NameUtil {
   private AbstractCompiler compiler;
 
-  public NameUtil(AbstractCompiler compiler) {
+  NameUtil(AbstractCompiler compiler) {
     this.compiler = compiler;
   }
 

src/main/java/com/google/javascript/gents/NodeComments.java

@@ -5,8 +5,8 @@
 import java.util.Map;
 
 /** Represents the mapping from an AST Node to its corresponding comment. */
-public class NodeComments {
-  final Map<Node, String> nodeToComment = new HashMap<>();
+class NodeComments {
+  private final Map<Node, String> nodeToComment = new HashMap<>();
 
   void addComment(Node n, String comment) {
     if (hasComment(n)) {

src/main/java/com/google/javascript/gents/Options.java

@@ -58,7 +58,7 @@ public class Options {
             + "Passing dependency files is disallowed when \"--dependenciesManifest\" option is used",
     metaVar = "DEPENDENCIES_MANIFEST"
   )
-  String dependenciesManifest = null;
+  private String dependenciesManifest = null;
 
   @Option(
     name = "--sourcesManifest",
@@ -67,7 +67,7 @@ public class Options {
             + "\"--convert\" option is disallowed when \"--sourcesManifest\" option is used",
     metaVar = "SOURCES_MANIFEST"
   )
-  String sourcesManifest = null;
+  private String sourcesManifest = null;
 
   @Option(
     name = "--convert",
@@ -115,7 +115,7 @@ public class Options {
   Set<String> srcFiles = new LinkedHashSet<>();
   Map<String, String> externsMap = null;
 
-  public CompilerOptions getCompilerOptions() {
+  CompilerOptions getCompilerOptions() {
     final CompilerOptions options = new CompilerOptions();
     options.setClosurePass(true);
 

src/main/java/com/google/javascript/gents/PathUtil.java

@@ -9,7 +9,7 @@ public class PathUtil {
   private final String rootpath;
   private final String absolutePrefix;
 
-  public PathUtil(String root, String absolutePrefix) {
+  PathUtil(String root, String absolutePrefix) {
     this.rootpath = root;
     this.absolutePrefix = absolutePrefix;
   }

src/main/java/com/google/javascript/gents/RemoveGoogScopePass.java

@@ -26,7 +26,7 @@ public final class RemoveGoogScopePass extends AbstractTopLevelCallback implemen
   private final Set<String> providedNamespaces = new HashSet<>();
   private final Map<String, String> aliasToProvidedNamespace = new HashMap<>();
 
-  public RemoveGoogScopePass(AbstractCompiler compiler) {
+  RemoveGoogScopePass(AbstractCompiler compiler) {
     this.compiler = compiler;
   }
 

src/main/java/com/google/javascript/gents/StyleFixPass.java

@@ -18,7 +18,7 @@ public final class StyleFixPass extends AbstractPostOrderCallback implements Com
   private final AbstractCompiler compiler;
   private final NodeComments nodeComments;
 
-  public StyleFixPass(AbstractCompiler compiler, NodeComments nodeComments) {
+  StyleFixPass(AbstractCompiler compiler, NodeComments nodeComments) {
     this.compiler = compiler;
     this.nodeComments = nodeComments;
   }
@@ -128,7 +128,7 @@ private boolean hasGrandchildren(Node n) {
    * Attempts to lift class or functions declarations of the form 'var/let/const x = class/function
    * {...}' into 'class/function x {...}'
    */
-  void liftClassOrFunctionDefinition(Node n) {
+  private void liftClassOrFunctionDefinition(Node n) {
     Node rhs = n.getFirstFirstChild();
     Node oldName = rhs.getFirstChild();
     Node newName = n.getFirstChild();

src/main/java/com/google/javascript/gents/TypeAnnotationPass.java

@@ -66,7 +66,7 @@ public final class TypeAnnotationPass implements CompilerPass {
   /** extern -> typing map for when extern and TS typing names differ */
   private final Map<String, String> externsMap;
 
-  public TypeAnnotationPass(
+  TypeAnnotationPass(
       AbstractCompiler compiler,
       PathUtil pathUtil,
       NameUtil nameUtil,
@@ -345,7 +345,7 @@ private void setTypeExpression(Node n, @Nullable TypeDeclarationNode type) {
   }
 
   @Nullable
-  public TypeDeclarationNode convert(@Nullable JSTypeExpression typeExpr, boolean isReturnType) {
+  private TypeDeclarationNode convert(@Nullable JSTypeExpression typeExpr, boolean isReturnType) {
     if (typeExpr == null) {
       return null;
     }
@@ -360,12 +360,12 @@ public TypeDeclarationNode convert(@Nullable JSTypeExpression typeExpr, boolean
    * @return the root node of a TypeDeclaration AST, or null if no type is available for the node.
    */
   @Nullable
-  public TypeDeclarationNode convertTypeNodeAST(Node n) {
+  private TypeDeclarationNode convertTypeNodeAST(Node n) {
     return convertTypeNodeAST(n, false);
   }
 
   @Nullable
-  public TypeDeclarationNode convertTypeNodeAST(Node n, boolean isReturnType) {
+  private TypeDeclarationNode convertTypeNodeAST(Node n, boolean isReturnType) {
     switch (n.getToken()) {
         // for function types that don't declare a return type
         // ex. /** @return */ var f = function() {};
@@ -523,7 +523,7 @@ public TypeDeclarationNode convertTypeNodeAST(Node n, boolean isReturnType) {
   }
 
   /** Returns a new node representing an index signature type. */
-  TypeDeclarationNode indexSignatureType(
+  private TypeDeclarationNode indexSignatureType(
       TypeDeclarationNode keyType, TypeDeclarationNode valueType) {
     TypeDeclarationNode node = new TypeDeclarationNode(Token.INDEX_SIGNATURE);
     TypeDeclarationNode first = null;
@@ -535,7 +535,7 @@ TypeDeclarationNode indexSignatureType(
   }
 
   /** Converts the global type name to the local type name. */
-  String convertTypeName(String sourceFile, String typeName) {
+  private String convertTypeName(String sourceFile, String typeName) {
     Map<String, String> rewriteMap =
         typeRewrite.containsRow(sourceFile)
             ? typeRewrite.rowMap().get(sourceFile)
@@ -591,7 +591,7 @@ String convertTypeName(String sourceFile, String typeName) {
    * If an extern-to-typing map is provided, try to look up the extern type name and replace it with
    * the TypeScript version.
    */
-  String convertExternNameToTypingName(String externTypeName) {
+  private String convertExternNameToTypingName(String externTypeName) {
     String typingName = this.externsMap.get(externTypeName);
     if (typingName != null) {
       return typingName;
@@ -601,7 +601,7 @@ String convertExternNameToTypingName(String externTypeName) {
   }
 
   /** Helper function to recursively flatten union types. */
-  void flatten(
+  private void flatten(
       Iterable<TypeDeclarationNode> types, List<TypeDeclarationNode> result, boolean hasNull) {
     for (TypeDeclarationNode t : types) {
       switch (t.getToken()) {
@@ -632,7 +632,7 @@ void flatten(
    *
    * @return A flattened union type with at most 1 null.
    */
-  TypeDeclarationNode flatUnionType(Iterable<TypeDeclarationNode> types) {
+  private TypeDeclarationNode flatUnionType(Iterable<TypeDeclarationNode> types) {
     List<TypeDeclarationNode> flatTypes = new ArrayList<>();
     flatten(types, flatTypes, false);
     return unionType(flatTypes);

src/main/java/com/google/javascript/gents/TypeConversionPass.java

@@ -41,7 +41,7 @@ public final class TypeConversionPass implements CompilerPass {
 
   private Map<String, String> typesToFilename;
 
-  public TypeConversionPass(
+  TypeConversionPass(
       AbstractCompiler compiler, CollectModuleMetadata modulePrepass, NodeComments nodeComments) {
     this.compiler = compiler;
     this.modulePrepass = modulePrepass;
@@ -514,7 +514,7 @@ private void convertTypeAlias() {
   }
 
   /** Converts @constructor annotated functions into class definitions. */
-  void convertConstructorToClass(Node n, JSDocInfo jsDoc) {
+  private void convertConstructorToClass(Node n, JSDocInfo jsDoc) {
     Preconditions.checkState(n.isFunction());
     Preconditions.checkState(n.getFirstChild().isName());
     Preconditions.checkState(n.getSecondChild().isParamList());
@@ -580,7 +580,7 @@ void convertConstructorToClass(Node n, JSDocInfo jsDoc) {
   }
 
   /** Converts goog.defineClass calls into class definitions. */
-  void convertDefineClassToClass(Node n) {
+  private void convertDefineClassToClass(Node n) {
     Preconditions.checkState(n.isCall());
     Node superClass = n.getSecondChild();
     if (superClass.isNull()) {
@@ -614,7 +614,7 @@ void convertDefineClassToClass(Node n) {
   }
 
   /** return if node n is a @constructor annotated function inside goog.defineClass */
-  boolean isConstructorInGoogDefineClass(Node n) {
+  private boolean isConstructorInGoogDefineClass(Node n) {
     // CALL
     //     GETPROP
     //         NAME goog
@@ -650,7 +650,7 @@ boolean isConstructorInGoogDefineClass(Node n) {
    * Converts functions and variables declared in object literals into member method and field
    * definitions
    */
-  void convertObjectLiteral(Node classMembers, Node objectLiteralMember, boolean isStatic) {
+  private void convertObjectLiteral(Node classMembers, Node objectLiteralMember, boolean isStatic) {
     Preconditions.checkState(
         objectLiteralMember.isStringKey() || objectLiteralMember.isMemberFunctionDef());
 
@@ -679,7 +679,7 @@ void convertObjectLiteral(Node classMembers, Node objectLiteralMember, boolean i
    * Attempts to move a method declaration into a class definition. This generates a new
    * MEMBER_FUNCTION_DEF Node while removing the old function node from the AST.
    */
-  void moveMethodsIntoClasses(ClassMemberDeclaration declaration) {
+  private void moveMethodsIntoClasses(ClassMemberDeclaration declaration) {
     Node classMembers = declaration.classNode.getLastChild();
     String fieldName = declaration.memberName;
 
@@ -709,7 +709,7 @@ void moveMethodsIntoClasses(ClassMemberDeclaration declaration) {
     compiler.reportChangeToEnclosingScope(memberFunc);
   }
 
-  Node createMemberVariableDef(ClassMemberDeclaration declaration) {
+  private Node createMemberVariableDef(ClassMemberDeclaration declaration) {
     Node fieldNode = Node.newString(Token.MEMBER_VARIABLE_DEF, declaration.memberName);
     fieldNode.setJSDocInfo(declaration.jsDoc);
     fieldNode.setStaticMember(declaration.isStatic);
@@ -721,7 +721,7 @@ Node createMemberVariableDef(ClassMemberDeclaration declaration) {
    * Attempts to move a field declaration into a class definition. This generates a new
    * MEMBER_VARIABLE_DEF Node while persisting the old node in the AST.
    */
-  void moveFieldsIntoClasses(ClassMemberDeclaration declaration) {
+  private void moveFieldsIntoClasses(ClassMemberDeclaration declaration) {
     Node classMembers = declaration.classNode.getLastChild();
 
     Node fieldNode = createMemberVariableDef(declaration);
@@ -766,7 +766,7 @@ private boolean canPromoteFieldInitializer(ClassMemberDeclaration declaration) {
    * <p>This returns without any modification if the node is not an inheritance statement. This
    * fails by reporting an error when the node is an invalid inheritance statement.
    */
-  void maybeRemoveInherits(Node exprNode) {
+  private void maybeRemoveInherits(Node exprNode) {
     Preconditions.checkState(exprNode.isExprResult());
     if (exprNode.getFirstChild().isCall()) {
       Node callNode = exprNode.getFirstChild();
@@ -831,7 +831,7 @@ void maybeRemoveInherits(Node exprNode) {
    *
    * <p>This returns without any modification if the node is not an superclass call statement.
    */
-  void maybeReplaceSuperCall(Node callNode) {
+  private void maybeReplaceSuperCall(Node callNode) {
     Preconditions.checkState(callNode.isCall());
     String callName = callNode.getFirstChild().getQualifiedName();
 
@@ -903,7 +903,7 @@ void maybeReplaceSuperCall(Node callNode) {
   }
 
   /** Adds a field node before the first method node in classMembers */
-  void addFieldToClassMembers(Node classMembers, Node field) {
+  private void addFieldToClassMembers(Node classMembers, Node field) {
     for (Node n : classMembers.children()) {
       if (n.isMemberFunctionDef()) {
         classMembers.addChildBefore(field, n);
@@ -918,7 +918,7 @@ void addFieldToClassMembers(Node classMembers, Node field) {
    *
    * <p>This determines the classname using the nearest available name node.
    */
-  void addClassToScope(Node n) {
+  private void addClassToScope(Node n) {
     Preconditions.checkState(n.isClass());
     String className = NodeUtil.getName(n);
     if (className == null) {

src/main/java/com/google/javascript/gents/TypeScriptGenerator.java

@@ -90,7 +90,7 @@ public static void main(String[] args) {
   private final Compiler compiler;
 
   final PathUtil pathUtil;
-  final NameUtil nameUtil;
+  private final NameUtil nameUtil;
   private GentsErrorManager errorManager;
 
   TypeScriptGenerator(Options opts) {