eslint-plugin-traceability 1.8.0 → 1.8.2

package/lib/tests/maintenance/cli.test.js

@@ -13,13 +13,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @req REQ-MAINT-SAFE - Clear exit codes and non-destructive dry-run
  */
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const cli_1 = require("../../src/maintenance/cli");
-function withTempDir() {
-    const tmpDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), "maint-cli-"));
-    return tmpDir;
-}
+const temp_dir_helpers_1 = require("../utils/temp-dir-helpers");
 describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
     let originalCwd;
     beforeAll(() => {
@@ -29,7 +25,8 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         process.chdir(originalCwd);
     });
     it("[REQ-MAINT-DETECT] detect exits with code 0 and message when no stale annotations", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
         const code = (0, cli_1.runMaintenanceCli)(["node", "traceability-maint", "detect"]);
@@ -39,11 +36,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-VERIFY] verify exits with code 0 when annotations valid", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const tsContent = `/**\n * @story my-story.story.md\n */`;
         fs_1.default.writeFileSync(path_1.default.join(dir, "file.ts"), tsContent, "utf8");
@@ -56,11 +54,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-REPORT] report prints human-readable summary and exits 0", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const tsContent = `/**\n * @story missing.story.md\n */`;
         fs_1.default.writeFileSync(path_1.default.join(dir, "file.ts"), tsContent, "utf8");
@@ -74,11 +73,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-UPDATE] update performs replacements and exits 0", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const tsContent = `/**\n * @story old.path.md\n */`;
         fs_1.default.writeFileSync(path_1.default.join(dir, "file.ts"), tsContent, "utf8");
@@ -99,11 +99,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-SAFE] update requires --from and --to and exits 2 when missing", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const errorSpy = jest.spyOn(console, "error").mockImplementation(() => { });
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
@@ -116,11 +117,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         finally {
             errorSpy.mockRestore();
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-SAFE] dry-run does not modify files and exits 0", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const tsContent = `/**\n * @story old.path.md\n */`;
         fs_1.default.writeFileSync(path_1.default.join(dir, "file.ts"), tsContent, "utf8");
@@ -142,11 +144,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-SAFE] report exits 2 and prints error on invalid --format value", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const errorSpy = jest.spyOn(console, "error").mockImplementation(() => { });
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
@@ -167,11 +170,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         finally {
             errorSpy.mockRestore();
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-DETECT] detect supports --json output", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const tsContent = `/**\n * @story stale.story.md\n */`;
         fs_1.default.writeFileSync(path_1.default.join(dir, "file.ts"), tsContent, "utf8");
@@ -191,11 +195,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-DETECT] detect with non-existent --root exits 0 and reports no stale annotations", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const missingRoot = path_1.default.join(dir, "missing-root");
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
@@ -212,11 +217,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         }
         finally {
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-SAFE] prints help and exits 0 when no subcommand is provided", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
         const errorSpy = jest.spyOn(console, "error").mockImplementation(() => { });
@@ -231,11 +237,12 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
         finally {
             logSpy.mockRestore();
             errorSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
     it("[REQ-MAINT-SAFE] detect catches filesystem permission errors and exits 2 with prefixed error message", () => {
-        const dir = withTempDir();
+        const temp = (0, temp_dir_helpers_1.createTempDir)("maint-cli-");
+        const dir = temp.dir;
         process.chdir(dir);
         const errorSpy = jest.spyOn(console, "error").mockImplementation(() => { });
         const logSpy = jest.spyOn(console, "log").mockImplementation(() => { });
@@ -255,7 +262,7 @@ describe("Maintenance CLI (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
             statSpy.mockRestore();
             errorSpy.mockRestore();
             logSpy.mockRestore();
-            fs_1.default.rmSync(dir, { recursive: true, force: true });
+            temp.cleanup();
         }
     });
 });

package/lib/tests/maintenance/report.test.js

@@ -41,27 +41,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
+const temp_dir_helpers_1 = require("../utils/temp-dir-helpers");
 const report_1 = require("../../src/maintenance/report");
 describe("generateMaintenanceReport (Story 009.0-DEV-MAINTENANCE-TOOLS)", () => {
-    let tmpDir;
+    let temp;
     beforeAll(() => {
-        tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "report-test-"));
+        temp = (0, temp_dir_helpers_1.createTempDir)("report-test-");
     });
     afterAll(() => {
-        fs.rmSync(tmpDir, { recursive: true, force: true });
+        temp.cleanup();
     });
     it("[REQ-MAINT-REPORT] should return empty string when no operations", () => {
-        const report = (0, report_1.generateMaintenanceReport)(tmpDir);
+        const report = (0, report_1.generateMaintenanceReport)(temp.dir);
         expect(report).toBe("");
     });
     it("[REQ-MAINT-REPORT] should report stale story annotation", () => {
-        const filePath = path.join(tmpDir, "stub.md");
+        const filePath = path.join(temp.dir, "stub.md");
         const content = `/**
  * @story non-existent.story.md
  */`;
         fs.writeFileSync(filePath, content);
-        const report = (0, report_1.generateMaintenanceReport)(tmpDir);
+        const report = (0, report_1.generateMaintenanceReport)(temp.dir);
         expect(report).toContain("non-existent.story.md");
     });
 });

package/lib/tests/plugin-default-export-and-configs.test.js

@@ -80,12 +80,10 @@ describe("Plugin Default Export and Configs (Story 001.0-DEV-PLUGIN-SETUP)", ()
         expect(recommendedRules).toHaveProperty("traceability/require-branch-annotation", "error");
         expect(recommendedRules).toHaveProperty("traceability/valid-story-reference", "error");
         expect(recommendedRules).toHaveProperty("traceability/valid-req-reference", "error");
-        expect(recommendedRules).toHaveProperty("traceability/prefer-implements-annotation", "warn");
     });
     it("[REQ-ERROR-SEVERITY] configs.strict uses same severity mapping as recommended", () => {
         const strictRules = index_1.configs.strict[0].rules;
         const recommendedRules = index_1.configs.recommended[0].rules;
         expect(strictRules).toEqual(recommendedRules);
-        expect(strictRules).toHaveProperty("traceability/prefer-implements-annotation", "warn");
     });
 });

package/lib/tests/rules/prefer-implements-annotation.test.js

@@ -4,20 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
- * Tests for: docs/stories/010.3-DEV-MIGRATE-TO-IMPLEMENTS.story.md
- * @story docs/stories/010.3-DEV-MIGRATE-TO-IMPLEMENTS.story.md
- * @req REQ-OPTIONAL-WARNING - Verify rule emits recommendations for legacy @story/@req usage
- * @req REQ-MULTI-STORY-DETECT - Verify rule detects multi-story and mixed-annotation patterns
+ * Tests for: docs/stories/010.3-DEV-MIGRATE-TO-SUPPORTS.story.md
+ * @story docs/stories/010.3-DEV-MIGRATE-TO-SUPPORTS.story.md
+ * @req REQ-OPTIONAL-WARNING - Verify rule emits recommendations for legacy @story/@req usage and migration to @supports
+ * @req REQ-MULTI-STORY-DETECT - Verify rule detects multi-story and mixed-annotation patterns involving @supports
  * @req REQ-CONFIG-SEVERITY - Verify rule is disabled by default and can be enabled as warn/error
  */
 const eslint_1 = require("eslint");
 const prefer_implements_annotation_1 = __importDefault(require("../../src/rules/prefer-implements-annotation"));
+const src_1 = require("../../src");
 const ruleTester = new eslint_1.RuleTester({
     languageOptions: {
         parserOptions: { ecmaVersion: 2020, sourceType: "module" },
     },
 });
-describe("prefer-implements-annotation rule (Story 010.3-DEV-MIGRATE-TO-IMPLEMENTS)", () => {
+describe("prefer-implements-annotation rule (Story 010.3-DEV-MIGRATE-TO-SUPPORTS)", () => {
     ruleTester.run("prefer-implements-annotation", prefer_implements_annotation_1.default, {
         valid: [
             {
@@ -29,25 +30,25 @@ describe("prefer-implements-annotation rule (Story 010.3-DEV-MIGRATE-TO-IMPLEMEN
                 code: `/**\n * @req REQ-ONLY\n */\nfunction onlyReq() {}`,
             },
             {
-                name: "[REQ-BACKWARD-COMP-VALIDATION] comment with @implements only is ignored",
-                code: `/**\n * @implements docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction alreadyImplements() {}`,
+                name: "[REQ-BACKWARD-COMP-VALIDATION] comment with @supports only is ignored",
+                code: `/**\n * @supports docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction alreadyImplements() {}`,
             },
         ],
         invalid: [
             {
                 name: "[REQ-OPTIONAL-WARNING] single-story @story + @req block triggers preferImplements message",
                 code: `/**\n * @story docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md\n * @req REQ-ANNOTATION-REQUIRED\n */\nfunction legacy() {}`,
-                output: `/**\n * @implements docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction legacy() {}`,
+                output: `/**\n * @supports docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction legacy() {}`,
                 errors: [{ messageId: "preferImplements" }],
             },
             {
-                name: "[REQ-MULTI-STORY-DETECT] mixed @story/@req and @implements triggers cannotAutoFix",
-                code: `/**\n * @story docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md\n * @req REQ-ANNOTATION-REQUIRED\n * @implements docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction mixed() {}`,
+                name: "[REQ-MULTI-STORY-DETECT] mixed @story/@req and @supports triggers cannotAutoFix",
+                code: `/**\n * @story docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md\n * @req REQ-ANNOTATION-REQUIRED\n * @supports docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction mixed() {}`,
                 errors: [
                     {
                         messageId: "cannotAutoFix",
                         data: {
-                            reason: "comment mixes @story/@req with existing @implements annotations",
+                            reason: "comment mixes @story/@req with existing @supports annotations",
                         },
                     },
                 ],
@@ -58,15 +59,15 @@ describe("prefer-implements-annotation rule (Story 010.3-DEV-MIGRATE-TO-IMPLEMEN
                 errors: [{ messageId: "multiStoryDetected" }],
             },
             {
-                name: "[REQ-AUTO-FIX] single @story + single @req auto-fixes to single @implements line",
+                name: "[REQ-AUTO-FIX] single @story + single @req auto-fixes to single @supports line",
                 code: `/**\n * @story docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md\n * @req REQ-ANNOTATION-REQUIRED\n */\nfunction autoFixSingleReq() {}`,
-                output: `/**\n * @implements docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction autoFixSingleReq() {}`,
+                output: `/**\n * @supports docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ANNOTATION-REQUIRED\n */\nfunction autoFixSingleReq() {}`,
                 errors: [{ messageId: "preferImplements" }],
             },
             {
-                name: "[REQ-SINGLE-STORY-FIX] single @story with multiple @req lines auto-fixes to single @implements line containing all REQ IDs",
+                name: "[REQ-SINGLE-STORY-FIX] single @story with multiple @req lines auto-fixes to single @supports line containing all REQ IDs",
                 code: `/**\n * @story docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md\n * @req REQ-ONE\n * @req REQ-TWO\n * @req REQ-THREE\n */\nfunction autoFixMultiReq() {}`,
-                output: `/**\n * @implements docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ONE REQ-TWO REQ-THREE\n */\nfunction autoFixMultiReq() {}`,
+                output: `/**\n * @supports docs/stories/003.0-DEV-FUNCTION-ANNOTATIONS.story.md REQ-ONE REQ-TWO REQ-THREE\n */\nfunction autoFixMultiReq() {}`,
                 errors: [{ messageId: "preferImplements" }],
             },
             {
@@ -82,3 +83,35 @@ describe("prefer-implements-annotation rule (Story 010.3-DEV-MIGRATE-TO-IMPLEMEN
         ],
     });
 });
+describe("prefer-implements-annotation configuration severity (REQ-CONFIG-SEVERITY)", () => {
+    test("rule is disabled by default in recommended and strict presets (not present in preset rule maps)", () => {
+        const recommended = src_1.configs.recommended;
+        expect(Array.isArray(recommended)).toBe(true);
+        const firstConfig = recommended[0];
+        expect(firstConfig).toBeDefined();
+        const rules = firstConfig.rules || {};
+        expect(rules["traceability/prefer-implements-annotation"]).toBeUndefined();
+        const strict = src_1.configs.strict;
+        expect(Array.isArray(strict)).toBe(true);
+        const strictFirstConfig = strict[0];
+        expect(strictFirstConfig).toBeDefined();
+        const strictRules = strictFirstConfig.rules || {};
+        expect(strictRules["traceability/prefer-implements-annotation"]).toBeUndefined();
+    });
+    test("rule can be configured with severity 'warn' or 'error' in flat config", () => {
+        const flatWarnConfig = {
+            files: ["**/*.ts"],
+            rules: {
+                "traceability/prefer-implements-annotation": "warn",
+            },
+        };
+        expect(flatWarnConfig.rules["traceability/prefer-implements-annotation"]).toBe("warn");
+        const flatErrorConfig = {
+            files: ["**/*.ts"],
+            rules: {
+                "traceability/prefer-implements-annotation": "error",
+            },
+        };
+        expect(flatErrorConfig.rules["traceability/prefer-implements-annotation"]).toBe("error");
+    });
+});

package/lib/tests/rules/require-branch-annotation.test.js

@@ -17,6 +17,10 @@ const require_branch_annotation_1 = __importDefault(require("../../src/rules/req
 const ruleTester = new eslint_1.RuleTester({
     languageOptions: { parserOptions: { ecmaVersion: 2020 } },
 });
+const makeMissingAnnotationErrors = (...missing) => missing.map((item) => ({
+    messageId: "missingAnnotation",
+    data: { missing: item },
+}));
 const runRule = (tests) => ruleTester.run("require-branch-annotation", require_branch_annotation_1.default, tests);
 describe("Require Branch Annotation Rule (Story 004.0-DEV-BRANCH-ANNOTATIONS)", () => {
     runRule({
@@ -144,10 +148,7 @@ if (condition) {}`,
                 code: `if (condition) {}`,
                 output: `// @story <story-file>.story.md
 if (condition) {}`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing @req on for loop when only story present",
@@ -156,7 +157,7 @@ for (let i = 0; i < 5; i++) {}`,
                 output: `// @story docs/stories/004.0-DEV-BRANCH-ANNOTATIONS.story.md
 // @req <REQ-ID>
 for (let i = 0; i < 5; i++) {}`,
-                errors: [{ messageId: "missingAnnotation", data: { missing: "@req" } }],
+                errors: makeMissingAnnotationErrors("@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing @story on while loop when only req present",
@@ -165,9 +166,7 @@ while (true) {}`,
                 output: `// @req REQ-BRANCH-DETECTION
 // @story <story-file>.story.md
 while (true) {}`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing annotations on switch-case",
@@ -180,10 +179,7 @@ while (true) {}`,
   case 'a':
     break;
 }`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing annotations on do-while loop",
@@ -194,10 +190,7 @@ while (true) {}`,
 do {
   action();
 } while (condition);`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing annotations on for-of loop",
@@ -208,10 +201,7 @@ do {
 for (const item of items) {
   process(item);
 }`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing annotations on for-in loop",
@@ -222,10 +212,7 @@ for (const item of items) {
 for (const key in object) {
   console.log(key);
 }`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-BRANCH-DETECTION] missing annotations on try-catch blocks",
@@ -241,10 +228,8 @@ try {
   handleError(error);
 }`,
                 errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
+                    ...makeMissingAnnotationErrors("@story", "@req"),
+                    ...makeMissingAnnotationErrors("@story", "@req"),
                 ],
             },
             {
@@ -260,10 +245,7 @@ try {
   case 'a':
     break;
 }`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
             {
                 name: "[REQ-CONFIGURABLE-SCOPE] missing annotations on configured branch type ForStatement",
@@ -271,10 +253,7 @@ try {
                 options: [{ branchTypes: ["ForStatement"] }],
                 output: `// @story <story-file>.story.md
 for (let i = 0; i < 3; i++) {}`,
-                errors: [
-                    { messageId: "missingAnnotation", data: { missing: "@story" } },
-                    { messageId: "missingAnnotation", data: { missing: "@req" } },
-                ],
+                errors: makeMissingAnnotationErrors("@story", "@req"),
             },
         ],
     });