kumi-parser 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2cb46dec6261ef8c66346abb17f188c36a21c97322415ac6315adc3347214c3
-  data.tar.gz: 4cad59a51d06aaca85b1343ac520cdf28e5a82255df891fbb0086d4b11e35d98
+  metadata.gz: 935f50c0ecadd127eddc6ddef78aa2cd2b4cc25c26ef33202260895719224527
+  data.tar.gz: ecebfbe0f95c5304d5a188eeaf8b6c22eff42357913064aa6f1ea380b4145f69
 SHA512:
-  metadata.gz: c0505e71430dd3593356318dc4262e3b79487d9eea3aceb7fd19fbd189d9c5c0593d937eebd9727206d6640d0d280eede4a8378058de11858e83f05467d46aaa
-  data.tar.gz: 904e451757c5beeaa13f0a27c53477dcd5729abd678e08713f150e7d03a9a7fb3e5b948f7a62d8deed1ef38905214bebfe99881758bb92a2d8faf68ece50364e
+  metadata.gz: 81fe15f8482f0a2e123c14136e10bf47d2b90f5957f8c90e6ca4a416e811deee838510d22d3eb266dc8ef64b13dc1f4d2769eeacb06e7f1cac2a82e79fe1aa3b
+  data.tar.gz: ad2e56299872ac29522b5d63eca7e2c67ad74c07b702bf8cb0aa3a4da870bc11781e8e7a9c1df0232a75712c9eec7d8b29ebfedf4b387094790d2dfa48e3ecbf

data/CLAUDE.md

@@ -25,7 +25,7 @@
 ## AST Structure & Compatibility
 
 All nodes from `Kumi::Syntax::*` (defined in main kumi gem):
-- `Root(inputs, attributes, traits)`
+- `Root(inputs, values, traits)`
 - `InputDeclaration(name, domain, type, children)`
 - `ValueDeclaration(name, expression)`
 - `TraitDeclaration(name, expression)`
@@ -50,7 +50,7 @@ ast = Kumi::Parser::TextParser.parse(schema)
 puts Kumi::Support::SExpressionPrinter.print(ast)
 # => (Root
 #      inputs: [(InputDeclaration :income :float)]
-#      attributes: [(ValueDeclaration :tax (CallExpression :+ ...))]
+#      values: [(ValueDeclaration :tax (CallExpression :+ ...))]
 #      traits: [(TraitDeclaration :adult (CallExpression :>= ...))])
 ```
 

data/examples/debug_text_parser.rb

@@ -33,7 +33,7 @@ begin
   puts
 
   puts 'AST structure:'
-  puts "- Values: #{ast.attributes.count} - #{ast.attributes.map(&:name)}"
+  puts "- Values: #{ast.values.count} - #{ast.values.map(&:name)}"
   puts "- Traits: #{ast.traits.count} - #{ast.traits.map(&:name)}"
 rescue StandardError => e
   puts "Error: #{e.message}"

data/examples/text_parser_comprehensive_test.rb

@@ -318,7 +318,7 @@ if __FILE__ == $0
       ast = Kumi::TextParser.parse(schema_text)
       puts "\nParsed successfully!"
       puts "- Input fields: #{ast.inputs.map(&:name).join(', ')}"
-      puts "- Values: #{ast.attributes.count}"
+      puts "- Values: #{ast.values.count}"
       puts "- Traits: #{ast.traits.count}"
     else
       puts '❌ Schema has errors:'

data/examples/text_parser_test_with_comments.rb

@@ -70,8 +70,8 @@ begin
       end
     end
 
-    puts "- Value declarations: #{ast.attributes.count}"
-    ast.attributes.each_with_index do |value, i|
+    puts "- Value declarations: #{ast.values.count}"
+    ast.values.each_with_index do |value, i|
       puts "  #{i + 1}. #{value.name}"
     end
 

data/kumi-parser.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Dependencies
-  spec.add_dependency 'kumi', '~> 0.0.7'
+  spec.add_dependency 'kumi', '~> 0.0.13'
   spec.add_dependency 'parslet', '~> 2.0'
   spec.add_dependency 'zeitwerk', '~> 2.6'
 

data/lib/kumi/parser/direct_parser.rb

@@ -75,7 +75,7 @@ module Kumi
         # Construct Root with exact AST.md structure
         Kumi::Syntax::Root.new(
           input_declarations,
-          value_declarations, # attributes
+          value_declarations, # values
           trait_declarations,
           loc: schema_token.location
         )
@@ -126,9 +126,9 @@ module Kumi
           end
         end
 
-        # Handle nested array declarations
+        # Handle nested array and hash declarations
         children = []
-        if type_token.metadata[:type_name] == :array && current_token.type == :do
+        if %i[array hash].include?(type_token.metadata[:type_name]) && current_token.type == :do
           advance # consume 'do'
           skip_comments_and_newlines
 
@@ -143,13 +143,24 @@ module Kumi
           expect_token(:end)
         end
 
-        Kumi::Syntax::InputDeclaration.new(
-          name_token.value,
-          domain,
-          type_token.metadata[:type_name],
-          children,
-          loc: type_token.location
-        )
+        if children.empty?
+          Kumi::Syntax::InputDeclaration.new(
+            name_token.value,
+            domain,
+            type_token.metadata[:type_name],
+            children,
+            loc: type_token.location
+          )
+        else
+          Kumi::Syntax::InputDeclaration.new(
+            name_token.value,
+            domain,
+            type_token.metadata[:type_name],
+            children,
+            :field,
+            loc: type_token.location
+          )
+        end
       end
 
       def parse_domain_specification
@@ -175,7 +186,7 @@ module Kumi
         start_token = current_token
         start_value = start_token.type == :integer ? start_token.value.to_i : start_token.value.to_f
         advance
-        
+
         case current_token.type
         when :dot_dot
           # Inclusive range: start..end
@@ -199,14 +210,14 @@ module Kumi
 
       def convert_array_expression_to_ruby_array(array_expr)
         return nil unless array_expr.is_a?(Kumi::Syntax::ArrayExpression)
-        
+
         array_expr.elements.map do |element|
           if element.is_a?(Kumi::Syntax::Literal)
             element.value
           else
             # For non-literal elements, we'd need more complex evaluation
             # For now, just return the element as-is
-            element  
+            element
           end
         end
       end
@@ -262,18 +273,35 @@ module Kumi
         Kumi::Syntax::CascadeExpression.new(cases, loc: start_token.location)
       end
 
-      # Case expression: 'on condition, result' or 'base result'
+      # Case expression: 'on condition1, condition2, ..., result' or 'base result'
       def parse_case_expression
         case current_token.type
         when :on
           on_token = advance_and_return_token
-          condition = parse_expression
           
-          # Wrap simple trait references in all? to match Ruby DSL behavior
-          condition = wrap_condition_in_all(condition) if simple_trait_reference?(condition)
+          # Parse all comma-separated expressions
+          expressions = []
+          expressions << parse_expression
           
-          expect_token(:comma)
-          result = parse_expression
+          # Continue parsing comma-separated expressions until end of case
+          while current_token.type == :comma
+            advance # consume comma
+            expressions << parse_expression
+          end
+          
+          # Last expression is the result, all others are conditions
+          result = expressions.pop
+          conditions = expressions
+          
+          # Combine conditions appropriately
+          if conditions.length == 1
+            condition = conditions[0]
+            # Wrap simple trait references in cascade_and to match Ruby DSL behavior
+            condition = wrap_condition_in_all(condition) if simple_trait_reference?(condition)
+          else
+            # Multiple conditions: combine with cascade_and
+            condition = Kumi::Syntax::CallExpression.new(:cascade_and, conditions, loc: on_token.location)
+          end
 
           Kumi::Syntax::CaseExpression.new(condition, result, loc: on_token.location)
 
@@ -559,10 +587,10 @@ module Kumi
         condition.is_a?(Kumi::Syntax::DeclarationReference)
       end
 
-      # Helper method to wrap condition in all? function call
+
+      # Helper method to wrap condition in cascade_and function call
       def wrap_condition_in_all(condition)
-        array_expr = Kumi::Syntax::ArrayExpression.new([condition], loc: condition.loc)
-        Kumi::Syntax::CallExpression.new(:all?, [array_expr], loc: condition.loc)
+        Kumi::Syntax::CallExpression.new(:cascade_and, [condition], loc: condition.loc)
       end
 
       # Map operator token types to function names for Ruby DSL compatibility

data/lib/kumi/parser/token_metadata.rb

@@ -144,6 +144,11 @@ module Kumi
         starts_declaration: true,
         type_name: :array
       },
+      hash_type: {
+        category: :type_keyword,
+        starts_declaration: true,
+        type_name: :hash
+      },
 
       # Function keyword
       fn: {
@@ -379,7 +384,8 @@ module Kumi
       'string' => :string_type,
       'boolean' => :boolean_type,
       'any' => :any_type,
-      'array' => :array_type
+      'array' => :array_type,
+      'hash' => :hash_type
     }.freeze
 
     # Opener to closer mappings for error recovery

data/lib/kumi/parser/version.rb

@@ -2,6 +2,6 @@
 
 module Kumi
   module Parser
-    VERSION = '0.0.10'
+    VERSION = '0.0.12'
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumi-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Kumi Team
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kumi
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +162,7 @@ metadata:
   homepage_uri: https://github.com/amuta/kumi-parser
   source_code_uri: https://github.com/amuta/kumi-parser
   changelog_uri: https://github.com/amuta/kumi-parser/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -175,7 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: Text parser for Kumi
 test_files: []