fix: stricter validation/reorder analysis steps

Author: techpixel

background/src/index.ts

@@ -56,23 +56,26 @@ function parseRecord(record: Airtable.Record<Airtable.FieldSet>) {
     let data: any;
     try {
         data = websiteJson ? JSON.parse(websiteJson) : {};
-        
-        if (websiteActive) {
-            if (data.version !== VERSION) {
-                data = { error: "Your JSON is outdated. Please update it!" };
-            } else {
-                const validationErrors = validateSatelliteContent(data);
-                if (validationErrors.length > 0) {
-                    console.error(`Validation errors for slug ${slug}: ${validationErrors.join(', ')}`);
-                    data = { error: `Invalid JSON structure: ${validationErrors.join(', ')}` };
-                }
-            }
-        }
     } catch (error) {
         console.error(`Error parsing JSON for slug ${slug}: ${error}`);
         data = { error: "Error parsing JSON. Make sure the JSON is valid!" };
     }
 
+    if (websiteActive && !data.error) {
+        try {
+            const validationErrors = validateSatelliteContent(data);
+            if (validationErrors.length > 0) {
+                console.error(`Validation errors for slug ${slug}: ${validationErrors.join(', ')}`);
+                data = { error: `Invalid JSON structure: ${validationErrors.join(', ')}` };
+            } else if (data.version !== VERSION) {
+                data = { error: "Your JSON is outdated. Please update it!" };
+            }
+        } catch (error) {
+            console.error(`Unexpected validation error for slug ${slug}: ${error}`);
+            data = { error: "Unexpected error during validation." };
+        }
+    }
+
     if (status === 'Canceled') {
         data.cancelled = true;
     }

background/src/satellite.ts

@@ -16,7 +16,7 @@ export const SatelliteContentSchema = z.object({
             ctaSecondarySuffix: z.string(),
             videoLabel: z.string().optional(),
             mapLabel: z.string(),
-        }),
+        }).strict(),
         nav: z.record(z.string(), z.string()),
         steps: z.object({
             stepLabel: z.string().optional(),
@@ -25,7 +25,7 @@ export const SatelliteContentSchema = z.object({
             step3: z.string(),
             step4: z.string(),
             guideButton: z.string(),
-        }),
+        }).strict(),
         letter: z.object({
             greeting: z.string(),
             paragraph1: z.string(),
@@ -34,16 +34,16 @@ export const SatelliteContentSchema = z.object({
             paragraph4: z.string(),
             closing: z.string(),
             signature: z.string(),
-        }),
+        }).strict(),
         schedule: z.object({
             title: z.string(),
-        }),
+        }).strict(),
         sponsors: z.object({
             title: z.string(),
-        }),
+        }).strict(),
         signatures: z.object({
             title: z.string(),
-        }),
+        }).strict(),
         footer: z.object({
             tagline: z.string(),
             copyright: z.string(),
@@ -52,35 +52,35 @@ export const SatelliteContentSchema = z.object({
             links: z.array(z.object({
                 text: z.string(),
                 href: z.string(),
-            })),
-        }),
-    }),
+            }).strict()),
+        }).strict(),
+    }).strict(),
     event: z.object({
         city: z.string(),
         date: z.string(),
         venue: z.object({
             name: z.string(),
             link: z.string(),
-        }),
+        }).strict(),
         schedule: z.object({
             days: z.array(z.object({
                 date: z.string(),
                 items: z.array(z.object({
                     time: z.string(),
                     activity: z.string(),
-                })),
-            })),
-        }),
+                }).strict()),
+            }).strict()),
+        }).strict(),
         sponsors: z.object({
             cards: z.array(z.object({
                 sponsor: z.string(),
                 logo: z.string(),
                 link: z.string(),
-            })),
-        }),
+            }).strict()),
+        }).strict(),
         signatures: z.union([
             z.literal(false),
-            z.object({ img: z.string() }),
+            z.object({ img: z.string() }).strict(),
         ]).optional(),
         faq: z.object({
             title: z.string(),
@@ -89,26 +89,26 @@ export const SatelliteContentSchema = z.object({
                 questions: z.array(z.object({
                     question: z.string(),
                     answer: z.string(),
-                })),
+                }).strict()),
                 buttonText: z.string(),
                 buttonLink: z.string().optional()
-            }),
+            }).strict(),
             organizer: z.object({
                 title: z.string(),
                 questions: z.array(z.object({
                     question: z.string(),
                     answer: z.string(),
-                })),
+                }).strict()),
                 buttonText: z.string(),
                 buttonLink: z.string().optional()
-            }).optional(),
-        }),
+            }).strict().optional(),
+        }).strict(),
         contactUs: z.object({
             email: z.string().optional(),
             instagram: z.string().optional(),
             linkedin: z.string().optional(),
-        }).optional(),
-    }),
-});
+        }).strict().optional(),
+    }).strict(),
+}).strict();
 
 export type SatelliteContent = z.infer<typeof SatelliteContentSchema>;