lutaml-lml 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2253a295aed1a2d3218c34818aa1fddf38ca68be9830695175a52ba777719b
-  data.tar.gz: 6a070753dfcf0acf67b5196c8f8fca550f8b7ae41f01a15ad969f8d3e423de4f
+  metadata.gz: 30cbd708d890192c751f7fa14cc3eb87ba0e3ee344c636bb9581623de04ab639
+  data.tar.gz: 5a89263d3bedb5d4aaf587c9644f2479f135e6fd0b3aca923931dc24de001002
 SHA512:
-  metadata.gz: f1190e583a4ed9f86af817b45863ab26a40668dc38f4f1d17458f5df869e47e409c2454a7282d60ba2a601896e53697a852a263ab6148390f972c29519a8af61
-  data.tar.gz: ec32fdc80d72afa8a7173655c3f47115acbab0c1b14535126954e0edd0bd2c809b218884c8e98287beb53bd740f225ec552f741171f5fded67dadeaced305ca5
+  metadata.gz: fa80e98551690a86dfd630e6ad09e5b2965508c8462f01aff53e06e5d8fee8affa0e50af39a31888c6231685638b965dead7390b4cc25b50f968dc8b5faf976e
+  data.tar.gz: 462a67af964daef324c0cacf8b4591aad300a7c923f74a747d756286e7a285b6c527872210f5df438510fe48ea6c467139fadc770924fecba2f83abd102d9377

data/lib/lutaml/lml/cli.rb

@@ -167,6 +167,7 @@ module Lutaml
                              desc: 'Schema output path (file for one model, directory for many)'
       def compile(path)
         raise Thor::Error, "File does not exist: #{path}" unless File.exist?(path)
+        raise Thor::Error, "Expected a file, got directory: #{path}" if File.directory?(path)
 
         ns = options[:namespace] || (::Lutaml::Lml::ModelCompiler::DEFAULT_NAMESPACE if options[:schema])
         result = File.open(path) { |file| Lutaml::Lml::ModelCompiler.new(namespace: ns).compile(file) }

data/lib/lutaml/lml/document_builder.rb

@@ -402,6 +402,7 @@ module Lutaml
         if (section = hash.delete(:default_string_formats))
           model.default_string_formats << build_string_format(section)
         end
+        expand_class_namespace(model, hash)
         return unless (derived = hash.delete(:derived_field))
 
         model.derived_fields << build(:derived_field,
@@ -409,6 +410,15 @@ module Lutaml
                                       type: unquote(derived[:type]))
       end
 
+      # Issue #49: an in-class `namespace "uri" [prefix "p"]` line
+      def expand_class_namespace(model, hash)
+        decl = hash.delete(:class_namespace) or return
+
+        model.xml_namespace = build(:namespace,
+                                    uri: unquote(decl[:uri]),
+                                    prefix: unquote(decl[:prefix]))
+      end
+
       # L7a: from_table declares the enum's members as an artifact table
       # { from_table_name:, from_table_artifact? } — expansion happens at
       # compile time (deterministic materialization, no runtime data dep)

data/lib/lutaml/lml/formatter/canonical.rb

@@ -140,6 +140,7 @@ module Lutaml
         render_block(class_header(klass)) do
           render_comments(klass.comments)
           member { render_definition(klass.definition) } if definition_present?(klass.definition)
+          member { render_class_namespace(klass.xml_namespace) } if klass.xml_namespace&.uri
           Array(klass.attributes).each { |attribute| member { render_attribute(attribute) } }
           Array(klass.operations).each { |operation| member { render_operation(operation) } }
           Array(klass.derived_fields).each do |field|
@@ -152,6 +153,12 @@ module Lutaml
         end
       end
 
+      def render_class_namespace(namespace)
+        text = "namespace #{quote_always(namespace.uri)}"
+        text += " prefix #{quote_always(namespace.prefix)}" if namespace.prefix
+        line(text)
+      end
+
       def class_header(klass)
         text = "#{declaration_visibility(klass.visibility)}#{class_modifier(klass)}"
         text += "class #{klass.name}"
@@ -304,6 +311,8 @@ module Lutaml
       def render_attribute(attribute)
         return if attribute.name.to_s.empty?
 
+        return render_attribute_block(attribute) if attribute.xml_role && attribute_block_options?(attribute)
+
         if terse_attribute?(attribute)
           line("attribute #{attribute.name}, #{attribute.type}")
         elsif naked_attribute?(attribute)
@@ -315,6 +324,11 @@ module Lutaml
         end
       end
 
+      def attribute_block_options?(attribute)
+        Array(attribute.value_set).any? || Array(attribute.properties).any? ||
+          !attribute.pattern.nil? || !attribute.default.nil?
+      end
+
       def terse_attribute?(attribute)
         public_visibility?(attribute.visibility) &&
           bare_name?(attribute.name) &&
@@ -324,7 +338,7 @@ module Lutaml
           Array(attribute.properties).empty? &&
           attribute.pattern.nil? && attribute.default.nil? &&
           Array(attribute.stereotype).empty? && !attribute.literal &&
-          !definition_present?(attribute.definition)
+          attribute.xml_role.nil? && !definition_present?(attribute.definition)
       end
 
       def naked_attribute?(attribute)
@@ -335,14 +349,14 @@ module Lutaml
           Array(attribute.properties).empty? &&
           attribute.pattern.nil? && attribute.default.nil? &&
           Array(attribute.stereotype).empty? && !attribute.literal &&
-          !definition_present?(attribute.definition)
+          attribute.xml_role.nil? && !definition_present?(attribute.definition)
       end
 
       def bare_attribute?(attribute)
         !public_visibility?(attribute.visibility) ||
           !bare_name?(attribute.name) ||
           Array(attribute.stereotype).any? || attribute.literal ||
-          definition_present?(attribute.definition)
+          !attribute.xml_role.nil? || definition_present?(attribute.definition)
       end
 
       def render_bare_attribute(attribute)
@@ -351,6 +365,7 @@ module Lutaml
         header += ": #{type}" if type != ''
         cardinality = attribute_cardinality(attribute)
         header += " [#{cardinality}]" if cardinality
+        header += " as :#{attribute.xml_role}" if attribute.xml_role
 
         if definition_present?(attribute.definition)
           render_block(header) { render_definition(attribute.definition) }
@@ -376,7 +391,9 @@ module Lutaml
       end
 
       def render_attribute_block(attribute)
-        render_block("attribute #{attribute_name_text(attribute.name)}") do
+        header = "attribute #{attribute_name_text(attribute.name)}"
+        header += " as :#{attribute.xml_role}" if attribute.xml_role
+        render_block(header) do
           line("type #{attribute.type}") if attribute.type.to_s != ''
           cardinality = attribute_cardinality(attribute)
           line("cardinality #{cardinality}") if cardinality