Fixed falsely parsed subcommands

VelixDevelopments · Mar 5, 2025 · 1cca21e · 1cca21e
1 parent b0ab826
commit 1cca21e
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.velix"
-    version = "1.7.0"
+    version = "1.7.1"
 
     ext {
         def kyoriVersion = "4.17.0"

diff --git a/core/src/main/java/dev/velix/imperat/BaseImperat.java b/core/src/main/java/dev/velix/imperat/BaseImperat.java
@@ -276,13 +276,19 @@ private CommandDispatch.Result handleExecution(Context<S> context) throws Impera
         CommandUsage<S> usage = searchResult.toUsage(command);
 
         //executing usage
-        if (searchResult.result() == CommandDispatch.Result.COMPLETE)
+        if (searchResult.result() == CommandDispatch.Result.COMPLETE) {
+            ImperatDebugger.debug("Executing usage '%s'", usage != null ? CommandUsage.format(command, usage) : "NULL");
             executeUsage(command, source, context, usage);
+        }
         else if (searchResult.result() == CommandDispatch.Result.INCOMPLETE) {
             var lastParameter = searchResult.getLastParameter();
+            ImperatDebugger.debug("Executing subcommand-main-usage '%s'", CommandUsage.format(command, lastParameter.asCommand().mainUsage()));
+            ImperatDebugger.debug("Last param = '%s'", lastParameter.format());
             if (lastParameter.isCommand()) {
-                executeUsage(command, source, context, lastParameter.asCommand().getDefaultUsage());
+                ImperatDebugger.debug("Executing usage '%s'", CommandUsage.format(command, lastParameter.asCommand().mainUsage()));
+                executeUsage(command, source, context, lastParameter.asCommand().mainUsage());
             } else if (usage != null) {
+                ImperatDebugger.debug("Executing usage '%s'", CommandUsage.format(command, usage));
                 executeUsage(command, source, context, usage);
             } else {
                 //usage is null and last param is not command
@@ -308,6 +314,7 @@ private void executeUsage(
 
         ResolvedContext<S> resolvedContext = config.getContextFactory().createResolvedContext(context, usage);
         resolvedContext.resolve();
+        resolvedContext.debug();
 
         //global post-processing
         postProcess(resolvedContext);

diff --git a/core/src/main/java/dev/velix/imperat/annotations/base/MethodCommandExecutor.java b/core/src/main/java/dev/velix/imperat/annotations/base/MethodCommandExecutor.java
@@ -64,6 +64,12 @@ public static <S extends Source> MethodCommandExecutor<S> of(
     public void execute(S source,
                         ExecutionContext<S> context) throws ImperatException {
 
+        ImperatDebugger.debug("Debugging params:-");
+        for (var param : fullParameters) {
+            ImperatDebugger.debug("-%s", param.format());
+        }
+        ImperatDebugger.debug("SIZE=%s", fullParameters.size());
+
         var instances = AnnotationHelper.loadParameterInstances(
             dispatcher, fullParameters,
             source, context, method

diff --git a/core/src/main/java/dev/velix/imperat/annotations/base/element/SimpleCommandClassVisitor.java b/core/src/main/java/dev/velix/imperat/annotations/base/element/SimpleCommandClassVisitor.java
@@ -313,13 +313,35 @@ private CommandUsage<S> loadUsage(
         @NotNull Command<S> loadedCmd,
         MethodElement method
     ) {
-        if (method.getInputCount() == 0) {
-            loadedCmd.setDefaultUsageExecution(
-                MethodCommandExecutor.of(imperat, method, Collections.emptyList())
-            );
-            return null;
+        int inputCount = method.getInputCount();
+        if (parentCmd != null) {
+            int parentalParams = 0;
+
+            if (!(method.isAnnotationPresent(SubCommand.class) && Objects.requireNonNull(method.getAnnotation(SubCommand.class)).attachDirectly())) {
+                Command<S> parent = parentCmd;
+                while (parent != null) {
+                    parentalParams += parent.mainUsage().size();
+                    parent = parent.parent();
+                }
+            }
+
+            inputCount = Math.abs(method.getInputCount() - parentalParams);
         }
 
+        if (inputCount == 0) {
+            if (parentCmd != null) {
+                MethodUsageData<S> usageData = loadParameters(method, parentCmd);
+                loadedCmd.setDefaultUsageExecution(
+                    MethodCommandExecutor.of(imperat, method, usageData.inheritedTotalParameters())
+                );
+            } else {
+                loadedCmd.setDefaultUsageExecution(
+                    MethodCommandExecutor.of(imperat, method, Collections.emptyList())
+                );
+            }
+
+            return null;
+        }
         ClassElement methodOwner = (ClassElement) method.getParent();
         assert methodOwner != null;
 

diff --git a/core/src/main/java/dev/velix/imperat/context/ResolvedContext.java b/core/src/main/java/dev/velix/imperat/context/ResolvedContext.java
@@ -116,4 +116,6 @@ default void resolveFlag(
      * @return The used usage to use it to resolve commands
      */
     CommandUsage<S> getDetectedUsage();
+
+    void debug();
 }
diff --git a/core/src/main/java/dev/velix/imperat/context/internal/ResolvedContextImpl.java b/core/src/main/java/dev/velix/imperat/context/internal/ResolvedContextImpl.java
@@ -12,6 +12,7 @@
 import dev.velix.imperat.exception.ImperatException;
 import dev.velix.imperat.exception.NumberOutOfRangeException;
 import dev.velix.imperat.resolvers.ContextResolver;
+import dev.velix.imperat.util.ImperatDebugger;
 import dev.velix.imperat.util.Registry;
 import dev.velix.imperat.util.TypeUtility;
 import org.jetbrains.annotations.ApiStatus;
@@ -233,4 +234,12 @@ public CommandUsage<S> getDetectedUsage() {
         return usage;
     }
 
+    @Override
+    public void debug() {
+        for (var arg : allResolvedArgs.getAll()) {
+            ImperatDebugger.debug("Argument '%s' at index #%s with input='%s' with value='%s'",
+                arg.parameter().format(), arg.index(), arg.raw(), arg.value());
+        }
+    }
+
 }
diff --git a/core/src/test/java/dev/velix/imperat/commands/annotations/TestCommand.java b/core/src/test/java/dev/velix/imperat/commands/annotations/TestCommand.java
@@ -51,8 +51,8 @@ public void defaultUsage(TestSource source) {
         }
 
         @Usage
-        public void sub1Main(TestSource source, @Named("a") String a) {
-            source.reply("sub1-main a=" + a);
+        public void sub1Main(TestSource source, @Named("otherText") String otherText, @Named("a") String a) {
+            source.reply("otherText=" + otherText + ", sub1-main a=" + a);
         }
 
         @SubCommand("sub2")
@@ -65,7 +65,7 @@ public void defaultUsage(TestSource source) {
             }
 
             @Usage
-            public void sub2Main(TestSource source, @Named("b") String b) {
+            public void sub2Main(TestSource source, @Named("otherText") String otherText, @Named("a") String a, @Named("b") String b) {
                 source.reply("sub2-main b=" + b);
             }
 
@@ -78,7 +78,7 @@ public void defaultUsage(TestSource source) {
                 }
 
                 @Usage
-                public void sub3Main(TestSource source, @Named("c") String c) {
+                public void sub3Main(TestSource source, @Named("otherText") String otherText, @Named("a") String a, @Named("b") String b, @Named("c") String c) {
                     source.reply("sub3 c=" + c);
                 }