[rules score] add images to requirements

Author: hoe-jo

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
     rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0
     hooks:
       - id: reuse-lint-file
-        exclude: \.(svg|tpl|txt|conf|lock|json|in)$
+        exclude: \.(svg|tpl|txt|conf|lock|json|in|png)$
   - repo: local
     hooks:
       - id: copyright

MODULE.bazel

@@ -291,7 +291,7 @@ use_repo(pip, "manual_analysis_deps")
 bazel_dep(name = "trlc", version = "0.0.0")
 git_override(
     module_name = "trlc",
-    commit = "08ff8c7d6c362153392003c671a9799a446b0db5",
+    commit = "7f06d0396fd0e5f02b657d25700775af5113b7e0",
     remote = "https://github.com/bmw-software-engineering/trlc.git",
 )
 

bazel/rules/rules_score/private/assumed_system_requirements.bzl

@@ -33,6 +33,7 @@ def assumed_system_requirements(
         spec = Label("//bazel/rules/rules_score/trlc/config:score_requirements_model"),
         lobster_config = Label("//bazel/rules/rules_score/lobster/config:assumed_system_requirement"),
         ref_package = "",
+        image_srcs = [],
         **kwargs):
     """Define Assumed System Requirements following S-CORE process guidelines.
 
@@ -85,6 +86,7 @@ def assumed_system_requirements(
         lobster_config = lobster_config,
         spec = spec,
         ref_package = ref_package,
+        image_srcs = image_srcs,
         **kwargs
     )
     trlc_requirements_test(

bazel/rules/rules_score/private/component_requirements.bzl

@@ -32,6 +32,7 @@ def component_requirements(
         spec = Label("//bazel/rules/rules_score/trlc/config:score_requirements_model"),
         lobster_config = Label("//bazel/rules/rules_score/lobster/config:component_requirement"),
         ref_package = "",
+        image_srcs = [],
         **kwargs):
     """Define component requirements following S-CORE process guidelines.
 
@@ -79,6 +80,7 @@ def component_requirements(
         lobster_config = lobster_config,
         spec = spec,
         ref_package = ref_package,
+        image_srcs = image_srcs,
         **kwargs
     )
     trlc_requirements_test(

bazel/rules/rules_score/private/feature_requirements.bzl

@@ -33,6 +33,7 @@ def feature_requirements(
         spec = Label("//bazel/rules/rules_score/trlc/config:score_requirements_model"),
         lobster_config = Label("//bazel/rules/rules_score/lobster/config:feature_requirement"),
         ref_package = "",
+        image_srcs = [],
         **kwargs):
     """Define feature requirements following S-CORE process guidelines.
 
@@ -85,6 +86,7 @@ def feature_requirements(
         lobster_config = lobster_config,
         spec = spec,
         ref_package = ref_package,
+        image_srcs = image_srcs,
         **kwargs
     )
     trlc_requirements_test(

bazel/rules/rules_score/private/requirements.bzl

@@ -20,7 +20,7 @@ public-facing macros.
 """
 
 load("@lobster//:lobster.bzl", "subrule_lobster_trlc")
-load("@trlc//:trlc.bzl", "TrlcProviderInfo")
+load("@trlc//:trlc.bzl", "TrlcProviderInfo", "subrule_trlc_image_stage")
 load("//bazel/rules/rules_score:providers.bzl", "AssumedSystemRequirementsInfo", "ComponentRequirementsInfo", "FeatureRequirementsInfo", "SphinxSourcesInfo")
 load("//bazel/rules/rules_score/private:rst_to_trlc.bzl", "rst_to_trlc")
 
@@ -105,7 +105,9 @@ def _requirements_impl(ctx):
             name = ctx.label.name,
         )
 
-    sphinx_srcs = depset([rendered_file])
+    image_outputs = subrule_trlc_image_stage(ctx.files.image_srcs)
+
+    sphinx_srcs = depset([rendered_file] + image_outputs)
 
     transitive_sphinx = [sphinx_srcs]
     for dep in ctx.attr.deps:
@@ -163,14 +165,19 @@ _score_requirements_rule = rule(
             default = Label("//bazel/rules/rules_score/trlc/config:score_requirements_model"),
             doc = "TRLC specification target providing the RSL files that define the requirement types. Defaults to the S-CORE requirements model.",
         ),
+        "image_srcs": attr.label_list(
+            allow_files = [".svg"],
+            default = [],
+            doc = "SVG image files to stage next to the rendered RST. The package-relative path of each file (e.g. 'diagrams/arch.svg') must match the path written in a ``.. image::`` directive inside the requirement description field. Only SVG files are permitted.",
+        ),
         "_renderer": attr.label(
             default = Label("@trlc//tools/trlc_rst:trlc_rst"),
             executable = True,
             cfg = "exec",
             doc = "TRLC-to-RST renderer tool.",
         ),
     },
-    subrules = [subrule_lobster_trlc],
+    subrules = [subrule_lobster_trlc, subrule_trlc_image_stage],
 )
 
 def score_requirements_rule(

bazel/rules/rules_score/test/BUILD

@@ -39,6 +39,11 @@ load(
     "providers_test",
     "sphinx_module_test_suite",
 )
+load(
+    ":requirements_image_test.bzl",
+    "image_srcs_sphinx_sources_test",
+    "requirements_image_test_suite",
+)
 load(
     ":requirements_rst_test.bzl",
     "aous_rst_provider_test",
@@ -694,6 +699,25 @@ aous_rst_sphinx_test(
 
 requirements_rst_test_suite(name = "requirements_rst_tests")
 
+# ============================================================================
+# Image srcs Tests
+# ============================================================================
+
+# Fixture: feature_requirements with image_srcs
+feature_requirements(
+    name = "feat_req_with_image",
+    srcs = ["fixtures/seooc_test/feature_requirements.trlc"],
+    image_srcs = ["fixtures/image_srcs/diagrams/arch.svg"],
+    deps = [":asr_trlc"],
+)
+
+image_srcs_sphinx_sources_test(
+    name = "image_srcs_sphinx_sources_test",
+    target_under_test = ":feat_req_with_image",
+)
+
+requirements_image_test_suite(name = "requirements_image_tests")
+
 # ============================================================================
 # Combined Test Suite
 # ============================================================================
@@ -732,15 +756,29 @@ py_test(
     deps = ["//bazel/rules/rules_score:rst_to_trlc_lib"],
 )
 
+py_test(
+    name = "test_trlc_rst_image_rendering",
+    size = "small",
+    srcs = ["trlc_rst_image_rendering_test.py"],
+    data = [
+        "fixtures/image_requirements/image_requirements.trlc",
+        "fixtures/image_requirements/schema.rsl",
+    ],
+    main = "trlc_rst_image_rendering_test.py",
+    deps = ["@trlc//tools/trlc_rst:trlc_rst_lib"],
+)
+
 # Combined test suite for all tests
 test_suite(
     name = "all_tests",
     tests = [
+        ":requirements_image_tests",
         ":requirements_rst_tests",
         ":seooc_tests",
         ":sphinx_module_tests",
         ":test_rst_to_trlc",
         ":test_safety_analysis_tools",
+        ":test_trlc_rst_image_rendering",
         ":unit_component_tests",
     ],
 )

bazel/rules/rules_score/test/MODULE.bazel

@@ -71,7 +71,7 @@ register_toolchains(
 bazel_dep(name = "trlc", version = "0.0.0")
 git_override(
     module_name = "trlc",
-    commit = "c7750ebd0520996e05b9a9bc91eb6a4f62030f22",
+    commit = "7f06d0396fd0e5f02b657d25700775af5113b7e0",
     remote = "https://github.com/bmw-software-engineering/trlc.git",
 )
 

bazel/rules/rules_score/test/fixtures/image_requirements/diagrams/overview.svg

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+package ImageTest
+
+Requirement REQ_with_image {
+    description = '''
+        The system shall support image rendering in requirements.
+
+        ![System overview](diagrams/overview.svg)
+    '''
+}
+
+Requirement REQ_no_image {
+    description = "The system shall operate without images."
+}