fix misskey-js generator compatibility with openapi-typescript 7.x

packages/misskey-js/generator/package.json

@@ -8,6 +8,7 @@
 	},
 	"devDependencies": {
 		"@readme/openapi-parser": "5.0.1",
+		"@redocly/openapi-core": "1.34.5",
 		"@types/node": "22.18.1",
 		"@typescript-eslint/eslint-plugin": "8.44.1",
 		"@typescript-eslint/parser": "8.44.1",

packages/misskey-js/generator/src/generator.ts

@@ -2,8 +2,10 @@ import assert from 'assert';
 import { mkdir, readFile, writeFile } from 'fs/promises';
 import { OpenAPIV3_1 } from 'openapi-types';
 import { toPascal } from 'ts-case-convert';
-import OpenAPIParser from '@readme/openapi-parser';
+import * as OpenAPIParser from '@readme/openapi-parser';
-import openapiTS, { OpenAPI3, OperationObject, PathItemObject } from 'openapi-typescript';
+import openapiTS, { astToString, OpenAPI3, OperationObject, PathItemObject } from 'openapi-typescript';
+import ts from 'typescript';
+import { createConfig } from '@redocly/openapi-core';
 
 async function generateBaseTypes(
 	openApiDocs: OpenAPIV3_1.Document,
@@ -21,6 +23,10 @@ async function generateBaseTypes(
 	}
 	lines.push('');
 
+	// https://openapi-ts.dev/node#transform-posttransform
+	const BLOB = ts.factory.createTypeReferenceNode(ts.factory.createIdentifier('Blob'));
+	const NULL = ts.factory.createLiteralTypeNode(ts.factory.createNull());
+
 	// NOTE: Align `operationId` of GET and POST to avoid duplication of type definitions
 	const openApi = JSON.parse(await readFile(openApiJsonPath, 'utf8')) as OpenAPI3;
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -43,15 +49,54 @@ async function generateBaseTypes(
 		};
 	}
 
+	// Turn off redocly so it doesn't complain about our schema.
+	// https://openapi-ts.dev/node#redoc-config
+	const redocly = await createConfig({
+		extends: [],
+		rules: {},
+	});
+	// redocly.getRulesForSpecVersion ??= () => [];
+
 	const generatedTypes = await openapiTS(openApi, {
+		redocly,
 		exportType: true,
 		transform(schemaObject) {
 			if ('format' in schemaObject && schemaObject.format === 'binary') {
-				return schemaObject.nullable ? 'Blob | null' : 'Blob';
+				return schemaObject.nullable ? ts.factory.createUnionTypeNode([BLOB, NULL]) : BLOB;
 			}
 		},
 	});
-	lines.push(generatedTypes);
+
+	// Remove duplicate operations.
+	// Our schema depends on having get/post both point to the same object, but redocly doesn't collapse them like the previous implementation did.
+	for (let i = 0; i < generatedTypes.length; i++) {
+		const node = generatedTypes[i];
+		if (!ts.isInterfaceDeclaration(node) || node.name.text !== 'operations') {
+			continue;
+		}
+
+		const seenNames = new Set<string>();
+		const newMembers = ts.visitNodes(node.members, member => {
+			if (ts.isPropertySignature(member) && 'text' in member.name) {
+				if (seenNames.has(member.name.text)) {
+					return [];
+				} else {
+					seenNames.add(member.name.text);
+				}
+			}
+
+			return member;
+		}, ts.isTypeElement);
+
+		// Replace the node with a copy containing new members array
+		const newOperations: ts.InterfaceDeclaration = {
+			...node,
+			members: newMembers,
+		};
+		generatedTypes[i] = newOperations;
+	}
+
+	lines.push(astToString(generatedTypes));
 	lines.push('');
 
 	await writeFile(typeFileName, lines.join('\n'));

packages/misskey-js/src/api.ts

@@ -64,7 +64,7 @@ export class APIClient {
 		return ep in endpointReqTypes;
 	}
 
-	public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
+	public request<E extends keyof Endpoints, P extends Endpoints[E]['req'] & object>(
 		endpoint: E,
 		params: P = {} as P,
 		credential?: string | null,