feat(gpt-runner-web): optimize file tree popover menu request multiple

2214962083 · 2214962083 · commit 47f88e5c200b · 2023-06-20T00:43:08.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -33,9 +33,11 @@
     "linebreak",
     "localstorage",
     "nicepkg",
+    "nuxt",
     "OPENAI",
     "OVSE",
     "ovsx",
+    "pycache",
     "rehype",
     "rubberband",
     "tablist",
diff --git a/packages/gpt-runner-core/src/core/config.ts b/packages/gpt-runner-core/src/core/config.ts
@@ -24,7 +24,7 @@ export async function getGptFilesInfo(params: GetGptFilesInfoParams): Promise<Ge
     exts = ['.gpt.md'],
     includes = null,
     excludes = null,
-    respectGitignore = true,
+    respectGitIgnore = true,
   } = resolvedUserConfig
 
   const ig: Ignore | null = await (async () => {
@@ -36,7 +36,7 @@ export async function getGptFilesInfo(params: GetGptFilesInfoParams): Promise<Ge
   })()
 
   const isGitignorePaths = (filePath: string): boolean => {
-    if (!respectGitignore)
+    if (!respectGitIgnore)
       return false
 
     if (filePath && filePath.match(/\/\.git\//))
diff --git a/packages/gpt-runner-core/src/core/get-common-file-tree.ts b/packages/gpt-runner-core/src/core/get-common-file-tree.ts
@@ -14,7 +14,7 @@ interface CreateFileTreeParams {
 
 interface CreateFileTreeReturns {
   tree: FileInfoTreeItem[]
-  exts: string[]
+  includeFileExts: string[]
 }
 
 function createFileTree(params: CreateFileTreeParams): CreateFileTreeReturns {
@@ -34,7 +34,8 @@ function createFileTree(params: CreateFileTreeParams): CreateFileTreeReturns {
       const isFile = index === parts.length - 1
 
       if (!pathMap.get(currentPath)) {
-        const ext = isFile ? part.split('.').length > 1 ? part.split('.').pop() : '' : undefined
+        const ext = isFile ? PathUtils.extname(part) : undefined
+
         const tokenNum = isFile ? countFileTokens(currentPath) : 0
         const item = {
           id: currentPath,
@@ -94,7 +95,7 @@ function createFileTree(params: CreateFileTreeParams): CreateFileTreeReturns {
 
   return {
     tree: finalTree,
-    exts: Array.from(exts),
+    includeFileExts: Array.from(exts),
   }
 }
 
@@ -140,9 +141,9 @@ export async function getCommonFileTree(params: GetCommonFileTreeParams): Promis
     },
   })
 
-  const { tree, exts } = createFileTree({ rootPath, filePaths })
+  const { tree, includeFileExts } = createFileTree({ rootPath, filePaths })
 
-  return { tree, exts }
+  return { tree, includeFileExts }
 }
 
 export interface CreateFileContextParams {
diff --git a/packages/gpt-runner-shared/src/common/helpers/config.ts b/packages/gpt-runner-shared/src/common/helpers/config.ts
@@ -1,4 +1,5 @@
 import type { SingleFileConfig, UserConfig } from '../types'
+import { DEFAULT_EXCLUDE_FILES } from './constants'
 
 export function singleFileConfigWithDefault(singleFileConfig?: Partial<SingleFileConfig>): SingleFileConfig {
   return {
@@ -18,9 +19,9 @@ export function userConfigWithDefault(userConfig?: Partial<UserConfig>): UserCon
     },
     rootPath: process.cwd(),
     includes: null,
-    excludes: null,
+    excludes: DEFAULT_EXCLUDE_FILES,
     exts: ['.gpt.md'],
-    respectGitignore: true,
+    respectGitIgnore: true,
     ...userConfig,
   }
 }
diff --git a/packages/gpt-runner-shared/src/common/helpers/constants.ts b/packages/gpt-runner-shared/src/common/helpers/constants.ts
@@ -0,0 +1,113 @@
+export const DEFAULT_EXCLUDE_FILES = [
+  'node_modules',
+  '.git',
+  '__pycache__',
+  '.Python',
+  '.DS_Store',
+  '.cache',
+  '.next',
+  '.nuxt',
+  '.out',
+  'dist/',
+  '.serverless',
+  '.parcel-cache',
+]
+
+export const DEFAULT_EXCLUDE_FILE_EXTS = [
+  '.jpg',
+  '.png',
+  '.gif',
+  '.jpeg',
+  '.svg',
+  '.mp4',
+  '.mp3',
+  '.wav',
+  '.flac',
+  '.ogg',
+  '.webm',
+  '.ico',
+  '.pdf',
+  '.doc',
+  '.docx',
+  '.xls',
+  '.xlsx',
+  '.ppt',
+  '.pptx',
+  '.zip',
+  '.rar',
+  '.7z',
+  '.tar',
+  '.gz',
+  '.tgz',
+  '.bz2',
+  '.xz',
+  '.exe',
+  '.dmg',
+  '.pkg',
+  '.deb',
+  '.rpm',
+  '.msi',
+  '.apk',
+  '.ipa',
+  '.iso',
+  '.img',
+  '.bin',
+  '.dll',
+  '.so',
+  '.dylib',
+  '.a',
+  '.lib',
+  '.o',
+  '.obj',
+  '.class',
+  '.jar',
+  '.war',
+  '.ear',
+  '.swf',
+  '.fla',
+  '.as',
+  '.as3',
+  '.mxml',
+  '.swc',
+  '.swd',
+  '.swz',
+  '.swt',
+  '.air',
+  '.ane',
+  '.ttf',
+  '.woff',
+  '.woff2',
+  '.eot',
+  '.otf',
+  '.psd',
+  '.ai',
+  '.sketch',
+  '.fig',
+  '.xd',
+  '.blend',
+  '.fbx',
+  '.obj',
+  '.mtl',
+  '.stl',
+  '.3ds',
+  '.dae',
+  '.max',
+  '.ma',
+  '.mb',
+  '.lwo',
+  '.lws',
+  '.lxo',
+  '.c4d',
+
+  // data
+  '.csv',
+  '.tsv',
+
+  // ai
+  '.pth',
+  '.pt',
+  '.h5',
+  '.hdf5',
+  '.ckpt',
+  '.ckpt.index',
+]
diff --git a/packages/gpt-runner-shared/src/common/helpers/index.ts b/packages/gpt-runner-shared/src/common/helpers/index.ts
@@ -1,5 +1,6 @@
 export * from './common'
 export * from './config'
+export * from './constants'
 export * from './create-filter-pattern'
 export * from './debug'
 export * from './env-config'
diff --git a/packages/gpt-runner-shared/src/common/types/config.ts b/packages/gpt-runner-shared/src/common/types/config.ts
@@ -82,7 +82,7 @@ export interface UserConfig {
   /**
      * @default true
      */
-  respectGitignore?: boolean
+  respectGitIgnore?: boolean
 }
 
 export interface SingleChatMessage {
diff --git a/packages/gpt-runner-shared/src/common/types/server.ts b/packages/gpt-runner-shared/src/common/types/server.ts
@@ -79,5 +79,6 @@ export interface GetCommonFilesReqParams {
 
 export interface GetCommonFilesResData {
   filesInfoTree: FileInfoTree
-  fileExts: string[]
+  includeFileExts: string[]
+  allFileExts: string[]
 }
diff --git a/packages/gpt-runner-shared/src/common/zod/config.zod.ts b/packages/gpt-runner-shared/src/common/zod/config.zod.ts
@@ -36,7 +36,7 @@ export const UserConfigSchema = z.object({
   exts: z.array(z.string()).optional().default(['.gpt.md']),
   includes: FilterPatternSchema.optional().default(null),
   excludes: FilterPatternSchema.optional().default(null),
-  respectGitignore: z.boolean().optional().default(true),
+  respectGitIgnore: z.boolean().optional().default(true),
 }) satisfies z.ZodType<UserConfig>
 
 export const SingleChatMessageSchema = z.object({
diff --git a/packages/gpt-runner-shared/src/node/helpers/file-utils.ts b/packages/gpt-runner-shared/src/node/helpers/file-utils.ts
@@ -127,7 +127,7 @@ export class FileUtils {
         if (!createFilterByPattern(includes)(filePath))
           return false
 
-        if (!createFilterByPattern(excludes)(filePath))
+        if (createFilterByPattern(excludes)(filePath))
           return false
 
         if (!isValidPath(filePath))
diff --git a/packages/gpt-runner-web/client/src/app.tsx b/packages/gpt-runner-web/client/src/app.tsx
@@ -18,7 +18,7 @@ const queryClient = new QueryClient({
   },
 })
 
-const fallbackRender: ComponentType<FallbackProps> = ({ error }) => {
+const FallbackRender: ComponentType<FallbackProps> = ({ error }) => {
   // Call resetErrorBoundary() to reset the error boundary and retry the render.
 
   return (
@@ -32,9 +32,11 @@ const fallbackRender: ComponentType<FallbackProps> = ({ error }) => {
 export const AppProviders: FC<PropsWithChildren> = ({ children }) => {
   return (
     <LoadingProvider>
-      <ErrorBoundary FallbackComponent={fallbackRender}>
+      <ErrorBoundary FallbackComponent={FallbackRender as any}>
         <QueryClientProvider client={queryClient}>
-          {children}
+          <>
+            {children}
+          </>
         </QueryClientProvider>
       </ErrorBoundary>
     </LoadingProvider>
diff --git a/packages/gpt-runner-web/client/src/components/loading-view/index.tsx b/packages/gpt-runner-web/client/src/components/loading-view/index.tsx
@@ -0,0 +1,57 @@
+import { VSCodeProgressRing } from '@vscode/webview-ui-toolkit/react'
+import type { FC } from 'react'
+import { styled } from 'styled-components'
+
+const LoadingWrapper = styled.div`
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-flow: column;
+  position: relative;
+`
+
+const Mask = styled.div`
+  position: absolute;
+  top: 0;
+  left: 0;
+  background: var(--panel-view-background);
+  opacity: 0.5;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+`
+
+export interface LoadingViewProps {
+  style?: React.CSSProperties
+  className?: string
+  absolute?: boolean
+  mask?: boolean
+}
+
+export const LoadingView: FC<LoadingViewProps> = (props) => {
+  const { style, className, absolute, mask = true } = props
+
+  const absoluteStyle: React.CSSProperties = {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    zIndex: 999,
+  }
+
+  const finalStyle = absolute ? { ...absoluteStyle, ...style } : style
+
+  return (
+    <LoadingWrapper style={finalStyle} className={className} onClick={(e: any) => {
+      e.stopPropagation()
+      return false
+    }}>
+      <VSCodeProgressRing />
+
+      {mask && <Mask />}
+    </LoadingWrapper>
+  )
+}
+
+LoadingView.displayName = 'LoadingView'
diff --git a/packages/gpt-runner-web/client/src/components/popover-menu/index.tsx b/packages/gpt-runner-web/client/src/components/popover-menu/index.tsx
@@ -1,5 +1,5 @@
 // PopoverMenu.tsx
-import React, { useLayoutEffect, useState } from 'react'
+import React, { useEffect, useLayoutEffect, useState } from 'react'
 import { Popover } from 'react-tiny-popover'
 import { useHover } from '../../hooks/use-hover.hook'
 import { useSize } from '../../hooks/use-size.hook'
@@ -41,6 +41,7 @@ export const PopoverMenu: React.FC<PopoverMenuProps> = (props) => {
   const [privateIsPopoverOpen, setPrivateIsPopoverOpen] = useState(false)
   const [childrenHoverRef, isChildrenHovering] = useHover()
   const [menuMaskHoverRef, isMenuMaskHovering] = useHover()
+  const [keepOpen, setKeepOpen] = useState(false)
   const [, { height: childrenHeight }] = useSize({ ref: childrenHoverRef })
   const isProvideOpenAndChange = isPopoverOpen !== undefined && onPopoverDisplayChange !== undefined
 
@@ -52,6 +53,13 @@ export const PopoverMenu: React.FC<PopoverMenuProps> = (props) => {
     return isProvideOpenAndChange ? onPopoverDisplayChange : setPrivateIsPopoverOpen
   }
 
+  useEffect(() => {
+    if (!getIsPopoverOpen())
+      return
+
+    setKeepOpen(true)
+  }, [getIsPopoverOpen()])
+
   const childrenState: PopoverMenuChildrenState = {
     isHovering: isChildrenHovering || getIsPopoverOpen(),
     isInMenu: false,
@@ -104,12 +112,13 @@ export const PopoverMenu: React.FC<PopoverMenuProps> = (props) => {
 
   return (
     <Popover
-      isOpen={getIsPopoverOpen()}
+      isOpen={keepOpen}
       positions={[yPosition]}
       align={xPosition === 'left' ? 'start' : 'end'}
       onClickOutside={handleClose}
       containerStyle={{
         zIndex: '1',
+        display: getIsPopoverOpen() ? 'block' : 'none',
       }}
       content={() => (
         <div>
diff --git a/packages/gpt-runner-web/client/src/components/sidebar/index.tsx b/packages/gpt-runner-web/client/src/components/sidebar/index.tsx
@@ -4,11 +4,13 @@ import { useDebounce } from 'react-use'
 import type { TreeProps } from '../tree'
 import { Tree } from '../tree'
 import type { TreeItemBaseStateOtherInfo, TreeItemProps } from '../tree-item'
+import { LoadingView } from '../loading-view'
 import { SidebarHeader, SidebarSearch, SidebarSearchRightWrapper, SidebarSearchWrapper, SidebarTreeWrapper, SidebarUnderSearchWrapper, SidebarWrapper } from './sidebar.styles'
 
 export interface SidebarProps<OtherInfo extends TreeItemBaseStateOtherInfo = TreeItemBaseStateOtherInfo> {
   defaultSearchKeyword?: string
   placeholder?: string
+  loading?: boolean
   tree?: Omit<TreeProps<OtherInfo>, 'filter'>
   buildTreeItem?: (item: TreeItemProps<OtherInfo>) => TreeItemProps<OtherInfo>
   sortTreeItems?: (items: TreeItemProps<OtherInfo>[]) => TreeItemProps<OtherInfo>[]
@@ -21,6 +23,7 @@ export function Sidebar<OtherInfo extends TreeItemBaseStateOtherInfo = TreeItemB
   const {
     defaultSearchKeyword = '',
     placeholder,
+    loading,
     tree,
     buildTreeItem,
     sortTreeItems,
@@ -86,6 +89,7 @@ export function Sidebar<OtherInfo extends TreeItemBaseStateOtherInfo = TreeItemB
       {buildUnderSearchSlot?.()}
     </SidebarUnderSearchWrapper>
     <SidebarTreeWrapper>
+      {loading && <LoadingView absolute></LoadingView>}
       <Tree
         {...tree}
         items={finalItems}
diff --git a/packages/gpt-runner-web/client/src/pages/chat/components/chat-sidebar/index.tsx b/packages/gpt-runner-web/client/src/pages/chat/components/chat-sidebar/index.tsx
diff --git a/packages/gpt-runner-web/client/src/pages/chat/components/file-tree/file-tree.styles.ts b/packages/gpt-runner-web/client/src/pages/chat/components/file-tree/file-tree.styles.ts
diff --git a/packages/gpt-runner-web/client/src/pages/chat/components/file-tree/index.tsx b/packages/gpt-runner-web/client/src/pages/chat/components/file-tree/index.tsx
diff --git a/packages/gpt-runner-web/server/src/controllers/common-files.controller.ts b/packages/gpt-runner-web/server/src/controllers/common-files.controller.ts

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export interface UserConfig {`
`82`	`82`	`/**`
`83`	`83`	`* @default true`
`84`	`84`	`*/`
`85`		`- respectGitignore?: boolean`
	`85`	`+ respectGitIgnore?: boolean`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`export interface SingleChatMessage {`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,6 @@ export interface GetCommonFilesReqParams {`
`79`	`79`
`80`	`80`	`export interface GetCommonFilesResData {`
`81`	`81`	`filesInfoTree: FileInfoTree`
`82`		`- fileExts: string[]`
	`82`	`+ includeFileExts: string[]`
	`83`	`+ allFileExts: string[]`
`83`	`84`	`}`