fix/RangeError

swagger_parser/lib/src/parser/corrector/open_api_corrector.dart

@@ -215,9 +215,12 @@ class OpenApiCorrector {
                 (m) => '\\${m[0]}',
               );
 
-              // In properties blocks, only convert $ref values (not property names)
+              // In properties blocks, convert $ref values and
+              // discriminator mapping values (not property names)
               restoredBlock = restoredBlock.replaceAllMapped(
-                RegExp('\\\$ref:\\s*[\'"]#/[^\'"]*/$escapedType[\'"]'),
+                RegExp(
+                  '(?:\\\$ref:|\\w+):\\s*[\'"]#/[^\'"]*/$escapedType[\'"]',
+                ),
                 (match) => match[0]!.replaceAll(type, correctType),
               );
             }

swagger_parser/test/e2e/e2e_test.dart

@@ -571,6 +571,19 @@ void main() {
       );
     });
 
+    test('recursive_schema', () async {
+      await e2eTest(
+        'basic/recursive_schema',
+        (outputDirectory, schemaPath) => SWPConfig(
+          outputDirectory: outputDirectory,
+          schemaPath: schemaPath,
+          jsonSerializer: JsonSerializer.freezed,
+          putClientsInFolder: true,
+        ),
+        schemaFileName: 'openapi.yaml',
+      );
+    });
+
     test('circular_deps_with_tags', () async {
       await e2eTest(
         'basic/circular_deps_with_tags',

swagger_parser/test/e2e/tests/basic/recursive_schema/openapi.yaml

@@ -0,0 +1,80 @@
+openapi: 3.1.0
+info:
+  title: API with Recursive Schemas
+  version: 1.0.0
+paths:
+  /api/v1/nodes:
+    get:
+      operationId: getNodes
+      tags:
+        - nodes
+      responses:
+        '200':
+          description: A node tree
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Node'
+  /api/v1/groups:
+    get:
+      operationId: getGroups
+      tags:
+        - groups
+      responses:
+        '200':
+          description: A group list
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ACMEGroupList'
+components:
+  schemas:
+    Node:
+      type: object
+      properties:
+        id:
+          type: integer
+        children:
+          type: array
+          items:
+            $ref: '#/components/schemas/Node'
+    ACMEGroupList:
+      type: object
+      required:
+        - data
+      properties:
+        data:
+          type: array
+          items:
+            oneOf:
+              - $ref: '#/components/schemas/ACMEGroup'
+              - $ref: '#/components/schemas/BasicGroup'
+            discriminator:
+              propertyName: type
+              mapping:
+                ACME: '#/components/schemas/ACMEGroup'
+                BASIC: '#/components/schemas/BasicGroup'
+    ACMEGroup:
+      type: object
+      required:
+        - type
+        - name
+      properties:
+        type:
+          type: string
+          enum: ['ACME']
+        name:
+          type: string
+        specialField:
+          type: string
+    BasicGroup:
+      type: object
+      required:
+        - type
+        - name
+      properties:
+        type:
+          type: string
+          enum: ['BASIC']
+        name:
+          type: string