refactor: use data exported from collectFiles

Author: Hweinstock

packages/core/src/amazonq/util/files.ts

@@ -7,6 +7,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import {
     CollectFilesFilter,
+    CollectFilesResultItem,
     defaultExcludePatterns,
     getWorkspaceFoldersByPrefixes,
 } from '../../shared/utilities/workspaceUtils'
@@ -108,12 +109,12 @@ export async function prepareRepoData(
         const { excludePatterns, filterFn } = getFilterAndExcludePattern(useAutoBuildFeature, includeInfraDiagram)
 
         const ignoredExtensionMap = new Map<string, number>()
-        const isExcluded = (relativeFilePath: string, fileSize: number) => {
-            const isCodeFile_ = isCodeFile(relativeFilePath)
-            const isDevFile = relativeFilePath === 'devfile.yaml'
-            const isInfraDiagramFileExt = isInfraDiagramFile(relativeFilePath)
+        const isExcluded = (file: CollectFilesResultItem) => {
+            const isCodeFile_ = isCodeFile(file.relativeFilePath)
+            const isDevFile = file.relativeFilePath === 'devfile.yaml'
+            const isInfraDiagramFileExt = isInfraDiagramFile(file.relativeFilePath)
 
-            let isExcludeFile = fileSize >= fileSizeByteLimit
+            let isExcludeFile = file.fileSizeBytes >= fileSizeByteLimit
             // When useAutoBuildFeature is on, only respect the gitignore rules filtered earlier and apply the size limit
             if (!isExcludeFile && !useAutoBuildFeature) {
                 isExcludeFile = isDevFile || (!isCodeFile_ && (!includeInfraDiagram || !isInfraDiagramFileExt))
@@ -122,7 +123,7 @@ export async function prepareRepoData(
             if (isExcludeFile) {
                 if (!isCodeFile_) {
                     const re = /(?:\.([^.]+))?$/
-                    const extensionArray = re.exec(relativeFilePath)
+                    const extensionArray = re.exec(file.relativeFilePath)
                     const extension = extensionArray?.length ? extensionArray[1] : undefined
                     if (extension) {
                         const currentCount = ignoredExtensionMap.get(extension)

packages/core/src/amazonq/util/zipProjectUtil.ts

@@ -2,9 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import path from 'path'
-import { collectFiles, CollectFilesOptions } from '../../shared/utilities/workspaceUtils'
+import { collectFiles, CollectFilesOptions, CollectFilesResultItem } from '../../shared/utilities/workspaceUtils'
 import { CurrentWsFolders } from '../commons/types'
 import { ZipStream } from '../../shared/utilities/zipStream'
 
@@ -19,9 +18,9 @@ interface ZipProjectOptions {
 }
 
 interface ZipProjectCustomizations {
-    isExcluded?: (relativePath: string, fileSize: number) => boolean
-    checkForError?: (relativePath: string, fileSize: number) => void | never
-    computeSideEffects?: (filePath: string) => Promise<void> | void
+    isExcluded?: (file: CollectFilesResultItem) => boolean
+    checkForError?: (file: CollectFilesResultItem) => Error | undefined
+    computeSideEffects?: (file: CollectFilesResultItem) => Promise<void> | void
 }
 
 export async function zipProject(
@@ -41,15 +40,16 @@ export async function zipProject(
         }
         zippedFiles.add(file.zipFilePath)
 
-        if (customizations?.isExcluded && customizations.isExcluded(file.relativeFilePath, file.fileSizeBytes)) {
+        if (customizations?.isExcluded && customizations.isExcluded(file)) {
             continue
         }
-        if (customizations?.checkForError) {
-            customizations.checkForError(file.relativeFilePath, file.fileSizeBytes)
+        const errorToThrow = customizations?.checkForError ? customizations.checkForError(file) : undefined
+        if (errorToThrow) {
+            throw errorToThrow
         }
 
         if (customizations?.computeSideEffects) {
-            await customizations.computeSideEffects(file.fileUri.fsPath)
+            await customizations.computeSideEffects(file)
         }
 
         totalBytes += file.fileSizeBytes
@@ -58,7 +58,12 @@ export async function zipProject(
         const posixPath = file.zipFilePath.split(path.sep).join(path.posix.sep)
 
         try {
-            zip.writeFile(file.fileUri.fsPath, posixPath)
+            // filepath will be out-of-sync for files with unsaved changes.
+            if (file.isText) {
+                zip.writeString(file.fileContent, posixPath)
+            } else {
+                zip.writeFile(file.fileUri.fsPath, posixPath)
+            }
         } catch (error) {
             if (error instanceof Error && error.message.includes('File not found')) {
                 // No-op: Skip if file was deleted or does not exist