netlify-cli 17.3.2 → 17.4.0

package/src/utils/deploy/upload-files.mjs

@@ -1,120 +1,106 @@
-import fs from 'fs'
-
-import backoff from 'backoff'
-import pMap from 'p-map'
-
-import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.mjs'
-
+import fs from 'fs';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'back... Remove this comment to see the full error message
+import backoff from 'backoff';
+import pMap from 'p-map';
+import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.mjs';
+// @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRetry, statusCb }) => {
-  if (!concurrentUpload || !statusCb || !maxRetry) throw new Error('Missing required option concurrentUpload')
-  statusCb({
-    type: 'upload',
-    msg: `Uploading ${uploadList.length} files`,
-    phase: 'start',
-  })
-
-  const uploadFile = async (fileObj, index) => {
-    const { assetType, body, filepath, invocationMode, normalizedPath, runtime } = fileObj
-
-    const readStreamCtor = () => body ?? fs.createReadStream(filepath)
-
+    if (!concurrentUpload || !statusCb || !maxRetry)
+        throw new Error('Missing required option concurrentUpload');
     statusCb({
-      type: 'upload',
-      msg: `(${index}/${uploadList.length}) Uploading ${normalizedPath}...`,
-      phase: 'progress',
-    })
-    let response
-    switch (assetType) {
-      case 'file': {
-        response = await retryUpload(
-          () =>
-            api.uploadDeployFile({
-              body: readStreamCtor,
-              deployId,
-              path: encodeURI(normalizedPath),
-            }),
-          maxRetry,
-        )
-        break
-      }
-      case 'function': {
-        response = await retryUpload((retryCount) => {
-          const params = {
-            body: readStreamCtor,
-            deployId,
-            invocationMode,
-            name: encodeURI(normalizedPath),
-            runtime,
-          }
-
-          if (retryCount > 0) {
-            params.xNfRetryCount = retryCount
-          }
-
-          return api.uploadDeployFunction(params)
-        }, maxRetry)
-        break
-      }
-      default: {
-        const error = new Error('File Object missing assetType property')
-        error.fileObj = fileObj
-        throw error
-      }
-    }
-
-    return response
-  }
-
-  const results = await pMap(uploadList, uploadFile, { concurrency: concurrentUpload })
-  statusCb({
-    type: 'upload',
-    msg: `Finished uploading ${uploadList.length} assets`,
-    phase: 'stop',
-  })
-  return results
-}
-
-const retryUpload = (uploadFn, maxRetry) =>
-  new Promise((resolve, reject) => {
-    let lastError
-
+        type: 'upload',
+        msg: `Uploading ${uploadList.length} files`,
+        phase: 'start',
+    });
+    // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
+    const uploadFile = async (fileObj, index) => {
+        const { assetType, body, filepath, invocationMode, normalizedPath, runtime } = fileObj;
+        const readStreamCtor = () => body ?? fs.createReadStream(filepath);
+        statusCb({
+            type: 'upload',
+            msg: `(${index}/${uploadList.length}) Uploading ${normalizedPath}...`,
+            phase: 'progress',
+        });
+        let response;
+        switch (assetType) {
+            case 'file': {
+                response = await retryUpload(() => api.uploadDeployFile({
+                    body: readStreamCtor,
+                    deployId,
+                    path: encodeURI(normalizedPath),
+                }), maxRetry);
+                break;
+            }
+            case 'function': {
+                // @ts-expect-error TS(7006) FIXME: Parameter 'retryCount' implicitly has an 'any' typ... Remove this comment to see the full error message
+                response = await retryUpload((retryCount) => {
+                    const params = {
+                        body: readStreamCtor,
+                        deployId,
+                        invocationMode,
+                        name: encodeURI(normalizedPath),
+                        runtime,
+                    };
+                    if (retryCount > 0) {
+                        // @ts-expect-error TS(2339) FIXME: Property 'xNfRetryCount' does not exist on type '{... Remove this comment to see the full error message
+                        params.xNfRetryCount = retryCount;
+                    }
+                    return api.uploadDeployFunction(params);
+                }, maxRetry);
+                break;
+            }
+            default: {
+                const error = new Error('File Object missing assetType property');
+                // @ts-expect-error TS(2339) FIXME: Property 'fileObj' does not exist on type 'Error'.
+                error.fileObj = fileObj;
+                throw error;
+            }
+        }
+        return response;
+    };
+    const results = await pMap(uploadList, uploadFile, { concurrency: concurrentUpload });
+    statusCb({
+        type: 'upload',
+        msg: `Finished uploading ${uploadList.length} assets`,
+        phase: 'stop',
+    });
+    return results;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'uploadFn' implicitly has an 'any' type.
+const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
+    // @ts-expect-error TS(7034) FIXME: Variable 'lastError' implicitly has type 'any' in ... Remove this comment to see the full error message
+    let lastError;
     const fibonacciBackoff = backoff.fibonacci({
-      randomisationFactor: UPLOAD_RANDOM_FACTOR,
-      initialDelay: UPLOAD_INITIAL_DELAY,
-      maxDelay: UPLOAD_MAX_DELAY,
-    })
-
+        randomisationFactor: UPLOAD_RANDOM_FACTOR,
+        initialDelay: UPLOAD_INITIAL_DELAY,
+        maxDelay: UPLOAD_MAX_DELAY,
+    });
     const tryUpload = async (retryIndex = -1) => {
-      try {
-        const results = await uploadFn(retryIndex + 1)
-
-        return resolve(results)
-      } catch (error) {
-        lastError = error
-
-        // observed errors: 408, 401 (4** swallowed), 502
-        if (error.status >= 400 || error.name === 'FetchError') {
-          fibonacciBackoff.backoff()
-          return
+        try {
+            const results = await uploadFn(retryIndex + 1);
+            return resolve(results);
+        }
+        catch (error) {
+            lastError = error;
+            // observed errors: 408, 401 (4** swallowed), 502
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error.status >= 400 || error.name === 'FetchError') {
+                fibonacciBackoff.backoff();
+                return;
+            }
+            return reject(error);
         }
-        return reject(error)
-      }
-    }
-
-    fibonacciBackoff.failAfter(maxRetry)
-
+    };
+    fibonacciBackoff.failAfter(maxRetry);
     fibonacciBackoff.on('backoff', () => {
-      // Do something when backoff starts, e.g. show to the
-      // user the delay before next reconnection attempt.
-    })
-
-    fibonacciBackoff.on('ready', tryUpload)
-
+        // Do something when backoff starts, e.g. show to the
+        // user the delay before next reconnection attempt.
+    });
+    fibonacciBackoff.on('ready', tryUpload);
     fibonacciBackoff.on('fail', () => {
-      reject(lastError)
-    })
-
-    tryUpload()
-  })
-
-export default uploadFiles
+        // @ts-expect-error TS(7005) FIXME: Variable 'lastError' implicitly has an 'any' type.
+        reject(lastError);
+    });
+    tryUpload();
+});
+export default uploadFiles;

package/src/utils/deploy/util.mjs

@@ -1,99 +1,93 @@
-// @ts-check
-import { sep } from 'path'
-
-import pWaitFor from 'p-wait-for'
-
-import { DEPLOY_POLL } from './constants.mjs'
-
+import { sep } from 'path';
+import pWaitFor from 'p-wait-for';
+import { DEPLOY_POLL } from './constants.mjs';
 // normalize windows paths to unix paths
+// @ts-expect-error TS(7006) FIXME: Parameter 'relname' implicitly has an 'any' type.
 export const normalizePath = (relname) => {
-  if (relname.includes('#') || relname.includes('?')) {
-    throw new Error(`Invalid filename ${relname}. Deployed filenames cannot contain # or ? characters`)
-  }
-  return relname.split(sep).join('/')
-}
-
+    if (relname.includes('#') || relname.includes('?')) {
+        throw new Error(`Invalid filename ${relname}. Deployed filenames cannot contain # or ? characters`);
+    }
+    return relname.split(sep).join('/');
+};
 // poll an async deployId until its done diffing
+// @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 export const waitForDiff = async (api, deployId, siteId, timeout) => {
-  // capture ready deploy during poll
-  let deploy
-
-  const loadDeploy = async () => {
-    const siteDeploy = await api.getSiteDeploy({ siteId, deployId })
-
-    switch (siteDeploy.state) {
-      // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
-      case 'error': {
-        const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`)
-        deployError.deploy = siteDeploy
-        throw deployError
-      }
-      case 'prepared':
-      case 'uploading':
-      case 'uploaded':
-      case 'ready': {
-        deploy = siteDeploy
-        return true
-      }
-      case 'preparing':
-      default: {
-        return false
-      }
-    }
-  }
-
-  await pWaitFor(loadDeploy, {
-    interval: DEPLOY_POLL,
-    timeout: {
-      milliseconds: timeout,
-      message: 'Timeout while waiting for deploy',
-    },
-  })
-
-  return deploy
-}
-
+    // capture ready deploy during poll
+    let deploy;
+    const loadDeploy = async () => {
+        const siteDeploy = await api.getSiteDeploy({ siteId, deployId });
+        switch (siteDeploy.state) {
+            // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
+            case 'error': {
+                const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`);
+                // @ts-expect-error TS(2339) FIXME: Property 'deploy' does not exist on type 'Error'.
+                deployError.deploy = siteDeploy;
+                throw deployError;
+            }
+            case 'prepared':
+            case 'uploading':
+            case 'uploaded':
+            case 'ready': {
+                deploy = siteDeploy;
+                return true;
+            }
+            case 'preparing':
+            default: {
+                return false;
+            }
+        }
+    };
+    await pWaitFor(loadDeploy, {
+        interval: DEPLOY_POLL,
+        timeout: {
+            milliseconds: timeout,
+            message: 'Timeout while waiting for deploy',
+        },
+    });
+    return deploy;
+};
 // Poll a deployId until its ready
+// @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 export const waitForDeploy = async (api, deployId, siteId, timeout) => {
-  // capture ready deploy during poll
-  let deploy
-
-  const loadDeploy = async () => {
-    const siteDeploy = await api.getSiteDeploy({ siteId, deployId })
-    switch (siteDeploy.state) {
-      // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
-      case 'error': {
-        const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`)
-        deployError.deploy = siteDeploy
-        throw deployError
-      }
-      case 'ready': {
-        deploy = siteDeploy
-        return true
-      }
-      case 'preparing':
-      case 'prepared':
-      case 'uploaded':
-      case 'uploading':
-      default: {
-        return false
-      }
-    }
-  }
-
-  await pWaitFor(loadDeploy, {
-    interval: DEPLOY_POLL,
-    timeout: {
-      milliseconds: timeout,
-      message: 'Timeout while waiting for deploy',
-    },
-  })
-
-  return deploy
-}
-
+    // capture ready deploy during poll
+    let deploy;
+    const loadDeploy = async () => {
+        const siteDeploy = await api.getSiteDeploy({ siteId, deployId });
+        switch (siteDeploy.state) {
+            // https://github.com/netlify/bitballoon/blob/master/app/models/deploy.rb#L21-L33
+            case 'error': {
+                const deployError = new Error(siteDeploy.error_message || `Deploy ${deployId} had an error`);
+                // @ts-expect-error TS(2339) FIXME: Property 'deploy' does not exist on type 'Error'.
+                deployError.deploy = siteDeploy;
+                throw deployError;
+            }
+            case 'ready': {
+                deploy = siteDeploy;
+                return true;
+            }
+            case 'preparing':
+            case 'prepared':
+            case 'uploaded':
+            case 'uploading':
+            default: {
+                return false;
+            }
+        }
+    };
+    await pWaitFor(loadDeploy, {
+        interval: DEPLOY_POLL,
+        timeout: {
+            milliseconds: timeout,
+            message: 'Timeout while waiting for deploy',
+        },
+    });
+    return deploy;
+};
 // Transform the fileShaMap and fnShaMap into a generic shaMap that file-uploader.js can use
+// @ts-expect-error TS(7006) FIXME: Parameter 'required' implicitly has an 'any' type.
 export const getUploadList = (required, shaMap) => {
-  if (!required || !shaMap) return []
-  return required.flatMap((sha) => shaMap[sha])
-}
+    if (!required || !shaMap)
+        return [];
+    // @ts-expect-error TS(7006) FIXME: Parameter 'sha' implicitly has an 'any' type.
+    return required.flatMap((sha) => shaMap[sha]);
+};