more strict null checks

pixiebrix · Aug 19, 2024 · e34f806 · e34f806
1 parent 92a618c
commit e34f806
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/pageEditor/hooks/useBuildAndValidateMod.test.ts b/src/pageEditor/hooks/useBuildAndValidateMod.test.ts
@@ -55,7 +55,7 @@ describe("useBuildAndValidateMod", () => {
     modDefinition: UnsavedModDefinition,
   ): StarterBrickDefinitionLike[] {
     return modDefinition.extensionPoints.map(({ id }) => {
-      const definition = modDefinition.definitions[id]
+      const definition = modDefinition.definitions![id]!
         .definition as StarterBrickDefinitionProp;
       return {
         apiVersion: modDefinition.apiVersion,
@@ -112,12 +112,12 @@ describe("useBuildAndValidateMod", () => {
         const starterBricks = selectStarterBricks(modDefinition);
 
         for (let i = 0; i < dirtyModComponentCount; i++) {
-          const starterBrick = starterBricks[i];
+          const starterBrick = starterBricks[i]!;
           // Mock this lookup for the adapter call that follows
           jest.mocked(lookupStarterBrick).mockResolvedValue(starterBrick);
 
           // Mod was activated, so get the mod component from state
-          const modComponent = state.activatedModComponents[i];
+          const modComponent = state.activatedModComponents[i]!;
 
           // Load the adapter for this mod component
           const { fromModComponent } = adapter(starterBrick.definition.type);

diff --git a/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts b/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts
@@ -93,7 +93,7 @@ describe("useCheckModStarterBrickInvariants", () => {
       expectedResult: boolean;
     }) => {
       const modMetadata = modMetadataFactory();
-      let activatedModDefinition: ModDefinition | null = null;
+      let activatedModDefinition: ModDefinition | undefined;
       const activatedFormStates: ModComponentFormState[] = [];
       const newFormStates: ModComponentFormState[] = [];
 
@@ -147,7 +147,7 @@ describe("useCheckModStarterBrickInvariants", () => {
         const activatedModComponent =
           mapModComponentDefinitionToActivatedModComponent({
             modComponentDefinition,
-            modDefinition: activatedModDefinition,
+            modDefinition: activatedModDefinition!,
             optionsArgs: {},
             integrationDependencies: [],
           });

diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -4,6 +4,8 @@
     "strictNullChecks": true
   },
   "files": [
+    "./pageEditor/hooks/useBuildAndValidateMod.test.ts",
+    "./pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts",
     "./pageEditor/hooks/useSaveMod.test.ts",
     "./pageEditor/modals/addBrickModal/AddBrickModal.test.tsx",
     "./pageEditor/modListingPanel/ModListItem.test.tsx",