junoser 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad52f9bcc08bafe72ec4b432c96d85dce85d1db353c29053ebad6bbc7918690
-  data.tar.gz: 8a54ab81259886f5d52b59fa438dd00df6e60b1436221a810aa47c9120306fee
+  metadata.gz: 15ee47f89643f4f98a2382fd8be31c3a4758daf9ce84b0da6e1df20eaac1f90f
+  data.tar.gz: 1dbdef198298e901d75b43659427084dd6e6a3f701450d890fde32d51def2c65
 SHA512:
-  metadata.gz: b7b885fa0bfdb1668bea5613e65888488a42b88be667d0812052e0b72a2c68cc49772d4070f4bc24ef72c2b3c20ba69f2b563bd00f289341420bc33a2d27083e
-  data.tar.gz: 50994ee96cf22cb5079fe2ded3ca5b13e82de325d91c68abfb00899c2c27dbcbbb9e11052f0ebd114dfce0aea23c03b86eeb79f39f55354140407cad3d120868
+  metadata.gz: c8eff73a8e20c78062db8a30c8330d00ac919b7d16649139c92dbfee2e5c46d53638d697cafbcae8cfa9ba1a2bcac1be0aa5fa9a27cbd8cef1f7e6c51e2ada59
+  data.tar.gz: 59c3a183983e42497adb6534faf85582267adcbe5186739e802e43c8766c25cec32a34adf4647de4b05d87ad68352879bf170cd5b807d04054dff7f50285358e

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.8.0] - 2026-10-17
+
+### Added
+
+* Recreate parser based on MX 23.4R2-S7.4 xsd
+* Newly supported syntax
+  * "mld-snooping vlan all disable"
+  * "poe fpc xxx"
+  * "chassis alarm fru-absence ignore fpc xxx pem xxx"
+  * "ethernet-switching-options voip interface xxx"
+  * Positional arguments of a choice
+    * "protocols mpls label-switched-path xxx priority xxx xxx"
+    * "routing-options aggregate route xxx as-path aggregator xxx xxx"
+
+
 ## [0.7.6] - 2026-10-01
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.7.6)
+    junoser (0.8.0)
       parslet
 
 GEM

data/README.md

@@ -1,6 +1,7 @@
 # Junoser
 
-[![Test on Ubuntu](https://github.com/codeout/junoser/actions/workflows/test-linux.yaml/badge.svg)](https://github.com/codeout/junoser/actions/workflows/test-linux.yaml)
+[![Test](https://github.com/codeout/junoser/actions/workflows/test.yaml/badge.svg)](https://github.com/codeout/junoser/actions/workflows/test.yaml)
+[![Lint](https://github.com/codeout/junoser/actions/workflows/lint.yaml/badge.svg)](https://github.com/codeout/junoser/actions/workflows/lint.yaml)
 [![Inline docs](http://inch-ci.org/github/codeout/junoser.svg)](http://inch-ci.org/github/codeout/junoser)
 
 Junoser is a JUNOS configuration PEG parser which can be automatically generated from Juniper's netconf.xsd. (XML Schema Definition for NETCONF)

data/Rakefile

@@ -3,22 +3,19 @@
 require 'bundler/gem_tasks'
 require 'junoser/development'
 require 'nokogiri'
-require 'pathname'
 require 'rake/testtask'
 
-xsd_path = File.join(__dir__, 'tmp/junos-system-22.4.xsd')
+xsd_path = File.join(__dir__, 'tmp/junos-system-23.4.xsd')
 rule_path = File.join(__dir__, 'tmp/rule.rb')
 ruby_parser_path = File.join(__dir__, 'lib/junoser/parser.rb')
 js_parser_path = File.join(__dir__, 'tmp/junos.js')
 
 def open_files(input, output)
-  i = File.open(input)
-  o = File.open(output, 'w')
-
-  yield i, o
-
-  i.close
-  o.close
+  File.open(input) do |i|
+    File.open(output, 'w') do |o|
+      yield i, o
+    end
+  end
 end
 
 def move_wildcards(element)

data/exe/junoser

@@ -3,9 +3,8 @@
 
 require 'English'
 require 'optparse'
-require 'pathname'
 
-$LOAD_PATH << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+$LOAD_PATH << File.expand_path('../../lib', File.realpath(__FILE__))
 
 require 'junoser'
 

data/exe/junoser-squash

@@ -3,9 +3,8 @@
 
 require 'English'
 require 'optparse'
-require 'pathname'
 
-$LOAD_PATH << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+$LOAD_PATH << File.expand_path('../../lib', File.realpath(__FILE__))
 require 'junoser/squash'
 
 command = :squash

data/lib/junoser/js_ruler.rb

@@ -77,6 +77,7 @@ module Junoser
 
     def process_line(str)
       str = remove_undefined_variables(str)
+      str = process_placeholder_syntax(str)
       str = process_common_syntax(str)
       str = process_argument_syntax(str)
       str = process_structural_syntax(str)
@@ -90,6 +91,20 @@ module Junoser
 
       # "$junos-interface-unit" |
       str.gsub!(/"\$[\w-]+" \| /, '')
+      # | "$junos-pon-id-interface-set-name"  (this one trails the other members)
+      str.gsub!(/ \| "\$[\w-]+"/, '')
+
+      str
+    end
+
+    def process_placeholder_syntax(str)
+      # The .xsd puts a placeholder name where an argument belongs, so the parser would accept only that word.
+      # Ruler does the same.
+      str.gsub!(/\((.*) \| "name"\)/) { "(#{$1} | arg)" }
+      str.gsub!(/\("name" \| (.*?)\)/) { "(#{$1} | arg)" }
+      str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
+      str.gsub! '("all" | "fpc-slot-number")', '("all" | arg)'
+      str.gsub! '("all" | "psu-slot-number")', '("all" | arg)'
 
       str
     end
@@ -134,19 +149,27 @@ module Junoser
       # "foo" arg (  ->  "foo(arg)": {
       str.gsub!(/^(\s*)"(\S+)" arg \(/) { "#{$1}\"#{$2}(arg)\": {" }
 
-      # "foo" (... | arg)  /* doc */  ->  "foo": "arg"
-      str.gsub!(%r{^(\s*)"(\S+)" \(.* \| arg ?.*\)  /\* (.*) \*/(,?)$}) { "#{$1}\"#{$2} | #{$3}\": arg#{$4}" }
+      # "foo" ("bar" | arg)  /* doc */  ->  "foo | doc": ["bar", "arg"]
+      str.gsub!(%r{^(\s*)"(\S+)" \((.* \| arg ?.*)\)  /\* (.*) \*/(,?)$}) do
+        "#{$1}\"#{$2} | #{$4}\": #{array_members($3)}#{$5}"
+      end
 
-      # "foo" (... | arg) (  /* doc */  ->  "foo(arg)": {
-      str.gsub!(%r{^(\s*)"(\S+)" \(.* \| arg ?.*\) \(  /\* (.*) \*/$}) { "#{$1}\"#{$2}(arg) | #{$3}\": {" }
-      # "foo" (... | arg) (  ->  "foo(arg)": {
-      str.gsub!(/^(\s*)"(\S+)" \(.* \| arg ?.*\) \($/) { "#{$1}\"#{$2}(arg)\": {" }
+      # "foo" ("bar" | arg) (  /* doc */  ->  "foo(bar|arg) | doc": {
+      str.gsub!(%r{^(\s*)"(\S+)" \((.* \| arg ?.*)\) \(  /\* (.*) \*/$}) do
+        "#{$1}\"#{$2}(#{pipe_members($3)}) | #{$4}\": {"
+      end
+      # "foo" ("bar" | arg) (  ->  "foo(bar|arg)": {
+      str.gsub!(/^(\s*)"(\S+)" \((.* \| arg ?.*)\) \($/) { "#{$1}\"#{$2}(#{pipe_members($3)})\": {" }
 
-      # "foo" (arg | ...)  /* doc */  ->  "foo": "arg"
-      str.gsub!(%r{^(\s*)"(\S+)" \(arg ?.*\)  /\* (.*) \*/(,?)$}) { "#{$1}\"#{$2} | #{$3}\": arg#{$4}" }
+      # "foo" (arg | "bar")  /* doc */  ->  "foo | doc": ["arg", "bar"]
+      str.gsub!(%r{^(\s*)"(\S+)" \((arg ?.*)\)  /\* (.*) \*/(,?)$}) do
+        "#{$1}\"#{$2} | #{$4}\": #{array_members($3)}#{$5}"
+      end
 
-      # "foo" (arg | ...) (  /* doc */  ->  "foo(arg)": {
-      str.gsub!(%r{^(\s*)"(\S+)" \(arg ?.*\) \(  /\* (.*) \*/(,?)$}) { "#{$1}\"#{$2}(arg) | #{$3}\": {#{$4}" }
+      # "foo" (arg | "bar") (  /* doc */  ->  "foo(arg|bar) | doc": {
+      str.gsub!(%r{^(\s*)"(\S+)" \((arg ?.*)\) \(  /\* (.*) \*/(,?)$}) do
+        "#{$1}\"#{$2}(#{pipe_members($3)}) | #{$4}\": {#{$5}"
+      end
 
       # "foo" ("bar" | "baz") (  /* doc */  ->  "foo(bar|baz)": {
       str.gsub!(%r{^(\s*)"(\S+)" \("([^)]+)"\) \(  /\* (.*) \*/$}) do
@@ -182,9 +205,6 @@ module Junoser
       # "foo" (  ->  "foo": (opts) => {
       str.gsub!(/^(\s*)"(\S+)" \($/) { "#{$1}\"#{$2}\": {" }
 
-      # "foo" arg (  /* doc */  ->  "foo | doc": (opts) => {
-      str.gsub!(%r{^(\s*)"(\S+)" arg \(  /\* (.*) \*/}) { "#{$1}\"#{$2} | #{$3}\": {" }
-
       str
     end
 
@@ -208,8 +228,13 @@ module Junoser
       # enum(("bar" | "baz"))  ->  "foo": new Enumeration(["bar", "baz"])
       str.gsub!(/^(\s*)enum\(\((.*)\)\)/) { "#{$1}new Enumeration(#{$2.gsub('"', '').split(' | ')})" }
 
-      # (arg | "foo")  ->  ["arg", "foo"]
-      str.gsub!(/^(\s*) \(arg( \| "[^"]+")+\)/) { "#{$1}[\"arg\"#{$2.split(' | ').join(', ')}]" }
+      # (arg | "foo" | "bar")  ->  ["arg", "foo", "bar"]
+      # capture the tail as a whole, because a repeated group keeps only its last match
+      str.gsub!(/^(\s*) \(arg((?: \| "[^"]+")+)\)/) do
+        indent = $1
+        members = ['"arg"'] + $2.scan(/"[^"]+"/)
+        "#{indent}[#{members.uniq.join(', ')}]"
+      end
 
       str
     end
@@ -261,6 +286,21 @@ module Junoser
       str
     end
 
+    # Join the members of a choice with a pipe, for the parentheses of a key: "all" | arg -> all|arg.
+    # Keep the keywords next to arg, because vscode-junos offers every member as a completion candidate.
+    def pipe_members(choice)
+      choice.gsub('"', '').split(' | ').join('|')
+    end
+
+    # Put the members of a choice in an array, for a value. A lone arg stays a scalar, which is the shape
+    # loadString handles.
+    def array_members(choice)
+      list = choice.gsub('"', '').split(' | ')
+      return 'arg' if list == ['arg']
+
+      "[#{list.map { |member| %("#{member}") }.join(', ')}]"
+    end
+
     def finalize(lines)
       lines = balance_parenthesis(lines)
       objectize_arg_of_s(lines)
@@ -292,7 +332,7 @@ module Junoser
       lines.gsub!(/([{,]\n\s*)([^ "(]+)/m) { "#{$1}\"null_#{sequence}\": #{$2}" }
 
       # "arg"  ->  "arg_1"
-      lines.gsub('"arg":') { %("arg_#{sequence}":) }
+      lines.gsub!('"arg":') { %("arg_#{sequence}":) }
 
       conditional_groups(lines)
     end