metanorma-plugin-lutaml 0.7.7 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59529d97e0b2a61af4daf695ab6e3490ccdb5e99f5a351e53ab8c822c063a17
-  data.tar.gz: 2a30e8db498027922dc4f848057880a13d4a240310b2c01122ed2176be4cbf2e
+  metadata.gz: 29510e3dd02119b47d1d179c94d0a954b596dc0255410091d8c0db366e6a4dd3
+  data.tar.gz: b2502ffd6bea597bc56c8882712c58d13e72799eca5387c76329a9ef813d62eb
 SHA512:
-  metadata.gz: e5b8fffe0ec8df9e9ae6bddff29202f9c65a40b43a4790980799763cad78f950cab5c59f0b07ac6c7e774f4199f9aa5cf9c9ec2470d4d67622d3e491416de09e
-  data.tar.gz: c530eea53a62605af3df803eeddffdb5feee15e91856dff2541fe2b5831cd5e27ad5052fab01d101763eb9a890b0154aad28a934a40caf980111d2647eda5448
+  metadata.gz: b06a2f0d8be8e9073c3f631b260d8e88525353afb8e4e6cdf11bd6db9d78994543eb6a9acda9a2602212943ff972a700efa7c7d3dc870951cd3f2c6e5a219ff2
+  data.tar.gz: c80c2d456bec408dccb3c621397bc9313e2cc6a53cf7c5671d504737087ebb597b446d2fc043e3deaaf809a0941f0f3b732837bf4b5aee404685d70cd6ab0d27

data/Gemfile

@@ -11,5 +11,3 @@ begin
 rescue StandardError
   nil
 end
-
-gem "ogc-gml", github: "lutaml/ogc-gml"

data/lib/metanorma/plugin/lutaml/liquid/custom_filters.rb

@@ -1,5 +1,4 @@
 require "coradoc"
-require "coradoc/input/html"
 
 module Metanorma
   module Plugin
@@ -7,6 +6,7 @@ module Metanorma
       module Liquid
         module CustomFilters
           def html2adoc(input)
+            # Coradoc::ReverseAdoc.convert(input)
             Coradoc::Input::HTML.convert(input)
           end
 

data/lib/metanorma/plugin/lutaml/liquid_drops/klass_table_attribute_drop.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class KlassTableAttributeDrop < Liquid::Drop
+  LOWER_VALUE_MAPPINGS = {
+    "C" => "0",
+    "M" => "1",
+  }.freeze
+
+  def initialize(attr) # rubocop:disable Lint/MissingSuper
+    @attr = attr
+  end
+
+  def id
+    @attr[:id]
+  end
+
+  def name
+    @attr[:name]
+  end
+
+  def type
+    @attr[:type]
+  end
+
+  def xmi_id
+    @attr[:xmi_id]
+  end
+
+  def is_derived
+    @attr[:is_derived]
+  end
+
+  def cardinality
+    min = @attr[:cardinality]["min"]
+    min = min.nil? ? nil : LOWER_VALUE_MAPPINGS[min]
+
+    "#{min}..#{@attr[:cardinality]['max']}"
+  end
+
+  def definition
+    @attr[:definition]
+  end
+
+  def association
+    @attr[:association]
+  end
+
+  def has_association?
+    !!@attr[:association]
+  end
+
+  def upper_klass
+    @attr[:upper_klass]
+  end
+
+  def name_ns
+    @attr[:name_ns]
+  end
+
+  def type_ns
+    @attr[:type_ns]
+  end
+
+  def gen_name
+    @attr[:gen_name]
+  end
+end

data/lib/metanorma/plugin/lutaml/liquid_drops/klass_table_content_drop.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class KlassTableContentDrop < Liquid::Drop
+  def initialize(content) # rubocop:disable Lint/MissingSuper
+    @content = content
+  end
+
+  def owned_props
+    @content[:owned_props]
+  end
+
+  def assoc_props
+    @content[:assoc_props]
+  end
+
+  def inherited_props
+    @content[:inherited_props]
+  end
+
+  def inherited_assoc_props
+    @content[:inherited_assoc_props]
+  end
+end

data/lib/metanorma/plugin/lutaml/liquid_drops/klass_table_drop.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class KlassTableDrop < Liquid::Drop
+  def initialize(klass) # rubocop:disable Lint/MissingSuper
+    @klass = klass
+  end
+
+  def id
+    @klass[:general_id]
+  end
+
+  def name
+    @klass[:name]
+  end
+
+  def stereotype
+    @klass[:stereotype]
+  end
+
+  def definition
+    @klass[:definition]
+  end
+
+  def type
+    @klass[:type]
+  end
+
+  def upper_klass
+    @klass[:general_upper_klass]
+  end
+
+  def general
+    KlassTableGeneralDrop.new(@klass[:general]) if @klass[:general]
+  end
+
+  def has_general?
+    !!@klass[:general]
+  end
+
+  def attributes
+    @klass[:general_attributes].map do |attr|
+      KlassTableAttributeDrop.new(attr)
+    end
+  end
+end

data/lib/metanorma/plugin/lutaml/liquid_drops/klass_table_general_drop.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class KlassTableGeneralDrop < Liquid::Drop
+  def initialize(gen) # rubocop:disable Lint/MissingSuper
+    @gen = gen
+  end
+
+  def id
+    @gen[:general_id]
+  end
+
+  def name
+    @gen[:general_name]
+  end
+
+  def upper_klass
+    @gen[:general_upper_klass]
+  end
+
+  def general
+    KlassTableGeneralDrop.new(@gen[:general]) if @gen[:general]
+  end
+
+  def has_general?
+    !!@gen[:general]
+  end
+
+  def attributes
+    @gen[:general_attributes].map do |attr|
+      KlassTableAttributeDrop.new(attr)
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+{%- for attr in attributes -%}
+  {%- if attr.has_association? != false -%}
+    {%- capture name_col -%}
+      {{ attr.name_ns }}:{{ attr.name }}
+      ({{ attr.gen_name }})
+    {%- endcapture -%}
+    | {{ name_col | newline_to_br }}
+    | {{ attr.type_ns }}:{{ attr.type }} [{{ attr.cardinality }}] 
+    | {{ attr.definition }}
+  {%- endif -%}
+{%- endfor -%}

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

@@ -0,0 +1,11 @@
+{%- for attr in attributes -%}
+  {%- if attr.has_association? == false -%}
+    {%- capture name_col -%}
+      {{ attr.name_ns }}:{{ attr.name }}
+      ({{ attr.gen_name }})
+    {%- endcapture -%}
+    | {{ name_col | newline_to_br }}
+    | {{ attr.type }} [{{ attr.cardinality }}] 
+    | {{ attr.definition }}
+  {%- endif -%}
+{%- endfor -%}

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

@@ -0,0 +1,23 @@
+[cols="1a,1a,2a"]
+|===
+| 型の定義
+2+| {{ root.definition }}
+
+h| 上位の型 2+| {{ root.general.upper_klass }}:{{ root.general.name }}
+h| ステレオタイプ 2+| << {{ root.stereotype }} >>
+
+3+h| 継承する属性
+h| 属性名 h| 属性の型及び多重度 h| 定義
+{{ content.inherited_props }}
+
+3+h| 自身に定義された属性
+{{ content.owned_props }}
+
+3+h| 継承する関連役割
+h| 関連役割名 h| 関連役割の型及び多重度 h| 定義
+{{ content.inherited_assoc_props }}
+
+3+h| 自身に定義された関連役割
+h| 関連役割名 h| 関連役割の型及び多重度 h| 定義
+{{ content.assoc_props }}
+|===

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

@@ -0,0 +1,310 @@
+# frozen_string_literal: true
+
+require "liquid"
+require "asciidoctor"
+require "asciidoctor/reader"
+require "lutaml"
+# require "lutaml/uml"
+require "xmi"
+require "lutaml/xmi"
+require "metanorma/plugin/lutaml/utils"
+require "metanorma/plugin/lutaml/asciidoctor/preprocessor"
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      #  Macro for quick rendering of datamodel attributes/values tables
+      #  from liquid drop object
+      class LutamlEaXmiPreprocessor <
+          ::Asciidoctor::Extensions::Preprocessor
+        MACRO_REGEXP =
+          /\[lutaml_ea_xmi,([^,]+),?(.+)?\]/.freeze
+        LIQUID_INCLUDE_PATH = File.join(
+          Gem.loaded_specs["metanorma-plugin-lutaml"].full_gem_path,
+          "lib", "metanorma", "plugin", "lutaml", "liquid_templates"
+        )
+        DEFAULT_RENDER_INCLUDE = "packages"
+        RENDER_STYLES_INCLUDES = {
+          "default" => "packages",
+          "entity_list" => "packages_entity_list",
+          "entity_list_class" => "packages_entity_list_class",
+          "data_dictionary" => "packages_data_dictionary",
+        }.freeze
+        RENDER_STYLE_ATTRIBUTE = "render_style"
+        SUPPORTED_NESTED_MACRO = %w[
+          before diagram_include_block after include_block package_text
+        ].freeze
+        # search document for block `lutaml_ea_xmi`
+        #  read include derectives that goes after that in block and transform
+        #  into yaml2text blocks
+        def process(document, reader)
+          r = Asciidoctor::PreprocessorNoIfdefsReader.new document, reader.lines
+          input_lines = r.readlines.to_enum
+          Asciidoctor::PreprocessorNoIfdefsReader
+            .new(document, processed_lines(document, input_lines))
+        end
+
+        private
+
+        def lutaml_document_from_file_or_cache(document, file_path, yaml_config)
+          full_path = Utils.relative_file_path(document, file_path)
+          if document.attributes["lutaml_xmi_cache"] &&
+              document.attributes["lutaml_xmi_cache"][full_path]
+            return document.attributes["lutaml_xmi_cache"][full_path]
+          end
+
+          yaml_config["ea_extension"]&.each do |ea_extension_path|
+            ea_extension_full_path = File.expand_path(
+              ea_extension_path, File.dirname(file_path)
+            )
+            Xmi::EaRoot.load_extension(ea_extension_full_path)
+          end
+
+          result_document = ::Lutaml::XMI::Parsers::XML.serialize_xmi_to_liquid(
+            File.new(
+              full_path, encoding: "UTF-8"
+            ),
+          )
+
+          document.attributes["lutaml_xmi_cache"] ||= {}
+          document.attributes["lutaml_xmi_cache"][full_path] = result_document
+          result_document
+        end
+
+        def parse_yaml_config_file(document, file_path)
+          return {} if file_path.nil?
+
+          relative_file_path = Utils.relative_file_path(document, file_path)
+          YAML.safe_load(File.read(relative_file_path, encoding: "UTF-8"))
+        end
+
+        def processed_lines(document, input_lines)
+          result = []
+          loop do
+            result.push(*process_text_blocks(document, input_lines))
+          end
+          result
+        end
+
+        def process_text_blocks(document, input_lines)
+          line = input_lines.next
+          block_match = line.match(MACRO_REGEXP)
+
+          return [line] if block_match.nil?
+
+          yaml_config = parse_yaml_config_file(document, block_match[2])
+          lutaml_document = lutaml_document_from_file_or_cache(document,
+                                                               block_match[1],
+                                                               yaml_config)
+          fill_in_diagrams_attributes(document, lutaml_document)
+          model_representation(
+            lutaml_document, document,
+            collect_additional_context(document, input_lines, input_lines.next),
+            yaml_config
+          )
+        end
+
+        def fill_in_entities_refs_attributes(document,
+          lutaml_document, options)
+          # render_style = options.fetch(RENDER_STYLE_ATTRIBUTE, "default")
+          all_children_packages = lutaml_document.packages
+            .map(&:children_packages).flatten
+          package_flat_packages = lambda do |pks|
+            pks.each_with_object({}) do |package, res|
+              res[package.name] = package.xmi_id
+            end
+          end
+          children_pks = package_flat_packages.call(all_children_packages)
+          ref_dictionary = package_flat_packages.call(lutaml_document.packages)
+            .merge(children_pks)
+          %w[class enum data_type].each do |type|
+            package_flat = lambda do |pks|
+              pks.each_with_object({}) do |package, res|
+                plural = type == "class" ? "classes" : "#{type}s"
+                package.send(plural).map do |entity|
+                  res["#{type}:#{package.name}:#{entity.name}"] = entity.xmi_id
+                end
+              end
+            end
+            children_pks_diags = package_flat.call(all_children_packages)
+            ref_dictionary = ref_dictionary
+              .merge(package_flat.call(lutaml_document.packages)
+                                      .merge(children_pks_diags))
+          end
+          document.attributes["lutaml_entity_id"] = ref_dictionary
+        end
+
+        def fill_in_diagrams_attributes(document, lutaml_document)
+          package_flat_diagrams = lambda do |pks|
+            pks.each_with_object({}) do |package, res|
+              package.diagrams.map do |diag|
+                res["#{package.name}:#{diag.name}"] = diag.xmi_id
+              end
+            end
+          end
+          children_pks_diags = package_flat_diagrams.call(
+            lutaml_document.packages.map(&:children_packages).flatten,
+          )
+
+          document.attributes["lutaml_figure_id"] = package_flat_diagrams
+            .call(lutaml_document.packages)
+            .merge(children_pks_diags)
+        end
+
+        def collect_additional_context(document, input_lines, end_mark)
+          additional_context = Hash.new { |hash, key| hash[key] = [] }
+          additional_context["all_macros"] = []
+          block_lines = []
+          while (block_line = input_lines.next) != end_mark
+            block_lines.push(block_line)
+          end
+          processed_lines =
+            process(document, ::Asciidoctor::PreprocessorReader.new(
+                                document, block_lines
+                              ))
+              .read_lines
+          block_document = ::Asciidoctor::Document
+            .new(processed_lines, {}).parse
+          block_document.blocks.each do |block|
+            next unless SUPPORTED_NESTED_MACRO.include?(block.attributes["role"])
+
+            attrs = block.attributes
+            name = attrs.delete("role")
+            package = attrs.delete("package")
+            macro_keyword = [name, package].compact.join(";")
+            block_text = block.lines.length.positive? ? block.lines.join("\n") : ""
+            additional_context[macro_keyword]
+              .push({ "text" => block_text }.merge(attrs))
+            additional_context["all_macros"]
+              .push({ "text" => block_text,
+                      "type" => name, "package" => package }.merge(attrs))
+          end
+          additional_context
+        end
+
+        def package_level(lutaml_document, level)
+          return lutaml_document if level <= 0
+
+          package_level(lutaml_document["packages"].first, level - 1)
+        end
+
+        def create_context_object(lutaml_document, additional_context, options)
+          root_package = package_level(lutaml_document.to_liquid,
+                                       options["package_root_level"] || 1)
+          if options.empty? || options["packages"].nil?
+            return {
+              "render_nested_packages" => true,
+              "packages" => root_package["packages"],
+              "root_packages" => [root_package],
+              "additional_context" => additional_context
+                  .merge("external_classes" => options["external_classes"]),
+              "name" => root_package["name"],
+            }
+          end
+
+          all_packages = [root_package, *root_package["children_packages"]]
+          {
+            "packages" => sort_and_filter_out_packages(all_packages, options),
+            "package_entities" => package_entities(options),
+            "package_skip_sections" => package_skip_sections(options),
+            "additional_context" => additional_context
+              .merge("external_classes" => options["external_classes"]),
+            "root_packages" => [root_package],
+            "render_nested_packages" => options["render_nested_packages"] ||
+              false,
+            "name" => root_package["name"],
+          }
+        end
+
+        def package_entities(options)
+          return {} unless options["packages"]
+
+          options["packages"]
+            .find_all { |entity| entity.is_a?(Hash) && entity.values.first["render_entities"] }
+            .map do |entity|
+            [entity.keys.first,
+             entity.values.first["render_entities"].map { |n| [n, true] }.to_h]
+          end.to_h
+        end
+
+        def package_skip_sections(options)
+          return {} unless options["packages"]
+
+          options["packages"]
+            .find_all { |entity| entity.is_a?(Hash) && entity.values.first["skip_tables"] }
+            .map do |entity|
+            [entity.keys.first, entity.values.first["skip_tables"].map do |n|
+                                  [n, true]
+                                end.to_h]
+          end.to_h
+        end
+
+        def sort_and_filter_out_packages(all_packages, options)
+          return all_packages if options["packages"].nil?
+
+          result = []
+          # Step one - filter out all skipped packages
+          options["packages"]
+            .find_all { |entity| entity.is_a?(Hash) && entity["skip"] }
+            .each do |entity|
+              entity_regexp = config_entity_regexp(entity["skip"])
+              all_packages
+                .delete_if { |package| package["name"] =~ entity_regexp }
+            end
+          # Step two - select supplied packages by pattern
+          options["packages"]
+            .find_all { |entity| entity.is_a?(String) || (entity.is_a?(Hash) && !entity["skip"]) }
+            .each do |entity_obj|
+              entity = entity_obj.is_a?(String) ? entity_obj : entity_obj.keys.first
+              entity_regexp = config_entity_regexp(entity)
+              all_packages.each do |package|
+                if package["name"]&.match?(entity_regexp)
+                  result.push(package)
+                  all_packages
+                    .delete_if { |nest_package| nest_package["name"] == package["name"] }
+                end
+              end
+            end
+          result
+        end
+
+        def config_entity_regexp(entity)
+          additional_sym = ".*" if /\*$/.match?(entity)
+          %r{^#{Regexp.escape(entity.delete('*'))}#{additional_sym}$}
+        end
+
+        def model_representation(lutaml_document, document, additional_context,
+options)
+          fill_in_entities_refs_attributes(document, lutaml_document, options)
+          render_result, errors = Utils.render_liquid_string(
+            template_string: template(options["section_depth"] || 2,
+                                      options["render_style"],
+                                      options["include_root"]),
+            context_items: create_context_object(lutaml_document,
+                                                 additional_context,
+                                                 options),
+            context_name: "context",
+            document: document,
+            include_path: LIQUID_INCLUDE_PATH,
+          )
+          Utils.notify_render_errors(document, errors)
+          render_result.split("\n")
+        end
+
+        def template(section_depth, render_style, include_root)
+          include_name = RENDER_STYLES_INCLUDES.fetch(render_style,
+                                                      DEFAULT_RENDER_INCLUDE)
+          result = ""
+          if include_root
+            result += <<~LIQUID
+              {% include "#{include_name}", package_skip_sections: context.package_skip_sections, package_entities: context.package_entities, context: context.root_packages, additional_context: context.additional_context, render_nested_packages: false %}
+            LIQUID
+          end
+          result + <<~LIQUID
+            {% include "#{include_name}", depth: #{section_depth}, package_skip_sections: context.package_skip_sections, package_entities: context.package_entities, context: context, additional_context: context.additional_context, render_nested_packages: context.render_nested_packages %}
+          LIQUID
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require_relative "liquid_drops/klass_table_drop"
+require_relative "liquid_drops/klass_table_attribute_drop"
+require_relative "liquid_drops/klass_table_general_drop"
+require_relative "liquid_drops/klass_table_content_drop"
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      class LutamlKlassTableBlockMacro < ::Asciidoctor::Extensions::BlockMacroProcessor
+        DEFAULT_TEMPLATE_PATH = File.join(
+          Gem::Specification.find_by_name("metanorma-plugin-lutaml").gem_dir,
+          "lib/metanorma/plugin/lutaml/liquid_templates/<NAME>.liquid",
+        )
+        DEFAULT_TABLE_TEMPLATE = DEFAULT_TEMPLATE_PATH
+          .gsub("<NAME>", "_klass_table")
+        DEFAULT_ROW_TEMPLATE = DEFAULT_TEMPLATE_PATH
+          .gsub("<NAME>", "_klass_row")
+        DEFAULT_ASSOC_ROW_TEMPLATE = DEFAULT_TEMPLATE_PATH
+          .gsub("<NAME>", "_klass_assoc_row")
+
+        use_dsl
+        named :lutaml_klass_table
+
+        def process(parent, target, attrs)
+          result_path = Utils.relative_file_path(parent.document, target)
+
+          gen = ::Lutaml::XMI::Parsers::XML.serialize_generalization_by_name(
+            result_path, attrs["name"]
+          )
+
+          render(gen, parent, attrs)
+        end
+
+        private
+
+        def render(gen, parent, attrs) # rubocop:disable Metrics/MethodLength
+          content = {}
+
+          content[:owned_props] = render_owned_props(
+            gen, parent, attrs
+          )
+          content[:assoc_props] = render_assoc_props(
+            gen, parent, attrs
+          )
+          content[:inherited_props] = render_inherited_props(
+            gen, parent, attrs
+          )
+          content[:inherited_assoc_props] = render_inherited_assoc_props(
+            gen, parent, attrs
+          )
+
+          # content[:inherited_props] += render_named_inherited_props(
+          #   gen, parent, attrs, "gml"
+          # )
+          # content[:inherited_props] += render_named_inherited_props(
+          #   gen, parent, attrs, "core"
+          # )
+          # content[:inherited_assoc_props] += render_named_inherited_props(
+          #   gen, parent, attrs, "gen"
+          # )
+
+          rendered_table = render_table(gen, parent, attrs, content)
+
+          block = create_open_block(parent, "", attrs)
+          parse_content(block, rendered_table, attrs)
+        end
+
+        def render_table(gen, parent, attrs, content)
+          table_tmpl = get_template(
+            parent.document, attrs["table_template"], :table
+          )
+
+          table_tmpl.assigns["root"] = KlassTableDrop.new(gen)
+          table_tmpl.assigns["content"] =
+            KlassTableContentDrop.new(content)
+
+          table_tmpl.render
+        end
+
+        def render_general_rows(general_item, parent, attrs)
+          row_tmpl = get_template(
+            parent.document, attrs["row_template"], :row
+          )
+          render_rows(general_item, row_tmpl)
+        end
+
+        def render_assoc_rows(general_item, parent, attrs)
+          row_tmpl = get_template(
+            parent.document, attrs["assoc_template"], :assoc_row
+          )
+          render_rows(general_item, row_tmpl)
+        end
+
+        def render_rows(general_item, row_tmpl)
+          gen_attrs = general_item[:general_attributes]
+          upper_klass = general_item[:general_upper_klass]
+          gen_name = general_item[:general_name]
+          attributes = prepare_row_drops(gen_attrs, upper_klass, gen_name)
+          row_tmpl.assigns["attributes"] = attributes
+          row_tmpl.render
+        end
+
+        def prepare_row_drops(gen_attrs, upper_klass, gen_name) # rubocop:disable Metrics/MethodLength
+          gen_attrs.map do |attr|
+            attr[:gen_name] = gen_name
+            attr[:upper_klass] = upper_klass
+            attr[:name_ns] = case attr[:type_ns]
+                             when "core", "gml"
+                               upper_klass
+                             else
+                               attr[:type_ns]
+                             end
+
+            attr[:name_ns] = upper_klass if attr[:name_ns].nil?
+
+            KlassTableAttributeDrop.new(attr)
+          end
+        end
+
+        def render_owned_props(gen, parent, attrs)
+          render_general_rows(gen, parent, attrs)
+        end
+
+        def render_assoc_props(gen, parent, attrs)
+          render_assoc_rows(gen, parent, attrs)
+        end
+
+        def render_gml_inherited_props(gen, parent, attrs)
+          render_named_inherited_props(gen, parent, attrs, "gml")
+        end
+
+        def render_core_inherited_props(gen, parent, attrs)
+          render_named_inherited_props(gen, parent, attrs, "core")
+        end
+
+        def render_gen_inherited_props(gen, parent, attrs)
+          render_named_inherited_props(gen, parent, attrs, "gen")
+        end
+
+        def render_named_inherited_props(gen, parent, attrs, name)
+          attr_key = "#{name}_attributes".to_sym
+          general_item = {}
+          general_item[:general_attributes] = gen[attr_key]
+          general_item[:general_upper_klass] = gen[attr_key].first[:upper_klass]
+          general_item[:general_name] = name
+
+          render_general_rows(general_item, parent, attrs)
+        end
+
+        def render_inherited_props(gen, parent, attrs)
+          render_inherited_rows(gen, parent, attrs, assoc: false)
+        end
+
+        def render_inherited_assoc_props(gen, parent, attrs)
+          render_inherited_rows(gen, parent, attrs, assoc: true)
+        end
+
+        def render_inherited_rows(gen, parent, attrs, assoc: false) # rubocop:disable Metrics/MethodLength
+          rendered_rows = ""
+          general_item = gen[:general]
+
+          while general_item && !general_item.empty?
+            rendered_rows += if assoc
+                               render_assoc_rows(general_item, parent, attrs)
+                             else
+                               render_general_rows(general_item, parent, attrs)
+                             end
+            general_item = general_item[:general]
+          end
+
+          rendered_rows
+        end
+
+        def get_template(document, template_path, tmpl_type)
+          if template_path.nil?
+            template_path = get_default_template_path(tmpl_type)
+          end
+
+          rel_tmpl_path = Utils.relative_file_path(
+            document, template_path
+          )
+
+          ::Liquid::Template.parse(File.read(rel_tmpl_path))
+        end
+
+        def get_default_template_path(tmpl_type)
+          case tmpl_type
+          when :row
+            DEFAULT_ROW_TEMPLATE
+          when :assoc_row
+            DEFAULT_ASSOC_ROW_TEMPLATE
+          else
+            DEFAULT_TABLE_TEMPLATE
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -121,10 +121,10 @@ options)
                 end
               end
             end
-            children_pks_daigs = package_flat.call(all_children_packages)
+            children_pks_diags = package_flat.call(all_children_packages)
             ref_dictionary = ref_dictionary
               .merge(package_flat.call(lutaml_document.packages)
-                                      .merge(children_pks_daigs))
+                                      .merge(children_pks_diags))
           end
           document.attributes["lutaml_entity_id"] = ref_dictionary
         end
@@ -138,12 +138,12 @@ options)
               end
             end
           end
-          children_pks_daigs = package_flat_diagrams.call(
+          children_pks_diags = package_flat_diagrams.call(
             lutaml_document.packages.map(&:children_packages).flatten,
           )
           document.attributes["lutaml_figure_id"] = package_flat_diagrams
             .call(lutaml_document.packages)
-            .merge(children_pks_daigs)
+            .merge(children_pks_diags)
         end
 
         def collect_additional_context(document, input_lines, end_mark)
@@ -265,7 +265,7 @@ options)
 
         def config_entity_regexp(entity)
           additional_sym = ".*" if /\*$/.match?(entity)
-          %r{^#{Regexp.escape(entity.gsub('*', ''))}#{additional_sym}$}
+          %r{^#{Regexp.escape(entity.delete('*'))}#{additional_sym}$}
         end
 
         def model_representation(lutaml_document, document, additional_context,

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.7.7".freeze
+      VERSION = "0.7.9".freeze
     end
   end
 end

data/lib/metanorma-plugin-lutaml.rb

@@ -3,6 +3,7 @@ require "metanorma/plugin/lutaml/lutaml_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_uml_class_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_uml_datamodel_description_preprocessor"
+require "metanorma/plugin/lutaml/lutaml_ea_xmi_preprocessor"
 require "metanorma/plugin/lutaml/lutaml_diagram_block"
 require "metanorma/plugin/lutaml/lutaml_diagram_block_macro"
 require "metanorma/plugin/lutaml/lutaml_figure_inline_macro"
@@ -11,6 +12,7 @@ require "metanorma/plugin/lutaml/lutaml_ea_diagram_block_macro"
 require "metanorma/plugin/lutaml/lutaml_gml_dictionary_base"
 require "metanorma/plugin/lutaml/lutaml_gml_dictionary_block_macro"
 require "metanorma/plugin/lutaml/lutaml_gml_dictionary_block"
+require "metanorma/plugin/lutaml/lutaml_klass_table_block_macro"
 
 module Metanorma
   module Plugin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -332,7 +332,14 @@ files:
 - lib/metanorma/plugin/lutaml/liquid/multiply_local_file_system.rb
 - lib/metanorma/plugin/lutaml/liquid_drops/gml_dictionary_drop.rb
 - lib/metanorma/plugin/lutaml/liquid_drops/gml_dictionary_entry_drop.rb
+- lib/metanorma/plugin/lutaml/liquid_drops/klass_table_attribute_drop.rb
+- lib/metanorma/plugin/lutaml/liquid_drops/klass_table_content_drop.rb
+- lib/metanorma/plugin/lutaml/liquid_drops/klass_table_drop.rb
+- lib/metanorma/plugin/lutaml/liquid_drops/klass_table_general_drop.rb
 - lib/metanorma/plugin/lutaml/liquid_templates/_diagrams_block.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_klass_assoc_row.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_klass_row.liquid
+- lib/metanorma/plugin/lutaml/liquid_templates/_klass_table.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages_class.liquid
 - lib/metanorma/plugin/lutaml/liquid_templates/_packages_data_dictionary.liquid
@@ -348,10 +355,12 @@ files:
 - lib/metanorma/plugin/lutaml/lutaml_diagram_block.rb
 - lib/metanorma/plugin/lutaml/lutaml_diagram_block_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_ea_diagram_block_macro.rb
+- lib/metanorma/plugin/lutaml/lutaml_ea_xmi_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_figure_inline_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_gml_dictionary_base.rb
 - lib/metanorma/plugin/lutaml/lutaml_gml_dictionary_block.rb
 - lib/metanorma/plugin/lutaml/lutaml_gml_dictionary_block_macro.rb
+- lib/metanorma/plugin/lutaml/lutaml_klass_table_block_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_table_inline_macro.rb
 - lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb