stepmod-utils 0.3.29 → 0.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20464f99d7ac2bb1ef98259e6e66d356fde298ca671e67587a57e072fdaad77c
-  data.tar.gz: 21ef21a08bd1dd78dca12c5f960ff8b715dbfbb3183a2d6ae3bb2da39300f53a
+  metadata.gz: e7459842ad5de4eed3337c26d6267a5d85e6255f8a730a443d27dfd93ec76bbf
+  data.tar.gz: e43d507c19b7027d0c22f6bb0e7fba544db9443a7a4df36162e3b8af3f2a28c7
 SHA512:
-  metadata.gz: e941853286cd6888c10323d8dce31b8347764e9588805eeae62248f8b1bcbf5c0f4e9324a24886704580dc874aa8ff92abc4d921a6bac224db3ff1983aa14707
-  data.tar.gz: 12ef57a910098c8f9cd9f98ad0af39072b6fb7496a6cbb7b238b401ee8f2f8dabaa4296ae2caaa3e5f24e54ce76674a76c8c8aa83c627b51e17d49706963c1b2
+  metadata.gz: a547cb2ee89f17a9d869dbc19aa6c74ee15a830c5bb88836166c4bf7d61532268508982e171ff318f2cb163b4041187d3e8638141a26e9d340433ebcb1b3ae58
+  data.tar.gz: 61e26c2579d309560b5336868e1c75f3b18cca9cd036272f990e8d872118e779ff1b4969ac55c84c3f8fa9c39ae76d93cac86f8ac290d068f9acde029cd4f1ec

data/README.adoc

@@ -1,6 +1,6 @@
 = STEPmod utilities
 
-image:https://img.shields.io/gem/v/metanorma.svg["Gem Version", link="https://rubygems.org/gems/metanorma"]
+image:https://img.shields.io/gem/v/stepmod-utils.svg["Gem Version", link="https://rubygems.org/gems/stepmod-utils"]
 image:https://github.com/metanorma/stepmod-utils/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/stepmod-utils/actions?query=workflow%3Aubuntu"]
 image:https://github.com/metanorma/stepmod-utils/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/stepmod-utils/actions?query=workflow%3Amacos"]
 image:https://github.com/metanorma/stepmod-utils/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/stepmod-utils/actions?query=workflow%3Awindows"]
@@ -111,6 +111,173 @@ expg_image:contract_schemaexpg1.xml[]
 expg_image:contract_schemaexpg2.xml[]
 ----
 
+== Convertion of all schema history information into independent per-schema YAML files
+
+Command:
+
+[source,sh]
+----
+$ stepmod-extract-changes -p {stepmod-data-directory}
+----
+
+=== Examples
+
+Given the following XML
+
+[source,xml]
+----
+<change version="4">
+   <arm.changes>
+      <arm.modifications>
+         <modified.object type="TYPE" name="ap242_requirement_assignment_item" />
+         <!-- ... -->
+      </arm.modifications>
+   </arm.changes>
+   <mim.changes>
+      <mim.additions>
+         <modified.object type="CONSTANT" name="ap242_shape_representation_reference_types" />
+         <!-- ... -->
+      </mim.additions>
+      <mim.modifications>
+         <modified.object type="CONSTANT" name="deprecated_interfaced_data_types" />
+         <!-- ... -->
+      </mim.modifications>
+      <mim.deletions>
+         <modified.object type="RULE" name="subtype_mandatory_shape_representation" />
+      </mim.deletions>
+   </mim.changes>
+
+   <arm_longform.changes>
+      <arm.additions>
+         <modified.object type="TYPE" name="advanced_face_model" />
+         <!-- ... -->
+      </arm.additions>
+      <arm.modifications>
+         <modified.object type="TYPE" name="assembly_constraint_select">
+            <description>
+               <ul>
+                  <li>Remove SELECT value 'ENTITY Binary_assembly_constraint'</li>
+               <!-- ... -->
+               </ul>
+            </description>
+         </modified.object>
+         <!-- ... -->
+      </arm.modifications>
+      <arm.deletions>
+         <modified.object type="TYPE" name="axis_placement_mapping_source" />
+      </arm.deletions>
+   </arm_longform.changes>
+
+   <mim_longform.changes>
+      <mim.additions>
+         <modified.object type="CONSTANT" name="ap242_shape_representation_reference_types" />
+      </mim.additions>
+
+      <mim.modifications>
+         <modified.object type="CONSTANT" name="deprecated_constructed_data_types">
+            <description>
+               CONSTANT 'deprecated_constructed_data_types': Expression Changed
+            </description>
+         </modified.object>
+         <!-- ... -->
+      </mim.modifications>
+
+      <mim.deletions>
+         <modified.object type="TYPE" name="connected_edge_with_length_set_items" />
+         <!-- ... -->
+      </mim.deletions>
+   </mim_longform.changes>
+
+</change>
+----
+
+Will Generate 4 files:
+
+- arm.changes.yml
+- mim.changes.yml
+- arm_lf.changes.yml
+- mim_lf.changes.yml
+
+`arm.changes.yml`:
+
+[source,yaml]
+----
+---
+schema: Ap242_managed_model_based_3d_engineering_arm
+change_edition:
+- version: 4
+   description:
+   modifications:
+   - type: TYPE
+   name: ap242_requirement_assignment_item
+----
+
+
+`mim.changes.yml`:
+
+[source,yaml]
+----
+---
+schema: Ap242_managed_model_based_3d_engineering_mim
+change_edition:
+- version: 4
+  description:
+  additions:
+  - type: CONSTANT
+    name: ap242_shape_representation_reference_types
+  modifications:
+  - type: CONSTANT
+    name: deprecated_interfaced_data_types
+  deletions:
+  - type: RULE
+    name: subtype_mandatory_shape_representation
+----
+
+`arm_lf.changes.yml`:
+
+[source,yaml]
+----
+---
+schema: Ap242_managed_model_based_3d_engineering_arm_LF
+change_edition:
+- version: 4
+  description:
+  additions:
+  - type: TYPE
+    name: advanced_face_model
+  modifications:
+  - type: TYPE
+    name: assembly_constraint_select
+    descriptions:
+    - Remove SELECT value 'ENTITY Binary_assembly_constraint'
+  deletions:
+  - type: TYPE
+    name: axis_placement_mapping_source
+----
+
+`mim_lf.changes.yml`:
+
+[source,yaml]
+----
+---
+schema: Ap242_managed_model_based_3d_engineering_mim_LF
+change_edition:
+- version: 4
+  description:
+  additions:
+  - type: CONSTANT
+    name: ap242_shape_representation_reference_types
+  modifications:
+  - type: CONSTANT
+    name: deprecated_constructed_data_types
+    description: |
+      CONSTANT 'deprecated_constructed_data_types': Expression Changed
+  deletions:
+  - type: TYPE
+    name: connected_edge_with_length_set_items
+----
+
+
 == Git repository
 
 If the STEPmod repository is a Git repository, term extract will work.

data/exe/stepmod-annotate-all

@@ -2,8 +2,10 @@
 
 require "concurrent"
 require "stepmod/utils/stepmod_file_annotator"
+require "fileutils"
 
 stepmod_dir = ARGV.first || Dir.pwd
+stepmod_dir = Pathname.new(stepmod_dir.gsub("\\", "/"))
 
 def all_express_files(stepmod_dir)
   index_file = File.read(File.join(stepmod_dir, "repository_index.xml"))
@@ -32,34 +34,38 @@ end
 MAX_THREADS = 1 #[2, Concurrent.processor_count].max * 2
 MAX_QUEUE_SIZE = MAX_THREADS * 4
 # https://github.com/ruby-concurrency/concurrent-ruby/blob/master/docs-source/thread_pools.md
-pool = Concurrent::ThreadPoolExecutor.new(
-  min_threads: MAX_THREADS,
-  max_threads: MAX_THREADS,
-  max_queue: MAX_QUEUE_SIZE,
-  fallback_policy: :caller_runs,
-)
+# pool = Concurrent::ThreadPoolExecutor.new(
+#   min_threads: MAX_THREADS,
+#   max_threads: MAX_THREADS,
+#   max_queue: MAX_QUEUE_SIZE,
+#   fallback_policy: :caller_runs,
+# )
 
 files = all_express_files(stepmod_dir)
 
-files.each_slice(MAX_QUEUE_SIZE) do |batch|
-  puts("Queueing next batch")
-  batch.each do |file|
-    pool.post do
-      puts "#{Thread.current.object_id}: Queued processing #{file}"
-      annotated = Stepmod::Utils::StepmodFileAnnotator.new(
-        express_file: file,
-        stepmod_dir: stepmod_dir
-      ).call
-
-      annotated_file_name = "#{File.basename(file, '.exp')}_annotated.exp"
-      annotated_file_path = File.join(File.dirname(file), annotated_file_name)
-
-      File.open(annotated_file_path, "w") do |file|
-        file.puts(annotated)
-      end
-
-      puts "#{Thread.current.object_id}: Done processing #{File.basename(file)} => #{annotated_file_path}."
-    end
+files.each do |file|
+  puts "#{Thread.current.object_id}: Processing #{file}"
+
+  result = Stepmod::Utils::StepmodFileAnnotator.new(
+    express_file: file,
+    stepmod_dir: stepmod_dir,
+  ).call
+
+  annotated_file_name = "#{File.basename(file, '.exp')}_annotated.exp"
+  annotated_file_path = File.join(File.dirname(file), annotated_file_name)
+
+  File.open(annotated_file_path, "w") do |annotated_file|
+    annotated_file.puts(result[:annotated_text])
+  end
+
+  result[:images_references].each do |source, destination|
+    source_path = File.join(stepmod_dir, "data", source)
+    destination_path = File.join(File.dirname(file), destination)
+
+    next if File.exist?(destination_path) || !File.exist?(source_path)
+
+    FileUtils.cp(source_path, destination_path)
   end
-  pool.shutdown
+
+  puts "#{Thread.current.object_id}: Done processing #{File.basename(file)} => #{annotated_file_path}."
 end

data/exe/stepmod-extract-concepts

@@ -86,7 +86,7 @@ else
   )
 end
 
-default_output_dir = File.join(stepmod_dir, "output_yaml")
+default_output_dir = File.join(File.expand_path("..", stepmod_dir), "output_yaml")
 output_dir = options[:output_dir] || default_output_dir
 unless File.directory?(output_dir)
   FileUtils.mkdir_p(output_dir)

data/exe/stepmod-srl-migrate

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+
+# encoding: UTF-8
+
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+# Fixes https://github.com/rubygems/rubygems/issues/1420
+require "rubygems/specification"
+
+module Gem
+  class Specification
+    def this; self; end
+  end
+end
+
+require "bundler/setup"
+require "optparse"
+
+def log(message)
+  puts "[stepmod-utils] #{message}"
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+
+  opts.on(
+    "--stepmod-data-dir STEPMOD_DATA_DIR",
+    String,
+    "Path to STEPmod data directory",
+  ) do |path|
+    options[:stepmod_dir] = path
+  end
+
+  opts.on(
+    "--srl-docs-dir SRL_DOCS_DIR",
+    String,
+    "Path to output srl docs",
+  ) do |path|
+    options[:srl_output_docs_dir] = path
+  end
+
+  opts.on(
+    "--srl-schemas-dir SRL_SCHEMAS_DIR",
+    String,
+    "Path to output srl schemas",
+  ) do |path|
+    options[:srl_output_schemas_dir] = path
+  end
+
+  opts.on(
+    "-s",
+    "--stepmod2mn-executeable STEPMOD2MN_EXECUTEABLE",
+    String,
+    "Path to STEPMOD2MN_EXECUTEABLE",
+  ) do |path|
+    options[:stepmod2mn_path] = path
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+stepmod2mn_path = options[:stepmod2mn_path]
+if stepmod2mn_path.nil?
+  raise StandardError.new(
+    "stepmod2mn executeable is required, set with the `-s` option.",
+  )
+end
+
+stepmod_dir = options[:stepmod_dir] || "stepmod"
+if stepmod_dir.nil?
+  raise StandardError.new(
+    "stepmod data directory required, set with the `--stepmod_dir` option.",
+  )
+end
+
+migrate_docs_command = %(stepmod-srl-migrate-docs -s "#{stepmod2mn_path}" --stepmod-data-dir "#{stepmod_dir}")
+migrate_docs_command += %( --srl-docs-dir #{options[:srl_output_docs_dir]}) if options[:srl_output_docs_dir]
+
+migrate_schemas_command = %(stepmod-srl-migrate-schemas -s "#{stepmod2mn_path}" --stepmod-data-dir "#{stepmod_dir}")
+migrate_schemas_command += %( --srl-schemas-dir #{options[:srl_output_schemas_dir]}) if options[:srl_output_schemas_dir]
+
+log("--- START Migrate Docs ---")
+system migrate_docs_command
+log("--- END Migrate Docs ---")
+
+log("--- START Migrate Schemas ---")
+system migrate_schemas_command
+log("--- END Migrate Schemas ---")

data/exe/stepmod-srl-migrate-docs

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+# encoding: UTF-8
+
+require "fileutils"
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+# Fixes https://github.com/rubygems/rubygems/issues/1420
+require "rubygems/specification"
+
+module Gem
+  class Specification
+    def this; self; end
+  end
+end
+
+require "bundler/setup"
+require "optparse"
+
+def log(message)
+  puts "[stepmod-utils] #{message}"
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+
+  opts.on(
+    "--stepmod-data-dir STEPMOD_DATA_DIR",
+    String,
+    "Path to STEPmod data directory",
+  ) do |path|
+    options[:stepmod_dir] = path
+  end
+
+  opts.on(
+    "--srl-docs-dir SRL_DOCS_DIR",
+    String,
+    "Path to output srl docs",
+  ) do |path|
+    options[:srl_output_docs_dir] = path
+  end
+
+  opts.on(
+    "-s",
+    "--stepmod2mn-executeable STEPMOD2MN_EXECUTEABLE",
+    String,
+    "Path to STEPMOD2MN_EXECUTEABLE",
+  ) do |path|
+    options[:stepmod2mn_path] = path
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+stepmod2mn_path = options[:stepmod2mn_path]
+if stepmod2mn_path.nil?
+  raise StandardError.new(
+    "stepmod2mn executeable is required, set with the `-s` option.",
+  )
+else
+  log "stepmod2mn executeable path: `#{stepmod2mn_path}`"
+end
+
+stepmod_dir = options[:stepmod_dir] || "stepmod/data"
+log "STEPmod data path: `#{stepmod_dir}`"
+
+srl_output_docs_dir = options[:srl_output_docs_dir] || "documents"
+unless File.directory?(srl_output_docs_dir)
+  FileUtils.mkdir_p(srl_output_docs_dir)
+end
+log "SRL output docs directory path: `#{srl_output_docs_dir}`"
+
+system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output #{srl_output_docs_dir}"

data/exe/stepmod-srl-migrate-schemas

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+
+# encoding: UTF-8
+
+require "fileutils"
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+# Fixes https://github.com/rubygems/rubygems/issues/1420
+require "rubygems/specification"
+
+module Gem
+  class Specification
+    def this; self; end
+  end
+end
+
+require "bundler/setup"
+require "optparse"
+
+def log(message, indent = 0)
+  indent_spaces = " " * (indent * 2)
+  puts "[stepmod-utils] #{indent_spaces}#{message}"
+end
+
+def copy_files_to_schemas(path, output_dir)
+  schema_name = path.dirname.basename
+  file_name = path.basename
+
+  new_dir = File.join(output_dir, schema_name)
+  new_file_path = File.join(new_dir, file_name.to_s.gsub("_annotated.exp", ".exp"))
+
+  unless Dir.exist?(new_dir)
+    FileUtils.mkdir_p(new_dir)
+  end
+
+  FileUtils.copy_file(path, new_file_path)
+  log("Copied #{path.basename} to #{new_file_path}", 1)
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+
+  opts.on(
+    "--stepmod-data-dir STEPMOD_DATA_DIR",
+    String,
+    "Path to STEPmod data directory",
+  ) do |path|
+    options[:stepmod_dir] = path
+  end
+
+  opts.on(
+    "--srl-schemas-dir SRL_SCHEMAS_DIR",
+    String,
+    "Path to output srl schemas",
+  ) do |path|
+    options[:srl_output_schemas_dir] = path
+  end
+
+  opts.on(
+    "-s",
+    "--stepmod2mn-executeable STEPMOD2MN_EXECUTEABLE",
+    String,
+    "Path to STEPMOD2MN_EXECUTEABLE",
+  ) do |path|
+    options[:stepmod2mn_path] = path
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+stepmod2mn_path = options[:stepmod2mn_path]
+if stepmod2mn_path.nil?
+  raise StandardError.new(
+    "stepmod2mn executeable is required, set with the `-s` option.",
+  )
+else
+  log "stepmod2mn executeable path: `#{stepmod2mn_path}`"
+end
+
+stepmod_dir = options[:stepmod_dir] || "stepmod/data"
+log "STEPmod data path: `#{stepmod_dir}`"
+
+srl_output_schemas_dir = options[:srl_output_schemas_dir] || "schemas"
+unless File.directory?(srl_output_schemas_dir)
+  FileUtils.mkdir_p(srl_output_schemas_dir)
+end
+log "SRL output schemas directory path: `#{srl_output_schemas_dir}`"
+
+system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output #{srl_output_schemas_dir} --svg"
+
+system "stepmod-annotate-all #{stepmod_dir}"
+
+Dir.glob("#{stepmod_dir}/data/**/*_annotated.exp").each do |filepath|
+  path = Pathname.new(filepath)
+  copy_files_to_schemas(path, srl_output_schemas_dir)
+end
+
+system "stepmod-extract-changes -p #{stepmod_dir}"
+
+Dir.glob("#{stepmod_dir}/data/**/*.changes.yaml").each do |filepath|
+  path = Pathname.new(filepath)
+  copy_files_to_schemas(path, srl_output_schemas_dir)
+end
+
+log("Done")

data/lib/stepmod/utils/converters/express_g.rb

@@ -18,15 +18,16 @@ module Stepmod
           return "" unless File.file?(file)
 
           image_document = Nokogiri::XML(File.read(file))
-          svg_path = File.basename(image_document.xpath("//img").first["src"],
+          svg_filename = File.basename(image_document.xpath("//img").first["src"],
                                    ".*")
           <<~SVGMAP
 
             *)
             (*"#{state.fetch(:schema_name)}.__expressg"
+            [[#{svg_filename}]]
             [.svgmap]
             ====
-            image::#{svg_path}.svg[]
+            image::#{svg_filename}.svg[]
 
             #{image_document.xpath('//img.area').map.with_index(1) { |n, i| schema_reference(n['href'], i) }.join("\n")}
             ====

data/lib/stepmod/utils/stepmod_file_annotator.rb

@@ -21,6 +21,7 @@ module Stepmod
         @resource_docs_cache = resource_docs_schemas(stepmod_dir)
         @stepmod_dir = stepmod_dir || Dir.pwd
         @added_bibdata = {}
+        @images_references = {}
 
         @schema_name = Expressir::Express::Parser.from_file(express_file)
                                                  .schemas
@@ -29,11 +30,11 @@ module Stepmod
       end
 
       def resource_docs_schemas(stepmod_dir)
-        filepath = File.join(stepmod_dir, "data/resource_docs/*/resource.xml")
+        filepath = File.join(stepmod_dir, "data", "resource_docs", "*", "resource.xml")
 
         schemas = {}
         Dir.glob(filepath).each do |resource_docs_file|
-          match = resource_docs_file.match("data/resource_docs/([^/]+)/resource.xml")
+          match = resource_docs_file.match("data[/\]resource_docs[/\]([^/\]+)[/\]resource.xml")
           resource_docs_dir = match.captures[0]
 
           resource_docs = Nokogiri::XML(File.read(resource_docs_file)).root
@@ -55,6 +56,7 @@ module Stepmod
         output_express = File.read(express_file)
         converted_description = ""
         base_linked = ""
+        processed_images_cache = {}
 
         if File.exist?(descriptions_file)
           descriptions = Nokogiri::XML(File.read(descriptions_file)).root
@@ -82,6 +84,10 @@ module Stepmod
                 descriptions_file, description
               )
             end
+
+            schema_base_dir = resource_docs_cache[base_linked]
+            add_images_references(converted_description, schema_base_dir, processed_images_cache)
+
             # Add converted description from exact linked path
             if resource_docs_dir && added_resource_descriptions[description["linkend"]].nil?
               output_express << convert_from_resource_file(resource_docs_dir,
@@ -112,7 +118,10 @@ module Stepmod
                             converted_description
                           end
 
-        sanitize(output_express)
+        {
+          annotated_text: sanitize(output_express),
+          images_references: @images_references,
+        }
       rescue StandardError => e
         puts "[ERROR]!!! #{e.message}"
         puts e.backtrace
@@ -124,6 +133,25 @@ module Stepmod
         file_content.gsub("(*)", "(`*`)")
       end
 
+      def add_images_references(description, schema_base_dir, processed_images_cache)
+        referenced_images = description.scan(/image::(.*?)\[\]/).flatten
+
+        referenced_images.each do |referenced_image|
+          next unless schema_base_dir
+
+          image_file_path = File.join("resource_docs", schema_base_dir, referenced_image)
+          new_image_file_path = referenced_image
+
+          if processed_images_cache[new_image_file_path]
+            processed_images_cache[new_image_file_path] = true
+            next
+          end
+
+          processed_images_cache[new_image_file_path] = true
+          @images_references[image_file_path] = new_image_file_path
+        end
+      end
+
       def convert_from_description_text(descriptions_file, description)
         Dir.chdir(File.dirname(descriptions_file)) do
           wrapper = "<ext_descriptions>#{description}</ext_descriptions>"

data/lib/stepmod/utils/terms_extractor.rb

@@ -243,13 +243,15 @@ module Stepmod
               bibdata: bibdata,
               # See: metanorma/iso-10303-2#90
               domain_prefix: "application module",
+              schema_type: type,
             )
           when "module_mim"
             mim_concepts = parse_annotated_module(
               schema: schema,
               bibdata: bibdata,
               # See: metanorma/iso-10303-2#90
-              domain_prefix: "application object",
+              domain_prefix: "application module",
+              schema_type: type,
             )
           when "resource"
             parse_annotated_resource(schema: schema, bibdata: bibdata)
@@ -268,7 +270,7 @@ module Stepmod
         }[match.captures[0]] || "resource"
       end
 
-      def parse_annotated_module(schema:, bibdata:, domain_prefix:)
+      def parse_annotated_module(schema:, bibdata:, domain_prefix:, schema_type:)
         log "INFO: parse_annotated_module: " \
             "Processing modules schema #{schema.file}"
 
@@ -285,6 +287,7 @@ module Stepmod
               "name" => schema.id,
               "type" => "module",
               "path" => extract_file_path(entity.parent.file),
+              "schema_type" => schema_type
             },
             document: {
               "type" => "module",
@@ -330,6 +333,7 @@ module Stepmod
               "name" => schema.id,
               "type" => "resource",
               "path" => extract_file_path(entity.parent.file),
+              "schema_type" => "resource"
             },
             document: {
               "type" => "resource",
@@ -363,7 +367,8 @@ module Stepmod
       # rubocop:disable Metrics/MethodLength
       def generate_concept_from_entity(entity:, schema:, domain:, bibdata:, document:)
         old_definition = trim_definition(entity.remarks.first)
-        definition = generate_entity_definition(entity, domain)
+        schema_type = schema["schema_type"]
+        definition = generate_entity_definition(entity, domain, schema_type)
 
         notes = [old_definition].reject { |note| redundant_note?(note) }
 
@@ -515,15 +520,20 @@ module Stepmod
       # end
 
       # rubocop:disable Layout/LineLength
-      def generate_entity_definition(entity, domain)
+      def generate_entity_definition(entity, domain, schema_type)
         return "" if entity.nil?
 
         # See: metanorma/iso-10303-2#90
-        entity_type = if domain_type = domain.match(/\A(application object):/)
-                        "{{#{domain_type[1]}}}"
-                      else
-                        "{{entity data type}}"
-                      end
+        entity_type = case schema_type
+        when "module_arm"
+          "{{application object}}"
+        when "module_mim"
+          "{{entity data type}}"
+        when "resource", "business_object_model"
+          "{{entity data type}}"
+        else
+          raise Error.new("[stepmod-utils] encountered unsupported schema_type")
+        end
 
         if entity.subtype_of.size.zero?
           "#{entity_type} " \

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.29".freeze
+    VERSION = "0.3.31".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.29
+  version: 0.3.31
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -175,6 +175,9 @@ executables:
 - stepmod-convert-express-resource
 - stepmod-extract-changes
 - stepmod-extract-concepts
+- stepmod-srl-migrate
+- stepmod-srl-migrate-docs
+- stepmod-srl-migrate-schemas
 extensions: []
 extra_rdoc_files: []
 files:
@@ -197,6 +200,9 @@ files:
 - exe/stepmod-convert-express-resource
 - exe/stepmod-extract-changes
 - exe/stepmod-extract-concepts
+- exe/stepmod-srl-migrate
+- exe/stepmod-srl-migrate-docs
+- exe/stepmod-srl-migrate-schemas
 - lib/stepmod/utils.rb
 - lib/stepmod/utils/bibdata.rb
 - lib/stepmod/utils/change.rb