lutaml-lml 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72188a69457d2cf82445867f2b726dd621d63e82d79c7e56b01241e0d15ec84
-  data.tar.gz: 402135ddb2bf31953c21f6166c859c6b5f67d24d1a9e18e8369eb3646a413381
+  metadata.gz: 9afdbd5bcb80896ee130f477fd40e21b475826cbe9ffcdac89b927e44ce77d5d
+  data.tar.gz: 194b68623da1d25a723af09a565948fdc6c567e340ebe7ac1efea5f8f925a6a1
 SHA512:
-  metadata.gz: d07e5279b6c0d983d1ba1384ef3579aa3d493fba0520aedadfd97ac11a42bfca1fd2e96e621e6551e8dd22bef52e30136779cdf88e8bbe81e611b762e1efa3cd
-  data.tar.gz: 20e402c37d1506fd86c4ded5fac0bb010dc58d3cdda8efcf3e92cd287ec8025331375310b7e40093741af136aaaf4f61d78a44456fe59b2d75dffe5e1d57568b
+  metadata.gz: 7f992466d0f04295e0808c199d37b31bc5ca16f8acc6e0a21ce519d932766437d7e87e604a7d5ea28b19ab89fe8ed3fa4f1b557882de7b36d41ec649be8f5a37
+  data.tar.gz: 57999ac9cba35e2ca2b515e40de8e99acf6d2ec00e4dc529c78a0344546f1e0c87ad66d42d116d55f53ccc38b137758a7c51c3a8a6500fa75431c3b579e06070

data/lib/lutaml/lml/cli.rb

@@ -24,7 +24,7 @@ module Lutaml
       }.freeze
 
       PARSE_HANDLERS = {
-        'lutaml' => ->(path) { Lutaml::Lml.parse(File.new(path)) },
+        'lutaml' => ->(path) { File.open(path) { |f| Lutaml::Lml.parse(f) } },
         'yaml' => ->(path) { Lutaml::Lml::YamlParser.parse(path.to_s) },
         'yml' => ->(path) { Lutaml::Lml::YamlParser.parse(path.to_s) },
         'exp' => lambda { |path|
@@ -94,8 +94,11 @@ module Lutaml
 
           lutaml lml validate model.lutaml project.lutaml
       DESC
+      method_option :input_format, type: :string, aliases: '-i',
+                                   desc: 'Input format (lutaml, yaml, exp)'
       def validate(*paths)
         assert_input_paths(paths)
+        @input_format = options[:input_format] || DEFAULT_INPUT_FORMAT
         errors = paths.map { |p| validate_single_file(p) }.compact
         report_validation(errors)
       end

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

@@ -4,7 +4,7 @@ module Lutaml
   module Lml
     class DataProcessor
       module AttributeProcessing
-        EXCLUDED_PASS_THROUGH_KEYS = %i[key value comments add attributes properties].freeze
+        EXCLUDED_PASS_THROUGH_KEYS = %i[key value comments add attributes properties type_literal].freeze
 
         def process_attributes(obj)
           case obj
@@ -31,6 +31,7 @@ module Lutaml
           result = extract_name_and_value(obj)
           convert_instance_type(result)
           result[:extended] = !obj[:add].nil? if obj.key?(:add)
+          result[:literal] = true if obj.key?(:type_literal)
           apply_nested_attributes(result, obj)
           apply_remaining_keys(result, obj)
           result

data/lib/lutaml/lml/formatter/graphviz/node_formatter.rb

@@ -14,8 +14,8 @@ module Lutaml
           symbol = ACCESS_SYMBOLS[node.visibility]
           result = "#{symbol}#{node.name}"
           if node.type
-            keyword = node.keyword ? "«#{node.keyword}»" : ''
-            result += " : #{keyword}#{node.type}"
+            stereotype = node.stereotype.empty? ? '' : node.stereotype.map { |s| "«#{s}»" }.join
+            result += " : #{stereotype}#{node.type}"
           end
           result += format_cardinality_bounds(node.cardinality) if node.cardinality
           result = escape_html_chars(result)
@@ -48,9 +48,23 @@ module Lutaml
           end.join(', ')
         end
 
+        # Kind labels rendered above the name: guillemet stereotypes first,
+        # then the entity-kind label (enums/data types/primitives carry no
+        # user stereotypes of their own in the grammar).
+        KIND_LABELS = {
+          enums: "enumeration",
+          data_types: "dataType",
+          primitives: "primitive"
+        }.freeze
+
         def format_class(node, hide_members = nil)
           name = ["<B>#{escape_html_chars(node.name)}</B>"]
-          name.unshift("«#{escape_html_chars(node.keyword)}»") if node.keyword
+          node.stereotype.each do |stereotype|
+            name.unshift("«#{escape_html_chars(stereotype)}»")
+          end
+          if (kind = KIND_LABELS[node.class.entity_type])
+            name.unshift("«#{kind}»")
+          end
           name_html = build_name_table(name)
 
           member_formatter = node.is_a?(Lml::Enum) ? method(:format_enum_member) : nil