fix(join): correctly prefix discriminator mapping refs (#2642)

* fix(join): correctly prefix discriminator mapping refs

* Update .changeset/fuzzy-drinks-warn.md

---------

Co-authored-by: Jacek Łękawa <164185257+JLekawa@users.noreply.github.com>
Co-authored-by: Daryna Pastushenko <77724851+Daryna-del@users.noreply.github.com>

Author: 3 people

.changeset/fuzzy-drinks-warn.md

@@ -0,0 +1,6 @@
+---
+'@redocly/cli': patch
+---
+
+Fixed an issue where `join --prefix-components-with-info-prop` would incorrectly rewrite discriminator mapping refs.
+This issue occurred when schema names contained the same substring as the prefix.

packages/cli/src/__tests__/commands/join.test.ts

@@ -8,6 +8,7 @@ import {
 } from '@redocly/openapi-core';
 import { yellow } from 'colorette';
 
+import { replace$Refs } from '../../commands/join/helpers/replace-$-refs.js';
 import { handleJoin } from '../../commands/join/index.js';
 import { exitWithError } from '../../utils/error.js';
 import {
@@ -464,4 +465,43 @@ describe('handleJoin', () => {
       expect(joinedDef.paths['/bar'].servers).toEqual([{ url: 'https://foo.com/api/v1/second' }]);
     });
   });
+
+  describe('replace$Refs', () => {
+    it('should prefix discriminator mapping refs when schema name contains prefix substring', () => {
+      const doc = {
+        components: {
+          schemas: {
+            CreateSomethingRequest: {
+              type: 'object',
+              properties: {
+                kind: { type: 'string' },
+              },
+            },
+            Wrapper: {
+              discriminator: {
+                propertyName: 'kind',
+                mapping: {
+                  create: '#/components/schemas/CreateSomethingRequest',
+                  alreadyPrefixed: '#/components/schemas/Something_CreateSomethingRequest',
+                },
+              },
+              oneOf: [
+                { $ref: '#/components/schemas/CreateSomethingRequest' },
+                { $ref: '#/components/schemas/Something_CreateSomethingRequest' },
+              ],
+            },
+          },
+        },
+      };
+
+      replace$Refs(doc, 'Something');
+
+      expect(doc.components.schemas.Wrapper.discriminator.mapping.create).toBe(
+        '#/components/schemas/Something_CreateSomethingRequest'
+      );
+      expect(doc.components.schemas.Wrapper.discriminator.mapping.alreadyPrefixed).toBe(
+        '#/components/schemas/Something_CreateSomethingRequest'
+      );
+    });
+  });
 });

packages/cli/src/commands/join/helpers/replace-$-refs.ts

@@ -16,7 +16,7 @@ export function replace$Refs(obj: unknown, componentsPrefix: string) {
           mapping[name] = mappingPointer
             .split('/')
             .map((name, i, arr) => {
-              return arr.length - 1 === i && !name.includes(componentsPrefix)
+              return arr.length - 1 === i && !name.startsWith(componentsPrefix + '_')
                 ? componentsPrefix + '_' + name
                 : name;
             })