@tscircuit/fake-snippets 0.0.82 → 0.0.84

package/src/components/dialogs/edit-package-details-dialog.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react"
+import { useState } from "react"
 import {
   Select,
   SelectContent,
@@ -110,12 +110,12 @@ export const EditPackageDetailsDialog = ({
 
       const response = await axios.post("/packages/update", {
         package_id: packageId,
-        description: formData.description,
-        website: formData.website,
+        description: formData.description.trim(),
+        website: formData.website.trim(),
         is_private: formData.visibility == "private",
         default_view: formData.defaultView,
         ...(formData.unscopedPackageName !== unscopedPackageName && {
-          name: formData.unscopedPackageName,
+          name: formData.unscopedPackageName.trim(),
         }),
       })
       if (response.status !== 200)
@@ -148,12 +148,7 @@ export const EditPackageDetailsDialog = ({
           })
         }
       }
-      console.log(
-        "formData.unscopedPackageName",
-        formData.unscopedPackageName,
-        "unscopedPackageName",
-        unscopedPackageName,
-      )
+
       if (formData.unscopedPackageName !== unscopedPackageName) {
         // Use router for client-side navigation
         window.history.replaceState(

package/src/components/dialogs/{import-snippet-dialog.tsx → import-package-dialog.tsx}

@@ -1,6 +1,6 @@
 import { useAxios } from "@/hooks/use-axios"
 import { useDebounce } from "@/hooks/use-debounce"
-import type { Snippet } from "fake-snippets-api/lib/db/schema"
+import type { Package } from "fake-snippets-api/lib/db/schema"
 import { useState } from "react"
 import { useQuery } from "react-query"
 import { Button } from "../ui/button"
@@ -8,25 +8,25 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from "../ui/dialog"
 import { Input } from "../ui/input"
 import { createUseDialog } from "./create-use-dialog"
 
-export const ImportSnippetDialog = ({
+export const ImportPackageDialog = ({
   open,
   onOpenChange,
-  onSnippetSelected,
+  onPackageSelected,
 }: {
   open: boolean
   onOpenChange: (open: boolean) => any
-  onSnippetSelected: (snippet: Snippet) => any
+  onPackageSelected: (pkg: Package) => any
 }) => {
   const [searchText, setSearchText] = useState("")
   const debouncedSearch = useDebounce(searchText, 300)
   const axios = useAxios()
   const { data: snippets, isLoading } = useQuery(
-    ["snippetSearch", debouncedSearch],
+    ["packageSearch", debouncedSearch],
     async () => {
-      const response = await axios.get(
-        `/snippets/search?q=${encodeURIComponent(debouncedSearch)}`,
-      )
-      return response.data.snippets.slice(0, 12)
+      const response = await axios.post("/packages/search", {
+        query: debouncedSearch,
+      })
+      return response.data.packages
     },
     {
       enabled: debouncedSearch.length > 0,
@@ -35,41 +35,42 @@ export const ImportSnippetDialog = ({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="z-[100]">
+      <DialogContent className="z-[100] p-4 sm:p-6">
         <DialogHeader>
-          <DialogTitle>Import Snippet</DialogTitle>
+          <DialogTitle>Import Package</DialogTitle>
         </DialogHeader>
         <Input
-          placeholder="Search snippets..."
+          placeholder="Search packages..."
           value={searchText}
           onChange={(e) => setSearchText(e.target.value)}
+          className="w-full mb-4"
         />
         <div className="h-64 overflow-y-auto">
           {isLoading ? (
-            <div>Loading...</div>
+            <div className="text-center">Loading...</div>
           ) : (
             <ul className="w-full">
-              {snippets?.map((snippet: Snippet) => (
+              {snippets?.map((pkg: Package) => (
                 <li
-                  className="flex items-center my-1 text-xs w-full"
-                  key={snippet.snippet_id}
+                  className="flex flex-col sm:flex-row items-start sm:items-center my-2 text-sm w-full"
+                  key={pkg.package_id}
                 >
                   <a
-                    href={`/${snippet.name}`}
+                    href={`/${pkg.name}`}
                     target="_blank"
-                    className="whitespace-nowrap mr-2 text-blue-500 hover:underline cursor-pointer flex-shrink-0"
+                    className="text-blue-500 hover:underline cursor-pointer flex-shrink-0 mb-1 sm:mb-0 sm:mr-2"
                   >
-                    {snippet.name}
+                    {pkg.name}
                   </a>
-                  <div className="text-xs text-gray-500 flex-grow overflow-hidden text-ellipsis whitespace-nowrap">
-                    {snippet.description}
+                  <div className="text-gray-500 flex-grow overflow-hidden text-ellipsis whitespace-nowrap mb-1 sm:mb-0">
+                    {pkg.description}
                   </div>
                   <Button
                     size="sm"
-                    className="ml-2 flex-shrink-0"
+                    className="flex-shrink-0"
                     variant="outline"
                     onClick={() => {
-                      onSnippetSelected(snippet)
+                      onPackageSelected(pkg)
                       onOpenChange(false)
                     }}
                   >
@@ -85,4 +86,4 @@ export const ImportSnippetDialog = ({
   )
 }
 
-export const useImportSnippetDialog = createUseDialog(ImportSnippetDialog)
+export const useImportPackageDialog = createUseDialog(ImportPackageDialog)

package/src/components/package-port/CodeEditorHeader.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from "react"
 import { Button } from "@/components/ui/button"
 import { handleManualEditsImportWithSupportForMultipleFiles } from "@/lib/handleManualEditsImportWithSupportForMultipleFiles"
-import { useImportSnippetDialog } from "@/components/dialogs/import-snippet-dialog"
+import { useImportPackageDialog } from "@/components/dialogs/import-package-dialog"
 import { useToast } from "@/hooks/use-toast"
 import {
   DropdownMenu,
@@ -19,6 +19,7 @@ import {
   SelectValue,
 } from "../ui/select"
 import { isHiddenFile } from "../ViewPackagePage/utils/is-hidden-file"
+import { Package } from "fake-snippets-api/lib/db/schema"
 
 export type FileName = string
 
@@ -39,8 +40,8 @@ export const CodeEditorHeader: React.FC<CodeEditorHeaderProps> = ({
   handleFileChange,
   entrypointFileName = "index.tsx",
 }) => {
-  const { Dialog: ImportSnippetDialog, openDialog: openImportDialog } =
-    useImportSnippetDialog()
+  const { Dialog: ImportPackageDialog, openDialog: openImportDialog } =
+    useImportPackageDialog()
   const { toast } = useToast()
   const [sidebarOpen, setSidebarOpen] = fileSidebarState
 
@@ -234,9 +235,9 @@ export const CodeEditorHeader: React.FC<CodeEditorHeaderProps> = ({
             Format
           </Button>
         </div>
-        <ImportSnippetDialog
-          onSnippetSelected={(snippet: any) => {
-            const newContent = `import {} from "@tsci/${snippet.owner_name}.${snippet.unscoped_name}"\n${files[currentFile || ""]}`
+        <ImportPackageDialog
+          onPackageSelected={(pkg: Package) => {
+            const newContent = `import {} from "@tsci/${pkg.owner_github_username}.${pkg.unscoped_name}"\n${files[currentFile || ""]}`
             updateFileContent(currentFile, newContent)
           }}
         />

package/src/components/ui/toaster.tsx

@@ -1,33 +1 @@
-import { useToast } from "@/hooks/use-toast"
-import {
-  Toast,
-  ToastClose,
-  ToastDescription,
-  ToastProvider,
-  ToastTitle,
-  ToastViewport,
-} from "@/components/ui/toast"
-
-export function Toaster() {
-  const { toasts } = useToast()
-
-  return (
-    <ToastProvider>
-      {toasts.map(function ({ id, title, description, action, ...props }) {
-        return (
-          <Toast key={id} {...props}>
-            <div className="grid gap-1">
-              {title && <ToastTitle>{title}</ToastTitle>}
-              {description && (
-                <ToastDescription>{description}</ToastDescription>
-              )}
-            </div>
-            {action}
-            <ToastClose />
-          </Toast>
-        )
-      })}
-      <ToastViewport />
-    </ToastProvider>
-  )
-}
+export { Toaster } from "react-hot-toast"

package/src/hooks/use-current-package-release.ts

@@ -4,6 +4,7 @@ import { usePackageRelease } from "./use-package-release"
 import { useUrlParams } from "./use-url-params"
 
 export const useCurrentPackageRelease = (options?: {
+  include_ai_review?: boolean
   include_logs?: boolean
   refetchInterval?: number
 }) => {
@@ -26,9 +27,17 @@ export const useCurrentPackageRelease = (options?: {
     query = { package_id: packageId, is_latest: true }
   }
 
+  if (query && options?.include_logs !== undefined) {
+    query.include_logs = options.include_logs
+  }
+
+  if (query && options?.include_ai_review !== undefined) {
+    query.include_ai_review = options.include_ai_review
+  }
+
   const { data: packageRelease, ...rest } = usePackageRelease(query, {
-    include_logs: options?.include_logs ?? false,
     refetchInterval: options?.refetchInterval,
   })
+
   return { packageRelease, ...rest }
 }

package/src/hooks/use-fork-package-mutation.ts

@@ -42,16 +42,17 @@ export const useForkPackageMutation = ({
         onSuccess?.(result)
       },
       onError: (error: any) => {
-        if (error.data.error_code === "cannot_fork_own_package") {
+        const message = error?.data?.error?.message
+        if (error?.data?.error_code === "cannot_fork_own_package") {
           toast({
             title: "Cannot Fork Package",
-            description: "You cannot fork your own package.",
+            description: message || "You cannot fork your own package.",
           })
           return
         }
         toast({
           title: "Error",
-          description: "Failed to fork package. Please try again.",
+          description: message || "Failed to fork package. Please try again.",
           variant: "destructive",
         })
       },

package/src/hooks/use-package-release.ts

@@ -2,7 +2,7 @@ import type { PackageRelease } from "fake-snippets-api/lib/db/schema"
 import { type UseQueryOptions, useQuery } from "react-query"
 import { useAxios } from "./use-axios"
 
-type PackageReleaseQuery =
+type PackageReleaseQuery = (
   | {
       package_release_id: string
     }
@@ -17,29 +17,30 @@ type PackageReleaseQuery =
       package_id: string
       is_latest: boolean
     }
+) & {
+  include_logs?: boolean | null | undefined
+  include_ai_review?: boolean | null | undefined
+}
 
 export const usePackageRelease = (
   query: PackageReleaseQuery | null,
-  options?: { include_logs?: boolean; refetchInterval?: number },
+  options?: {
+    refetchInterval?: number
+  },
 ) => {
   const axios = useAxios()
 
   return useQuery<PackageRelease, Error & { status: number }>(
-    ["packageRelease", query, options?.include_logs],
+    ["packageRelease", query],
     async () => {
       if (!query) return
 
-      const { data } = await axios.post(
-        "/package_releases/get",
-        query,
-        options?.include_logs
-          ? {
-              params: {
-                include_logs: true,
-              },
-            }
-          : undefined,
-      )
+      const { data } = await axios.post("/package_releases/get", query, {
+        params: {
+          include_logs: query.include_logs,
+          include_ai_review: query.include_ai_review,
+        },
+      })
 
       if (!data.package_release) {
         throw new Error("Package release not found")

package/src/hooks/use-sign-in.ts

@@ -7,16 +7,18 @@ export const useSignIn = () => {
   const isUsingFakeApi = useIsUsingFakeApi()
   const setSession = useGlobalStore((s) => s.setSession)
   return () => {
+    const currentUrl = window.location.href.replace("127.0.0.1", "localhost")
+    const nextUrl = `${window.location.origin.replace("127.0.0.1", "localhost")}/authorize?redirect=${encodeURIComponent(currentUrl)}`
     if (!isUsingFakeApi) {
-      const nextUrl = window.location.origin.replace("127.0.0.1", "localhost")
-      window.location.href = `${snippetsBaseApiUrl}/internal/oauth/github/authorize?next=${nextUrl}/authorize`
+      window.location.href = `${snippetsBaseApiUrl}/internal/oauth/github/authorize?next=${encodeURIComponent(nextUrl)}`
     } else {
-      setSession({
-        account_id: "account-1234",
-        github_username: "testuser",
-        token: "1234",
-        session_id: "session-1234",
-      })
+      window.location.href = nextUrl
+      // setSession({
+      //   account_id: "account-1234",
+      //   github_username: "testuser",
+      //   token: "1234",
+      //   session_id: "session-1234",
+      // })
     }
   }
 }

package/src/hooks/use-toast.tsx

@@ -1,191 +1,72 @@
-import * as React from "react"
+import toastLibrary, { Toaster, type Toast } from "react-hot-toast"
+import React from "react"
 
-import type { ToastActionElement, ToastProps } from "@/components/ui/toast"
-
-const TOAST_LIMIT = 1
-const TOAST_REMOVE_DELAY = 1000000
-
-export type ToasterToast = ToastProps & {
-  id: string
+export interface ToasterToast {
   title?: React.ReactNode
   description?: React.ReactNode
-  action?: ToastActionElement
-}
-
-const actionTypes = {
-  ADD_TOAST: "ADD_TOAST",
-  UPDATE_TOAST: "UPDATE_TOAST",
-  DISMISS_TOAST: "DISMISS_TOAST",
-  REMOVE_TOAST: "REMOVE_TOAST",
-} as const
-
-let count = 0
-
-function genId() {
-  count = (count + 1) % Number.MAX_SAFE_INTEGER
-  return count.toString()
+  variant?: "default" | "destructive"
+  duration?: number
 }
 
-type ActionType = typeof actionTypes
-
-type Action =
-  | {
-      type: ActionType["ADD_TOAST"]
-      toast: ToasterToast
-    }
-  | {
-      type: ActionType["UPDATE_TOAST"]
-      toast: Partial<ToasterToast>
-    }
-  | {
-      type: ActionType["DISMISS_TOAST"]
-      toastId?: ToasterToast["id"]
-    }
-  | {
-      type: ActionType["REMOVE_TOAST"]
-      toastId?: ToasterToast["id"]
-    }
-
-interface State {
-  toasts: ToasterToast[]
+function ToastContent({
+  title,
+  description,
+  variant,
+  t,
+}: ToasterToast & { t: Toast }) {
+  return (
+    <div
+      className={`rounded-md border p-4 shadow-lg transition-all ${
+        t.visible
+          ? "animate-in fade-in slide-in-from-top-full"
+          : "animate-out fade-out slide-out-to-right-full"
+      } ${
+        variant === "destructive"
+          ? "border-red-500 bg-red-500 text-slate-50"
+          : "border-slate-200 bg-white text-slate-950 dark:bg-slate-950 dark:text-slate-50"
+      }`}
+    >
+      {title && <div className="text-sm font-semibold">{title}</div>}
+      {description && <div className="text-sm opacity-90">{description}</div>}
+    </div>
+  )
 }
 
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
-
-const addToRemoveQueue = (toastId: string) => {
-  if (toastTimeouts.has(toastId)) {
-    return
+const toast = ({
+  duration,
+  description,
+  variant = "default",
+  title,
+}: ToasterToast) => {
+  if (description) {
+    return toastLibrary.custom(
+      (t) => (
+        <ToastContent
+          title={title}
+          description={description}
+          variant={variant}
+          t={t}
+        />
+      ),
+      { duration },
+    )
   }
 
-  const timeout = setTimeout(() => {
-    toastTimeouts.delete(toastId)
-    dispatch({
-      type: "REMOVE_TOAST",
-      toastId: toastId,
-    })
-  }, TOAST_REMOVE_DELAY)
-
-  toastTimeouts.set(toastId, timeout)
-}
-
-export const reducer = (state: State, action: Action): State => {
-  switch (action.type) {
-    case "ADD_TOAST":
-      return {
-        ...state,
-        toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
-      }
-
-    case "UPDATE_TOAST":
-      return {
-        ...state,
-        toasts: state.toasts.map((t) =>
-          t.id === action.toast.id ? { ...t, ...action.toast } : t,
-        ),
-      }
-
-    case "DISMISS_TOAST": {
-      const { toastId } = action
-
-      // ! Side effects ! - This could be extracted into a dismissToast() action,
-      // but I'll keep it here for simplicity
-      if (toastId) {
-        addToRemoveQueue(toastId)
-      } else {
-        state.toasts.forEach((toast) => {
-          addToRemoveQueue(toast.id)
-        })
-      }
-
-      return {
-        ...state,
-        toasts: state.toasts.map((t) =>
-          t.id === toastId || toastId === undefined
-            ? {
-                ...t,
-                open: false,
-              }
-            : t,
-        ),
-      }
-    }
-    case "REMOVE_TOAST":
-      if (action.toastId === undefined) {
-        return {
-          ...state,
-          toasts: [],
-        }
-      }
-      return {
-        ...state,
-        toasts: state.toasts.filter((t) => t.id !== action.toastId),
-      }
+  if (variant === "destructive") {
+    return toastLibrary.error(<>{title}</>, { duration })
   }
-}
-
-const listeners: Array<(state: State) => void> = []
-
-let memoryState: State = { toasts: [] }
-
-function dispatch(action: Action) {
-  memoryState = reducer(memoryState, action)
-  listeners.forEach((listener) => {
-    listener(memoryState)
-  })
-}
-
-type Toast = Omit<ToasterToast, "id">
 
-function toast({ ...props }: Toast) {
-  const id = genId()
-
-  const update = (props: ToasterToast) =>
-    dispatch({
-      type: "UPDATE_TOAST",
-      toast: { ...props, id },
-    })
-  const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
-
-  dispatch({
-    type: "ADD_TOAST",
-    toast: {
-      ...props,
-      id,
-      open: true,
-      onOpenChange: (open) => {
-        if (!open) dismiss()
-      },
-    },
-  })
-
-  return {
-    id: id,
-    dismiss,
-    update,
-  }
+  return toastLibrary(<>{title}</>, { duration })
 }
 
 function useToast() {
-  const [state, setState] = React.useState<State>(memoryState)
-
-  React.useEffect(() => {
-    listeners.push(setState)
-    return () => {
-      const index = listeners.indexOf(setState)
-      if (index > -1) {
-        listeners.splice(index, 1)
-      }
-    }
-  }, [state])
-
   return {
-    ...state,
     toast,
-    dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
+    dismiss: toastLibrary.dismiss,
   }
 }
 
-export { useToast, toast }
+export { useToast, toast, Toaster }
 
 export function useNotImplementedToast() {
   const { toast } = useToast()