Merge remote-tracking branch 'origin/codex/batch14-react-chart-payload-guard' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit abe685b2 parents 9b540fd 9e84f991 file · +9 −10Browse files

Unified · Split

 }
 // Helper to extract item config from a payload.
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value);
 function getPayloadConfigFromPayload(config: ChartConfig, payload: unknown, key: string) {
-  if (typeof payload !== "object" || payload === null) {
+  if (!isRecord(payload)) {
     return undefined;
   }
-  const payloadPayload =
+  const payloadPayload = isRecord(payload.payload) ? payload.payload : undefined;
-    "payload" in payload && typeof payload.payload === "object" && payload.payload !== null
-      ? payload.payload
-      : undefined;
   let configLabelKey: string = key;
-  if (key in payload && typeof payload[key as keyof typeof payload] === "string") {
+  if (typeof payload[key] === "string") {
-    configLabelKey = payload[key as keyof typeof payload] as string;
+    configLabelKey = payload[key];
   } else if (
     payloadPayload &&
-    key in payloadPayload &&
+    typeof payloadPayload[key] === "string"
-    typeof payloadPayload[key as keyof typeof payloadPayload] === "string"
   ) {
-    configLabelKey = payloadPayload[key as keyof typeof payloadPayload] as string;
+    configLabelKey = payloadPayload[key];
   }
   return configLabelKey in config ? config[configLabelKey] : config[key];

Keyboard shortcuts