metanorma-plugin-lutaml 0.7.54 → 0.7.55.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a443f1152ff2cf6f053744b7750e0e96426bc776cf0cb582b9c93f7d828f55
-  data.tar.gz: 4f31cad3531f1f38525e2eaacee72917fee007a2a6099a772894ed6159ed5168
+  metadata.gz: 4df1a140d2fef0dd3a780ac070ab6f6a3906191da12c6d72b30883ad0217bf25
+  data.tar.gz: ad4569a0ce6ae86577978e7358de9e98c1955227755efa699a7182aca38ab428
 SHA512:
-  metadata.gz: 4098ac9e010d91d65a98c21eb22abcbd7add8166f7dc93a1f0b2fdeeb790b40c70a274ef8b66f36aaa3402bcc3b481d9283ff4e766586b4a33e4c8dfd75e2463
-  data.tar.gz: 9ed735f7bd7b870a8be1ad0847e4b9c47a2a411a23de2a7d98874c6d185286e60123d067c8e34be42b3d339ae021cee51190b50c8c0581a5a04c1ad47c64f654
+  metadata.gz: 31f6b4b4a670f661412cedc5cdb5538b074054f6618a35e06bfa15080af2dedba5075b237f163e4ba63e8ab99d95b92dc1ed8b99c35111a8abf588616fa62c37
+  data.tar.gz: 3edd282734af0e5b2d3f6e74daa6e5b9a310e51b022baca413ab00aac448a186a76d22ffb8e5924bacdf0c9c4aaf08b50ce877e2f63a22f83c3d536b68219258

data/Gemfile

@@ -24,3 +24,19 @@ gem "simplecov"
 gem "timecop"
 gem "vcr"
 gem "webmock"
+
+# leptris 1.9.367.0 is the highest match for standoc's '~> 1.9.361' but
+# publishes only linux prebuilds plus a ruby gem with no vendored
+# libleptris; windows-latest falls back to that ruby gem and dies on
+# require "metanorma-standoc". 1.9.361.1 is the latest that still ships
+# x64-mingw-ucrt (and darwin) binaries. Lift once upstream packs Windows
+# again.
+gem "leptris", "~> 1.9.361.1"
+
+# pre-release line pins (see metanorma release wave)
+gem "isodoc", github: "metanorma/isodoc", branch: "main"
+gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
+gem "suma", github: "metanorma/suma", branch: "main"
+# standoc main (>= 3.5.1.pre.alpha.2) floors metanorma-document at
+# 0.5.2.pre.alpha.1 (SvgmapElement, metanorma-standoc#1303); main carries it
+gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"

data/Gemfile.devel

@@ -1,12 +1,12 @@
-gem "metanorma-standoc", github: "metanorma/metanorma-standoc", ref: "5ca49c85bbcc1422e48c4b625a66f7f026dc6832"
+# gem "metanorma-standoc", github: "metanorma/metanorma-standoc", ref: "5ca49c85bbcc1422e48c4b625a66f7f026dc6832"
 gem "metanorma", github: "metanorma/metanorma", ref: "a899a9a6fc933dca0a53166d6633b609311b14e6"
 # relaton v3 prerelease line (rubyzip ~> 3.4, matching lutaml-model);
 # relaton-cli's v2line branch allows relaton 3 while keeping version
 # 2.1.2 for metanorma-standoc's constraint; the metanorma/standoc
 # refs are the known-good pair (newer standoc@main needs unreleased
 # metanorma-document components)
-gem "relaton", github: "relaton/relaton", ref: "65742ac31bce9e006072e1ace440c984352201f3"
-gem "relaton-cli", github: "relaton/relaton-cli", branch: "feat/allow-relaton-v3-v2line"
+gem "relaton", "~> 3.0.0.pre.alpha"
+gem "relaton-cli", "~> 3.0.0.pre.alpha"
 
 # lutaml-lml 0.1.5 adds Lutaml::Lml.parse + Formatter::Graphviz used by
 # the lutaml_diagram renderer; 0.1.1 (previously resolved) lacks them

data/Rakefile

@@ -10,6 +10,7 @@ XMI_HEAVY_SPEC_FILES = %w[
 ].freeze
 
 XMI_SPEC_FILES = %w[
+  spec/metanorma/plugin/lutaml/lutaml_ea_uml_preprocessor_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_klass_table_block_macro_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_enum_table_block_macro_spec.rb
   spec/metanorma/plugin/lutaml/lutaml_xmi_index_spec.rb

data/docs/usages/enterprise_architect.adoc

@@ -208,11 +208,19 @@ classes:
         used: false
         guidance: |
           Drop guidance message here.
+data_types:
+  - name: Name Of Datatype
+    attributes:
+      - name: Name Of Attribute (e.g. Root:value)
+        used: false
+        guidance: |
+          Drop guidance message here.
 ...
 ----
 
 If you want to define the guidance, you can define the `name` of the class
-under `classes`.  Then define which `attributes` you want to add guidance by the
+under `classes` (or the datatype under `data_types`).  Then define which
+`attributes` you want to add guidance by the
 `name`. Set `used` to show the attribute is used or not. Drop the message of
 guidance in `guidance`.
 
@@ -311,11 +319,19 @@ classes:
     used: false
     guidance: |
       Drop guidance message here.
+data_types:
+- name: "NameOfDatatype"
+  attributes:
+  - name: Name Of Attribute (e.g. Root:value)
+    used: false
+    guidance: |
+      Drop guidance message here.
 ...
 ----
 
 If you want to define the guidance, you can define the `name` of the class
-under `classes`.  Then define which `attributes` you want to add guidance by the
+under `classes` (or the datatype under `data_types`).  Then define which
+`attributes` you want to add guidance by the
 `name`. Set `used` to show the attribute is used or not. Drop the message of
 guidance in `guidance`.
 

data/lib/metanorma/plugin/lutaml/config/guidance.rb

@@ -7,9 +7,22 @@ module Metanorma
         class Guidance < ::Lutaml::Model::Serializable
           attribute :classes, GuidanceKlass, collection: true,
                                              initialize_empty: true
+          attribute :data_types, GuidanceKlass, collection: true,
+                                                initialize_empty: true
 
           yaml do
             map "classes", to: :classes
+            map "data_types", to: :data_types
+          end
+
+          # Drops index into both keys (KlassDrop reads ["classes"],
+          # DataTypeDrop reads ["data_types"]); empty collections are
+          # omitted from as_yaml, so pin both keys here.
+          def to_yaml_hash
+            super.tap do |hash|
+              hash["classes"] ||= []
+              hash["data_types"] ||= []
+            end
           end
         end
       end

data/lib/metanorma/plugin/lutaml/express_remark_adapter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "expressir"
+require "pathname"
 
 module Metanorma
   module Plugin
@@ -16,7 +17,17 @@ module Metanorma
           )
           resolved = document.path_resolver
             .system_path(file_path, docfile_directory)
-          File.expand_path(resolved, docfile_directory)
+          # The prefix lands inside emitted image macros, so it must not
+          # carry the absolute build path: two builds of the same tree in
+          # two directories produced different image/@src values
+          # (metanorma/metanorma-plugin-lutaml#325). A path relative to the
+          # docfile resolves to the same schema file at render time and is
+          # byte-identical across build directories.
+          # The docfile directory may be relative ("."): relative_path_from
+          # refuses mixed prefixes, so both sides expand first
+          Pathname.new(File.expand_path(resolved))
+            .relative_path_from(Pathname.new(File.expand_path(docfile_directory)))
+            .to_s
         end
 
         def self.for(model)
@@ -47,6 +58,7 @@ module Metanorma
           end
 
           def decorate_remarks(options)
+            promote_schema_prose
             decorate_own_remarks(options)
             decorate_child_remark_items(options)
             traverse_children(options)
@@ -54,7 +66,29 @@ module Metanorma
 
           private
 
+          # A bare (*"Schema_name" ...*) remark is the schema-level prose:
+          # expressir models it in Schema#remarks, not as a RemarkItem, so
+          # renders that walk remark_items (every clause-4 template) drop
+          # it (iso-10303#720). Promote it to a leading RemarkItem keyed
+          # by the schema path, the same way an entity-tagged remark names
+          # its target. The prose stays in Schema#remarks too; templates
+          # that already render it there keep working unchanged.
+          def promote_schema_prose
+            return unless @model.is_a?(Expressir::Model::Declarations::Schema)
+            return if @model.remarks.to_a.empty?
+
+            items = @model.remark_items.to_a
+            return if items.any? { |ri| ri.id == @model.id }
+
+            prose = Expressir::Model::Declarations::RemarkItem.new(
+              id: @model.id,
+              remarks: @model.remarks.dup,
+            )
+            @model.remark_items = [prose] + items
+          end
+
           def decorate_own_remarks(options)
+
             @model.remarks = ExpressRemarksDecorator.decorate_array(
               @model.remarks, options
             )

data/lib/metanorma/plugin/lutaml/liquid_templates/_klass_table.liquid

@@ -1,4 +1,8 @@
-{%- assign root = klass.generalization -%}
+{%- comment -%}
+parentless types (e.g. Union-stereotyped data types) carry no
+generalization: render the drop itself so members are not lost
+{%- endcomment -%}
+{%- assign root = klass.generalization | default: klass -%}
 
 {%- capture upper_klass_name -%}
 {{ root.general.upper_klass }}:{{ root.general.name }}
@@ -21,57 +25,58 @@ h| Stereotype 2+| {{ stereotype }}
 
 3+h| Inherited Properties
 h| Property Name h| Property Type and Multiplicity h| Definition
-{%- for attr in root.inherited_props -%}
-{%- unless attr.has_association? -%}
-{%- capture name_col -%}
+{% for attr in root.inherited_props %}
+  {%- unless attr.has_association? -%}
+    {%- capture name_col -%}
       {{ attr.name_ns }}:{{ attr.name }}
       ({{ attr.gen_name }})
     {%- endcapture -%}
     | {{ name_col | newline_to_br }}
     | {{ attr.type }} [{{ attr.cardinality.min }}..{{ attr.cardinality.max }}]
     | {{ attr.definition }}
-{%- endunless -%}
-{%- endfor -%}
+  {%- endunless -%}
+{% endfor %}
 
 3+h| Self-defined Properties
 h| Property Name h| Property Type and Multiplicity h| Definition
-{%- for attr in root.owned_props -%}
-{%- unless attr.has_association? -%}
-{%- capture name_col -%}
+{%- assign self_props = root.owned_props | default: root.owned_attributes -%}
+{% for attr in self_props %}
+  {%- unless attr.has_association? -%}
+    {%- capture name_col -%}
       {{ attr.name_ns }}:{{ attr.name }}
       ({{ attr.gen_name }})
     {%- endcapture -%}
     | {{ name_col | newline_to_br }}
     | {{ attr.type }} [{{ attr.cardinality.min }}..{{ attr.cardinality.max }}]
     | {{ attr.definition }}
-{%- endunless -%}
-{%- endfor -%}
+  {%- endunless -%}
+{% endfor %}
 
 3+h| Properties Inherited from Association
 h| Property Name h| Property Type and Multiplicity h| Definition
-{%- for attr in root.inherited_assoc_props -%}
-{%- if attr.has_association? -%}
-{%- capture name_col -%}
+{% for attr in root.inherited_assoc_props %}
+  {%- if attr.has_association? -%}
+    {%- capture name_col -%}
       {{ attr.name_ns }}:{{ attr.name }}
       ({{ attr.gen_name }})
     {%- endcapture -%}
     | {{ name_col | newline_to_br }}
     | {{ attr.type_ns }}:{{ attr.type }} [{{ attr.cardinality.min }}..{{ attr.cardinality.max }}]
     | {{ attr.definition }}
-{%- endif -%}
-{%- endfor -%}
+  {%- endif -%}
+{% endfor %}
 
 3+h| Properties Defined in Association
 h| Property Name h| Property Type and Multiplicity h| Definition
-{%- for attr in root.assoc_props -%}
-{%- if attr.has_association? -%}
-{%- capture name_col -%}
+{% for attr in root.assoc_props %}
+  {%- if attr.has_association? -%}
+    {%- capture name_col -%}
       {{ attr.name_ns }}:{{ attr.name }}
       ({{ attr.gen_name }})
     {%- endcapture -%}
     | {{ name_col | newline_to_br }}
     | {{ attr.type_ns }}:{{ attr.type }} [{{ attr.cardinality.min }}..{{ attr.cardinality.max }}]
     | {{ attr.definition }}
-{%- endif -%}
-{%- endfor -%}
+  {%- endif -%}
+{% endfor %}
 |===

data/lib/metanorma/plugin/lutaml/lutaml_data_preprocessor.rb

@@ -117,7 +117,21 @@ module Metanorma
           parsed_template = template(lines)
           parsed_template.registers[:file_system] =
             build_file_system(document, options)
-          parsed_template.render(context_name => instances.to_h)
+          parsed_template.render(context_name => deep_stringify(instances.to_h))
+        end
+
+        # Liquid resolves variable lookups by string keys; the compiled
+        # LML models hash with symbols
+        def deep_stringify(value)
+          case value
+          when Hash
+            value.transform_keys(&:to_s)
+                 .transform_values { |v| deep_stringify(v) }
+          when Array
+            value.map { |v| deep_stringify(v) }
+          else
+            value
+          end
         end
 
         def resolve_data_paths(document, definition_file, instance_file)

data/lib/metanorma/plugin/lutaml/lutaml_klass_table_block_macro.rb

@@ -29,7 +29,8 @@ module Metanorma
           end
 
           klass = serialize_klass_or_datatype_drop_by_name(
-            xmi_path, path, parent.document, guidance)
+            xmi_path, path, parent.document, guidance
+          )
 
           render_table(klass, CONTEXT_NAME, parent, attrs)
         end

data/lib/metanorma/plugin/lutaml/version.rb

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.54".freeze
+      VERSION = "0.7.55.pre.alpha.2".freeze
     end
   end
 end

data/lib/metanorma/plugin/lutaml/xmi_cache.rb

@@ -34,9 +34,6 @@ yaml_config_path = nil)
           end
         end
 
-
-
-
         def find_packaged_klass(index, path, root_model_name: nil)
           segments = path.split("::").reject(&:empty?)
           if root_model_name && segments.first == root_model_name
@@ -108,7 +105,7 @@ yaml_config_path = nil)
         def serialize_klass_or_datatype_drop_by_name(xmi_path,
           name, _document = nil, guidance = nil)
           serialize_klass_drop_by_name(xmi_path, name, _document, guidance) ||
-            serialize_datatype_drop_by_name(xmi_path, name, _document)
+            serialize_datatype_drop_by_name(xmi_path, name, _document, guidance)
         end
 
         def serialize_klass_drop_by_name(xmi_path,
@@ -127,18 +124,19 @@ yaml_config_path = nil)
           )
         end
 
-        def serialize_datatype_drop_by_name(xmi_path, name, _document = nil)
+        def serialize_datatype_drop_by_name(xmi_path, name, _document = nil,
+          guidance = nil)
           GcBudget.gc_when_bloated!
           xmi_path, name, slice = XmiPartialLoadRegistry.rewrite(xmi_path, name)
           parsed = XMI_PARSE_CACHE.fetch(xmi_path, slice: slice)
           datatype = resolve_packaged_datatype(parsed, name)
           if datatype.nil?
             warn "Datatype not found for name: #{name}"
-            nil
+            return nil
           end
 
           ::Ea::Xmi::LiquidDrops::DataTypeDrop.new(
-            datatype, parsed.drop_options
+            datatype, guidance, parsed.drop_options
           )
         end
 

data/metanorma-plugin-lutaml.gemspec

@@ -32,13 +32,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "coradoc", "~> 1.1.8"
   spec.add_dependency "ea", ">= 0.6.41" # Ea::Xmi.load/load_graph (lutaml/ea#86): the partial-load API this gem calls
   spec.add_dependency "expressir", "~> 2.3", ">= 2.3.5"
-  spec.add_dependency "isodoc"
-  spec.add_dependency "liquid"
+  spec.add_dependency "isodoc", ">= 3.5.0"
+  spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "lutaml-lml"
   spec.add_dependency "lutaml-model", "~> 0.8.4"
   spec.add_dependency "lutaml-uml", ">= 0.5", "< 2"
   spec.add_dependency "ogc-gml", "~> 1.1"
-  spec.add_dependency "relaton-cli"
-
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.54
+  version: 0.7.55.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: lutaml-lml
   requirement: !ruby/object:Gem::Requirement
@@ -162,20 +162,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: relaton-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Metanorma plugin for LutaML
 email:
 - open.source@ribose.com