ic_agent 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7c8e2c2b92f692a20ba38898f78dd76a854367369a905e8553c162c3a0238c
-  data.tar.gz: 51885b2b8966bae6a23b4dc5e775c7fd3ee864b4452cafa2213e54aa1fdddeae
+  metadata.gz: 8f6dd5be4d1dbd760c09b92da6efa53590adf43cad43c6ef495ccb704deccf1a
+  data.tar.gz: d28f144bd132dbb0dca0a13f7f12f8749595b1055f70801ffa8dc117cc113bb0
 SHA512:
-  metadata.gz: 3369b673094b4b7416f1a5125f440d5b5ad4fd9b8878d58564165b50bbd33b503e0653220fb92ac617fdc25890cb20efe2429c3f7f64340f8305134162f58a95
-  data.tar.gz: 0e8e47383437dfd4a1de1d05ac8975faed0fb1cff4e56ea9c2006450fd7036dbff578cb4bbbbea2f635e4a41dbf05e0f25ce178a8978e5f6bdd2e79a7d644d22
+  metadata.gz: b332d5369452f62130204a09c92d24a96029a054c7e02f92ddbaed137167b7f7eccf6e7458b76e6bf4a56da43a540ae937435dae5bd5a2329f680e100f80d53f
+  data.tar.gz: d7ff9b8954dc25684ef50da692aeea12e000b7e146a40c803aec70bfb6ffc4e5f0348984af230fd55cb71ab7b69f1c91634d9fdd7b7f47d471d9b6efac321098

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ic_agent (0.1.1)
+    ic_agent (0.1.2)
       base32 (~> 0.3.4)
       bitcoin-ruby (~> 0.0.20)
       cbor (~> 0.5.9.6)

data/lib/ic_agent/ast/assembler.rb

@@ -153,32 +153,10 @@ module IcAgent
       end
 
       def self.get_params_refer_values(type_str)
-        pure_child_code, replaced_hash = replace_multi_type(type_str)
-        key_index = 0
-        value_arr = []
-        pure_child_code.split(';').each do |item|
-          _, item_value = get_record_key_value(item, ' : ', key_index)
-          value_arr << item_value.split(' ')
-          key_index += 1
-        end
-
-        replaced_hash.each_key do |key|
-          item_arr = replaced_hash[key].strip.split(';')
-          item_arr.each do |item|
-            multi_item_arr = item.strip.split(':')
-            if multi_item_arr.size > 1
-              item_value_arr = multi_item_arr[1].strip.split(' ').collect { |v| v.strip.gsub(';', '') }
-              item_value_arr.delete('{')
-              item_value_arr.delete('}')
-              item_value_arr.delete('{}')
-              value_arr << item_value_arr
-            else
-              value_arr << multi_item_arr[1].strip
-            end
-          end
-          value_arr.delete(key)
-        end
-        value_arr.flatten.uniq - IcAgent::Candid::ALL_TYPES - replaced_hash.keys
+        parser = IcAgent::Ast::StatementParser.new
+        parser.parse(type_str)
+        refer_type = parser.source_tree.content[:refer_type]
+        refer_type
       end
 
       def self.recover_type(type_str, multi_types)

data/lib/ic_agent/ast/did_grammar.treetop

@@ -6,7 +6,7 @@ grammar DIDGrammar
 
   rule base_type
     'bool' / 'text' / 'null' / 'reserved' / 'empty' / 'principal' / 'nat8' / 'nat16' / 'nat32' / 'nat64' / 'int8' / 'int16' / 'int32' / 'int64' / 'float32' / 'float64' /
-    'opt' / 'vec' / 'record' / 'variant' / 'service' / 'func' / 'nat' / 'int' / blob
+    'opt' / 'vec' / 'record' / 'variant' / 'service' / 'func' / 'nat' / 'int' / 'blob'
   end
 
   rule base_type_single
@@ -90,15 +90,19 @@ grammar DIDGrammar
   end
 
   rule service_item
-    space? service_method_name space? ":" space? "(" service_method_params? ")" space? "->" space? "(" service_method_return_type ")" space? method_query? ';' end_of_line? <IcAgent::Ast::Nodes::IcServiceItem>
+    space? service_method_name space? ":" space? "(" service_method_params? ")" space? "->" space? "(" service_method_return_type? ")" space? method_query? ';' end_of_line? <IcAgent::Ast::Nodes::IcServiceItem>
   end
 
   rule service_method_params
-    param_element (", " param_element)* <IcAgent::Ast::Nodes::IcServiceMethodParams>
+    source_coding (", " source_coding)* <IcAgent::Ast::Nodes::IcServiceMethodParams>
   end
 
   rule service_method_return_type
-    [a-zA-Z0-9_{}: ]* <IcAgent::Ast::Nodes::IcServiceMethodReturn>
+    source_coding (", " source_coding)* <IcAgent::Ast::Nodes::IcServiceMethodReturn>
+  end
+
+  rule source_coding
+    [a-zA-Z0-9_{}:;\n ]*
   end
 
   rule method_query

data/lib/ic_agent/ast/did_grammar_v2.treetop

@@ -0,0 +1,159 @@
+grammar DIDGrammar
+
+  rule body
+    ( type_declaration / service_declaration / comment / end_of_line )* <IcAgent::Ast::Nodes::DIDFile>
+  end
+
+  rule base_type
+    'bool' / 'text' / 'null' / 'reserved' / 'empty' / 'principal' / 'nat8' / 'nat16' / 'nat32' / 'nat64' / 'int8' / 'int16' / 'int32' / 'int64' / 'float32' / 'float64' /
+    'opt' / 'vec' / 'record' / 'variant' / 'service' / 'func' / 'nat' / 'int' / blob
+  end
+
+  rule base_type_single
+    'bool' / 'text' / 'null' / 'reserved' / 'empty' / 'principal' / 'nat8' / 'nat16' / 'nat32' / 'nat64' / 'int8' / 'int16' / 'int32' / 'int64' / 'float32' / 'float64' / 'nat' / 'int' / 'blob'
+  end
+
+  rule base_type_base
+    base_type_single+ <IcAgent::Ast::Nodes::BaseTypeSingle>
+  end
+
+  rule base_type_code
+    [a-zA-Z0-9_]+ <IcAgent::Ast::Nodes::BaseTypeOther>
+  end
+
+  rule base_type_key
+      [a-zA-Z0-9_]+ <IcAgent::Ast::Nodes::BaseTypeKey>
+  end
+
+  rule base_type_vec
+    'vec' space ic_all_type <IcAgent::Ast::Nodes::BaseTypeVec>
+  end
+
+  rule base_type_opt
+    'opt' space ic_all_type <IcAgent::Ast::Nodes::BaseTypeOpt>
+  end
+
+  rule base_type_record
+    'record' space '{' space_and_line ic_base_content space_and_line '}' <IcAgent::Ast::Nodes::BaseTypeRecord>
+  end
+
+  rule base_type_record_null
+    'record {}' <IcAgent::Ast::Nodes::BaseTypeRecord>
+  end
+
+  rule base_type_variant
+    'variant' space '{' space_and_line ic_base_content space_and_line '}' <IcAgent::Ast::Nodes::BaseTypeVariant>
+  end
+
+  rule base_type_func
+    'func' space? "(" service_method_params? ")" space? "->" space? "(" service_method_return_type ")" space? method_query? <IcAgent::Ast::Nodes::BaseTypeFunc>
+  end
+
+  rule ic_all_type
+    base_type_base / base_type_vec / base_type_record / base_type_record_null / base_type_variant / base_type_opt / base_type_func / base_type_code
+  end
+
+  rule ic_base_content
+    (ic_base_type)+  <IcAgent::Ast::Nodes::BaseTypeContent>
+  end
+
+  rule ic_base_type
+    space? base_type_key space? (':' space ic_all_type)* optional_semicolon <IcAgent::Ast::Nodes::BaseTypeChild>
+  end
+
+  rule type_declaration
+    'type' space_and_line type_name space_and_line '=' space_and_line ic_all_type ';' end_of_line <IcAgent::Ast::Nodes::TypeDeclaration>
+  end
+
+  rule type_name
+    [a-zA-Z0-9_]+ <IcAgent::Ast::Nodes::TypeName>
+  end
+
+  rule comment
+    space? '//' space? rest_of_line <IcAgent::Ast::Nodes::Comment>
+  end
+
+  rule service_declaration
+    "service" space ":" space service_name* "{" end_of_line service_methods "}"  <IcAgent::Ast::Nodes::Service>
+  end
+
+  rule service_name
+    "(" ic_service_name ")" space? "->" space?
+  end
+
+  rule ic_service_name
+    [a-zA-Z0-9_]* <IcAgent::Ast::Nodes::IcServiceName>
+  end
+
+  rule service_methods
+    (service_item)+ <IcAgent::Ast::Nodes::IcServiceMethods>
+  end
+
+  rule service_item
+    space? service_method_name space? ":" space? "(" service_method_params? ")" space? "->" space? "(" service_method_return_type ")" space? method_query? ';' end_of_line? <IcAgent::Ast::Nodes::IcServiceItem>
+  end
+
+  rule service_method_params
+    param_element (", " param_element)* <IcAgent::Ast::Nodes::IcServiceMethodParams>
+  end
+
+  rule service_method_return_type
+    [a-zA-Z0-9_{}: ]* <IcAgent::Ast::Nodes::IcServiceMethodReturn>
+  end
+
+  rule method_query
+    [a-zA-Z0-9_]* <IcAgent::Ast::Nodes::IcServiceMethodQuery>
+  end
+
+  rule words
+    [a-zA-Z_] [a-zA-Z0-9_]*
+  end
+
+  rule param_element
+    [a-zA-Z0-9_ ]+
+  end
+
+  rule service_method_name
+    [a-zA-Z0-9_]* <IcAgent::Ast::Nodes::IcServiceMethodName>
+  end
+
+  rule string_without_spaces
+    [\S]* <IcAgent::Ast::Nodes::StringLiteral>
+  end
+
+  rule rest_of_line
+    [^\n]* <IcAgent::Ast::Nodes::StringLiteral>
+  end
+
+  rule end_of_line
+    [\n]+
+  end
+
+  rule block_record
+    '{}'
+  end
+
+  rule has_end_of_line
+    [\n]*
+  end
+
+  rule splite_code
+    ' : '
+  end
+
+  rule space_and_line
+    [\s\n]*
+  end
+
+  rule space
+    [\s]+
+  end
+
+  rule start_space
+    [^\s]+
+  end
+
+  rule optional_semicolon
+    [;]*
+  end
+end

data/lib/ic_agent/ast/nested_type_grammar.treetop

@@ -0,0 +1,118 @@
+grammar TypeGrammar
+  rule statement_block
+    ic_all_type optional_semicolon <IcAgent::Ast::Nodes::StatementBlock>
+  end
+
+  rule ic_all_type
+    (ic_type_def)+ <IcAgent::Ast::Nodes::IcTypeDef>
+  end
+
+  rule ic_type_def
+    base_type_base / base_type_vec / base_type_record / base_type_record_null / base_type_variant / base_type_opt / base_type_func / base_type_code
+  end
+
+  rule record_statement_content
+    (ic_base_type_pair / ic_base_type_value)* <IcAgent::Ast::Nodes::StatementContent>
+  end
+
+  rule variant_statement_content
+    (ic_base_type_pair / ic_base_type_key)* <IcAgent::Ast::Nodes::StatementContent>
+  end
+
+  rule base_type
+    'bool' / 'text' / 'null' / 'reserved' / 'empty' / 'principal' / 'nat8' / 'nat16' / 'nat32' / 'nat64' / 'int8' / 'int16' / 'int32' / 'int64' / 'float32' / 'float64' /
+    'opt' / 'vec' / 'record' / 'variant' / 'service' / 'func' / 'nat' / 'int' / 'blob'
+  end
+
+  rule base_type_single
+    'bool' / 'text' / 'null' / 'reserved' / 'empty' / 'principal' / 'nat8' / 'nat16' / 'nat32' / 'nat64' / 'int8' / 'int16' / 'int32' / 'int64' / 'float32' / 'float64' / 'nat' / 'int' / 'blob'
+  end
+
+  rule ic_base_type_pair
+    space? base_type_key space? ':' space? base_type_value ';'? <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule ic_base_type_key
+    space? base_type_key space? ';'? <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule ic_base_type_value
+    base_type_value space? ';'? <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule base_type_base
+    base_type_single+ <IcAgent::Ast::Nodes::IcBaseTypeSingle>
+  end
+
+  rule base_type_code
+    [a-zA-Z0-9_]+ <IcAgent::Ast::Nodes::IcBaseTypeOther>
+  end
+
+  rule base_type_key
+    [a-zA-Z0-9_]+ <IcAgent::Ast::Nodes::IcBaseTypeKey>
+  end
+
+  rule base_type_value
+    space? ic_all_type <IcAgent::Ast::Nodes::IcBaseTypeValue>
+  end
+
+  rule base_type_vec
+    'vec' space ic_all_type <IcAgent::Ast::Nodes::IcBaseTypeVec>
+  end
+
+  rule base_type_opt
+    'opt' space ic_all_type <IcAgent::Ast::Nodes::IcBaseTypeOpt>
+  end
+
+  rule base_type_record
+    'record' space '{' space_and_line? record_statement_content space_and_line? '}' <IcAgent::Ast::Nodes::IcBaseTypeRecord>
+  end
+
+  rule base_type_record_null
+    'record {}' <IcAgent::Ast::Nodes::IcBaseTypeRecord>
+  end
+
+  rule base_type_variant
+    'variant' space '{' space_and_line variant_statement_content space_and_line '}' <IcAgent::Ast::Nodes::IcBaseTypeVariant>
+  end
+
+  rule base_type_func
+    'func' space? "(" service_method_params? ")" space? "->" space? "(" service_method_return_type ")" space? method_query? <IcAgent::Ast::Nodes::IcBaseTypeFunc>
+  end
+
+  rule service_method_params
+    source_coding / refer_coding
+  end
+
+  rule service_method_return_type
+    [a-zA-Z0-9_{}:;\n ]* <IcAgent::Ast::Nodes::IcServiceMethodReturn>
+  end
+
+  rule refer_coding
+    param_element (", " param_element)* <IcAgent::Ast::Nodes::IcServiceMethodParams>
+  end
+
+  rule source_coding
+    [a-zA-Z0-9_{}:;\n ]* <IcAgent::Ast::Nodes::IcServiceMethodParams>
+  end
+
+  rule param_element
+    [a-zA-Z0-9_ ]+
+  end
+
+  rule method_query
+    [a-zA-Z0-9]* <IcAgent::Ast::Nodes::IcServiceMethodQuery>
+  end
+
+  rule space_and_line
+    [\s\n]*
+  end
+
+  rule space
+    [\s]+
+  end
+
+  rule optional_semicolon
+    [;]*
+  end
+end

data/lib/ic_agent/ast/nodes/named_nodes.rb

@@ -19,6 +19,10 @@ module IcAgent
         def elements_to_s
           elements.map(&:to_s).join("\n")
         end
+
+        def source_content
+          self.text_value.strip
+        end
       end
 
       class Instruction < NamedNode
@@ -57,11 +61,11 @@ module IcAgent
         end
 
         def type_param_name
-          elements[0].text_value
+          elements[0].source_content
         end
 
         def type_param_content
-          elements[1].text_value.gsub("\n", '').gsub(';}', '}')
+          elements[1].source_content.gsub("\n", '').gsub(';}', '}')
         end
 
         def type_root_opt_code
@@ -84,59 +88,12 @@ module IcAgent
           names
         end
 
-        def type_child_item_values
-          values = []
-          type_child_items.each do |ele|
-
-            # get multi type value
-            replaced_hash = {}
-            modified_str = ele.text_value.gsub("\n", '').gsub(/record\s*{[^{}]*}/) do |match|
-              rad_id = rand(100000..999999)
-              type_name = "record_#{rad_id}"
-              replaced_hash[type_name] = match
-              type_name
-            end
-            modified_str = modified_str.gsub(/variant\s*{[^{}]*}/) do |match|
-              rad_id = rand(100000..999999)
-              type_name = "variant_#{rad_id}"
-              replaced_hash[type_name] = match
-              type_name
-            end
-            replaced_hash.each_key do |key|
-              item_arr = replaced_hash[key].strip.split(';')
-              item_arr.each do |item|
-                multi_item_arr = item.strip.split(':')
-                if multi_item_arr.size > 1
-                  item_value_arr = multi_item_arr[1].strip.split(' ').collect { |v| v.strip.gsub(';', '') }
-                  item_value_arr.delete('{')
-                  item_value_arr.delete('}')
-                  item_value_arr.delete('{}')
-                  values << item_value_arr
-                else
-                  values << []
-                end
-              end
-            end
-
-            # get root type value
-            item_arr = modified_str.strip.split(':')
-            if item_arr.size > 1
-              item_value_arr = item_arr[1].strip.split(' ').collect { |v| v.strip.gsub(';', '') }
-              item_value_arr.delete('{')
-              item_value_arr.delete('}')
-              item_value_arr.delete('{}')
-              item_value_arr -= replaced_hash.keys
-              values << item_value_arr
-            else
-              values << []
-            end
-          end
-          values
-        end
-
-        def type_child_refer_items
-          child_args = type_child_item_values.flatten - IcAgent::Candid::ALL_TYPES
-          child_args.uniq
+        def type_refer_items
+          source_string = self.type_param_content
+          parser = IcAgent::Ast::StatementParser.new
+          parser.parse(source_string)
+          refer_type = parser.source_tree.content[:refer_type]
+          refer_type
         end
 
         def to_s
@@ -148,7 +105,7 @@ module IcAgent
             'type_param_name' => type_param_name,
             'type_root_opt_code' => type_root_opt_code,
             'type_child_item_keys' => type_child_item_keys,
-            'type_child_item_values' => type_child_item_values
+            'type_child_item_values' => type_refer_items
           }
         end
       end
@@ -349,7 +306,7 @@ module IcAgent
         def to_obj
           obj = {}
           elements.each do |element|
-            obj[element.title.to_s] = element.text_value
+            obj[element.title.to_s] = element.text_value.gsub("\n", '')
           end
           obj
         end
@@ -404,6 +361,16 @@ module IcAgent
           elements_to_s
         end
       end
+
+      class BaseTypeContent < NamedNode
+        def title
+          :ic_service_method_query
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
     end
   end
 end

data/lib/ic_agent/ast/nodes/statement_nodes.rb

@@ -0,0 +1,224 @@
+require 'treetop'
+
+module IcAgent
+  module Ast
+    module Nodes
+      class StatementNode < Treetop::Runtime::SyntaxNode
+        attr_accessor :child_count, :depth
+
+        def title
+          :named_node
+        end
+
+        def to_array
+          [title] + elements.map(&:to_array)
+        end
+
+        def to_s
+          "#{title.to_s.upcase} #{elements_to_s}"
+        end
+
+        def elements_to_s
+          elements.map(&:to_s).join("\n")
+        end
+
+        def add_child
+          @child_count ||= 0 + 1
+        end
+
+        def source_content
+          self.text_value.strip
+        end
+      end
+
+      class IcBaseType < StatementNode
+        def title
+          :base_type
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcBaseTypeSingle < StatementNode
+        def title
+          :base_type_single
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'single'
+        end
+      end
+
+      class IcBaseTypeRecord < StatementNode
+        def title
+          :base_type_record
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'record'
+        end
+      end
+
+      class IcBaseTypeKey < StatementNode
+        def title
+          :base_type_key
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcBaseTypeValue < StatementNode
+        def title
+          :base_type_value
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcTypeDef < StatementNode
+        def title
+          :base_type_def
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcBaseTypeVariant < StatementNode
+        def title
+          :base_type_variant
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'variant'
+        end
+      end
+
+      class IcBaseTypeFunc < StatementNode
+        def title
+          :base_type_func
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'func'
+        end
+      end
+
+      class IcBaseTypeOpt < StatementNode
+        def title
+          :base_type_opt
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'opt'
+        end
+      end
+
+      class IcBaseTypeVec < StatementNode
+        def title
+          :base_type_vec
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          'vec'
+        end
+      end
+
+      class IcBaseTypeOther < StatementNode
+        def title
+          :base_type_other
+        end
+
+        def to_s
+          elements_to_s
+        end
+
+        def opt_code
+          text_value
+        end
+      end
+
+      class IcBaseTypeContent < StatementNode
+        def title
+          :base_type_content
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcBaseTypeChild < StatementNode
+        def title
+          :base_type_child
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class IcTypeName < StatementNode
+        def title
+          :type_name
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class StatementBlock < StatementNode
+        def title
+          :statement_block
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+
+      class StatementContent < StatementNode
+        def title
+          :statement_content
+        end
+
+        def to_s
+          elements_to_s
+        end
+      end
+    end
+  end
+end
+

data/lib/ic_agent/ast/record_parser.treetop

@@ -0,0 +1,22 @@
+grammar RecordParser
+  # record { key1: text; key2: 42; value1; value2; }
+  rule record
+    'record' space '{' space? (pair / value)* space? '}' <IcAgent::Ast::Nodes::IcBaseTypeRecord>
+  end
+
+  rule pair
+    space? identifier space? ':' space? identifier ';' <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule value
+    space? identifier ';' <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule identifier
+    [a-zA-Z0-9_]*
+  end
+
+  rule space
+    [\s]+
+  end
+end

data/lib/ic_agent/ast/statement_parser.rb

@@ -0,0 +1,101 @@
+require 'treetop'
+
+module IcAgent
+  module Ast
+    class StatementParser
+      attr_accessor :parser, :tree, :source_tree
+
+      REFER_TYPE_CLASS = ['IcAgent::Ast::Nodes::IcBaseTypeRecord',
+                          'IcAgent::Ast::Nodes::IcBaseTypeVariant',
+                          'IcAgent::Ast::Nodes::IcBaseTypeVec',
+                          'IcAgent::Ast::Nodes::IcBaseTypeOpt']
+
+      TREE_TYPE_CLASS = ['IcAgent::Ast::Nodes::IcBaseTypeRecord',
+                         'IcAgent::Ast::Nodes::IcBaseTypeVariant',
+                         'IcAgent::Ast::Nodes::IcBaseTypeVec',
+                         'IcAgent::Ast::Nodes::IcBaseTypeFunc',
+                         'IcAgent::Ast::Nodes::IcBaseTypeOpt',
+                         'IcAgent::Ast::Nodes::IcBaseTypeSingle',
+                         'IcAgent::Ast::Nodes::IcBaseTypeOther']
+
+      REFER_TYPE_KEYS = ['record', 'variant']
+
+      def initialize
+        Treetop.load(File.expand_path(File.join(File.dirname(__FILE__), 'nested_type_grammar.treetop')))
+        @parser = TypeGrammarParser.new
+      end
+
+      def parse(data, return_type = :string)
+        tree = @parser.parse(data)
+        raise Exception, "Parse error at offset: #{@parser.index} #{@parser.failure_reason}" if tree.nil?
+
+        # this edits the tree in place
+        clean_tree(tree)
+
+        # generate soure tree
+        gen_source_tree(tree)
+        @tree = tree
+        tree
+      end
+
+      def clean_tree(root_node)
+        return if root_node.elements.nil?
+
+        root_node.elements.delete_if { |node| node.class.name == 'Treetop::Runtime::SyntaxNode' and node.parent.class.name != 'IcAgent::Ast::Nodes::IcBaseTypeValue' and node.parent.class.name != "IcAgent::Ast::Nodes::IcTypeDef" }
+        root_node.elements.each { |node| self.clean_tree(node) }
+      end
+
+      # @param [Object] root_node
+      # @param [nil] tree_root_node
+      # @param [nil] tree_current_node
+      def gen_source_tree(root_node, tree_root_node = nil, tree_current_node = nil)
+        return if root_node.elements.nil?
+
+        tree_root_node = tree_root_node.nil? ? Tree::TreeNode.new('root', { 'total_child': 0, 'ic_type': nil, 'refer_type': [], 'prototype': root_node.source_content, 'content': root_node.source_content }) : tree_root_node
+        tree_current_node = tree_current_node.nil? ? tree_root_node : tree_current_node
+
+        root_node.elements.each do |node|
+          if TREE_TYPE_CLASS.include?(node.class.name) && node.source_content != tree_root_node.content[:prototype]
+
+            id = tree_root_node.content[:total_child] + 1
+            new_tree_node = Tree::TreeNode.new("node_#{id}", { 'total_child': 0, 'ic_type': nil, 'prototype': root_node.source_content, 'content': root_node.source_content })
+            tree_current_node << new_tree_node
+            tree_root_node.content[:total_child] = id
+
+            # set refer_type
+            unless Regexp.union(REFER_TYPE_KEYS) === root_node.source_content
+              # func type content
+              if root_node.source_content.index('->')
+                param_arr = []
+                temp_param_arr = root_node.source_content.strip.split(' ').collect { |v| v.strip.gsub(';', '') }
+                temp_param_arr.delete_if {|v| !v.index('(') && !v.index(')') }
+                temp_param_arr.each {|v| param_arr = param_arr + v.sub('(', '').sub(')', '').split(',')}
+              else
+                param_arr = root_node.source_content.strip.split(' ').collect { |v| v.strip.gsub(';', '') }
+                param_arr = param_arr - IcAgent::Candid::ALL_TYPES
+              end
+              tree_root_node.content[:refer_type] = (tree_root_node.content[:refer_type] + param_arr).uniq
+            end
+
+            self.source_tree = tree_root_node
+            self.gen_source_tree(node, tree_root_node, new_tree_node)
+          else
+            self.gen_source_tree(node, tree_root_node, tree_current_node)
+          end
+        end
+
+        self.source_tree = tree_root_node
+      end
+
+      def ic_statement_root
+        tree.elements[0]
+      end
+
+      def ic_statement_childs
+        if tree.elements[0] && tree.elements[0].elements[0].elements[0]
+          tree.elements[0].elements[0].elements[0].elements
+        end
+      end
+    end
+  end
+end

data/lib/ic_agent/ast/variant_parser.treetop

@@ -0,0 +1,21 @@
+grammar VariantParser
+  rule variant
+    'variant' space? '{' space? (pair / key)* space? '}' <IcAgent::Ast::Nodes::IcBaseTypeVariant>
+  end
+
+  rule pair
+    space? identifier space? ':' space? identifier ';' <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule key
+    space? identifier ';' <IcAgent::Ast::Nodes::IcBaseTypeChild>
+  end
+
+  rule identifier
+    [a-zA-Z0-9_]*
+  end
+
+  rule space
+    [\s]+
+  end
+end

data/lib/ic_agent/canister.rb

@@ -33,9 +33,14 @@ module IcAgent
         args_arr.each do |arg|
           args_type_arrs << get_param_to_ic_type(parser, arg)
         end
-        ret_type = get_param_to_ic_type(parser, rets)
 
-        add_caniter_method(method_name, args, args_type_arrs, ret_type, anno)
+        rets_arr = rets.nil? ? [] : rets.split(',').map(&:strip)
+        rets_type_arr = []
+        rets_arr.each do |ret|
+          rets_type_arr << get_param_to_ic_type(parser, ret)
+        end
+
+        add_caniter_method(method_name, args, args_type_arrs, rets_type_arr, anno)
       end
     end
 
@@ -69,7 +74,7 @@ module IcAgent
     def build_param_tree(parser, type_name, current_node = nil, tree_root_node = nil)
       if current_node.nil?
         root_type = parser.ic_type_by_name(type_name)
-        refer_nodes = root_type.type_child_refer_items.nil? ? [] : root_type.type_child_refer_items
+        refer_nodes = root_type.type_refer_items.nil? ? [] : root_type.type_refer_items
         root_node = Tree::TreeNode.new(type_name,
                                        { 'total_child': refer_nodes.size,
                                          'all_child': refer_nodes,
@@ -119,7 +124,7 @@ module IcAgent
           else
             # non self refer
             child_type = parser.ic_type_by_name(refer_node)
-            child_refer_nodes = child_type.type_child_refer_items
+            child_refer_nodes = child_type.type_refer_items
             if child_refer_nodes.size == 0
               # set ic type
               ic_type = IcAgent::Ast::Assembler.build_type(child_type.type_param_content)
@@ -183,14 +188,11 @@ module IcAgent
       refer_type.empty? ? nil : refer_type[0]
     end
 
-    def only_refer_type?(param)
-      refer_types = IcAgent::Ast::Assembler.get_params_refer_values(param)
-      param.index(' ').nil? && refer_types.size == 1
-    end
-
     def get_param_to_ic_type(parser, param)
       ic_refer_types = {}
       refer_types = IcAgent::Ast::Assembler.get_params_refer_values(param)
+      # param self is refer_values
+      refer_types << param unless param.index(' ') || IcAgent::Candid::ALL_TYPES.any?(param)
       refer_types.each do |refer_code|
         ic_refer_types[refer_code] = build_param_tree(parser, refer_code, nil, nil).content[:ic_type]
       end
@@ -235,14 +237,14 @@ module IcAgent
       new_root_text
     end
 
-    def add_caniter_method(method_name, type_args, args_types, rets_type, anno = nil)
+    def add_caniter_method(method_name, type_args, args_types, rets_types, anno = nil)
       self.class.class_eval do
         define_method(method_name) do |*args|
           init_method_name = method_name
           init_method_args = type_args.nil? ? [] : type_args.split(',').map(&:strip)
           init_method_anno = anno
           init_method_types = args_types
-          init_method_ret_type = rets_type
+          init_method_ret_type = rets_types
 
           if init_method_args.length != args.length
             raise ArgumentError, 'Arguments length not match'

data/lib/ic_agent/common/cycles_wallet.rb

@@ -228,7 +228,7 @@ module IcAgent
           wallet_balance128: () -> (record { amount: nat }) query;
           wallet_send: (record { canister: principal; amount: nat64 }) -> (WalletResult);
           wallet_send128: (record { canister: principal; amount: nat }) -> (WalletResult);
-          wallet_receive: (opt ReceiveOptions) -> ();  // Endpoint for receiving cycles.
+          wallet_receive: (opt ReceiveOptions) -> ();
           wallet_create_canister: (CreateCanisterArgs) -> (WalletResultCreate);
           wallet_create_canister128: (CreateCanisterArgs128) -> (WalletResultCreate);
           wallet_create_wallet: (CreateCanisterArgs) -> (WalletResultCreate);
@@ -248,9 +248,7 @@ module IcAgent
             args: blob;
             cycles: nat;
           }) -> (WalletResultCall);
-          add_address: (address: AddressEntry) -> ();
           list_addresses: () -> (vec AddressEntry) query;
-          remove_address: (address: principal) -> (WalletResult);
           get_events: (opt record { from: opt nat32; to: opt nat32; }) -> (vec Event) query;
           get_events128: (opt record { from: opt nat32; to: opt nat32; }) -> (vec Event128) query;
           get_chart: (opt record { count: opt nat32; precision: opt nat64; } ) -> (vec record { nat64; nat64; }) query;
@@ -258,7 +256,6 @@ module IcAgent
           get_managed_canister_events: (record { canister: principal; from: opt nat32; to: opt nat32; }) -> (opt vec ManagedCanisterEvent) query;
           get_managed_canister_events128: (record { canister: principal; from: opt nat32; to: opt nat32; }) -> (opt vec ManagedCanisterEvent128) query;
           set_short_name: (principal, opt text) -> (opt ManagedCanisterInfo);
-          http_request: (request: HttpRequest) -> (HttpResponse) query;
         }
       DIDL_DOC
 

data/lib/ic_agent/common/management.rb

@@ -4,7 +4,6 @@ module IcAgent
       CANISTER_ID = 'aaaaa-aa'
       DID_FILE = <<~DIDL_DOC
         type canister_id = principal;
-        type user_id = principal;
         type wasm_module = blob;
 
         type canister_settings = record {
@@ -21,21 +20,117 @@ module IcAgent
           freezing_threshold : nat;
         };
 
-        service ic : {
+        type change_origin = variant {
+          from_user : record {
+            user_id : principal;
+          };
+          from_canister : record {
+            canister_id : principal;
+            canister_version : opt nat64;
+          };
+        };
+
+        type change_details = variant {
+          creation : record {
+            controllers : vec principal;
+          };
+          code_uninstall;
+          code_deployment : record {
+            mode : variant {install; reinstall; upgrade};
+            module_hash : blob;
+          };
+          controllers_change : record {
+            controllers : vec principal;
+          };
+        };
+
+        type change = record {
+          timestamp_nanos : nat64;
+          canister_version : nat64;
+          origin : change_origin;
+          details : change_details;
+        };
+
+        type http_header = record { name: text; value: text };
+
+        type ecdsa_curve = variant { secp256k1; };
+
+        type satoshi = nat64;
+
+        type bitcoin_network = variant {
+          mainnet;
+          testnet;
+        };
+
+        type bitcoin_address = text;
+
+        type block_hash = blob;
+
+        type outpoint = record {
+          txid : blob;
+          vout : nat32
+        };
+
+        type utxo = record {
+          outpoint: outpoint;
+          value: satoshi;
+          height: nat32;
+        };
+
+        type get_utxos_request = record {
+          address : bitcoin_address;
+          network: bitcoin_network;
+          filter: opt variant {
+            min_confirmations: nat32;
+            page: blob;
+          };
+        };
+
+        type get_current_fee_percentiles_request = record {
+          network: bitcoin_network;
+        };
+
+        type get_utxos_response = record {
+          utxos: vec utxo;
+          tip_block_hash: block_hash;
+          tip_height: nat32;
+          next_page: opt blob;
+        };
+
+        type get_balance_request = record {
+          address : bitcoin_address;
+          network: bitcoin_network;
+          min_confirmations: opt nat32;
+        };
+
+        type send_transaction_request = record {
+          transaction: blob;
+          network: bitcoin_network;
+        };
+
+        type millisatoshi_per_byte = nat64;
+
+        service : {
           create_canister : (record {
-            settings : opt canister_settings
+            settings : opt canister_settings;
+            sender_canister_version : opt nat64;
           }) -> (record {canister_id : canister_id});
           update_settings : (record {
             canister_id : principal;
-            settings : canister_settings
+            settings : canister_settings;
+            sender_canister_version : opt nat64;
           }) -> ();
           install_code : (record {
             mode : variant {install; reinstall; upgrade};
             canister_id : canister_id;
             wasm_module : wasm_module;
             arg : blob;
+            sender_canister_version : opt nat64;
+          }) -> ();
+          uninstall_code : (record {
+            canister_id : canister_id;
+            sender_canister_version : opt nat64;
           }) -> ();
-          uninstall_code : (record {canister_id : canister_id}) -> ();
           start_canister : (record {canister_id : canister_id}) -> ();
           stop_canister : (record {canister_id : canister_id}) -> ();
           canister_status : (record {canister_id : canister_id}) -> (record {
@@ -44,12 +139,41 @@ module IcAgent
               module_hash: opt blob;
               memory_size: nat;
               cycles: nat;
+              idle_cycles_burned_per_day: nat;
+          });
+          canister_info : (record {
+              canister_id : canister_id;
+              num_requested_changes : opt nat64;
+          }) -> (record {
+              total_num_changes : nat64;
+              recent_changes : vec change;
+              module_hash : opt blob;
+              controllers : vec principal;
           });
           delete_canister : (record {canister_id : canister_id}) -> ();
           deposit_cycles : (record {canister_id : canister_id}) -> ();
+          raw_rand : () -> (blob);
+
+          ecdsa_public_key : (record {
+            canister_id : opt canister_id;
+            derivation_path : vec blob;
+            key_id : record { curve: ecdsa_curve; name: text };
+          }) -> (record { public_key : blob; chain_code : blob; });
+          sign_with_ecdsa : (record {
+            message_hash : blob;
+            derivation_path : vec blob;
+            key_id : record { curve: ecdsa_curve; name: text };
+          }) -> (record { signature : blob });
+
+          bitcoin_get_balance: (get_balance_request) -> (satoshi);
+          bitcoin_get_utxos: (get_utxos_request) -> (get_utxos_response);
+          bitcoin_send_transaction: (send_transaction_request) -> ();
+          bitcoin_get_current_fee_percentiles: (get_current_fee_percentiles_request) -> (vec millisatoshi_per_byte);
+
           provisional_create_canister_with_cycles : (record {
             amount: opt nat;
-            settings : opt canister_settings
+            settings : opt canister_settings;
+            specified_id: opt canister_id;
           }) -> (record {canister_id : canister_id});
           provisional_top_up_canister :
             (record { canister_id: canister_id; amount: nat }) -> ();

data/lib/ic_agent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IcAgent
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/ic_agent.rb

@@ -14,8 +14,10 @@ require_relative 'ic_agent/system_state'
 require_relative 'ic_agent/canister'
 
 require_relative 'ic_agent/ast/nodes/named_nodes'
+require_relative 'ic_agent/ast/nodes/statement_nodes'
 require_relative 'ic_agent/ast/nodes/string_literal'
 require_relative 'ic_agent/ast/parser'
+require_relative 'ic_agent/ast/statement_parser'
 require_relative 'ic_agent/ast/writer'
 require_relative 'ic_agent/ast/assembler'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ic_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Terry.Tu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base32
@@ -241,9 +241,15 @@ files:
 - lib/ic_agent/ast/assembler.rb
 - lib/ic_agent/ast/did_grammar.treetop
 - lib/ic_agent/ast/did_grammar_v1.treetop
+- lib/ic_agent/ast/did_grammar_v2.treetop
+- lib/ic_agent/ast/nested_type_grammar.treetop
 - lib/ic_agent/ast/nodes/named_nodes.rb
+- lib/ic_agent/ast/nodes/statement_nodes.rb
 - lib/ic_agent/ast/nodes/string_literal.rb
 - lib/ic_agent/ast/parser.rb
+- lib/ic_agent/ast/record_parser.treetop
+- lib/ic_agent/ast/statement_parser.rb
+- lib/ic_agent/ast/variant_parser.treetop
 - lib/ic_agent/ast/writer.rb
 - lib/ic_agent/candid.rb
 - lib/ic_agent/canister.rb