lutaml-lml 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afdbd5bcb80896ee130f477fd40e21b475826cbe9ffcdac89b927e44ce77d5d
-  data.tar.gz: 194b68623da1d25a723af09a565948fdc6c567e340ebe7ac1efea5f8f925a6a1
+  metadata.gz: d249342f8fa771fc6acc926a4a4fa75eb2f2532ccd4461ea0452c7930d6a0372
+  data.tar.gz: 7a852a63a20c02124a7c34c66501f749801711968239ef8e7fd7d92df4b96abb
 SHA512:
-  metadata.gz: 7f992466d0f04295e0808c199d37b31bc5ca16f8acc6e0a21ce519d932766437d7e87e604a7d5ea28b19ab89fe8ed3fa4f1b557882de7b36d41ec649be8f5a37
-  data.tar.gz: 57999ac9cba35e2ca2b515e40de8e99acf6d2ec00e4dc529c78a0344546f1e0c87ad66d42d116d55f53ccc38b137758a7c51c3a8a6500fa75431c3b579e06070
+  metadata.gz: 2acbed3dc1c0da892d6344ec7ff87147d13d24de03b44ae8c8ff3ba136a3941a20ac6b95e4d1e4445c52b91ca0997e1d7c9a7425fd92713b954874ce2dd0abf3
+  data.tar.gz: a9f5844e875eba16ef0f3bdcb2f10ff62fe377935cce06f35c7e92571a8e7cfa9a43782919b2661f161cb4be6fffe73b67fc10bbcb9c56a73ab7ec36b2daec48

data/lib/lutaml/lml/data_processor/instance_processing.rb

@@ -13,6 +13,7 @@ module Lutaml
 
         INSTANCE_FIELD_HANDLERS = {
           instance_type: :handle_instance_type,
+          isa: :handle_instance_isa,
           instance: :handle_instance_nested,
           attributes: :handle_instance_attributes,
           template: :handle_instance_template
@@ -45,6 +46,10 @@ module Lutaml
           result[:type] = process_value(value).last
         end
 
+        def handle_instance_isa(value, result)
+          result[:isa] = process_value(value).last
+        end
+
         def handle_instance_nested(value, result)
           result[:instance] = process_instance(value)
         end

data/lib/lutaml/lml/document_builder.rb

@@ -20,7 +20,11 @@ module Lutaml
         constraint: ::Lutaml::Lml::Constraint,
         value: ::Lutaml::Lml::Value,
         view_import: ::Lutaml::Lml::ViewImport,
-        view_filter: ::Lutaml::Lml::ViewFilter
+        view_filter: ::Lutaml::Lml::ViewFilter,
+        mapping: ::Lutaml::Lml::Mapping,
+        string_format: ::Lutaml::Lml::StringFormat,
+        derived_field: ::Lutaml::Lml::DerivedField,
+        member_field: ::Lutaml::Lml::MemberField
       }.freeze
 
       attr_reader :registry
@@ -31,7 +35,8 @@ module Lutaml
 
       FACTORY_KEYS = %i[
         document package class enum data_type diagram view_import view_filter
-        attribute association operation constraint value cardinality
+        attribute association operation constraint value cardinality mapping
+        string_format derived_field
       ].freeze
 
       MEMBER_KEY_MAP = {
@@ -45,7 +50,9 @@ module Lutaml
         associations: :association,
         operations: :operation,
         constraints: :constraint,
-        values: :value
+        values: :value,
+        mappings: :mapping,
+        member_fields: :member_field
       }.freeze
 
       FACTORY_KEYS.each do |key|
@@ -95,6 +102,9 @@ module Lutaml
       end
 
       def add_members(model, hash)
+        expand_mapping_section(model, hash)
+        expand_class_declarations(model, hash)
+        expand_enum_member_fields(model, hash)
         MEMBER_KEY_MAP.each do |plural_key, singular_key|
           data = hash.delete(plural_key)
           next if data.nil?
@@ -106,6 +116,69 @@ module Lutaml
         remap_filter_keys(hash, model)
       end
 
+      # A mapping section arrives as a bare member hash
+      # { format:, maps: [{ wire:, to: }] }; expand to one Mapping entry
+      # per map line, each carrying the format, and strip the section keys
+      def expand_mapping_section(model, hash)
+        section = mapping_section_from(hash)
+        return unless section
+
+        section[:maps].to_a.each do |line|
+          model.wire_mappings << build(:mapping,
+                                       format: section[:format],
+                                       wire: unquote(line[:wire]),
+                                       to: unquote(line[:to]))
+        end
+      end
+
+      def mapping_section_from(hash)
+        return { format: unquote(hash[:format]), maps: hash.delete(:maps) } if hash.key?(:maps)
+
+        hash.delete(:mappings)
+      end
+
+      # quoted_string captures nest their value under :string
+      def unquote(value)
+        value.is_a?(Hash) && value.key?(:string) ? value[:string] : value
+      end
+
+      # L5/L7 declaration members: string_format sections (class- or
+      # models-level), derive lines, and enum member_fields blocks
+      def expand_class_declarations(model, hash)
+        if (section = hash.delete(:string_format))
+          model.string_formats << build_string_format(section)
+        end
+        if (section = hash.delete(:default_string_formats))
+          model.default_string_formats << build_string_format(section)
+        end
+        return unless (derived = hash.delete(:derived_field))
+
+        model.derived_fields << build(:derived_field,
+                                      name: derived[:name],
+                                      type: unquote(derived[:type]))
+      end
+
+      def expand_enum_member_fields(model, hash)
+        decl = hash.delete(:member_fields_decl)
+        return unless decl && model.is_a?(Enum)
+
+        decl[:member_fields].to_a.each do |field|
+          model.member_fields << build(:member_field,
+                                       name: field[:name],
+                                       type: unquote(field[:member_field_type]))
+        end
+      end
+
+      def build_string_format(section)
+        items = section[:items].to_a.each_with_object({}) do |item, acc|
+          acc[item[:key].to_sym] = unquote(item[:value])
+        end
+        build(:string_format,
+              format: unquote(section[:format]),
+              artifact: items[:artifact],
+              root: items[:root])
+      end
+
       def ensure_collection(model, key)
         model.public_send(key) || begin
           model.public_send("#{key}=", [])
@@ -116,12 +189,10 @@ module Lutaml
       def remap_filter_keys(hash, model)
         return unless model.is_a?(Document)
 
-        if hash.key?(:show_list)
-          hash[:show_filter] = build_view_filter(hash.delete(:show_list))
-        end
-        if hash.key?(:hide_list)
-          hash[:hide_filter] = build_view_filter(hash.delete(:hide_list))
-        end
+        hash[:show_filter] = build_view_filter(hash.delete(:show_list)) if hash.key?(:show_list)
+        return unless hash.key?(:hide_list)
+
+        hash[:hide_filter] = build_view_filter(hash.delete(:hide_list))
       end
 
       def build_view_filter(entity_names)