Merge remote-tracking branch 'upstream/develop' into refactor-fronten…

…d-types
hideki0403 · Jan 20, 2024 · cdb4d6c · cdb4d6c
2 parents 04c7e92 + 7d57487
commit cdb4d6c
Show file tree

Hide file tree

Showing 169 changed files with 13,307 additions and 1,199 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,7 @@ api-docs.json
 ormconfig.json
 temp
 /packages/frontend/src/**/*.stories.ts
+tsdoc-metadata.json
 
 # blender backups
 *.blend1

diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,8 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
+COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
+COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 	pnpm i --frozen-lockfile --aggregate-output
@@ -52,6 +54,8 @@ COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY --link ["scripts", "./scripts"]
 COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
+COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
+COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 	pnpm i --frozen-lockfile --aggregate-output
@@ -79,8 +83,12 @@ WORKDIR /misskey
 COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
+COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
+COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
 COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./

diff --git a/locales/generateDTS.js b/locales/generateDTS.js
@@ -16,32 +16,40 @@ function createMemberType(item) {
 		item.matchAll(parameterRegExp),
 		([, parameter]) => parameter,
 	);
-	if (!parameters.length) {
-		return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-	}
-	return ts.factory.createTypeReferenceNode(
-		ts.factory.createIdentifier('ParameterizedString'),
-		[
-			ts.factory.createUnionTypeNode(
-				parameters.map((parameter) =>
-					ts.factory.createLiteralTypeNode(
-						ts.factory.createStringLiteral(parameter),
+	return parameters.length
+		? ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('ParameterizedString'),
+				[
+					ts.factory.createUnionTypeNode(
+						parameters.map((parameter) =>
+							ts.factory.createStringLiteral(parameter),
+						),
 					),
-				),
-			),
-		],
-	);
+				],
+			)
+		: ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
 }
 
 function createMembers(record) {
-	return Object.entries(record).map(([k, v]) =>
-		ts.factory.createPropertySignature(
+	return Object.entries(record).map(([k, v]) => {
+		const node = ts.factory.createPropertySignature(
 			undefined,
 			ts.factory.createStringLiteral(k),
 			undefined,
 			createMemberType(v),
-		),
-	);
+		);
+		if (typeof v === 'string') {
+			ts.addSyntheticLeadingComment(
+				node,
+				ts.SyntaxKind.MultiLineCommentTrivia,
+				`*
+ * ${v.replace(/\n/g, '\n * ')}
+ `,
+				true,
+			);
+		}
+		return node;
+	});
 }
 
 export default function generateDTS() {
@@ -72,10 +80,8 @@ export default function generateDTS() {
 				ts.factory.createTypeParameterDeclaration(
 					undefined,
 					ts.factory.createIdentifier('T'),
-					ts.factory.createTypeReferenceNode(
-						ts.factory.createIdentifier('string'),
-						undefined,
-					),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 				),
 			],
 			undefined,
@@ -115,7 +121,6 @@ export default function generateDTS() {
 						ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 						ts.factory.createTypeReferenceNode(
 							ts.factory.createIdentifier('ParameterizedString'),
-							[ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)],
 						),
 						ts.factory.createTypeReferenceNode(
 							ts.factory.createIdentifier('ILocale'),
@@ -187,6 +192,24 @@ export default function generateDTS() {
 		),
 		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
 	];
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		' eslint-disable ',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' This file is generated by locales/generateDTS.js',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' Do not edit this file directly.',
+		true,
+	);
 	const printed = ts
 		.createPrinter({
 			newLine: ts.NewLineKind.LineFeed,
@@ -203,12 +226,5 @@ export default function generateDTS() {
 			),
 		);
 
-	fs.writeFileSync(
-		`${__dirname}/index.d.ts`,
-		`/* eslint-disable */
-// This file is generated by locales/generateDTS.js
-// Do not edit this file directly.
-${printed}`,
-		'utf-8',
-	);
+	fs.writeFileSync(`${__dirname}/index.d.ts`, printed, 'utf-8');
 }