Added support for png images in requirements

Author: vishwajitdandage

bazel/rules/rules_score/private/requirements.bzl

@@ -166,9 +166,9 @@ _score_requirements_rule = rule(
             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"],
+            allow_files = [".svg", ".png"],
             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.",
+            doc = "Image files (.svg or .png) to stage next to the rendered RST. The package-relative path of each file (e.g. 'diagrams/arch.png') must match the path written in a ``.. image::`` directive inside the requirement description field.",
         ),
         "_renderer": attr.label(
             default = Label("@trlc//tools/trlc_rst:trlc_rst"),

bazel/rules/rules_score/test/BUILD

@@ -707,7 +707,10 @@ requirements_rst_test_suite(name = "requirements_rst_tests")
 feature_requirements(
     name = "feat_req_with_image",
     srcs = ["fixtures/seooc_test/feature_requirements.trlc"],
-    image_srcs = ["fixtures/image_srcs/diagrams/arch.svg"],
+    image_srcs = [
+        "fixtures/image_srcs/diagrams/arch.svg",
+        "fixtures/image_srcs/diagrams/arch.png",
+    ],
     deps = [":asr_trlc"],
 )
 

bazel/rules/rules_score/test/fixtures/image_requirements/image_requirements.trlc

@@ -20,6 +20,14 @@ Requirement REQ_with_image {
     '''
 }
 
+Requirement REQ_with_png_image {
+    description = '''
+        The system shall support PNG image rendering in requirements.
+
+        ![System overview PNG](diagrams/overview.png)
+    '''
+}
+
 Requirement REQ_no_image {
     description = "The system shall operate without images."
 }

bazel/rules/rules_score/test/fixtures/image_srcs/diagrams/arch.png

@@ -48,29 +48,24 @@ def _image_srcs_sphinx_sources_test_impl(ctx):
         str([f.basename for f in rst_files]),
     )
 
-    image_files = [f for f in sphinx_files if f.extension == "svg"]
+    image_files = [f for f in sphinx_files if f.extension in ("svg", "png")]
     asserts.true(
         env,
-        len(image_files) == 1,
-        "SphinxSourcesInfo.srcs should contain exactly one staged image file, got: " +
+        len(image_files) == 2,
+        "SphinxSourcesInfo.srcs should contain exactly two staged image files, got: " +
         str([f.basename for f in image_files]),
     )
 
-    asserts.equals(
-        env,
-        "arch.svg",
-        image_files[0].basename,
-        "Staged image should be named arch.svg",
-    )
+    basenames = sorted([f.basename for f in image_files])
+    asserts.equals(env, ["arch.png", "arch.svg"], basenames)
 
-    # Verify the image is staged at the package-relative path (diagrams/arch.svg)
-    # meaning its short_path ends with diagrams/arch.svg relative to the rule output dir.
-    image_short_path = image_files[0].short_path
+    # Verify images are staged at package-relative paths under diagrams/.
+    image_short_paths = sorted([f.short_path for f in image_files])
     asserts.true(
         env,
-        image_short_path.endswith("diagrams/arch.svg"),
-        "Staged image should preserve package-relative path (diagrams/arch.svg), got: " +
-        image_short_path,
+        image_short_paths[0].endswith("diagrams/arch.png") and image_short_paths[1].endswith("diagrams/arch.svg"),
+        "Staged images should preserve package-relative paths under diagrams/, got: " +
+        str(image_short_paths),
     )
 
     return analysistest.end(env)

bazel/rules/rules_score/test/requirements_image_test.bzl

@@ -76,22 +76,26 @@ def _render(self) -> str:
             return f.read()
 
     def test_image_directive_emitted(self):
-        """``.. image:: diagrams/overview.svg`` appears in the rendered RST."""
-        self.assertIn(".. image:: diagrams/overview.svg", self._render())
+        """Both SVG and PNG image directives appear in the rendered RST."""
+        rendered = self._render()
+        self.assertIn(".. image:: diagrams/overview.svg", rendered)
+        self.assertIn(".. image:: diagrams/overview.png", rendered)
 
     def test_alt_text_emitted(self):
         """The ``:alt:`` option is emitted with the Markdown alt text."""
-        self.assertIn(":alt: System overview", self._render())
+        rendered = self._render()
+        self.assertIn(":alt: System overview", rendered)
+        self.assertIn(":alt: System overview PNG", rendered)
 
     def test_markdown_syntax_not_in_output(self):
         """The raw ``![...]()`` Markdown syntax must not appear in the output."""
         self.assertNotIn("![", self._render())
 
     def test_requirement_without_image_unaffected(self):
-        """Requirements without an image render normally; exactly one image total."""
+        """Requirements without an image render normally; two images total."""
         content = self._render()
         self.assertIn("The system shall operate without images.", content)
-        self.assertEqual(content.count(".. image::"), 1)
+        self.assertEqual(content.count(".. image::"), 2)
 
 
 if __name__ == "__main__":