From bfcfc2bdc0d59bc1c6580c353cb39321928f2328 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Apr 2026 09:30:42 +0000
Subject: [PATCH 1/3] Initial plan


From ee01ca78649af651dc85746db14444bbd9077b86 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:09:21 +0000
Subject: [PATCH 2/3] fix: decode URI-encoded names in getDependencies to fix
 missing filtered operations

Agent-Logs-Url: https://github.com/hey-api/openapi-ts/sessions/11f92a24-26b1-4ed3-8ea0-b3a4775a2eeb
---
 .../shared/graph/__tests__/meta.test.ts       | 186 ++++++++++++++++++
 .../shared/src/openApi/shared/graph/meta.ts   |   5 +-
 2 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts

diff --git a/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts b/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts
new file mode 100644
index 0000000000..1740eef1c5
--- /dev/null
+++ b/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts
@@ -0,0 +1,186 @@
+import type { Logger } from '@hey-api/codegen-core';
+
+import { createFilteredDependencies, type Filters } from '../../utils/filter';
+import { buildGraph } from '../../utils/graph';
+import { buildResourceMetadata } from '../meta';
+
+const loggerStub = {
+  timeEvent: () => ({ timeEnd: () => {} }),
+} as unknown as Logger;
+
+function createFilters(): Filters {
+  return {
+    deprecated: true,
+    operations: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+    orphans: false,
+    parameters: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+    preserveOrder: false,
+    requestBodies: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+    responses: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+    schemas: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+    tags: {
+      exclude: new Set(),
+      include: new Set(),
+    },
+  };
+}
+
+describe('buildResourceMetadata', () => {
+  it('decodes URI-encoded names in operation dependencies', () => {
+    // Simulate a spec where the $ref value has been URL-encoded by the JSON schema
+    // ref-parser (e.g. angle brackets in generic schema names: Foo<Bar> -> Foo%3CBar%3E).
+    // The schema key in components/schemas remains unencoded (Foo<Bar>), but the $ref
+    // pointing to it is URL-encoded. Without the fix, the dependency key would be
+    // 'schema/Foo%3CBar%3E' which does not match 'schema/Foo<Bar>' in resourceMetadata.schemas.
+    const spec = {
+      components: {
+        schemas: {
+          ClientItem: {
+            properties: { id: { type: 'string' } },
+            type: 'object',
+          },
+          // Key uses literal angle brackets (as seen when traversing the spec object)
+          'PaginatedList<ClientItem>': {
+            properties: {
+              items: {
+                items: { $ref: '#/components/schemas/ClientItem' },
+                type: 'array',
+              },
+            },
+            type: 'object',
+          },
+        },
+      },
+      paths: {
+        '/api/items': {
+          get: {
+            // $ref uses URL-encoded form as the JSON schema ref-parser would produce
+            responses: {
+              '200': {
+                content: {
+                  'application/json': {
+                    schema: { $ref: '#/components/schemas/PaginatedList%3CClientItem%3E' },
+                  },
+                },
+                description: '',
+              },
+            },
+            tags: ['Client'],
+          },
+        },
+        '/api/other': {
+          get: {
+            responses: { '200': { description: '' } },
+            tags: ['Other'],
+          },
+        },
+      },
+    };
+
+    const { graph } = buildGraph(spec, loggerStub);
+    const { resourceMetadata } = buildResourceMetadata(graph, loggerStub);
+
+    // The operation's dependencies should use the decoded name so they match
+    // the keys in resourceMetadata.schemas
+    const opDeps =
+      resourceMetadata.operations.get('operation/GET /api/items')?.dependencies ?? new Set();
+    expect(opDeps.has('schema/PaginatedList<ClientItem>')).toBe(true);
+    expect(opDeps.has('schema/PaginatedList%3CClientItem%3E')).toBe(false);
+  });
+
+  it('includes operations with URL-encoded schema references when filtering by tag', () => {
+    // Reproduces the issue: when using tag filters, operations whose response schemas
+    // have names with URL-unsafe characters (e.g. angle brackets for generic types like
+    // PaginatedListItem<T>) were incorrectly dropped because the URL-encoded $ref
+    // produced by the JSON schema ref-parser did not match the unencoded schema key
+    // in resourceMetadata.schemas.
+    const spec = {
+      components: {
+        schemas: {
+          ClientItem: {
+            properties: { id: { type: 'string' } },
+            type: 'object',
+          },
+          OtherResponse: {
+            properties: { name: { type: 'string' } },
+            type: 'object',
+          },
+          'PaginatedList<ClientItem>': {
+            properties: {
+              items: {
+                items: { $ref: '#/components/schemas/ClientItem' },
+                type: 'array',
+              },
+            },
+            type: 'object',
+          },
+        },
+      },
+      paths: {
+        '/api/items': {
+          get: {
+            responses: {
+              '200': {
+                content: {
+                  'application/json': {
+                    // URL-encoded $ref simulating what json-schema-ref-parser produces
+                    schema: { $ref: '#/components/schemas/PaginatedList%3CClientItem%3E' },
+                  },
+                },
+                description: '',
+              },
+            },
+            tags: ['Client'],
+          },
+        },
+        '/api/other': {
+          get: {
+            responses: {
+              '200': {
+                content: {
+                  'application/json': {
+                    schema: { $ref: '#/components/schemas/OtherResponse' },
+                  },
+                },
+                description: '',
+              },
+            },
+            tags: ['Other'],
+          },
+        },
+      },
+    };
+
+    const { graph } = buildGraph(spec, loggerStub);
+    const { resourceMetadata } = buildResourceMetadata(graph, loggerStub);
+
+    const filters = createFilters();
+    filters.tags.include.add('Client');
+
+    const { operations } = createFilteredDependencies({
+      filters,
+      logger: loggerStub,
+      resourceMetadata,
+    });
+
+    // The 'Client' tagged operation must be included despite the URL-encoded $ref
+    expect(operations.has('operation/GET /api/items')).toBe(true);
+    // The 'Other' tagged operation must be excluded
+    expect(operations.has('operation/GET /api/other')).toBe(false);
+  });
+});
diff --git a/packages/shared/src/openApi/shared/graph/meta.ts b/packages/shared/src/openApi/shared/graph/meta.ts
index 5018ce8a9a..e62677e045 100644
--- a/packages/shared/src/openApi/shared/graph/meta.ts
+++ b/packages/shared/src/openApi/shared/graph/meta.ts
@@ -77,7 +77,10 @@ export const buildResourceMetadata = (
           if (namespace === 'unknown') {
             console.warn(`unsupported type: ${type}`);
           }
-          dependencies.add(addNamespace(namespace, name));
+          // Decode URI components to handle cases where $ref values were
+          // URL-encoded by the JSON schema ref-parser (e.g. angle brackets
+          // in generic schema names like Foo<Bar> become Foo%3CBar%3E).
+          dependencies.add(addNamespace(namespace, decodeURI(name)));
         }
       }
     }

From 290c14fba3c104a6e820eaa981b29c3b6a378e16 Mon Sep 17 00:00:00 2001
From: Lubos <lubos@heyapi.dev>
Date: Fri, 17 Apr 2026 06:34:47 +0200
Subject: [PATCH 3/3] fix: avoid encoding url unsafe characters

---
 .changeset/kind-terms-greet.md                |   7 +
 .../src/__tests__/bundle.test.ts              | 175 ++++++++++++++++
 .../src/__tests__/pointer.test.ts             |  23 +++
 packages/json-schema-ref-parser/src/bundle.ts |   4 +-
 .../json-schema-ref-parser/src/dereference.ts |   2 +-
 .../common/default-class/types.gen.ts         |   2 +-
 .../@angular/common/default/types.gen.ts      |   2 +-
 .../@hey-api/schemas/default/schemas.gen.ts   |   4 +-
 .../plugins/@hey-api/sdk/default/types.gen.ts |   2 +-
 .../@hey-api/sdk/throwOnError/types.gen.ts    |   2 +-
 .../plugins/@pinia/colada/fetch/types.gen.ts  |   2 +-
 .../axios/types.gen.ts                        |   2 +-
 .../fetch/types.gen.ts                        |   2 +-
 .../@tanstack/preact-query/axios/types.gen.ts |   2 +-
 .../@tanstack/preact-query/fetch/types.gen.ts |   2 +-
 .../@tanstack/react-query/axios/types.gen.ts  |   2 +-
 .../@tanstack/react-query/fetch/types.gen.ts  |   2 +-
 .../react-query/useMutation/types.gen.ts      |   2 +-
 .../@tanstack/solid-query/axios/types.gen.ts  |   2 +-
 .../@tanstack/solid-query/fetch/types.gen.ts  |   2 +-
 .../@tanstack/svelte-query/axios/types.gen.ts |   2 +-
 .../@tanstack/svelte-query/fetch/types.gen.ts |   2 +-
 .../@tanstack/vue-query/axios/types.gen.ts    |   2 +-
 .../@tanstack/vue-query/fetch/types.gen.ts    |   2 +-
 .../plugins/fastify/default/types.gen.ts      |   2 +-
 .../base-url-false/types.gen.ts               |   2 +-
 .../base-url-number/types.gen.ts              |   2 +-
 .../base-url-strict/types.gen.ts              |   2 +-
 .../base-url-string/types.gen.ts              |   2 +-
 .../client-angular/clean-false/types.gen.ts   |   2 +-
 .../client-angular/default/types.gen.ts       |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-axios/base-url-false/types.gen.ts  |   2 +-
 .../client-axios/base-url-number/types.gen.ts |   2 +-
 .../client-axios/base-url-strict/types.gen.ts |   2 +-
 .../client-axios/base-url-string/types.gen.ts |   2 +-
 .../client-axios/clean-false/types.gen.ts     |   2 +-
 .../client-axios/default/types.gen.ts         |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-fetch/base-url-false/types.gen.ts  |   2 +-
 .../client-fetch/base-url-number/types.gen.ts |   2 +-
 .../client-fetch/base-url-strict/types.gen.ts |   2 +-
 .../client-fetch/base-url-string/types.gen.ts |   2 +-
 .../client-fetch/clean-false/types.gen.ts     |   2 +-
 .../client-fetch/default/types.gen.ts         |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-ky/base-url-false/types.gen.ts     |   2 +-
 .../client-ky/base-url-number/types.gen.ts    |   2 +-
 .../client-ky/base-url-strict/types.gen.ts    |   2 +-
 .../client-ky/base-url-string/types.gen.ts    |   2 +-
 .../client-ky/clean-false/types.gen.ts        |   2 +-
 .../@hey-api/client-ky/default/types.gen.ts   |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-next/base-url-false/types.gen.ts   |   2 +-
 .../client-next/base-url-number/types.gen.ts  |   2 +-
 .../client-next/base-url-strict/types.gen.ts  |   2 +-
 .../client-next/base-url-string/types.gen.ts  |   2 +-
 .../client-next/clean-false/types.gen.ts      |   2 +-
 .../@hey-api/client-next/default/types.gen.ts |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-nuxt/base-url-false/types.gen.ts   |   2 +-
 .../client-nuxt/base-url-number/types.gen.ts  |   2 +-
 .../client-nuxt/base-url-strict/types.gen.ts  |   2 +-
 .../client-nuxt/base-url-string/types.gen.ts  |   2 +-
 .../client-nuxt/clean-false/types.gen.ts      |   2 +-
 .../@hey-api/client-nuxt/default/types.gen.ts |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-ofetch/base-url-false/types.gen.ts |   2 +-
 .../base-url-number/types.gen.ts              |   2 +-
 .../base-url-strict/types.gen.ts              |   2 +-
 .../base-url-string/types.gen.ts              |   2 +-
 .../client-ofetch/clean-false/types.gen.ts    |   2 +-
 .../client-ofetch/default/types.gen.ts        |   2 +-
 .../import-file-extension-ts/types.gen.ts     |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../tsconfig-node16-sdk/types.gen.ts          |   2 +-
 .../tsconfig-nodenext-sdk/types.gen.ts        |   2 +-
 .../client-custom/base-url-false/types.gen.ts |   2 +-
 .../base-url-number/types.gen.ts              |   2 +-
 .../base-url-strict/types.gen.ts              |   2 +-
 .../base-url-string/types.gen.ts              |   2 +-
 .../client-custom/default/types.gen.ts        |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../my-client/base-url-false/types.gen.ts     |   2 +-
 .../my-client/base-url-number/types.gen.ts    |   2 +-
 .../my-client/base-url-strict/types.gen.ts    |   2 +-
 .../my-client/base-url-string/types.gen.ts    |   2 +-
 .../clients/my-client/bundle/types.gen.ts     |   2 +-
 .../clients/my-client/default/types.gen.ts    |   2 +-
 .../sdk-client-optional/types.gen.ts          |   2 +-
 .../sdk-client-required/types.gen.ts          |   2 +-
 .../common/default-class/types.gen.ts         |   2 +-
 .../@angular/common/default/types.gen.ts      |   2 +-
 .../@hey-api/schemas/default/schemas.gen.ts   |   4 +-
 .../plugins/@hey-api/sdk/default/types.gen.ts |   2 +-
 .../@hey-api/sdk/throwOnError/types.gen.ts    |   2 +-
 .../plugins/@pinia/colada/fetch/types.gen.ts  |   2 +-
 .../axios/types.gen.ts                        |   2 +-
 .../fetch/types.gen.ts                        |   2 +-
 .../@tanstack/preact-query/axios/types.gen.ts |   2 +-
 .../@tanstack/preact-query/fetch/types.gen.ts |   2 +-
 .../@tanstack/react-query/axios/types.gen.ts  |   2 +-
 .../@tanstack/react-query/fetch/types.gen.ts  |   2 +-
 .../react-query/useMutation/types.gen.ts      |   2 +-
 .../@tanstack/solid-query/axios/types.gen.ts  |   2 +-
 .../@tanstack/solid-query/fetch/types.gen.ts  |   2 +-
 .../@tanstack/svelte-query/axios/types.gen.ts |   2 +-
 .../@tanstack/svelte-query/fetch/types.gen.ts |   2 +-
 .../@tanstack/vue-query/axios/types.gen.ts    |   2 +-
 .../@tanstack/vue-query/fetch/types.gen.ts    |   2 +-
 .../plugins/fastify/default/types.gen.ts      |   2 +-
 .../__snapshots__/3.0.x/default/types.gen.ts  |   2 +-
 .../__snapshots__/3.1.x/default/types.gen.ts  |   2 +-
 .../3.0.x/mini/default/zod.gen.ts             |  16 +-
 .../__snapshots__/3.0.x/v3/default/zod.gen.ts |  16 +-
 .../__snapshots__/3.0.x/v4/default/zod.gen.ts |  16 +-
 .../3.1.x/mini/default/zod.gen.ts             |  16 +-
 .../__snapshots__/3.1.x/v3/default/zod.gen.ts |  16 +-
 .../__snapshots__/3.1.x/v4/default/zod.gen.ts |  16 +-
 .../3.0.x/mini/default/zod.gen.ts             |  16 +-
 .../__snapshots__/3.0.x/v3/default/zod.gen.ts |  16 +-
 .../__snapshots__/3.0.x/v4/default/zod.gen.ts |  16 +-
 .../3.1.x/mini/default/zod.gen.ts             |  16 +-
 .../__snapshots__/3.1.x/v3/default/zod.gen.ts |  16 +-
 .../__snapshots__/3.1.x/v4/default/zod.gen.ts |  16 +-
 .../src/plugins/@hey-api/schemas/plugin.ts    |  60 +++---
 .../shared/src/openApi/2.0.x/parser/schema.ts |   4 +-
 .../shared/src/openApi/3.0.x/parser/schema.ts |   4 +-
 .../shared/src/openApi/3.1.x/parser/schema.ts |   4 +-
 .../shared/graph/__tests__/meta.test.ts       | 186 ------------------
 .../shared/src/openApi/shared/graph/meta.ts   |   5 +-
 .../shared/src/utils/__tests__/path.test.ts   |   6 -
 packages/shared/src/utils/path.ts             |   4 +-
 packages/shared/src/utils/ref.ts              |   8 +-
 160 files changed, 471 insertions(+), 485 deletions(-)
 create mode 100644 .changeset/kind-terms-greet.md
 delete mode 100644 packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts

diff --git a/.changeset/kind-terms-greet.md b/.changeset/kind-terms-greet.md
new file mode 100644
index 0000000000..b7e3b9089b
--- /dev/null
+++ b/.changeset/kind-terms-greet.md
@@ -0,0 +1,7 @@
+---
+"@hey-api/json-schema-ref-parser": patch
+"@hey-api/openapi-ts": patch
+"@hey-api/shared": patch
+---
+
+**parser**: fix: avoid encoding url unsafe characters
diff --git a/packages/json-schema-ref-parser/src/__tests__/bundle.test.ts b/packages/json-schema-ref-parser/src/__tests__/bundle.test.ts
index 37b24d7434..00b7ae0023 100644
--- a/packages/json-schema-ref-parser/src/__tests__/bundle.test.ts
+++ b/packages/json-schema-ref-parser/src/__tests__/bundle.test.ts
@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -11,6 +12,10 @@ const __dirname = path.dirname(__filename);
 const getSnapshotsPath = () => path.join(__dirname, '__snapshots__');
 const getTempSnapshotsPath = () => path.join(__dirname, '.gen', 'snapshots');
 
+const writeJsonFile = (filePath: string, value: unknown) => {
+  fs.writeFileSync(filePath, JSON.stringify(value, null, 2));
+};
+
 /**
  * Helper function to compare a bundled schema with a snapshot file.
  * Handles writing the schema to a temp file and comparing with the snapshot.
@@ -46,6 +51,176 @@ describe('bundle', () => {
     await expectBundledSchemaToMatchSnapshot(schema, 'circular-ref-with-description.json');
   });
 
+  it('emits decoded internal refs for generic component names', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'json-schema-ref-parser-'));
+
+    try {
+      const rootPath = path.join(tempDir, 'root.json');
+
+      writeJsonFile(rootPath, {
+        components: {
+          schemas: {
+            ClientResponse: {
+              properties: {
+                id: {
+                  type: 'string',
+                },
+              },
+              type: 'object',
+            },
+            'PaginatedListItems<ClientResponse>': {
+              properties: {
+                items: {
+                  items: {
+                    $ref: '#/components/schemas/ClientResponse',
+                  },
+                  type: 'array',
+                },
+              },
+              type: 'object',
+            },
+          },
+        },
+        info: {
+          title: 'Test API',
+          version: '1.0.0',
+        },
+        openapi: '3.0.0',
+        paths: {
+          '/clients': {
+            get: {
+              responses: {
+                '200': {
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: '#/components/schemas/PaginatedListItems<ClientResponse>',
+                      },
+                    },
+                  },
+                  description: 'ok',
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const refParser = new $RefParser();
+      const schema = (await refParser.bundle({ pathOrUrlOrSchema: rootPath })) as any;
+
+      expect(
+        schema.paths['/clients'].get.responses['200'].content['application/json'].schema.$ref,
+      ).toBe('#/components/schemas/PaginatedListItems<ClientResponse>');
+
+      const bundledJson = JSON.stringify(schema);
+      expect(bundledJson).not.toContain('PaginatedListItems%3CClientResponse%3E');
+    } finally {
+      fs.rmSync(tempDir, { force: true, recursive: true });
+    }
+  });
+
+  it('emits decoded refs for external schemas with generic and unicode names', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'json-schema-ref-parser-'));
+
+    try {
+      const externalPath = path.join(tempDir, 'external.json');
+      const rootPath = path.join(tempDir, 'root.json');
+
+      writeJsonFile(externalPath, {
+        components: {
+          schemas: {
+            'PaginatedList<ClientItem>': {
+              description: 'generic schema',
+              properties: {
+                next: {
+                  $ref: '#/components/schemas/PaginatedList<ClientItem>',
+                },
+              },
+              type: 'object',
+            },
+            Überschrift: {
+              description: 'unicode schema',
+              properties: {
+                next: {
+                  $ref: '#/components/schemas/Überschrift',
+                },
+              },
+              type: 'object',
+            },
+          },
+        },
+      });
+
+      writeJsonFile(rootPath, {
+        info: {
+          title: 'Test API',
+          version: '1.0.0',
+        },
+        openapi: '3.0.0',
+        paths: {
+          '/generic': {
+            get: {
+              responses: {
+                '200': {
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: 'external.json#/components/schemas/PaginatedList<ClientItem>',
+                      },
+                    },
+                  },
+                  description: 'ok',
+                },
+              },
+            },
+          },
+          '/unicode': {
+            get: {
+              responses: {
+                '200': {
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: 'external.json#/components/schemas/Überschrift',
+                      },
+                    },
+                  },
+                  description: 'ok',
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const refParser = new $RefParser();
+      const schema = (await refParser.bundle({ pathOrUrlOrSchema: rootPath })) as any;
+      const schemas = schema.components.schemas as Record<string, any>;
+
+      const findSchemaByDescription = (description: string) =>
+        Object.entries(schemas).find(([, value]) => value.description === description);
+
+      const genericSchema = findSchemaByDescription('generic schema');
+      const unicodeSchema = findSchemaByDescription('unicode schema');
+
+      expect(genericSchema).toBeDefined();
+      expect(unicodeSchema).toBeDefined();
+
+      const [genericName, genericValue] = genericSchema!;
+      const [unicodeName, unicodeValue] = unicodeSchema!;
+
+      expect(genericValue.properties.next.$ref).toBe(`#/components/schemas/${genericName}`);
+      expect(unicodeValue.properties.next.$ref).toBe(`#/components/schemas/${unicodeName}`);
+
+      const bundledJson = JSON.stringify(schema);
+      expect(bundledJson).not.toContain('PaginatedList%3CClientItem%3E');
+      expect(bundledJson).not.toContain('%C3%9Cberschrift');
+    } finally {
+      fs.rmSync(tempDir, { force: true, recursive: true });
+    }
+  });
+
   it('bundles multiple references to the same file correctly', async () => {
     const refParser = new $RefParser();
     const pathOrUrlOrSchema = path.join(
diff --git a/packages/json-schema-ref-parser/src/__tests__/pointer.test.ts b/packages/json-schema-ref-parser/src/__tests__/pointer.test.ts
index cc13788379..7d5e009a52 100644
--- a/packages/json-schema-ref-parser/src/__tests__/pointer.test.ts
+++ b/packages/json-schema-ref-parser/src/__tests__/pointer.test.ts
@@ -1,9 +1,32 @@
 import path from 'node:path';
 
 import { $RefParser } from '..';
+import Pointer from '../pointer';
 import { getSpecsPath } from './utils';
 
 describe('pointer', () => {
+  it('round-trips generic and unicode component names through join and parse', () => {
+    const genericRef = Pointer.join('#/components/schemas', 'PaginatedListItems<ClientResponse>');
+    const unicodeRef = Pointer.join('#/components/schemas', 'Überschrift');
+
+    expect(genericRef).toBe('#/components/schemas/PaginatedListItems%3CClientResponse%3E');
+    expect(unicodeRef).toBe('#/components/schemas/%C3%9Cberschrift');
+
+    expect(Pointer.parse(genericRef)).toEqual([
+      'components',
+      'schemas',
+      'PaginatedListItems<ClientResponse>',
+    ]);
+    expect(Pointer.parse(unicodeRef)).toEqual(['components', 'schemas', 'Überschrift']);
+  });
+
+  it('preserves JSON Pointer escaping for path-like tokens while decoding them on parse', () => {
+    const joined = Pointer.join('#/paths', '/foo');
+
+    expect(joined).toBe('#/paths/~1foo');
+    expect(Pointer.parse(joined)).toEqual(['paths', '/foo']);
+  });
+
   it('inlines internal JSON Pointer refs under #/paths/ for OpenAPI bundling', async () => {
     const refParser = new $RefParser();
     const pathOrUrlOrSchema = path.join(
diff --git a/packages/json-schema-ref-parser/src/bundle.ts b/packages/json-schema-ref-parser/src/bundle.ts
index 2eec6493b0..c6fd409a41 100644
--- a/packages/json-schema-ref-parser/src/bundle.ts
+++ b/packages/json-schema-ref-parser/src/bundle.ts
@@ -574,7 +574,7 @@ function remap(parser: $RefParser, inventory: Array<InventoryEntry>) {
     // preserve the original $ref rather than rewriting it to the resolved hash.
     if (!entry.external) {
       if (!entry.extended && entry.$ref && typeof entry.$ref === 'object') {
-        entry.$ref.$ref = entry.hash;
+        entry.$ref.$ref = decodeURI(entry.hash);
       }
       continue;
     }
@@ -582,7 +582,7 @@ function remap(parser: $RefParser, inventory: Array<InventoryEntry>) {
     // Avoid changing direct self-references; keep them internal
     if (entry.circular) {
       if (entry.$ref && typeof entry.$ref === 'object') {
-        entry.$ref.$ref = entry.pathFromRoot;
+        entry.$ref.$ref = decodeURI(entry.pathFromRoot);
       }
       continue;
     }
diff --git a/packages/json-schema-ref-parser/src/dereference.ts b/packages/json-schema-ref-parser/src/dereference.ts
index 4d97209d8e..de5a623710 100644
--- a/packages/json-schema-ref-parser/src/dereference.ts
+++ b/packages/json-schema-ref-parser/src/dereference.ts
@@ -228,7 +228,7 @@ function dereference$Ref<S extends object = JSONSchema>(
   if (directCircular) {
     // The pointer is a DIRECT circular reference (i.e., it references itself).
     // So replace the $ref path with the absolute path from the JSON Schema root
-    dereferencedValue.$ref = pathFromRoot;
+    dereferencedValue.$ref = decodeURI(pathFromRoot);
   }
 
   const dereferencedObject = {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts
index 636147d56a..980fd6d71e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts
@@ -2356,7 +2356,7 @@ export const OneOfAllOfIssueWritableSchema = {
                             $ref: '#/components/schemas/ConstValue'
                         },
                         {
-                            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.Boolean]'
+                            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.Boolean]Writable'
                         }
                     ]
                 },
@@ -2366,7 +2366,7 @@ export const OneOfAllOfIssueWritableSchema = {
             ]
         },
         {
-            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.String]'
+            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.String]Writable'
         }
     ]
 } as const;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/useMutation/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/types.gen.ts
index a22aa515cc..9dde7d02fc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/fastify/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/fastify/default/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/fastify/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/fastify/default/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/types.gen.ts
index 91cb1a373f..d03a97194a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/types.gen.ts
index 91cb1a373f..d03a97194a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/types.gen.ts
index 57ceb17c50..23e73ffed6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/schemas/default/schemas.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/schemas/default/schemas.gen.ts
index 0c05f072f1..6233f9fc00 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/schemas/default/schemas.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/schemas/default/schemas.gen.ts
@@ -2405,7 +2405,7 @@ export const OneOfAllOfIssueWritableSchema = {
                             $ref: '#/components/schemas/ConstValue'
                         },
                         {
-                            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.Boolean]'
+                            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.Boolean]Writable'
                         }
                     ]
                 },
@@ -2415,7 +2415,7 @@ export const OneOfAllOfIssueWritableSchema = {
             ]
         },
         {
-            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.String]'
+            $ref: '#/components/schemas/Generic.Schema.Duplicate.Issue`1[System.String]Writable'
         }
     ]
 } as const;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/preact-query/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/useMutation/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/useMutation/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/types.gen.ts
index 1b48eb5baf..7b48941ad3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/fastify/default/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/fastify/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/fastify/default/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/fastify/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.0.x/default/types.gen.ts b/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.0.x/default/types.gen.ts
index 1b553ea1ed..2223d82c40 100644
--- a/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.0.x/default/types.gen.ts
+++ b/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.0.x/default/types.gen.ts
@@ -1043,7 +1043,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.1.x/default/types.gen.ts b/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.1.x/default/types.gen.ts
index 916fd3b949..741f01812c 100644
--- a/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.1.x/default/types.gen.ts
+++ b/packages/openapi-ts-tests/nestjs/v11/__snapshots__/3.1.x/default/types.gen.ts
@@ -1056,7 +1056,7 @@ export type AdditionalPropertiesUnknownIssueWritable = {
     [key: string]: string | number;
 };
 
-export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBooleanWritable) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemStringWritable;
 
 export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
     item?: boolean;
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
index c47fadf327..5b216f4cb8 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.optional(z.boolean()),
     error: z.nullish(z.string()),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.nullish(z.string())
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/default/zod.gen.ts
index 5c6dc87c2b..3e01760aea 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.union([
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
index ab1abd778e..352fd90398 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
index 81dab9d3d4..6fe8c52873 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.optional(z.boolean()),
     error: z.nullish(z.string()),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.nullish(z.string())
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/default/zod.gen.ts
index 1aa1e86a66..02f5a01f0e 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.union([
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
index 069d3536d3..fb868a729d 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
index 7821e9f7af..3bf6af96dc 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.optional(z.boolean()),
     error: z.nullish(z.string()),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.nullish(z.string())
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/default/zod.gen.ts
index 71377eec8f..b6e9f445a6 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.union([
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
index 424a8ed779..a0437fa3f0 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
@@ -1028,14 +1028,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1047,6 +1039,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
index 4850e117d1..3f26aa5d93 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.optional(z.boolean()),
     error: z.nullish(z.string()),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.nullish(z.string())
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/default/zod.gen.ts
index 81ebbaf44a..a053389f96 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.union([
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
index 86a318e83c..5098d450e2 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
@@ -1037,14 +1037,6 @@ export const zAdditionalPropertiesUnknownIssueWritable = z.record(z.string(), z.
     z.number()
 ]));
 
-export const zOneOfAllOfIssueWritable = z.union([
-    z.intersection(z.union([
-        zConstValue,
-        zGenericSchemaDuplicateIssue1SystemBoolean
-    ]), z3eNum1Период),
-    zGenericSchemaDuplicateIssue1SystemString
-]);
-
 export const zGenericSchemaDuplicateIssue1SystemBooleanWritable = z.object({
     item: z.boolean().optional(),
     error: z.string().nullish(),
@@ -1056,6 +1048,14 @@ export const zGenericSchemaDuplicateIssue1SystemStringWritable = z.object({
     error: z.string().nullish()
 });
 
+export const zOneOfAllOfIssueWritable = z.union([
+    z.intersection(z.union([
+        zConstValue,
+        zGenericSchemaDuplicateIssue1SystemBooleanWritable
+    ]), z3eNum1Период),
+    zGenericSchemaDuplicateIssue1SystemStringWritable
+]);
+
 /**
  * This is a reusable parameter
  */
diff --git a/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts
index 985c2ed54e..09736989e4 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/schemas/plugin.ts
@@ -5,13 +5,13 @@ import type { OpenAPIV2, OpenAPIV3, OpenAPIV3_1 } from '@hey-api/spec-types';
 import { $ } from '../../../ts-dsl';
 import type { HeyApiSchemasPlugin } from './types';
 
-const stripSchema = ({
+function stripSchema({
   plugin,
   schema,
 }: {
   plugin: HeyApiSchemasPlugin['Instance'];
   schema: OpenAPIV2.SchemaObject | OpenAPIV3.SchemaObject | OpenAPIV3_1.SchemaObject;
-}) => {
+}) {
   if (plugin.config.type === 'form') {
     if (schema.description) {
       delete schema.description;
@@ -33,9 +33,9 @@ const stripSchema = ({
       delete schema.title;
     }
   }
-};
+}
 
-const schemaToJsonSchemaDraft_04 = ({
+function schemaToJsonSchemaDraft_04({
   context,
   plugin,
   schema: _schema,
@@ -43,7 +43,7 @@ const schemaToJsonSchemaDraft_04 = ({
   context: Context;
   plugin: HeyApiSchemasPlugin['Instance'];
   schema: OpenAPIV2.SchemaObject;
-}): OpenAPIV2.SchemaObject => {
+}): OpenAPIV2.SchemaObject {
   if (Array.isArray(_schema)) {
     return _schema.map((item) =>
       schemaToJsonSchemaDraft_04({
@@ -57,9 +57,6 @@ const schemaToJsonSchemaDraft_04 = ({
   const schema = structuredClone(_schema);
 
   if (schema.$ref) {
-    // refs using unicode characters become encoded, didn't investigate why
-    // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-    schema.$ref = decodeURI(schema.$ref);
     return schema;
   }
 
@@ -106,9 +103,9 @@ const schemaToJsonSchemaDraft_04 = ({
   }
 
   return schema;
-};
+}
 
-const schemaToJsonSchemaDraft_05 = ({
+function schemaToJsonSchemaDraft_05({
   context,
   plugin,
   schema: _schema,
@@ -116,7 +113,7 @@ const schemaToJsonSchemaDraft_05 = ({
   context: Context;
   plugin: HeyApiSchemasPlugin['Instance'];
   schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject;
-}): OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject => {
+}): OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject {
   if (Array.isArray(_schema)) {
     return _schema.map((item) =>
       schemaToJsonSchemaDraft_05({
@@ -130,9 +127,6 @@ const schemaToJsonSchemaDraft_05 = ({
   const schema = structuredClone(_schema);
 
   if ('$ref' in schema) {
-    // refs using unicode characters become encoded, didn't investigate why
-    // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-    schema.$ref = decodeURI(schema.$ref);
     return schema;
   }
 
@@ -199,9 +193,9 @@ const schemaToJsonSchemaDraft_05 = ({
   }
 
   return schema;
-};
+}
 
-const schemaToJsonSchema2020_12 = ({
+function schemaToJsonSchema2020_12({
   context,
   plugin,
   schema: _schema,
@@ -209,7 +203,7 @@ const schemaToJsonSchema2020_12 = ({
   context: Context;
   plugin: HeyApiSchemasPlugin['Instance'];
   schema: OpenAPIV3_1.SchemaObject;
-}): OpenAPIV3_1.SchemaObject => {
+}): OpenAPIV3_1.SchemaObject {
   if (Array.isArray(_schema)) {
     return _schema.map((item) =>
       schemaToJsonSchema2020_12({
@@ -224,12 +218,6 @@ const schemaToJsonSchema2020_12 = ({
 
   stripSchema({ plugin, schema });
 
-  if (schema.$ref) {
-    // refs using unicode characters become encoded, didn't investigate why
-    // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-    schema.$ref = decodeURI(schema.$ref);
-  }
-
   if (schema.additionalProperties && typeof schema.additionalProperties !== 'boolean') {
     schema.additionalProperties = schemaToJsonSchema2020_12({
       context,
@@ -301,9 +289,9 @@ const schemaToJsonSchema2020_12 = ({
   }
 
   return schema;
-};
+}
 
-const schemaName = ({
+function schemaName({
   name,
   plugin,
   schema,
@@ -315,7 +303,7 @@ const schemaName = ({
     | OpenAPIV3.ReferenceObject
     | OpenAPIV3.SchemaObject
     | OpenAPIV3_1.SchemaObject;
-}): string => {
+}): string {
   let customName = '';
 
   if (plugin.config.nameBuilder) {
@@ -331,15 +319,15 @@ const schemaName = ({
   }
 
   return customName;
-};
+}
 
-const schemasV2_0_X = ({
+function schemasV2_0_X({
   context,
   plugin,
 }: {
   context: Context<OpenApi.V2_0_X>;
   plugin: HeyApiSchemasPlugin['Instance'];
-}) => {
+}) {
   if (!context.spec.definitions) {
     return;
   }
@@ -370,15 +358,15 @@ const schemasV2_0_X = ({
       );
     plugin.node(statement);
   }
-};
+}
 
-const schemasV3_0_X = ({
+function schemasV3_0_X({
   context,
   plugin,
 }: {
   context: Context<OpenApi.V3_0_X>;
   plugin: HeyApiSchemasPlugin['Instance'];
-}) => {
+}) {
   if (!context.spec.components) {
     return;
   }
@@ -409,15 +397,15 @@ const schemasV3_0_X = ({
       );
     plugin.node(statement);
   }
-};
+}
 
-const schemasV3_1_X = ({
+function schemasV3_1_X({
   context,
   plugin,
 }: {
   context: Context<OpenApi.V3_1_X>;
   plugin: HeyApiSchemasPlugin['Instance'];
-}) => {
+}) {
   if (!context.spec.components) {
     return;
   }
@@ -448,7 +436,7 @@ const schemasV3_1_X = ({
       );
     plugin.node(statement);
   }
-};
+}
 
 export const handler: HeyApiSchemasPlugin['Handler'] = ({ plugin }) => {
   if ('swagger' in plugin.context.spec) {
diff --git a/packages/shared/src/openApi/2.0.x/parser/schema.ts b/packages/shared/src/openApi/2.0.x/parser/schema.ts
index 9efd320763..2c0c366437 100644
--- a/packages/shared/src/openApi/2.0.x/parser/schema.ts
+++ b/packages/shared/src/openApi/2.0.x/parser/schema.ts
@@ -551,9 +551,7 @@ function parseRef({
     // Fallback to preserving the ref if circular
   }
 
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  irSchema.$ref = decodeURI(schema.$ref);
+  irSchema.$ref = schema.$ref;
 
   // rewrite definitions refs as the internal schema follows OpenAPI 3.x syntax
   // and stores all definitions as reusable schemas
diff --git a/packages/shared/src/openApi/3.0.x/parser/schema.ts b/packages/shared/src/openApi/3.0.x/parser/schema.ts
index ceeed38999..3c57dcef11 100644
--- a/packages/shared/src/openApi/3.0.x/parser/schema.ts
+++ b/packages/shared/src/openApi/3.0.x/parser/schema.ts
@@ -1063,9 +1063,7 @@ function parseRef({
 
   const irSchema: IR.SchemaObject = {};
 
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  irSchema.$ref = decodeURI(schema.$ref);
+  irSchema.$ref = schema.$ref;
 
   if (!state.circularReferenceTracker.has(schema.$ref)) {
     const refSchema = context.resolveRef<OpenAPIV3.SchemaObject>(schema.$ref);
diff --git a/packages/shared/src/openApi/3.1.x/parser/schema.ts b/packages/shared/src/openApi/3.1.x/parser/schema.ts
index 620f0a85d0..cf8588e19a 100644
--- a/packages/shared/src/openApi/3.1.x/parser/schema.ts
+++ b/packages/shared/src/openApi/3.1.x/parser/schema.ts
@@ -1141,9 +1141,7 @@ function parseRef({
 
   const irRefSchema: IR.SchemaObject = {};
 
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  irRefSchema.$ref = decodeURI(schema.$ref);
+  irRefSchema.$ref = schema.$ref;
 
   if (!state.circularReferenceTracker.has(schema.$ref)) {
     const refSchema = context.resolveRef<OpenAPIV3_1.SchemaObject>(schema.$ref);
diff --git a/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts b/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts
deleted file mode 100644
index 1740eef1c5..0000000000
--- a/packages/shared/src/openApi/shared/graph/__tests__/meta.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import type { Logger } from '@hey-api/codegen-core';
-
-import { createFilteredDependencies, type Filters } from '../../utils/filter';
-import { buildGraph } from '../../utils/graph';
-import { buildResourceMetadata } from '../meta';
-
-const loggerStub = {
-  timeEvent: () => ({ timeEnd: () => {} }),
-} as unknown as Logger;
-
-function createFilters(): Filters {
-  return {
-    deprecated: true,
-    operations: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-    orphans: false,
-    parameters: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-    preserveOrder: false,
-    requestBodies: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-    responses: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-    schemas: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-    tags: {
-      exclude: new Set(),
-      include: new Set(),
-    },
-  };
-}
-
-describe('buildResourceMetadata', () => {
-  it('decodes URI-encoded names in operation dependencies', () => {
-    // Simulate a spec where the $ref value has been URL-encoded by the JSON schema
-    // ref-parser (e.g. angle brackets in generic schema names: Foo<Bar> -> Foo%3CBar%3E).
-    // The schema key in components/schemas remains unencoded (Foo<Bar>), but the $ref
-    // pointing to it is URL-encoded. Without the fix, the dependency key would be
-    // 'schema/Foo%3CBar%3E' which does not match 'schema/Foo<Bar>' in resourceMetadata.schemas.
-    const spec = {
-      components: {
-        schemas: {
-          ClientItem: {
-            properties: { id: { type: 'string' } },
-            type: 'object',
-          },
-          // Key uses literal angle brackets (as seen when traversing the spec object)
-          'PaginatedList<ClientItem>': {
-            properties: {
-              items: {
-                items: { $ref: '#/components/schemas/ClientItem' },
-                type: 'array',
-              },
-            },
-            type: 'object',
-          },
-        },
-      },
-      paths: {
-        '/api/items': {
-          get: {
-            // $ref uses URL-encoded form as the JSON schema ref-parser would produce
-            responses: {
-              '200': {
-                content: {
-                  'application/json': {
-                    schema: { $ref: '#/components/schemas/PaginatedList%3CClientItem%3E' },
-                  },
-                },
-                description: '',
-              },
-            },
-            tags: ['Client'],
-          },
-        },
-        '/api/other': {
-          get: {
-            responses: { '200': { description: '' } },
-            tags: ['Other'],
-          },
-        },
-      },
-    };
-
-    const { graph } = buildGraph(spec, loggerStub);
-    const { resourceMetadata } = buildResourceMetadata(graph, loggerStub);
-
-    // The operation's dependencies should use the decoded name so they match
-    // the keys in resourceMetadata.schemas
-    const opDeps =
-      resourceMetadata.operations.get('operation/GET /api/items')?.dependencies ?? new Set();
-    expect(opDeps.has('schema/PaginatedList<ClientItem>')).toBe(true);
-    expect(opDeps.has('schema/PaginatedList%3CClientItem%3E')).toBe(false);
-  });
-
-  it('includes operations with URL-encoded schema references when filtering by tag', () => {
-    // Reproduces the issue: when using tag filters, operations whose response schemas
-    // have names with URL-unsafe characters (e.g. angle brackets for generic types like
-    // PaginatedListItem<T>) were incorrectly dropped because the URL-encoded $ref
-    // produced by the JSON schema ref-parser did not match the unencoded schema key
-    // in resourceMetadata.schemas.
-    const spec = {
-      components: {
-        schemas: {
-          ClientItem: {
-            properties: { id: { type: 'string' } },
-            type: 'object',
-          },
-          OtherResponse: {
-            properties: { name: { type: 'string' } },
-            type: 'object',
-          },
-          'PaginatedList<ClientItem>': {
-            properties: {
-              items: {
-                items: { $ref: '#/components/schemas/ClientItem' },
-                type: 'array',
-              },
-            },
-            type: 'object',
-          },
-        },
-      },
-      paths: {
-        '/api/items': {
-          get: {
-            responses: {
-              '200': {
-                content: {
-                  'application/json': {
-                    // URL-encoded $ref simulating what json-schema-ref-parser produces
-                    schema: { $ref: '#/components/schemas/PaginatedList%3CClientItem%3E' },
-                  },
-                },
-                description: '',
-              },
-            },
-            tags: ['Client'],
-          },
-        },
-        '/api/other': {
-          get: {
-            responses: {
-              '200': {
-                content: {
-                  'application/json': {
-                    schema: { $ref: '#/components/schemas/OtherResponse' },
-                  },
-                },
-                description: '',
-              },
-            },
-            tags: ['Other'],
-          },
-        },
-      },
-    };
-
-    const { graph } = buildGraph(spec, loggerStub);
-    const { resourceMetadata } = buildResourceMetadata(graph, loggerStub);
-
-    const filters = createFilters();
-    filters.tags.include.add('Client');
-
-    const { operations } = createFilteredDependencies({
-      filters,
-      logger: loggerStub,
-      resourceMetadata,
-    });
-
-    // The 'Client' tagged operation must be included despite the URL-encoded $ref
-    expect(operations.has('operation/GET /api/items')).toBe(true);
-    // The 'Other' tagged operation must be excluded
-    expect(operations.has('operation/GET /api/other')).toBe(false);
-  });
-});
diff --git a/packages/shared/src/openApi/shared/graph/meta.ts b/packages/shared/src/openApi/shared/graph/meta.ts
index e62677e045..5018ce8a9a 100644
--- a/packages/shared/src/openApi/shared/graph/meta.ts
+++ b/packages/shared/src/openApi/shared/graph/meta.ts
@@ -77,10 +77,7 @@ export const buildResourceMetadata = (
           if (namespace === 'unknown') {
             console.warn(`unsupported type: ${type}`);
           }
-          // Decode URI components to handle cases where $ref values were
-          // URL-encoded by the JSON schema ref-parser (e.g. angle brackets
-          // in generic schema names like Foo<Bar> become Foo%3CBar%3E).
-          dependencies.add(addNamespace(namespace, decodeURI(name)));
+          dependencies.add(addNamespace(namespace, name));
         }
       }
     }
diff --git a/packages/shared/src/utils/__tests__/path.test.ts b/packages/shared/src/utils/__tests__/path.test.ts
index b7963a3cd3..4421fd9432 100644
--- a/packages/shared/src/utils/__tests__/path.test.ts
+++ b/packages/shared/src/utils/__tests__/path.test.ts
@@ -142,12 +142,6 @@ describe('pathToName', () => {
     );
   });
 
-  // ── Encoded characters ──
-
-  it('handles URI-encoded names', () => {
-    expect(pathToName(['components', 'schemas', 'My%20Schema'])).toBe('My Schema');
-  });
-
   // ── Anchor option ──
 
   it('uses anchor for component schema', () => {
diff --git a/packages/shared/src/utils/path.ts b/packages/shared/src/utils/path.ts
index c176990f97..19224216d3 100644
--- a/packages/shared/src/utils/path.ts
+++ b/packages/shared/src/utils/path.ts
@@ -136,7 +136,5 @@ export function pathToName(
     index++;
   }
 
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  return decodeURI(names.join('-'));
+  return names.join('-');
 }
diff --git a/packages/shared/src/utils/ref.ts b/packages/shared/src/utils/ref.ts
index d20ab19eec..84c70422bf 100644
--- a/packages/shared/src/utils/ref.ts
+++ b/packages/shared/src/utils/ref.ts
@@ -7,9 +7,7 @@ const jsonPointerTilde = /~0/g;
 export function refToName($ref: string): string {
   const path = jsonPointerToPath($ref);
   const name = path[path.length - 1]!;
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  return decodeURI(name);
+  return name;
 }
 
 /**
@@ -121,9 +119,7 @@ export function isTopLevelComponent(refOrPath: string | ReadonlyArray<string | n
 }
 
 export function resolveRef<T>({ $ref, spec }: { $ref: string; spec: Record<string, any> }): T {
-  // refs using unicode characters become encoded, didn't investigate why
-  // but the suspicion is this comes from `@hey-api/json-schema-ref-parser`
-  const path = jsonPointerToPath(decodeURI($ref));
+  const path = jsonPointerToPath($ref);
 
   let current = spec;