refactor: fix eslint errors from rebase

Author: serhalp

src/utils/deploy/deploy-site.ts

@@ -20,6 +20,9 @@ import hashFiles from './hash-files.js'
 import hashFns from './hash-fns.js'
 import uploadFiles from './upload-files.js'
 import { getUploadList, waitForDeploy, waitForDiff } from './util.js'
+import type { DeployEvent } from './status-cb.js'
+
+export type { DeployEvent }
 
 const buildStatsString = (possibleParts: (string | false | undefined)[]) => {
   const parts = possibleParts.filter(Boolean)
@@ -28,13 +31,6 @@ const buildStatsString = (possibleParts: (string | false | undefined)[]) => {
   return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message
 }
 
-// TODO(serhalp): This is alternatingly called "event", "status", and "progress". Standardize.
-export interface DeployEvent {
-  type: string
-  msg: string
-  phase: 'start' | 'progress' | 'error' | 'stop'
-}
-
 export const deploySite = async (
   command: BaseCommand,
   api: $TSFixMe,
@@ -115,7 +111,6 @@ export const deploySite = async (
       concurrentHash,
       hashAlgorithm,
       statusCb,
-      assetType,
       manifestPath,
       skipFunctionsCache,
       rootDir: siteRoot,

src/utils/deploy/hash-files.ts

@@ -30,7 +30,7 @@ const hashFiles = async ({
   const files = {}
   // hash: [fileObj, fileObj, fileObj]
   const filesShaMap = {}
-  const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb, assetType })
+  const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb })
 
   await pipeline([fileStream, fileFilter, hasher, fileNormalizer, manifestCollector])
 

src/utils/deploy/hash-fns.ts

@@ -108,8 +108,6 @@ const hashFns = async (
   command: BaseCommand,
   directories: string[],
   config: {
-    /** @default 'function' */
-    assetType?: string
     concurrentHash?: number
     functionsConfig: $TSFixMe
     /** @default 'sha256' */
@@ -122,7 +120,6 @@ const hashFns = async (
   },
 ): Promise<$TSFixMe> => {
   const {
-    assetType = 'function',
     concurrentHash,
     functionsConfig,
     hashAlgorithm = 'sha256',
@@ -219,7 +216,7 @@ const hashFns = async (
   const functions = {}
   // hash: [fileObj, fileObj, fileObj]
   const fnShaMap = {}
-  const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType })
+  const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb })
 
   await pipeline([functionStream, hasher, manifestCollector])
   return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig }

src/utils/deploy/hasher-segments.ts

@@ -6,6 +6,7 @@ import { pipeline } from 'node:stream/promises'
 import transform from 'parallel-transform'
 
 import { normalizePath } from './util.js'
+import { StatusCallback } from './status-cb.js'
 
 const hashFile = async (filePath: string, algorithm: string) => {
   const hasher = createHash(algorithm)
@@ -58,13 +59,11 @@ export const fileNormalizerCtor = ({
 export const manifestCollectorCtor = (
   filesObj: Record<string, unknown>,
   shaMap: Record<string, unknown[]>,
-  { assetType, statusCb }: { assetType: string; statusCb: Function },
+  { statusCb }: { statusCb: StatusCallback },
 ) => {
-  if (!statusCb || !assetType) throw new Error('Missing required options')
-
   return new Writable({
     objectMode: true,
-    write(fileObj, encoding, callback) {
+    write(fileObj, _encoding, callback) {
       filesObj[fileObj.normalizedPath] = fileObj.hash
 
       // Maintain hash to fileObj mapping
@@ -84,7 +83,6 @@ export const manifestCollectorCtor = (
     },
   })
 }
-/* eslint-enable promise/prefer-await-to-callbacks */
 
 export const fileFilterCtor = () =>
   new Transform({
@@ -93,7 +91,6 @@ export const fileFilterCtor = () =>
       if (fileObj.type === 'file') {
         this.push(fileObj)
       }
-      // eslint-disable-next-line promise/prefer-await-to-callbacks
       callback()
     },
   })

src/utils/deploy/status-cb.ts

@@ -0,0 +1,8 @@
+// TODO(serhalp): This is alternatingly called "event", "status", and "progress". Standardize.
+export interface DeployEvent {
+  type: string
+  msg: string
+  phase: 'start' | 'progress' | 'error' | 'stop'
+}
+
+export type StatusCallback = (status: DeployEvent) => void