externs inner namespaces fix

google · Mar 14, 2023 · fe34746 · fe34746
1 parent e61082a
commit fe34746
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/com/google/javascript/rhino/jstype/JSType.java b/src/com/google/javascript/rhino/jstype/JSType.java
@@ -210,6 +210,10 @@ public boolean isBigIntValueType() {
     return false;
   }
 
+  public boolean isFromEmptyObjLitExtern() {
+    return false;
+  }
+
   /** Whether this is the prototype of a function. */
   // TODO(sdh): consider renaming this to isPrototypeObject.
   public boolean isFunctionPrototypeType() {

diff --git a/src/com/google/javascript/rhino/jstype/JSTypeRegistry.java b/src/com/google/javascript/rhino/jstype/JSTypeRegistry.java
@@ -1110,7 +1110,7 @@ private void registerNativeType(JSTypeNative typeId, JSType type) {
   // we don't need to store these properties in the propertyIndex separately.
   private static boolean isObjectLiteralThatCanBeSkipped(JSType t) {
     t = t.restrictByNotNullOrUndefined();
-    return t.isRecordType() || t.isLiteralObject();
+    return (t.isRecordType() || t.isLiteralObject()) && !t.isFromEmptyObjLitExtern();
   }
 
   void registerDroppedPropertiesInUnion(RecordType subtype, RecordType supertype) {
@@ -1777,7 +1777,16 @@ public ObjectType createObjectType(String name, ObjectType implicitPrototype) {
    * @param info Used to mark object literals as structs; can be {@code null}
    */
   public ObjectType createAnonymousObjectType(@Nullable JSDocInfo info) {
-    PrototypeObjectType type = PrototypeObjectType.builder(this).setAnonymous(true).build();
+	   PrototypeObjectType type = PrototypeObjectType.builder(this).setAnonymous(true).build();
+    type.setPrettyPrint(true);
+    type.setJSDocInfo(info);
+    return type;
+  }
+  public ObjectType createAnonymousObjectType(@Nullable JSDocInfo info, boolean fromExternsEmptyObjLit) {
+	   PrototypeObjectType type = PrototypeObjectType.builder(this)
+	       .setAnonymous(true)
+	       .setFromExternsEmptyObjectLit(fromExternsEmptyObjLit)
+	       .build();
     type.setPrettyPrint(true);
     type.setJSDocInfo(info);
     return type;

diff --git a/src/com/google/javascript/rhino/jstype/PrototypeObjectType.java b/src/com/google/javascript/rhino/jstype/PrototypeObjectType.java
@@ -76,6 +76,7 @@ public class PrototypeObjectType extends ObjectType {
   private final PropertyMap properties = new PropertyMap();
   private final boolean nativeType;
   private final boolean anonymousType;
+  private boolean fromEmptyObjLitExtern;
 
   // NOTE(nicksantos): The implicit prototype can change over time.
   // Modeling this is a bear. Always call getImplicitPrototype(), because
@@ -104,6 +105,7 @@ public class PrototypeObjectType extends ObjectType {
     this.templateParamCount = builder.templateParamCount;
     this.nativeType = builder.nativeType;
     this.anonymousType = builder.anonymousType;
+    this.fromEmptyObjLitExtern = builder.externsEmptyObjLit;
 
     this.properties.setParentSource(this);
 
@@ -136,6 +138,7 @@ static class Builder<T extends Builder<T>> {
 
     private boolean nativeType;
     private boolean anonymousType;
+    private boolean externsEmptyObjLit;
 
     private TemplateTypeMap templateTypeMap;
     private int templateParamCount;
@@ -166,6 +169,11 @@ final T setAnonymous(boolean x) {
       return castThis();
     }
 
+    final T setFromExternsEmptyObjectLit(boolean x) {
+      this.externsEmptyObjLit = x;
+      return castThis();
+    }
+
     final T setTemplateTypeMap(TemplateTypeMap x) {
       this.templateTypeMap = x;
       return castThis();
@@ -495,4 +503,8 @@ int recursionUnsafeHashCode() {
       return System.identityHashCode(this);
     }
   }
+
+  public boolean isFromEmptyObjLitExtern() {
+	   return fromEmptyObjLitExtern;
+  }
 }