135 option enum value type alias (#143)

* Emit enum with value type alias
* Use enumValueTypeAlias for constant type annotation for rust

Author: cuzfrog

annotation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>online.sharedtype</groupId>
         <artifactId>sharedtype-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

e2e/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>online.sharedtype</groupId>
         <artifactId>sharedtype-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

internal/src/main/java/online/sharedtype/processor/domain/def/ConcreteTypeDef.java

@@ -29,6 +29,7 @@ public abstract class ConcreteTypeDef implements TypeDef {
 
     /**
      * Register a counterpart typeInfo.
+     * <b>Note:</b> This method should not be called from outside, please use {@link ConcreteTypeInfo#shallowResolved()}
      */
     public abstract void linkTypeInfo(ConcreteTypeInfo typeInfo);
 }

internal/src/main/java/online/sharedtype/processor/domain/def/EnumDef.java

@@ -54,6 +54,13 @@ public TypeInfo getComponentValueType() {
         }
         return enumValueInfos.get(0).value().getValueType();
     }
+    /** @return true if component value has a different type other than this enumType, i.e. when enumValue is defined */
+    public boolean hasComponentValueType() {
+        return !getComponentValueType().equals(typeInfo);
+    }
+    public String valueTypeAlias() {
+        return String.format("%sValue", simpleName);
+    }
 
     @Override
     public Set<ConcreteTypeInfo> typeInfoSet() {

internal/src/main/java/online/sharedtype/processor/domain/value/EnumConstantValue.java

@@ -9,9 +9,11 @@
 @EqualsAndHashCode(callSuper = true)
 public final class EnumConstantValue extends LiteralValue {
     private static final long serialVersionUID = -6711930218877737970L;
+    private final ConcreteTypeInfo enumType;
     private final String enumConstantName;
-    EnumConstantValue(String enumConstantName, ConcreteTypeInfo valueType, Object value) {
+    EnumConstantValue(ConcreteTypeInfo enumType, String enumConstantName, ConcreteTypeInfo valueType, Object value) {
         super(valueType, value);
+        this.enumType = enumType;
         this.enumConstantName = enumConstantName;
     }
 

internal/src/main/java/online/sharedtype/processor/domain/value/ValueHolder.java

@@ -2,7 +2,6 @@
 
 import online.sharedtype.processor.domain.Constants;
 import online.sharedtype.processor.domain.type.ConcreteTypeInfo;
-import online.sharedtype.processor.domain.type.TypeInfo;
 
 import java.io.Serializable;
 
@@ -27,15 +26,15 @@ static ValueHolder of(ConcreteTypeInfo valueType, Object value) {
         }
     }
 
-    static EnumConstantValue ofEnum(String enumConstantName, ConcreteTypeInfo valueType, Object value) {
+    static EnumConstantValue ofEnum(ConcreteTypeInfo enumType, String enumConstantName, ConcreteTypeInfo valueType, Object value) {
         ConcreteTypeInfo actualValueType = valueType;
         Object actualValue = value;
         while (actualValue instanceof ValueHolder) {
             ValueHolder valueHolder = (ValueHolder) actualValue;
             actualValueType = valueHolder.getValueType();
             actualValue = valueHolder.getValue();
         }
-        return new EnumConstantValue(enumConstantName, actualValueType, actualValue);
+        return new EnumConstantValue(enumType, enumConstantName, actualValueType, actualValue);
     }
 
     LiteralValue NULL = new LiteralValue(Constants.NULL_TYPE_INFO,null);

it/java17/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>online.sharedtype</groupId>
         <artifactId>sharedtype-it-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

it/java8/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>online.sharedtype</groupId>
         <artifactId>sharedtype-it-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

it/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>online.sharedtype</groupId>
         <artifactId>sharedtype-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.12.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>online.sharedtype</groupId>
     <artifactId>sharedtype-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.12.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SharedType Parent</name>