Fix type error and explicitly type error map

gatsbyjs · Mar 13, 2020 · bb22972 · bb22972
1 parent 4f7b7a3
commit bb22972
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/gatsby-cli/src/structured-errors/construct-error.ts b/packages/gatsby-cli/src/structured-errors/construct-error.ts
@@ -1,12 +1,12 @@
 import Joi from "@hapi/joi"
 import stackTrace from "stack-trace"
 import errorSchema from "./error-schema"
-import { errorMap, defaultError, IErrorMapEntry } from "./error-map"
+import { errorMap, defaultError, IErrorMapEntry, ErrorId } from "./error-map"
 import { sanitizeStructuredStackTrace } from "../reporter/errors"
 
 interface IConstructError {
   details: {
-    id?: keyof typeof errorMap
+    id?: ErrorId
     context?: Record<string, string>
     error?: string
     [key: string]: unknown

diff --git a/packages/gatsby-cli/src/structured-errors/error-map.ts b/packages/gatsby-cli/src/structured-errors/error-map.ts
@@ -28,7 +28,7 @@ const optionalGraphQLInfo = (context: IOptionalGraphQLInfoContext): string =>
     context.plugin ? `\nPlugin: ${context.plugin}` : ``
   }`
 
-export const errorMap = {
+const errors = {
   "": {
     text: (context): string => {
       const sourceMessage = context.sourceMessage
@@ -430,7 +430,7 @@ export const errorMap = {
       ]
         .filter(Boolean)
         .join(`\n`),
-    level: `ERROR`,
+    level: Level.ERROR,
   },
   // node object didn't pass validation
   "11467": {
@@ -486,6 +486,10 @@ export const errorMap = {
   },
 }
 
+export type ErrorId = keyof typeof errors
+
+export const errorMap: Record<ErrorId, IErrorMapEntry> = errors
+
 export const defaultError = errorMap[``]
 
 export interface IErrorMapEntry {