cli: Make --raw-string work with input/0 and inputs/0

Also lots of refactor
wader · Sep 12, 2021 · ac8cfca · ac8cfca
1 parent 845bc6b
commit ac8cfca
Show file tree

Hide file tree

Showing 10 changed files with 242 additions and 129 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -119,6 +119,7 @@
         "tfhd",
         "tfra",
         "tmpl",
+        "toarray",
         "toboolean",
         "tobytes",
         "toimage",

diff --git a/doc/file.mp3 b/doc/file.mp3
diff --git a/doc/file.mp4 b/doc/file.mp4
diff --git a/doc/usage.md b/doc/usage.md
@@ -8,7 +8,7 @@ For more information see https://github.com/wader/fq
 
 Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
 --compact,-c            Compact output
---decode,-d NAME        Decode format (probe)
+--decode,-d NAME        Decode format (default probe)
 --file,-f PATH          Read EXPR from file
 --formats               Show supported formats
 --help,-h               Show help
@@ -18,10 +18,10 @@ Usage: fq [OPTIONS] [--] [EXPR] [FILE...]
 --null-output,-0        Null byte between outputs
 --option,-o KEY=VALUE   Set option, eg: color=true
 --options               Show all options
+--raw-input,-R          Read raw input strings (don't decode)
 --raw-output,-r         Raw string output (without quotes)
 --repl,-i               Interactive REPL
 --slurp,-s              Read (slurp) all inputs into an array
---raw-input,-R          Read raw input strings (don't decode)
 --version,-v            Show version (dev)
 </pre>
 

diff --git a/pkg/interp/args.jq b/pkg/interp/args.jq
@@ -107,7 +107,9 @@ def args_help_text($opts):
       end;
   ( _maxoptlen as $l
   | $opts
-  | to_entries[]
+  | to_entries
+  | sort_by(.value.long)
+  | .[]
   | (.value | .help_default // .default) as $default
   | [ "\(.value | _opthelp | rpad(" "; $l))  \(.value.description)"
     , if $default then

diff --git a/pkg/interp/internal.jq b/pkg/interp/internal.jq
@@ -29,9 +29,6 @@ def _default_options(f): _global_var("default_options"; f);
 def _options_stack: _global_var("options_stack");
 def _options_stack(f): _global_var("options_stack"; f);
 
-def _parsed_args: _global_var("parsed_args");
-def _parsed_args(f): _global_var("parsed_args"; f);
-
 def _cli_last_expr_error: _global_var("cli_last_expr_error");
 def _cli_last_expr_error(f): _global_var("cli_last_expr_error"; f);
 
@@ -41,6 +38,12 @@ def _input_filename(f): _global_var("input_filename"; f);
 def _input_filenames: _global_var("input_filenames");
 def _input_filenames(f): _global_var("input_filenames"; f);
 
+def _input_strings: _global_var("input_strings");
+def _input_strings(f): _global_var("input_strings"; f);
+
+def _input_strings_lines: _global_var("input_strings_lines");
+def _input_strings_lines(f): _global_var("input_strings_lines"; f);
+
 def _input_io_errors: _global_var("input_io_errors");
 def _input_io_errors(f): _global_var("input_io_errors"; f);