make config more strict by adding no unchecked index access to tsconfig

birdwingo · Nov 7, 2023 · a43b41b · a43b41b
1 parent 2fc8772
commit a43b41b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 21 deletions.
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
@@ -14,7 +14,7 @@ const StoryImage: FC<StoryImageProps> = ( {
   onImageLayout, onLoad,
 } ) => {
 
-  const [ data, setData ] = useState<{ uri: string, isVideo?: boolean }>(
+  const [ data, setData ] = useState<{ uri: string | undefined, isVideo?: boolean }>(
     { uri: defaultImage, isVideo: isDefaultVideo },
   );
 

diff --git a/src/components/InstagramStories/index.tsx b/src/components/InstagramStories/index.tsx
@@ -76,6 +76,12 @@ const InstagramStories = forwardRef<InstagramStoriesPublicMethods, InstagramStor
       );
       const seenStory = story.stories[seenStoryIndex + 1] || story.stories[0];
 
+      if ( !seenStory ) {
+
+        return true;
+
+      }
+
       return seenStory.mediaType !== 'video' ? Image.prefetch( seenStory.sourceUrl ) : true;
 
     } );

diff --git a/src/components/List/index.tsx b/src/components/List/index.tsx
@@ -49,8 +49,8 @@ const StoryList: FC<StoryListProps> = ( {
         <StoryImage
           stories={stories}
           activeStory={activeStory}
-          defaultImage={stories[lastSeenIndex + 1]?.sourceUrl ?? stories[0].sourceUrl}
-          isDefaultVideo={( stories[lastSeenIndex + 1]?.mediaType ?? stories[0].mediaType ) === 'video'}
+          defaultImage={stories[lastSeenIndex + 1]?.sourceUrl ?? stories[0]?.sourceUrl}
+          isDefaultVideo={( stories[lastSeenIndex + 1]?.mediaType ?? stories[0]?.mediaType ) === 'video'}
           onImageLayout={onImageLayout}
           onLoad={onImageLoad}
           paused={paused}

diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
@@ -37,12 +37,12 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
   const userId = useDerivedValue( () => stories[userIndex.value]?.id );
   const previousUserId = useDerivedValue( () => stories[userIndex.value - 1]?.id );
   const nextUserId = useDerivedValue( () => stories[userIndex.value + 1]?.id );
-  const previousStory = useDerivedValue(
-    () => stories[userIndex.value]?.stories[storyIndex.value - 1]?.id,
-  );
-  const nextStory = useDerivedValue(
-    () => stories[userIndex.value]?.stories[storyIndex.value + 1]?.id,
-  );
+  const previousStory = useDerivedValue( () => ( storyIndex.value !== undefined
+    ? stories[userIndex.value]?.stories[storyIndex.value - 1]?.id
+    : undefined ) );
+  const nextStory = useDerivedValue( () => ( storyIndex.value !== undefined
+    ? stories[userIndex.value]?.stories[storyIndex.value + 1]?.id
+    : undefined ) );
 
   const animatedStyles = useAnimatedStyle( () => ( { top: y.value } ) );
   const backgroundAnimatedStyles = useAnimatedStyle( () => ( {
@@ -91,7 +91,12 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
     } else {
 
       animation.value = 0;
-      runOnJS( onSeenStoriesChange )( userId.value, currentStory.value );
+
+      if ( userId.value !== undefined && currentStory.value !== undefined ) {
+
+        runOnJS( onSeenStoriesChange )( userId.value, currentStory.value );
+
+      }
 
     }
 
@@ -111,7 +116,8 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
       ( story ) => story.id === seenStories.value[id],
     );
     const userStories = stories[newUserIndex]?.stories;
-    currentStory.value = userStories[newStoryIndex + 1]?.id ?? userStories[0]?.id;
+    currentStory.value = newStoryIndex !== undefined
+      ? userStories?.[newStoryIndex + 1]?.id ?? userStories?.[0]?.id : undefined;
 
   };
 
@@ -236,7 +242,11 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
         }
 
         const newUserId = stories[Math.round( newX / WIDTH )]?.id;
-        scrollTo( newUserId );
+        if ( newUserId !== undefined ) {
+
+          scrollTo( newUserId );
+
+        }
 
       } else if ( ctx.pressedAt + LONG_PRESS_DURATION < Date.now() ) {
 
@@ -266,12 +276,16 @@ const StoryModal = forwardRef<StoryModalPublicMethods, StoryModalProps>( ( {
 
     if ( visible ) {
 
-      onShow?.( currentStory.value );
+      if ( currentStory.value !== undefined ) {
+
+        onShow?.( currentStory.value );
+
+      }
       onLoad?.();
 
       y.value = withTiming( 0, ANIMATION_CONFIG );
 
-    } else {
+    } else if ( currentStory.value !== undefined ) {
 
       onHide?.( currentStory.value );
 

diff --git a/src/core/dto/componentsDTO.ts b/src/core/dto/componentsDTO.ts
@@ -58,8 +58,8 @@ export interface AnimationProps {
 
 export interface StoryImageProps {
   stories: InstagramStoryProps['stories'];
-  activeStory: SharedValue<string>;
-  defaultImage: string;
+  activeStory: SharedValue<string | undefined>;
+  defaultImage: string | undefined;
   isDefaultVideo: boolean;
   paused: SharedValue<boolean>;
   videoProps?: any;
@@ -97,14 +97,14 @@ export interface IconProps {
 export interface StoryContentProps {
   stories: InstagramStoryProps['stories'];
   active: SharedValue<boolean>;
-  activeStory: SharedValue<string>;
+  activeStory: SharedValue<string | undefined>;
 }
 
 export interface StoryListProps extends InstagramStoryProps, StoryHeaderProps {
   index: number;
   x: SharedValue<number>;
-  activeUser: SharedValue<string>;
-  activeStory: SharedValue<string>;
+  activeUser: SharedValue<string | undefined>;
+  activeStory: SharedValue<string | undefined>;
   progress: SharedValue<number>;
   seenStories: SharedValue<ProgressStorageProps>;
   paused: SharedValue<boolean>;

diff --git a/tsconfig.json b/tsconfig.json
@@ -27,7 +27,8 @@
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "skipLibCheck": false,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "noUncheckedIndexedAccess": true
   },
   "include": [
     "src/**/*.ts",
@@ -41,4 +42,4 @@
     "jest.config.js",
     "commitlint.config.js",
   ]
-}
+}