netlify-cli 17.3.1 → 17.4.0

package/src/utils/deploy/hash-fns.mjs

@@ -1,162 +1,157 @@
-import { readFile } from 'fs/promises'
-import path from 'path'
-import { promisify } from 'util'
-
-import { zipFunctions } from '@netlify/zip-it-and-ship-it'
-import fromArray from 'from2-array'
-import pumpModule from 'pump'
-
-import { getPathInProject } from '../../lib/settings.mjs'
-import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.mjs'
-
-import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs'
-
-const pump = promisify(pumpModule)
-
+import { readFile } from 'fs/promises';
+import path from 'path';
+import { promisify } from 'util';
+import { zipFunctions } from '@netlify/zip-it-and-ship-it';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'from... Remove this comment to see the full error message
+import fromArray from 'from2-array';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message
+import pumpModule from 'pump';
+import { getPathInProject } from '../../lib/settings.mjs';
+import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.mjs';
+import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs';
+const pump = promisify(pumpModule);
 // Maximum age of functions manifest (2 minutes).
-const MANIFEST_FILE_TTL = 12e4
-
-const getFunctionZips = async ({
-  directories,
-  functionsConfig,
-  manifestPath,
-  rootDir,
-  skipFunctionsCache,
-  statusCb,
-  tmpDir,
-}) => {
-  statusCb({
-    type: 'functions-manifest',
-    msg: 'Looking for a functions cache...',
-    phase: 'start',
-  })
-
-  if (manifestPath) {
-    try {
-      // read manifest.json file
-      const { functions, timestamp } = JSON.parse(await readFile(manifestPath))
-      const manifestAge = Date.now() - timestamp
-
-      if (manifestAge > MANIFEST_FILE_TTL) {
-        throw new Error('Manifest expired')
-      }
-
-      statusCb({
-        type: 'functions-manifest',
-        msg: 'Deploying functions from cache (use --skip-functions-cache to override)',
-        phase: 'stop',
-      })
-
-      return functions
-    } catch {
-      statusCb({
+const MANIFEST_FILE_TTL = 12e4;
+const getFunctionZips = async ({ 
+// @ts-expect-error TS(7031) FIXME: Binding element 'directories' implicitly has an 'a... Remove this comment to see the full error message
+directories, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'functionsConfig' implicitly has a... Remove this comment to see the full error message
+functionsConfig, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'manifestPath' implicitly has an '... Remove this comment to see the full error message
+manifestPath, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'rootDir' implicitly has an 'any' ... Remove this comment to see the full error message
+rootDir, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'skipFunctionsCache' implicitly ha... Remove this comment to see the full error message
+skipFunctionsCache, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'statusCb' implicitly has an 'any'... Remove this comment to see the full error message
+statusCb, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'tmpDir' implicitly has an 'any' t... Remove this comment to see the full error message
+tmpDir, }) => {
+    statusCb({
         type: 'functions-manifest',
-        msg: 'Ignored invalid or expired functions cache',
-        phase: 'stop',
-      })
+        msg: 'Looking for a functions cache...',
+        phase: 'start',
+    });
+    if (manifestPath) {
+        try {
+            // read manifest.json file
+            // @ts-expect-error TS(2345) FIXME: Argument of type 'Buffer' is not assignable to par... Remove this comment to see the full error message
+            const { functions, timestamp } = JSON.parse(await readFile(manifestPath));
+            const manifestAge = Date.now() - timestamp;
+            if (manifestAge > MANIFEST_FILE_TTL) {
+                throw new Error('Manifest expired');
+            }
+            statusCb({
+                type: 'functions-manifest',
+                msg: 'Deploying functions from cache (use --skip-functions-cache to override)',
+                phase: 'stop',
+            });
+            return functions;
+        }
+        catch {
+            statusCb({
+                type: 'functions-manifest',
+                msg: 'Ignored invalid or expired functions cache',
+                phase: 'stop',
+            });
+        }
     }
-  } else {
-    const msg = skipFunctionsCache
-      ? 'Ignoring functions cache (use without --skip-functions-cache to change)'
-      : 'No cached functions were found'
-
-    statusCb({
-      type: 'functions-manifest',
-      msg,
-      phase: 'stop',
-    })
-  }
-
-  return await zipFunctions(directories, tmpDir, {
-    basePath: rootDir,
-    configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
-    config: functionsConfig,
-  })
-}
-
+    else {
+        const msg = skipFunctionsCache
+            ? 'Ignoring functions cache (use without --skip-functions-cache to change)'
+            : 'No cached functions were found';
+        statusCb({
+            type: 'functions-manifest',
+            msg,
+            phase: 'stop',
+        });
+    }
+    return await zipFunctions(directories, tmpDir, {
+        basePath: rootDir,
+        configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
+        config: functionsConfig,
+    });
+};
 const hashFns = async (
-  directories,
-  {
-    assetType = 'function',
-    concurrentHash,
-    functionsConfig,
-    hashAlgorithm = 'sha256',
-    manifestPath,
-    rootDir,
-    skipFunctionsCache,
-    statusCb,
-    tmpDir,
-  },
-) => {
-  // Early out if no functions directories are configured.
-  if (directories.length === 0) {
-    return { functions: {}, functionsWithNativeModules: [], shaMap: {} }
-  }
-
-  if (!tmpDir) {
-    throw new Error('Missing tmpDir directory for zipping files')
-  }
-
-  const functionZips = await getFunctionZips({
-    directories,
-    functionsConfig,
-    manifestPath,
-    rootDir,
-    skipFunctionsCache,
-    statusCb,
-    tmpDir,
-  })
-  const fileObjs = functionZips.map(
+// @ts-expect-error TS(7006) FIXME: Parameter 'directories' implicitly has an 'any' ty... Remove this comment to see the full error message
+directories, { assetType = 'function', 
+// @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message
+concurrentHash, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'functionsConfig' implicitly has a... Remove this comment to see the full error message
+functionsConfig, hashAlgorithm = 'sha256', 
+// @ts-expect-error TS(7031) FIXME: Binding element 'manifestPath' implicitly has an '... Remove this comment to see the full error message
+manifestPath, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'rootDir' implicitly has an 'any' ... Remove this comment to see the full error message
+rootDir, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'skipFunctionsCache' implicitly ha... Remove this comment to see the full error message
+skipFunctionsCache, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'statusCb' implicitly has an 'any'... Remove this comment to see the full error message
+statusCb, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'tmpDir' implicitly has an 'any' t... Remove this comment to see the full error message
+tmpDir, }) => {
+    // Early out if no functions directories are configured.
+    if (directories.length === 0) {
+        return { functions: {}, functionsWithNativeModules: [], shaMap: {} };
+    }
+    if (!tmpDir) {
+        throw new Error('Missing tmpDir directory for zipping files');
+    }
+    const functionZips = await getFunctionZips({
+        directories,
+        functionsConfig,
+        manifestPath,
+        rootDir,
+        skipFunctionsCache,
+        statusCb,
+        tmpDir,
+    });
+    const fileObjs = functionZips.map(
+    // @ts-expect-error TS(7031) FIXME: Binding element 'buildData' implicitly has an 'any... Remove this comment to see the full error message
     ({ buildData, displayName, generator, invocationMode, path: functionPath, runtime, runtimeVersion }) => ({
-      filepath: functionPath,
-      root: tmpDir,
-      relname: path.relative(tmpDir, functionPath),
-      basename: path.basename(functionPath),
-      extname: path.extname(functionPath),
-      type: 'file',
-      assetType: 'function',
-      normalizedPath: path.basename(functionPath, path.extname(functionPath)),
-      runtime: runtimeVersion ?? runtime,
-      displayName,
-      generator,
-      invocationMode,
-      buildData,
-    }),
-  )
-  const fnConfig = functionZips
-    .filter((func) => Boolean(func.displayName || func.generator || func.routes || func.buildData))
-    .reduce(
-      (funcs, curr) => ({
+        filepath: functionPath,
+        root: tmpDir,
+        relname: path.relative(tmpDir, functionPath),
+        basename: path.basename(functionPath),
+        extname: path.extname(functionPath),
+        type: 'file',
+        assetType: 'function',
+        normalizedPath: path.basename(functionPath, path.extname(functionPath)),
+        runtime: runtimeVersion ?? runtime,
+        displayName,
+        generator,
+        invocationMode,
+        buildData,
+    }));
+    const fnConfig = functionZips
+        // @ts-expect-error TS(7006) FIXME: Parameter 'func' implicitly has an 'any' type.
+        .filter((func) => Boolean(func.displayName || func.generator || func.routes || func.buildData))
+        .reduce(
+    // @ts-expect-error TS(7006) FIXME: Parameter 'funcs' implicitly has an 'any' type.
+    (funcs, curr) => ({
         ...funcs,
         [curr.name]: {
-          display_name: curr.displayName,
-          generator: curr.generator,
-          routes: curr.routes,
-          build_data: curr.buildData,
+            display_name: curr.displayName,
+            generator: curr.generator,
+            routes: curr.routes,
+            build_data: curr.buildData,
         },
-      }),
-      {},
-    )
-  const functionSchedules = functionZips
-    .map(({ name, schedule }) => schedule && { name, cron: schedule })
-    .filter(Boolean)
-  const functionsWithNativeModules = functionZips.filter(
-    ({ nativeNodeModules }) => nativeNodeModules !== undefined && Object.keys(nativeNodeModules).length !== 0,
-  )
-
-  const functionStream = fromArray.obj(fileObjs)
-
-  const hasher = hasherCtor({ concurrentHash, hashAlgorithm })
-
-  // Written to by manifestCollector
-  // normalizedPath: hash (wanted by deploy API)
-  const functions = {}
-  // hash: [fileObj, fileObj, fileObj]
-  const fnShaMap = {}
-  const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType })
-
-  await pump(functionStream, hasher, manifestCollector)
-  return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig }
-}
-
-export default hashFns
+    }), {});
+    const functionSchedules = functionZips
+        // @ts-expect-error TS(7031) FIXME: Binding element 'name' implicitly has an 'any' typ... Remove this comment to see the full error message
+        .map(({ name, schedule }) => schedule && { name, cron: schedule })
+        .filter(Boolean);
+    const functionsWithNativeModules = functionZips.filter(
+    // @ts-expect-error TS(7031) FIXME: Binding element 'nativeNodeModules' implicitly has... Remove this comment to see the full error message
+    ({ nativeNodeModules }) => nativeNodeModules !== undefined && Object.keys(nativeNodeModules).length !== 0);
+    const functionStream = fromArray.obj(fileObjs);
+    const hasher = hasherCtor({ concurrentHash, hashAlgorithm });
+    // Written to by manifestCollector
+    // normalizedPath: hash (wanted by deploy API)
+    const functions = {};
+    // hash: [fileObj, fileObj, fileObj]
+    const fnShaMap = {};
+    const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType });
+    await pump(functionStream, hasher, manifestCollector);
+    return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig };
+};
+export default hashFns;

package/src/utils/deploy/hasher-segments.mjs

@@ -1,63 +1,69 @@
-import flushWriteStream from 'flush-write-stream'
-import hasha from 'hasha'
-import transform from 'parallel-transform'
-import { objCtor as objFilterCtor } from 'through2-filter'
-import { obj as map } from 'through2-map'
-
-import { normalizePath } from './util.mjs'
-
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'flus... Remove this comment to see the full error message
+import flushWriteStream from 'flush-write-stream';
+import hasha from 'hasha';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'para... Remove this comment to see the full error message
+import transform from 'parallel-transform';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
+import { objCtor as objFilterCtor } from 'through2-filter';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
+import { obj as map } from 'through2-map';
+import { normalizePath } from './util.mjs';
 // a parallel transform stream segment ctor that hashes fileObj's created by folder-walker
 // TODO: use promises instead of callbacks
 /* eslint-disable promise/prefer-await-to-callbacks */
+// @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message
 export const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
-  const hashaOpts = { algorithm: hashAlgorithm }
-  if (!concurrentHash) throw new Error('Missing required opts')
-  return transform(concurrentHash, { objectMode: true }, async (fileObj, cb) => {
-    try {
-      const hash = await hasha.fromFile(fileObj.filepath, hashaOpts)
-      // insert hash and asset type to file obj
-      return cb(null, { ...fileObj, hash })
-    } catch (error) {
-      return cb(error)
-    }
-  })
-}
-
+    const hashaOpts = { algorithm: hashAlgorithm };
+    if (!concurrentHash)
+        throw new Error('Missing required opts');
+    // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
+    return transform(concurrentHash, { objectMode: true }, async (fileObj, cb) => {
+        try {
+            const hash = await hasha.fromFile(fileObj.filepath, hashaOpts);
+            // insert hash and asset type to file obj
+            return cb(null, { ...fileObj, hash });
+        }
+        catch (error) {
+            return cb(error);
+        }
+    });
+};
 // Inject normalized file names into normalizedPath and assetType
-export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) =>
-  map((fileObj) => {
-    const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) }
-
+// @ts-expect-error TS(7031) FIXME: Binding element 'assetType' implicitly has an 'any... Remove this comment to see the full error message
+export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) => 
+// @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
+map((fileObj) => {
+    const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) };
     if (normalizeFunction !== undefined) {
-      return normalizeFunction(normalizedFile)
+        return normalizeFunction(normalizedFile);
     }
-
-    return normalizedFile
-  })
-
+    return normalizedFile;
+});
 // A writable stream segment ctor that normalizes file paths, and writes shaMap's
+// @ts-expect-error TS(7006) FIXME: Parameter 'filesObj' implicitly has an 'any' type.
 export const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
-  if (!statusCb || !assetType) throw new Error('Missing required options')
-  return flushWriteStream.obj((fileObj, _, cb) => {
-    filesObj[fileObj.normalizedPath] = fileObj.hash
-
-    // We map a hash to multiple fileObj's because the same file
-    // might live in two different locations
-
-    if (Array.isArray(shaMap[fileObj.hash])) {
-      shaMap[fileObj.hash].push(fileObj)
-    } else {
-      shaMap[fileObj.hash] = [fileObj]
-    }
-    statusCb({
-      type: 'hashing',
-      msg: `Hashing ${fileObj.relname}`,
-      phase: 'progress',
-    })
-    cb(null)
-  })
-}
+    if (!statusCb || !assetType)
+        throw new Error('Missing required options');
+    // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
+    return flushWriteStream.obj((fileObj, _, cb) => {
+        filesObj[fileObj.normalizedPath] = fileObj.hash;
+        // We map a hash to multiple fileObj's because the same file
+        // might live in two different locations
+        if (Array.isArray(shaMap[fileObj.hash])) {
+            shaMap[fileObj.hash].push(fileObj);
+        }
+        else {
+            shaMap[fileObj.hash] = [fileObj];
+        }
+        statusCb({
+            type: 'hashing',
+            msg: `Hashing ${fileObj.relname}`,
+            phase: 'progress',
+        });
+        cb(null);
+    });
+};
 /* eslint-enable promise/prefer-await-to-callbacks */
-
 // transform stream ctor that filters folder-walker results for only files
-export const fileFilterCtor = objFilterCtor((fileObj) => fileObj.type === 'file')
+// @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
+export const fileFilterCtor = objFilterCtor((fileObj) => fileObj.type === 'file');