netlify-cli 17.3.1 → 17.4.0

package/src/lib/functions/runtimes/rust/index.mjs

@@ -1,79 +1,70 @@
-// @ts-check
-import { readFile } from 'fs/promises'
-import { dirname, extname, join, resolve } from 'path'
-import { platform } from 'process'
-
-import { findUp } from 'find-up'
-import toml from 'toml'
-
-import execa from '../../../../utils/execa.mjs'
-import { SERVE_FUNCTIONS_FOLDER } from '../../../../utils/functions/functions.mjs'
-import { getPathInProject } from '../../../settings.mjs'
-import { runFunctionsProxy } from '../../local-proxy.mjs'
-
-const isWindows = platform === 'win32'
-
-export const name = 'rs'
-
+import { readFile } from 'fs/promises';
+import { dirname, extname, join, resolve } from 'path';
+import { platform } from 'process';
+import { findUp } from 'find-up';
+import toml from 'toml';
+// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
+import execa from '../../../../utils/execa.mjs';
+import { SERVE_FUNCTIONS_FOLDER } from '../../../../utils/functions/functions.mjs';
+import { getPathInProject } from '../../../settings.mjs';
+import { runFunctionsProxy } from '../../local-proxy.mjs';
+const isWindows = platform === 'win32';
+export const name = 'rs';
+// @ts-expect-error TS(7031) FIXME: Binding element 'func' implicitly has an 'any' typ... Remove this comment to see the full error message
 const build = async ({ func }) => {
-  const functionDirectory = dirname(func.mainFile)
-  const cacheDirectory = resolve(getPathInProject([SERVE_FUNCTIONS_FOLDER]))
-  const targetDirectory = join(cacheDirectory, func.name)
-  const crateName = await getCrateName(functionDirectory)
-  const binaryName = `${crateName}${isWindows ? '.exe' : ''}`
-  const binaryPath = join(targetDirectory, 'debug', binaryName)
-
-  await execa('cargo', ['build', '--target-dir', targetDirectory], {
-    cwd: functionDirectory,
-  })
-
-  return {
-    binaryPath,
-    srcFiles: [functionDirectory],
-  }
-}
-
-export const getBuildFunction =
-  ({ func }) =>
-  () =>
-    build({ func })
-
+    const functionDirectory = dirname(func.mainFile);
+    const cacheDirectory = resolve(getPathInProject([SERVE_FUNCTIONS_FOLDER]));
+    const targetDirectory = join(cacheDirectory, func.name);
+    const crateName = await getCrateName(functionDirectory);
+    const binaryName = `${crateName}${isWindows ? '.exe' : ''}`;
+    const binaryPath = join(targetDirectory, 'debug', binaryName);
+    // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
+    await execa('cargo', ['build', '--target-dir', targetDirectory], {
+        cwd: functionDirectory,
+    });
+    return {
+        binaryPath,
+        srcFiles: [functionDirectory],
+    };
+};
+export const getBuildFunction = 
+// @ts-expect-error TS(7031) FIXME: Binding element 'func' implicitly has an 'any' typ... Remove this comment to see the full error message
+({ func }) => () => build({ func });
+// @ts-expect-error TS(7006) FIXME: Parameter 'cwd' implicitly has an 'any' type.
 const getCrateName = async (cwd) => {
-  const manifestPath = await findUp('Cargo.toml', { cwd, type: 'file' })
-  const manifest = await readFile(manifestPath, 'utf-8')
-  const { package: CargoPackage } = toml.parse(manifest)
-
-  return CargoPackage.name
-}
-
+    const manifestPath = await findUp('Cargo.toml', { cwd, type: 'file' });
+    // @ts-expect-error TS(2769) FIXME: No overload matches this call.
+    const manifest = await readFile(manifestPath, 'utf-8');
+    const { package: CargoPackage } = toml.parse(manifest);
+    return CargoPackage.name;
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'context' implicitly has an 'any' ... Remove this comment to see the full error message
 export const invokeFunction = async ({ context, event, func, timeout }) => {
-  const { stdout } = await runFunctionsProxy({
-    binaryPath: func.buildData.binaryPath,
-    context,
-    directory: dirname(func.mainFile),
-    event,
-    name: func.name,
-    timeout,
-  })
-
-  try {
-    const { body, headers, multiValueHeaders, statusCode } = JSON.parse(stdout)
-
-    return {
-      body,
-      headers,
-      multiValueHeaders,
-      statusCode,
+    const { stdout } = await runFunctionsProxy({
+        binaryPath: func.buildData.binaryPath,
+        context,
+        directory: dirname(func.mainFile),
+        event,
+        name: func.name,
+        timeout,
+    });
+    try {
+        const { body, headers, multiValueHeaders, statusCode } = JSON.parse(stdout);
+        return {
+            body,
+            headers,
+            multiValueHeaders,
+            statusCode,
+        };
     }
-  } catch {
-    return {
-      statusCode: 500,
+    catch {
+        return {
+            statusCode: 500,
+        };
     }
-  }
-}
-
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'func' implicitly has an 'any' type.
 export const onRegister = (func) => {
-  const isSource = extname(func.mainFile) === '.rs'
-
-  return isSource ? func : null
-}
+    const isSource = extname(func.mainFile) === '.rs';
+    return isSource ? func : null;
+};

package/src/lib/functions/scheduled.mjs

@@ -1,98 +1,80 @@
-import AnsiToHtml from 'ansi-to-html'
-
-import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.mjs'
-
-import { formatLambdaError } from './utils.mjs'
-
-const ansiToHtml = new AnsiToHtml()
-
+import AnsiToHtml from 'ansi-to-html';
+import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.mjs';
+import { formatLambdaError } from './utils.mjs';
+const ansiToHtml = new AnsiToHtml();
+// @ts-expect-error TS(7031) FIXME: Binding element 'error' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const buildHelpResponse = ({ error, headers, path, result }) => {
-  const acceptsHtml = headers.accept && headers.accept.includes('text/html')
-
-  const paragraph = (text) => {
-    text = text.trim()
-
-    if (acceptsHtml) {
-      return ansiToHtml.toHtml(`<p>${text}</p>`)
-    }
-
-    text = text
-      .replace(/<pre><code>/gm, '```\n')
-      .replace(/<\/code><\/pre>/gm, '\n```')
-      .replace(/<code>/gm, '`')
-      .replace(/<\/code>/gm, '`')
-
-    return `${text}\n\n`
-  }
-
-  const isSimulatedRequest = headers['user-agent'] === CLOCKWORK_USERAGENT
-
-  let message = ''
-
-  if (!isSimulatedRequest) {
-    message += paragraph(`
+    const acceptsHtml = headers.accept && headers.accept.includes('text/html');
+    // @ts-expect-error TS(7006) FIXME: Parameter 'text' implicitly has an 'any' type.
+    const paragraph = (text) => {
+        text = text.trim();
+        if (acceptsHtml) {
+            return ansiToHtml.toHtml(`<p>${text}</p>`);
+        }
+        text = text
+            .replace(/<pre><code>/gm, '```\n')
+            .replace(/<\/code><\/pre>/gm, '\n```')
+            .replace(/<code>/gm, '`')
+            .replace(/<\/code>/gm, '`');
+        return `${text}\n\n`;
+    };
+    const isSimulatedRequest = headers['user-agent'] === CLOCKWORK_USERAGENT;
+    let message = '';
+    if (!isSimulatedRequest) {
+        message += paragraph(`
 You performed an HTTP request to <code>${path}</code>, which is a scheduled function.
 You can do this to test your functions locally, but it won't work in production.
-    `)
-  }
-
-  if (error) {
-    message += paragraph(`
+    `);
+    }
+    if (error) {
+        message += paragraph(`
 There was an error during execution of your scheduled function:
 
-<pre><code>${formatLambdaError(error)}</code></pre>`)
-  }
-
-  if (result) {
-    // lambda emulator adds level field, which isn't user-provided
-    const returnValue = { ...result }
-    delete returnValue.level
-
-    const { statusCode } = returnValue
-    if (statusCode >= 500) {
-      message += paragraph(`
+<pre><code>${formatLambdaError(error)}</code></pre>`);
+    }
+    if (result) {
+        // lambda emulator adds level field, which isn't user-provided
+        const returnValue = { ...result };
+        delete returnValue.level;
+        const { statusCode } = returnValue;
+        if (statusCode >= 500) {
+            message += paragraph(`
 Your function returned a status code of <code>${statusCode}</code>.
 At the moment, Netlify does nothing about that. In the future, there might be a retry mechanism based on this.
-`)
+`);
+        }
+        const allowedKeys = new Set(['statusCode']);
+        const returnedKeys = Object.keys(returnValue);
+        const ignoredKeys = returnedKeys.filter((key) => !allowedKeys.has(key));
+        if (ignoredKeys.length !== 0) {
+            message += paragraph(`Your function returned ${ignoredKeys
+                .map((key) => `<code>${key}</code>`)
+                .join(', ')}. Is this an accident? It won't be interpreted by Netlify.`);
+        }
     }
-
-    const allowedKeys = new Set(['statusCode'])
-    const returnedKeys = Object.keys(returnValue)
-    const ignoredKeys = returnedKeys.filter((key) => !allowedKeys.has(key))
-
-    if (ignoredKeys.length !== 0) {
-      message += paragraph(
-        `Your function returned ${ignoredKeys
-          .map((key) => `<code>${key}</code>`)
-          .join(', ')}. Is this an accident? It won't be interpreted by Netlify.`,
-      )
-    }
-  }
-
-  const statusCode = error ? 500 : 200
-  return acceptsHtml
-    ? {
-        statusCode,
-        contentType: 'text/html',
-        message: `<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">\n
+    const statusCode = error ? 500 : 200;
+    return acceptsHtml
+        ? {
+            statusCode,
+            contentType: 'text/html',
+            message: `<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">\n
                 ${message}`,
-      }
-    : {
-        statusCode,
-        contentType: 'text/plain',
-        message,
-      }
-}
-
+        }
+        : {
+            statusCode,
+            contentType: 'text/plain',
+            message,
+        };
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'error' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const handleScheduledFunction = ({ error, request, response, result }) => {
-  const { contentType, message, statusCode } = buildHelpResponse({
-    error,
-    headers: request.headers,
-    path: request.path,
-    result,
-  })
-
-  response.status(statusCode)
-  response.set('Content-Type', contentType)
-  response.send(message)
-}
+    const { contentType, message, statusCode } = buildHelpResponse({
+        error,
+        headers: request.headers,
+        path: request.path,
+        result,
+    });
+    response.status(statusCode);
+    response.set('Content-Type', contentType);
+    response.send(message);
+};