javascript: Provide evaluate-javascript-expression as the interface.

Rename evaluate-parameter-reference to evaluate-javascript-expression.
Adjust invocations and tests.

Javascript expressions are more general than parameter references.
Hence, it makes sense that the public interface is named after them.

1 files changed, 37 insertions, 37 deletions

diff --git a/tests/javascript.scm b/tests/javascript.scm
index b249877..a84f949 100644
--- a/tests/javascript.scm
+++ b/tests/javascript.scm
@@ -37,65 +37,65 @@
 
 (test-equal "evaluate parameter reference"
   "c"
-  (evaluate-parameter-reference "$(inputs.message['bar'][\"foo\"][2])"
-                                '(("inputs" ("message" ("bar" ("foo" . #("a" "b" "c" "d"))))))))
+  (evaluate-javascript-expression "$(inputs.message['bar'][\"foo\"][2])"
+                                  '(("inputs" ("message" ("bar" ("foo" . #("a" "b" "c" "d"))))))))
 
 (test-equal "evaluate parameter reference to JSON object"
   '(("class" . "File")
     ("path" . "/foo/bar"))
-  (evaluate-parameter-reference "$(inputs.fasta)"
-                                '(("inputs" ("fasta"
-                                             ("class" . "File")
-                                             ("path" . "/foo/bar"))))))
+  (evaluate-javascript-expression "$(inputs.fasta)"
+                                  '(("inputs" ("fasta"
+                                               ("class" . "File")
+                                               ("path" . "/foo/bar"))))))
 
 (test-equal "evaluate parameter reference with string interpolation"
   "24foo12foobar"
-  (evaluate-parameter-reference "$(runtime.cores)foo$(inputs.threads)$(inputs.output_filename)"
-                                '(("inputs"
-                                   ("threads" . 12)
-                                   ("output_filename" . "foobar"))
-                                  ("runtime" ("cores" . 24)))))
+  (evaluate-javascript-expression "$(runtime.cores)foo$(inputs.threads)$(inputs.output_filename)"
+                                  '(("inputs"
+                                     ("threads" . 12)
+                                     ("output_filename" . "foobar"))
+                                    ("runtime" ("cores" . 24)))))
 
 (test-equal "evaluate parameter reference with string interpolation of JSON trees"
   "foo[0,1,2,3]{\"bar\":2,\"foo\":1}"
-  (evaluate-parameter-reference "foo$(inputs.vector)$(inputs.object)"
-                                '(("inputs"
-                                   ("object"
-                                    ("foo" . 1)
-                                    ("bar" . 2))
-                                   ("vector" . #(0 1 2 3))))))
+  (evaluate-javascript-expression "foo$(inputs.vector)$(inputs.object)"
+                                  '(("inputs"
+                                     ("object"
+                                      ("foo" . 1)
+                                      ("bar" . 2))
+                                     ("vector" . #(0 1 2 3))))))
 
 (test-equal "evaluate parameter reference with node"
   3
-  (evaluate-parameter-reference "$(inputs.n + 1)"
-                                '(("inputs" ("n" . 2)))))
+  (evaluate-javascript-expression "$(inputs.n + 1)"
+                                  '(("inputs" ("n" . 2)))))
 
 (test-equal "evaluate parameter reference to JSON object using node"
   '(json-ref inputs "fasta")
   (gexp->sexp-rec
-   (evaluate-parameter-reference "$(inputs.fasta)")))
+   (evaluate-javascript-expression "$(inputs.fasta)")))
 
 (test-equal "evaluate parameter reference with string interpolation using node"
   "24foo24foobar"
-  (evaluate-parameter-reference "$(runtime.cores)foo$(inputs.threads*2)$(inputs.output_filename)"
-                                '(("inputs"
-                                   ("threads" . 12)
-                                   ("output_filename" . "foobar"))
-                                  ("runtime" ("cores" . 24)))))
+  (evaluate-javascript-expression "$(runtime.cores)foo$(inputs.threads*2)$(inputs.output_filename)"
+                                  '(("inputs"
+                                     ("threads" . 12)
+                                     ("output_filename" . "foobar"))
+                                    ("runtime" ("cores" . 24)))))
 
 (test-equal "evaluate parameter reference with string interpolation of JSON trees using node"
   "foo[0,1,2,3]{\"bar\":2,\"foo\":1}20"
-  (evaluate-parameter-reference "foo$(inputs.vector)$(inputs.object)$(inputs.object.foo*20)"
-                                '(("inputs"
-                                   ("object"
-                                    ("foo" . 1)
-                                    ("bar" . 2))
-                                   ("vector" . #(0 1 2 3))))))
+  (evaluate-javascript-expression "foo$(inputs.vector)$(inputs.object)$(inputs.object.foo*20)"
+                                  '(("inputs"
+                                     ("object"
+                                      ("foo" . 1)
+                                      ("bar" . 2))
+                                     ("vector" . #(0 1 2 3))))))
 
 (test-equal "evaluate parameter reference (without context)"
   '(json-ref inputs "message" "bar" "foo" 2)
   (gexp->sexp-rec
-   (evaluate-parameter-reference "$(inputs.message['bar'][\"foo\"][2])")))
+   (evaluate-javascript-expression "$(inputs.message['bar'][\"foo\"][2])")))
 
 (test-equal "evaluate parameter reference with string interpolation (without context)"
   '(string-join
@@ -107,7 +107,7 @@
                (json-ref inputs "output_filename")))
     "")
   (gexp->sexp-rec
-   (evaluate-parameter-reference "$(runtime.cores)foo$(inputs.threads)$(inputs.output_filename)")))
+   (evaluate-javascript-expression "$(runtime.cores)foo$(inputs.threads)$(inputs.output_filename)")))
 
 (test-equal "evaluate parameter reference with string interpolation of JSON trees (without context)"
   '(string-join
@@ -116,7 +116,7 @@
          (list "foo" (json-ref inputs "vector") (json-ref inputs "object")))
     "")
   (gexp->sexp-rec
-   (evaluate-parameter-reference "foo$(inputs.vector)$(inputs.object)")))
+   (evaluate-javascript-expression "foo$(inputs.vector)$(inputs.object)")))
 
 (test-equal "evaluate parameter reference with node (without context)"
   '(evaluate-javascript (*approximate*)
@@ -126,7 +126,7 @@
                                        "var self = " (scm->json-string self) ";"
                                        "var runtime = " (scm->json-string runtime) ";"))
   (gexp->sexp-rec
-   (evaluate-parameter-reference "$(inputs.n + 1)")))
+   (evaluate-javascript-expression "$(inputs.n + 1)")))
 
 (test-equal "evaluate parameter reference with string interpolation using node (without context)"
   '(string-join
@@ -143,7 +143,7 @@
                (json-ref inputs "output_filename")))
     "")
   (gexp->sexp-rec
-   (evaluate-parameter-reference "$(runtime.cores)foo$(inputs.threads*2)$(inputs.output_filename)")))
+   (evaluate-javascript-expression "$(runtime.cores)foo$(inputs.threads*2)$(inputs.output_filename)")))
 
 (test-equal "evaluate parameter reference with string interpolation of JSON trees using node (without context)"
   '(string-join
@@ -160,6 +160,6 @@
                                                    "var runtime = " (scm->json-string runtime) ";"))))
     "")
   (gexp->sexp-rec
-   (evaluate-parameter-reference "foo$(inputs.vector)$(inputs.object)$(inputs.object.foo*20)")))
+   (evaluate-javascript-expression "foo$(inputs.vector)$(inputs.object)$(inputs.object.foo*20)")))
 
 (test-end "javascript")