refactor

Author: nl0

catalog/app/components/Assistant/Model/ContextFiles.ts

@@ -93,6 +93,7 @@ function useBuildPathChain(path: string): string[] {
 }
 
 function useContextFiles(
+  marker: string,
   load: (path: string) => Promise<ContextFile | null>,
   paths: string[],
   limit?: number,
@@ -113,27 +114,40 @@ function useContextFiles(
         : r.map(format),
     [r],
   )
-  return { ready, messages }
+  return {
+    markers: { [marker]: ready },
+    messages,
+  }
 }
 
 export function useBucketRootContextFiles(bucket: string) {
-  return useContextFiles(useLoadBucketContextFile(bucket), CONTEXT_FILE_NAMES)
+  return useContextFiles(
+    'bucketRootContextFilesReady',
+    useLoadBucketContextFile(bucket),
+    CONTEXT_FILE_NAMES,
+  )
 }
 
 export function useBucketDirContextFiles(bucket: string, path: string) {
   return useContextFiles(
+    'bucketDirContextFilesReady',
     useLoadBucketContextFile(bucket),
     useBuildPathChain(path),
     MAX_NON_ROOT_FILES,
   )
 }
 
 export function usePackageRootContextFiles(bucket: string, name: string) {
-  return useContextFiles(useLoadPackageContextFile(bucket, name), CONTEXT_FILE_NAMES)
+  return useContextFiles(
+    'packageRootContextFilesReady',
+    useLoadPackageContextFile(bucket, name),
+    CONTEXT_FILE_NAMES,
+  )
 }
 
 export function usePackageDirContextFiles(bucket: string, name: string, path: string) {
   return useContextFiles(
+    'packageDirContextFilesReady',
     useLoadPackageContextFile(bucket, name),
     useBuildPathChain(path),
     MAX_NON_ROOT_FILES,

catalog/app/containers/Bucket/AssistantContext.tsx

@@ -5,12 +5,6 @@ interface BucketContextProps {
   bucket: string
 }
 
-export const BucketContext = Assistant.Context.LazyContext(
-  ({ bucket }: BucketContextProps) => {
-    const { ready, messages } = ContextFiles.useBucketRootContextFiles(bucket)
-    return {
-      markers: { bucketContextFilesReady: ready },
-      messages,
-    }
-  },
+export const BucketContext = Assistant.Context.LazyContext<BucketContextProps>(
+  ({ bucket }) => ContextFiles.useBucketRootContextFiles(bucket),
 )

catalog/app/containers/Bucket/DirAssistantContext.ts

@@ -62,12 +62,6 @@ interface DirContextFilesProps {
   path: string
 }
 
-export const DirContextFiles = Assistant.Context.LazyContext(
-  ({ bucket, path }: DirContextFilesProps) => {
-    const { ready, messages } = ContextFiles.useBucketDirContextFiles(bucket, path)
-    return {
-      markers: { dirContextFilesReady: ready },
-      messages,
-    }
-  },
+export const DirContextFiles = Assistant.Context.LazyContext<DirContextFilesProps>(
+  ({ bucket, path }) => ContextFiles.useBucketDirContextFiles(bucket, path),
 )

catalog/app/containers/Bucket/File/AssistantContext.ts

@@ -110,15 +110,7 @@ interface FileContextFilesProps {
   path: string
 }
 
-export const FileContextFiles = Assistant.Context.LazyContext(
-  ({ bucket, path }: FileContextFilesProps) => {
-    const { ready, messages } = ContextFiles.useBucketDirContextFiles(
-      bucket,
-      S3Paths.getPrefix(path),
-    )
-    return {
-      markers: { fileContextFilesReady: ready },
-      messages,
-    }
-  },
+export const FileContextFiles = Assistant.Context.LazyContext<FileContextFilesProps>(
+  ({ bucket, path }) =>
+    ContextFiles.useBucketDirContextFiles(bucket, S3Paths.getPrefix(path)),
 )

catalog/app/containers/Bucket/PackageTree/AssistantContext.tsx

@@ -53,10 +53,13 @@ interface PackageContextProps {
   revision: RevisionData
 }
 
-export const PackageContext = Assistant.Context.LazyContext(
-  ({ bucket, name, path, revision }: PackageContextProps) => {
-    const dir = S3Paths.getPrefix(path)
-    const dirCtx = ContextFiles.usePackageDirContextFiles(bucket, name, dir)
+export const PackageContext = Assistant.Context.LazyContext<PackageContextProps>(
+  ({ bucket, name, path, revision }) => {
+    const dirCtx = ContextFiles.usePackageDirContextFiles(
+      bucket,
+      name,
+      S3Paths.getPrefix(path),
+    )
     const rootCtx = ContextFiles.usePackageRootContextFiles(bucket, name)
     const metadataMsg = useMetadataContext(bucket, name, revision)
 
@@ -65,12 +68,11 @@ export const PackageContext = Assistant.Context.LazyContext(
       [metadataMsg, rootCtx.messages, dirCtx.messages],
     )
 
-    return {
-      markers: {
-        packageRootContextFilesReady: rootCtx.ready,
-        packageDirContextFilesReady: dirCtx.ready,
-      },
-      messages,
+    const markers = {
+      ...rootCtx.markers,
+      ...dirCtx.markers,
     }
+
+    return { markers, messages }
   },
 )