@nativesquare/soma 0.14.0 → 0.16.0

package/src/{healthkit → component/healthkit}/index.ts

@@ -1,59 +1,46 @@
-// ─── @nativesquare/soma/healthkit ─────────────────────────────────────────────
-// Apple HealthKit → Soma schema transformers.
-//
-// Pure TypeScript functions with zero runtime dependencies.
-// Compatible with any HealthKit library (react-native-health, expo-health, etc.)
-
-// ── Transformers ─────────────────────────────────────────────────────────────
-export { transformWorkout } from "./activity.js";
-export type { ActivityData } from "./activity.js";
-
-export { transformSleep } from "./sleep.js";
-export type { SleepData } from "./sleep.js";
-
-export { transformBody } from "./body.js";
-export type { BodyData } from "./body.js";
-
-export { transformDaily, transformDailyFromSummary } from "./daily.js";
-export type { DailyData } from "./daily.js";
-
-export { transformNutrition } from "./nutrition.js";
-export type { NutritionData } from "./nutrition.js";
-
-export { transformMenstruation } from "./menstruation.js";
-export type { MenstruationData } from "./menstruation.js";
-
-export { transformAthlete } from "./athlete.js";
-export type { AthleteData } from "./athlete.js";
-
-// ── Enum Maps ────────────────────────────────────────────────────────────────
-export { mapActivityType } from "./maps/activity-type.js";
-export { mapSleepLevel, isAsleepCategory } from "./maps/sleep-level.js";
-export { mapMenstruationFlow } from "./maps/menstruation-flow.js";
-
-// ── Types ────────────────────────────────────────────────────────────────────
-export type {
-  HKQuantitySample,
-  HKCategorySample,
-  HKWorkout,
-  HKWorkoutRoute,
-  HKActivitySummary,
-  HKDevice,
-  HKSource,
-  HKCharacteristics,
-  HKBiologicalSex,
-  HKQuantityTypeIdentifier,
-  HKCategoryTypeIdentifier,
-  HKSleepCategoryValue,
-  HKMenstrualFlowCategoryValue,
-} from "./types.js";
-
-export { HKSleepCategory, HKMenstrualFlowCategory } from "./types.js";
-
-// ── Utilities ────────────────────────────────────────────────────────────────
-export {
-  diffSeconds,
-  dayRange,
-  sampleTimeRange,
-  buildDeviceData,
-} from "./utils.js";
+// ─── @nativesquare/soma/healthkit ─────────────────────────────────────────────
+// Apple HealthKit → Soma schema transformers.
+//
+// Pure TypeScript functions with zero runtime dependencies.
+// Compatible with any HealthKit library (react-native-health, expo-health, etc.)
+
+// ── Transformers ─────────────────────────────────────────────────────────────
+export { transformWorkout } from "./transform/activity.js";
+export { transformSleep } from "./transform/sleep.js";
+export { transformBody } from "./transform/body.js";
+export { transformDaily, transformDailyFromSummary } from "./transform/daily.js";
+export { transformNutrition } from "./transform/nutrition.js";
+export { transformMenstruation } from "./transform/menstruation.js";
+export { transformAthlete } from "./transform/athlete.js";
+
+// ── Enum Maps ────────────────────────────────────────────────────────────────
+export { mapActivityType } from "./transform/maps/activityType.js";
+export { mapSleepLevel, isAsleepCategory } from "./transform/maps/sleepLevel.js";
+export { mapMenstruationFlow } from "./transform/maps/menstruationFlow.js";
+
+// ── Types ────────────────────────────────────────────────────────────────────
+export type {
+  HKQuantitySample,
+  HKCategorySample,
+  HKWorkout,
+  HKWorkoutRoute,
+  HKActivitySummary,
+  HKDevice,
+  HKSource,
+  HKCharacteristics,
+  HKBiologicalSex,
+  HKQuantityTypeIdentifier,
+  HKCategoryTypeIdentifier,
+  HKSleepCategoryValue,
+  HKMenstrualFlowCategoryValue,
+} from "./types.js";
+
+export { HKSleepCategory, HKMenstrualFlowCategory } from "./types.js";
+
+// ── Utilities ────────────────────────────────────────────────────────────────
+export {
+  diffSeconds,
+  dayRange,
+  sampleTimeRange,
+  buildDeviceData,
+} from "./transform/utils.js";

package/src/component/healthkit/transform/activity.ts

@@ -0,0 +1,115 @@
+// ─── Activity Transformer ────────────────────────────────────────────────────
+// Transforms an Apple HealthKit HKWorkout into the Soma Activity schema shape.
+
+import type { HKWorkout } from "../types.js";
+import type { SomaActivity } from "../../validators/activity.js";
+import { mapActivityType } from "./maps/activityType.js";
+import { buildDeviceData } from "./utils.js";
+
+/**
+ * Transform an HKWorkout into a Soma Activity document shape.
+ *
+ * The returned object is ready to be spread into an `ingestActivity` call
+ * alongside `connectionId` and `userId`.
+ *
+ * @param workout - The HKWorkout from HealthKit
+ * @returns Soma Activity fields (without connectionId/userId)
+ *
+ * @example
+ * ```ts
+ * const data = transformWorkout(hkWorkout);
+ * await soma.ingestActivity(ctx, { connectionId, userId, ...data });
+ * ```
+ */
+export function transformWorkout(workout: HKWorkout): SomaActivity {
+  const heartRateSamples = workout.heartRateSamples;
+  const hrValues = heartRateSamples?.map((s) => s.value) ?? [];
+
+  return {
+    metadata: {
+      summary_id: workout.uuid,
+      start_time: workout.startDate,
+      end_time: workout.endDate,
+      type: mapActivityType(workout.workoutActivityType),
+      upload_type: 1 as const, // Automatic
+      name: undefined as string | undefined,
+    },
+
+    active_durations_data: {
+      activity_seconds: workout.duration,
+    },
+
+    calories_data:
+      workout.totalEnergyBurned != null
+        ? {
+          total_burned_calories: workout.totalEnergyBurned,
+        }
+        : undefined,
+
+    device_data: buildDeviceData(workout.source, workout.device),
+
+    distance_data:
+      workout.totalDistance != null ||
+        workout.totalSwimmingStrokeCount != null ||
+        workout.totalFlightsClimbed != null
+        ? {
+          summary: {
+            distance_meters: workout.totalDistance,
+            steps: undefined as number | undefined,
+            floors_climbed: workout.totalFlightsClimbed,
+            swimming:
+              workout.totalSwimmingStrokeCount != null
+                ? { num_strokes: workout.totalSwimmingStrokeCount }
+                : undefined,
+          },
+        }
+        : undefined,
+
+    heart_rate_data:
+      heartRateSamples && heartRateSamples.length > 0
+        ? {
+          detailed: {
+            hr_samples: heartRateSamples.map((s) => ({
+              timestamp: s.startDate,
+              bpm: s.value,
+            })),
+          },
+          summary: {
+            avg_hr_bpm:
+              hrValues.length > 0
+                ? hrValues.reduce((a, b) => a + b, 0) / hrValues.length
+                : undefined,
+            max_hr_bpm:
+              hrValues.length > 0 ? Math.max(...hrValues) : undefined,
+            min_hr_bpm:
+              hrValues.length > 0 ? Math.min(...hrValues) : undefined,
+          },
+        }
+        : undefined,
+
+    position_data:
+      workout.routeData && workout.routeData.length > 0
+        ? {
+          position_samples: workout.routeData.flatMap((route) =>
+            route.locations.map((loc) => ({
+              timestamp: loc.timestamp,
+              coords_lat_lng_deg: [loc.latitude, loc.longitude],
+            })),
+          ),
+          start_pos_lat_lng_deg: (() => {
+            const first = workout.routeData[0]?.locations[0];
+            return first
+              ? [first.latitude, first.longitude]
+              : undefined;
+          })(),
+          end_pos_lat_lng_deg: (() => {
+            const lastRoute =
+              workout.routeData[workout.routeData.length - 1];
+            const last =
+              lastRoute?.locations[lastRoute.locations.length - 1];
+            return last ? [last.latitude, last.longitude] : undefined;
+          })(),
+        }
+        : undefined,
+  };
+}

package/src/{healthkit → component/healthkit/transform}/athlete.ts

@@ -2,12 +2,8 @@
 // Transforms Apple HealthKit user characteristics into the Soma Athlete schema.
 // NOTE: HealthKit exposes very limited profile data compared to other providers.
 
-import type { HKCharacteristics } from "./types.js";
-
-/**
- * The output shape of {@link transformAthlete}.
- */
-export type AthleteData = ReturnType<typeof transformAthlete>;
+import type { SomaAthlete } from "../../validators/athlete.js";
+import type { HKCharacteristics } from "../types.js";
 
 /**
  * Transform HealthKit user characteristics into a Soma Athlete document shape.
@@ -25,7 +21,7 @@ export type AthleteData = ReturnType<typeof transformAthlete>;
  * await soma.ingestAthlete(ctx, { connectionId, userId, ...data });
  * ```
  */
-export function transformAthlete(characteristics: HKCharacteristics) {
+export function transformAthlete(characteristics: HKCharacteristics): SomaAthlete {
   const sexMap: Record<string, string> = {
     female: "female",
     male: "male",
@@ -35,7 +31,7 @@ export function transformAthlete(characteristics: HKCharacteristics) {
   return {
     sex:
       characteristics.biologicalSex &&
-      characteristics.biologicalSex !== "notSet"
+        characteristics.biologicalSex !== "notSet"
         ? sexMap[characteristics.biologicalSex]
         : undefined,
     date_of_birth: characteristics.dateOfBirth,

package/src/{healthkit → component/healthkit/transform}/body.ts

@@ -1,7 +1,8 @@
 // ─── Body Transformer ────────────────────────────────────────────────────────
 // Transforms Apple HealthKit body-related quantity samples into the Soma Body schema.
 
-import type { HKQuantitySample } from "./types.js";
+import type { HKQuantitySample } from "../types.js";
+import type { SomaBody } from "../../validators/body.js";
 import {
   filterByType,
   avgValue,
@@ -11,11 +12,6 @@ import {
   buildDeviceData,
 } from "./utils.js";
 
-/**
- * The output shape of {@link transformBody}.
- */
-export type BodyData = ReturnType<typeof transformBody>;
-
 /**
  * Transform a mixed array of HealthKit body-related quantity samples into a
  * Soma Body document shape.
@@ -37,7 +33,7 @@ export type BodyData = ReturnType<typeof transformBody>;
 export function transformBody(
   samples: HKQuantitySample[],
   timeRange?: { start_time: string; end_time: string },
-) {
+): SomaBody {
   const range = timeRange ?? sampleTimeRange(samples);
 
   // ── Heart rate ─────────────────────────────────────────────────────────

package/src/{healthkit → component/healthkit/transform}/daily.ts

@@ -1,7 +1,8 @@
 // ─── Daily Transformer ───────────────────────────────────────────────────────
 // Transforms Apple HealthKit daily activity data into the Soma Daily schema.
 
-import type { HKQuantitySample, HKActivitySummary } from "./types.js";
+import type { HKQuantitySample, HKActivitySummary } from "../types.js";
+import type { SomaDaily } from "../../validators/daily.js";
 import {
   filterByType,
   sumValues,
@@ -11,13 +12,6 @@ import {
   buildDeviceData,
 } from "./utils.js";
 
-/**
- * The output shape of {@link transformDaily} and {@link transformDailyFromSummary}.
- */
-export type DailyData =
-  | ReturnType<typeof transformDaily>
-  | ReturnType<typeof transformDailyFromSummary>;
-
 /**
  * Transform an array of HealthKit quantity samples for a single day into a
  * Soma Daily document shape.
@@ -39,7 +33,7 @@ export type DailyData =
 export function transformDaily(
   samples: HKQuantitySample[],
   timeRange?: { start_time: string; end_time: string },
-) {
+): SomaDaily {
   const range = timeRange ?? sampleTimeRange(samples);
 
   // ── Activity samples ───────────────────────────────────────────────────
@@ -222,7 +216,7 @@ export function transformDaily(
  * @param summary - The HKActivitySummary from HealthKit
  * @returns Soma Daily fields (without connectionId/userId)
  */
-export function transformDailyFromSummary(summary: HKActivitySummary) {
+export function transformDailyFromSummary(summary: HKActivitySummary): SomaDaily {
   const range = dayRange(summary.dateComponents);
 
   return {

package/src/{healthkit/maps/menstruation-flow.ts → component/healthkit/transform/maps/menstruationFlow.ts}

@@ -4,7 +4,7 @@
 // HK values: https://developer.apple.com/documentation/healthkit/hkcategoryvaluemenstrualflow
 // Terra MenstruationFlow: 0=UNKNOWN, 1=NONE, 2=LIGHT, 3=MEDIUM, 4=HEAVY, 5=HAD
 
-import { HKMenstrualFlowCategory } from "../types.js";
+import { HKMenstrualFlowCategory } from "../../types.js";
 
 const menstruationFlowMap: Record<number, number> = {
   [HKMenstrualFlowCategory.Unspecified]: 5, // Unspecified → HAD (flow occurred, amount unknown)

package/src/{healthkit/maps/sleep-level.ts → component/healthkit/transform/maps/sleepLevel.ts}

@@ -4,7 +4,7 @@
 // HK values: https://developer.apple.com/documentation/healthkit/hkcategoryvaluesleepanalysis
 // Terra SleepLevel: 0=Unknown, 1=Awake, 2=Sleeping, 3=OutOfBed, 4=Light, 5=Deep, 6=REM
 
-import { HKSleepCategory } from "../types.js";
+import { HKSleepCategory } from "../../types.js";
 
 const sleepLevelMap: Record<number, number> = {
   [HKSleepCategory.InBed]: 2, // InBed → Sleeping (generic)

package/src/{healthkit → component/healthkit/transform}/menstruation.ts

@@ -1,15 +1,11 @@
 // ─── Menstruation Transformer ─────────────────────────────────────────────────
 // Transforms Apple HealthKit menstrual flow samples into the Soma Menstruation schema.
 
-import type { HKCategorySample } from "./types.js";
-import { mapMenstruationFlow } from "./maps/menstruation-flow.js";
+import type { HKCategorySample } from "../types.js";
+import type { SomaMenstruation } from "../../validators/menstruation.js";
+import { mapMenstruationFlow } from "./maps/menstruationFlow.js";
 import { sampleTimeRange } from "./utils.js";
 
-/**
- * The output shape of {@link transformMenstruation}.
- */
-export type MenstruationData = ReturnType<typeof transformMenstruation>;
-
 /**
  * Transform an array of HealthKit menstrual flow category samples into a
  * Soma Menstruation document shape.
@@ -27,7 +23,7 @@ export type MenstruationData = ReturnType<typeof transformMenstruation>;
 export function transformMenstruation(
   samples: HKCategorySample[],
   timeRange?: { start_time: string; end_time: string },
-) {
+): SomaMenstruation {
   if (samples.length === 0) {
     throw new Error(
       "transformMenstruation requires at least one menstrual flow sample",

package/src/{healthkit → component/healthkit/transform}/nutrition.ts

@@ -1,14 +1,10 @@
 // ─── Nutrition Transformer ────────────────────────────────────────────────────
 // Transforms Apple HealthKit dietary quantity samples into the Soma Nutrition schema.
 
-import type { HKQuantitySample } from "./types.js";
+import type { HKQuantitySample } from "../types.js";
+import type { SomaNutrition } from "../../validators/nutrition.js";
 import { filterByType, sumValues, sampleTimeRange } from "./utils.js";
 
-/**
- * The output shape of {@link transformNutrition}.
- */
-export type NutritionData = ReturnType<typeof transformNutrition>;
-
 /**
  * Transform an array of HealthKit dietary quantity samples into a
  * Soma Nutrition document shape.
@@ -30,7 +26,7 @@ export type NutritionData = ReturnType<typeof transformNutrition>;
 export function transformNutrition(
   samples: HKQuantitySample[],
   timeRange?: { start_time: string; end_time: string },
-) {
+): SomaNutrition {
   const range = timeRange ?? sampleTimeRange(samples);
 
   const sum = (type: string) => {

package/src/{healthkit → component/healthkit/transform}/sleep.ts

@@ -1,16 +1,12 @@
 // ─── Sleep Transformer ───────────────────────────────────────────────────────
 // Transforms Apple HealthKit sleep analysis samples into the Soma Sleep schema.
 
-import type { HKCategorySample } from "./types.js";
-import { HKSleepCategory } from "./types.js";
-import { mapSleepLevel, isAsleepCategory } from "./maps/sleep-level.js";
+import type { HKCategorySample } from "../types.js";
+import type { SomaSleep } from "../../validators/sleep.js";
+import { HKSleepCategory } from "../types.js";
+import { mapSleepLevel, isAsleepCategory } from "./maps/sleepLevel.js";
 import { diffSeconds, buildDeviceData } from "./utils.js";
 
-/**
- * The output shape of {@link transformSleep}.
- */
-export type SleepData = ReturnType<typeof transformSleep>;
-
 /**
  * Transform an array of HealthKit sleep analysis category samples into a
  * Soma Sleep document shape.
@@ -29,7 +25,7 @@ export type SleepData = ReturnType<typeof transformSleep>;
  * await soma.ingestSleep(ctx, { connectionId, userId, ...data });
  * ```
  */
-export function transformSleep(samples: HKCategorySample[]) {
+export function transformSleep(samples: HKCategorySample[]): SomaSleep {
   if (samples.length === 0) {
     throw new Error("transformSleep requires at least one sleep sample");
   }

package/src/{healthkit → component/healthkit/transform}/utils.ts

@@ -1,7 +1,7 @@
 // ─── Shared Utilities ────────────────────────────────────────────────────────
 // Pure helper functions used across HealthKit transformer modules.
 
-import type { HKDevice, HKQuantitySample, HKSource } from "./types.js";
+import type { HKDevice, HKQuantitySample, HKSource } from "../types.js";
 
 /**
  * Compute the difference in seconds between two ISO-8601 timestamps.

package/src/component/strava/public.ts

@@ -21,7 +21,7 @@ import {
 } from "./auth.js";
 import { transformActivity } from "./transform/activity.js";
 import { transformAthlete } from "./transform/athlete.js";
-import type { SomaError } from "../validators/shared.js";
+import type { SomaError, SomaErrorType } from "../validators/shared.js";
 
 // ─── OAuth ──────────────────────────────────────────────────────────────────
 
@@ -153,8 +153,8 @@ export const disconnectStrava = action({
           headers: { "Content-Type": "application/x-www-form-urlencoded" },
           body: `access_token=${tokenDoc.accessToken}`,
         });
-      } catch {
-        // Deauthorization is best-effort — clean up locally regardless
+      } catch (err) {
+        console.warn("[strava:disconnect] Best-effort deauthorization failed:", err instanceof Error ? err.message : err);
       }
 
       // 3. Delete stored tokens
@@ -303,9 +303,10 @@ export const pullAll = action({
       clientId: args.clientId,
       clientSecret: args.clientSecret,
     };
-    const pullFns = [
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const pullFns: Array<{ ref: any; name: SomaErrorType; args: Record<string, unknown> }> = [
       { ref: api.strava.public.pullAthlete, name: "athlete", args: sharedArgs },
-      { ref: api.strava.public.pullActivities, name: "activities", args: { ...sharedArgs, after: args.after, before: args.before } },
+      { ref: api.strava.public.pullActivities, name: "activity", args: { ...sharedArgs, after: args.after, before: args.before } },
     ];
     const synced: Record<string, number> = {};
     const errors: SomaError[] = [];

package/src/component/strava/webhooks.ts

@@ -17,7 +17,7 @@ import {
 } from "./types/stravaApi/sdk.gen.js";
 import { transformActivity } from "./transform/activity.js";
 import { transformAthlete } from "./transform/athlete.js";
-import type { SomaError } from "../validators/shared.js";
+import type { SomaError, SomaErrorType, WebhookResult } from "../validators/shared.js";
 
 // ─── Schema ─────────────────────────────────────────────────────────────────
 
@@ -41,10 +41,8 @@ const VALID_EVENT_NAMES = new Set([
   "athlete-deauthorize",
 ]);
 
-type WebhookResult = {
-  errors: SomaError[];
-  items: Array<{ connectionId: string; userId: string; data: Record<string, unknown> | null }>;
-};
+// Strava webhooks use WebhookResult with nullable data (for delete/deauthorize events).
+type StravaWebhookResult = WebhookResult<Record<string, unknown> | null>;
 
 // ─── Handler ────────────────────────────────────────────────────────────────
 
@@ -55,7 +53,7 @@ export const handleStravaWebhook = action({
     clientSecret: v.string(),
     autoIngest: v.optional(v.boolean()),
   },
-  handler: async (ctx, args): Promise<WebhookResult> => {
+  handler: async (ctx, args): Promise<StravaWebhookResult> => {
     const payload = stravaWebhookPayloadSchema.parse(args.payload);
     const { clientId, clientSecret } = args;
     const shouldIngest = args.autoIngest !== false;
@@ -74,7 +72,7 @@ export const handleStravaWebhook = action({
     if (!connection) {
       return {
         errors: [{
-          type: payload.object_type,
+          type: payload.object_type as SomaErrorType,
           id: String(payload.object_id),
           message: `No Soma connection found for Strava owner_id "${payload.owner_id}". ` +
             "The user may need to reconnect to populate the provider user ID.",
@@ -87,7 +85,7 @@ export const handleStravaWebhook = action({
     if (!connection.active && eventName !== "athlete-deauthorize") {
       return {
         errors: [{
-          type: payload.object_type,
+          type: payload.object_type as SomaErrorType,
           id: String(payload.object_id),
           message: `Strava connection for owner_id "${payload.owner_id}" is inactive`,
         }],
@@ -141,7 +139,7 @@ async function handleActivityCreateOrUpdate(
     clientSecret: string;
     shouldIngest: boolean;
   },
-): Promise<WebhookResult> {
+): Promise<StravaWebhookResult> {
   const errors: SomaError[] = [];
 
   let accessToken: string;
@@ -219,7 +217,7 @@ async function handleAthleteUpdate(
     clientSecret: string;
     shouldIngest: boolean;
   },
-): Promise<WebhookResult> {
+): Promise<StravaWebhookResult> {
   let accessToken: string;
   try {
     const resolved = await ctx.runAction(
@@ -283,7 +281,7 @@ async function handleAthleteDeauthorize(
     userId: string;
     shouldIngest: boolean;
   },
-): Promise<WebhookResult> {
+): Promise<StravaWebhookResult> {
   if (args.shouldIngest) {
     try {
       await ctx.runMutation(internal.private.deleteTokens, {

package/src/component/validators/shared.ts

@@ -1,15 +1,58 @@
-import { type Infer, v } from "convex/values";
+import { v } from "convex/values";
+
+// ─── SomaErrorType ──────────────────────────────────────────────────────────
+// Canonical error‐type identifiers shared across Garmin & Strava modules.
+
+export type SomaErrorType =
+  // Data domain types
+  | "activity"
+  | "activityDetails"
+  | "athlete"
+  | "bloodPressure"
+  | "body"
+  | "daily"
+  | "epochs"
+  | "healthSnapshot"
+  | "hrv"
+  | "manuallyUpdatedActivities"
+  | "menstruation"
+  | "moveIQ"
+  | "pulseOx"
+  | "respiration"
+  | "skinTemperature"
+  | "sleep"
+  | "stressDetails"
+  | "userMetrics"
+  // Operation types
+  | "deleteSchedule"
+  | "deleteWorkout"
+  | "ingest"
+  | "pushSchedule"
+  | "pushWorkout";
 
 // ─── SomaError ──────────────────────────────────────────────────────────────
-// Convex validator matching the SomaError TypeScript interface.
+
+/** Convex validator for SomaError (uses v.string() for runtime flexibility). */
 export const somaErrorValidator = v.object({
   type: v.string(),
   id: v.string(),
   message: v.string(),
 });
 
-/** Structured error from a Soma operation, derived from the Convex validator. */
-export type SomaError = Infer<typeof somaErrorValidator>;
+/** Structured error from a Soma operation. */
+export interface SomaError {
+  type: SomaErrorType;
+  id: string;
+  message: string;
+}
+
+// ─── WebhookResult ──────────────────────────────────────────────────────────
+// Shared return shape for all webhook handler actions.
+
+export type WebhookResult<TData = Record<string, unknown>> = {
+  errors: SomaError[];
+  items: Array<{ connectionId: string; userId: string; data: TData }>;
+};
 
 import {
   heartRateDataSample,

package/src/validators.ts

@@ -40,6 +40,7 @@
 
 import { v } from "convex/values";
 export { somaErrorValidator } from "./component/validators/shared.js";
+export type { SomaErrorType } from "./component/validators/shared.js";
 import { connectionValidator as _connectionValidator } from "./component/validators/connection.js";
 import {
   activityValidator as _activityValidator,