Dev

src/main/java/org/comroid/annotations/Category.java

@@ -0,0 +1,14 @@
+package org.comroid.annotations;
+
+import org.comroid.annotations.internal.Inherit;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Inherit(Inherit.Type.FromBoth)
+public @interface Category {
+    String value() default "";
+
+    Description[] desc() default {};
+}

src/main/java/org/comroid/annotations/Default.java

@@ -0,0 +1,15 @@
+package org.comroid.annotations;
+
+import org.intellij.lang.annotations.Language;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface Default {
+    @Language("JShellLanguage")
+    String value() default "null";
+}

src/main/java/org/comroid/annotations/Description.java

@@ -0,0 +1,12 @@
+package org.comroid.annotations;
+
+import org.comroid.annotations.internal.Inherit;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Inherit(Inherit.Type.FromSupertype)
+public @interface Description {
+    String[] value() default {};
+}

src/main/java/org/comroid/annotations/Order.java

@@ -0,0 +1,12 @@
+package org.comroid.annotations;
+
+import org.comroid.annotations.internal.Inherit;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Inherit(Inherit.Type.FromSupertype)
+public @interface Order {
+    int value();
+}

src/main/java/org/comroid/annotations/internal/Annotations.java

@@ -1,14 +1,18 @@
 package org.comroid.annotations.internal;
 
+import jdk.jshell.JShell;
+import jdk.jshell.JShellException;
+import jdk.jshell.SnippetEvent;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.Value;
 import lombok.experimental.UtilityClass;
 import lombok.extern.java.Log;
-import org.comroid.annotations.Alias;
-import org.comroid.annotations.Convert;
-import org.comroid.annotations.Ignore;
+import org.comroid.annotations.*;
+import org.comroid.api.Polyfill;
 import org.comroid.api.data.seri.DataStructure;
+import org.comroid.api.data.seri.StandardValueType;
 import org.comroid.api.func.ext.Wrap;
 import org.comroid.api.info.Constraint;
 import org.comroid.api.java.ReflectionHelper;
@@ -20,6 +24,7 @@
 import java.lang.annotation.ElementType;
 import java.lang.reflect.*;
 import java.util.*;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -34,6 +39,12 @@
 @ApiStatus.Internal
 public class Annotations {
     public static final Class<?>[] SystemFilters = new Class<?>[]{Object.class, Class.class, Annotation.class};
+    public static final Comparator<AnnotatedElement> OrderComparator = Comparator.comparingInt(it ->
+            findAnnotations(Order.class, it)
+                    .findAny()
+                    .map(Result::getAnnotation)
+                    .map(Order::value)
+                    .orElse(0));
 
     @ApiStatus.Experimental
     @Convert(identifyVia = "annotationType")
@@ -48,6 +59,41 @@ public Set<String> aliases(@NotNull AnnotatedElement of) {
                 .collect(Collectors.toUnmodifiableSet());
     }
 
+    public Stream<String> description(@NotNull AnnotatedElement of) {
+        return findAnnotations(Description.class, of)
+                .flatMap(it -> stream(it.annotation.value()));
+    }
+
+    public Wrap<Result<Category>> category(@NotNull AnnotatedElement of) {
+        return Wrap.ofStream(findAnnotations(Category.class, of));
+    }
+
+    public <R> @Nullable R defaultValue(@NotNull AnnotatedElement of) {
+        final var silent = new Object(){
+            @SneakyThrows
+            public void throwIfExcPresent(SnippetEvent e) {
+                var exc = e.exception();
+                if (exc != null)
+                    throw exc;
+            }
+        };
+        try (final var jShell = JShell.create()) {
+            return findAnnotations(Default.class, of)
+                    .map(Result::getAnnotation)
+                    .flatMap(expr -> jShell.eval(expr.value()).stream())
+                    .peek(silent::throwIfExcPresent)
+                    .map(SnippetEvent::value)
+                    .filter(Objects::nonNull)
+                    .findAny()
+                    .map(StandardValueType::findGoodType)
+                    .map(Polyfill::<R>uncheckedCast)
+                    .orElse(null);
+        } catch (Throwable t) {
+            log.log(Level.WARNING, "Failed to evaluate default expression of " + of, t);
+            return null;
+        }
+    }
+
     public Optional<? extends AnnotatedElement> ignore(@NotNull AnnotatedElement it) {
         return ignore(it, null);
     }
@@ -112,6 +158,8 @@ public <A extends Annotation> Stream<Result<A>> findAnnotations(final Class<A> t
                         break;
                     case FromSupertype, FromBoth:
                         sources = sources.collect(append(findAncestor(member, type).stream()));
+                        if (inherit != Inherit.Type.FromBoth)
+                            break;
                     case FromParent:
                         sources = sources.collect(append(decl));
                         break;

src/main/java/org/comroid/api/data/seri/DataNode.java

@@ -215,7 +215,7 @@ static Stream<Entry> properties(final java.lang.Object it) {
         if (it instanceof DataNode.Base)
             return ((DataNode) it).properties();
         return DataStructure.of(it.getClass(), java.lang.Object.class)
-                .getProperties().values().stream()
+                .getDeclaredProperties().values().stream()
                 .map(Polyfill::<DataStructure<java.lang.Object>.Property<Object>>uncheckedCast)
                 .map(prop -> new Entry(prop.getName(), of(prop.getFrom(it))));
     }
@@ -309,7 +309,12 @@ public Stream<Entry> properties() {
     @AllArgsConstructor
     @Ignore(Convertible.class)
     class Value<T> extends Base implements ValueBox<T> {
-        public static final DataNode NULL = new Value<>(null);
+        public static final DataNode NULL = new Value<>(null){
+            @Override
+            public ValueType<?> getHeldType() {
+                return VOID;
+            }
+        };
         protected @Nullable T value;
 
         @Override