junoser 0.5.6 → 0.6.0

data/lib/junoser/rule_tree/node.rb

@@ -0,0 +1,24 @@
+module Junoser
+  module RuleTree
+    class Node
+      INDENT = '    '
+      attr_reader :name, :children
+
+      def initialize(name)
+        @name = name
+        @children = []
+      end
+
+      def <<(child)
+        @children << child
+      end
+
+      def print(level = 0)
+        puts INDENT * level + "- #{@name}"
+        @children.each do |child|
+          child.print level + 1
+        end
+      end
+    end
+  end
+end

data/lib/junoser/rule_tree/parser.rb

@@ -0,0 +1,66 @@
+module Junoser
+  module RuleTree
+    class Parser
+      def initialize(content)
+        @content = content
+        @nodes = {}
+        @root = nil
+      end
+
+      def print
+        parse
+        @nodes['configuration'].print 0
+      end
+
+      def parse
+        rules = content.scan(/^rule\(:([a-z\d_]+)\) do\n(.*?)^end/m)
+        root_index = rules.index { |r| r[0] == 'configuration' }
+        primitives = rules.map(&:first)
+                          .then { |r| r[0, root_index] } + %w[any]
+
+        validate_uniq rules[root_index..].map(&:first)
+
+        @nodes = Hash[rules[root_index..].map { |name, _| [name, Node.new(name)] }]
+        used = Set.new
+
+        rules[root_index..].map do |name, refs|
+          children = refs.split.map { |i| i.strip.gsub(/,$/, '') }
+                         .reject { |i| primitives.include?(i) }
+                         .uniq
+          used += children
+          children.each do |child|
+            raise %(Unknown rule: #{child}) unless @nodes[child]
+            @nodes[name] << @nodes[child]
+          end
+        end
+
+        validate_used @nodes.keys, used.to_a
+      end
+
+      private
+
+      def content
+        @_content ||= @content
+                        .gsub(%r| */\*.*\*/|, '')
+                        .gsub(/\.as\(:oneline\)/, '')
+                        .gsub(/^(?!rule.*).*["#()].*\n/, '')
+                        .gsub(/ *arg,?\n/, '')
+      end
+
+      def validate_uniq(rules)
+        duplicates = rules.group_by(&:itself).select { |_, v| v.count > 1 }.keys
+        return if duplicates.empty?
+
+        raise %(Duplicated rules:\n  - #{duplicates.join("\n  - ")}) unless duplicates.empty?
+      end
+
+      def validate_used(all, used)
+        unused = all - used - %w[configuration]
+        return if unused.empty?
+
+        $stderr.puts 'Warning: Unused rules:'
+        unused.each { |r| $stderr.puts "  - #{r}" }
+      end
+    end
+  end
+end

data/lib/junoser/rule_tree.rb

@@ -0,0 +1,2 @@
+require 'junoser/rule_tree/node'
+require 'junoser/rule_tree/parser'

data/lib/junoser/ruler.rb

@@ -224,10 +224,8 @@ module Junoser
       str.gsub! '"*"', 'arg'
 
       # Fix .xsd: "from-zone" arg is also required
-      str.gsub!(/^(\s*)"policy" \(\s*s\(\s*arg,\s*"to-zone-name" arg,\s*c\(\s*"policy" \(\s*policy_type\s*\)\s*\)/) do
-        format(['b(s("from-zone", arg, "to-zone", arg),',
-                '    b("policy", policy_type',
-               ], $1)
+      str.gsub!(/^        "policy" \(\s*s\(\s*arg,\s*"to-zone-name" arg,\s*(.*?)\s*\)\s*^        \),/m) do
+        format(['b(', '  s("from-zone", arg, "to-zone", arg),', "      #$1", '),'], '        ')
       end
 
       # Fix .xsd: "members" accepts [ foo bar ]
@@ -271,6 +269,11 @@ module Junoser
       # Fix .xsd: support "set policy-options policy-statement xxx from policy [expression]"
       str.gsub!(/^rule\(:policy_algebra\) do(\s*)arg\.as\(:arg\)\send/) { "rule(:policy_algebra) do#{$1}any.as(:arg)\nend" }
 
+      # Fix .xsd: support "set interfaces xxx enable"
+      str.gsub!(/^(rule\(:interfaces_type\) do\s*[^\n]*\s*c\()(\s*)/m) do
+        %[#{$1}#{$2}"enable",#{$2}]
+      end
+
       str
     end
 
@@ -280,6 +283,8 @@ module Junoser
         str.empty? ? '' : offset + str
       when Array
         str.map { |s| s.empty? ? '' : offset + s.to_s }.join("\n")
+      else
+        ''
       end
     end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

data/sig/junoser/rule_tree/node.rbs

@@ -0,0 +1,17 @@
+module Junoser
+  module RuleTree
+    class Node
+      INDENT: String
+      @children: Array[Node]
+      @name: String
+
+      attr_reader children: Array[Node]
+      attr_reader name: String
+
+      def initialize: (String name) -> void
+
+      def <<: (Node child) -> void
+      def print: (Numeric level) -> void
+    end
+  end
+end

data/sig/junoser/rule_tree/parser.rbs

@@ -0,0 +1,21 @@
+module Junoser
+  module RuleTree
+    class Parser
+      @_content: String
+      @content: String
+      @path: String
+      @nodes: Hash[String, Node]
+      @root: Node?
+
+      def initialize: (String content) -> void
+
+      def parse: -> void
+
+      private
+
+      def content: -> String
+      def validate_uniq: (Array[String] rules)-> void
+      def validate_used: (Array[String], Array[String])-> untyped
+    end
+  end
+end

data/sig/junoser/ruler.rbs

@@ -4,17 +4,19 @@
 module Junoser
   class Ruler
     OFFSET: String
-    @rule: untyped
+    @rule: String
+
+    def initialize: (String input) -> void
 
-    def initialize: (untyped input) -> void
     def to_rule: -> String
-    def rule: -> untyped
+    def rule: -> String
 
     private
-    def remove_comments: (untyped str) -> untyped
-    def process_line: (untyped str) -> untyped
-    def process_reserved_element: (untyped str) -> untyped
-    def format: (Array[String?] | String str, ?String? offset) -> String?
+
+    def remove_comments: (String str) -> String
+    def process_line: (String str) -> String
+    def process_reserved_element: (String str) -> String
+    def format: (Array[String?] | String str, ?String? offset) -> String
     def rule_header: -> String
     def rule_footer: -> String
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -89,6 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test-linux.yaml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
@@ -115,6 +116,9 @@ files:
 - lib/junoser/input.rb
 - lib/junoser/js_ruler.rb
 - lib/junoser/parser.rb
+- lib/junoser/rule_tree.rb
+- lib/junoser/rule_tree/node.rb
+- lib/junoser/rule_tree/parser.rb
 - lib/junoser/ruler.rb
 - lib/junoser/squash.rb
 - lib/junoser/transformer.rb
@@ -131,6 +135,8 @@ files:
 - lib/junoser/xsd/simple_type.rb
 - lib/junoser/xsd/union.rb
 - lib/underscorable.rb
+- sig/junoser/rule_tree/node.rbs
+- sig/junoser/rule_tree/parser.rbs
 - sig/junoser/ruler.rbs
 homepage: https://github.com/codeout/junoser
 licenses: []
@@ -150,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: PEG parser for JUNOS configuration.