feat: Add support for oaf input format and improvements on chart output

OpenAF · Jun 22, 2024 · ce4fca5 · ce4fca5
1 parent 8f9e162
commit ce4fca5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/docs/USAGE.md b/src/docs/USAGE.md
@@ -74,6 +74,7 @@ List of data input types that can be auto-detected (through the file extension o
 | md | A Markdown format |
 | mdtable | A Markdown table format |
 | ndjson | A NDJSON format |
+| oaf | Takes an OpenAF scripting code to execute and use the result as input |
 | oafp | Takes a JSON/SLON map input as parameters for calling a sub oafp process (arrays will call multiple oafp processes) |
 | openmetrics | An OpenMetrics/Prometheus compatible format |
 | raw | Passes the input directly to transforms and output |

diff --git a/src/include/inputFns.js b/src/include/inputFns.js
@@ -409,6 +409,12 @@ var _inputFns = new Map([
         _r = af.fromBytes2String(io.gunzip(af.fromBase64(_res, true)))
         _$o(_r, options)
     }],
+    ["oaf", (_res, options) => {
+        if (!isString(_res)) _exit(-1, "oaf is only supported with a string.")
+        _showTmpMsg()
+        var _r = af.eval(_res)
+        _$o(_r, options)
+    }],
     ["oafp", (_res, options) => {
         params.__inception = true
         var _r = _fromJSSLON(_res)

diff --git a/src/include/outputFns.js b/src/include/outputFns.js
@@ -282,12 +282,13 @@ var _outputFns = new Map([
     }],
     ["chart", (r, options) => {
         if (isUnDef(params.chart)) _exit(-1, "For out=chart you need to provide a chart=\"<units> [<path[:color][:legend]>...]\"")
-        if (isUnDef(splitBySepWithEnc)) _exit(-1, "Output=chart is not supported in this version of OpenAF")
+        if (isUnDef(splitBySepWithEnc)) _exit(-1, "output=chart is not supported in this version of OpenAF")
 
         let fmt = _chartPathParse(r, params.chart)
         if (fmt.length > 0) {
+            var _out = printChart("oafp " + fmt)
             if (toBoolean(params.chartcls)) cls()
-            _print(printChart("oafp " + fmt))
+            _print(_out)
         }
 
     }],