Merge branch 'fix-js-ruler'

Author: codeout

lib/junoser/js_ruler.rb

@@ -29,17 +29,20 @@ def process_lines(str)
       # set groups
       str.gsub! /"groups" \(.*\s*s\(\s*any\s*\)\s*\)/, <<-EOS.strip
           "groups" arg (  /* Configuration groups */
-            "when" (  /* Specify additional conditions for groups */
-              c(
-                "chassis" arg  /* Chassis id */,
-                "member" arg  /* Member of virtual chassis */,
-                "model" arg  /* Model name */,
-                "node" arg  /* Node of cluster */,
-                "peers" arg  /* Hosts on which this group should be effective */,
-                "routing-engine" arg  /* Routing Engine */,
-                "time" (  /* Time at which group should be effective */
-                  "to" arg  /* End time([yyyy-mm-dd.]hh:mm) */,
-                  arg
+            c(
+              this.configuration({ groups: false }),
+              "when" (  /* Specify additional conditions for groups */
+                c(
+                  "chassis" arg  /* Chassis id */,
+                  "member" arg  /* Member of virtual chassis */,
+                  "model" arg  /* Model name */,
+                  "node" arg  /* Node of cluster */,
+                  "peers" arg  /* Hosts on which this group should be effective */,
+                  "routing-engine" arg  /* Routing Engine */,
+                  "time" (  /* Time at which group should be effective */
+                    "to" arg  /* End time([yyyy-mm-dd.]hh:mm) */,
+                    arg
+                  )
                 )
               )
             )
@@ -91,8 +94,8 @@ def remove_undefined_variables(str)
     end
 
     def process_common_syntax(str)
-      # rule(:foo) do  ->  foo(...args) {
-      str.gsub!(/^rule\(:(\S+)\) do/) { "#$1(...args) { return_next_line" }
+      # rule(:foo) do  ->  foo(opts) {
+      str.gsub!(/^rule\(:(\S+)\) do/) { "#$1(opts) { return_next_line" }
       # end  ->  }
       str.gsub!(/^(\s*)end$/) { "#$1}" }
 
@@ -167,12 +170,12 @@ def process_argument_syntax(str)
     end
 
     def process_structural_syntax(str)
-      # "foo" (  /* doc */  ->  "foo | doc": (...args) => {
+      # "foo" (  /* doc */  ->  "foo | doc": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" \(  /\* (.*) \*/|) { "#$1\"#$2 | #$3\": {" }
-      # "foo" (  ->  "foo": (...args) => {
+      # "foo" (  ->  "foo": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" \($|) { "#$1\"#$2\": {" }
 
-      # "foo" arg (  /* doc */  ->  "foo | doc": (...args) => {
+      # "foo" arg (  /* doc */  ->  "foo | doc": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" arg \(  /\* (.*) \*/|) { "#$1\"#$2 | #$3\": {" }
 
       str
@@ -286,6 +289,8 @@ def finalize(lines)
 
       # "arg"  ->  "arg_1"
       lines.gsub('"arg":') { %["arg_#{sequence}":] }
+
+      conditional_groups(lines)
     end
 
     # }  ->  )
@@ -349,6 +354,17 @@ def objectize_arg_of_s(lines)
       lines
     end
 
+    def conditional_groups(lines)
+      # "null_13264": this.configuration(false),
+      # ->
+      # (opts === undefined || opts?.configuration !== false) && { "null_13264": this.configuration(false) },
+      #
+      # ref: process_lines()
+      lines.gsub(/("groups\(arg\) \| .*":) {/) {
+        "#{$1} opts?.groups !== false && {"
+      }
+    end
+
     def rule_header
       <<~EOS
         /* eslint-disable semi */