chore: update eslint rules (#363)

This updates @netlify/eslint-config-node to v7 and fixes all issues.

moved the unit tests to `test/unit`

Also removes some optional chaining and nullish coalescing operator as
we test against node 8.

This is in preparation for an upcoming fix and the introduction of tests
for typescript types.

Author: danez

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
   overrides: [
     ...overrides,
     {
-      files: 'test/*.js',
+      files: 'test/**/*.+(t|j)s',
       rules: {
         'no-magic-numbers': 'off',
         'promise/prefer-await-to-callbacks': 'off',

package-lock.json

@@ -14,8 +14,8 @@
     "prepack": "npm run build",
     "prepublishOnly": "npm ci && npm test",
     "test": "run-s format test:dev",
-    "format": "run-s format:check-fix:*",
-    "format:ci": "run-s format:check:*",
+    "format": "run-s build format:check-fix:*",
+    "format:ci": "run-s build format:check:*",
     "format:check-fix:lint": "run-e format:check:lint format:fix:lint",
     "format:check:lint": "cross-env-shell eslint $npm_package_config_eslint",
     "format:fix:lint": "cross-env-shell eslint --fix $npm_package_config_eslint",
@@ -28,12 +28,12 @@
     "test:ci:ava": "nyc -r lcovonly -r text -r json ava"
   },
   "config": {
-    "eslint": "--ignore-pattern README.md --ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,.github}/**/*.{ts,js,md,html}\" \"*.{ts,js,md,html}\" \".*.{ts,js,md,html}\"",
+    "eslint": "--ignore-pattern README.md --ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,.github,test}/**/*.{ts,js,md,html}\" \"*.{ts,js,md,html}\" \".*.{ts,js,md,html}\"",
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,scripts,.github}/**/*.{ts,js,md,yml,json,html}\" \"*.{ts,js,yml,json,html}\" \".*.{ts,js,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\""
   },
   "ava": {
     "files": [
-      "test/*.js"
+      "test/unit/*.js"
     ],
     "verbose": true
   },
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@commitlint/cli": "^13.0.0",
     "@commitlint/config-conventional": "^13.0.0",
-    "@netlify/eslint-config-node": "^5.1.8",
+    "@netlify/eslint-config-node": "^7.0.0",
     "ava": "^2.4.0",
     "husky": "^7.0.4",
     "npm-run-all": "^4.1.5",

package.json

@@ -1,6 +1,6 @@
-import type { Context } from './context'
-import type { Event } from './event'
-import type { Response, BuilderResponse } from './response'
+import type { Context } from './context.js'
+import type { Event } from './event.js'
+import type { Response, BuilderResponse } from './response.js'
 
 export interface HandlerCallback<ResponseType extends Response = Response> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/function/handler.ts

@@ -1,7 +1,7 @@
-export { Context as HandlerContext } from './context'
-export { Event as HandlerEvent } from './event'
-export { Handler, HandlerCallback } from './handler'
-export { Response as HandlerResponse } from './response'
+export { Context as HandlerContext } from './context.js'
+export { Event as HandlerEvent } from './event.js'
+export { Handler, HandlerCallback } from './handler.js'
+export { Response as HandlerResponse } from './response.js'
 export {
   getSecrets,
   getSecretsForBuild,
@@ -10,5 +10,5 @@ export {
   getNetlifyGraphTokenForBuild,
   GraphTokenResponse,
   HasHeaders,
-} from '../lib/graph'
-export { NetlifySecrets } from '../lib/secrets_helper'
+} from '../lib/graph.js'
+export { NetlifySecrets } from '../lib/secrets_helper.js'

src/function/index.ts

@@ -1,16 +1,16 @@
 import isPromise from 'is-promise'
 
-import { HandlerContext, HandlerEvent } from '../function'
-import { BuilderHandler, Handler, HandlerCallback } from '../function/handler'
-import { Response, BuilderResponse } from '../function/response'
+import { BuilderHandler, Handler, HandlerCallback } from '../function/handler.js'
+import { HandlerContext, HandlerEvent } from '../function/index.js'
+import { Response, BuilderResponse } from '../function/response.js'
 
-import { BUILDER_FUNCTIONS_FLAG, HTTP_STATUS_METHOD_NOT_ALLOWED, METADATA_VERSION } from './consts'
+import { BUILDER_FUNCTIONS_FLAG, HTTP_STATUS_METHOD_NOT_ALLOWED, METADATA_VERSION } from './consts.js'
 
 const augmentResponse = (response: BuilderResponse) => {
   if (!response) {
     return response
   }
-  const metadata = { version: METADATA_VERSION, builder_function: BUILDER_FUNCTIONS_FLAG, ttl: response.ttl ?? 0 }
+  const metadata = { version: METADATA_VERSION, builder_function: BUILDER_FUNCTIONS_FLAG, ttl: response.ttl || 0 }
 
   return {
     ...response,
@@ -36,8 +36,9 @@ const wrapHandler =
       queryStringParameters: {},
     }
 
-    // eslint-disable-next-line promise/prefer-await-to-callbacks
-    const wrappedCallback = (error: unknown, response: BuilderResponse) => callback?.(error, augmentResponse(response))
+    const wrappedCallback = (error: unknown, response: BuilderResponse) =>
+      // eslint-disable-next-line promise/prefer-await-to-callbacks
+      callback ? callback(error, augmentResponse(response)) : null
     const execution = handler(modifiedEvent, context, wrappedCallback)
 
     if (isPromise(execution)) {

src/lib/builder.ts

@@ -1,12 +1,12 @@
-import { Context as HandlerContext, Context } from '../function/context'
-import { Event as HandlerEvent } from '../function/event'
-import { BaseHandler, HandlerCallback } from '../function/handler'
-import { Response } from '../function/response'
+import { Context as HandlerContext, Context } from '../function/context.js'
+import { Event as HandlerEvent } from '../function/event.js'
+import { BaseHandler, HandlerCallback } from '../function/handler.js'
+import { Response } from '../function/response.js'
 
-import { getSecrets, NetlifySecrets } from './secrets_helper'
+import { getSecrets, NetlifySecrets } from './secrets_helper.js'
 // Fine-grained control during the preview, less necessary with a more proactive OneGraph solution
-export { getSecrets, getSecretsForBuild } from './secrets_helper'
-export { getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders } from './graph_token'
+export { getSecrets, getSecretsForBuild } from './secrets_helper.js'
+export { getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders } from './graph_token.js'
 
 export interface ContextWithSecrets extends Context {
   secrets: NetlifySecrets

src/lib/graph.ts

@@ -50,11 +50,10 @@ const graphTokenFromEnv = function (): GraphTokenResponse {
   return { token }
 }
 
-const tokenFallback = function (event: HasHeaders): GraphTokenResponse {
+const tokenFallback = function (event: HasHeaders & { authlifyToken?: string | null }): GraphTokenResponse {
   // Backwards compatibility with older version of cli that doesn't inject header
-  const token = (event as { authlifyToken?: string | null })?.authlifyToken
-  if (token) {
-    return { token }
+  if (event && event.authlifyToken) {
+    return { token: event.authlifyToken }
   }
 
   // If we're in dev-mode with next.js, the plugin won't be there to inject

src/lib/graph_token.ts

@@ -1,4 +1,4 @@
-import type { Handler } from '../function'
+import type { Handler } from '../function/index.js'
 
 /**
  * Declares a function to run on a cron schedule.

src/lib/schedule.ts

@@ -1,5 +1,10 @@
-import { graphRequest } from './graph_request'
-import { getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponseError, HasHeaders } from './graph_token'
+import { graphRequest } from './graph_request.js'
+import {
+  getNetlifyGraphToken,
+  getNetlifyGraphTokenForBuild,
+  GraphTokenResponseError,
+  HasHeaders,
+} from './graph_token.js'
 
 const services = {
   gitHub: null,
@@ -65,12 +70,19 @@ const serviceNormalizeOverrides: ServiceNormalizeOverrides = {
 }
 
 const formatSecrets = (result: GraphSecretsResponse | undefined) => {
-  const responseServices = result?.data?.me?.serviceMetadata?.loggedInServices
-
-  if (!responseServices) {
+  if (
+    !result ||
+    !result.data ||
+    !result.data.me ||
+    !result.data.me.serviceMetadata ||
+    !result.data.me.serviceMetadata.loggedInServices
+  ) {
     return {}
   }
 
+  // TODO use optional chaining once we drop node 12 or lower
+  const responseServices = result.data.me.serviceMetadata.loggedInServices
+
   const newSecrets = responseServices.reduce((acc: NetlifySecrets, service) => {
     const normalized = serviceNormalizeOverrides[service.service] || camelize(service.friendlyServiceName)
     return { ...acc, [normalized]: service }
@@ -134,7 +146,7 @@ const findLoggedInServicesQuery = `query FindLoggedInServicesQuery {
 const getSecretsForToken = async (token: string): Promise<NetlifySecrets> => {
   const body = JSON.stringify({ query: findLoggedInServicesQuery })
 
-  // eslint-disable-next-line node/no-unsupported-features/node-builtins
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins
   const resultBody = await graphRequest(token, new TextEncoder().encode(body))
   const result: GraphSecretsResponse = JSON.parse(resultBody)
 

src/lib/secrets_helper.ts

@@ -1,3 +1,3 @@
-export { builder } from './lib/builder'
-export { schedule } from './lib/schedule'
-export * from './function'
+export { builder } from './lib/builder.js'
+export { schedule } from './lib/schedule.js'
+export * from './function/index.js'

src/main.ts

@@ -1,8 +1,7 @@
 const test = require('ava')
 
-const { builder } = require('../dist/lib/builder')
-
-const { invokeLambda } = require('./helpers/main')
+const { builder } = require('../../dist/lib/builder')
+const { invokeLambda } = require('../helpers/main')
 
 const METADATA_OBJECT = { metadata: { version: 1, builder_function: true, ttl: 0 } }