Fix typescript nulls

Author: aslakhellesoy

.mocharc.json

@@ -2,7 +2,7 @@
   "require": [
     "ts-node/register",
     "source-map-support/register",
-    "./css-modules-hook.js",
+    "./css-modules-hook.cjs",
     "global-jsdom/register"
   ],
   "extension": ["ts", "tsx"],

.storybook/main.js renamed to .storybook/main.cjs

@@ -1,4 +1,4 @@
 
 export const parameters = {
   actions: { argTypesRegex: "^on[A-Z].*" },
-}
+}

.storybook/preview.js renamed to .storybook/preview.cjs

@@ -1,12 +1,12 @@
-FEATURE_FILES = $(sort $(wildcard node_modules/@cucumber/compatibility-kit/javascript/features/**/*.ndjson))
-TS_MESSAGE_FILES = $(patsubst node_modules/@cucumber/compatibility-kit/javascript/features/%.ndjson,acceptance/%.ts,$(FEATURE_FILES))
+FEATURE_FILES = $(sort $(wildcard node_modules/@cucumber/compatibility-kit/features/**/*.ndjson))
+TS_MESSAGE_FILES = $(patsubst node_modules/@cucumber/compatibility-kit/features/%.ndjson,acceptance/%.ts,$(FEATURE_FILES))
 
 default: .codegen .tested
 
 .codegen: $(TS_MESSAGE_FILES)
 
 # Convert an .ndjson file to a .ts file with Envelope objects that can be imported
-acceptance/%.ts: node_modules/@cucumber/compatibility-kit/javascript/features/%.ndjson Makefile
+acceptance/%.ts: node_modules/@cucumber/compatibility-kit/features/%.ndjson Makefile
 	mkdir -p $(@D)
 	echo "// Generated file. Do not edit." > $@
 	echo "export default [" >> $@

Makefile

@@ -11,4 +11,4 @@ hook({
     }).css
   },
   generateScopedName: '[local]__generated',
-});
+});

css-modules-hook.js renamed to css-modules-hook.cjs

@@ -2,8 +2,21 @@
   "name": "@cucumber/react",
   "version": "18.1.2",
   "description": "React components for Cucumber",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
+  "type": "module",
+  "main": "dist/cjs/src/index.js",
+  "types": "dist/cjs/src/index.d.ts",
+  "files": [
+    "dist/cjs",
+    "dist/esm"
+  ],
+  "module": "dist/esm/src/index.js",
+  "jsnext:main": "dist/esm/src/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/src/index.js",
+      "require": "./dist/cjs/src/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cucumber/cucumber.git"

package.json

@@ -8,23 +8,23 @@ export class EnvelopesQuery {
     this.envelopes.push(envelope)
   }
 
-  public find(predicate: (envelope: messages.Envelope) => boolean): messages.Envelope {
+  public find(predicate: (envelope: messages.Envelope) => boolean): messages.Envelope | undefined {
     return this.envelopes.find(predicate)
   }
 
   public filter(predicate: (envelope: messages.Envelope) => boolean): messages.Envelope[] {
     return this.envelopes.filter(predicate)
   }
 
-  public getMeta(): messages.Meta {
+  public getMeta(): messages.Meta | undefined {
     return this.find((envelope) => !!envelope.meta)?.meta
   }
 
-  public getTestRunStarted(): messages.TestRunStarted {
+  public getTestRunStarted(): messages.TestRunStarted | undefined {
     return this.find((envelope) => !!envelope.testRunStarted)?.testRunStarted
   }
 
-  public getTestRunFinished(): messages.TestRunFinished {
+  public getTestRunFinished(): messages.TestRunFinished | undefined {
     return this.find((envelope) => !!envelope.testRunFinished)?.testRunFinished
   }
 }

src/EnvelopesQueryContext.ts

@@ -8,7 +8,7 @@ const defaultQuery = ''
 const defaultHideStatuses: Status[] = []
 
 export interface SearchQueryUpdate {
-  readonly query?: string
+  readonly query?: string | null
   readonly hideStatuses?: readonly Status[]
 }
 
@@ -70,14 +70,14 @@ export function searchFromURLParams(opts?: {
 
 function toSearchQuery(iQuery?: SearchQueryUpdate): SearchQuery {
   return {
-    query: iQuery.query ?? defaultQuery,
-    hideStatuses: iQuery.hideStatuses ?? defaultHideStatuses,
+    query: iQuery?.query ?? defaultQuery,
+    hideStatuses: iQuery?.hideStatuses ?? defaultHideStatuses,
   }
 }
 
 export class SearchQueryCtx implements SearchQuery {
   readonly query: string
-  readonly hideStatuses: readonly Status[] | null
+  readonly hideStatuses: readonly Status[]
   readonly update: (query: SearchQueryUpdate) => void
 
   constructor(value: SearchQuery, updateValue: SearchQueryUpdateFn) {
@@ -92,7 +92,7 @@ export class SearchQueryCtx implements SearchQuery {
   }
 
   static withDefaults = (
-    value: SearchQueryUpdate,
+    value: SearchQueryUpdate = {},
     onSearchQueryUpdated: SearchQueryUpdateFn = () => {
       //Do nothing
     }
@@ -107,9 +107,9 @@ export function useSearchQueryCtx(props: SearchQueryProps): SearchQueryCtx {
     searchQuery,
     props.onSearchQueryUpdated
       ? (query) => {
-          props.onSearchQueryUpdated(query)
-          setSearchQuery(query)
-        }
+        props.onSearchQueryUpdated && props.onSearchQueryUpdated(query)
+        setSearchQuery(query)
+      }
       : setSearchQuery
   )
 }

src/SearchQueryContext.ts

@@ -1,3 +1,3 @@
 import React from 'react'
 
-export default React.createContext(null as string)
+export default React.createContext<null|string>(null)

src/UriContext.ts

@@ -11,7 +11,7 @@ interface IProps {
 export const CICommitLink: React.FunctionComponent<IProps> = ({ ci: ci }) => {
   const commitLink = ciCommitLink(ci)
 
-  if (commitLink) {
+  if (commitLink && ci.git?.remote) {
     return (
       <>
         <FontAwesomeIcon icon={faLink} />
@@ -21,7 +21,7 @@ export const CICommitLink: React.FunctionComponent<IProps> = ({ ci: ci }) => {
   }
   return (
     <>
-      <FontAwesomeIcon icon={faLink} /> {ci.git.revision.substring(0, 7)}
+      <FontAwesomeIcon icon={faLink} /> {ci.git?.revision.substring(0, 7)}
     </>
   )
 }