move schema types to types.ts

Author: brendan-kellam

src/app/api/(client)/client.ts

@@ -1,4 +1,5 @@
-import { FileSourceResponse, fileSourceResponseSchema, ListRepositoriesResponse, listRepositoriesResponseSchema, SearchRequest, SearchResponse, searchResponseSchema } from "@/lib/schemas";
+import { fileSourceResponseSchema, listRepositoriesResponseSchema, searchResponseSchema } from "@/lib/schemas";
+import { FileSourceResponse, ListRepositoriesResponse, SearchRequest, SearchResponse } from "@/lib/types";
 
 export const search = async (body: SearchRequest): Promise<SearchResponse> => {
     const result = await fetch(`/api/search`, {

src/app/repositoryCarousel.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { Repository } from "@/lib/schemas";
 import {
     Carousel,
     CarouselContent,
@@ -11,6 +10,7 @@ import { getRepoCodeHostInfo } from "@/lib/utils";
 import Image from "next/image";
 import { FileIcon } from "@radix-ui/react-icons";
 import clsx from "clsx";
+import { Repository } from "@/lib/types";
 
 interface RepositoryCarouselProps {
     repos: Repository[];

src/app/search/components/codePreviewPanel/codePreview.tsx

@@ -8,7 +8,7 @@ import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExt
 import { useThemeNormalized } from "@/hooks/useThemeNormalized";
 import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
 import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
-import { SearchResultFileMatch } from "@/lib/schemas";
+import { SearchResultFileMatch } from "@/lib/types";
 import { defaultKeymap } from "@codemirror/commands";
 import { search } from "@codemirror/search";
 import { EditorView, keymap } from "@codemirror/view";

src/app/search/components/codePreviewPanel/index.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { fetchFileSource } from "@/app/api/(client)/client";
-import { SearchResultFile } from "@/lib/schemas";
 import { getCodeHostFilePreviewLink } from "@/lib/utils";
 import { useQuery } from "@tanstack/react-query";
 import { CodePreview, CodePreviewFile } from "./codePreview";
+import { SearchResultFile } from "@/lib/types";
 
 interface CodePreviewPanelProps {
     fileMatch?: SearchResultFile;

src/app/search/components/searchResultsPanel/codePreview.tsx

@@ -4,7 +4,7 @@ import { useExtensionWithDependency } from "@/hooks/useExtensionWithDependency";
 import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
 import { useThemeNormalized } from "@/hooks/useThemeNormalized";
 import { lineOffsetExtension } from "@/lib/extensions/lineOffsetExtension";
-import { SearchResultRange } from "@/lib/schemas";
+import { SearchResultRange } from "@/lib/types";
 import CodeMirror, { Decoration, DecorationSet, EditorState, EditorView, ReactCodeMirrorRef, StateField, Transaction } from "@uiw/react-codemirror";
 import { useMemo, useRef } from "react";
 

src/app/search/components/searchResultsPanel/fileMatchContainer.tsx

@@ -1,13 +1,13 @@
 'use client';
 
-import { SearchResultFile } from "@/lib/schemas";
 import { getRepoCodeHostInfo } from "@/lib/utils";
 import { useCallback, useMemo, useState } from "react";
 import Image from "next/image";
 import { DoubleArrowDownIcon, DoubleArrowUpIcon, FileIcon } from "@radix-ui/react-icons";
 import clsx from "clsx";
 import { Separator } from "@/components/ui/separator";
 import { CodePreview } from "./codePreview";
+import { SearchResultFile } from "@/lib/types";
 
 const MAX_MATCHES_TO_PREVIEW = 3;
 

src/app/search/components/searchResultsPanel/index.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { ScrollArea } from "@/components/ui/scroll-area";
-import { SearchResultFile } from "@/lib/schemas";
 import { Scrollbar } from "@radix-ui/react-scroll-area";
 import { FileMatchContainer } from "./fileMatchContainer";
+import { SearchResultFile } from "@/lib/types";
 
 interface SearchResultsPanelProps {
     fileMatches: SearchResultFile[];

src/app/search/page.tsx

@@ -7,7 +7,6 @@ import {
 } from "@/components/ui/resizable";
 import { Separator } from "@/components/ui/separator";
 import { useNonEmptyQueryParam } from "@/hooks/useNonEmptyQueryParam";
-import { SearchResultFile } from "@/lib/schemas";
 import { createPathWithQueryParams } from "@/lib/utils";
 import { SymbolIcon } from "@radix-ui/react-icons";
 import { useQuery } from "@tanstack/react-query";
@@ -22,6 +21,7 @@ import { SettingsDropdown } from "../settingsDropdown";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 import { CodePreviewPanel } from "./components/codePreviewPanel";
 import { SearchResultsPanel } from "./components/searchResultsPanel";
+import { SearchResultFile } from "@/lib/types";
 
 const DEFAULT_NUM_RESULTS = 100;
 

src/lib/extensions/searchResultHighlightExtension.ts

@@ -1,6 +1,6 @@
 import { EditorSelection, Extension, StateEffect, StateField, Text, Transaction } from "@codemirror/state";
 import { Decoration, DecorationSet, EditorView } from "@codemirror/view";
-import { SearchResultRange } from "../schemas";
+import { SearchResultRange } from "../types";
 
 const setMatchState = StateEffect.define<{
     selectedMatchIndex: number,

src/lib/schemas.ts

@@ -1,22 +1,14 @@
 import { z } from "zod";
 
-export type SearchRequest = z.infer<typeof searchRequestSchema>;
 export const searchRequestSchema = z.object({
     query: z.string(),
     numResults: z.number(),
     whole: z.boolean().optional(),
 });
 
 
-export type SearchResponse = z.infer<typeof searchResponseSchema>;
-export type SearchResult = SearchResponse["Result"];
-export type SearchResultFile = NonNullable<SearchResult["Files"]>[number];
-export type SearchResultFileMatch = SearchResultFile["ChunkMatches"][number];
-export type SearchResultRange = z.infer<typeof rangeSchema>;
-export type SearchResultLocation = z.infer<typeof locationSchema>;
-
 // @see : https://github.com/TaqlaAI/zoekt/blob/main/api.go#L212
-const locationSchema = z.object({
+export const locationSchema = z.object({
     // 0-based byte offset from the beginning of the file
     ByteOffset: z.number(),
     // 1-based line number from the beginning of the file
@@ -25,7 +17,7 @@ const locationSchema = z.object({
     Column: z.number(),
 });
 
-const rangeSchema = z.object({
+export const rangeSchema = z.object({
     Start: locationSchema,
     End: locationSchema,
 });
@@ -79,22 +71,16 @@ export const searchResponseSchema = z.object({
     }),
 });
 
-export type FileSourceRequest = z.infer<typeof fileSourceRequestSchema>;
 export const fileSourceRequestSchema = z.object({
     fileName: z.string(),
     repository: z.string()
 });
 
-export type FileSourceResponse = z.infer<typeof fileSourceResponseSchema>;
-
 export const fileSourceResponseSchema = z.object({
     source: z.string(),
 });
 
 
-export type ListRepositoriesResponse = z.infer<typeof listRepositoriesResponseSchema>;
-export type Repository = z.infer<typeof repositorySchema>;
-
 // @see : https://github.com/TaqlaAI/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L728
 const repoStatsSchema = z.object({
     Repos: z.number(),
@@ -120,7 +106,7 @@ const indexMetadataSchema = z.object({
 });
 
 // @see : https://github.com/TaqlaAI/zoekt/blob/3780e68cdb537d5a7ed2c84d9b3784f80c7c5d04/api.go#L555
-const repositorySchema = z.object({
+export const repositorySchema = z.object({
     Name: z.string(),
     URL: z.string(),
     Source: z.string(),