Support (partially) EnumValueType

Author: Lipen

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/EtsTypeToDto.kt

@@ -21,6 +21,7 @@ import org.jacodb.ets.model.EtsAnyType
 import org.jacodb.ets.model.EtsArrayType
 import org.jacodb.ets.model.EtsBooleanType
 import org.jacodb.ets.model.EtsClassType
+import org.jacodb.ets.model.EtsEnumValueType
 import org.jacodb.ets.model.EtsFunctionType
 import org.jacodb.ets.model.EtsGenericType
 import org.jacodb.ets.model.EtsIntersectionType
@@ -55,11 +56,11 @@ private object EtsTypeToDto : EtsType.Visitor<TypeDto> {
     }
 
     override fun visit(type: EtsUnionType): TypeDto {
-        return UnionTypeDto(types = type.types.map { it.accept(this) })
+        return UnionTypeDto(types = type.types.map { it.toDto() })
     }
 
     override fun visit(type: EtsIntersectionType): TypeDto {
-        return IntersectionTypeDto(types = type.types.map { it.accept(this) })
+        return IntersectionTypeDto(types = type.types.map { it.toDto() })
     }
 
     override fun visit(type: EtsGenericType): TypeDto {
@@ -81,6 +82,13 @@ private object EtsTypeToDto : EtsType.Visitor<TypeDto> {
         )
     }
 
+    override fun visit(type: EtsEnumValueType): TypeDto {
+        return EnumValueTypeDto(
+            signature = type.signature.toDto(),
+            constant = type.constant?.toDto(),
+        )
+    }
+
     override fun visit(type: EtsBooleanType): TypeDto {
         return BooleanTypeDto
     }
@@ -153,7 +161,7 @@ private object EtsTypeToDto : EtsType.Visitor<TypeDto> {
     }
 
     override fun visit(type: EtsTupleType): TypeDto {
-        return TupleTypeDto(types = type.types.map { it.accept(this) })
+        return TupleTypeDto(types = type.types.map { it.toDto() })
     }
 
     override fun visit(type: EtsFunctionType): TypeDto {

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/EtsValueToDto.kt

@@ -32,43 +32,43 @@ import org.jacodb.ets.model.EtsValue
 
 fun EtsValue.toDto(): ValueDto = accept(EtsValueToDto)
 
-private object EtsValueToDto : EtsValue.Visitor<ValueDto> {
-    override fun visit(value: EtsLocal): ValueDto {
-        return LocalDto(
-            name = value.name,
-            type = value.type.toDto(),
-        )
-    }
+fun EtsLocal.toDto(): LocalDto = LocalDto(
+    name = name,
+    type = type.toDto(),
+)
 
-    private fun visitConstant(value: EtsConstant): ValueDto {
-        return ConstantDto(
-            value = value.toString(),
-            type = value.type.toDto(),
-        )
+fun EtsConstant.toDto(): ConstantDto = ConstantDto(
+    value = toString(),
+    type = type.toDto(),
+)
+
+private object EtsValueToDto : EtsValue.Visitor<ValueDto> {
+    override fun visit(value: EtsLocal): LocalDto {
+        return value.toDto()
     }
 
     override fun visit(value: EtsConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsStringConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsBooleanConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsNumberConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsNullConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsUndefinedConstant): ValueDto {
-        return visitConstant(value)
+        return value.toDto()
     }
 
     override fun visit(value: EtsThis): ValueDto {

jacodb-ets/src/main/kotlin/org/jacodb/ets/grpc/EtsTypeToProto.kt

@@ -41,6 +41,7 @@ import org.jacodb.ets.model.EtsAnyType
 import org.jacodb.ets.model.EtsArrayType
 import org.jacodb.ets.model.EtsBooleanType
 import org.jacodb.ets.model.EtsClassType
+import org.jacodb.ets.model.EtsEnumValueType
 import org.jacodb.ets.model.EtsFunctionType
 import org.jacodb.ets.model.EtsGenericType
 import org.jacodb.ets.model.EtsIntersectionType
@@ -112,6 +113,10 @@ private class EtsTypeToProto(
         }
     }
 
+    override fun visit(type: EtsEnumValueType) {
+        TODO("${type::class.java.simpleName} is not supported yet")
+    }
+
     override fun visit(type: EtsBooleanType) {
         dsl.booleanType = booleanType { }
     }

jacodb-ets/src/main/kotlin/org/jacodb/ets/proto/EtsTypeToProto.kt

@@ -21,6 +21,7 @@ import org.jacodb.ets.model.EtsAnyType
 import org.jacodb.ets.model.EtsArrayType
 import org.jacodb.ets.model.EtsBooleanType
 import org.jacodb.ets.model.EtsClassType
+import org.jacodb.ets.model.EtsEnumValueType
 import org.jacodb.ets.model.EtsFunctionType
 import org.jacodb.ets.model.EtsGenericType
 import org.jacodb.ets.model.EtsIntersectionType
@@ -85,6 +86,10 @@ private object EtsTypeToProto : EtsType.Visitor<IProtoType> {
         )
     }
 
+    override fun visit(type: EtsEnumValueType): IProtoType {
+        TODO("${type::class.java.simpleName} is not supported yet")
+    }
+
     override fun visit(type: EtsBooleanType): IProtoType {
         return ProtoBooleanType
     }