diff --git a/compiler.jar b/compiler.jar
index e6afbcf1a..92bc25656 100644
Binary files a/compiler.jar and b/compiler.jar differ
diff --git a/complete/completion.yaml b/complete/completion.yaml
index 8903c602b..54388da28 100644
--- a/complete/completion.yaml
+++ b/complete/completion.yaml
@@ -24,7 +24,8 @@ jobs:
in:
file: isString
exec : |
- ow.template.addHelper("$p", p => p)
+ ow.template.addHelper("$sfx", n => "${arg#" + n + "}")
+ ow.template.addHelper("$esc", s => isUnDef(s) ? "" : String(s).replace(/'/g, "'\\''"))
from :
- (pass ):
aYAMLFile: "{{file}}"
@@ -36,45 +37,92 @@ jobs:
#!/bin/sh
# Flags
+ _G_EXACT_CHOSEN=0
{{#each complete}}
F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=1
+ {{#if exact}}
+ F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_SEEN=0
+ {{#each opts}}
+ F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=1
+ {{/each}}
+ {{else}}
{{#each opts}}
F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0
{{#each opts}}
F_{{{$path ../../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=1
{{/each}}
{{/each}}
+ {{/if}}
{{/each}}
# Iterate over the arguments
+ FFOUND=0
if [ $# -gt 0 ]; then
- FFOUND=0
+ _n=$#
+ _i=0
for arg in "$@"; do
- if [ "$arg" = "${!#}" ]; then FFOUND=1; break; fi
+ _i=$((_i+1))
+ if [ $_i -eq $_n ]; then FFOUND=1; break; fi
{{#each complete}}
{{#if opts.length}}
- # {{{name}}} options
+ {{#if exact}}
+ # {{{name}}} subcommand
+ if [ "$arg" = "{{{name}}}" ]; then FFOUND=1; F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_SEEN=1; _G_EXACT_CHOSEN=1; fi
+ {{#each opts}}
+ if [ $F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_SEEN -eq 1 ] && [ "$arg" = "{{{name}}}" ]; then FFOUND=1; F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
+ {{/each}}
{{else}}
- # {{{name}}} single option
- if [ "$arg" = "{{{name}}}" ]; then FFOUND=1; F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
- {{/if}}
+ # {{{name}}} options
{{#each opts}}
if [ "$arg" = "{{{name}}}" ]; then FFOUND=1; F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=1; F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
{{#each opts}}
- if [ "${arg#{{{name}}}{{$p '}'}}" != "$arg" ]; then FFOUND=1; F_{{{$path ../../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
+ if [ "{{{$sfx name}}}" != "$arg" ]; then FFOUND=1; F_{{{$path ../../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
{{/each}}
{{/each}}
+ {{/if}}
+ {{else}}
+ # {{{name}}} single option
+ if [ "$arg" = "{{{name}}}" ]; then FFOUND=1; F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}=0; fi
+ {{/if}}
{{/each}}
done
fi
{{#each complete}}
+ {{#if exact}}
# Print completion for {{{name}}}
- if [ $F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
- echo "{{{name}}} {{{desc}}}"
-
+ if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
+ {{#if desc}}
+ printf '%s\t%s\n' '{{{$esc name}}}' '{{{$esc desc}}}'
+ {{else}}
+ printf '%s\n' '{{{$esc name}}}'
+ {{/if}}
+ fi
+ if [ $F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_SEEN -eq 1 ]; then
{{#each opts}}
- echo "{{{name}}} {{{desc}}}"
+ if [ $F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
+ {{#if desc}}
+ printf '%s\t%s\n' '{{{$esc name}}}' '{{{$esc desc}}}'
+ {{else}}
+ printf '%s\n' '{{{$esc name}}}'
+ {{/if}}
+ fi
+ {{/each}}
+ fi
+ {{else}}
+ # Print completion for {{{name}}}
+ if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
+ {{#if desc}}
+ printf '%s\t%s\n' '{{{$esc name}}}' '{{{$esc desc}}}'
+ {{else}}
+ printf '%s\n' '{{{$esc name}}}'
+ {{/if}}
+ {{#each opts}}
+ {{#if desc}}
+ printf '%s\t%s\n' '{{{$esc name}}}' '{{{$esc desc}}}'
+ {{else}}
+ printf '%s\n' '{{{$esc name}}}'
+ {{/if}}
{{/each}}
fi
{{#each opts}}
@@ -82,12 +130,17 @@ jobs:
if [ $F_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
{{#each opts}}
if [ $F_{{{$path ../../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path ../name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}}_{{{$path name 'replace(@,\'[^a-zA-Z0-9]\',\'g\',\'_\')'}}} -eq 1 ]; then
- echo "{{{name}}} {{{desc}}}"
+ {{#if desc}}
+ printf '%s\t%s\n' '{{{$esc name}}}' '{{{$esc desc}}}'
+ {{else}}
+ printf '%s\n' '{{{$esc name}}}'
+ {{/if}}
fi
{{/each}}
fi
{{/if}}
{{/each}}
+ {{/if}}
{{/each}}
# end
@@ -96,7 +149,7 @@ jobs:
else
echo :2
fi
-
+
((key )): args
((dpath )): data
((out )): out
diff --git a/complete/completion_oaf.sh b/complete/completion_oaf.sh
index 0c98c1373..c1d68972a 100644
--- a/complete/completion_oaf.sh
+++ b/complete/completion_oaf.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# Flags
+_G_EXACT_CHOSEN=0
F__e=1
F__c=1
F__p=1
@@ -21,10 +22,13 @@ F__v=1
F__helpscript=1
# Iterate over the arguments
+FFOUND=0
if [ $# -gt 0 ]; then
- FFOUND=0
+ _n=$#
+ _i=0
for arg in "$@"; do
- if [ "$arg" = "" ]; then FFOUND=1; break; fi
+ _i=$((_i+1))
+ if [ $_i -eq $_n ]; then FFOUND=1; break; fi
# -e single option
if [ "$arg" = "-e" ]; then FFOUND=1; F__e=0; fi
# -c single option
@@ -65,94 +69,76 @@ if [ $# -gt 0 ]; then
fi
# Print completion for -e
-if [ $F__e -eq 1 ]; then
- echo "-e provide input directly instead of using stdin"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__e -eq 1 ]; then
+ printf '%s\t%s\n' '-e' 'provide input directly instead of using stdin'
fi
# Print completion for -c
-if [ $F__c -eq 1 ]; then
- echo "-c provide javascript code directly"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__c -eq 1 ]; then
+ printf '%s\t%s\n' '-c' 'provide javascript code directly'
fi
# Print completion for -p
-if [ $F__p -eq 1 ]; then
- echo "-p received streaming input -OS pipe-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__p -eq 1 ]; then
+ printf '%s\t%s\n' '-p' 'received streaming input -OS pipe-'
fi
# Print completion for -o
-if [ $F__o -eq 1 ]; then
- echo "-o output mode -__pmOut displayed-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__o -eq 1 ]; then
+ printf '%s\t%s\n' '-o' 'output mode -__pmOut displayed-'
fi
# Print completion for -f
-if [ $F__f -eq 1 ]; then
- echo "-f provide a script file directly"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__f -eq 1 ]; then
+ printf '%s\t%s\n' '-f' 'provide a script file directly'
fi
# Print completion for --install
-if [ $F___install -eq 1 ]; then
- echo "--install generates scripts to use openaf on the current directory"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___install -eq 1 ]; then
+ printf '%s\t%s\n' '--install' 'generates scripts to use openaf on the current directory'
fi
# Print completion for --check
-if [ $F___check -eq 1 ]; then
- echo "--check checks if this is the current version"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___check -eq 1 ]; then
+ printf '%s\t%s\n' '--check' 'checks if this is the current version'
fi
# Print completion for --update
-if [ $F___update -eq 1 ]; then
- echo "--update updates to the most current version"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___update -eq 1 ]; then
+ printf '%s\t%s\n' '--update' 'updates to the most current version'
fi
# Print completion for --console
-if [ $F___console -eq 1 ]; then
- echo "--console interactive OpenAF console"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___console -eq 1 ]; then
+ printf '%s\t%s\n' '--console' 'interactive OpenAF console'
fi
# Print completion for --repack
-if [ $F___repack -eq 1 ]; then
- echo "--repack repack OpenAF.jar for faster startup times"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___repack -eq 1 ]; then
+ printf '%s\t%s\n' '--repack' 'repack OpenAF.jar for faster startup times'
fi
# Print completion for --daemon
-if [ $F___daemon -eq 1 ]; then
- echo "--daemon executes a script/opack as a daemon"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___daemon -eq 1 ]; then
+ printf '%s\t%s\n' '--daemon' 'executes a script/opack as a daemon'
fi
# Print completion for --script
-if [ $F___script -eq 1 ]; then
- echo "--script executes a script/opack"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___script -eq 1 ]; then
+ printf '%s\t%s\n' '--script' 'executes a script/opack'
fi
# Print completion for --force
-if [ $F___force -eq 1 ]; then
- echo "--force forces an update"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___force -eq 1 ]; then
+ printf '%s\t%s\n' '--force' 'forces an update'
fi
# Print completion for --sb
-if [ $F___sb -eq 1 ]; then
- echo "--sb generates or pre-appends openaf/ojob shebang to a js script or ojob yaml/json"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___sb -eq 1 ]; then
+ printf '%s\t%s\n' '--sb' 'generates or pre-appends openaf/ojob shebang to a js script or ojob yaml/json'
fi
# Print completion for --py
-if [ $F___py -eq 1 ]; then
- echo "--py runs a python script with openaf extensions"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F___py -eq 1 ]; then
+ printf '%s\t%s\n' '--py' 'runs a python script with openaf extensions'
fi
# Print completion for -h
-if [ $F__h -eq 1 ]; then
- echo "-h show this help information"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__h -eq 1 ]; then
+ printf '%s\t%s\n' '-h' 'show this help information'
fi
# Print completion for -v
-if [ $F__v -eq 1 ]; then
- echo "-v show the version"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__v -eq 1 ]; then
+ printf '%s\t%s\n' '-v' 'show the version'
fi
# Print completion for -helpscript
-if [ $F__helpscript -eq 1 ]; then
- echo "-helpscript show help on a search term on scripting"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__helpscript -eq 1 ]; then
+ printf '%s\t%s\n' '-helpscript' 'show help on a search term on scripting'
fi
# end
diff --git a/complete/completion_oafp.sh b/complete/completion_oafp.sh
index b23c52842..62c33e021 100644
--- a/complete/completion_oafp.sh
+++ b/complete/completion_oafp.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# Flags
+_G_EXACT_CHOSEN=0
F_in_=1
F_in__in_ask=0
F_in__in_base64=0
@@ -349,156 +350,159 @@ F_xrfn_=1
F_val2icon_=1
# Iterate over the arguments
+FFOUND=0
if [ $# -gt 0 ]; then
- FFOUND=0
+ _n=$#
+ _i=0
for arg in "$@"; do
- if [ "$arg" = "" ]; then FFOUND=1; break; fi
+ _i=$((_i+1))
+ if [ $_i -eq $_n ]; then FFOUND=1; break; fi
# in= options
if [ "$arg" = "in=ask" ]; then FFOUND=1; F_in__in_ask=1; F_in_=0; fi
if [ "$arg" = "in=base64" ]; then FFOUND=1; F_in__in_base64=1; F_in_=0; fi
if [ "$arg" = "in=ch" ]; then FFOUND=1; F_in__in_ch=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inch=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inchall=0; fi
+ if [ "${arg#inch}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inch=0; fi
+ if [ "${arg#inchall}" != "$arg" ]; then FFOUND=1; F_in__in_ch_inchall=0; fi
if [ "$arg" = "in=csv" ]; then FFOUND=1; F_in__in_csv=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_csv_incsv_=0; fi
+ if [ "${arg#incsv=}" != "$arg" ]; then FFOUND=1; F_in__in_csv_incsv_=0; fi
if [ "$arg" = "in=dsv" ]; then FFOUND=1; F_in__in_dsv=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsep_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsepre_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvquote_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvescape_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvcomment_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvheader_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvtrim_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvfields_=0; fi
+ if [ "${arg#indsvsep=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsep_=0; fi
+ if [ "${arg#indsvsepre=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvsepre_=0; fi
+ if [ "${arg#indsvquote=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvquote_=0; fi
+ if [ "${arg#indsvescape=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvescape_=0; fi
+ if [ "${arg#indsvcomment=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvcomment_=0; fi
+ if [ "${arg#indsvheader=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvheader_=0; fi
+ if [ "${arg#indsvtrim=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvtrim_=0; fi
+ if [ "${arg#indsvjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvjoin_=0; fi
+ if [ "${arg#indsvfields=}" != "$arg" ]; then FFOUND=1; F_in__in_dsv_indsvfields_=0; fi
if [ "$arg" = "in=db" ]; then FFOUND=1; F_in__in_db=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbjdbc_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbuser_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbpass_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbtimeout_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indblib_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbstream_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbexec_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbautocommit_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbdesc_=0; fi
+ if [ "${arg#indbjdbc=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbjdbc_=0; fi
+ if [ "${arg#indbuser=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbuser_=0; fi
+ if [ "${arg#indbpass=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbpass_=0; fi
+ if [ "${arg#indbtimeout=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbtimeout_=0; fi
+ if [ "${arg#indblib=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indblib_=0; fi
+ if [ "${arg#indbstream=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbstream_=0; fi
+ if [ "${arg#indbexec=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbexec_=0; fi
+ if [ "${arg#indbautocommit=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbautocommit_=0; fi
+ if [ "${arg#indbdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_db_indbdesc_=0; fi
if [ "$arg" = "in=gb64json" ]; then FFOUND=1; F_in__in_gb64json=1; F_in_=0; fi
if [ "$arg" = "in=hsperf" ]; then FFOUND=1; F_in__in_hsperf=1; F_in_=0; fi
if [ "$arg" = "in=ini" ]; then FFOUND=1; F_in__in_ini=1; F_in_=0; fi
if [ "$arg" = "in=javas" ]; then FFOUND=1; F_in__in_javas=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javas_javasinception_=0; fi
+ if [ "${arg#javasinception=}" != "$arg" ]; then FFOUND=1; F_in__in_javas_javasinception_=0; fi
if [ "$arg" = "in=javagc" ]; then FFOUND=1; F_in__in_javagc=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javagc_javagcjoin_=0; fi
+ if [ "${arg#javagcjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_javagc_javagcjoin_=0; fi
if [ "$arg" = "in=javathread" ]; then FFOUND=1; F_in__in_javathread=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_javathread_javathreadpid_=0; fi
+ if [ "${arg#javathreadpid=}" != "$arg" ]; then FFOUND=1; F_in__in_javathread_javathreadpid_=0; fi
if [ "$arg" = "in=jfr" ]; then FFOUND=1; F_in__in_jfr=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrdesc_=0; fi
+ if [ "${arg#jfrjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrjoin_=0; fi
+ if [ "${arg#jfrdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_jfr_jfrdesc_=0; fi
if [ "$arg" = "in=jmx" ]; then FFOUND=1; F_in__in_jmx=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpid_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxurl_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxuser_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpass_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxprovider_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxop_=0; fi
+ if [ "${arg#jmxpid=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpid_=0; fi
+ if [ "${arg#jmxurl=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxurl_=0; fi
+ if [ "${arg#jmxuser=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxuser_=0; fi
+ if [ "${arg#jmxpass=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxpass_=0; fi
+ if [ "${arg#jmxprovider=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxprovider_=0; fi
+ if [ "${arg#jmxop=}" != "$arg" ]; then FFOUND=1; F_in__in_jmx_jmxop_=0; fi
if [ "$arg" = "in=json" ]; then FFOUND=1; F_in__in_json=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsondesc_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsonprefix_=0; fi
+ if [ "${arg#jsondesc=}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsondesc_=0; fi
+ if [ "${arg#jsonprefix=}" != "$arg" ]; then FFOUND=1; F_in__in_json_jsonprefix_=0; fi
if [ "$arg" = "in=jsonschema" ]; then FFOUND=1; F_in__in_jsonschema=1; F_in_=0; fi
if [ "$arg" = "in=jwt" ]; then FFOUND=1; F_in__in_jwt=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtverify_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtsecret_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtpubkey_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtalg_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtraw_=0; fi
+ if [ "${arg#injwtverify=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtverify_=0; fi
+ if [ "${arg#injwtsecret=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtsecret_=0; fi
+ if [ "${arg#injwtpubkey=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtpubkey_=0; fi
+ if [ "${arg#injwtalg=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtalg_=0; fi
+ if [ "${arg#injwtraw=}" != "$arg" ]; then FFOUND=1; F_in__in_jwt_injwtraw_=0; fi
if [ "$arg" = "in=lines" ]; then FFOUND=1; F_in__in_lines=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisual_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualsepre_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualheadsep=0; fi
+ if [ "${arg#linesjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesjoin_=0; fi
+ if [ "${arg#linesvisual=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisual_=0; fi
+ if [ "${arg#linesvisualsepre=}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualsepre_=0; fi
+ if [ "${arg#linesvisualheadsep}" != "$arg" ]; then FFOUND=1; F_in__in_lines_linesvisualheadsep=0; fi
if [ "$arg" = "in=llm" ]; then FFOUND=1; F_in__in_llm=1; F_in_=0; fi
if [ "$arg" = "in=llmmodels" ]; then FFOUND=1; F_in__in_llmmodels=1; F_in_=0; fi
if [ "$arg" = "in=ls" ]; then FFOUND=1; F_in__in_ls=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsext_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsrecursive_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsposix_=0; fi
+ if [ "${arg#lsext=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsext_=0; fi
+ if [ "${arg#lsrecursive=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsrecursive_=0; fi
+ if [ "${arg#lsposix=}" != "$arg" ]; then FFOUND=1; F_in__in_ls_lsposix_=0; fi
if [ "$arg" = "in=md" ]; then FFOUND=1; F_in__in_md=1; F_in_=0; fi
if [ "$arg" = "in=mdtable" ]; then FFOUND=1; F_in__in_mdtable=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mdtable_inmdtablejoin_=0; fi
+ if [ "${arg#inmdtablejoin=}" != "$arg" ]; then FFOUND=1; F_in__in_mdtable_inmdtablejoin_=0; fi
if [ "$arg" = "in=mdcode" ]; then FFOUND=1; F_in__in_mdcode=1; F_in_=0; fi
if [ "$arg" = "in=mcp" ]; then FFOUND=1; F_in__in_mcp=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcptoolslist_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcplistprompts_=0; fi
+ if [ "${arg#inmcptoolslist=}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcptoolslist_=0; fi
+ if [ "${arg#inmcplistprompts=}" != "$arg" ]; then FFOUND=1; F_in__in_mcp_inmcplistprompts_=0; fi
if [ "$arg" = "in=minia" ]; then FFOUND=1; F_in__in_minia=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minianolog_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minialogfile_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_minia_miniametrics_=0; fi
+ if [ "${arg#minianolog=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minianolog_=0; fi
+ if [ "${arg#minialogfile=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_minialogfile_=0; fi
+ if [ "${arg#miniametrics=}" != "$arg" ]; then FFOUND=1; F_in__in_minia_miniametrics_=0; fi
if [ "$arg" = "in=ndjson" ]; then FFOUND=1; F_in__in_ndjson=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonfilter_=0; fi
+ if [ "${arg#ndjsonjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonjoin_=0; fi
+ if [ "${arg#ndjsonfilter=}" != "$arg" ]; then FFOUND=1; F_in__in_ndjson_ndjsonfilter_=0; fi
if [ "$arg" = "in=ndslon" ]; then FFOUND=1; F_in__in_ndslon=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonfilter_=0; fi
+ if [ "${arg#ndslonjoin=}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonjoin_=0; fi
+ if [ "${arg#ndslonfilter=}" != "$arg" ]; then FFOUND=1; F_in__in_ndslon_ndslonfilter_=0; fi
if [ "$arg" = "in=oaf" ]; then FFOUND=1; F_in__in_oaf=1; F_in_=0; fi
if [ "$arg" = "in=oafp" ]; then FFOUND=1; F_in__in_oafp=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_oafp_inoafpseq_=0; fi
+ if [ "${arg#inoafpseq=}" != "$arg" ]; then FFOUND=1; F_in__in_oafp_inoafpseq_=0; fi
if [ "$arg" = "in=ojob" ]; then FFOUND=1; F_in__in_ojob=1; F_in_=0; fi
if [ "$arg" = "in=openmetrics" ]; then FFOUND=1; F_in__in_openmetrics=1; F_in_=0; fi
if [ "$arg" = "in=raw" ]; then FFOUND=1; F_in__in_raw=1; F_in_=0; fi
if [ "$arg" = "in=rawhex" ]; then FFOUND=1; F_in__in_rawhex=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_rawhex_inrawhexline_=0; fi
+ if [ "${arg#inrawhexline=}" != "$arg" ]; then FFOUND=1; F_in__in_rawhex_inrawhexline_=0; fi
if [ "$arg" = "in=sh" ]; then FFOUND=1; F_in__in_sh=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sh_inshformat_=0; fi
+ if [ "${arg#inshformat=}" != "$arg" ]; then FFOUND=1; F_in__in_sh_inshformat_=0; fi
if [ "$arg" = "in=slon" ]; then FFOUND=1; F_in__in_slon=1; F_in_=0; fi
if [ "$arg" = "in=sql" ]; then FFOUND=1; F_in__in_sql=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqlparse_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqloptions_=0; fi
+ if [ "${arg#sqlparse=}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqlparse_=0; fi
+ if [ "${arg#sqloptions=}" != "$arg" ]; then FFOUND=1; F_in__in_sql_sqloptions_=0; fi
if [ "$arg" = "in=snmp" ]; then FFOUND=1; F_in__in_snmp=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmp_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpcommunity_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpversion_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmptimeout_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpretries_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpsec_=0; fi
+ if [ "${arg#insnmp=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmp_=0; fi
+ if [ "${arg#insnmpcommunity=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpcommunity_=0; fi
+ if [ "${arg#insnmpversion=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpversion_=0; fi
+ if [ "${arg#insnmptimeout=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmptimeout_=0; fi
+ if [ "${arg#insnmpretries=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpretries_=0; fi
+ if [ "${arg#insnmpsec=}" != "$arg" ]; then FFOUND=1; F_in__in_snmp_insnmpsec_=0; fi
if [ "$arg" = "in=toml" ]; then FFOUND=1; F_in__in_toml=1; F_in_=0; fi
if [ "$arg" = "in=toon" ]; then FFOUND=1; F_in__in_toon=1; F_in_=0; fi
if [ "$arg" = "in=xls" ]; then FFOUND=1; F_in__in_xls=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlssheet_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsevalformulas_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsdesc_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlscol_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsrow_=0; fi
+ if [ "${arg#inxlssheet=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlssheet_=0; fi
+ if [ "${arg#inxlsevalformulas=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsevalformulas_=0; fi
+ if [ "${arg#inxlsdesc=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsdesc_=0; fi
+ if [ "${arg#inxlscol=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlscol_=0; fi
+ if [ "${arg#inxlsrow=}" != "$arg" ]; then FFOUND=1; F_in__in_xls_inxlsrow_=0; fi
if [ "$arg" = "in=xml" ]; then FFOUND=1; F_in__in_xml=1; F_in_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlignored_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlprefix_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlfiltertag_=0; fi
+ if [ "${arg#xmlignored=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlignored_=0; fi
+ if [ "${arg#xmlprefix=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlprefix_=0; fi
+ if [ "${arg#xmlfiltertag=}" != "$arg" ]; then FFOUND=1; F_in__in_xml_xmlfiltertag_=0; fi
if [ "$arg" = "in=yaml" ]; then FFOUND=1; F_in__in_yaml=1; F_in_=0; fi
# out= options
if [ "$arg" = "out=base64" ]; then FFOUND=1; F_out__out_base64=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_base64_base64gzip_=0; fi
+ if [ "${arg#base64gzip=}" != "$arg" ]; then FFOUND=1; F_out__out_base64_base64gzip_=0; fi
if [ "$arg" = "out=ch" ]; then FFOUND=1; F_out__out_ch=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_ch_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chkey_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chunset_=0; fi
+ if [ "${arg#ch=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_ch_=0; fi
+ if [ "${arg#chkey=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chkey_=0; fi
+ if [ "${arg#chunset=}" != "$arg" ]; then FFOUND=1; F_out__out_ch_chunset_=0; fi
if [ "$arg" = "out=chart" ]; then FFOUND=1; F_out__out_chart=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chart_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chartcls_=0; fi
+ if [ "${arg#chart=}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chart_=0; fi
+ if [ "${arg#chartcls=}" != "$arg" ]; then FFOUND=1; F_out__out_chart_chartcls_=0; fi
if [ "$arg" = "out=cjson" ]; then FFOUND=1; F_out__out_cjson=1; F_out_=0; fi
if [ "$arg" = "out=cmd" ]; then FFOUND=1; F_out__out_cmd=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmd_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdjoin_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdseq_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdnl_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdparam_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdtmpl_=0; fi
+ if [ "${arg#outcmd=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmd_=0; fi
+ if [ "${arg#outcmdjoin=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdjoin_=0; fi
+ if [ "${arg#outcmdseq=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdseq_=0; fi
+ if [ "${arg#outcmdnl=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdnl_=0; fi
+ if [ "${arg#outcmdparam=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdparam_=0; fi
+ if [ "${arg#outcmdtmpl=}" != "$arg" ]; then FFOUND=1; F_out__out_cmd_outcmdtmpl_=0; fi
if [ "$arg" = "out=cslon" ]; then FFOUND=1; F_out__out_cslon=1; F_out_=0; fi
if [ "$arg" = "out=csv" ]; then FFOUND=1; F_out__out_csv=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_csv_csv_=0; fi
+ if [ "${arg#csv=}" != "$arg" ]; then FFOUND=1; F_out__out_csv_csv_=0; fi
if [ "$arg" = "out=dsv" ]; then FFOUND=1; F_out__out_dsv=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvsep_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvquote_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvfields_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvuseslon_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvheader_=0; fi
+ if [ "${arg#dsvsep=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvsep_=0; fi
+ if [ "${arg#dsvquote=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvquote_=0; fi
+ if [ "${arg#dsvfields=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvfields_=0; fi
+ if [ "${arg#dsvuseslon=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvuseslon_=0; fi
+ if [ "${arg#dsvheader=}" != "$arg" ]; then FFOUND=1; F_out__out_dsv_dsvheader_=0; fi
if [ "$arg" = "out=ctable" ]; then FFOUND=1; F_out__out_ctable=1; F_out_=0; fi
if [ "$arg" = "out=ctree" ]; then FFOUND=1; F_out__out_ctree=1; F_out_=0; fi
if [ "$arg" = "out=mtree" ]; then FFOUND=1; F_out__out_mtree=1; F_out_=0; fi
@@ -509,87 +513,87 @@ if [ $# -gt 0 ]; then
if [ "$arg" = "out=lkyaml" ]; then FFOUND=1; F_out__out_lkyaml=1; F_out_=0; fi
if [ "$arg" = "out=clkyaml" ]; then FFOUND=1; F_out__out_clkyaml=1; F_out_=0; fi
if [ "$arg" = "out=db" ]; then FFOUND=1; F_out__out_db=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbjdbc_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbuser_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbpass_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtimeout_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dblib_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtable_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbnocreate_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbicase_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbbatchsize_=0; fi
+ if [ "${arg#dbjdbc=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbjdbc_=0; fi
+ if [ "${arg#dbuser=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbuser_=0; fi
+ if [ "${arg#dbpass=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbpass_=0; fi
+ if [ "${arg#dbtimeout=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtimeout_=0; fi
+ if [ "${arg#dblib=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dblib_=0; fi
+ if [ "${arg#dbtable=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbtable_=0; fi
+ if [ "${arg#dbnocreate=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbnocreate_=0; fi
+ if [ "${arg#dbicase=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbicase_=0; fi
+ if [ "${arg#dbbatchsize=}" != "$arg" ]; then FFOUND=1; F_out__out_db_dbbatchsize_=0; fi
if [ "$arg" = "out=envs" ]; then FFOUND=1; F_out__out_envs=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envscmd_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsprefix_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsnoprefix_=0; fi
+ if [ "${arg#envscmd=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envscmd_=0; fi
+ if [ "${arg#envsprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsprefix_=0; fi
+ if [ "${arg#envsnoprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_envs_envsnoprefix_=0; fi
if [ "$arg" = "out=gb64json" ]; then FFOUND=1; F_out__out_gb64json=1; F_out_=0; fi
if [ "$arg" = "out=grid" ]; then FFOUND=1; F_out__out_grid=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_grid_grid_=0; fi
+ if [ "${arg#grid=}" != "$arg" ]; then FFOUND=1; F_out__out_grid_grid_=0; fi
if [ "$arg" = "out=html" ]; then FFOUND=1; F_out__out_html=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlcompact_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlpart_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlopen_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlwait_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmldark_=0; fi
+ if [ "${arg#htmlcompact=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlcompact_=0; fi
+ if [ "${arg#htmlpart=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlpart_=0; fi
+ if [ "${arg#htmlopen=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlopen_=0; fi
+ if [ "${arg#htmlwait=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmlwait_=0; fi
+ if [ "${arg#htmldark=}" != "$arg" ]; then FFOUND=1; F_out__out_html_htmldark_=0; fi
if [ "$arg" = "out=ini" ]; then FFOUND=1; F_out__out_ini=1; F_out_=0; fi
if [ "$arg" = "out=json" ]; then FFOUND=1; F_out__out_json=1; F_out_=0; fi
if [ "$arg" = "out=jwt" ]; then FFOUND=1; F_out__out_jwt=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtsecret_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtprivkey_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtalg_=0; fi
+ if [ "${arg#jwtsecret=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtsecret_=0; fi
+ if [ "${arg#jwtprivkey=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtprivkey_=0; fi
+ if [ "${arg#jwtalg=}" != "$arg" ]; then FFOUND=1; F_out__out_jwt_jwtalg_=0; fi
if [ "$arg" = "out=lines" ]; then FFOUND=1; F_out__out_lines=1; F_out_=0; fi
if [ "$arg" = "out=log" ]; then FFOUND=1; F_out__out_log=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_log_logprintall_=0; fi
+ if [ "${arg#logprintall=}" != "$arg" ]; then FFOUND=1; F_out__out_log_logprintall_=0; fi
if [ "$arg" = "out=map" ]; then FFOUND=1; F_out__out_map=1; F_out_=0; fi
if [ "$arg" = "out=md" ]; then FFOUND=1; F_out__out_md=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_md_mdtemplate_=0; fi
+ if [ "${arg#mdtemplate=}" != "$arg" ]; then FFOUND=1; F_out__out_md_mdtemplate_=0; fi
if [ "$arg" = "out=mdtable" ]; then FFOUND=1; F_out__out_mdtable=1; F_out_=0; fi
if [ "$arg" = "out=mdyaml" ]; then FFOUND=1; F_out__out_mdyaml=1; F_out_=0; fi
if [ "$arg" = "out=ndjson" ]; then FFOUND=1; F_out__out_ndjson=1; F_out_=0; fi
if [ "$arg" = "out=ndslon" ]; then FFOUND=1; F_out__out_ndslon=1; F_out_=0; fi
if [ "$arg" = "out=ndcslon" ]; then FFOUND=1; F_out__out_ndcslon=1; F_out_=0; fi
if [ "$arg" = "out=oaf" ]; then FFOUND=1; F_out__out_oaf=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_oaf_outoaf_=0; fi
+ if [ "${arg#outoaf=}" != "$arg" ]; then FFOUND=1; F_out__out_oaf_outoaf_=0; fi
if [ "$arg" = "out=openmetrics" ]; then FFOUND=1; F_out__out_openmetrics=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricsprefix_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricstimestamp_=0; fi
+ if [ "${arg#metricsprefix=}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricsprefix_=0; fi
+ if [ "${arg#metricstimestamp=}" != "$arg" ]; then FFOUND=1; F_out__out_openmetrics_metricstimestamp_=0; fi
if [ "$arg" = "out=pjson" ]; then FFOUND=1; F_out__out_pjson=1; F_out_=0; fi
if [ "$arg" = "out=prettyjson" ]; then FFOUND=1; F_out__out_prettyjson=1; F_out_=0; fi
if [ "$arg" = "out=pxml" ]; then FFOUND=1; F_out__out_pxml=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_pxml_pxmlprefix=0; fi
+ if [ "${arg#pxmlprefix}" != "$arg" ]; then FFOUND=1; F_out__out_pxml_pxmlprefix=0; fi
if [ "$arg" = "out=raw" ]; then FFOUND=1; F_out__out_raw=1; F_out_=0; fi
if [ "$arg" = "out=rawascii" ]; then FFOUND=1; F_out__out_rawascii=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciistart_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciiend_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciitab_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinovisual_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinolinenum_=0; fi
+ if [ "${arg#rawasciistart=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciistart_=0; fi
+ if [ "${arg#rawasciiend=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciiend_=0; fi
+ if [ "${arg#rawasciitab=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciitab_=0; fi
+ if [ "${arg#rawasciinovisual=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinovisual_=0; fi
+ if [ "${arg#rawasciinolinenum=}" != "$arg" ]; then FFOUND=1; F_out__out_rawascii_rawasciinolinenum_=0; fi
if [ "$arg" = "out=schart" ]; then FFOUND=1; F_out__out_schart=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_schart_schart_=0; fi
+ if [ "${arg#schart=}" != "$arg" ]; then FFOUND=1; F_out__out_schart_schart_=0; fi
if [ "$arg" = "out=slon" ]; then FFOUND=1; F_out__out_slon=1; F_out_=0; fi
if [ "$arg" = "out=sql" ]; then FFOUND=1; F_out__out_sql=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqltable_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlicase_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlnocreate_=0; fi
+ if [ "${arg#sqltable=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqltable_=0; fi
+ if [ "${arg#sqlicase=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlicase_=0; fi
+ if [ "${arg#sqlnocreate=}" != "$arg" ]; then FFOUND=1; F_out__out_sql_sqlnocreate_=0; fi
if [ "$arg" = "out=stable" ]; then FFOUND=1; F_out__out_stable=1; F_out_=0; fi
if [ "$arg" = "out=table" ]; then FFOUND=1; F_out__out_table=1; F_out_=0; fi
if [ "$arg" = "out=template" ]; then FFOUND=1; F_out__out_template=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_template_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatepath_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatedata_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatetmpl_=0; fi
+ if [ "${arg#template=}" != "$arg" ]; then FFOUND=1; F_out__out_template_template_=0; fi
+ if [ "${arg#templatepath=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatepath_=0; fi
+ if [ "${arg#templatedata=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatedata_=0; fi
+ if [ "${arg#templatetmpl=}" != "$arg" ]; then FFOUND=1; F_out__out_template_templatetmpl_=0; fi
if [ "$arg" = "out=text" ]; then FFOUND=1; F_out__out_text=1; F_out_=0; fi
if [ "$arg" = "out=toml" ]; then FFOUND=1; F_out__out_toml=1; F_out_=0; fi
if [ "$arg" = "out=toon" ]; then FFOUND=1; F_out__out_toon=1; F_out_=0; fi
if [ "$arg" = "out=tree" ]; then FFOUND=1; F_out__out_tree=1; F_out_=0; fi
if [ "$arg" = "out=xls" ]; then FFOUND=1; F_out__out_xls=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsfile_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlssheet_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsformat_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopen_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopenwait_=0; fi
+ if [ "${arg#xlsfile=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsfile_=0; fi
+ if [ "${arg#xlssheet=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlssheet_=0; fi
+ if [ "${arg#xlsformat=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsformat_=0; fi
+ if [ "${arg#xlsopen=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopen_=0; fi
+ if [ "${arg#xlsopenwait=}" != "$arg" ]; then FFOUND=1; F_out__out_xls_xlsopenwait_=0; fi
if [ "$arg" = "out=xml" ]; then FFOUND=1; F_out__out_xml=1; F_out_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_out__out_xml_outxmlprefix=0; fi
+ if [ "${arg#outxmlprefix}" != "$arg" ]; then FFOUND=1; F_out__out_xml_outxmlprefix=0; fi
if [ "$arg" = "out=yaml" ]; then FFOUND=1; F_out__out_yaml=1; F_out_=0; fi
# -h single option
if [ "$arg" = "-h" ]; then FFOUND=1; F__h=0; fi
@@ -723,11 +727,11 @@ if [ $# -gt 0 ]; then
if [ "$arg" = "regressionforecast=" ]; then FFOUND=1; F_regression__regressionforecast_=1; F_regression_=0; fi
# set= options
if [ "$arg" = "setop=" ]; then FFOUND=1; F_set__setop_=1; F_set_=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_union=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffa=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffb=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffab=0; fi
- if [ "}}}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_intersect=0; fi
+ if [ "${arg#setop=union}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_union=0; fi
+ if [ "${arg#setop=diffa}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffa=0; fi
+ if [ "${arg#setop=diffb}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffb=0; fi
+ if [ "${arg#setop=diffab}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_diffab=0; fi
+ if [ "${arg#setop=intersect}" != "$arg" ]; then FFOUND=1; F_set__setop__setop_intersect=0; fi
# removedups= single option
if [ "$arg" = "removedups=" ]; then FFOUND=1; F_removedups_=0; fi
# removeempty= single option
@@ -771,1042 +775,965 @@ if [ $# -gt 0 ]; then
fi
# Print completion for in=
-if [ $F_in_ -eq 1 ]; then
- echo "in= The input type -if not provided it will try to be auto-detected-"
-
- echo "in=ask Interactively asks questions to an user -using JSON/SLON for OpenAF's askStruct-"
- echo "in=base64 A base64 text input format"
- echo "in=ch An OpenAF channel input format"
- echo "in=csv A CSV format -auto-detected-"
- echo "in=dsv A DSV -Delimiter Separated Values- format"
- echo "in=db A JDBC query to a database"
- echo "in=gb64json Equivalent to in=base64 and base64gzip=true"
- echo "in=hsperf A Java hsperfdata* file -requires file=hsperfdata_user/123-"
- echo "in=ini INI/Properties format"
- echo "in=javas Tries to list java processes running locally"
- echo "in=javagc A Java GC log text file format"
- echo "in=javathread A Java thread dump text file format or java pid"
- echo "in=jfr A Java Flight Recorder file format"
- echo "in=jmx Uses Java JMX to retrieve data from another Java process"
- echo "in=json A JSON format -auto-detected-"
- echo "in=jsonschema Given a JSON schema format tries to generate sample data for it"
- echo "in=jwt Decodes and/or verifies a JSON Web Token -JWT-"
- echo "in=lines A given string/text to be processed line by line"
- echo "in=llm A large language model input -uses 'llmenv' or 'llmoptions'-"
- echo "in=llmmodels Lists the large language models available -using 'llmenv' or 'llmoptions'-"
- echo "in=ls Returns a list of files and folders for a given directory path or zip or tar or tgz file"
- echo "in=md A Markdown input format"
- echo "in=mdtable A Markdown table format"
- echo "in=mdcode A Markdown code blocks format"
- echo "in=mcp A Model Context Protocol (MCP) input"
- echo "in=minia Executes a mini-a interaction definition (requires the mini-a oPack)"
- echo "in=ndjson A NDJSON (new-line delimited JSON) format"
- echo "in=ndslon A NDSLON (new-line delimited SLON) format"
- echo "in=oaf Takes an OpenAF scripting code or OpenAF script file to execute and use the result as input"
- echo "in=oafp Takes a JSON/SLON/YAML map input as parameters for calling a sub oafp process -arrays will call multiple oafp processes-"
- echo "in=ojob Takes a JSON/SLON/YAML map input with a 'ojob' string and a 'args' map parameter"
- echo "in=openmetrics An OpenMetrics/Prometheus compatible format"
- echo "in=raw Passes the input directly to transforms and output"
- echo "in=rawhex Tries to read the input char by char converting into lines with the hexadecimal representation"
- echo "in=sh Executes a shell command returning stdout, stderr and exitcode as a map"
- echo "in=slon A SLON format -auto-detected-"
- echo "in=sql One or more SQLs statements to AST -Abstract Syntax Tree- or beautified SQL"
- echo "in=snmp Retrieves data from a SNMP device"
- echo "in=toml TOML format"
- echo "in=toon TOON format"
- echo "in=xls A XLSx compatible file -requires file=abc.xlsx-"
- echo "in=xml An XML format -auto-detected-"
- echo "in=yaml A YAML format -auto-detected-"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_in_ -eq 1 ]; then
+ printf '%s\t%s\n' 'in=' 'The input type -if not provided it will try to be auto-detected-'
+ printf '%s\t%s\n' 'in=ask' 'Interactively asks questions to an user -using JSON/SLON for OpenAF'\''s askStruct-'
+ printf '%s\t%s\n' 'in=base64' 'A base64 text input format'
+ printf '%s\t%s\n' 'in=ch' 'An OpenAF channel input format'
+ printf '%s\t%s\n' 'in=csv' 'A CSV format -auto-detected-'
+ printf '%s\t%s\n' 'in=dsv' 'A DSV -Delimiter Separated Values- format'
+ printf '%s\t%s\n' 'in=db' 'A JDBC query to a database'
+ printf '%s\t%s\n' 'in=gb64json' 'Equivalent to in=base64 and base64gzip=true'
+ printf '%s\t%s\n' 'in=hsperf' 'A Java hsperfdata* file -requires file=hsperfdata_user/123-'
+ printf '%s\t%s\n' 'in=ini' 'INI/Properties format'
+ printf '%s\t%s\n' 'in=javas' 'Tries to list java processes running locally'
+ printf '%s\t%s\n' 'in=javagc' 'A Java GC log text file format'
+ printf '%s\t%s\n' 'in=javathread' 'A Java thread dump text file format or java pid'
+ printf '%s\t%s\n' 'in=jfr' 'A Java Flight Recorder file format'
+ printf '%s\t%s\n' 'in=jmx' 'Uses Java JMX to retrieve data from another Java process'
+ printf '%s\t%s\n' 'in=json' 'A JSON format -auto-detected-'
+ printf '%s\t%s\n' 'in=jsonschema' 'Given a JSON schema format tries to generate sample data for it'
+ printf '%s\t%s\n' 'in=jwt' 'Decodes and/or verifies a JSON Web Token -JWT-'
+ printf '%s\t%s\n' 'in=lines' 'A given string/text to be processed line by line'
+ printf '%s\t%s\n' 'in=llm' 'A large language model input -uses '\''llmenv'\'' or '\''llmoptions'\''-'
+ printf '%s\t%s\n' 'in=llmmodels' 'Lists the large language models available -using '\''llmenv'\'' or '\''llmoptions'\''-'
+ printf '%s\t%s\n' 'in=ls' 'Returns a list of files and folders for a given directory path or zip or tar or tgz file'
+ printf '%s\t%s\n' 'in=md' 'A Markdown input format'
+ printf '%s\t%s\n' 'in=mdtable' 'A Markdown table format'
+ printf '%s\t%s\n' 'in=mdcode' 'A Markdown code blocks format'
+ printf '%s\t%s\n' 'in=mcp' 'A Model Context Protocol (MCP) input'
+ printf '%s\t%s\n' 'in=minia' 'Executes a mini-a interaction definition (requires the mini-a oPack)'
+ printf '%s\t%s\n' 'in=ndjson' 'A NDJSON (new-line delimited JSON) format'
+ printf '%s\t%s\n' 'in=ndslon' 'A NDSLON (new-line delimited SLON) format'
+ printf '%s\t%s\n' 'in=oaf' 'Takes an OpenAF scripting code or OpenAF script file to execute and use the result as input'
+ printf '%s\t%s\n' 'in=oafp' 'Takes a JSON/SLON/YAML map input as parameters for calling a sub oafp process -arrays will call multiple oafp processes-'
+ printf '%s\t%s\n' 'in=ojob' 'Takes a JSON/SLON/YAML map input with a '\''ojob'\'' string and a '\''args'\'' map parameter'
+ printf '%s\t%s\n' 'in=openmetrics' 'An OpenMetrics/Prometheus compatible format'
+ printf '%s\t%s\n' 'in=raw' 'Passes the input directly to transforms and output'
+ printf '%s\t%s\n' 'in=rawhex' 'Tries to read the input char by char converting into lines with the hexadecimal representation'
+ printf '%s\t%s\n' 'in=sh' 'Executes a shell command returning stdout, stderr and exitcode as a map'
+ printf '%s\t%s\n' 'in=slon' 'A SLON format -auto-detected-'
+ printf '%s\t%s\n' 'in=sql' 'One or more SQLs statements to AST -Abstract Syntax Tree- or beautified SQL'
+ printf '%s\t%s\n' 'in=snmp' 'Retrieves data from a SNMP device'
+ printf '%s\t%s\n' 'in=toml' 'TOML format'
+ printf '%s\t%s\n' 'in=toon' 'TOON format'
+ printf '%s\t%s\n' 'in=xls' 'A XLSx compatible file -requires file=abc.xlsx-'
+ printf '%s\t%s\n' 'in=xml' 'An XML format -auto-detected-'
+ printf '%s\t%s\n' 'in=yaml' 'A YAML format -auto-detected-'
fi
if [ $F_in__in_ch -eq 1 ]; then
if [ $F_in__in_ch_inch -eq 1 ]; then
- echo "inch A JSON/SLON configuration string with type and options/url"
+ printf '%s\t%s\n' 'inch' 'A JSON/SLON configuration string with type and options/url'
fi
if [ $F_in__in_ch_inchall -eq 1 ]; then
- echo "inchall A boolean flag to determine if the input map will be used for a getAll query"
+ printf '%s\t%s\n' 'inchall' 'A boolean flag to determine if the input map will be used for a getAll query'
fi
fi
if [ $F_in__in_csv -eq 1 ]; then
if [ $F_in__in_csv_incsv_ -eq 1 ]; then
- echo "incsv= If in=csv, the CSV options to use"
+ printf '%s\t%s\n' 'incsv=' 'If in=csv, the CSV options to use'
fi
fi
if [ $F_in__in_dsv -eq 1 ]; then
if [ $F_in__in_dsv_indsvsep_ -eq 1 ]; then
- echo "indsvsep= The separator to use for the DSV format -defaults to comma-"
+ printf '%s\t%s\n' 'indsvsep=' 'The separator to use for the DSV format -defaults to comma-'
fi
if [ $F_in__in_dsv_indsvsepre_ -eq 1 ]; then
- echo "indsvsepre= The regular expression to use for the DSV format"
+ printf '%s\t%s\n' 'indsvsepre=' 'The regular expression to use for the DSV format'
fi
if [ $F_in__in_dsv_indsvquote_ -eq 1 ]; then
- echo "indsvquote= The quote character to use for the DSV format -defaults to double quote-"
+ printf '%s\t%s\n' 'indsvquote=' 'The quote character to use for the DSV format -defaults to double quote-'
fi
if [ $F_in__in_dsv_indsvescape_ -eq 1 ]; then
- echo "indsvescape= The escape character to use for the DSV format -defaults to backslash -"
+ printf '%s\t%s\n' 'indsvescape=' 'The escape character to use for the DSV format -defaults to backslash -'
fi
if [ $F_in__in_dsv_indsvcomment_ -eq 1 ]; then
- echo "indsvcomment= The comment character to use for the DSV format -defaults to pound-"
+ printf '%s\t%s\n' 'indsvcomment=' 'The comment character to use for the DSV format -defaults to pound-'
fi
if [ $F_in__in_dsv_indsvheader_ -eq 1 ]; then
- echo "indsvheader= If true the first line will be considered as header -defaults to true-"
+ printf '%s\t%s\n' 'indsvheader=' 'If true the first line will be considered as header -defaults to true-'
fi
if [ $F_in__in_dsv_indsvtrim_ -eq 1 ]; then
- echo "indsvtrim= If true the values will be trimmed -defaults to true-"
+ printf '%s\t%s\n' 'indsvtrim=' 'If true the values will be trimmed -defaults to true-'
fi
if [ $F_in__in_dsv_indsvjoin_ -eq 1 ]; then
- echo "indsvjoin= If true will join the DSV records to build an output array"
+ printf '%s\t%s\n' 'indsvjoin=' 'If true will join the DSV records to build an output array'
fi
if [ $F_in__in_dsv_indsvfields_ -eq 1 ]; then
- echo "indsvfields= Comma delimited list of fields to use for the DSV format -defaults to all fields-"
+ printf '%s\t%s\n' 'indsvfields=' 'Comma delimited list of fields to use for the DSV format -defaults to all fields-'
fi
fi
if [ $F_in__in_db -eq 1 ]; then
if [ $F_in__in_db_indbjdbc_ -eq 1 ]; then
- echo "indbjdbc= The JDBC URL to access the input database"
+ printf '%s\t%s\n' 'indbjdbc=' 'The JDBC URL to access the input database'
fi
if [ $F_in__in_db_indbuser_ -eq 1 ]; then
- echo "indbuser= The JDBC access user"
+ printf '%s\t%s\n' 'indbuser=' 'The JDBC access user'
fi
if [ $F_in__in_db_indbpass_ -eq 1 ]; then
- echo "indbpass= The JDBC access password"
+ printf '%s\t%s\n' 'indbpass=' 'The JDBC access password'
fi
if [ $F_in__in_db_indbtimeout_ -eq 1 ]; then
- echo "indbtimeout= The JDBC access timeout"
+ printf '%s\t%s\n' 'indbtimeout=' 'The JDBC access timeout'
fi
if [ $F_in__in_db_indblib_ -eq 1 ]; then
- echo "indblib= Use a JDBC driver oPack generated by ojob.io/db/getDriver"
+ printf '%s\t%s\n' 'indblib=' 'Use a JDBC driver oPack generated by ojob.io/db/getDriver'
fi
if [ $F_in__in_db_indbstream_ -eq 1 ]; then
- echo "indbstream= If true will stream the data instead of loading it all in memory"
+ printf '%s\t%s\n' 'indbstream=' 'If true will stream the data instead of loading it all in memory'
fi
if [ $F_in__in_db_indbexec_ -eq 1 ]; then
- echo "indbexec= If true the input SQL is not a query but a DML statement"
+ printf '%s\t%s\n' 'indbexec=' 'If true the input SQL is not a query but a DML statement'
fi
if [ $F_in__in_db_indbautocommit_ -eq 1 ]; then
- echo "indbautocommit= If true the input SQL will be executed with autocommit enabled"
+ printf '%s\t%s\n' 'indbautocommit=' 'If true the input SQL will be executed with autocommit enabled'
fi
if [ $F_in__in_db_indbdesc_ -eq 1 ]; then
- echo "indbdesc= If true, the output will be a list of column names and types. Use 'LIMIT 1' for faster results."
+ printf '%s\t%s\n' 'indbdesc=' 'If true, the output will be a list of column names and types. Use '\''LIMIT 1'\'' for faster results.'
fi
fi
if [ $F_in__in_javas -eq 1 ]; then
if [ $F_in__in_javas_javasinception_ -eq 1 ]; then
- echo "javasinception= If true will include also oafp itself"
+ printf '%s\t%s\n' 'javasinception=' 'If true will include also oafp itself'
fi
fi
if [ $F_in__in_javagc -eq 1 ]; then
if [ $F_in__in_javagc_javagcjoin_ -eq 1 ]; then
- echo "javagcjoin= If true it will return an array with each processed line."
+ printf '%s\t%s\n' 'javagcjoin=' 'If true it will return an array with each processed line.'
fi
fi
if [ $F_in__in_javathread -eq 1 ]; then
if [ $F_in__in_javathread_javathreadpid_ -eq 1 ]; then
- echo "javathreadpid= The PID of the Java process to connect to -requires Java SDK-"
+ printf '%s\t%s\n' 'javathreadpid=' 'The PID of the Java process to connect to -requires Java SDK-'
fi
fi
if [ $F_in__in_jfr -eq 1 ]; then
if [ $F_in__in_jfr_jfrjoin_ -eq 1 ]; then
- echo "jfrjoin= If true it will return an array with each processed line."
+ printf '%s\t%s\n' 'jfrjoin=' 'If true it will return an array with each processed line.'
fi
if [ $F_in__in_jfr_jfrdesc_ -eq 1 ]; then
- echo "jfrdesc= If true it will include a __desc_ entry with the JFR event description"
+ printf '%s\t%s\n' 'jfrdesc=' 'If true it will include a __desc_ entry with the JFR event description'
fi
fi
if [ $F_in__in_jmx -eq 1 ]; then
if [ $F_in__in_jmx_jmxpid_ -eq 1 ]; then
- echo "jmxpid= The PID of the Java process to connect to"
+ printf '%s\t%s\n' 'jmxpid=' 'The PID of the Java process to connect to'
fi
if [ $F_in__in_jmx_jmxurl_ -eq 1 ]; then
- echo "jmxurl= The JMX URL to connect to"
+ printf '%s\t%s\n' 'jmxurl=' 'The JMX URL to connect to'
fi
if [ $F_in__in_jmx_jmxuser_ -eq 1 ]; then
- echo "jmxuser= The JMX user to connect to"
+ printf '%s\t%s\n' 'jmxuser=' 'The JMX user to connect to'
fi
if [ $F_in__in_jmx_jmxpass_ -eq 1 ]; then
- echo "jmxpass= The JMX password to connect to"
+ printf '%s\t%s\n' 'jmxpass=' 'The JMX password to connect to'
fi
if [ $F_in__in_jmx_jmxprovider_ -eq 1 ]; then
- echo "jmxprovider= The JMX Java class provider to use"
+ printf '%s\t%s\n' 'jmxprovider=' 'The JMX Java class provider to use'
fi
if [ $F_in__in_jmx_jmxop_ -eq 1 ]; then
- echo "jmxop= The JMX operation to execute between 'all', 'domains', 'query' and 'get'"
+ printf '%s\t%s\n' 'jmxop=' 'The JMX operation to execute between '\''all'\'', '\''domains'\'', '\''query'\'' and '\''get'\'''
fi
fi
if [ $F_in__in_json -eq 1 ]; then
if [ $F_in__in_json_jsondesc_ -eq 1 ]; then
- echo "jsondesc= If true the output will be a list of JSON paths of the original json."
+ printf '%s\t%s\n' 'jsondesc=' 'If true the output will be a list of JSON paths of the original json.'
fi
if [ $F_in__in_json_jsonprefix_ -eq 1 ]; then
- echo "jsonprefix= Given the 'jsondesc=true' output list you can use each to filter big json files by prefix."
+ printf '%s\t%s\n' 'jsonprefix=' 'Given the '\''jsondesc=true'\'' output list you can use each to filter big json files by prefix.'
fi
fi
if [ $F_in__in_jwt -eq 1 ]; then
if [ $F_in__in_jwt_injwtverify_ -eq 1 ]; then
- echo "injwtverify= If true the boolean entry '__verified' will be added to the result."
+ printf '%s\t%s\n' 'injwtverify=' 'If true the boolean entry '\''__verified'\'' will be added to the result.'
fi
if [ $F_in__in_jwt_injwtsecret_ -eq 1 ]; then
- echo "injwtsecret= A string secret for using HS256, HS384 or HS512 depending on secret size used to verify."
+ printf '%s\t%s\n' 'injwtsecret=' 'A string secret for using HS256, HS384 or HS512 depending on secret size used to verify.'
fi
if [ $F_in__in_jwt_injwtpubkey_ -eq 1 ]; then
- echo "injwtpubkey= A public key file used to verify -might require specifying the injwtalg-."
+ printf '%s\t%s\n' 'injwtpubkey=' 'A public key file used to verify -might require specifying the injwtalg-.'
fi
if [ $F_in__in_jwt_injwtalg_ -eq 1 ]; then
- echo "injwtalg= Specifies the algorithm used to verify the JWT -HS* or RSA by default-. Depends on available algorithms on the current JVM."
+ printf '%s\t%s\n' 'injwtalg=' 'Specifies the algorithm used to verify the JWT -HS* or RSA by default-. Depends on available algorithms on the current JVM.'
fi
if [ $F_in__in_jwt_injwtraw_ -eq 1 ]; then
- echo "injwtraw= If true it won't try to convert Unix epoch timestamps to dates."
+ printf '%s\t%s\n' 'injwtraw=' 'If true it won'\''t try to convert Unix epoch timestamps to dates.'
fi
fi
if [ $F_in__in_lines -eq 1 ]; then
if [ $F_in__in_lines_linesjoin_ -eq 1 ]; then
- echo "linesjoin= If true it will return an array with each processed line"
+ printf '%s\t%s\n' 'linesjoin=' 'If true it will return an array with each processed line'
fi
if [ $F_in__in_lines_linesvisual_ -eq 1 ]; then
- echo "linesvisual= If true it will try to determine header and column position from spaces and tabs"
+ printf '%s\t%s\n' 'linesvisual=' 'If true it will try to determine header and column position from spaces and tabs'
fi
if [ $F_in__in_lines_linesvisualsepre_ -eq 1 ]; then
- echo "linesvisualsepre= Regular expression representing the separator between columns when linesvisual=true -defaults to ' \\s+'-"
+ printf '%s\t%s\n' 'linesvisualsepre=' 'Regular expression representing the separator between columns when linesvisual=true -defaults to '\'' \\s+'\''-'
fi
if [ $F_in__in_lines_linesvisualheadsep -eq 1 ]; then
- echo "linesvisualheadsep If true will try to process the second line as header separator aiding on column position determination -if linesvisualsepre is not defined it will default to '\\s+'-"
+ printf '%s\t%s\n' 'linesvisualheadsep' 'If true will try to process the second line as header separator aiding on column position determination -if linesvisualsepre is not defined it will default to '\''\\s+'\''-'
fi
fi
if [ $F_in__in_ls -eq 1 ]; then
if [ $F_in__in_ls_lsext_ -eq 1 ]; then
- echo "lsext= Forces the file format parsing of the provided path or file -between zip, tar, tgz-"
+ printf '%s\t%s\n' 'lsext=' 'Forces the file format parsing of the provided path or file -between zip, tar, tgz-'
fi
if [ $F_in__in_ls_lsrecursive_ -eq 1 ]; then
- echo "lsrecursive= Will list all files and folders recursively -for folders-"
+ printf '%s\t%s\n' 'lsrecursive=' 'Will list all files and folders recursively -for folders-'
fi
if [ $F_in__in_ls_lsposix_ -eq 1 ]; then
- echo "lsposix= Tries to add extra posix data if available -for ZIP files-"
+ printf '%s\t%s\n' 'lsposix=' 'Tries to add extra posix data if available -for ZIP files-'
fi
fi
if [ $F_in__in_mdtable -eq 1 ]; then
if [ $F_in__in_mdtable_inmdtablejoin_ -eq 1 ]; then
- echo "inmdtablejoin= Scans an entire markdown input for tables and returns an array with the data of each markdown table"
+ printf '%s\t%s\n' 'inmdtablejoin=' 'Scans an entire markdown input for tables and returns an array with the data of each markdown table'
fi
fi
if [ $F_in__in_mcp -eq 1 ]; then
if [ $F_in__in_mcp_inmcptoolslist_ -eq 1 ]; then
- echo "inmcptoolslist= If true will list all available MCP tools"
+ printf '%s\t%s\n' 'inmcptoolslist=' 'If true will list all available MCP tools'
fi
if [ $F_in__in_mcp_inmcplistprompts_ -eq 1 ]; then
- echo "inmcplistprompts= If true will list all available MCP prompts"
+ printf '%s\t%s\n' 'inmcplistprompts=' 'If true will list all available MCP prompts'
fi
fi
if [ $F_in__in_minia -eq 1 ]; then
if [ $F_in__in_minia_minianolog_ -eq 1 ]; then
- echo "minianolog= If true hides mini-a interaction logs and shows a temporary progress message instead"
+ printf '%s\t%s\n' 'minianolog=' 'If true hides mini-a interaction logs and shows a temporary progress message instead'
fi
if [ $F_in__in_minia_minialogfile_ -eq 1 ]; then
- echo "minialogfile= Path to append interaction log lines with timestamps"
+ printf '%s\t%s\n' 'minialogfile=' 'Path to append interaction log lines with timestamps'
fi
if [ $F_in__in_minia_miniametrics_ -eq 1 ]; then
- echo "miniametrics= Path to write the mini-a run metrics as JSON (placeholders can include the run id)"
+ printf '%s\t%s\n' 'miniametrics=' 'Path to write the mini-a run metrics as JSON (placeholders can include the run id)'
fi
fi
if [ $F_in__in_ndjson -eq 1 ]; then
if [ $F_in__in_ndjson_ndjsonjoin_ -eq 1 ]; then
- echo "ndjsonjoin= If true will join the ndjson records to build an output array"
+ printf '%s\t%s\n' 'ndjsonjoin=' 'If true will join the ndjson records to build an output array'
fi
if [ $F_in__in_ndjson_ndjsonfilter_ -eq 1 ]; then
- echo "ndjsonfilter= If true each line is interpreted as an array before filters execute -this allows to filter json records on a ndjson-"
+ printf '%s\t%s\n' 'ndjsonfilter=' 'If true each line is interpreted as an array before filters execute -this allows to filter json records on a ndjson-'
fi
fi
if [ $F_in__in_ndslon -eq 1 ]; then
if [ $F_in__in_ndslon_ndslonjoin_ -eq 1 ]; then
- echo "ndslonjoin= If true will join the ndslon records to build an output array"
+ printf '%s\t%s\n' 'ndslonjoin=' 'If true will join the ndslon records to build an output array'
fi
if [ $F_in__in_ndslon_ndslonfilter_ -eq 1 ]; then
- echo "ndslonfilter= If true each line is interpreted as an array before filters execute -this allows to filter slon records on a ndslon-"
+ printf '%s\t%s\n' 'ndslonfilter=' 'If true each line is interpreted as an array before filters execute -this allows to filter slon records on a ndslon-'
fi
fi
if [ $F_in__in_oafp -eq 1 ]; then
if [ $F_in__in_oafp_inoafpseq_ -eq 1 ]; then
- echo "inoafpseq= If true and if input is an array the oafp processes will be executed in sequence"
+ printf '%s\t%s\n' 'inoafpseq=' 'If true and if input is an array the oafp processes will be executed in sequence'
fi
fi
if [ $F_in__in_rawhex -eq 1 ]; then
if [ $F_in__in_rawhex_inrawhexline_ -eq 1 ]; then
- echo "inrawhexline= Number of hexadecimal characters per returned array line"
+ printf '%s\t%s\n' 'inrawhexline=' 'Number of hexadecimal characters per returned array line'
fi
fi
if [ $F_in__in_sh -eq 1 ]; then
if [ $F_in__in_sh_inshformat_ -eq 1 ]; then
- echo "inshformat= The format to parse stdout and stderr between raw, yaml or json -default-"
+ printf '%s\t%s\n' 'inshformat=' 'The format to parse stdout and stderr between raw, yaml or json -default-'
fi
fi
if [ $F_in__in_sql -eq 1 ]; then
if [ $F_in__in_sql_sqlparse_ -eq 1 ]; then
- echo "sqlparse= If true instead of returning a SQL AST representation it will beautify the SQL statements"
+ printf '%s\t%s\n' 'sqlparse=' 'If true instead of returning a SQL AST representation it will beautify the SQL statements'
fi
if [ $F_in__in_sql_sqloptions_ -eq 1 ]; then
- echo "sqloptions= A JSON/SLON map with options for sqlparse=true"
+ printf '%s\t%s\n' 'sqloptions=' 'A JSON/SLON map with options for sqlparse=true'
fi
fi
if [ $F_in__in_snmp -eq 1 ]; then
if [ $F_in__in_snmp_insnmp_ -eq 1 ]; then
- echo "insnmp= The SNMP address 'udp://1.2.3.4/161'"
+ printf '%s\t%s\n' 'insnmp=' 'The SNMP address '\''udp://1.2.3.4/161'\'''
fi
if [ $F_in__in_snmp_insnmpcommunity_ -eq 1 ]; then
- echo "insnmpcommunity= The SNMP community"
+ printf '%s\t%s\n' 'insnmpcommunity=' 'The SNMP community'
fi
if [ $F_in__in_snmp_insnmpversion_ -eq 1 ]; then
- echo "insnmpversion= The SNMP version -1, 2, 3-"
+ printf '%s\t%s\n' 'insnmpversion=' 'The SNMP version -1, 2, 3-'
fi
if [ $F_in__in_snmp_insnmptimeout_ -eq 1 ]; then
- echo "insnmptimeout= The SNMP timeout"
+ printf '%s\t%s\n' 'insnmptimeout=' 'The SNMP timeout'
fi
if [ $F_in__in_snmp_insnmpretries_ -eq 1 ]; then
- echo "insnmpretries= The SNMP retries"
+ printf '%s\t%s\n' 'insnmpretries=' 'The SNMP retries'
fi
if [ $F_in__in_snmp_insnmpsec_ -eq 1 ]; then
- echo "insnmpsec= JSON/SLON map with SNMPv3 security options"
+ printf '%s\t%s\n' 'insnmpsec=' 'JSON/SLON map with SNMPv3 security options'
fi
fi
if [ $F_in__in_xls -eq 1 ]; then
if [ $F_in__in_xls_inxlssheet_ -eq 1 ]; then
- echo "inxlssheet= The name of sheet to consider -default to the first sheet-"
+ printf '%s\t%s\n' 'inxlssheet=' 'The name of sheet to consider -default to the first sheet-'
fi
if [ $F_in__in_xls_inxlsevalformulas_ -eq 1 ]; then
- echo "inxlsevalformulas= If false the existing formulas won't be evaluated -defaults to true-"
+ printf '%s\t%s\n' 'inxlsevalformulas=' 'If false the existing formulas won'\''t be evaluated -defaults to true-'
fi
if [ $F_in__in_xls_inxlsdesc_ -eq 1 ]; then
- echo "inxlsdesc= If true, instead of retrieving data, either a list of sheet names will be returned, or, if inxlssheet is provided, a table empty and non-empty will be returned"
+ printf '%s\t%s\n' 'inxlsdesc=' 'If true, instead of retrieving data, either a list of sheet names will be returned, or, if inxlssheet is provided, a table empty and non-empty will be returned'
fi
if [ $F_in__in_xls_inxlscol_ -eq 1 ]; then
- echo "inxlscol= The column on the sheet where a table should be detected -e.g. "A"-"
+ printf '%s\t%s\n' 'inxlscol=' 'The column on the sheet where a table should be detected -e.g. "A"-'
fi
if [ $F_in__in_xls_inxlsrow_ -eq 1 ]; then
- echo "inxlsrow= The row on the sheet where a table should be detected -e.g. 1-"
+ printf '%s\t%s\n' 'inxlsrow=' 'The row on the sheet where a table should be detected -e.g. 1-'
fi
fi
if [ $F_in__in_xml -eq 1 ]; then
if [ $F_in__in_xml_xmlignored_ -eq 1 ]; then
- echo "xmlignored= A comma-separated list of XML tags to ignore"
+ printf '%s\t%s\n' 'xmlignored=' 'A comma-separated list of XML tags to ignore'
fi
if [ $F_in__in_xml_xmlprefix_ -eq 1 ]; then
- echo "xmlprefix= A prefix to add to all XML tags"
+ printf '%s\t%s\n' 'xmlprefix=' 'A prefix to add to all XML tags'
fi
if [ $F_in__in_xml_xmlfiltertag_ -eq 1 ]; then
- echo "xmlfiltertag= If true will filter the XML tags"
+ printf '%s\t%s\n' 'xmlfiltertag=' 'If true will filter the XML tags'
fi
fi
# Print completion for out=
-if [ $F_out_ -eq 1 ]; then
- echo "out= The output format -default mtree-"
-
- echo "out=base64 A base64 text output format"
- echo "out=ch An OpenAF channel output format"
- echo "out=chart A line-chart like chart -usefull together with 'loop'-"
- echo "out=cjson A JSON forcely colored format"
- echo "out=cmd Executes a command for each input data entry"
- echo "out=cslon A SLON format forcely colored"
- echo "out=csv A CSV format -only for list outputs-"
- echo "out=dsv A DSV -Delimiter Separated Values- format -only for list outputs-"
- echo "out=ctable A table-like forcely colored format -only for list outputs-"
- echo "out=ctree A tree-like forcely colored format"
- echo "out=mtree A tree-like forcely monochrome format"
- echo "out=btree A tree-like forcely with non-ansi characters format"
- echo "out=cyaml An YAML colored format"
- echo "out=kyaml A Kubernetes YAML format"
- echo "out=ckyaml A Kubernetes YAML colored format"
- echo "out=lkyaml A Kubernetes YAML format without new-lines"
- echo "out=clkyaml A Kubernetes YAML without new-lines colored format"
- echo "out=db Output to a JDBC database"
- echo "out=envs Tries to output the input data as OS environment variables setting commands"
- echo "out=gb64json Equivalent to out=base64 and base64gzip=true"
- echo "out=grid A multiple output ascii grid -usefull together with 'loop'-"
- echo "out=html An HTML format"
- echo "out=ini A INI/Properties format -arrays are not supported-"
- echo "out=json A JSON format without spacing"
- echo "out=jwt Signs map data into a JSON Web Token -JWT-"
- echo "out=lines Given an array of strings prints each line"
- echo "out=log If input has Logstash compatible fields outputs a human-readable log"
- echo "out=map A rectangle map format"
- echo "out=md An output Markdown format"
- echo "out=mdtable A Markdown table format -only for list outputs-"
- echo "out=mdyaml A multi document YAML format -only for list outputs-"
- echo "out=ndjson A NDJSON -new-line delimited JSON- format"
- echo "out=ndslon A NDSLON -new-line delimited SLON- format"
- echo "out=ndcslon A NDSLON -new-line delimited SLON- forcely colored"
- echo "out=oaf Executes OpenAF scripting code or an OpenAF script file and receives -data- as input and outputs via -outoaf-"
- echo "out=openmetrics Converts a map or list to OpenMetrics/Prometheus compatible format"
- echo "out=pjson A JSON format with spacing -equivalent to prettyjson-"
- echo "out=prettyjson A JSON format with spacing"
- echo "out=pxml Tries to output the input data into pretty xml"
- echo "out=raw Tries to output the internal representation -string or json- of the input transformed data"
- echo "out=rawascii Outputs text data line by line with visual representation of non-visual characters"
- echo "out=schart A static line-chart like chart -for a fixed list/array of values-"
- echo "out=slon A SLON format"
- echo "out=sql Outputs a series of SQL statements for an input list/array data"
- echo "out=stable A table-like format with separation -only for list outputs-"
- echo "out=table A table-like format without size constraints -only for list outputs-"
- echo "out=template A Handlebars template format"
- echo "out=text A string text format"
- echo "out=toml A TOML format -arrays will have outkey=list-"
- echo "out=toon A TOON format"
- echo "out=tree A tree-like format"
- echo "out=xls A XLSx output format"
- echo "out=xml An XML format"
- echo "out=yaml A YAML format"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_out_ -eq 1 ]; then
+ printf '%s\t%s\n' 'out=' 'The output format -default mtree-'
+ printf '%s\t%s\n' 'out=base64' 'A base64 text output format'
+ printf '%s\t%s\n' 'out=ch' 'An OpenAF channel output format'
+ printf '%s\t%s\n' 'out=chart' 'A line-chart like chart -usefull together with '\''loop'\''-'
+ printf '%s\t%s\n' 'out=cjson' 'A JSON forcely colored format'
+ printf '%s\t%s\n' 'out=cmd' 'Executes a command for each input data entry'
+ printf '%s\t%s\n' 'out=cslon' 'A SLON format forcely colored'
+ printf '%s\t%s\n' 'out=csv' 'A CSV format -only for list outputs-'
+ printf '%s\t%s\n' 'out=dsv' 'A DSV -Delimiter Separated Values- format -only for list outputs-'
+ printf '%s\t%s\n' 'out=ctable' 'A table-like forcely colored format -only for list outputs-'
+ printf '%s\t%s\n' 'out=ctree' 'A tree-like forcely colored format'
+ printf '%s\t%s\n' 'out=mtree' 'A tree-like forcely monochrome format'
+ printf '%s\t%s\n' 'out=btree' 'A tree-like forcely with non-ansi characters format'
+ printf '%s\t%s\n' 'out=cyaml' 'An YAML colored format'
+ printf '%s\t%s\n' 'out=kyaml' 'A Kubernetes YAML format'
+ printf '%s\t%s\n' 'out=ckyaml' 'A Kubernetes YAML colored format'
+ printf '%s\t%s\n' 'out=lkyaml' 'A Kubernetes YAML format without new-lines'
+ printf '%s\t%s\n' 'out=clkyaml' 'A Kubernetes YAML without new-lines colored format'
+ printf '%s\t%s\n' 'out=db' 'Output to a JDBC database'
+ printf '%s\t%s\n' 'out=envs' 'Tries to output the input data as OS environment variables setting commands'
+ printf '%s\t%s\n' 'out=gb64json' 'Equivalent to out=base64 and base64gzip=true'
+ printf '%s\t%s\n' 'out=grid' 'A multiple output ascii grid -usefull together with '\''loop'\''-'
+ printf '%s\t%s\n' 'out=html' 'An HTML format'
+ printf '%s\t%s\n' 'out=ini' 'A INI/Properties format -arrays are not supported-'
+ printf '%s\t%s\n' 'out=json' 'A JSON format without spacing'
+ printf '%s\t%s\n' 'out=jwt' 'Signs map data into a JSON Web Token -JWT-'
+ printf '%s\t%s\n' 'out=lines' 'Given an array of strings prints each line'
+ printf '%s\t%s\n' 'out=log' 'If input has Logstash compatible fields outputs a human-readable log'
+ printf '%s\t%s\n' 'out=map' 'A rectangle map format'
+ printf '%s\t%s\n' 'out=md' 'An output Markdown format'
+ printf '%s\t%s\n' 'out=mdtable' 'A Markdown table format -only for list outputs-'
+ printf '%s\t%s\n' 'out=mdyaml' 'A multi document YAML format -only for list outputs-'
+ printf '%s\t%s\n' 'out=ndjson' 'A NDJSON -new-line delimited JSON- format'
+ printf '%s\t%s\n' 'out=ndslon' 'A NDSLON -new-line delimited SLON- format'
+ printf '%s\t%s\n' 'out=ndcslon' 'A NDSLON -new-line delimited SLON- forcely colored'
+ printf '%s\t%s\n' 'out=oaf' 'Executes OpenAF scripting code or an OpenAF script file and receives -data- as input and outputs via -outoaf-'
+ printf '%s\t%s\n' 'out=openmetrics' 'Converts a map or list to OpenMetrics/Prometheus compatible format'
+ printf '%s\t%s\n' 'out=pjson' 'A JSON format with spacing -equivalent to prettyjson-'
+ printf '%s\t%s\n' 'out=prettyjson' 'A JSON format with spacing'
+ printf '%s\t%s\n' 'out=pxml' 'Tries to output the input data into pretty xml'
+ printf '%s\t%s\n' 'out=raw' 'Tries to output the internal representation -string or json- of the input transformed data'
+ printf '%s\t%s\n' 'out=rawascii' 'Outputs text data line by line with visual representation of non-visual characters'
+ printf '%s\t%s\n' 'out=schart' 'A static line-chart like chart -for a fixed list/array of values-'
+ printf '%s\t%s\n' 'out=slon' 'A SLON format'
+ printf '%s\t%s\n' 'out=sql' 'Outputs a series of SQL statements for an input list/array data'
+ printf '%s\t%s\n' 'out=stable' 'A table-like format with separation -only for list outputs-'
+ printf '%s\t%s\n' 'out=table' 'A table-like format without size constraints -only for list outputs-'
+ printf '%s\t%s\n' 'out=template' 'A Handlebars template format'
+ printf '%s\t%s\n' 'out=text' 'A string text format'
+ printf '%s\t%s\n' 'out=toml' 'A TOML format -arrays will have outkey=list-'
+ printf '%s\t%s\n' 'out=toon' 'A TOON format'
+ printf '%s\t%s\n' 'out=tree' 'A tree-like format'
+ printf '%s\t%s\n' 'out=xls' 'A XLSx output format'
+ printf '%s\t%s\n' 'out=xml' 'An XML format'
+ printf '%s\t%s\n' 'out=yaml' 'A YAML format'
fi
if [ $F_out__out_base64 -eq 1 ]; then
if [ $F_out__out_base64_base64gzip_ -eq 1 ]; then
- echo "base64gzip= If true the contents will thet gzip/gunzip respectively to reduce the size of the base64 output"
+ printf '%s\t%s\n' 'base64gzip=' 'If true the contents will thet gzip/gunzip respectively to reduce the size of the base64 output'
fi
fi
if [ $F_out__out_ch -eq 1 ]; then
if [ $F_out__out_ch_ch_ -eq 1 ]; then
- echo "ch= A JSON/SLON configuration string with type and options/url"
+ printf '%s\t%s\n' 'ch=' 'A JSON/SLON configuration string with type and options/url'
fi
if [ $F_out__out_ch_chkey_ -eq 1 ]; then
- echo "chkey= A comma delimited list of map keys to build a key from each array value"
+ printf '%s\t%s\n' 'chkey=' 'A comma delimited list of map keys to build a key from each array value'
fi
if [ $F_out__out_ch_chunset_ -eq 1 ]; then
- echo "chunset= If true the input data will be used to unset data on the output channel instead of set"
+ printf '%s\t%s\n' 'chunset=' 'If true the input data will be used to unset data on the output channel instead of set'
fi
fi
if [ $F_out__out_chart -eq 1 ]; then
if [ $F_out__out_chart_chart_ -eq 1 ]; then
- echo "chart= Chart definition in the format --unit path:color:legend... -min:0 -max:100--"
+ printf '%s\t%s\n' 'chart=' 'Chart definition in the format --unit path:color:legend... -min:0 -max:100--'
fi
if [ $F_out__out_chart_chartcls_ -eq 1 ]; then
- echo "chartcls= If true the screen will be cleared for each execution"
+ printf '%s\t%s\n' 'chartcls=' 'If true the screen will be cleared for each execution'
fi
fi
if [ $F_out__out_cmd -eq 1 ]; then
if [ $F_out__out_cmd_outcmd_ -eq 1 ]; then
- echo "outcmd= The command to execute receiving, in pipeline, each input entry in json"
+ printf '%s\t%s\n' 'outcmd=' 'The command to execute receiving, in pipeline, each input entry in json'
fi
if [ $F_out__out_cmd_outcmdjoin_ -eq 1 ]; then
- echo "outcmdjoin= If true and if input is an array the entire array will be the input entry"
+ printf '%s\t%s\n' 'outcmdjoin=' 'If true and if input is an array the entire array will be the input entry'
fi
if [ $F_out__out_cmd_outcmdseq_ -eq 1 ]; then
- echo "outcmdseq= If true and if input is an array the commands will be executed in sequence"
+ printf '%s\t%s\n' 'outcmdseq=' 'If true and if input is an array the commands will be executed in sequence'
fi
if [ $F_out__out_cmd_outcmdnl_ -eq 1 ]; then
- echo "outcmdnl= If true each command execution output will be appended with a new-line"
+ printf '%s\t%s\n' 'outcmdnl=' 'If true each command execution output will be appended with a new-line'
fi
if [ $F_out__out_cmd_outcmdparam_ -eq 1 ]; then
- echo "outcmdparam= If true the input entry will be replaced on the 'outcmd' where '{}' is found"
+ printf '%s\t%s\n' 'outcmdparam=' 'If true the input entry will be replaced on the '\''outcmd'\'' where '\''{}'\'' is found'
fi
if [ $F_out__out_cmd_outcmdtmpl_ -eq 1 ]; then
- echo "outcmdtmpl= If true the input entry will be considered as an OpenAF template"
+ printf '%s\t%s\n' 'outcmdtmpl=' 'If true the input entry will be considered as an OpenAF template'
fi
fi
if [ $F_out__out_csv -eq 1 ]; then
if [ $F_out__out_csv_csv_ -eq 1 ]; then
- echo "csv= If out=csv, the CSV options to use"
+ printf '%s\t%s\n' 'csv=' 'If out=csv, the CSV options to use'
fi
fi
if [ $F_out__out_dsv -eq 1 ]; then
if [ $F_out__out_dsv_dsvsep_ -eq 1 ]; then
- echo "dsvsep= The separator to use for the DSV format -defaults to comma-"
+ printf '%s\t%s\n' 'dsvsep=' 'The separator to use for the DSV format -defaults to comma-'
fi
if [ $F_out__out_dsv_dsvquote_ -eq 1 ]; then
- echo "dsvquote= The quote character to use for the DSV format -defaults to double quote-"
+ printf '%s\t%s\n' 'dsvquote=' 'The quote character to use for the DSV format -defaults to double quote-'
fi
if [ $F_out__out_dsv_dsvfields_ -eq 1 ]; then
- echo "dsvfields= Comma delimited list of fields to use for the DSV format -defaults to all fields-"
+ printf '%s\t%s\n' 'dsvfields=' 'Comma delimited list of fields to use for the DSV format -defaults to all fields-'
fi
if [ $F_out__out_dsv_dsvuseslon_ -eq 1 ]; then
- echo "dsvuseslon= If true the output of value objects will be a SLON format -default is false-"
+ printf '%s\t%s\n' 'dsvuseslon=' 'If true the output of value objects will be a SLON format -default is false-'
fi
if [ $F_out__out_dsv_dsvheader_ -eq 1 ]; then
- echo "dsvheader= If true will try to output the first line as header -default is true-"
+ printf '%s\t%s\n' 'dsvheader=' 'If true will try to output the first line as header -default is true-'
fi
fi
if [ $F_out__out_db -eq 1 ]; then
if [ $F_out__out_db_dbjdbc_ -eq 1 ]; then
- echo "dbjdbc= The JDBC URL to access the input database"
+ printf '%s\t%s\n' 'dbjdbc=' 'The JDBC URL to access the input database'
fi
if [ $F_out__out_db_dbuser_ -eq 1 ]; then
- echo "dbuser= The JDBC access user"
+ printf '%s\t%s\n' 'dbuser=' 'The JDBC access user'
fi
if [ $F_out__out_db_dbpass_ -eq 1 ]; then
- echo "dbpass= The JDBC access password"
+ printf '%s\t%s\n' 'dbpass=' 'The JDBC access password'
fi
if [ $F_out__out_db_dbtimeout_ -eq 1 ]; then
- echo "dbtimeout= The JDBC access timeout"
+ printf '%s\t%s\n' 'dbtimeout=' 'The JDBC access timeout'
fi
if [ $F_out__out_db_dblib_ -eq 1 ]; then
- echo "dblib= Use a JDBC driver oPack generated by ojob.io/db/getDriver"
+ printf '%s\t%s\n' 'dblib=' 'Use a JDBC driver oPack generated by ojob.io/db/getDriver'
fi
if [ $F_out__out_db_dbtable_ -eq 1 ]; then
- echo "dbtable= The db table in which should be inserted -'data' by default-"
+ printf '%s\t%s\n' 'dbtable=' 'The db table in which should be inserted -'\''data'\'' by default-'
fi
if [ $F_out__out_db_dbnocreate_ -eq 1 ]; then
- echo "dbnocreate= If true no table creation command will be executed -if the table already exists set this to true-"
+ printf '%s\t%s\n' 'dbnocreate=' 'If true no table creation command will be executed -if the table already exists set this to true-'
fi
if [ $F_out__out_db_dbicase_ -eq 1 ]; then
- echo "dbicase= If true table and field names will try to ignore case"
+ printf '%s\t%s\n' 'dbicase=' 'If true table and field names will try to ignore case'
fi
if [ $F_out__out_db_dbbatchsize_ -eq 1 ]; then
- echo "dbbatchsize= If defined it will changed the default batch data insert process"
+ printf '%s\t%s\n' 'dbbatchsize=' 'If defined it will changed the default batch data insert process'
fi
fi
if [ $F_out__out_envs -eq 1 ]; then
if [ $F_out__out_envs_envscmd_ -eq 1 ]; then
- echo "envscmd= If defined will output the provided command to set each environment variable -defaults to 'export' or 'set' in Windows-"
+ printf '%s\t%s\n' 'envscmd=' 'If defined will output the provided command to set each environment variable -defaults to '\''export'\'' or '\''set'\'' in Windows-'
fi
if [ $F_out__out_envs_envsprefix_ -eq 1 ]; then
- echo "envsprefix= If defined uses the provided prefix for each environment variable key -defaults to 'OAFP'-"
+ printf '%s\t%s\n' 'envsprefix=' 'If defined uses the provided prefix for each environment variable key -defaults to '\''OAFP'\''-'
fi
if [ $F_out__out_envs_envsnoprefix_ -eq 1 ]; then
- echo "envsnoprefix= Boolean flag to indicate that no envsprefix should be used -defaults to false-"
+ printf '%s\t%s\n' 'envsnoprefix=' 'Boolean flag to indicate that no envsprefix should be used -defaults to false-'
fi
fi
if [ $F_out__out_grid -eq 1 ]; then
if [ $F_out__out_grid_grid_ -eq 1 ]; then
- echo "grid= A JSON/SLON configuration composed of an array with another array per grid line. Each line array should have a map per column -see below for the map options-"
+ printf '%s\t%s\n' 'grid=' 'A JSON/SLON configuration composed of an array with another array per grid line. Each line array should have a map per column -see below for the map options-'
fi
fi
if [ $F_out__out_html -eq 1 ]; then
if [ $F_out__out_html_htmlcompact_ -eq 1 ]; then
- echo "htmlcompact= Boolean flag that if true and the input data is a string or markdown the generated html will have a visual compact width format"
+ printf '%s\t%s\n' 'htmlcompact=' 'Boolean flag that if true and the input data is a string or markdown the generated html will have a visual compact width format'
fi
if [ $F_out__out_html_htmlpart_ -eq 1 ]; then
- echo "htmlpart= Boolean flag that if true and the input data is a string or markdown the generated html will be partial and not the complete file"
+ printf '%s\t%s\n' 'htmlpart=' 'Boolean flag that if true and the input data is a string or markdown the generated html will be partial and not the complete file'
fi
if [ $F_out__out_html_htmlopen_ -eq 1 ]; then
- echo "htmlopen= Boolean that if false won't try to open the output contents in a browser -defaults to true-"
+ printf '%s\t%s\n' 'htmlopen=' 'Boolean that if false won'\''t try to open the output contents in a browser -defaults to true-'
fi
if [ $F_out__out_html_htmlwait_ -eq 1 ]; then
- echo "htmlwait= Amount of ms, when htmlopen=true, to wait for the system browser to open an render the html output"
+ printf '%s\t%s\n' 'htmlwait=' 'Amount of ms, when htmlopen=true, to wait for the system browser to open an render the html output'
fi
if [ $F_out__out_html_htmldark_ -eq 1 ]; then
- echo "htmldark= If supported and true the output html will use a dark theme."
+ printf '%s\t%s\n' 'htmldark=' 'If supported and true the output html will use a dark theme.'
fi
fi
if [ $F_out__out_jwt -eq 1 ]; then
if [ $F_out__out_jwt_jwtsecret_ -eq 1 ]; then
- echo "jwtsecret= A string secret for using HS256, HS384 or HS512 depending on secret size used to sign the JWT."
+ printf '%s\t%s\n' 'jwtsecret=' 'A string secret for using HS256, HS384 or HS512 depending on secret size used to sign the JWT.'
fi
if [ $F_out__out_jwt_jwtprivkey_ -eq 1 ]; then
- echo "jwtprivkey= A private key file used to sign -might require specifying the jwtalg-."
+ printf '%s\t%s\n' 'jwtprivkey=' 'A private key file used to sign -might require specifying the jwtalg-.'
fi
if [ $F_out__out_jwt_jwtalg_ -eq 1 ]; then
- echo "jwtalg= Specifies the algorithm used to sign the JWT -HS* or RSA by default-. Depends on available algorithms on the current JVM."
+ printf '%s\t%s\n' 'jwtalg=' 'Specifies the algorithm used to sign the JWT -HS* or RSA by default-. Depends on available algorithms on the current JVM.'
fi
fi
if [ $F_out__out_log -eq 1 ]; then
if [ $F_out__out_log_logprintall_ -eq 1 ]; then
- echo "logprintall= If true all original non data -string- lines will be output"
+ printf '%s\t%s\n' 'logprintall=' 'If true all original non data -string- lines will be output'
fi
fi
if [ $F_out__out_md -eq 1 ]; then
if [ $F_out__out_md_mdtemplate_ -eq 1 ]; then
- echo "mdtemplate= If true will apply a template output without any input data"
+ printf '%s\t%s\n' 'mdtemplate=' 'If true will apply a template output without any input data'
fi
fi
if [ $F_out__out_oaf -eq 1 ]; then
if [ $F_out__out_oaf_outoaf_ -eq 1 ]; then
- echo "outoaf= The OpenAF script to execute scripting code or file path receiving -data- as input"
+ printf '%s\t%s\n' 'outoaf=' 'The OpenAF script to execute scripting code or file path receiving -data- as input'
fi
fi
if [ $F_out__out_openmetrics -eq 1 ]; then
if [ $F_out__out_openmetrics_metricsprefix_ -eq 1 ]; then
- echo "metricsprefix= The prefix to use for each metric -defaults to 'metrics'-"
+ printf '%s\t%s\n' 'metricsprefix=' 'The prefix to use for each metric -defaults to '\''metrics'\''-'
fi
if [ $F_out__out_openmetrics_metricstimestamp_ -eq 1 ]; then
- echo "metricstimestamp= Unix Epoch in seconds for each metric"
+ printf '%s\t%s\n' 'metricstimestamp=' 'Unix Epoch in seconds for each metric'
fi
fi
if [ $F_out__out_pxml -eq 1 ]; then
if [ $F_out__out_pxml_pxmlprefix -eq 1 ]; then
- echo "pxmlprefix A prefix added to all XML tags"
+ printf '%s\t%s\n' 'pxmlprefix' 'A prefix added to all XML tags'
fi
fi
if [ $F_out__out_rawascii -eq 1 ]; then
if [ $F_out__out_rawascii_rawasciistart_ -eq 1 ]; then
- echo "rawasciistart= Starting line number to display"
+ printf '%s\t%s\n' 'rawasciistart=' 'Starting line number to display'
fi
if [ $F_out__out_rawascii_rawasciiend_ -eq 1 ]; then
- echo "rawasciiend= Ending line number to display"
+ printf '%s\t%s\n' 'rawasciiend=' 'Ending line number to display'
fi
if [ $F_out__out_rawascii_rawasciitab_ -eq 1 ]; then
- echo "rawasciitab= Tab size for tab character visualization -defaults to 8-"
+ printf '%s\t%s\n' 'rawasciitab=' 'Tab size for tab character visualization -defaults to 8-'
fi
if [ $F_out__out_rawascii_rawasciinovisual_ -eq 1 ]; then
- echo "rawasciinovisual= If true, non-visual characters won't be replaced by their visual representation"
+ printf '%s\t%s\n' 'rawasciinovisual=' 'If true, non-visual characters won'\''t be replaced by their visual representation'
fi
if [ $F_out__out_rawascii_rawasciinolinenum_ -eq 1 ]; then
- echo "rawasciinolinenum= If true, line numbers won't be displayed"
+ printf '%s\t%s\n' 'rawasciinolinenum=' 'If true, line numbers won'\''t be displayed'
fi
fi
if [ $F_out__out_schart -eq 1 ]; then
if [ $F_out__out_schart_schart_ -eq 1 ]; then
- echo "schart= Chart definition in the format --unit path:color:legend... -min:0 -max:100--"
+ printf '%s\t%s\n' 'schart=' 'Chart definition in the format --unit path:color:legend... -min:0 -max:100--'
fi
fi
if [ $F_out__out_sql -eq 1 ]; then
if [ $F_out__out_sql_sqltable_ -eq 1 ]; then
- echo "sqltable= The table name to use for the SQL statements -defaults to 'data'-"
+ printf '%s\t%s\n' 'sqltable=' 'The table name to use for the SQL statements -defaults to '\''data'\''-'
fi
if [ $F_out__out_sql_sqlicase_ -eq 1 ]; then
- echo "sqlicase= If true the table and fields names won't be double-quoted"
+ printf '%s\t%s\n' 'sqlicase=' 'If true the table and fields names won'\''t be double-quoted'
fi
if [ $F_out__out_sql_sqlnocreate_ -eq 1 ]; then
- echo "sqlnocreate= If true the create table statement won't be generated"
+ printf '%s\t%s\n' 'sqlnocreate=' 'If true the create table statement won'\''t be generated'
fi
fi
if [ $F_out__out_template -eq 1 ]; then
if [ $F_out__out_template_template_ -eq 1 ]; then
- echo "template= A file path to a HandleBars' template or a string template definition if 'templatetmpl' is true"
+ printf '%s\t%s\n' 'template=' 'A file path to a HandleBars'\'' template or a string template definition if '\''templatetmpl'\'' is true'
fi
if [ $F_out__out_template_templatepath_ -eq 1 ]; then
- echo "templatepath= If 'template' is not provided a path to the template definition -pre-transformation-"
+ printf '%s\t%s\n' 'templatepath=' 'If '\''template'\'' is not provided a path to the template definition -pre-transformation-'
fi
if [ $F_out__out_template_templatedata_ -eq 1 ]; then
- echo "templatedata= If defined the template data will be retrieved from the provided path"
+ printf '%s\t%s\n' 'templatedata=' 'If defined the template data will be retrieved from the provided path'
fi
if [ $F_out__out_template_templatetmpl_ -eq 1 ]; then
- echo "templatetmpl= If true the 'template' will be interpreted as the template defintion instead of a file path"
+ printf '%s\t%s\n' 'templatetmpl=' 'If true the '\''template'\'' will be interpreted as the template defintion instead of a file path'
fi
fi
if [ $F_out__out_xls -eq 1 ]; then
if [ $F_out__out_xls_xlsfile_ -eq 1 ]; then
- echo "xlsfile= The output filename -if not defined a temporary file will be used to open with the OS's Excel-compatible application-"
+ printf '%s\t%s\n' 'xlsfile=' 'The output filename -if not defined a temporary file will be used to open with the OS'\''s Excel-compatible application-'
fi
if [ $F_out__out_xls_xlssheet_ -eq 1 ]; then
- echo "xlssheet= The name of sheet to use -default to 'data'-"
+ printf '%s\t%s\n' 'xlssheet=' 'The name of sheet to use -default to '\''data'\''-'
fi
if [ $F_out__out_xls_xlsformat_ -eq 1 ]; then
- echo "xlsformat= A SLON or JSON string with the formatting of the output file -e.g. -bold: true, borderBottom: "medium", borderBottomColor: "red"--"
+ printf '%s\t%s\n' 'xlsformat=' 'A SLON or JSON string with the formatting of the output file -e.g. -bold: true, borderBottom: "medium", borderBottomColor: "red"--'
fi
if [ $F_out__out_xls_xlsopen_ -eq 1 ]; then
- echo "xlsopen= If false it won't try to open the OS's Excel-compatible application -defaults to true-"
+ printf '%s\t%s\n' 'xlsopen=' 'If false it won'\''t try to open the OS'\''s Excel-compatible application -defaults to true-'
fi
if [ $F_out__out_xls_xlsopenwait_ -eq 1 ]; then
- echo "xlsopenwait= The amount of time, in ms, to keep the temporary file for the OS's Excel-compatible application to start and open the file"
+ printf '%s\t%s\n' 'xlsopenwait=' 'The amount of time, in ms, to keep the temporary file for the OS'\''s Excel-compatible application to start and open the file'
fi
fi
if [ $F_out__out_xml -eq 1 ]; then
if [ $F_out__out_xml_outxmlprefix -eq 1 ]; then
- echo "outxmlprefix A prefix added to all XML tags"
+ printf '%s\t%s\n' 'outxmlprefix' 'A prefix added to all XML tags'
fi
fi
# Print completion for -h
-if [ $F__h -eq 1 ]; then
- echo "-h Shows the help document"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__h -eq 1 ]; then
+ printf '%s\t%s\n' '-h' 'Shows the help document'
fi
# Print completion for help=
-if [ $F_help_ -eq 1 ]; then
- echo "help= If true will show the help document or other available -e.g. filters, template-"
-
- echo "help=filters Shows the filters help"
- echo "help=template Shows the template help"
- echo "help=examples Shows examples"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_help_ -eq 1 ]; then
+ printf '%s\t%s\n' 'help=' 'If true will show the help document or other available -e.g. filters, template-'
+ printf '%s\t%s\n' 'help=filters' 'Shows the filters help'
+ printf '%s\t%s\n' 'help=template' 'Shows the template help'
+ printf '%s\t%s\n' 'help=examples' 'Shows examples'
fi
# Print completion for file=
-if [ $F_file_ -eq 1 ]; then
- echo "file= The file to parse -if not provide stdin is used-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_file_ -eq 1 ]; then
+ printf '%s\t%s\n' 'file=' 'The file to parse -if not provide stdin is used-'
fi
# Print completion for cmd=
-if [ $F_cmd_ -eq 1 ]; then
- echo "cmd= Alternative to file and stdin to execute a command -e.g. kubectl, docker- to get the file contents"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_cmd_ -eq 1 ]; then
+ printf '%s\t%s\n' 'cmd=' 'Alternative to file and stdin to execute a command -e.g. kubectl, docker- to get the file contents'
fi
# Print completion for data=
-if [ $F_data_ -eq 1 ]; then
- echo "data= Alternative to file, stdin and cmd to provide data input"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_data_ -eq 1 ]; then
+ printf '%s\t%s\n' 'data=' 'Alternative to file, stdin and cmd to provide data input'
fi
# Print completion for from=
-if [ $F_from_ -eq 1 ]; then
- echo "from= An OpenAF nLinq path expression to filter output"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_from_ -eq 1 ]; then
+ printf '%s\t%s\n' 'from=' 'An OpenAF nLinq path expression to filter output'
fi
# Print completion for sql=
-if [ $F_sql_ -eq 1 ]; then
- echo "sql= A SQL expression to filter output"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_sql_ -eq 1 ]; then
+ printf '%s\t%s\n' 'sql=' 'A SQL expression to filter output'
fi
# Print completion for sqlfilter=
-if [ $F_sqlfilter_ -eq 1 ]; then
- echo "sqlfilter= Enables the forcing of the sql filter parser -values: auto, simple, advanced-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_sqlfilter_ -eq 1 ]; then
+ printf '%s\t%s\n' 'sqlfilter=' 'Enables the forcing of the sql filter parser -values: auto, simple, advanced-'
fi
# Print completion for sqlfiltertables=
-if [ $F_sqlfiltertables_ -eq 1 ]; then
- echo "sqlfiltertables= A JSON/SLON array composed of 'table' name and 'path' to each table's data to be used with the sqlfilter"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_sqlfiltertables_ -eq 1 ]; then
+ printf '%s\t%s\n' 'sqlfiltertables=' 'A JSON/SLON array composed of '\''table'\'' name and '\''path'\'' to each table'\''s data to be used with the sqlfilter'
fi
# Print completion for path=
-if [ $F_path_ -eq 1 ]; then
- echo "path= A JMESPath expression to filter output"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_path_ -eq 1 ]; then
+ printf '%s\t%s\n' 'path=' 'A JMESPath expression to filter output'
fi
# Print completion for outkey=
-if [ $F_outkey_ -eq 1 ]; then
- echo "outkey= If defined the map/list output will be prefix with the provided key"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_outkey_ -eq 1 ]; then
+ printf '%s\t%s\n' 'outkey=' 'If defined the map/list output will be prefix with the provided key'
fi
# Print completion for outfile=
-if [ $F_outfile_ -eq 1 ]; then
- echo "outfile= If defined all output will be written to the provided file"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_outfile_ -eq 1 ]; then
+ printf '%s\t%s\n' 'outfile=' 'If defined all output will be written to the provided file'
fi
# Print completion for outfileappend=
-if [ $F_outfileappend_ -eq 1 ]; then
- echo "outfileappend= If 'true' and outfile=true the output will be appended on the provided file"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_outfileappend_ -eq 1 ]; then
+ printf '%s\t%s\n' 'outfileappend=' 'If '\''true'\'' and outfile=true the output will be appended on the provided file'
fi
# Print completion for pause=
-if [ $F_pause_ -eq 1 ]; then
- echo "pause= If 'true' will try to pause contents in alternative to _less -r_"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_pause_ -eq 1 ]; then
+ printf '%s\t%s\n' 'pause=' 'If '\''true'\'' will try to pause contents in alternative to _less -r_'
fi
# Print completion for color=
-if [ $F_color_ -eq 1 ]; then
- echo "color= If 'true' will force colored output if available"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_color_ -eq 1 ]; then
+ printf '%s\t%s\n' 'color=' 'If '\''true'\'' will force colored output if available'
fi
# Print completion for url=
-if [ $F_url_ -eq 1 ]; then
- echo "url= Retrieves data from the provided URL"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_url_ -eq 1 ]; then
+ printf '%s\t%s\n' 'url=' 'Retrieves data from the provided URL'
fi
# Print completion for urlmethod=
-if [ $F_urlmethod_ -eq 1 ]; then
- echo "urlmethod= If 'url' is provided defines the http method to use if different from GET"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_urlmethod_ -eq 1 ]; then
+ printf '%s\t%s\n' 'urlmethod=' 'If '\''url'\'' is provided defines the http method to use if different from GET'
fi
# Print completion for urlparams=
-if [ $F_urlparams_ -eq 1 ]; then
- echo "urlparams= If 'url' is provided extra parameters -equivalent to OpenAF's $rest- can be provided in JSON/SLON"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_urlparams_ -eq 1 ]; then
+ printf '%s\t%s\n' 'urlparams=' 'If '\''url'\'' is provided extra parameters -equivalent to OpenAF'\''s $rest- can be provided in JSON/SLON'
fi
# Print completion for urldata=
-if [ $F_urldata_ -eq 1 ]; then
- echo "urldata= If 'url' is provided a JSON/SLON/text data can be provided"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_urldata_ -eq 1 ]; then
+ printf '%s\t%s\n' 'urldata=' 'If '\''url'\'' is provided a JSON/SLON/text data can be provided'
fi
# Print completion for chs=
-if [ $F_chs_ -eq 1 ]; then
- echo "chs= A JSON/SLON map or array composed of an OpenAF channel 'name', 'type' and optional 'options'"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_chs_ -eq 1 ]; then
+ printf '%s\t%s\n' 'chs=' 'A JSON/SLON map or array composed of an OpenAF channel '\''name'\'', '\''type'\'' and optional '\''options'\'''
fi
# Print completion for loop=
-if [ $F_loop_ -eq 1 ]; then
- echo "loop= If defined will loop the processing by the number of seconds provided"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_loop_ -eq 1 ]; then
+ printf '%s\t%s\n' 'loop=' 'If defined will loop the processing by the number of seconds provided'
fi
# Print completion for loopcls=
-if [ $F_loopcls_ -eq 1 ]; then
- echo "loopcls= If 'true' and loop is defined it will clear the screen -or file- on each loop cycle"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_loopcls_ -eq 1 ]; then
+ printf '%s\t%s\n' 'loopcls=' 'If '\''true'\'' and loop is defined it will clear the screen -or file- on each loop cycle'
fi
# Print completion for libs=
-if [ $F_libs_ -eq 1 ]; then
- echo "libs= Comma delimited list of installed OpenAF's oPacks to consider to extend oafp's inputs, transformations and outputs"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_libs_ -eq 1 ]; then
+ printf '%s\t%s\n' 'libs=' 'Comma delimited list of installed OpenAF'\''s oPacks to consider to extend oafp'\''s inputs, transformations and outputs'
fi
# Print completion for -examples
-if [ $F__examples -eq 1 ]; then
- echo "-examples Will access an internet based list of oafp examples and list them"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__examples -eq 1 ]; then
+ printf '%s\t%s\n' '-examples' 'Will access an internet based list of oafp examples and list them'
fi
# Print completion for examples=
-if [ $F_examples_ -eq 1 ]; then
- echo "examples= Will search the provided keyword or 'category::subcategory' in the internet based list of oafp examples"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_examples_ -eq 1 ]; then
+ printf '%s\t%s\n' 'examples=' 'Will search the provided keyword or '\''category::subcategory'\'' in the internet based list of oafp examples'
fi
# Print completion for version=
-if [ $F_version_ -eq 1 ]; then
- echo "version= Alternative way to change the input to a map with the tool's version"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_version_ -eq 1 ]; then
+ printf '%s\t%s\n' 'version=' 'Alternative way to change the input to a map with the tool'\''s version'
fi
# Print completion for pipe=
-if [ $F_pipe_ -eq 1 ]; then
- echo "pipe= A JSON/SLON/YAML map for recursive call of oafp similar to using unix pipes - useful with -f -"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_pipe_ -eq 1 ]; then
+ printf '%s\t%s\n' 'pipe=' 'A JSON/SLON/YAML map for recursive call of oafp similar to using unix pipes - useful with -f -'
fi
# Print completion for parallel=
-if [ $F_parallel_ -eq 1 ]; then
- echo "parallel= If true and input supports parallel processing it will try to process the input in parallel regardless of the input data order"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_parallel_ -eq 1 ]; then
+ printf '%s\t%s\n' 'parallel=' 'If true and input supports parallel processing it will try to process the input in parallel regardless of the input data order'
fi
# Print completion for -v
-if [ $F__v -eq 1 ]; then
- echo "-v Changes the input to a map with the tool's version info"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__v -eq 1 ]; then
+ printf '%s\t%s\n' '-v' 'Changes the input to a map with the tool'\''s version info'
fi
# Print completion for -f
-if [ $F__f -eq 1 ]; then
- echo "-f A JSON/SLON/YAML file with all the oafp parameters as a map"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__f -eq 1 ]; then
+ printf '%s\t%s\n' '-f' 'A JSON/SLON/YAML file with all the oafp parameters as a map'
fi
# Print completion for allstrings=
-if [ $F_allstrings_ -eq 1 ]; then
- echo "allstrings= If true all fields will be converted to strings -useful for text processing-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_allstrings_ -eq 1 ]; then
+ printf '%s\t%s\n' 'allstrings=' 'If true all fields will be converted to strings -useful for text processing-'
fi
# Print completion for arraytomap=
-if [ $F_arraytomap_ -eq 1 ]; then
- echo "arraytomap= If true will try to convert the input array to a map -see arraytomapkey, arraytomapkeepkey-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_arraytomap_ -eq 1 ]; then
+ printf '%s\t%s\n' 'arraytomap=' 'If true will try to convert the input array to a map -see arraytomapkey, arraytomapkeepkey-'
fi
# Print completion for arraytomapkeepkey=
-if [ $F_arraytomapkeepkey_ -eq 1 ]; then
- echo "arraytomapkeepkey= If true and arraytomap=true the defined arraytomapkey won't be removed from each map"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_arraytomapkeepkey_ -eq 1 ]; then
+ printf '%s\t%s\n' 'arraytomapkeepkey=' 'If true and arraytomap=true the defined arraytomapkey won'\''t be removed from each map'
fi
# Print completion for arraytomapkey=
-if [ $F_arraytomapkey_ -eq 1 ]; then
- echo "arraytomapkey= For arraytomap=true defines the name of the map property that will be each element key -see arraytomapkeepkey-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_arraytomapkey_ -eq 1 ]; then
+ printf '%s\t%s\n' 'arraytomapkey=' 'For arraytomap=true defines the name of the map property that will be each element key -see arraytomapkeepkey-'
fi
# Print completion for cmlt=
-if [ $F_cmlt_ -eq 1 ]; then
- echo "cmlt= If true will accumulate the input values into an output array -useful with loop-"
-
- echo "cmltch= A JSON/SLON OpenAF channel configuration string with type and options/url -defaults to simple-"
- echo "cmltsize= The number of input data values to keep -default 100-. If -1 it will keep without a limit"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_cmlt_ -eq 1 ]; then
+ printf '%s\t%s\n' 'cmlt=' 'If true will accumulate the input values into an output array -useful with loop-'
+ printf '%s\t%s\n' 'cmltch=' 'A JSON/SLON OpenAF channel configuration string with type and options/url -defaults to simple-'
+ printf '%s\t%s\n' 'cmltsize=' 'The number of input data values to keep -default 100-. If -1 it will keep without a limit'
fi
# Print completion for correcttypes=
-if [ $F_correcttypes_ -eq 1 ]; then
- echo "correcttypes= If true will try to convert alpha-numeric field values with just numbers to number fields, string date fields to dates and boolean fields"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_correcttypes_ -eq 1 ]; then
+ printf '%s\t%s\n' 'correcttypes=' 'If true will try to convert alpha-numeric field values with just numbers to number fields, string date fields to dates and boolean fields'
fi
# Print completion for denormalize=
-if [ $F_denormalize_ -eq 1 ]; then
- echo "denormalize= Reverses 'normalize' given a JSON/SLON map with a normalize schema -see OpenAF's ow.ai.normalize.withSchema-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_denormalize_ -eq 1 ]; then
+ printf '%s\t%s\n' 'denormalize=' 'Reverses '\''normalize'\'' given a JSON/SLON map with a normalize schema -see OpenAF'\''s ow.ai.normalize.withSchema-'
fi
# Print completion for diff=
-if [ $F_diff_ -eq 1 ]; then
- echo "diff= A JSON/SLON map with a 'a' path and a 'b' path to compare and provide diff data"
-
- echo "difftheme= A JSON/SLON map with the colors to use if color = true"
- echo "diffnlines= If true will append each line with a line number of the final result of the differences between 'a' and 'b' -just for rough reference-"
- echo "diffwords= If true and the input is text based will perform the diff at the word level"
- echo "diffwordswithspace= If true and the input is text based will perform the diff at the word + spaces level"
- echo "difflines= If true and the input is text based will perform the diff at the lines level"
- echo "diffsentences= If true and the input is text based will perfom the diff at the sentence level"
- echo "diffchars= If true and the input is text based will perform the diff at the char level"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_diff_ -eq 1 ]; then
+ printf '%s\t%s\n' 'diff=' 'A JSON/SLON map with a '\''a'\'' path and a '\''b'\'' path to compare and provide diff data'
+ printf '%s\t%s\n' 'difftheme=' 'A JSON/SLON map with the colors to use if color = true'
+ printf '%s\t%s\n' 'diffnlines=' 'If true will append each line with a line number of the final result of the differences between '\''a'\'' and '\''b'\'' -just for rough reference-'
+ printf '%s\t%s\n' 'diffwords=' 'If true and the input is text based will perform the diff at the word level'
+ printf '%s\t%s\n' 'diffwordswithspace=' 'If true and the input is text based will perform the diff at the word + spaces level'
+ printf '%s\t%s\n' 'difflines=' 'If true and the input is text based will perform the diff at the lines level'
+ printf '%s\t%s\n' 'diffsentences=' 'If true and the input is text based will perfom the diff at the sentence level'
+ printf '%s\t%s\n' 'diffchars=' 'If true and the input is text based will perform the diff at the char level'
fi
# Print completion for field2byte=
-if [ $F_field2byte_ -eq 1 ]; then
- echo "field2byte= A comma delimited list of fields whose value should be converted to a byte abbreviation"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_field2byte_ -eq 1 ]; then
+ printf '%s\t%s\n' 'field2byte=' 'A comma delimited list of fields whose value should be converted to a byte abbreviation'
fi
# Print completion for field2date=
-if [ $F_field2date_ -eq 1 ]; then
- echo "field2date= A comma delimited list of fields whose value should be converted to date values"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_field2date_ -eq 1 ]; then
+ printf '%s\t%s\n' 'field2date=' 'A comma delimited list of fields whose value should be converted to date values'
fi
# Print completion for field2si=
-if [ $F_field2si_ -eq 1 ]; then
- echo "field2si= A comma delimited list of fields whose value should be converted to a SI abbreviation"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_field2si_ -eq 1 ]; then
+ printf '%s\t%s\n' 'field2si=' 'A comma delimited list of fields whose value should be converted to a SI abbreviation'
fi
# Print completion for field2str=
-if [ $F_field2str_ -eq 1 ]; then
- echo "field2str= A comma delimited list of fields whose value should be converted to a string representation"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_field2str_ -eq 1 ]; then
+ printf '%s\t%s\n' 'field2str=' 'A comma delimited list of fields whose value should be converted to a string representation'
fi
# Print completion for field4map=
-if [ $F_field4map_ -eq 1 ]; then
- echo "field4map= A comma delimited list of fields whose value should be converted from JSON/SLON string representation to a map"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_field4map_ -eq 1 ]; then
+ printf '%s\t%s\n' 'field4map=' 'A comma delimited list of fields whose value should be converted from JSON/SLON string representation to a map'
fi
# Print completion for flatmap=
-if [ $F_flatmap_ -eq 1 ]; then
- echo "flatmap= If true a map structure will be flat to just one level -optionally flatmapsep=[char] to use a different separator that '.'-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_flatmap_ -eq 1 ]; then
+ printf '%s\t%s\n' 'flatmap=' 'If true a map structure will be flat to just one level -optionally flatmapsep=[char] to use a different separator that '\''.'\''-'
fi
# Print completion for getlist=
-if [ $F_getlist_ -eq 1 ]; then
- echo "getlist= If true will try to find the first array on the input value -if number will stop only after the number of checks-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_getlist_ -eq 1 ]; then
+ printf '%s\t%s\n' 'getlist=' 'If true will try to find the first array on the input value -if number will stop only after the number of checks-'
fi
# Print completion for jsonschema=
-if [ $F_jsonschema_ -eq 1 ]; then
- echo "jsonschema= The JSON schema file to use for validation returning a map with a boolean valid and errors if exist"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_jsonschema_ -eq 1 ]; then
+ printf '%s\t%s\n' 'jsonschema=' 'The JSON schema file to use for validation returning a map with a boolean valid and errors if exist'
fi
# Print completion for jsonschemacmd=
-if [ $F_jsonschemacmd_ -eq 1 ]; then
- echo "jsonschemacmd= Alternative option to 'jsonschema' to retrieve the JSON schema data to use for validation returning a map with a boolean valid and errors if exist"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_jsonschemacmd_ -eq 1 ]; then
+ printf '%s\t%s\n' 'jsonschemacmd=' 'Alternative option to '\''jsonschema'\'' to retrieve the JSON schema data to use for validation returning a map with a boolean valid and errors if exist'
fi
# Print completion for jsonschemagen=
-if [ $F_jsonschemagen_ -eq 1 ]; then
- echo "jsonschemagen= If true will taken the provided input map as an example to generate an output json schema"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_jsonschemagen_ -eq 1 ]; then
+ printf '%s\t%s\n' 'jsonschemagen=' 'If true will taken the provided input map as an example to generate an output json schema'
fi
# Print completion for kmeans=
-if [ $F_kmeans_ -eq 1 ]; then
- echo "kmeans= Given an array of 'normalized' data will cluster data into the number of centroids provided"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_kmeans_ -eq 1 ]; then
+ printf '%s\t%s\n' 'kmeans=' 'Given an array of '\''normalized'\'' data will cluster data into the number of centroids provided'
fi
# Print completion for llmprompt=
-if [ $F_llmprompt_ -eq 1 ]; then
- echo "llmprompt= A large language model prompt to transform the input data to json -uses the same input options 'llmenv' and 'llmoptions'-"
-
- echo "llmcontext= If 'llmprompt' is defined provides extra context to the model regarding the input data"
- echo "llmenv= The environment variable containing the value of 'llmoptions' -defaults to OAFP_MODEL-"
- echo "llmoptions= A JSON or SLON string with OpenAF's LLM 'type' -e.g. openai/ollama-, 'model' name, 'timeout' in ms for answers, 'url' for the ollama type or 'key' for openai type"
- echo "llmconversation= File to keep the LLM conversation"
- echo "llmimage= For visual models you can provide a base64 image or an image file path or an URL of an image"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_llmprompt_ -eq 1 ]; then
+ printf '%s\t%s\n' 'llmprompt=' 'A large language model prompt to transform the input data to json -uses the same input options '\''llmenv'\'' and '\''llmoptions'\''-'
+ printf '%s\t%s\n' 'llmcontext=' 'If '\''llmprompt'\'' is defined provides extra context to the model regarding the input data'
+ printf '%s\t%s\n' 'llmenv=' 'The environment variable containing the value of '\''llmoptions'\'' -defaults to OAFP_MODEL-'
+ printf '%s\t%s\n' 'llmoptions=' 'A JSON or SLON string with OpenAF'\''s LLM '\''type'\'' -e.g. openai/ollama-, '\''model'\'' name, '\''timeout'\'' in ms for answers, '\''url'\'' for the ollama type or '\''key'\'' for openai type'
+ printf '%s\t%s\n' 'llmconversation=' 'File to keep the LLM conversation'
+ printf '%s\t%s\n' 'llmimage=' 'For visual models you can provide a base64 image or an image file path or an URL of an image'
fi
# Print completion for maptoarray=
-if [ $F_maptoarray_ -eq 1 ]; then
- echo "maptoarray= If true will try to convert the input map to an array -see maptoarraykey-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_maptoarray_ -eq 1 ]; then
+ printf '%s\t%s\n' 'maptoarray=' 'If true will try to convert the input map to an array -see maptoarraykey-'
fi
# Print completion for maptoarraykey=
-if [ $F_maptoarraykey_ -eq 1 ]; then
- echo "maptoarraykey= If maptoarray=true defines the name of the map property that will hold the key for each map in the new array"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_maptoarraykey_ -eq 1 ]; then
+ printf '%s\t%s\n' 'maptoarraykey=' 'If maptoarray=true defines the name of the map property that will hold the key for each map in the new array'
fi
# Print completion for merge=
-if [ $F_merge_ -eq 1 ]; then
- echo "merge= If input is a list/array of maps will merge each element into one map"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_merge_ -eq 1 ]; then
+ printf '%s\t%s\n' 'merge=' 'If input is a list/array of maps will merge each element into one map'
fi
# Print completion for normalize=
-if [ $F_normalize_ -eq 1 ]; then
- echo "normalize= A JSON/SLON map with a normalize schema -see OpenAF's ow.ai.normalize.withSchema-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_normalize_ -eq 1 ]; then
+ printf '%s\t%s\n' 'normalize=' 'A JSON/SLON map with a normalize schema -see OpenAF'\''s ow.ai.normalize.withSchema-'
fi
# Print completion for numformat=
-if [ $F_numformat_ -eq 1 ]; then
- echo "numformat= For all number values applies a java.util.Formatter format -e.g. %,d-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_numformat_ -eq 1 ]; then
+ printf '%s\t%s\n' 'numformat=' 'For all number values applies a java.util.Formatter format -e.g. %,d-'
fi
# Print completion for oaf=
-if [ $F_oaf_ -eq 1 ]; then
- echo "oaf= An OpenAF script to execute or a file path to an OpenAF script taking -data- as input and returning the transformed data"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_oaf_ -eq 1 ]; then
+ printf '%s\t%s\n' 'oaf=' 'An OpenAF script to execute or a file path to an OpenAF script taking -data- as input and returning the transformed data'
fi
# Print completion for regression=
-if [ $F_regression_ -eq 1 ]; then
- echo "regression= Performs a regression -linear, log, exp, poly or power- over a provided list/array of numeric values"
-
- echo "regressionpath= The path to the array of y values for the regression formulas"
- echo "regressionx= Optional path to the array of x values for the regression formulas -defaults to 1, 2, 3, ...-"
- echo "regressionoptions= A JSON/SLON configuration with order -defaults to 2- and/or precision -defaults to 5-"
- echo "regressionforecast= Optional path to an array of x values for which to forecast the corresponding y"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_regression_ -eq 1 ]; then
+ printf '%s\t%s\n' 'regression=' 'Performs a regression -linear, log, exp, poly or power- over a provided list/array of numeric values'
+ printf '%s\t%s\n' 'regressionpath=' 'The path to the array of y values for the regression formulas'
+ printf '%s\t%s\n' 'regressionx=' 'Optional path to the array of x values for the regression formulas -defaults to 1, 2, 3, ...-'
+ printf '%s\t%s\n' 'regressionoptions=' 'A JSON/SLON configuration with order -defaults to 2- and/or precision -defaults to 5-'
+ printf '%s\t%s\n' 'regressionforecast=' 'Optional path to an array of x values for which to forecast the corresponding y'
fi
# Print completion for set=
-if [ $F_set_ -eq 1 ]; then
- echo "set= Performs set operations (intersection by default) over an 'a' and 'b' path to an array defined in a JSON/SLON map"
-
- echo "setop= Allows to choose a different set operation between 'union', 'diffa', 'diffb', 'diffab' -symetric difference-, 'diff' and 'intersect' -default-"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_set_ -eq 1 ]; then
+ printf '%s\t%s\n' 'set=' 'Performs set operations (intersection by default) over an '\''a'\'' and '\''b'\'' path to an array defined in a JSON/SLON map'
+ printf '%s\t%s\n' 'setop=' 'Allows to choose a different set operation between '\''union'\'', '\''diffa'\'', '\''diffb'\'', '\''diffab'\'' -symetric difference-, '\''diff'\'' and '\''intersect'\'' -default-'
fi
if [ $F_set__setop_ -eq 1 ]; then
if [ $F_set__setop__setop_union -eq 1 ]; then
- echo "setop=union Will return the union of the two sets"
+ printf '%s\t%s\n' 'setop=union' 'Will return the union of the two sets'
fi
if [ $F_set__setop__setop_diffa -eq 1 ]; then
- echo "setop=diffa Will return the difference between 'a' and 'b'"
+ printf '%s\t%s\n' 'setop=diffa' 'Will return the difference between '\''a'\'' and '\''b'\'''
fi
if [ $F_set__setop__setop_diffb -eq 1 ]; then
- echo "setop=diffb Will return the difference between 'b' and 'a'"
+ printf '%s\t%s\n' 'setop=diffb' 'Will return the difference between '\''b'\'' and '\''a'\'''
fi
if [ $F_set__setop__setop_diffab -eq 1 ]; then
- echo "setop=diffab Will return the symetric difference between 'a' and 'b'"
+ printf '%s\t%s\n' 'setop=diffab' 'Will return the symetric difference between '\''a'\'' and '\''b'\'''
fi
if [ $F_set__setop__setop_intersect -eq 1 ]; then
- echo "setop=intersect Will return the intersection of the two sets"
+ printf '%s\t%s\n' 'setop=intersect' 'Will return the intersection of the two sets'
fi
fi
# Print completion for removedups=
-if [ $F_removedups_ -eq 1 ]; then
- echo "removedups= If true will try to remove duplicates from an array"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_removedups_ -eq 1 ]; then
+ printf '%s\t%s\n' 'removedups=' 'If true will try to remove duplicates from an array'
fi
# Print completion for removeempty=
-if [ $F_removeempty_ -eq 1 ]; then
- echo "removeempty= If true will remove array/list entries that are either null or undefined"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_removeempty_ -eq 1 ]; then
+ printf '%s\t%s\n' 'removeempty=' 'If true will remove array/list entries that are either null or undefined'
fi
# Print completion for removenulls=
-if [ $F_removenulls_ -eq 1 ]; then
- echo "removenulls= If true will try to remove nulls and undefined values from a map or array"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_removenulls_ -eq 1 ]; then
+ printf '%s\t%s\n' 'removenulls=' 'If true will try to remove nulls and undefined values from a map or array'
fi
# Print completion for spacekeys=
-if [ $F_spacekeys_ -eq 1 ]; then
- echo "spacekeys= Replaces spaces in keys with the provided string -for example, helpful to xml output-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_spacekeys_ -eq 1 ]; then
+ printf '%s\t%s\n' 'spacekeys=' 'Replaces spaces in keys with the provided string -for example, helpful to xml output-'
fi
# Print completion for searchkeys=
-if [ $F_searchkeys_ -eq 1 ]; then
- echo "searchkeys= Will return a map with only keys that match the provided string"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_searchkeys_ -eq 1 ]; then
+ printf '%s\t%s\n' 'searchkeys=' 'Will return a map with only keys that match the provided string'
fi
# Print completion for searchvalues=
-if [ $F_searchvalues_ -eq 1 ]; then
- echo "searchvalues= Will return am map with only values that match the provided string"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_searchvalues_ -eq 1 ]; then
+ printf '%s\t%s\n' 'searchvalues=' 'Will return am map with only values that match the provided string'
fi
# Print completion for sortmapkeys=
-if [ $F_sortmapkeys_ -eq 1 ]; then
- echo "sortmapkeys= If true the resulting map keys will be sorted"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_sortmapkeys_ -eq 1 ]; then
+ printf '%s\t%s\n' 'sortmapkeys=' 'If true the resulting map keys will be sorted'
fi
# Print completion for trim=
-if [ $F_trim_ -eq 1 ]; then
- echo "trim= If true all the strings of the result map/list will be trimmed"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_trim_ -eq 1 ]; then
+ printf '%s\t%s\n' 'trim=' 'If true all the strings of the result map/list will be trimmed'
fi
# Print completion for forcearray=
-if [ $F_forcearray_ -eq 1 ]; then
- echo "forcearray= If true and if the input is map it will force it to be an array with that map as the only element"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_forcearray_ -eq 1 ]; then
+ printf '%s\t%s\n' 'forcearray=' 'If true and if the input is map it will force it to be an array with that map as the only element'
fi
# Print completion for secKey=
-if [ $F_secKey_ -eq 1 ]; then
- echo "secKey= The mandatory sBucket bucket key to use"
-
- echo "secEnv= A boolean flag to use environment variables as sBuckets"
- echo "secFile= Optional sBucket file source"
- echo "secMainPass= sBucket repository password"
- echo "secPass= sBucket bucket password"
- echo "secBucket= sBucket bucket name"
- echo "secRepo= sBucket repository"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_secKey_ -eq 1 ]; then
+ printf '%s\t%s\n' 'secKey=' 'The mandatory sBucket bucket key to use'
+ printf '%s\t%s\n' 'secEnv=' 'A boolean flag to use environment variables as sBuckets'
+ printf '%s\t%s\n' 'secFile=' 'Optional sBucket file source'
+ printf '%s\t%s\n' 'secMainPass=' 'sBucket repository password'
+ printf '%s\t%s\n' 'secPass=' 'sBucket bucket password'
+ printf '%s\t%s\n' 'secBucket=' 'sBucket bucket name'
+ printf '%s\t%s\n' 'secRepo=' 'sBucket repository'
fi
# Print completion for xjs=
-if [ $F_xjs_ -eq 1 ]; then
- echo "xjs= A .js file with function code manipulating an input 'args'. Returns the transformed 'args' variable"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xjs_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xjs=' 'A .js file with function code manipulating an input '\''args'\''. Returns the transformed '\''args'\'' variable'
fi
# Print completion for xpy=
-if [ $F_xpy_ -eq 1 ]; then
- echo "xpy= A .py file with Python function code manipulating an input 'args'. Returns the transformed 'args' variable"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xpy_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xpy=' 'A .py file with Python function code manipulating an input '\''args'\''. Returns the transformed '\''args'\'' variable'
fi
# Print completion for xfn=
-if [ $F_xfn_ -eq 1 ]; then
- echo "xfn= A javascript code, receiving input as 'args' and return it's code evaluation"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xfn_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xfn=' 'A javascript code, receiving input as '\''args'\'' and return it'\''s code evaluation'
fi
# Print completion for xrjs=
-if [ $F_xrjs_ -eq 1 ]; then
- echo "xrjs= A .js file with function code to manipulate each input array record as 'args'. Returns the transformed 'args' record"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xrjs_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xrjs=' 'A .js file with function code to manipulate each input array record as '\''args'\''. Returns the transformed '\''args'\'' record'
fi
# Print completion for xrpy=
-if [ $F_xrpy_ -eq 1 ]; then
- echo "xrpy= A .py file with function code to manipulate each input array record as 'args'. Returns the transformed 'args' record"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xrpy_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xrpy=' 'A .py file with function code to manipulate each input array record as '\''args'\''. Returns the transformed '\''args'\'' record'
fi
# Print completion for xrfn=
-if [ $F_xrfn_ -eq 1 ]; then
- echo "xrfn= A javascript code, receiving each input array record as 'args' and return it's code evaluation"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_xrfn_ -eq 1 ]; then
+ printf '%s\t%s\n' 'xrfn=' 'A javascript code, receiving each input array record as '\''args'\'' and return it'\''s code evaluation'
fi
# Print completion for val2icon=
-if [ $F_val2icon_ -eq 1 ]; then
- echo "val2icon= If defined will transform undefined, null and boolean values to emoticons -values can be 'default' or 'simple'-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_val2icon_ -eq 1 ]; then
+ printf '%s\t%s\n' 'val2icon=' 'If defined will transform undefined, null and boolean values to emoticons -values can be '\''default'\'' or '\''simple'\''-'
fi
# end
diff --git a/complete/completion_opack.sh b/complete/completion_opack.sh
index 675ea128e..35d8d527b 100644
--- a/complete/completion_opack.sh
+++ b/complete/completion_opack.sh
@@ -1,23 +1,27 @@
#!/bin/sh
# Flags
+_G_EXACT_CHOSEN=0
F_info=1
F_search=1
F_install=1
-F_install__d=0
-F_install__force=0
-F_install__repo=0
-F_install__deps=0
-F_install__useunzip=0
-F_install__noverify=0
-F_install__arg=0
+F_install_SEEN=0
+F_install__d=1
+F_install__force=1
+F_install__repo=1
+F_install__deps=1
+F_install__useunzip=1
+F_install__noverify=1
+F_install__arg=1
F_erase=1
-F_erase__force=0
-F_erase__arg=0
+F_erase_SEEN=0
+F_erase__force=1
+F_erase__arg=1
F_update=1
-F_update__all=0
-F_update__noerase=0
-F_update__erasefolder=0
+F_update_SEEN=0
+F_update__all=1
+F_update__noerase=1
+F_update__erasefolder=1
F_exec=1
F_list=1
F_pack=1
@@ -30,29 +34,35 @@ F_ojob=1
F__cred=1
# Iterate over the arguments
+FFOUND=0
if [ $# -gt 0 ]; then
- FFOUND=0
+ _n=$#
+ _i=0
for arg in "$@"; do
- if [ "$arg" = "" ]; then FFOUND=1; break; fi
+ _i=$((_i+1))
+ if [ $_i -eq $_n ]; then FFOUND=1; break; fi
# info single option
if [ "$arg" = "info" ]; then FFOUND=1; F_info=0; fi
# search single option
if [ "$arg" = "search" ]; then FFOUND=1; F_search=0; fi
- # install options
- if [ "$arg" = "-d" ]; then FFOUND=1; F_install__d=1; F_install=0; fi
- if [ "$arg" = "-force" ]; then FFOUND=1; F_install__force=1; F_install=0; fi
- if [ "$arg" = "-repo" ]; then FFOUND=1; F_install__repo=1; F_install=0; fi
- if [ "$arg" = "-deps" ]; then FFOUND=1; F_install__deps=1; F_install=0; fi
- if [ "$arg" = "-useunzip" ]; then FFOUND=1; F_install__useunzip=1; F_install=0; fi
- if [ "$arg" = "-noverify" ]; then FFOUND=1; F_install__noverify=1; F_install=0; fi
- if [ "$arg" = "-arg" ]; then FFOUND=1; F_install__arg=1; F_install=0; fi
- # erase options
- if [ "$arg" = "-force" ]; then FFOUND=1; F_erase__force=1; F_erase=0; fi
- if [ "$arg" = "-arg" ]; then FFOUND=1; F_erase__arg=1; F_erase=0; fi
- # update options
- if [ "$arg" = "-all" ]; then FFOUND=1; F_update__all=1; F_update=0; fi
- if [ "$arg" = "-noerase" ]; then FFOUND=1; F_update__noerase=1; F_update=0; fi
- if [ "$arg" = "-erasefolder" ]; then FFOUND=1; F_update__erasefolder=1; F_update=0; fi
+ # install subcommand
+ if [ "$arg" = "install" ]; then FFOUND=1; F_install=0; F_install_SEEN=1; _G_EXACT_CHOSEN=1; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-d" ]; then FFOUND=1; F_install__d=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-force" ]; then FFOUND=1; F_install__force=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-repo" ]; then FFOUND=1; F_install__repo=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-deps" ]; then FFOUND=1; F_install__deps=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-useunzip" ]; then FFOUND=1; F_install__useunzip=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-noverify" ]; then FFOUND=1; F_install__noverify=0; fi
+ if [ $F_install_SEEN -eq 1 ] && [ "$arg" = "-arg" ]; then FFOUND=1; F_install__arg=0; fi
+ # erase subcommand
+ if [ "$arg" = "erase" ]; then FFOUND=1; F_erase=0; F_erase_SEEN=1; _G_EXACT_CHOSEN=1; fi
+ if [ $F_erase_SEEN -eq 1 ] && [ "$arg" = "-force" ]; then FFOUND=1; F_erase__force=0; fi
+ if [ $F_erase_SEEN -eq 1 ] && [ "$arg" = "-arg" ]; then FFOUND=1; F_erase__arg=0; fi
+ # update subcommand
+ if [ "$arg" = "update" ]; then FFOUND=1; F_update=0; F_update_SEEN=1; _G_EXACT_CHOSEN=1; fi
+ if [ $F_update_SEEN -eq 1 ] && [ "$arg" = "-all" ]; then FFOUND=1; F_update__all=0; fi
+ if [ $F_update_SEEN -eq 1 ] && [ "$arg" = "-noerase" ]; then FFOUND=1; F_update__noerase=0; fi
+ if [ $F_update_SEEN -eq 1 ] && [ "$arg" = "-erasefolder" ]; then FFOUND=1; F_update__erasefolder=0; fi
# exec single option
if [ "$arg" = "exec" ]; then FFOUND=1; F_exec=0; fi
# list single option
@@ -77,91 +87,106 @@ if [ $# -gt 0 ]; then
fi
# Print completion for info
-if [ $F_info -eq 1 ]; then
- echo "info Provides information about the current package."
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_info -eq 1 ]; then
+ printf '%s\t%s\n' 'info' 'Provides information about the current package.'
fi
# Print completion for search
-if [ $F_search -eq 1 ]; then
- echo "search Searches for a keyword on the repository."
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_search -eq 1 ]; then
+ printf '%s\t%s\n' 'search' 'Searches for a keyword on the repository.'
fi
# Print completion for install
-if [ $F_install -eq 1 ]; then
- echo "install Install a package"
-
- echo "-d Installation directory for package."
- echo "-force Force instalation."
- echo "-repo Use an alternatively repository for dependencies"
- echo "-deps Automatically try to install dependencies"
- echo "-useunzip Alternatively use unzip to save memory"
- echo "-noverify Don't run hash verification on the end"
- echo "-arg Pass an argument to the pre/post install scripts"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_install -eq 1 ]; then
+ printf '%s\t%s\n' 'install' 'Install a package'
+fi
+if [ $F_install_SEEN -eq 1 ]; then
+ if [ $F_install__d -eq 1 ]; then
+ printf '%s\t%s\n' '-d' 'Installation directory for package.'
+ fi
+ if [ $F_install__force -eq 1 ]; then
+ printf '%s\t%s\n' '-force' 'Force instalation.'
+ fi
+ if [ $F_install__repo -eq 1 ]; then
+ printf '%s\t%s\n' '-repo' 'Use an alternatively repository for dependencies'
+ fi
+ if [ $F_install__deps -eq 1 ]; then
+ printf '%s\t%s\n' '-deps' 'Automatically try to install dependencies'
+ fi
+ if [ $F_install__useunzip -eq 1 ]; then
+ printf '%s\t%s\n' '-useunzip' 'Alternatively use unzip to save memory'
+ fi
+ if [ $F_install__noverify -eq 1 ]; then
+ printf '%s\t%s\n' '-noverify' 'Don'\''t run hash verification on the end'
+ fi
+ if [ $F_install__arg -eq 1 ]; then
+ printf '%s\t%s\n' '-arg' 'Pass an argument to the pre/post install scripts'
+ fi
fi
# Print completion for erase
-if [ $F_erase -eq 1 ]; then
- echo "erase Deletes a package on the path specified -only files declared on the package.json will be deleted-"
-
- echo "-force Force operation even with package dependencies"
- echo "-arg Pass an argument to the pre/post erase scripts"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_erase -eq 1 ]; then
+ printf '%s\t%s\n' 'erase' 'Deletes a package on the path specified -only files declared on the package.json will be deleted-'
+fi
+if [ $F_erase_SEEN -eq 1 ]; then
+ if [ $F_erase__force -eq 1 ]; then
+ printf '%s\t%s\n' '-force' 'Force operation even with package dependencies'
+ fi
+ if [ $F_erase__arg -eq 1 ]; then
+ printf '%s\t%s\n' '-arg' 'Pass an argument to the pre/post erase scripts'
+ fi
fi
# Print completion for update
-if [ $F_update -eq 1 ]; then
- echo "update Updates a package"
-
- echo "-all Tries to update all packages locally installed"
- echo "-noerase When updating don't delete the package first"
- echo "-erasefolder Erase previous version folder while updating to a new version"
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_update -eq 1 ]; then
+ printf '%s\t%s\n' 'update' 'Updates a package'
+fi
+if [ $F_update_SEEN -eq 1 ]; then
+ if [ $F_update__all -eq 1 ]; then
+ printf '%s\t%s\n' '-all' 'Tries to update all packages locally installed'
+ fi
+ if [ $F_update__noerase -eq 1 ]; then
+ printf '%s\t%s\n' '-noerase' 'When updating don'\''t delete the package first'
+ fi
+ if [ $F_update__erasefolder -eq 1 ]; then
+ printf '%s\t%s\n' '-erasefolder' 'Erase previous version folder while updating to a new version'
+ fi
fi
# Print completion for exec
-if [ $F_exec -eq 1 ]; then
- echo "exec Executes code from an installed package"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_exec -eq 1 ]; then
+ printf '%s\t%s\n' 'exec' 'Executes code from an installed package'
fi
# Print completion for list
-if [ $F_list -eq 1 ]; then
- echo "list List installed packages"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_list -eq 1 ]; then
+ printf '%s\t%s\n' 'list' 'List installed packages'
fi
# Print completion for pack
-if [ $F_pack -eq 1 ]; then
- echo "pack Generates a opack file from a packaging directory"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_pack -eq 1 ]; then
+ printf '%s\t%s\n' 'pack' 'Generates a opack file from a packaging directory'
fi
# Print completion for genpack
-if [ $F_genpack -eq 1 ]; then
- echo "genpack Generates a package.json for packaging"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_genpack -eq 1 ]; then
+ printf '%s\t%s\n' 'genpack' 'Generates a package.json for packaging'
fi
# Print completion for add2db
-if [ $F_add2db -eq 1 ]; then
- echo "add2db Add an already installed package to the local OpenPack database"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_add2db -eq 1 ]; then
+ printf '%s\t%s\n' 'add2db' 'Add an already installed package to the local OpenPack database'
fi
# Print completion for remove4db
-if [ $F_remove4db -eq 1 ]; then
- echo "remove4db Remove a package entry from the local OpenPack database"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_remove4db -eq 1 ]; then
+ printf '%s\t%s\n' 'remove4db' 'Remove a package entry from the local OpenPack database'
fi
# Print completion for script
-if [ $F_script -eq 1 ]; then
- echo "script Creates a shell script, on the current path, to execute a opack"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_script -eq 1 ]; then
+ printf '%s\t%s\n' 'script' 'Creates a shell script, on the current path, to execute a opack'
fi
# Print completion for daemon
-if [ $F_daemon -eq 1 ]; then
- echo "daemon Creates a shell script, on the current path, to execute an opack as a daemon"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_daemon -eq 1 ]; then
+ printf '%s\t%s\n' 'daemon' 'Creates a shell script, on the current path, to execute an opack as a daemon'
fi
# Print completion for ojob
-if [ $F_ojob -eq 1 ]; then
- echo "ojob Creates a shell script, on the current path, to execute an opack as a ojob"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F_ojob -eq 1 ]; then
+ printf '%s\t%s\n' 'ojob' 'Creates a shell script, on the current path, to execute an opack as a ojob'
fi
# Print completion for -cred
-if [ $F__cred -eq 1 ]; then
- echo "-cred Provide authentication credentials for a remote repository -e.g. user:pass-"
-
+if [ $_G_EXACT_CHOSEN -eq 0 ] && [ $F__cred -eq 1 ]; then
+ printf '%s\t%s\n' '-cred' 'Provide authentication credentials for a remote repository -e.g. user:pass-'
fi
# end
diff --git a/complete/completion_opack.yaml b/complete/completion_opack.yaml
index 5c9d17ba1..96adce7b3 100644
--- a/complete/completion_opack.yaml
+++ b/complete/completion_opack.yaml
@@ -5,6 +5,7 @@ complete:
desc: Searches for a keyword on the repository.
- name: install
desc: Install a package
+ exact: true
opts:
- name: -d
desc: Installation directory for package.
@@ -22,6 +23,7 @@ complete:
desc: Pass an argument to the pre/post install scripts
- name: erase
desc: Deletes a package on the path specified -only files declared on the package.json will be deleted-
+ exact: true
opts:
- name: -force
desc: Force operation even with package dependencies
@@ -29,6 +31,7 @@ complete:
desc: Pass an argument to the pre/post erase scripts
- name: update
desc: Updates a package
+ exact: true
opts:
- name: -all
desc: Tries to update all packages locally installed
diff --git a/js/bashcompletion.js b/js/bashcompletion.js
index b213fdc04..a69ea498f 100644
--- a/js/bashcompletion.js
+++ b/js/bashcompletion.js
@@ -5,13 +5,13 @@ __conStatus = false
function _r(_e) {
switch(_e) {
case "oaf" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "oaf").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "oaf").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_oaf.sh")
io.writeFileString(homeDir + "/.openaf_completion_oaf.sh", shell2)
print(shell1)
break
case "ojob" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "ojob").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "ojob").replace(/{{home}}/g, homeDir)
var _url = "https://ojob.io/oaf/openaf_completion_ojob_bash_" + getDistribution() + ".sh"
if (toBoolean(getEnv("OAF_COMPLETION_OJOB_BUILD")) || isDef($rest().head(_url).error) ) {
@@ -31,13 +31,13 @@ function _r(_e) {
print(shell1)
break
case "oafp" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "oafp").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "oafp").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_oafp.sh")
io.writeFileString(homeDir + "/.openaf_completion_oafp.sh", shell2)
print(shell1)
break
case "opack" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "opack").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_bash.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "opack").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_opack.sh")
io.writeFileString(homeDir + "/.openaf_completion_opack.sh", shell2)
print(shell1)
diff --git a/js/opack.js b/js/opack.js
index 60cce9800..5f4d1d161 100755
--- a/js/opack.js
+++ b/js/opack.js
@@ -403,29 +403,7 @@ function verifyDeps(packag) {
ldep = dep.toLowerCase()
results[ldep] = false
if (!isUnDef(compareTo)) {
- var _vs = version.split(",")
-
- var isValid = []
- for(var j in _vs) {
- var _version = String(_vs[j]).trim()
- compareTo.version = String(compareTo.version).trim()
- if (compareTo.version.indexOf(".") > 0 && _version.indexOf(".") > 0) {
- try {
- if (_version.match(/^\>\=/) && ow.format.semVer(compareTo.version).greaterEquals(_version.replace(/^\>\=/, ""))) { isValid.push(true); continue }
- if (_version.match(/^\<\=/) && ow.format.semVer(compareTo.version).lowerEquals(_version.replace(/\<\=/, ""))) { isValid.push(true); continue }
- if (_version.match(/^\<(?=[^=])/) && ow.format.semVer(compareTo.version).lower(_version.replace(/^\(?=[^=])/) && ow.format.semVer(compareTo.version).greater(_version.replace(/^\>/, ""))) { isValid.push(true); continue }
- if (ow.format.semVer(compareTo.version).equals(_version)) { isValid.push(true); continue }
- } catch(ee) { /* nothing */ }
- }
- if (compareTo.version == _version) { isValid.push(true); continue }
- if (_version.match(/^\>\=/) && compareTo.version >= _version.replace(/^\>\=/, "")) { isValid.push(true); continue }
- if (_version.match(/^\<\=/) && compareTo.version <= _version.replace(/^\<\=/, "")) { isValid.push(true); continue }
- if (_version.match(/^\<(?=[^=])/) && compareTo.version < _version.replace(/^\(?=[^=])/) && compareTo.version > _version.replace(/^\>/, "")) { isValid.push(true); continue }
- isValid.push(false)
- }
- if (isValid.indexOf(false) < 0) results[ldep] = true
+ results[ldep] = ow.format.checkVersionSpec(compareTo.version, version)
}
}
}
@@ -1297,31 +1275,20 @@ function __opack_list(args) {
// Check version given package and force parameters
function checkVersion(packag, force) {
if (isUnDef(packag)) return -1
- var installedVersion = getPackVersion(packag.name);
+ var installedVersion = getPackVersion(packag.name)
- if (!force && isDef(installedVersion) &&
- ( (installedVersion.indexOf(".") > 0 && packag.version.indexOf(".") && ow.format.semver(installedVersion).greater(packag.version)) ||
- (installedVersion > packag.version) ) ) {
+ if (isUnDef(installedVersion)) return -1
+ if (force) return 1
+ var _c = ow.format.compareVersion(installedVersion, packag.version)
+ if (_c > 0) {
log("Installed version is newer " + installedVersion);
- // Installed and newer
return 0
- } else {
- if (!force && isDef(installedVersion) &&
- ((installedVersion.indexOf(".") > 0 && packag.version.indexOf(".") && ow.format.semver(installedVersion).equals(packag.version)) ||
- (installedVersion == packag.version ) )) {
- log(packag.name + ", version " + installedVersion + ", already installed in '" + findLocalDBTargetByName(packag.name) + "'.");
- // Already installed
- return 0
- } else {
- if (isUnDef(installedVersion)) {
- // Not installed
- return -1
- } else {
- // Installed and older
- return 1
- }
- }
}
+ if (_c == 0) {
+ log(packag.name + ", version " + installedVersion + ", already installed in '" + findLocalDBTargetByName(packag.name) + "'.");
+ return 0
+ }
+ return 1
}
// INSTALL
diff --git a/js/openaf.js b/js/openaf.js
index 4e9b44992..1b90a7877 100644
--- a/js/openaf.js
+++ b/js/openaf.js
@@ -260,7 +260,9 @@ var __flags = ( typeof __flags != "undefined" && "[object Object]" == Object.pro
jsonParse: true,
listFilesRecursive: true,
colorify : true,
- restart : true
+ restart : true,
+ toTOON : true,
+ fromTOON : true
},
WITHMD: {
htmlFilter: true
@@ -5912,7 +5914,8 @@ const parallel = function(aFunction, numThreads, aAggFunction, threads) {
var results = [];
for(var i = 0; i < numThreads; i++) {
var uuid = __threads.addThread(function(uuid) {
- results.push(aFunction(uuid, __threads));
+ var result = aFunction(uuid, __threads);
+ __threads.sync(function() { results.push(result); });
if (balance) __balance();
});
if (isDef(threads)) {
@@ -11246,24 +11249,36 @@ AF.prototype.toKYAML = function(aJson, multiDoc, sanitize, shouldColor, perEntry
/**
*
- * AF.toTOON(aObj) : String
- * Tries to convert aObj into a TOON string.
+ * AF.toTOON(aObj, alternative) : String
+ * Tries to convert aObj into a TOON string. If alternative = true (or, if unset, defaults to
+ * __flags.ALTERNATIVES.toTOON) a native Java TOON engine will be used instead of the bundled
+ * Javascript one (faster and lower memory footprint on bigger payloads).
*
*/
-AF.prototype.toTOON = function(aObj) {
- loadTOON()
- return toon.encode(aObj)
+AF.prototype.toTOON = function(aObj, alternative) {
+ if (_$(alternative).default(__flags.ALTERNATIVES.toTOON)) {
+ return af.toTOONJava(aObj)
+ } else {
+ loadTOON()
+ return toon.encode(aObj)
+ }
}
/**
*
- * AF.fromTOON(aTOONStr) : Object
- * Tries to parse aTOONStr into a javascript object.
+ * AF.fromTOON(aTOONStr, alternative) : Object
+ * Tries to parse aTOONStr into a javascript object. If alternative = true (or, if unset, defaults
+ * to __flags.ALTERNATIVES.fromTOON) a native Java TOON engine will be used instead of the bundled
+ * Javascript one (faster and lower memory footprint on bigger payloads).
*
*/
-AF.prototype.fromTOON = function(aTOONStr) {
- loadTOON()
- return toon.decode(aTOONStr)
+AF.prototype.fromTOON = function(aTOONStr, alternative) {
+ if (_$(alternative).default(__flags.ALTERNATIVES.fromTOON)) {
+ return af.fromTOONJava(aTOONStr)
+ } else {
+ loadTOON()
+ return toon.decode(aTOONStr)
+ }
}
/**
@@ -13973,7 +13988,7 @@ const includeOPack = function(aOPackName, aMinVersion) {
if (aOPackName.toLowerCase() == "openaf") {
if (isDef(aMinVersion)) {
- if (getVersion() < aMinVersion) throw("The OpenAF version is " + getVersion() + ". It needs to be updated to " + aMinVersion);
+ if (ow.loadFormat().compareVersion(getVersion(), aMinVersion) < 0) throw("The OpenAF version is " + getVersion() + ". It needs to be updated to " + aMinVersion);
}
return true;
}
@@ -13982,8 +13997,8 @@ const includeOPack = function(aOPackName, aMinVersion) {
if (isDef(getOPackPath(aOPackName))) {
var version = $from(getOPackLocalDB()).equals("name", aOPackName).at(0).version
// Check version
- if (version < aMinVersion) {
- oPack("add2db " + oPackName)
+ if (isDef(aMinVersion) && ow.loadFormat().compareVersion(version, aMinVersion) < 0) {
+ oPack("add2db " + aOPackName)
}
} else {
// add it if it's on the same directory
@@ -13996,10 +14011,10 @@ const includeOPack = function(aOPackName, aMinVersion) {
}
if (isDef(aMinVersion)) {
var version = $path(getOPackLocalDB(), "to_array(*)[?name==`" + aOPackName + "`] | [0].version");
- if (version < aMinVersion) {
+ if (ow.loadFormat().compareVersion(version, aMinVersion) < 0) {
oPack("update " + aOPackName);
version = $path(getOPackLocalDB(), "to_array(*)[?name==`" + aOPackName + "`] | [0].version");
- if (version < aMinVersion) throw "Couldn't update opack " + aOPackName + " from version " + version + " to >=" + aMinVersion;
+ if (ow.loadFormat().compareVersion(version, aMinVersion) < 0) throw "Couldn't update opack " + aOPackName + " from version " + version + " to >=" + aMinVersion;
}
}
return true;
diff --git a/js/owrap.ai.js b/js/owrap.ai.js
index 32aada49d..57231e790 100644
--- a/js/owrap.ai.js
+++ b/js/owrap.ai.js
@@ -189,6 +189,74 @@ OpenWrap.ai.prototype.__gpttypes = {
return merge(_h, aOptions.headers)
}
var _buildURL = aURI => _joinURL(aOptions.url, aURI)
+ var _responsesAvailable = __
+ var _normalizeResponseSchema = aResponseSchema => {
+ if (!isMap(aResponseSchema)) return __
+ return {
+ name : aResponseSchema.name || "Response",
+ description: aResponseSchema.description || "API Response",
+ schema : aResponseSchema.schema || {},
+ strict : aResponseSchema.strict !== false
+ }
+ }
+ var _toResponseInputText = aContent => {
+ if (isMap(aContent) || isArray(aContent)) return stringify(aContent, __, "")
+ return isDef(aContent) ? String(aContent) : ""
+ }
+ var _toResponsesInput = aMsgs => {
+ return _$(aMsgs, "aMsgs").isArray().default([]).map(m => {
+ if (!isMap(m)) return { role: "user", content: [ { type: "input_text", text: _toResponseInputText(m) } ] }
+ if (isArray(m.content)) {
+ return {
+ role : isString(m.role) ? m.role : "user",
+ content: clone(m.content)
+ }
+ }
+ return {
+ role : isString(m.role) ? m.role : "user",
+ content: [ { type: "input_text", text: _toResponseInputText(m.content) } ]
+ }
+ })
+ }
+ var _extractResponseErrorMessage = aResponse => {
+ if (!isMap(aResponse)) return ""
+ if (isMap(aResponse.error)) {
+ if (isString(aResponse.error.message)) return aResponse.error.message
+ if (isString(aResponse.error.error)) return aResponse.error.error
+ return stringify(aResponse.error, __, "")
+ }
+ if (isString(aResponse.message)) return aResponse.message
+ return stringify(aResponse, __, "")
+ }
+ var _isResponsesUnavailable = aResponse => {
+ if (!isMap(aResponse)) return false
+ var _status = isDef(aResponse.status) ? Number(aResponse.status) : (isMap(aResponse.error) && isDef(aResponse.error.status) ? Number(aResponse.error.status) : __)
+ if ([ 404, 405, 410, 501 ].indexOf(_status) >= 0) return true
+
+ var _code = (isMap(aResponse.error) && isDef(aResponse.error.code) ? aResponse.error.code : aResponse.code)
+ if (isDef(_code)) {
+ _code = String(_code).toLowerCase()
+ if (_code.indexOf("not_found") >= 0 || _code.indexOf("unsupported") >= 0 || _code.indexOf("unknown_url") >= 0 || _code.indexOf("unknown_endpoint") >= 0) return true
+ }
+
+ var _type = (isMap(aResponse.error) && isDef(aResponse.error.type) ? aResponse.error.type : aResponse.type)
+ if (isDef(_type)) {
+ _type = String(_type).toLowerCase()
+ if (_type.indexOf("not_found") >= 0 || _type.indexOf("unsupported") >= 0) return true
+ }
+
+ var _msg = _extractResponseErrorMessage(aResponse).toLowerCase()
+ return (
+ _msg.indexOf("/responses") >= 0 && (
+ _msg.indexOf("not found") >= 0 ||
+ _msg.indexOf("unsupported") >= 0 ||
+ _msg.indexOf("unknown") >= 0 ||
+ _msg.indexOf("not available") >= 0 ||
+ _msg.indexOf("unavailable") >= 0 ||
+ _msg.indexOf("does not exist") >= 0
+ )
+ ) || _msg.indexOf("unknown endpoint") >= 0 || _msg.indexOf("unknown url") >= 0
+ }
var _captureStats = (aResponse, aRequestBody) => {
if (!isMap(aResponse)) {
_lastStats = __
@@ -207,13 +275,23 @@ OpenWrap.ai.prototype.__gpttypes = {
if (isDef(aResponse.usage.prompt_tokens)) tokens.prompt = aResponse.usage.prompt_tokens
if (isDef(aResponse.usage.completion_tokens)) tokens.completion = aResponse.usage.completion_tokens
if (isDef(aResponse.usage.total_tokens)) tokens.total = aResponse.usage.total_tokens
+ if (isDef(aResponse.usage.input_tokens)) tokens.prompt = aResponse.usage.input_tokens
+ if (isDef(aResponse.usage.output_tokens)) tokens.completion = aResponse.usage.output_tokens
+ if (isDef(aResponse.usage.total_tokens)) tokens.total = aResponse.usage.total_tokens
if (isMap(aResponse.usage.prompt_tokens_details)) {
if (isDef(aResponse.usage.prompt_tokens_details.cached_tokens)) tokens.cached = aResponse.usage.prompt_tokens_details.cached_tokens
if (isDef(aResponse.usage.prompt_tokens_details.audio_tokens)) tokens.audio = aResponse.usage.prompt_tokens_details.audio_tokens
}
+ if (isMap(aResponse.usage.input_tokens_details)) {
+ if (isDef(aResponse.usage.input_tokens_details.cached_tokens)) tokens.cached = aResponse.usage.input_tokens_details.cached_tokens
+ if (isDef(aResponse.usage.input_tokens_details.audio_tokens)) tokens.audio = aResponse.usage.input_tokens_details.audio_tokens
+ }
if (isMap(aResponse.usage.completion_tokens_details)) {
if (isDef(aResponse.usage.completion_tokens_details.reasoning_tokens)) tokens.reasoning = aResponse.usage.completion_tokens_details.reasoning_tokens
}
+ if (isMap(aResponse.usage.output_tokens_details)) {
+ if (isDef(aResponse.usage.output_tokens_details.reasoning_tokens)) tokens.reasoning = aResponse.usage.output_tokens_details.reasoning_tokens
+ }
if (Object.keys(tokens).length > 0) stats.tokens = tokens
stats.usage = aResponse.usage
}
@@ -698,6 +776,79 @@ OpenWrap.ai.prototype.__gpttypes = {
if (isMap(res) && isDef(res.error)) return res
return res.content
},
+ rawResponse: (aPrompt, aModel, aTemperature, aJsonSchemaFlag, aTools, aResponseSchema) => {
+ aPrompt = _$(aPrompt, "aPrompt").default(__)
+ aTemperature = _$(aTemperature, "aTemperature").isNumber().default(_temperature)
+ aModel = _$(aModel, "aModel").isString().default(_model)
+ aJsonSchemaFlag = _$(aJsonSchemaFlag, "aJsonSchemaFlag").isBoolean().default(false)
+ if (isUnDef(aTools)) {
+ aTools = Object.keys(_r.tools)
+ } else if (isMap(aTools)) {
+ aTools = Object.keys(aTools)
+ }
+ aTools = _$(aTools, "aTools").isArray().default([])
+
+ _resetStats()
+ var msgs = []
+ if (isString(aPrompt)) aPrompt = [ aPrompt ]
+ aPrompt = _r.conversation.concat(aPrompt)
+ msgs = aPrompt.filter(c => isDef(c)).map(c => isMap(c) ? c : { role: "user", content: c })
+
+ _r.conversation = msgs
+ if (_noSystem) msgs = msgs.map(m => { if (m.role == "system") m.role = "developer"; return m })
+ var _schema = _normalizeResponseSchema(aResponseSchema)
+ var _responsesBody = {
+ model : aModel,
+ temperature: aTemperature,
+ input : _toResponsesInput(msgs)
+ }
+ if (isDef(_schema)) {
+ _responsesBody.text = {
+ format: merge({ type: "json_schema" }, _schema)
+ }
+ }
+
+ var _chatBody = {
+ model : aModel,
+ temperature: aTemperature,
+ messages : msgs
+ }
+ if (isDef(_schema)) {
+ _chatBody.response_format = {
+ type : "json_schema",
+ json_schema: _schema
+ }
+ }
+
+ _responsesBody = merge(_responsesBody, aOptions.params)
+ _chatBody = merge(_chatBody, aOptions.params)
+
+ var _res = __
+ var _requestBody = __
+ if (_responsesAvailable !== false) {
+ _requestBody = _responsesBody
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'client'}, merge({_t:nowNano(),_f:'client'}, _requestBody))
+ _res = _r._request(_route("responses", aModel), _requestBody)
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'llm'}, merge({_t:nowNano(),_f:'llm'}, _res))
+ if (isMap(_res) && isMap(_res.error) && _isResponsesUnavailable(_res)) {
+ _responsesAvailable = false
+ _requestBody = _chatBody
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'client'}, merge({_t:nowNano(),_f:'client'}, _requestBody))
+ _res = _r._request(_route("chat/completions", aModel), _requestBody)
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'llm'}, merge({_t:nowNano(),_f:'llm'}, _res))
+ } else if (!isMap(_res) || isUnDef(_res.error)) {
+ _responsesAvailable = true
+ }
+ } else {
+ _requestBody = _chatBody
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'client'}, merge({_t:nowNano(),_f:'client'}, _requestBody))
+ _res = _r._request(_route("chat/completions", aModel), _requestBody)
+ if (isDef(_debugCh)) $ch(_debugCh).set({_t:nowNano(),_f:'llm'}, merge({_t:nowNano(),_f:'llm'}, _res))
+ }
+
+ _captureStats(_res, _requestBody)
+ return _res
+ },
rawImgGen: (aPrompt, aModel) => {
aPrompt = _$(aPrompt, "aPrompt").default(__)
aModel = _$(aModel, "aModel").isString().default(_model)
@@ -2080,7 +2231,7 @@ OpenWrap.ai.prototype.__gpttypes = {
if (isUnDef(_args)) _args = {}
var _tr = stringify(_t.fn(_args), __, "")
_p.push({ role: "assistant", content: "", tool_calls: [ tc ] })
- _p.push({ role: "tool", tool_name: tc.function.name, content: _tr })
+ _p.push({ role: "tool", tool_call_id: tc.id, tool_name: tc.function.name, content: _tr })
}
}
})
@@ -3392,6 +3543,12 @@ OpenWrap.ai.prototype.gpt.prototype.promptStream = function(aPrompt, aRole, aMod
OpenWrap.ai.prototype.gpt.prototype.rawPromptStream = function(aPrompt, aRole, aModel, aTemperature, aJsonFlag, tools, aOnDelta) {
if (!isFunction(this.model.rawPromptStream)) throw "Streaming not supported by this provider"
var _args = this.__resolvePromptArgs(aRole, aModel, aTemperature, aJsonFlag, tools)
+ // Keep the original six-argument form working: without aRole, the
+ // callback occupies the sixth argument rather than the seventh.
+ if (isUnDef(aOnDelta) && isUnDef(_args.role)) {
+ if (isFunction(tools)) aOnDelta = tools
+ else if (isFunction(aJsonFlag)) aOnDelta = aJsonFlag
+ }
return this.model.rawPromptStream(aPrompt, _args.model, _args.temperature, _args.jsonFlag, _args.tools, aOnDelta)
}
@@ -3573,6 +3730,58 @@ OpenWrap.ai.prototype.gpt.prototype.rawPromptWithStats = function(aPrompt, aRole
return { response: response, stats: this.getLastStats() }
}
+/**
+ *
+ * ow.ai.gpt.jsonSchemaPrompt(aPrompt, aResponseSchema, aModel, aTemperature, tools) : Object
+ * Executes a prompt using OpenAI's JSON Schema response format, enforcing structured output validated against aResponseSchema.\
+ * aResponseSchema should be a map with: name (string), description (string), schema (JSON Schema object), strict (boolean, defaults to true).\
+ * Returns the parsed JSON response matching the provided schema.\
+ * Only supported by the "openai" provider; throws if the underlying provider does not implement rawResponse.
+ *
+ */
+OpenWrap.ai.prototype.gpt.prototype.jsonSchemaPrompt = function(aPrompt, aResponseSchema, aModel, aTemperature, tools) {
+ if (!isFunction(this.model.rawResponse)) throw "JSON Schema responses not supported by this provider"
+ var response = this.model.rawResponse(aPrompt, aModel, aTemperature, false, tools, aResponseSchema)
+ if (isString(response.output_text) && response.output_text.length > 0) {
+ return jsonParse(response.output_text, __, __, true)
+ }
+ if (isArray(response.output)) {
+ var _parts = []
+ response.output.forEach(o => {
+ if (isArray(o.content)) {
+ o.content.forEach(c => {
+ if (isString(c.text)) _parts.push(c.text)
+ else if (isDef(c.json)) _parts.push(c.json)
+ })
+ }
+ })
+ if (_parts.length > 0) {
+ var _out = _parts[0]
+ if (_parts.length > 1 && _parts.every(isString)) _out = _parts.join("")
+ return isString(_out) ? jsonParse(_out, __, __, true) : _out
+ }
+ }
+ if (isArray(response.choices) && response.choices.length > 0) {
+ if (response.choices[0].finish_reason == "stop") {
+ var content = response.choices[0].message.content
+ return isString(content) ? jsonParse(content, __, __, true) : content
+ }
+ }
+ return response
+}
+
+/**
+ *
+ * ow.ai.gpt.jsonSchemaPromptWithStats(aPrompt, aResponseSchema, aModel, aTemperature, tools) : Map
+ * Executes jsonSchemaPrompt and returns the parsed response together with any reported statistics ({ response, stats }).\
+ * aResponseSchema should be a map with: name (string), description (string), schema (JSON Schema object), strict (boolean, defaults to true).
+ *
+ */
+OpenWrap.ai.prototype.gpt.prototype.jsonSchemaPromptWithStats = function(aPrompt, aResponseSchema, aModel, aTemperature, tools) {
+ var response = this.jsonSchemaPrompt(aPrompt, aResponseSchema, aModel, aTemperature, tools)
+ return { response: response, stats: this.getLastStats() }
+}
+
/**
*
* ow.ai.gpt.promptImgGen(aPrompt, aModel, anOutputPathPrefix) : Array
@@ -4380,6 +4589,28 @@ global.$gpt = function(aModel) {
*
*/
importConversation: (aExport) => { _g.importConversation(aExport); return _r },
+ /**
+ *
+ * $gpt.jsonSchemaPrompt(aPrompt, aResponseSchema, aModel, aTemperature, tools) : Object
+ * Executes a prompt using OpenAI's JSON Schema response format, enforcing structured output validated against aResponseSchema.\
+ * aResponseSchema should be a map with: name (string), description (string), schema (JSON Schema object), strict (boolean, defaults to true).\
+ * Returns the parsed JSON response matching the provided schema.\
+ * Only supported by the "openai" provider.
+ *
+ */
+ jsonSchemaPrompt: (aPrompt, aResponseSchema, aModel, aTemperature, tools) => {
+ return _g.jsonSchemaPrompt(aPrompt, aResponseSchema, aModel, aTemperature, tools)
+ },
+ /**
+ *
+ * $gpt.jsonSchemaPromptWithStats(aPrompt, aResponseSchema, aModel, aTemperature, tools) : Map
+ * Executes jsonSchemaPrompt and returns the parsed response together with any reported statistics ({ response, stats }).\
+ * aResponseSchema should be a map with: name (string), description (string), schema (JSON Schema object), strict (boolean, defaults to true).
+ *
+ */
+ jsonSchemaPromptWithStats: (aPrompt, aResponseSchema, aModel, aTemperature, tools) => {
+ return _g.jsonSchemaPromptWithStats(aPrompt, aResponseSchema, aModel, aTemperature, tools)
+ },
/**
*
* $gpt.close()
diff --git a/js/owrap.format.js b/js/owrap.format.js
index 331f55730..dc1ab3b0d 100644
--- a/js/owrap.format.js
+++ b/js/owrap.format.js
@@ -1491,6 +1491,68 @@ OpenWrap.format.prototype.semver = function(aVer) {
}
}
+/**
+ *
+ * ow.format.compareVersion(aVersionA, aVersionB) : Number
+ * Compares two versions returning 1 when aVersionA is greater, 0 when they are equal and -1 when aVersionA is lower. Supports date, numeric and semantic versions. (available after ow.loadFormat())
+ *
+ */
+OpenWrap.format.prototype.compareVersion = function(aVersionA, aVersionB) {
+ var _n = v => {
+ v = String(v).trim()
+ if (/^[vV]\d/.test(v)) v = v.substring(1)
+ return v
+ }
+ var a = _n(aVersionA), b = _n(aVersionB)
+ if (a == b) return 0
+
+ var _isNum = v => /^\d+$/.test(v)
+ if (_isNum(a) && _isNum(b)) return Number(a) > Number(b) ? 1 : (Number(a) < Number(b) ? -1 : 0)
+
+ // pad pure numbers (mixed scheme) and short numeric dotted versions to semver X.Y.Z
+ var _pad = v => {
+ if (_isNum(v)) return v + ".0.0"
+ if (/^\d+\.\d+$/.test(v)) return v + ".0"
+ return v
+ }
+ try {
+ var sa = this.semver(_pad(a)), pb = _pad(b)
+ if (sa.equals(pb)) return 0
+ return sa.greater(pb) ? 1 : -1
+ } catch(e) {
+ // fallback: numeric compare of leading dotted segments, then plain string compare
+ var va = a.split("."), vb = b.split(".")
+ for(var i = 0; i < Math.max(va.length, vb.length); i++) {
+ var na = Number(va[i]), nb = Number(vb[i])
+ if (isNaN(na) || isNaN(nb)) break
+ if (na != nb) return na > nb ? 1 : -1
+ }
+ return a > b ? 1 : (a < b ? -1 : 0)
+ }
+}
+
+/**
+ *
+ * ow.format.checkVersionSpec(aVersion, aSpec) : Boolean
+ * Checks whether aVersion satisfies a comma-separated version specification using >=, <=, >, <, = or bare equality. (available after ow.loadFormat())
+ *
+ */
+OpenWrap.format.prototype.checkVersionSpec = function(aVersion, aSpec) {
+ var _v = String(aVersion).trim()
+ return String(aSpec).split(",").every(_s => {
+ _s = _s.trim()
+ var m = _s.match(/^(>=|<=|>|<|=)?\s*(.+)$/)
+ var c = this.compareVersion(_v, m[2])
+ switch(m[1]) {
+ case ">=": return c >= 0
+ case "<=": return c <= 0
+ case ">" : return c > 0
+ case "<" : return c < 0
+ default : return c == 0
+ }
+ })
+}
+
OpenWrap.format.prototype.syms = function() {
return {
check_mark : "\u2714",
@@ -2730,7 +2792,7 @@ OpenWrap.format.prototype.printDashboard = function(widgets, aOptions) {
var tl = title.length
var dashCount = Math.max(0, iW - 1 - tl)
- var top = tl > 0 ? bc(bchars.topLeft + (borderStyle != "simple" ? bchars.horizontal : " ")) + (borderStyle != "simple" ? " " : "") + ansiColor("BOLD", title.substring(0, iW - 2)) + " " + bc(repeat(Math.max(0, dashCount - 2), bchars.horizontal) + bchars.topRight)
+ var top = tl > 0 ? bc(bchars.topLeft + (borderStyle != "simple" ? bchars.horizontal : " ")) + (borderStyle != "simple" ? " " : "") + ansiColor("BOLD", title.substring(0, iW - 2)) + " " + bc(repeat(Math.max(0, dashCount - (borderStyle != "simple" ? 2 : 1)), bchars.horizontal) + bchars.topRight)
: bc(bchars.topLeft + repeat(iW, bchars.horizontal) + bchars.topRight)
var bot = bc(bchars.bottomLeft + repeat(iW, bchars.horizontal) + bchars.bottomRight)
lines = lines.map(function(l) { return bc(bchars.vertical) + l + bc(bchars.vertical) })
diff --git a/js/owrap.template.js b/js/owrap.template.js
index e3c4beed1..f4c36185f 100644
--- a/js/owrap.template.js
+++ b/js/owrap.template.js
@@ -827,6 +827,16 @@ OpenWrap.template.prototype.parseMD2HTML = function(aMarkdownString, isFull, rem
removeMaxWidth = _$(removeMaxWidth, "removeMaxWidth").isBoolean().default(__flags.MD_NOMAXWIDTH)
var mdString = aMarkdownString
var svgBlocks = []
+ var mathBlocks = []
+ var _escapeHTMLText = aText => String(aText)
+ .replace(/&/g, "&")
+ .replace(//g, ">")
+ mdString = String(mdString).replace(/(^|\n)([ \t]*)\$\$([\s\S]*?)\$\$(?=\s*(?:\n|$))/g, (m, prefix, indent, math) => {
+ var token = "OAFMDMATHBLOCK" + mathBlocks.length + "PLACEHOLDER"
+ mathBlocks.push("$$" + math + "$$")
+ return prefix + indent + token
+ })
if (__flags.MD_RENDER_SVG) {
mdString = String(mdString).replace(/(^|\n)```svg[ \t]*\r?\n([\s\S]*?)\r?\n```(?=\n|$)/g, (m, prefix, svg) => {
var token = "OAFMDSVGBLOCK" + svgBlocks.length + "PLACEHOLDER"
@@ -1166,6 +1176,13 @@ OpenWrap.template.prototype.parseMD2HTML = function(aMarkdownString, isFull, rem
_posextras = _posextras.map(_normalizeExtra)
var html = converter.makeHtml(mdString).replace("", "OAFMDMATHBLOCK" + idx + "PLACEHOLDER
", () => "" + mathHTML + "
")
+ html = html.replace("OAFMDMATHBLOCK" + idx + "PLACEHOLDER", () => mathHTML)
+ })
+ }
if (__flags.MD_RENDER_SVG && svgBlocks.length > 0) {
svgBlocks.forEach((svg, idx) => {
html = html.replace("OAFMDSVGBLOCK" + idx + "PLACEHOLDER
", svg)
@@ -1185,6 +1202,13 @@ OpenWrap.template.prototype.parseMD2HTML = function(aMarkdownString, isFull, rem
})
} else {
var html = converter.makeHtml(mdString).replace("", "OAFMDMATHBLOCK" + idx + "PLACEHOLDER
", () => "" + mathHTML + "
")
+ html = html.replace("OAFMDMATHBLOCK" + idx + "PLACEHOLDER", () => mathHTML)
+ })
+ }
if (__flags.MD_RENDER_SVG && svgBlocks.length > 0) {
svgBlocks.forEach((svg, idx) => {
html = html.replace("OAFMDSVGBLOCK" + idx + "PLACEHOLDER
", svg)
diff --git a/js/zshcompletion.js b/js/zshcompletion.js
index 4166337dc..75109e557 100644
--- a/js/zshcompletion.js
+++ b/js/zshcompletion.js
@@ -5,13 +5,13 @@ __conStatus = false
function _r(_e) {
switch(_e) {
case "oaf" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "oaf").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "oaf").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_oaf.sh")
io.writeFileString(homeDir + "/.openaf_completion_oaf.sh", shell2)
print(shell1)
break
case "ojob" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "ojob").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "ojob").replace(/{{home}}/g, homeDir)
var _url = "https://ojob.io/oaf/openaf_completion_ojob_zsh_" + getDistribution() + ".sh"
if (toBoolean(getEnv("OAF_COMPLETION_OJOB_BUILD")) || isDef($rest().head(_url).error) ) {
@@ -32,13 +32,13 @@ function _r(_e) {
print(shell1)
break
case "oafp" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "oafp").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "oafp").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_oafp.sh")
io.writeFileString(homeDir + "/.openaf_completion_oafp.sh", shell2)
print(shell1)
break
case "opack" :
- var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh {{home}}/.openaf_completion_{{tool}}.sh").replace(/{{tool}}/g, "opack").replace(/{{home}}/g, homeDir)
+ var shell1 = io.readFileString(getOpenAFJar() + "::complete/completion_zsh.hbs").replace(/{{request}}/g, "sh \"{{home}}/.openaf_completion_{{tool}}.sh\"").replace(/{{tool}}/g, "opack").replace(/{{home}}/g, homeDir)
var shell2 = io.readFileString(getOpenAFJar() + "::complete/completion_opack.sh")
io.writeFileString(homeDir + "/.openaf_completion_opack.sh", shell2)
print(shell1)
diff --git a/lib/commons-logging-1.3.6.jar b/lib/commons-logging-1.4.0.jar
similarity index 69%
rename from lib/commons-logging-1.3.6.jar
rename to lib/commons-logging-1.4.0.jar
index 399a2fc2f..180641a99 100644
Binary files a/lib/commons-logging-1.3.6.jar and b/lib/commons-logging-1.4.0.jar differ
diff --git a/lib/jackson-core-2.22.0.jar b/lib/jackson-core-2.22.1.jar
similarity index 76%
rename from lib/jackson-core-2.22.0.jar
rename to lib/jackson-core-2.22.1.jar
index b13f19e96..c8609f57e 100644
Binary files a/lib/jackson-core-2.22.0.jar and b/lib/jackson-core-2.22.1.jar differ
diff --git a/lib/jackson-databind-2.22.0.jar b/lib/jackson-databind-2.22.1.jar
similarity index 89%
rename from lib/jackson-databind-2.22.0.jar
rename to lib/jackson-databind-2.22.1.jar
index a078f00b2..c37200129 100644
Binary files a/lib/jackson-databind-2.22.0.jar and b/lib/jackson-databind-2.22.1.jar differ
diff --git a/lib/jackson-dataformat-toml-2.22.0.jar b/lib/jackson-dataformat-toml-2.22.1.jar
similarity index 87%
rename from lib/jackson-dataformat-toml-2.22.0.jar
rename to lib/jackson-dataformat-toml-2.22.1.jar
index 56d07f0b4..fc71ad543 100644
Binary files a/lib/jackson-dataformat-toml-2.22.0.jar and b/lib/jackson-dataformat-toml-2.22.1.jar differ
diff --git a/lib/java-util-4.108.0.jar b/lib/java-util-4.108.0.jar
new file mode 100644
index 000000000..26b2e07f4
Binary files /dev/null and b/lib/java-util-4.108.0.jar differ
diff --git a/lib/jetty-client-12.1.9.jar b/lib/jetty-client-12.1.11.jar
similarity index 73%
rename from lib/jetty-client-12.1.9.jar
rename to lib/jetty-client-12.1.11.jar
index d85efeb9f..bae97432d 100644
Binary files a/lib/jetty-client-12.1.9.jar and b/lib/jetty-client-12.1.11.jar differ
diff --git a/lib/jetty-compression-common-12.1.9.jar b/lib/jetty-compression-common-12.1.11.jar
similarity index 65%
rename from lib/jetty-compression-common-12.1.9.jar
rename to lib/jetty-compression-common-12.1.11.jar
index 810bb6050..fc7602f5c 100644
Binary files a/lib/jetty-compression-common-12.1.9.jar and b/lib/jetty-compression-common-12.1.11.jar differ
diff --git a/lib/jetty-http-12.1.9.jar b/lib/jetty-http-12.1.11.jar
similarity index 84%
rename from lib/jetty-http-12.1.9.jar
rename to lib/jetty-http-12.1.11.jar
index 48b42484b..a285f5414 100644
Binary files a/lib/jetty-http-12.1.9.jar and b/lib/jetty-http-12.1.11.jar differ
diff --git a/lib/jetty-io-12.1.9.jar b/lib/jetty-io-12.1.11.jar
similarity index 85%
rename from lib/jetty-io-12.1.9.jar
rename to lib/jetty-io-12.1.11.jar
index d1dfb7f98..be0f04ae9 100644
Binary files a/lib/jetty-io-12.1.9.jar and b/lib/jetty-io-12.1.11.jar differ
diff --git a/lib/jetty-util-12.1.9.jar b/lib/jetty-util-12.1.11.jar
similarity index 81%
rename from lib/jetty-util-12.1.9.jar
rename to lib/jetty-util-12.1.11.jar
index 4dee5daf0..a813b0038 100644
Binary files a/lib/jetty-util-12.1.9.jar and b/lib/jetty-util-12.1.11.jar differ
diff --git a/lib/jetty-websocket-core-client-12.1.9.jar b/lib/jetty-websocket-core-client-12.1.11.jar
similarity index 79%
rename from lib/jetty-websocket-core-client-12.1.9.jar
rename to lib/jetty-websocket-core-client-12.1.11.jar
index f861c9e34..a7fd13f30 100644
Binary files a/lib/jetty-websocket-core-client-12.1.9.jar and b/lib/jetty-websocket-core-client-12.1.11.jar differ
diff --git a/lib/jetty-websocket-core-common-12.1.9.jar b/lib/jetty-websocket-core-common-12.1.11.jar
similarity index 82%
rename from lib/jetty-websocket-core-common-12.1.9.jar
rename to lib/jetty-websocket-core-common-12.1.11.jar
index 5c8de7f18..0b4caab22 100644
Binary files a/lib/jetty-websocket-core-common-12.1.9.jar and b/lib/jetty-websocket-core-common-12.1.11.jar differ
diff --git a/lib/jetty-websocket-jetty-api-12.1.9.jar b/lib/jetty-websocket-jetty-api-12.1.11.jar
similarity index 68%
rename from lib/jetty-websocket-jetty-api-12.1.9.jar
rename to lib/jetty-websocket-jetty-api-12.1.11.jar
index d10a5dcfd..fb80d66bf 100644
Binary files a/lib/jetty-websocket-jetty-api-12.1.9.jar and b/lib/jetty-websocket-jetty-api-12.1.11.jar differ
diff --git a/lib/jetty-websocket-jetty-client-12.1.9.jar b/lib/jetty-websocket-jetty-client-12.1.11.jar
similarity index 79%
rename from lib/jetty-websocket-jetty-client-12.1.9.jar
rename to lib/jetty-websocket-jetty-client-12.1.11.jar
index efa00e19c..3939f9291 100644
Binary files a/lib/jetty-websocket-jetty-client-12.1.9.jar and b/lib/jetty-websocket-jetty-client-12.1.11.jar differ
diff --git a/lib/jetty-websocket-jetty-common-12.1.9.jar b/lib/jetty-websocket-jetty-common-12.1.11.jar
similarity index 81%
rename from lib/jetty-websocket-jetty-common-12.1.9.jar
rename to lib/jetty-websocket-jetty-common-12.1.11.jar
index 901ca4288..016e45359 100644
Binary files a/lib/jetty-websocket-jetty-common-12.1.9.jar and b/lib/jetty-websocket-jetty-common-12.1.11.jar differ
diff --git a/lib/jna-5.18.1.jar b/lib/jna-5.19.1.jar
similarity index 90%
rename from lib/jna-5.18.1.jar
rename to lib/jna-5.19.1.jar
index 7e644c743..575d007b9 100644
Binary files a/lib/jna-5.18.1.jar and b/lib/jna-5.19.1.jar differ
diff --git a/lib/jna-platform-5.19.0.jar b/lib/jna-platform-5.19.1.jar
similarity index 88%
rename from lib/jna-platform-5.19.0.jar
rename to lib/jna-platform-5.19.1.jar
index 42530f518..7df936d0e 100644
Binary files a/lib/jna-platform-5.19.0.jar and b/lib/jna-platform-5.19.1.jar differ
diff --git a/lib/jsch-2.28.2.jar b/lib/jsch-2.28.4.jar
similarity index 74%
rename from lib/jsch-2.28.2.jar
rename to lib/jsch-2.28.4.jar
index 8f94f5ca7..9ec10d96b 100644
Binary files a/lib/jsch-2.28.2.jar and b/lib/jsch-2.28.4.jar differ
diff --git a/lib/json-io-4.108.0.jar b/lib/json-io-4.108.0.jar
new file mode 100644
index 000000000..03bd61c34
Binary files /dev/null and b/lib/json-io-4.108.0.jar differ
diff --git a/lib/okhttp-5.3.2.jar b/lib/okhttp-5.3.2.jar
deleted file mode 100644
index a7ddbc9d0..000000000
Binary files a/lib/okhttp-5.3.2.jar and /dev/null differ
diff --git a/lib/okhttp-5.4.0.jar b/lib/okhttp-5.4.0.jar
new file mode 100644
index 000000000..7bfa95b65
Binary files /dev/null and b/lib/okhttp-5.4.0.jar differ
diff --git a/lib/okhttp-jvm-5.3.2.jar b/lib/okhttp-jvm-5.3.2.jar
deleted file mode 100644
index 521e4daae..000000000
Binary files a/lib/okhttp-jvm-5.3.2.jar and /dev/null differ
diff --git a/lib/okhttp-jvm-5.4.0.jar b/lib/okhttp-jvm-5.4.0.jar
new file mode 100644
index 000000000..0b21df0d0
Binary files /dev/null and b/lib/okhttp-jvm-5.4.0.jar differ
diff --git a/lib/okio-3.17.0.jar b/lib/okio-3.18.0.jar
similarity index 67%
rename from lib/okio-3.17.0.jar
rename to lib/okio-3.18.0.jar
index 746d61538..66b4bf0c4 100644
Binary files a/lib/okio-3.17.0.jar and b/lib/okio-3.18.0.jar differ
diff --git a/lib/okio-jvm-3.17.0.jar b/lib/okio-jvm-3.18.0.jar
similarity index 62%
rename from lib/okio-jvm-3.17.0.jar
rename to lib/okio-jvm-3.18.0.jar
index 455afa45a..3ee61fca3 100644
Binary files a/lib/okio-jvm-3.17.0.jar and b/lib/okio-jvm-3.18.0.jar differ
diff --git a/lib/postgresql-42.7.12.jar b/lib/postgresql-42.7.12.jar
deleted file mode 100644
index 892da46f3..000000000
Binary files a/lib/postgresql-42.7.12.jar and /dev/null differ
diff --git a/lib/postgresql-42.7.13.jar b/lib/postgresql-42.7.13.jar
new file mode 100644
index 000000000..6794385c1
Binary files /dev/null and b/lib/postgresql-42.7.13.jar differ
diff --git a/lib/snmp4j-agent-3.8.3.jar b/lib/snmp4j-agent-3.9.2.jar
similarity index 50%
rename from lib/snmp4j-agent-3.8.3.jar
rename to lib/snmp4j-agent-3.9.2.jar
index 5a11b04b7..69a791de2 100644
Binary files a/lib/snmp4j-agent-3.8.3.jar and b/lib/snmp4j-agent-3.9.2.jar differ
diff --git a/pom.json b/pom.json
index 9dd12cf65..ff335cd8b 100644
--- a/pom.json
+++ b/pom.json
@@ -1 +1 @@
-{"{\"artifactId\":\"rhino\"}":{"groupId":"org.mozilla","artifactId":"rhino","version":"1.8.1"},"{\"artifactId\":\"rhino-xml\"}":{"groupId":"org.mozilla","artifactId":"rhino-xml","version":"1.8.1"},"{\"artifactId\":\"rhino-engine\"}":{"groupId":"org.mozilla","artifactId":"rhino-engine","version":"1.8.1"},"{\"artifactId\":\"asciilist-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciilist-j7","version":"1.0.0"},"{\"artifactId\":\"asciitable-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciitable-j7","version":"1.0.1"},"{\"artifactId\":\"commons-cli\"}":{"groupId":"commons-cli","artifactId":"commons-cli","version":"1.11.0"},"{\"artifactId\":\"commons-codec\"}":{"groupId":"commons-codec","artifactId":"commons-codec","version":"1.22.0"},"{\"artifactId\":\"commons-collections4\"}":{"groupId":"org.apache.commons","artifactId":"commons-collections4","version":"4.5.0"},"{\"artifactId\":\"commons-compress\"}":{"groupId":"org.apache.commons","artifactId":"commons-compress","version":"1.28.0"},"{\"artifactId\":\"commons-csv\"}":{"groupId":"org.apache.commons","artifactId":"commons-csv","version":"1.14.1"},"{\"artifactId\":\"commons-email\"}":{"groupId":"org.apache.commons","artifactId":"commons-email","version":"1.6.0"},"{\"artifactId\":\"commons-io\"}":{"groupId":"commons-io","artifactId":"commons-io","version":"2.22.0"},"{\"artifactId\":\"commons-lang3\"}":{"groupId":"org.apache.commons","artifactId":"commons-lang3","version":"3.20.0"},"{\"artifactId\":\"commons-logging\"}":{"groupId":"commons-logging","artifactId":"commons-logging","version":"1.3.6"},"{\"artifactId\":\"commons-math3\"}":{"groupId":"org.apache.commons","artifactId":"commons-math3","version":"3.6.1"},"{\"artifactId\":\"commons-net\"}":{"groupId":"commons-net","artifactId":"commons-net","version":"3.13.0"},"{\"artifactId\":\"googleauth\"}":{"groupId":"com.warrenstrange","artifactId":"googleauth","version":"1.5.0"},"{\"artifactId\":\"gson\"}":{"groupId":"com.google.code.gson","artifactId":"gson","version":"2.14.0"},"{\"artifactId\":\"h2\"}":{"groupId":"com.h2database","artifactId":"h2","version":"2.4.240"},"{\"artifactId\":\"jackson-annotations\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-annotations","version":"2.21"},"{\"artifactId\":\"jackson-core\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-core","version":"2.22.0"},"{\"artifactId\":\"jackson-databind\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-databind","version":"2.22.0"},"{\"artifactId\":\"jansi\"}":{"groupId":"org.fusesource.jansi","artifactId":"jansi","version":"1.18"},"{\"artifactId\":\"jaxb-api\"}":{"groupId":"javax.xml.bind","artifactId":"jaxb-api","version":"2.3.1"},"{\"artifactId\":\"jbsdiff\"}":{"groupId":"io.sigpipe","artifactId":"jbsdiff","version":"1.0"},"{\"artifactId\":\"jetty-client\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-client","version":"12.1.9"},"{\"artifactId\":\"jetty-http\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-http","version":"12.1.9"},"{\"artifactId\":\"jetty-io\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-io","version":"12.1.9"},"{\"artifactId\":\"jetty-util\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-util","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-common","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-api\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-api","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-jetty-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-client","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-core-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-client","version":"12.1.9"},"{\"artifactId\":\"jetty-websocket-core-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-common","version":"12.1.9"},"{\"artifactId\":\"jline\"}":{"groupId":"jline","artifactId":"jline","version":"2.14.6"},"{\"artifactId\":\"jna-platform\"}":{"groupId":"net.java.dev.jna","artifactId":"jna-platform","version":"5.19.0"},"{\"artifactId\":\"jna\"}":{"groupId":"net.java.dev.jna","artifactId":"jna","version":"5.18.1"},"{\"artifactId\":\"postgresql\"}":{"groupId":"org.postgresql","artifactId":"postgresql","version":"42.7.12"},"{\"artifactId\":\"snmp4j\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j","version":"3.9.7"},"{\"artifactId\":\"snmp4j-agent\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j-agent","version":"3.8.3"},"{\"artifactId\":\"jjwt-impl\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-impl","version":"0.13.0"},"{\"artifactId\":\"jjwt-api\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-api","version":"0.13.0"},"{\"artifactId\":\"jjwt-gson\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-gson","version":"0.13.0"},"{\"artifactId\":\"okhttp\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp","version":"5.3.2"},"{\"artifactId\":\"okhttp-jvm\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp-jvm","version":"5.3.2"},"{\"artifactId\":\"kotlin-stdlib\"}":{"groupId":"org.jetbrains.kotlin","artifactId":"kotlin-stdlib","version":"2.4.0"},"{\"artifactId\":\"okio\"}":{"groupId":"com.squareup.okio","artifactId":"okio","version":"3.17.0"},"{\"artifactId\":\"okio-jvm\"}":{"groupId":"com.squareup.okio","artifactId":"okio-jvm","version":"3.17.0"},"{\"artifactId\":\"dnsjava\"}":{"groupId":"dnsjava","artifactId":"dnsjava","version":"3.6.5"},"{\"artifactId\":\"slf4j-api\"}":{"groupId":"org.slf4j","artifactId":"slf4j-api","version":"2.0.18"},"{\"artifactId\":\"slf4j-nop\"}":{"groupId":"org.slf4j","artifactId":"slf4j-nop","version":"2.0.18"},"{\"artifactId\":\"jsch\"}":{"groupId":"com.github.mwiede","artifactId":"jsch","version":"2.28.2"},"{\"artifactId\":\"sql-formatter\"}":{"groupId":"com.github.vertical-blank","artifactId":"sql-formatter","version":"2.0.5"},"{\"artifactId\":\"semver4j\"}":{"groupId":"org.semver4j","artifactId":"semver4j","version":"6.0.0"},"{\"artifactId\":\"ojdbc11\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc11","version":"23.9.0.25.07"},"{\"artifactId\":\"ojdbc17\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc17","version":"23.26.2.0.0"},"{\"artifactId\":\"jetty-compression-common\"}":{"groupId":"org.eclipse.jetty.compression","artifactId":"jetty-compression-common","version":"12.1.9"},"{\"artifactId\":\"jackson-dataformat-toml\"}":{"groupId":"com.fasterxml.jackson.dataformat","artifactId":"jackson-dataformat-toml","version":"2.22.0"},"{\"artifactId\":\"jakarta.mail\"}":{"groupId":"com.sun.mail","artifactId":"jakarta.mail","version":"1.6.8"}}
\ No newline at end of file
+{"{\"artifactId\":\"rhino\"}":{"groupId":"org.mozilla","artifactId":"rhino","version":"1.8.1"},"{\"artifactId\":\"rhino-xml\"}":{"groupId":"org.mozilla","artifactId":"rhino-xml","version":"1.8.1"},"{\"artifactId\":\"rhino-engine\"}":{"groupId":"org.mozilla","artifactId":"rhino-engine","version":"1.8.1"},"{\"artifactId\":\"asciilist-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciilist-j7","version":"1.0.0"},"{\"artifactId\":\"asciitable-j7\"}":{"groupId":"de.vandermeer","artifactId":"asciitable-j7","version":"1.0.1"},"{\"artifactId\":\"commons-cli\"}":{"groupId":"commons-cli","artifactId":"commons-cli","version":"1.11.0"},"{\"artifactId\":\"commons-codec\"}":{"groupId":"commons-codec","artifactId":"commons-codec","version":"1.22.0"},"{\"artifactId\":\"commons-collections4\"}":{"groupId":"org.apache.commons","artifactId":"commons-collections4","version":"4.5.0"},"{\"artifactId\":\"commons-compress\"}":{"groupId":"org.apache.commons","artifactId":"commons-compress","version":"1.28.0"},"{\"artifactId\":\"commons-csv\"}":{"groupId":"org.apache.commons","artifactId":"commons-csv","version":"1.14.1"},"{\"artifactId\":\"commons-email\"}":{"groupId":"org.apache.commons","artifactId":"commons-email","version":"1.6.0"},"{\"artifactId\":\"commons-io\"}":{"groupId":"commons-io","artifactId":"commons-io","version":"2.22.0"},"{\"artifactId\":\"commons-lang3\"}":{"groupId":"org.apache.commons","artifactId":"commons-lang3","version":"3.20.0"},"{\"artifactId\":\"commons-logging\"}":{"groupId":"commons-logging","artifactId":"commons-logging","version":"1.4.0"},"{\"artifactId\":\"commons-math3\"}":{"groupId":"org.apache.commons","artifactId":"commons-math3","version":"3.6.1"},"{\"artifactId\":\"commons-net\"}":{"groupId":"commons-net","artifactId":"commons-net","version":"3.13.0"},"{\"artifactId\":\"googleauth\"}":{"groupId":"com.warrenstrange","artifactId":"googleauth","version":"1.5.0"},"{\"artifactId\":\"gson\"}":{"groupId":"com.google.code.gson","artifactId":"gson","version":"2.14.0"},"{\"artifactId\":\"h2\"}":{"groupId":"com.h2database","artifactId":"h2","version":"2.4.240"},"{\"artifactId\":\"jackson-annotations\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-annotations","version":"2.21"},"{\"artifactId\":\"jackson-core\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-core","version":"2.22.1"},"{\"artifactId\":\"jackson-databind\"}":{"groupId":"com.fasterxml.jackson.core","artifactId":"jackson-databind","version":"2.22.1"},"{\"artifactId\":\"jackson-dataformat-toml\"}":{"groupId":"com.fasterxml.jackson.dataformat","artifactId":"jackson-dataformat-toml","version":"2.22.1"},"{\"artifactId\":\"jansi\"}":{"groupId":"org.fusesource.jansi","artifactId":"jansi","version":"1.18"},"{\"artifactId\":\"jaxb-api\"}":{"groupId":"javax.xml.bind","artifactId":"jaxb-api","version":"2.3.1"},"{\"artifactId\":\"jbsdiff\"}":{"groupId":"io.sigpipe","artifactId":"jbsdiff","version":"1.0"},"{\"artifactId\":\"jetty-client\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-client","version":"12.1.11"},"{\"artifactId\":\"jetty-http\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-http","version":"12.1.11"},"{\"artifactId\":\"jetty-io\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-io","version":"12.1.11"},"{\"artifactId\":\"jetty-util\"}":{"groupId":"org.eclipse.jetty","artifactId":"jetty-util","version":"12.1.11"},"{\"artifactId\":\"jetty-compression-common\"}":{"groupId":"org.eclipse.jetty.compression","artifactId":"jetty-compression-common","version":"12.1.11"},"{\"artifactId\":\"jetty-websocket-jetty-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-common","version":"12.1.11"},"{\"artifactId\":\"jetty-websocket-jetty-api\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-api","version":"12.1.11"},"{\"artifactId\":\"jetty-websocket-jetty-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-jetty-client","version":"12.1.11"},"{\"artifactId\":\"jetty-websocket-core-client\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-client","version":"12.1.11"},"{\"artifactId\":\"jetty-websocket-core-common\"}":{"groupId":"org.eclipse.jetty.websocket","artifactId":"jetty-websocket-core-common","version":"12.1.11"},"{\"artifactId\":\"jline\"}":{"groupId":"jline","artifactId":"jline","version":"2.14.6"},"{\"artifactId\":\"jna-platform\"}":{"groupId":"net.java.dev.jna","artifactId":"jna-platform","version":"5.19.1"},"{\"artifactId\":\"jna\"}":{"groupId":"net.java.dev.jna","artifactId":"jna","version":"5.19.1"},"{\"artifactId\":\"postgresql\"}":{"groupId":"org.postgresql","artifactId":"postgresql","version":"42.7.13"},"{\"artifactId\":\"snmp4j\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j","version":"3.9.7"},"{\"artifactId\":\"snmp4j-agent\"}":{"groupId":"org.snmp4j","artifactId":"snmp4j-agent","version":"3.9.2"},"{\"artifactId\":\"jjwt-impl\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-impl","version":"0.13.0"},"{\"artifactId\":\"jjwt-api\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-api","version":"0.13.0"},"{\"artifactId\":\"jjwt-gson\"}":{"groupId":"io.jsonwebtoken","artifactId":"jjwt-gson","version":"0.13.0"},"{\"artifactId\":\"okhttp\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp","version":"5.4.0"},"{\"artifactId\":\"okhttp-jvm\"}":{"groupId":"com.squareup.okhttp3","artifactId":"okhttp-jvm","version":"5.4.0"},"{\"artifactId\":\"kotlin-stdlib\"}":{"groupId":"org.jetbrains.kotlin","artifactId":"kotlin-stdlib","version":"2.4.0"},"{\"artifactId\":\"okio\"}":{"groupId":"com.squareup.okio","artifactId":"okio","version":"3.18.0"},"{\"artifactId\":\"okio-jvm\"}":{"groupId":"com.squareup.okio","artifactId":"okio-jvm","version":"3.18.0"},"{\"artifactId\":\"dnsjava\"}":{"groupId":"dnsjava","artifactId":"dnsjava","version":"3.6.5"},"{\"artifactId\":\"slf4j-api\"}":{"groupId":"org.slf4j","artifactId":"slf4j-api","version":"2.0.18"},"{\"artifactId\":\"slf4j-nop\"}":{"groupId":"org.slf4j","artifactId":"slf4j-nop","version":"2.0.18"},"{\"artifactId\":\"jsch\"}":{"groupId":"com.github.mwiede","artifactId":"jsch","version":"2.28.4"},"{\"artifactId\":\"sql-formatter\"}":{"groupId":"com.github.vertical-blank","artifactId":"sql-formatter","version":"2.0.5"},"{\"artifactId\":\"semver4j\"}":{"groupId":"org.semver4j","artifactId":"semver4j","version":"6.0.0"},"{\"artifactId\":\"ojdbc17\"}":{"groupId":"com.oracle.database.jdbc","artifactId":"ojdbc17","version":"23.26.2.0.0"},"{\"artifactId\":\"jakarta.mail\"}":{"groupId":"com.sun.mail","artifactId":"jakarta.mail","version":"1.6.8"},"{\"artifactId\":\"json-io\"}":{"groupId":"com.cedarsoftware","artifactId":"json-io","version":"4.108.0"},"{\"artifactId\":\"java-util\"}":{"groupId":"com.cedarsoftware","artifactId":"java-util","version":"4.108.0"}}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8ead1fe25..e06942374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
commons-logging
commons-logging
- 1.3.6
+ 1.4.0
org.apache.commons
@@ -192,6 +192,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
gson
2.14.0
+
+ com.cedarsoftware
+ json-io
+ 4.108.0
+
+
+ com.cedarsoftware
+ java-util
+ 4.108.0
+
com.h2database
h2
@@ -205,17 +215,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
com.fasterxml.jackson.core
jackson-core
- 2.22.0
+ 2.22.1
com.fasterxml.jackson.core
jackson-databind
- 2.22.0
+ 2.22.1
com.fasterxml.jackson.dataformat
jackson-dataformat-toml
- 2.22.0
+ 2.22.1
org.fusesource.jansi
@@ -235,52 +245,52 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
org.eclipse.jetty
jetty-client
- 12.1.9
+ 12.1.11
org.eclipse.jetty
jetty-http
- 12.1.9
+ 12.1.11
org.eclipse.jetty
jetty-io
- 12.1.9
+ 12.1.11
org.eclipse.jetty
jetty-util
- 12.1.9
+ 12.1.11
org.eclipse.jetty.compression
jetty-compression-common
- 12.1.9
+ 12.1.11
org.eclipse.jetty.websocket
jetty-websocket-jetty-common
- 12.1.9
+ 12.1.11
org.eclipse.jetty.websocket
jetty-websocket-jetty-api
- 12.1.9
+ 12.1.11
org.eclipse.jetty.websocket
jetty-websocket-jetty-client
- 12.1.9
+ 12.1.11
org.eclipse.jetty.websocket
jetty-websocket-core-client
- 12.1.9
+ 12.1.11
org.eclipse.jetty.websocket
jetty-websocket-core-common
- 12.1.9
+ 12.1.11
jline
@@ -290,17 +300,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
net.java.dev.jna
jna-platform
- 5.19.0
+ 5.19.1
net.java.dev.jna
jna
- 5.18.1
+ 5.19.1
org.postgresql
postgresql
- 42.7.12
+ 42.7.13
org.snmp4j
@@ -310,7 +320,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
org.snmp4j
snmp4j-agent
- 3.8.3
+ 3.9.2
io.jsonwebtoken
@@ -330,12 +340,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
com.squareup.okhttp3
okhttp
- 5.3.2
+ 5.4.0
com.squareup.okhttp3
okhttp-jvm
- 5.3.2
+ 5.4.0
org.jetbrains.kotlin
@@ -345,12 +355,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
com.squareup.okio
okio
- 3.17.0
+ 3.18.0
com.squareup.okio
okio-jvm
- 3.17.0
+ 3.18.0
dnsjava
@@ -370,7 +380,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
com.github.mwiede
jsch
- 2.28.2
+ 2.28.4
com.github.vertical-blank
diff --git a/src/openaf/AFBase.java b/src/openaf/AFBase.java
index a0f0eeff0..d3b01d826 100644
--- a/src/openaf/AFBase.java
+++ b/src/openaf/AFBase.java
@@ -71,6 +71,7 @@
import java.util.concurrent.atomic.AtomicReference;
+import com.cedarsoftware.io.JsonIo;
import com.google.gson.Gson;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
@@ -277,6 +278,73 @@ public static Object fromJavaMap(Object m) {
}
return res;
}
+
+ /**
+ *
+ * af.toTOONJava(aObj) : String
+ * Tries to convert aObj into a TOON string using the native Java TOON engine (json-io) instead
+ * of the bundled Javascript one. See __flags.ALTERNATIVES.toTOON.
+ *
+ */
+ @JSFunction
+ public static String toTOONJava(Object obj) {
+ Context cx = (Context) AFCmdBase.jse.enterContext();
+ try {
+ String json = (String) NativeJSON.stringify(cx, (Scriptable) AFCmdBase.jse.getGlobalscope(), obj, null, "");
+ Object value = JsonIo.toObjects(json, null, Object.class);
+ return JsonIo.toToon(value);
+ } finally {
+ AFCmdBase.jse.exitContext();
+ }
+ }
+
+ /**
+ *
+ * af.fromTOONJava(aTOONStr) : Object
+ * Tries to parse aTOONStr into a javascript object using the native Java TOON engine (json-io)
+ * instead of the bundled Javascript one. See __flags.ALTERNATIVES.fromTOON.
+ *
+ */
+ @JSFunction
+ public static Object fromTOONJava(String toon) {
+ Object decoded = JsonIo.fromToon(toon).asClass(Object.class);
+ Context cx = (Context) AFCmdBase.jse.enterContext();
+ try {
+ return javaTreeToNativeJS(decoded, cx, (Scriptable) AFCmdBase.jse.getGlobalscope());
+ } finally {
+ AFCmdBase.jse.exitContext();
+ }
+ }
+
+ /**
+ * Recursively converts a plain Java value tree (as produced by JsonIo.fromToon(...).asClass(Object.class):
+ * Map, List, String, Number, Boolean or null -- no other types) into genuine Rhino native JS values,
+ * bypassing the JSON-string + NativeJSON.parse round trip used by fromJavaMap for arbitrary Java
+ * objects. Safe here specifically because the input type surface is fully controlled by json-io's
+ * own TOON decoder.
+ */
+ private static Object javaTreeToNativeJS(Object value, Context cx, Scriptable scope) {
+ if (value == null) return null;
+
+ if (value instanceof Map) {
+ Scriptable obj = cx.newObject(scope);
+ for (Map.Entry entry : ((Map) value).entrySet()) {
+ obj.put(String.valueOf(entry.getKey()), obj, javaTreeToNativeJS(entry.getValue(), cx, scope));
+ }
+ return obj;
+ }
+
+ if (value instanceof List) {
+ List list = (List) value;
+ Object[] converted = new Object[list.size()];
+ for (int i = 0; i < converted.length; i++) converted[i] = javaTreeToNativeJS(list.get(i), cx, scope);
+ return cx.newArray(scope, converted);
+ }
+
+ if (value instanceof Number) return ((Number) value).doubleValue();
+
+ return value;
+ }
/**
*
diff --git a/src/openaf/AFCmdBase.java b/src/openaf/AFCmdBase.java
index f1d291afa..8746f8a09 100644
--- a/src/openaf/AFCmdBase.java
+++ b/src/openaf/AFCmdBase.java
@@ -15,7 +15,7 @@
*
*/
public class AFCmdBase {
- public static String VERSION = "20260124";
+ public static String VERSION = "20260722";
public static String DISTRIBUTION = "nightly";
public static String LICENSE = "See license info in openaf.jar/LICENSE and openaf.jar/LICENSES.txt";
diff --git a/tests/asserts.svg b/tests/asserts.svg
index 13547f557..c3c0647a0 100644
--- a/tests/asserts.svg
+++ b/tests/asserts.svg
@@ -1 +1 @@
-OpenAF tests asserts: 777 OpenAF tests asserts OpenAF tests asserts 777 777 OpenAF tests asserts: 883 OpenAF tests asserts OpenAF tests asserts 883 883 test 1 ", "Problem with ow.template.parseMD2HTML");
// TODO: Need to improve this test
@@ -17,6 +17,18 @@
ow.test.assert(out.match(/highlight\.js/).length, 1, "Problem with ow.template.parseMD2HTML full html");
};
+ exports.testMD2HTMLDisplayMathKeepsLineBreaks = function() {
+ var md = "Before\n\n$$\na \\\\\nb\n$$\n\nAfter";
+
+ ow.loadTemplate();
+ var out = ow.template.parseMD2HTML(md);
+ var math = out.match(/\$\$[\s\S]*?\$\$/);
+
+ ow.test.assert(isDef(math), true, "Problem with ow.template.parseMD2HTML display math block.");
+ ow.test.assert(//i.test(math[0]), false, "Problem with ow.template.parseMD2HTML inserted line break inside display math.");
+ ow.test.assert(math[0].indexOf("a \\\\\nb") >= 0, true, "Problem with ow.template.parseMD2HTML preserving display math newlines.");
+ };
+
exports.testMD2HTMLWithPrefix = function() {
var md = "# test 1"
var extraTag = ' PASS | 8 ms | n/a |
-|AI | Anthropic prompt caching headers | FAIL | 146 ms | TypeError: Cannot read property "requestHeaders" from undefined |
-|AI | GPT prompt argument routing | FAIL | 10 ms | Problem routing GPT rawPromptStream wrapper arguments. (got [ "hello", "gpt-test", 0.4, false, [ { "type": "function", "function": { "name": "echo" } } ], null ] but expected ["hello","gpt-test",0.4,false,[{"type":"function","function":{"name":"echo"}}],null]) |
-|AI | LSTM AND | PASS | 201 ms | n/a |
-|AI | LSTM network save and load | PASS | 143 ms | n/a |
-|AI | Liquid XOR | PASS | 363 ms | n/a |
-|AI | Liquid network save and load | PASS | 350 ms | n/a |
+|AI | Anthropic prompt caching body and stats | PASS | 7 ms | n/a |
+|AI | Anthropic prompt caching headers | PASS | 35 ms | n/a |
+|AI | GPT prompt argument routing | PASS | 8 ms | n/a |
+|AI | LSTM AND | PASS | 193 ms | n/a |
+|AI | LSTM network save and load | PASS | 156 ms | n/a |
+|AI | Liquid XOR | PASS | 356 ms | n/a |
+|AI | Liquid network save and load | PASS | 361 ms | n/a |
|AI | Normalize features array | PASS | 1 ms | n/a |
|AI | Normalize with schema | PASS | 6 ms | n/a |
-|AI | Ollama streaming tool execution and ids | FAIL | 17 ms | Problem preserving Ollama streaming tool result id. (got undefined but expected "call-3") |
-|AI | Ollama streaming warmup on fresh conversation | FAIL | 3 ms | Problem preserving Ollama streaming deltas after warmup. (got [] but expected ["part-1","part-2"]) |
-|AI | OpenAI export conversation falls back to tool name | PASS | 4 ms | n/a |
-|AI | OpenAI stats capture includes cached and reasoning | PASS | 6 ms | n/a |
-|AI | OpenAI streaming tool recursion without duplication | PASS | 18 ms | n/a |
-|AI | OpenAI tool recursion without duplication | PASS | 6 ms | n/a |
-|AI | OpenAI transport modes | PASS | 11 ms | n/a |
-|AI | Perceptron XOR | PASS | 394 ms | n/a |
-|AI | Perceptron XOR Put | PASS | 6 seconds, 717 ms | n/a |
-|AI | Perceptron XOR save and load | PASS | 44 ms | n/a |
-|AI | Perceptron network save and load | PASS | 41 ms | n/a |
-|AI | Test C45 | PASS | 25 ms | n/a |
-|AI | Test ID3 | PASS | 55 ms | n/a |
-|AI | Test KMeans | PASS | 13 ms | n/a |
+|AI | Ollama streaming tool execution and ids | PASS | 22 ms | n/a |
+|AI | Ollama streaming warmup on fresh conversation | PASS | 4 ms | n/a |
+|AI | OpenAI export conversation falls back to tool name | PASS | 5 ms | n/a |
+|AI | OpenAI jsonSchemaPrompt | PASS | 4 ms | n/a |
+|AI | OpenAI jsonSchemaPrompt schema defaults | PASS | 3 ms | n/a |
+|AI | OpenAI jsonSchemaPrompt unsupported provider | PASS | 4 ms | n/a |
+|AI | OpenAI jsonSchemaPromptWithStats | PASS | 12 ms | n/a |
+|AI | OpenAI rawResponse caches chat fallback | PASS | 4 ms | n/a |
+|AI | OpenAI rawResponse fallback to chat completions | PASS | 4 ms | n/a |
+|AI | OpenAI rawResponse keeps non availability errors | PASS | 3 ms | n/a |
+|AI | OpenAI rawResponse prefers responses | PASS | 5 ms | n/a |
+|AI | OpenAI stats capture includes cached and reasoning | PASS | 11 ms | n/a |
+|AI | OpenAI streaming tool recursion without duplication | PASS | 15 ms | n/a |
+|AI | OpenAI tool recursion without duplication | PASS | 5 ms | n/a |
+|AI | OpenAI transport modes | PASS | 21 ms | n/a |
+|AI | Perceptron XOR | PASS | 674 ms | n/a |
+|AI | Perceptron XOR Put | PASS | 6 seconds, 315 ms | n/a |
+|AI | Perceptron XOR save and load | PASS | 42 ms | n/a |
+|AI | Perceptron network save and load | PASS | 43 ms | n/a |
+|AI | Test C45 | PASS | 27 ms | n/a |
+|AI | Test ID3 | PASS | 51 ms | n/a |
+|AI | Test KMeans | PASS | 11 ms | n/a |
|CSV | Generic CSV | PASS | 2 ms | n/a |
-|CSV | Stream CSV | PASS | 14 ms | n/a |
-|CSV | ToFrom CSV | PASS | 17 ms | n/a |
+|CSV | Stream CSV | PASS | 16 ms | n/a |
+|CSV | ToFrom CSV | PASS | 8 ms | n/a |
|Channels | Keep history util | PASS | 4 seconds, 6 ms | n/a |
-|Channels | Remote channel access auditing | PASS | 191 ms | n/a |
-|Channels | Subscribers test | PASS | 594 ms | n/a |
+|Channels | Remote channel access auditing | PASS | 183 ms | n/a |
+|Channels | Subscribers test | PASS | 592 ms | n/a |
|Channels | Test Elastic Index | PASS | 1 ms | n/a |
-|Channels | Test MVS Utils | PASS | 62 ms | n/a |
-|Channels | Test channel (all) | PASS | 19 ms | n/a |
+|Channels | Test MVS Utils | PASS | 51 ms | n/a |
+|Channels | Test channel (all) | PASS | 17 ms | n/a |
+|Channels | Test channel (big) | PASS | 1 ms | n/a |
+|Channels | Test channel (big) | PASS | 12 ms | n/a |
+|Channels | Test channel (big) | PASS | 157 ms | n/a |
|Channels | Test channel (big) | PASS | 1 ms | n/a |
-|Channels | Test channel (big) | PASS | 15 ms | n/a |
-|Channels | Test channel (big) | PASS | 190 ms | n/a |
-|Channels | Test channel (big) | PASS | ~0 ms | n/a |
|Channels | Test channel (big) | PASS | 32 seconds, 5 ms | n/a |
-|Channels | Test channel (cache) | PASS | ~0 ms | n/a |
-|Channels | Test channel (cache) | PASS | ~0 ms | n/a |
-|Channels | Test channel (cache) | PASS | 32 seconds, 4 ms | n/a |
-|Channels | Test channel (file) | PASS | 4 ms | n/a |
-|Channels | Test channel (file) | PASS | 12 ms | n/a |
-|Channels | Test channel (file) | PASS | 174 ms | n/a |
-|Channels | Test channel (file) | PASS | ~0 ms | n/a |
+|Channels | Test channel (cache) | PASS | 1 ms | n/a |
+|Channels | Test channel (cache) | PASS | 1 ms | n/a |
+|Channels | Test channel (cache) | PASS | 32 seconds, 5 ms | n/a |
+|Channels | Test channel (file) | PASS | 170 ms | n/a |
+|Channels | Test channel (file) | PASS | 690 ms | n/a |
+|Channels | Test channel (file) | PASS | 124 ms | n/a |
+|Channels | Test channel (file) | PASS | 1 ms | n/a |
|Channels | Test channel (file) | PASS | 32 seconds, 5 ms | n/a |
-|Channels | Test channel (mvs) | PASS | 1 ms | n/a |
+|Channels | Test channel (mvs) | PASS | 2 ms | n/a |
|Channels | Test channel (mvs) | PASS | 8 ms | n/a |
-|Channels | Test channel (mvs) | PASS | 128 ms | n/a |
+|Channels | Test channel (mvs) | PASS | 88 ms | n/a |
|Channels | Test channel (mvs) | PASS | ~0 ms | n/a |
-|Channels | Test channel (mvs) | PASS | 32 seconds, 8 ms | n/a |
+|Channels | Test channel (mvs) | PASS | 32 seconds, 6 ms | n/a |
|Channels | Test channel (simple) | PASS | ~0 ms | n/a |
|Channels | Test channel (simple) | PASS | 4 ms | n/a |
-|Channels | Test channel (simple) | PASS | 102 ms | n/a |
+|Channels | Test channel (simple) | PASS | 82 ms | n/a |
|Channels | Test channel (simple) | PASS | ~0 ms | n/a |
-|Channels | Test channel (simple) | PASS | 32 seconds, 4 ms | n/a |
-|DB | DB type conversion to JS | PASS | 8 ms | n/a |
-|DB | Simple DB in memory | PASS | 153 ms | n/a |
-|Format | Add number separator | PASS | ~0 ms | n/a |
-|Format | Conversions | PASS | 5 ms | n/a |
-|Format | Cron | PASS | 3 ms | n/a |
-|Format | Cron How Many Ago | PASS | 28 ms | n/a |
-|Format | Date diff | PASS | 4 ms | n/a |
-|Format | Date to/from | PASS | 10 ms | n/a |
-|Format | Escape strings | PASS | 1 ms | n/a |
+|Channels | Test channel (simple) | PASS | 32 seconds, 6 ms | n/a |
+|DB | DB type conversion to JS | PASS | 9 ms | n/a |
+|DB | Simple DB in memory | PASS | 147 ms | n/a |
+|Format | Add number separator | PASS | 1 ms | n/a |
+|Format | Check version spec | PASS | 2 ms | n/a |
+|Format | Compare version | PASS | 9 ms | n/a |
+|Format | Conversions | PASS | 7 ms | n/a |
+|Format | Cron | PASS | 7 ms | n/a |
+|Format | Cron How Many Ago | PASS | 29 ms | n/a |
+|Format | Date diff | PASS | 6 ms | n/a |
+|Format | Date to/from | PASS | 2 ms | n/a |
+|Format | Escape strings | PASS | ~0 ms | n/a |
|Format | Escape/Unescape HTML4 | PASS | 8 ms | n/a |
-|Format | Grid | PASS | 79 ms | n/a |
+|Format | Grid | PASS | 167 ms | n/a |
|Format | Host | PASS | 2 ms | n/a |
|Format | LDAP date to/from | PASS | ~0 ms | n/a |
-|Format | LSH | PASS | 594 ms | n/a |
+|Format | LSH | PASS | 860 ms | n/a |
|Format | Load Format | PASS | ~0 ms | n/a |
-|Format | Markdown wrap | PASS | 23 ms | n/a |
+|Format | Markdown wrap | PASS | 18 ms | n/a |
|Format | Number abbreviation | PASS | 1 ms | n/a |
|Format | Number rounding | PASS | 1 ms | n/a |
-|Format | Print bullet value formats | PASS | 19 ms | n/a |
-|Format | Print dashboard | FAIL | 11 ms | Problem with printDashboard total width. (got 38 but expected 40) |
-|Format | Print histogram | PASS | 9 ms | n/a |
-|Format | Print sparkline | PASS | 8 ms | n/a |
+|Format | Print bullet value formats | PASS | 24 ms | n/a |
+|Format | Print dashboard | PASS | 156 ms | n/a |
+|Format | Print histogram | PASS | 8 ms | n/a |
+|Format | Print sparkline | PASS | 6 ms | n/a |
|Format | PrintTable emoji alignment | PASS | 18 ms | n/a |
-|Format | PrintTable header alignment | FAIL | 9 ms | Problem with printTable header second separator alignment. (got 13 but expected 15) |
-|Format | PrintTable subdivision flag alignment | FAIL | 13 ms | Problem with printTable subdivision flag alignment. (got 23 but expected 13) |
-|Format | SLON | PASS | 18 ms | n/a |
-|Format | String pad | PASS | ~0 ms | n/a |
+|Format | PrintTable header alignment | PASS | 9 ms | n/a |
+|Format | PrintTable subdivision flag alignment | PASS | 17 ms | n/a |
+|Format | SLON | PASS | 20 ms | n/a |
+|Format | String pad | PASS | 1 ms | n/a |
|Format | Terminal capabilities | PASS | 3 ms | n/a |
|Format | Time ago | PASS | 2 ms | n/a |
|Format | TimeAbbreviation | PASS | 3 ms | n/a |
|Format | Unix date to/from | PASS | ~0 ms | n/a |
|Format | Viz benchmark | PASS | 2 ms | n/a |
-|Format | Viz create canvas | PASS | 2 ms | n/a |
+|Format | Viz create canvas | PASS | 3 ms | n/a |
|Format | Viz frame diff | PASS | 2 ms | n/a |
|Format | Viz layout | PASS | 3 ms | n/a |
|Format | Word wrap | PASS | 13 ms | n/a |
-|HTTP | HTTP changing user agent | PASS | 446 ms | n/a |
-|HTTP | HTTP plugin basic functionality | PASS | 55 ms | n/a |
-|HTTP | HTTP plugin test basic auth | PASS | 725 ms | n/a |
-|HTTP | HTTP plugin web socket client | PASS | 2 seconds, 727 ms | n/a |
-|IO | IO Test Gzip Native to Byte array | PASS | 23 ms | n/a |
+|HTTP | HTTP changing user agent | PASS | 209 ms | n/a |
+|HTTP | HTTP plugin basic functionality | PASS | 56 ms | n/a |
+|HTTP | HTTP plugin test basic auth | PASS | 390 ms | n/a |
+|HTTP | HTTP plugin web socket client | PASS | 2 seconds, 576 ms | n/a |
+|IO | IO Test Gzip Native to Byte array | PASS | 24 ms | n/a |
|IO | IO Test JSON | PASS | 2 ms | n/a |
-|IO | IO Test Stream JSON | PASS | 23 ms | n/a |
-|IO | IO Test TAR functionality | PASS | 4 seconds, 477 ms | n/a |
-|IO | IO Test binary file detection | PASS | 9 ms | n/a |
-|IO | IO Test copy streams | PASS | 168 ms | n/a |
-|IO | IO Test copy/move/delete file | PASS | 18 ms | n/a |
-|IO | IO Test read/writeFileStream | PASS | 3 ms | n/a |
+|IO | IO Test Stream JSON | PASS | 30 ms | n/a |
+|IO | IO Test TAR functionality | PASS | 5 seconds, 10 ms | n/a |
+|IO | IO Test binary file detection | PASS | 11 ms | n/a |
+|IO | IO Test copy streams | PASS | 217 ms | n/a |
+|IO | IO Test copy/move/delete file | PASS | 5 ms | n/a |
+|IO | IO Test read/writeFileStream | PASS | 2 ms | n/a |
|IO | IO Test read/writeFileStream NIO | PASS | 5 ms | n/a |
|IO | IO Test read/writeFileStreamBytes | PASS | 2 ms | n/a |
|IO | IO Test read/writeFileStreamBytes NIO | PASS | 1 ms | n/a |
-|JMX | JMX test | PASS | 963 ms | n/a |
-|Java | Java ASym Cipher | PASS | 62 ms | n/a |
-|Java | Java Cipher | PASS | 128 ms | n/a |
-|MCP | OAuth authorization URL includes resource and PKCE | PASS | 45 ms | n/a |
-|MCP | OAuth authorization code token exchange includes resource and verifier | PASS | 72 ms | n/a |
-|MCP | OAuth discovery with client credentials | PASS | 163 ms | n/a |
-|MCP | oJob tplDesc renders all tool metadata strings | PASS | 326 ms | n/a |
-|Net | Get Actual Time (default) | PASS | 70 ms | n/a |
-|Net | Get Actual Time (server and timeout) | PASS | 24 ms | n/a |
-|Net | Get Actual Time (with server) | PASS | 45 ms | n/a |
-|Net | Get Actual Time (with timeout) | PASS | 45 ms | n/a |
+|JMX | JMX test | PASS | 806 ms | n/a |
+|Java | Java ASym Cipher | PASS | 162 ms | n/a |
+|Java | Java Cipher | PASS | 350 ms | n/a |
+|MCP | OAuth authorization URL includes resource and PKCE | PASS | 44 ms | n/a |
+|MCP | OAuth authorization code token exchange includes resource and verifier | PASS | 92 ms | n/a |
+|MCP | OAuth discovery with client credentials | PASS | 121 ms | n/a |
+|MCP | oJob tplDesc renders all tool metadata strings | PASS | 279 ms | n/a |
+|Net | Get Actual Time (default) | PASS | 80 ms | n/a |
+|Net | Get Actual Time (server and timeout) | PASS | 38 ms | n/a |
+|Net | Get Actual Time (with server) | PASS | 56 ms | n/a |
+|Net | Get Actual Time (with timeout) | PASS | 60 ms | n/a |
|Net | Load Net | PASS | ~0 ms | n/a |
|Obj | Array to object conversion | PASS | 2 ms | n/a |
-|Obj | DB ResultSet to object | FAIL | 1 second, 136 ms | JavaException: org.postgresql.util.PSQLException: FATAL: remaining connection slots are reserved for roles with the SUPERUSER attribute |
+|Obj | DB ResultSet to object | PASS | 1 second, 42 ms | n/a |
|Obj | Filter | PASS | 12 ms | n/a |
-|Obj | Flat map | PASS | 33 ms | n/a |
-|Obj | Flatten | PASS | 189 ms | n/a |
-|Obj | Generate One of | PASS | 41 ms | n/a |
+|Obj | Flat map | PASS | 15 ms | n/a |
+|Obj | Flatten | PASS | 176 ms | n/a |
+|Obj | Generate One of | PASS | 37 ms | n/a |
|Obj | Generate One of Fn | PASS | 14 ms | n/a |
|Obj | Get Path | PASS | 1 ms | n/a |
-|Obj | Object fuzzy search | PASS | 53 ms | n/a |
-|Obj | Object pool | PASS | 6 seconds, 76 ms | n/a |
-|Obj | Object schema validation | PASS | 292 ms | n/a |
-|Obj | Object to array conversion | PASS | 2 ms | n/a |
+|Obj | Object fuzzy search | PASS | 48 ms | n/a |
+|Obj | Object pool | PASS | 6 seconds, 78 ms | n/a |
+|Obj | Object schema validation | PASS | 275 ms | n/a |
+|Obj | Object to array conversion | PASS | 1 ms | n/a |
|Obj | Set Path | PASS | 1 ms | n/a |
-|Obj | Sign object | PASS | 324 ms | n/a |
+|Obj | Sign object | PASS | 330 ms | n/a |
|Obj | Thread-safe array | PASS | 3 ms | n/a |
-|Obj | Thread-safe array | PASS | 1 ms | n/a |
-|Obj | Thread-safe map | PASS | 1 ms | n/a |
-|OpenAF | Await | PASS | 54 ms | n/a |
-|OpenAF | AwaitAll | PASS | 54 ms | n/a |
-|OpenAF | Basic Parallel processing | FAIL | 9 ms | Something wrong with the parallel processing. |
-|OpenAF | Cache | PASS | 322 ms | n/a |
-|OpenAF | Crypt | PASS | 17 ms | n/a |
+|Obj | Thread-safe array | PASS | ~0 ms | n/a |
+|Obj | Thread-safe map | PASS | 2 ms | n/a |
+|OpenAF | Await | PASS | 55 ms | n/a |
+|OpenAF | AwaitAll | PASS | 55 ms | n/a |
+|OpenAF | Basic Parallel processing | PASS | 15 ms | n/a |
+|OpenAF | Cache | PASS | 329 ms | n/a |
+|OpenAF | Crypt | PASS | 19 ms | n/a |
|OpenAF | DescType | PASS | 2 ms | n/a |
|OpenAF | Encrypt/Decrypt | PASS | 1 ms | n/a |
|OpenAF | Get Path | PASS | 1 ms | n/a |
-|OpenAF | Get version | PASS | 1 ms | n/a |
-|OpenAF | IsFunctions | PASS | ~0 ms | n/a |
+|OpenAF | Get version | PASS | 2 ms | n/a |
+|OpenAF | IsFunctions | PASS | 1 ms | n/a |
|OpenAF | Java RegExp | PASS | 4 ms | n/a |
-|OpenAF | Logs | PASS | 3 ms | n/a |
+|OpenAF | Logs | PASS | 2 ms | n/a |
|OpenAF | Map Array | PASS | 2 ms | n/a |
-|OpenAF | Map22Array | PASS | 515 ms | n/a |
-|OpenAF | NDJSON | PASS | 2 ms | n/a |
-|OpenAF | PSelect | PASS | 10 ms | n/a |
-|OpenAF | Prints | PASS | 1 ms | n/a |
-|OpenAF | Queue | PASS | 12 ms | n/a |
+|OpenAF | Map22Array | PASS | 544 ms | n/a |
+|OpenAF | NDJSON | PASS | 3 ms | n/a |
+|OpenAF | PSelect | PASS | 12 ms | n/a |
+|OpenAF | Prints | PASS | 2 ms | n/a |
+|OpenAF | Queue | PASS | 16 ms | n/a |
|OpenAF | Range | PASS | 2 ms | n/a |
|OpenAF | Retry | PASS | 2 ms | n/a |
|OpenAF | SPrints | PASS | 1 ms | n/a |
-|OpenAF | Search Key and Values | PASS | 2 ms | n/a |
+|OpenAF | Search Key and Values | PASS | 3 ms | n/a |
|OpenAF | Set Path | PASS | 1 ms | n/a |
-|OpenAF | Test $do | PASS | 10 ms | n/a |
-|OpenAF | Test $doAll | PASS | 4 ms | n/a |
+|OpenAF | Test $do | PASS | 13 ms | n/a |
+|OpenAF | Test $doAll | PASS | 6 ms | n/a |
|OpenAF | Test $doFirst | PASS | 155 ms | n/a |
-|OpenAF | Test AF Parse | PASS | 1 ms | n/a |
-|OpenAF | Test BCrypt | PASS | 750 ms | n/a |
+|OpenAF | Test AF Parse | PASS | 2 ms | n/a |
+|OpenAF | Test BCrypt | PASS | 832 ms | n/a |
|OpenAF | Test Encoding | PASS | ~0 ms | n/a |
-|OpenAF | Test Envs | PASS | 1 ms | n/a |
-|OpenAF | Test FLock | PASS | 6 ms | n/a |
+|OpenAF | Test Envs | PASS | 10 ms | n/a |
+|OpenAF | Test FLock | PASS | 7 ms | n/a |
|OpenAF | Test Format Conversion to/from base64 | PASS | ~0 ms | n/a |
|OpenAF | Test Format Conversion to/from bytes | PASS | ~0 ms | n/a |
|OpenAF | Test GetSet | PASS | 3 ms | n/a |
|OpenAF | Test Lock | PASS | 1 ms | n/a |
|OpenAF | Test Merge | PASS | ~0 ms | n/a |
|OpenAF | Test Object Compression | PASS | 1 ms | n/a |
-|OpenAF | Test Path | PASS | 107 ms | n/a |
-|OpenAF | Test Rest | PASS | 226 ms | n/a |
-|OpenAF | Test SHA1 | PASS | 1 ms | n/a |
+|OpenAF | Test Path | PASS | 234 ms | n/a |
+|OpenAF | Test Rest | PASS | 359 ms | n/a |
+|OpenAF | Test SHA1 | PASS | ~0 ms | n/a |
|OpenAF | Test SHA256 | PASS | ~0 ms | n/a |
|OpenAF | Test SHA512 | PASS | ~0 ms | n/a |
-|OpenAF | Test Scope Ids | PASS | 1 ms | n/a |
-|OpenAF | Test Shell | PASS | 4 ms | n/a |
-|OpenAF | Test Shell with Map | PASS | 2 ms | n/a |
+|OpenAF | Test Scope Ids | PASS | 2 ms | n/a |
+|OpenAF | Test Shell | PASS | 3 ms | n/a |
+|OpenAF | Test Shell with Map | PASS | 3 ms | n/a |
|OpenAF | Test Stream conversions | PASS | 1 ms | n/a |
|OpenAF | Test Void shortcut | PASS | ~0 ms | n/a |
-|OpenAF | Test clone | PASS | ~0 ms | n/a |
-|OpenAF | Test pForEach | PASS | 151 ms | n/a |
-|OpenAF | Thread box | PASS | 306 ms | n/a |
+|OpenAF | Test clone | PASS | 1 ms | n/a |
+|OpenAF | Test pForEach | PASS | 165 ms | n/a |
+|OpenAF | Thread box | FAIL | 105 ms | JavaException: java.lang.InterruptedException: null |
|OpenAF | Two factor authentication | PASS | 2 ms | n/a |
-|OpenAF | XML2And4Obj | PASS | 247 ms | n/a |
-|OpenAF | YAML | PASS | 5 ms | n/a |
-|Sec | Sec basic functionality | PASS | 15 ms | n/a |
-|Sec | Sec function functionality | PASS | 330 ms | n/a |
-|Sec | Sec object functionality | PASS | 865 ms | n/a |
-|Server | Auth | PASS | 6 seconds, 21 ms | n/a |
-|Server | AuthApp | PASS | 164 ms | n/a |
-|Server | CheckIn | PASS | 3 ms | n/a |
-|Server | HTTP server | PASS | 116 ms | n/a |
-|Server | HTTP server Java | PASS | 24 ms | n/a |
+|OpenAF | XML2And4Obj | PASS | 204 ms | n/a |
+|OpenAF | YAML | PASS | 6 ms | n/a |
+|Sec | Sec basic functionality | PASS | 18 ms | n/a |
+|Sec | Sec function functionality | PASS | 360 ms | n/a |
+|Sec | Sec object functionality | PASS | 904 ms | n/a |
+|Server | Auth | PASS | 6 seconds, 16 ms | n/a |
+|Server | AuthApp | PASS | 187 ms | n/a |
+|Server | CheckIn | PASS | 2 ms | n/a |
+|Server | HTTP server | PASS | 115 ms | n/a |
+|Server | HTTP server Java | PASS | 21 ms | n/a |
|Server | HTTP server NWU2 | PASS | 80 ms | n/a |
-|Server | HTTP server prefix | FAIL | 22 ms | (nwu) Problem stripping HTTPD prefix before route handlers. (got { "responseCode": 200, "contentType": "text/plain", "response": "/normal" } but expected "/normal") |
-|Server | HTTP server prefix Java | FAIL | 8 ms | (java) Problem stripping HTTPD prefix before route handlers. (got { "responseCode": 200, "contentType": "text/plain", "response": "/normal" } but expected "/normal") |
-|Server | HTTP server prefix NWU2 | FAIL | 18 ms | (nwu2) Problem stripping HTTPD prefix before route handlers. (got { "responseCode": 200, "contentType": "text/plain", "response": "/normal" } but expected "/normal") |
+|Server | HTTP server prefix | PASS | 1 second, 264 ms | n/a |
+|Server | HTTP server prefix Java | PASS | 1 second, 218 ms | n/a |
+|Server | HTTP server prefix NWU2 | PASS | 1 second, 264 ms | n/a |
|Server | HTTP server prefix helpers | PASS | 1 ms | n/a |
-|Server | Locks | PASS | 2 seconds, 15 ms | n/a |
-|Server | Queue | PASS | 4 seconds, 893 ms | n/a |
-|Server | REST server | PASS | 66 ms | n/a |
-|Server | REST server Java | PASS | 202 ms | n/a |
-|Server | REST server NWU2 | PASS | 49 ms | n/a |
-|Server | REST server simple | PASS | 31 ms | n/a |
-|Server | REST server simple Java | PASS | 25 ms | n/a |
-|Server | REST server simple NWU2 | PASS | 30 ms | n/a |
-|Server | Scheduler | PASS | 16 seconds, 23 ms | n/a |
-|Template | Load Template | PASS | ~0 ms | n/a |
-|Template | Test Markdown to HTML | PASS | 614 ms | n/a |
-|Template | Test Markdown to HTML prefix | PASS | 163 ms | n/a |
-|Template | Test conditional helpers | PASS | 140 ms | n/a |
-|Template | Test format helpers | PASS | 30 ms | n/a |
-|Template | Test openaf helpers | PASS | 68 ms | n/a |
-|Template | Test partial helpers | PASS | 39 ms | n/a |
-|Template | Test simple template | PASS | 22 ms | n/a |
-|ZIP | ZIP basic functionality | PASS | 1 second, 531 ms | n/a |
-|ZIP | ZIP streaming functionality | PASS | 1 second, 577 ms | n/a |
-|oDoc | Test access to oDoc | PASS | 792 ms | n/a |
-|oJob | oJob | PASS | 1 second, 930 ms | n/a |
-|oJob | oJobArgsMultipleLevels | PASS | 2 seconds, 129 ms | n/a |
-|oJob | oJobChecks | PASS | 1 second, 873 ms | n/a |
-|oJob | oJobEncryptedJSON | PASS | 1 second, 834 ms | n/a |
-|oJob | oJobEncryptedYAML | PASS | 1 second, 896 ms | n/a |
-|oJob | oJobInitArray | PASS | 4 seconds, 557 ms | n/a |
-|oJob | oJobPass | PASS | 1 second, 907 ms | n/a |
-|oJob | oJobShortcutOutput | PASS | 1 second, 959 ms | n/a |
-|oJob | oJobShortcuts | PASS | 1 second, 805 ms | n/a |
+|Server | Locks | PASS | 1 second, 17 ms | n/a |
+|Server | Queue | PASS | 4 seconds, 523 ms | n/a |
+|Server | REST server | PASS | 70 ms | n/a |
+|Server | REST server Java | PASS | 153 ms | n/a |
+|Server | REST server NWU2 | PASS | 67 ms | n/a |
+|Server | REST server simple | PASS | 30 ms | n/a |
+|Server | REST server simple Java | PASS | 22 ms | n/a |
+|Server | REST server simple NWU2 | PASS | 34 ms | n/a |
+|Server | Scheduler | PASS | 16 seconds, 20 ms | n/a |
+|TOON | Default engine round-trip | PASS | 528 ms | n/a |
+|TOON | Engines agree on tabular data | PASS | 235 ms | n/a |
+|TOON | Flag defaults | FAIL | 2 ms | toTOON alternative flag should default to false (js engine) until proven in production (got true but expected false) |
+|TOON | Java engine round-trip | PASS | 3 ms | n/a |
+|TOON | Known empty array cross-engine limitation | PASS | 4 ms | n/a |
+|TOON | Large payload | PASS | 258 ms | n/a |
+|Template | Load Template | PASS | 1 ms | n/a |
+|Template | Test Markdown display math | PASS | 16 ms | n/a |
+|Template | Test Markdown to HTML | PASS | 702 ms | n/a |
+|Template | Test Markdown to HTML prefix | PASS | 136 ms | n/a |
+|Template | Test conditional helpers | PASS | 218 ms | n/a |
+|Template | Test format helpers | PASS | 43 ms | n/a |
+|Template | Test openaf helpers | PASS | 95 ms | n/a |
+|Template | Test partial helpers | PASS | 27 ms | n/a |
+|Template | Test simple template | PASS | 25 ms | n/a |
+|ZIP | ZIP basic functionality | PASS | 1 second, 847 ms | n/a |
+|ZIP | ZIP streaming functionality | PASS | 1 second, 691 ms | n/a |
+|oDoc | Test access to oDoc | PASS | 765 ms | n/a |
+|oJob | oJob | PASS | 1 second, 718 ms | n/a |
+|oJob | oJobArgsMultipleLevels | PASS | 1 second, 984 ms | n/a |
+|oJob | oJobChecks | PASS | 1 second, 700 ms | n/a |
+|oJob | oJobEncryptedJSON | PASS | 1 second, 561 ms | n/a |
+|oJob | oJobEncryptedYAML | PASS | 1 second, 642 ms | n/a |
+|oJob | oJobInitArray | PASS | 4 seconds, 94 ms | n/a |
+|oJob | oJobPass | PASS | 1 second, 766 ms | n/a |
+|oJob | oJobShortcutOutput | PASS | 1 second, 945 ms | n/a |
+|oJob | oJobShortcuts | PASS | 1 second, 757 ms | n/a |
diff --git a/tests/autoTestAll.results.json b/tests/autoTestAll.results.json
index cf3391926..918b9966f 100644
--- a/tests/autoTestAll.results.json
+++ b/tests/autoTestAll.results.json
@@ -1 +1 @@
-{"pass":158,"fail":1,"count":159}
\ No newline at end of file
+{"pass":247,"fail":0,"count":247,"asserts":887}
\ No newline at end of file
diff --git a/tests/autoTestAllResults.xml b/tests/autoTestAllResults.xml
index c47cb4c97..09b3df8e3 100644
--- a/tests/autoTestAllResults.xml
+++ b/tests/autoTestAllResults.xml
@@ -1 +1 @@
-Problem with await (2) (got 1 but expected 2) OpenAF tests: (FAIL: 12, PASS: 218, TOTAL: 230) OpenAF tests OpenAF tests (FAIL: 12, PASS: 218, TOTAL: 230) (FAIL: 12, PASS: 218, TOTAL: 230) OpenAF tests: (FAIL: 2, PASS: 245, TOTAL: 247) OpenAF tests OpenAF tests (FAIL: 2, PASS: 245, TOTAL: 247) (FAIL: 2, PASS: 245, TOTAL: 247)