metanorma-plugin-lutaml 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241b12b07d457ea48176e22ce2cacc4a533c2ffc5435465637d51d37d6da1e80
-  data.tar.gz: 2a2bd1fe63f4febdae9ce40679f525cfe476f2a773ab15c5de9622145dbdbd7f
+  metadata.gz: c3ac25c64f997af2bb3228af3816a9aafe2ea0b62a8c80eaa58f598cba8085e2
+  data.tar.gz: 824ab598854889b1a7079d872d96f515757719436eba95850eb7a85d924e23fc
 SHA512:
-  metadata.gz: 33ef546ecbc2929104ccda434021ef50afbd067d5f466b7d07181aea92415a15aaad67fdf3848b4bd0cf93878e032b007b437a630b1d5ea87398396b446b622f
-  data.tar.gz: 7373d126f78af6063dbfea6076018712f4185a6c0e75e50309befc23bf1e34beeec86ab80d8b36f9c73eb7e5ae238b0522e85ec307ee434538222790cc05d8c3
+  metadata.gz: 68246a6140b1a29548a77c10e7949058652c4be9e1ec2ee150d698f777e0bb91c2c4d75abaac3f69b8d09089f945cc24fff150a9ac83acf6ff36c521bd8c1c97
+  data.tar.gz: a8c60e3c539d000334fafa9b43d3e89a144dd327f9c212445aae35a547f1dd6ce0214df15b3223d8306829d3e3f938318331b1581c9220ff330e8cfd5817f0fb

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

@@ -135,7 +135,7 @@ None.
 {% assign non_unions = package.data_types | where: "stereotype", "DataType"  %}
 {% if non_unions.size > 0 %}
 {% for data_type in non_unions %}
-{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}<<{{ assoc.member_end }}-section,{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
+{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}<<{{ ref_id }},{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
 [[{{ data_type.name }}-section]]
 {{equalsigns}}== {{ data_type.name }}
 
@@ -166,7 +166,8 @@ h| Constraint:
 {% if assoc.member_end_attribute_name.size > 0 %}
 {% capture cardinality %}&#91;{% case assoc.member_end_cardinality.min %}{% when "C" %}0{% when "M" %}1{% else %}{{assoc.member_end_cardinality.min}}{% endcase %}..{{ assoc.member_end_cardinality.max }}&#93;{% endcapture %}
 | {{ assoc.member_end_attribute_name }}
-| <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}
+| <<{{ ref_id }},{{assoc.member_end}}>> {{ cardinality }}
 | {{ assoc.definition | replace: '|', '\|' }}
 {% endif %}
 {% endfor %}
@@ -195,7 +196,8 @@ h| Constraint:
 {% for attr in data_type.attributes %}
 {% capture cardinality %}&#91;{% case attr.cardinality.min %}{% when 'C' %}0{% when 'M' %}1{% else %}{{ attr.cardinality.min }}{% endcase %}..{{ attr.cardinality.max }}&#93;{% endcapture %}
 | {{ attr.name }}
-| <<{{ attr.type }}-section,{{ attr.type }}>> {{ cardinality }}
+{% capture ref_id %}{% if additional_context.external_classes[attr.type] %}{{ additional_context.external_classes[attr.type] }}{% else %}{{ attr.type }}-section{% endif %}{% endcapture %}
+| <<{{ ref_id }},{{ attr.type }}>> {{ cardinality }}
 | {{ attr.definition | replace: '|', '\|' }}
 
 {% endfor %}

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

@@ -1,5 +1,5 @@
 {% capture equalsigns %}{% for count in (1..depth) %}={% endfor %}{% endcapture %}
-{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}<<{{ assoc.member_end }}-section,{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
+{% capture generalizations %}{% assign inheritance = klass.associations | where: "member_end_type", "inheritance" %}{% for assoc in inheritance %}{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}<<{{ ref_id }},{{ assoc.member_end }}>>{% endfor %}{% endcapture %}
 [[{{ klass.name }}-section]]
 {{equalsigns}} {{ klass.name }}
 {%comment%}(inside class: depth is {{ depth }}, equalsigns {{equalsigns}}){%endcomment%}
@@ -31,7 +31,8 @@ h| Constraint:
 {% if assoc.member_end_attribute_name.size > 0 %}
 {% capture cardinality %}&#91;{% case assoc.member_end_cardinality.min %}{% when "C" %}0{% when "M" %}1{% else %}{{assoc.member_end_cardinality.min}}{% endcase %}..{{ assoc.member_end_cardinality.max }}&#93;{% endcapture %}
 | {{ assoc.member_end_attribute_name }}
-| <<{{assoc.member_end}}-section,{{assoc.member_end}}>> {{ cardinality }}
+{% capture ref_id %}{% if additional_context.external_classes[assoc.member_end] %}{{ additional_context.external_classes[assoc.member_end] }}{% else %}{{ assoc.member_end }}-section{% endif %}{% endcapture %}
+| <<{{ ref_id }},{{assoc.member_end}}>> {{ cardinality }}
 | {{ assoc.definition | replace: '|', '\|' }}
 {% endif %}
 {% endfor %}
@@ -59,7 +60,8 @@ h| Constraint:
 {% for attr in klass.attributes %}
 {% capture cardinality %}&#91;{% case attr.cardinality.min %}{% when 'C' %}0{% when 'M' %}1{% else %}{{ attr.cardinality.min }}{% endcase %}..{{ attr.cardinality.max }}&#93;{% endcapture %}
 | {{ attr.name }}
-| <<{{ attr.type }}-section,{{ attr.type }}>> {{ cardinality }}
+{% capture ref_id %}{% if additional_context.external_classes[attr.type] %}{{ additional_context.external_classes[attr.type] }}{% else %}{{ attr.type }}-section{% endif %}{% endcapture %}
+| <<{{ ref_id }},{{ attr.type }}>> {{ cardinality }}
 | {{ attr.definition | replace: '|', '\|' }}
 
 {% endfor %}

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

@@ -89,7 +89,8 @@
 
 {% for klass in package.classes %}
 {% unless not_classes_stereotypes contains klass.stereotype %}
-| <<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
+{% capture ref_id %}{% if additional_context.external_classes[klass.name] %}{{ additional_context.external_classes[klass.name] }}{% else %}{{ klass.name }}-section{% endif %}{% endcapture %}
+| <<{{ ref_id }},{{ klass.name }}>> «{{ klass.stereotype }}»
 | {{ klass.definition | replace: '|', '\|' }}
 
 {% endunless %}
@@ -120,36 +121,6 @@
 
 {% endif %}
 
-{% comment %} {% if package.data_types.size > 0 %}
-.Data types used in {{ package.name }}
-[cols="2a,6a",options="header"]
-|===
-|Name |Description
-
-{% for klass in package.data_types %}
-|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
-|{{ klass.definition | replace: '|', '\|' }}
-
-{% endfor %}
-
-|===
-{% endif %}
-
-{% if package.enums.size > 0 %}
-.Enumerated Classes used in {{ package.name }}
-[cols="2a,6a",options="header"]
-|===
-|Name |Description
-
-{% for klass in package.enums %}
-|<<{{ klass.name }}-section,{{ klass.name }}>> «{{ klass.stereotype }}»
-|{{ klass.definition | replace: '|', '\|' }}
-
-{% endfor %}
-
-|===
-{% endif %} {% endcomment %}
-
 {% if additional_context.all_macros.size > 0 %}
 {% assign sorted_all_macros = additional_context.all_macros | where: "position", "after" | sort: 'index' %}
 {% for block in sorted_all_macros %}

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

@@ -163,7 +163,7 @@ module Metanorma
               'render_nested_packages' => true,
               "packages" => root_package['packages'],
               "root_packages" => [root_package],
-              "additional_context" => additional_context,
+              "additional_context" => additional_context.merge("external_classes" => options["external_classes"]),
               "name" => root_package['name']
             }
           end
@@ -173,7 +173,7 @@ module Metanorma
             "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,
+            "additional_context" => additional_context.merge("external_classes" => options["external_classes"]),
             "root_packages" => [root_package],
             "name" => root_package['name']
           }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid