feat: change cli library

levkopo · levkopo · commit 7d90781950fd · 2025-03-10T00:04:44.000+05:00
diff --git a/backend/common/build.gradle b/backend/common/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api "commons-cli:commons-cli:1.9.0"
+    api 'info.picocli:picocli:4.7.6'
     implementation project(":core")
     implementation group: 'com.github.albfernandez', name: 'juniversalchardet', version: '2.4.0'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
diff --git a/backend/common/src/main/java/com/github/kayjamlang/backend/IBackendCompiler.java b/backend/common/src/main/java/com/github/kayjamlang/backend/IBackendCompiler.java
@@ -1,11 +1,6 @@
 package com.github.kayjamlang.backend;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Options;
-
 public interface IBackendCompiler {
-    void addOptions(Options options);
-    IBackendOptions parseOptions(CommandLine data);
+    IBackendOptions createOptionsClass();
     void compile(IOptions options) throws Exception;
 }
diff --git a/backend/jvm/build.gradle b/backend/jvm/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     implementation project(":core")
     implementation project(":backend:common")
     implementation 'org.ow2.asm:asm:9.7.1'
+    annotationProcessor 'info.picocli:picocli-codegen:4.7.6'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation project(':core')
 }
diff --git a/backend/jvm/src/main/java/com/github/kayjamlang/backend/jvm/JVMBackendCompiler.java b/backend/jvm/src/main/java/com/github/kayjamlang/backend/jvm/JVMBackendCompiler.java
@@ -7,9 +7,6 @@
 import com.github.kayjamlang.core.KayJamFile;
 import com.github.kayjamlang.core.exceptions.KayJamLexerException;
 import com.github.kayjamlang.core.exceptions.KayJamParserException;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Options;
 import org.objectweb.asm.ClassWriter;
 
 import java.io.File;
@@ -22,13 +19,8 @@ public class JVMBackendCompiler implements IBackendCompiler {
     public static final JVMBackendCompiler INSTANCE = new JVMBackendCompiler();
 
     @Override
-    public void addOptions(Options options) {
-
-    }
-
-    @Override
-    public IBackendOptions parseOptions(CommandLine data) {
-        return null;
+    public IBackendOptions createOptionsClass() {
+        return new JVMBackendOptions();
     }
 
     @Override
diff --git a/backend/jvm/src/main/java/com/github/kayjamlang/backend/jvm/JVMBackendOptions.java b/backend/jvm/src/main/java/com/github/kayjamlang/backend/jvm/JVMBackendOptions.java
@@ -0,0 +1,9 @@
+package com.github.kayjamlang.backend.jvm;
+
+import com.github.kayjamlang.backend.IBackendOptions;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "jvm", mixinStandardHelpOptions = true)
+public class JVMBackendOptions implements IBackendOptions {
+
+}
diff --git a/backend/ts/build.gradle b/backend/ts/build.gradle
@@ -7,6 +7,7 @@ plugins {
 dependencies {
     implementation project(":core")
     implementation project(":backend:common")
+    annotationProcessor 'info.picocli:picocli-codegen:4.7.6'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation project(':core')
 }
diff --git a/backend/ts/src/main/java/com/github/kayjamlang/backend/ts/TSBackendCompiler.java b/backend/ts/src/main/java/com/github/kayjamlang/backend/ts/TSBackendCompiler.java
@@ -7,27 +7,18 @@
 import com.github.kayjamlang.core.KayJamFile;
 import com.github.kayjamlang.core.exceptions.KayJamLexerException;
 import com.github.kayjamlang.core.exceptions.KayJamParserException;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Options;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 public class TSBackendCompiler implements IBackendCompiler {
     public static final TSBackendCompiler INSTANCE = new TSBackendCompiler();
 
     @Override
-    public void addOptions(Options options) {
-
-    }
-
-    @Override
-    public IBackendOptions parseOptions(CommandLine data) {
-        return null;
+    public IBackendOptions createOptionsClass() {
+        return new TSBackendOptions();
     }
 
     @Override
diff --git a/backend/ts/src/main/java/com/github/kayjamlang/backend/ts/TSBackendOptions.java b/backend/ts/src/main/java/com/github/kayjamlang/backend/ts/TSBackendOptions.java
@@ -0,0 +1,9 @@
+package com.github.kayjamlang.backend.ts;
+
+import com.github.kayjamlang.backend.IBackendOptions;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "ts", mixinStandardHelpOptions = true)
+public class TSBackendOptions implements IBackendOptions {
+
+}
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -24,7 +24,8 @@ dependencies {
     implementation project(":backend:common")
     implementation project(":backend:jvm")
     implementation project(":backend:ts")
-    implementation "commons-cli:commons-cli:1.9.0"
+    implementation 'info.picocli:picocli:4.7.6'
+    annotationProcessor 'info.picocli:picocli-codegen:4.7.6'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation project(':core')
 }
diff --git a/cli/scripts/kayjam b/cli/scripts/kayjam
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-java -jar /usr/share/kayjam/kayjam-cli.jar "$*"
+java -jar /usr/share/kayjam/kayjam-cli.jar $*
diff --git a/cli/src/main/java/com/github/kayjamlang/cli/MainCli.java b/cli/src/main/java/com/github/kayjamlang/cli/MainCli.java
@@ -4,71 +4,66 @@
 import com.github.kayjamlang.backend.IBackendOptions;
 import com.github.kayjamlang.backend.jvm.JVMBackendCompiler;
 import com.github.kayjamlang.backend.ts.TSBackendCompiler;
-import org.apache.commons.cli.*;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
-public class MainCli {
-    private static final Map<String, IBackendCompiler> compilers = new HashMap<>();
+@Command(name = "kayjam", mixinStandardHelpOptions = true)
+public class MainCli implements Callable<Integer> {
+    private final Map<String, IBackendCompiler> compilers = new HashMap<>();
+    private final String compiler;
+    private final String[] args;
 
-    static {
-        compilers.put("jvm", JVMBackendCompiler.INSTANCE);
-        compilers.put("ts", TSBackendCompiler.INSTANCE);
-    }
+    @Option(names = {"-o", "--output"}, description = "Folder for output compiled files", required = true)
+    private String output;
 
-    public static void main(String[] args) {
-        Option typeOption = new Option("t", "type", true, "Backend type: " + compilers.keySet());
-        typeOption.setRequired(true);
+    @Option(names = {"-i", "--input"}, description = "Folder for input kayjam files", required = true)
+    private String input;
 
-        Option outputOption = new Option("o", "output", true, "Output folder");
-        outputOption.setRequired(true);
 
-        Option inputOption = new Option("i", "input", true, "Input folder");
-        inputOption.setRequired(true);
+    public MainCli(String compiler, String[] args) {
+        this.compiler = compiler;
+        this.args = args;
+        compilers.put("jvm", JVMBackendCompiler.INSTANCE);
+        compilers.put("ts", TSBackendCompiler.INSTANCE);
+    }
 
-        Options options = new Options();
-        options.addOption(typeOption);
-        options.addOption(outputOption);
-        options.addOption(inputOption);
+    @Override
+    public Integer call() throws Exception {
+        if (compilers.containsKey(compiler)) {
+            IBackendCompiler backendCompiler = compilers.get(compiler);
+            IBackendOptions backendOptions = backendCompiler.createOptionsClass();
 
-        CommandLineParser cmdLinePosixParser = new DefaultParser();
-        try {
-            CommandLine commandLine = cmdLinePosixParser.parse(options, args);
-            String type = commandLine.getOptionValue(typeOption).replace(" ", "");
-            System.out.println(compilers.get(type));
-            System.out.println("\'"+type+"\'");
-            if (compilers.containsKey(type)) {
-                IBackendCompiler backendCompiler = compilers.get(type);
-                backendCompiler.addOptions(options);
+            CommandLine line = new CommandLine(backendOptions);
+            line.setUnmatchedArgumentsAllowed(true);
+            line.parseArgs(args);
 
-                commandLine = cmdLinePosixParser.parse(options, args);
-                IBackendOptions backendOptions = backendCompiler.parseOptions(commandLine);
-                CliOptions cliOptions = new CliOptions(
-                        backendOptions,
-                        new File(commandLine.getOptionValue(outputOption)),
-                        new File(commandLine.getOptionValue(inputOption))
-                );
+            CliOptions cliOptions = new CliOptions(
+                    backendOptions,
+                    new File(output),
+                    new File(input)
+            );
 
-                backendCompiler.compile(cliOptions);
-            } else {
-                System.err.println("Unknown backend type: " + type);
-                printHelp(options);
-                System.exit(1);
-            }
-        } catch (ParseException e) {
-            printHelp(options);
-            System.exit(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
+            backendCompiler.compile(cliOptions);
+        } else {
+            System.err.println("Unknown backend type: " + compiler);
+            return 1;
         }
+
+        return 0;
     }
 
-    public static void printHelp(final Options options) {
-        final String commandLineSyntax = "kayjam -t jvm -i input/ -o output/";
-        final HelpFormatter helpFormatter = new HelpFormatter();
-        helpFormatter.printHelp(commandLineSyntax, options);
+    public static void main(String[] args) {
+        int exitCode = new CommandLine(new MainCli(args[0], Arrays.copyOfRange(args, 1, args.length)))
+                .execute(Arrays.copyOfRange(args, 1, args.length));
+        System.exit(exitCode);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- api "commons-cli:commons-cli:1.9.0"`
	`8`	`+ api 'info.picocli:picocli:4.7.6'`
`9`	`9`	`implementation project(":core")`
`10`	`10`	`implementation group: 'com.github.albfernandez', name: 'juniversalchardet', version: '2.4.0'`
`11`	`11`	`testImplementation group: 'junit', name: 'junit', version: '4.13.2'`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ dependencies {`
`8`	`8`	`implementation project(":core")`
`9`	`9`	`implementation project(":backend:common")`
`10`	`10`	`implementation 'org.ow2.asm:asm:9.7.1'`
	`11`	`+ annotationProcessor 'info.picocli:picocli-codegen:4.7.6'`
`11`	`12`	`testImplementation group: 'junit', name: 'junit', version: '4.13.2'`
`12`	`13`	`testImplementation project(':core')`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ plugins {`
`7`	`7`	`dependencies {`
`8`	`8`	`implementation project(":core")`
`9`	`9`	`implementation project(":backend:common")`
	`10`	`+ annotationProcessor 'info.picocli:picocli-codegen:4.7.6'`
`10`	`11`	`testImplementation group: 'junit', name: 'junit', version: '4.13.2'`
`11`	`12`	`testImplementation project(':core')`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/usr/bin/env sh`
`2`		`-java -jar /usr/share/kayjam/kayjam-cli.jar "$*"`
	`2`	`+java -jar /usr/share/kayjam/kayjam-cli.jar $*`