不要なsafeParseをparseに、不要な再exportを削除

Author: na-trium-144

app/(docs)/@docs/[lang]/[pageId]/chatForm.tsx

@@ -7,9 +7,8 @@ import { useState, FormEvent, useEffect } from "react";
 //   QuestionExampleParams,
 // } from "../actions/questionExample";
 // import { getLanguageName } from "../pagesList";
-import { DynamicMarkdownSection } from "./pageContent";
 import { useEmbedContext } from "@/terminal/embedContext";
-import { PagePath } from "@/lib/docs";
+import { DynamicMarkdownSection, PagePath } from "@/lib/docs";
 import { useRouter } from "next/navigation";
 import { ChatStreamEvent } from "@/api/chat/route";
 import { useStreamingChatContext } from "@/(docs)/streamingChatContext";

app/(docs)/@docs/[lang]/[pageId]/pageContent.tsx

@@ -19,8 +19,6 @@ import Link from "next/link";
 import { useChatId } from "@/(docs)/chatAreaState";
 import { ChatWithMessages } from "@/lib/chatHistory";
 
-export type { DynamicMarkdownSection };
-
 interface PageContentProps {
   splitMdContent: MarkdownSection[];
   langEntry: LanguageEntry;

app/actions/deleteChat.ts

@@ -3,13 +3,8 @@
 import { z } from "zod";
 import { deleteChat, initContext } from "@/lib/chatHistory";
 
-const chatIdSchema = z.string().uuid();
-
 export async function deleteChatAction(chatId: string) {
-  const parsed = chatIdSchema.safeParse(chatId);
-  if (!parsed.success) {
-    throw new Error(parsed.error.issues.map((e) => e.message).join(", "));
-  }
+  chatId = z.uuid().parse(chatId);
   const ctx = await initContext();
-  await deleteChat(parsed.data, ctx);
+  await deleteChat(chatId, ctx);
 }

app/actions/getRedirectFromChat.ts

@@ -6,20 +6,16 @@ import { LangId, PageSlug } from "@/lib/docs";
 import { chat, section } from "@/schema/chat";
 import { and, eq } from "drizzle-orm";
 
-const chatIdSchema = z.string().uuid();
-
 export async function getRedirectFromChat(chatId: string): Promise<string> {
-  const parsed = chatIdSchema.safeParse(chatId);
-  if (!parsed.success) {
-    throw new Error(parsed.error.issues.map((e) => e.message).join(", "));
-  }
+  chatId = z.uuid().parse(chatId);
+  
   const { drizzle, userId } = await initContext();
   if (!userId) {
     throw new Error("Not authenticated");
   }
 
   const chatData = (await drizzle.query.chat.findFirst({
-    where: and(eq(chat.chatId, parsed.data), eq(chat.userId, userId)),
+    where: and(eq(chat.chatId, chatId), eq(chat.userId, userId)),
     with: {
       section: true,
     },

app/api/chat/route.ts

@@ -13,7 +13,10 @@ import {
   PagePathSchema,
   SectionId,
 } from "@/lib/docs";
-import { ReplCommandSchema, ReplOutputSchema } from "@my-code/runtime/interface";
+import {
+  ReplCommandSchema,
+  ReplOutputSchema,
+} from "@my-code/runtime/interface";
 import { z } from "zod";
 
 const ChatParamsSchema = z.object({
@@ -25,8 +28,6 @@ const ChatParamsSchema = z.object({
   execResults: z.record(z.string(), z.array(ReplOutputSchema)),
 });
 
-type ChatParams = z.output<typeof ChatParamsSchema>;
-
 export type ChatStreamEvent =
   | { type: "chat"; chatId: string; sectionId: string }
   | { type: "chunk"; text: string }
@@ -41,14 +42,16 @@ export async function POST(request: NextRequest) {
 
   const parseResult = ChatParamsSchema.safeParse(await request.json());
   if (!parseResult.success) {
-    return new Response(
-      parseResult.error.issues.map((e) => e.message).join(", "),
-      { status: 400 }
-    );
+    return new Response(JSON.stringify(parseResult.error), { status: 400 });
   }
-  const params: ChatParams = parseResult.data;
-  const { path, userQuestion, sectionContent, replOutputs, files, execResults } =
-    params;
+  const {
+    path,
+    userQuestion,
+    sectionContent,
+    replOutputs,
+    files,
+    execResults,
+  } = parseResult.data;
 
   const pagesList = await getPagesList();
   const langName = pagesList.find((lang) => lang.id === path.lang)?.name;
@@ -217,7 +220,7 @@ export async function POST(request: NextRequest) {
           prompt.join("\n")
         )) {
           console.log("Received chunk:", [chunk]);
-        
+
           fullText += chunk;
 
           if (!headerParsed) {
@@ -309,9 +312,7 @@ export async function POST(request: NextRequest) {
         await addMessagesAndDiffs(
           chatId,
           path,
-          [
-            { role: "ai", content: cleanMessage },
-          ],
+          [{ role: "ai", content: cleanMessage }],
           diffRaw,
           context
         );

app/lib/docs.ts

@@ -25,7 +25,10 @@ export const PagePathSchema = z.object({
   lang: z.string().transform((s) => s as LangId),
   page: z.string().transform((s) => s as PageSlug),
 });
-export type PagePath = z.output<typeof PagePathSchema>;
+export interface PagePath {
+  lang: LangId;
+  page: PageSlug;
+}
 
 export const MarkdownSectionSchema = z.object({
   /**
@@ -68,7 +71,9 @@ export const DynamicMarkdownSectionSchema = MarkdownSectionSchema.extend({
   replacedContent: z.string(),
   replacedRange: z.array(ReplacedRangeSchema),
 });
-export type DynamicMarkdownSection = z.output<typeof DynamicMarkdownSectionSchema>;
+export type DynamicMarkdownSection = z.output<
+  typeof DynamicMarkdownSectionSchema
+>;
 
 /**
  * 各言語のindex.ymlから読み込んだデータにid,index等を追加したデータ型

app/markdown/markdown.tsx

@@ -5,10 +5,10 @@ import remarkCjkFriendly from "remark-cjk-friendly";
 import {
   MultiHighlightTag,
   remarkMultiHighlight,
-  ReplacedRange,
 } from "./multiHighlight";
 import { Heading } from "./heading";
 import { AutoCodeBlock } from "./codeBlock";
+import { ReplacedRange } from "@/lib/docs";
 
 export function StyledMarkdown(props: {
   content: string;

app/markdown/multiHighlight.tsx

@@ -8,7 +8,6 @@ import { useChatId } from "@/(docs)/chatAreaState";
 import Link from "next/link";
 import type { ReplacedRange } from "@/lib/docs";
 
-export type { ReplacedRange };
 export const remarkMultiHighlight: Plugin<[ReplacedRange[]], Root> = (
   replacedRange?: ReplacedRange[]
 ) => {

app/sidebar.tsx

@@ -1,7 +1,7 @@
 "use client";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { LangId, LanguageEntry, PagePath, PageSlug } from "@/lib/docs";
+import { DynamicMarkdownSection, LangId, LanguageEntry, PagePath, PageSlug } from "@/lib/docs";
 import { AccountMenu } from "./accountMenu";
 import { ThemeToggle } from "./themeToggle";
 import {
@@ -15,7 +15,6 @@ import {
 import clsx from "clsx";
 import { LanguageIcon } from "@/terminal/icons";
 import { RuntimeLang } from "@my-code/runtime/languages";
-import { DynamicMarkdownSection } from "./(docs)/@docs/[lang]/[pageId]/pageContent";
 
 export interface ISidebarMdContext {
   loadedPath: PagePath | null;