Handle -1 option for first element #3

jsqry · Jun 19, 2020 · 6c1e38f · 6c1e38f
1 parent 279df56
commit 6c1e38f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/github/jsqry/cli/App.java b/src/main/java/com/github/jsqry/cli/App.java
@@ -25,6 +25,10 @@ public static void main(String[] args) {
     help.setRequired(false);
     options.addOption(help);
 
+    Option first = new Option("1", "first", false, "return first result element");
+    first.setRequired(false);
+    options.addOption(first);
+
     CommandLineParser parser = new DefaultParser();
     CommandLine cmd;
 
@@ -76,7 +80,8 @@ public static void main(String[] args) {
       Value doWork = context.eval("js", "doWork");
 
       String inputJsonStr = new String(System.in.readAllBytes(), StandardCharsets.UTF_8);
-      Value result = doWork.execute(inputJsonStr, query);
+
+      Value result = doWork.execute(inputJsonStr, query, cmd.hasOption(first.getLongOpt()));
       if (!result.asBoolean()) {
         System.exit(1);
       }

diff --git a/src/main/resources/app.js b/src/main/resources/app.js
@@ -1,4 +1,4 @@
-function doWork(jsonStr, queryStr) {
+function doWork(jsonStr, queryStr, useFirst) {
     let json;
     try {
         json = JSON.parse(jsonStr);
@@ -8,7 +8,7 @@ function doWork(jsonStr, queryStr) {
     }
     let res;
     try {
-        res = jsqry.query(json, queryStr);
+        res = (useFirst ? jsqry.first : jsqry.query)(json, queryStr);
     } catch (e) {
         console.error('error: ' + e);
         return false;

diff --git a/test_app.sh b/test_app.sh
@@ -19,5 +19,6 @@ CP=$(mvn -q exec:exec -Dexec.executable=echo -Dexec.args="%classpath")
 echo $CP
 
 echo '[{"a":1},{"a":2}]' | $JAVA -cp "$CP" com.github.jsqry.cli.App "a"
+echo '[{"a":1},{"a":2}]' | $JAVA -cp "$CP" com.github.jsqry.cli.App -1 "a[1]"
 echo 'wrong' | $JAVA -cp "$CP" com.github.jsqry.cli.App "a"
 echo '[]' | $JAVA -cp "$CP" com.github.jsqry.cli.App "]"