@happyvertical/smrt-svelte 0.43.4 → 0.43.6

package/dist/components/forms/Form.svelte.d.ts

@@ -1,4 +1,4 @@
-import { type ControlInteractionEvent, type ControlInteractionRegistry } from '@happyvertical/smrt-ui/forms';
+import { type ControlInteractionEvent, type ControlInteractionRegistry, type ControlSubject } from '@happyvertical/smrt-ui/forms';
 import type { Snippet } from 'svelte';
 import type { LLMModelId, STTAdapterType } from './types.js';
 export interface Props {
@@ -16,7 +16,7 @@ export interface Props {
     llmModel?: LLMModelId;
     /** Called when form is submitted (if provided, prevents native submission) */
     onsubmit?: (data: Record<string, unknown>) => void | Promise<void>;
-    /** Expose this form's submit intent to WebMCP. */
+    /** Let WebMCP propose field changes for local human review. */
     webmcp?: boolean | {
         name?: string;
         description?: string;
@@ -29,8 +29,12 @@ export interface Props {
     action?: string;
     /** Stable identity used by control/agent interaction adapters. */
     formId?: string;
+    /** Default record-qualified identity for registered fields. */
+    subject?: ControlSubject;
     interactionRegistry?: ControlInteractionRegistry;
     oninteraction?: (event: ControlInteractionEvent) => void;
+    /** Render the built-in human review surface for staged changes. */
+    stagedReview?: boolean;
     id?: string;
     name?: string;
     class?: string;

package/dist/components/forms/Form.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Form.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/Form.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,0BAA0B,EAIhC,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAatC,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,MAAM,WAAW,KAAK;IACpB,oBAAoB;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,8BAA8B;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oCAAoC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uBAAuB;IACvB,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,0BAA0B,CAAC;IACjD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;IACzD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAs4BD,QAAA,MAAM,IAAI;uBAhFe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;kCAQZ,0BAA0B;MAwEZ,CAAC;AACnD,KAAK,IAAI,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;AACpC,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Form.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/Form.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,0BAA0B,EAG/B,KAAK,cAAc,EAIpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAatC,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,MAAM,WAAW,KAAK;IACpB,oBAAoB;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,8BAA8B;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oCAAoC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iDAAiD;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uBAAuB;IACvB,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,+DAA+D;IAC/D,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+DAA+D;IAC/D,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,mBAAmB,CAAC,EAAE,0BAA0B,CAAC;IACjD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;IACzD,mEAAmE;IACnE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA04CD,QAAA,MAAM,IAAI;uBAjFe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;kCAQZ,0BAA0B;MAyEZ,CAAC;AACnD,KAAK,IAAI,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;AACpC,eAAe,IAAI,CAAC"}

package/dist/components/forms/MeasurementInput.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
 import { useI18n } from '@happyvertical/smrt-ui/i18n';
-import { onDestroy, onMount } from 'svelte';
 import { useAppState } from '../../hooks/useAppState.svelte.js';
 import { M } from '../../i18n/strings.forms.js';
 import {
   type FieldDefinition,
   tryGetFormContext,
 } from '../../state/form-context.js';
+import { invalidStagedValue } from './prepare-field-value.js';
 import type { MeasurementUnit, MeasurementValue } from './types.js';
 
 const { t } = useI18n();
@@ -89,16 +89,24 @@ let {
 
 const app = useAppState();
 const formContext = tryGetFormContext();
+const fieldOwnerId = $props.id();
+const fieldOwnerToken = `smrt-rich-field-${fieldOwnerId}`;
 
 const isSmrt = $derived(app.state.mode === 'smrt');
 
 // Validation
-const isInRange = $derived.by(() => {
-  if (value === null) return true;
-  if (min !== undefined && value < min) return false;
-  if (max !== undefined && value > max) return false;
+function measurementIsInRange(candidate: number | null): boolean {
+  if (candidate === null) return true;
+  if (min !== undefined && candidate < min) return false;
+  if (max !== undefined && candidate > max) return false;
   return true;
-});
+}
+function measurementMatchesStep(candidate: number): boolean {
+  if (!Number.isFinite(step) || step <= 0) return true;
+  const offset = (candidate - (min ?? 0)) / step;
+  return Math.abs(offset - Math.round(offset)) <= 1e-9;
+}
+const isInRange = $derived(measurementIsInRange(value));
 const showInvalid = $derived((value !== null && !isInRange) || !!error);
 
 function updateValue(newValue: number | null, newUnit?: MeasurementUnit) {
@@ -262,25 +270,31 @@ function parseSpokenMeasurement(text: string): MeasurementValue | null {
 }
 
 // Register with form context
-onMount(() => {
+$effect(() => {
   if (formContext) {
-    let rangeDesc = '';
-    if (min !== undefined && max !== undefined) {
-      rangeDesc = ` (between ${min} and ${max})`;
-    } else if (min !== undefined) {
-      rangeDesc = ` (minimum ${min})`;
-    } else if (max !== undefined) {
-      rangeDesc = ` (maximum ${max})`;
-    }
-
+    const registeredName = name;
     const fieldDef: FieldDefinition = {
-      name,
+      name: registeredName,
+      ownerToken: fieldOwnerToken,
       type: 'measurement',
-      label,
-      description:
-        (description ||
-          'A measurement with value and unit (e.g., "12 feet 6 inches")') +
-        rangeDesc,
+      get label() {
+        return label;
+      },
+      get description() {
+        let rangeDescription = '';
+        if (min !== undefined && max !== undefined) {
+          rangeDescription = ` (between ${min} and ${max})`;
+        } else if (min !== undefined) {
+          rangeDescription = ` (minimum ${min})`;
+        } else if (max !== undefined) {
+          rangeDescription = ` (maximum ${max})`;
+        }
+        return (
+          (description ||
+            'A measurement with value and unit (e.g., "12 feet 6 inches")') +
+          rangeDescription
+        );
+      },
       setValue: (v: unknown) => {
         if (v === null || v === undefined || v === '') {
           updateValue(null);
@@ -302,17 +316,109 @@ onMount(() => {
         }
       },
       getValue: () => (value !== null ? { value, unit } : null),
-      constraints: { required, min, max },
+      prepareValue: (candidate) => {
+        if (candidate === null || candidate === undefined || candidate === '') {
+          return null;
+        }
+        if (typeof candidate === 'number') {
+          return Number.isFinite(candidate)
+            ? { value: candidate, unit }
+            : invalidStagedValue();
+        }
+        if (typeof candidate === 'string') {
+          return parseSpokenMeasurement(candidate) ?? invalidStagedValue();
+        }
+        if (
+          typeof candidate !== 'object' ||
+          Array.isArray(candidate) ||
+          ![Object.prototype, null].includes(Object.getPrototypeOf(candidate))
+        ) {
+          return invalidStagedValue();
+        }
+        const measurement = candidate as Record<string, unknown>;
+        return {
+          value: measurement.value,
+          unit: measurement.unit,
+          ...Object.fromEntries(
+            Object.entries(measurement).filter(
+              ([key]) => key !== 'value' && key !== 'unit',
+            ),
+          ),
+        };
+      },
+      clear: () => {
+        updateValue(null);
+        return true;
+      },
+      get unit() {
+        return unit;
+      },
+      getState: () => ({ disabled }),
+      get constraints() {
+        return { required, min, max, step };
+      },
+      get webMcpSchema() {
+        return {
+          type: 'object',
+          additionalProperties: false,
+          properties: {
+            value: {
+              type: 'number',
+              ...(min !== undefined ? { minimum: min } : {}),
+              ...(max !== undefined ? { maximum: max } : {}),
+              ...(Number.isFinite(step) &&
+              step > 0 &&
+              (min === undefined || measurementMatchesStep(0))
+                ? { multipleOf: step }
+                : {}),
+            },
+            unit: { type: 'string', enum: [...units] },
+          },
+          ...(required ? { required: ['value', 'unit'] } : {}),
+        };
+      },
+      validateValue: (candidate) => {
+        if (candidate === null || candidate === undefined || candidate === '') {
+          return !required;
+        }
+        let proposed: MeasurementValue | null = null;
+        if (
+          typeof candidate === 'object' &&
+          candidate !== null &&
+          !Array.isArray(candidate)
+        ) {
+          const measurement = candidate as Record<string, unknown>;
+          if (
+            [Object.prototype, null].includes(
+              Object.getPrototypeOf(measurement),
+            ) &&
+            Object.keys(measurement).every((key) =>
+              ['value', 'unit'].includes(key),
+            ) &&
+            Object.hasOwn(measurement, 'value') &&
+            Object.hasOwn(measurement, 'unit') &&
+            typeof measurement.value === 'number' &&
+            typeof measurement.unit === 'string'
+          ) {
+            proposed = measurement as unknown as MeasurementValue;
+          }
+        } else if (typeof candidate === 'number') {
+          proposed = { value: candidate, unit };
+        } else {
+          proposed = parseSpokenMeasurement(String(candidate));
+        }
+        return (
+          proposed !== null &&
+          Number.isFinite(proposed.value) &&
+          units.includes(proposed.unit) &&
+          measurementIsInRange(proposed.value) &&
+          measurementMatchesStep(proposed.value)
+        );
+      },
       validate: () =>
         value === null ? !required : Number.isFinite(value) && isInRange,
     };
-    formContext.registerField(fieldDef);
-  }
-});
-
-onDestroy(() => {
-  if (formContext) {
-    formContext.unregisterField(name);
+    return formContext.registerField(fieldDef);
   }
 });
 
@@ -334,7 +440,7 @@ function handleUnitChange(e: Event) {
 }
 </script>
 
-<div class="smrt-measurement">
+<div class="smrt-measurement" data-smrt-field-owner={fieldOwnerToken}>
   {#if label}
     <label for={name} class="smrt-label">
       {label}

package/dist/components/forms/MeasurementInput.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/MeasurementInput.svelte.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGpE,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,qCAAqC;IACrC,KAAK,CAAC,EAAE,eAAe,EAAE,CAAC;IAC1B,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,gBAAgB,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3D;AAsVD,QAAA,MAAM,gBAAgB,yDAAwC,CAAC;AAC/D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC5D,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"MeasurementInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/MeasurementInput.svelte.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGpE,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,qCAAqC;IACrC,KAAK,CAAC,EAAE,eAAe,EAAE,CAAC;IAC1B,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,gBAAgB,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3D;AAgcD,QAAA,MAAM,gBAAgB,yDAAwC,CAAC;AAC/D,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC5D,eAAe,gBAAgB,CAAC"}

package/dist/components/forms/MoneyInput.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
 import { useI18n } from '@happyvertical/smrt-ui/i18n';
-import { onDestroy, onMount } from 'svelte';
 import { useAppState } from '../../hooks/useAppState.svelte.js';
 import { M } from '../../i18n/strings.forms.js';
 import {
   type FieldDefinition,
   tryGetFormContext,
 } from '../../state/form-context.js';
+import { invalidStagedValue } from './prepare-field-value.js';
 
 const { t } = useI18n();
 
@@ -216,22 +216,28 @@ function parseSpokenMoney(text: string): number | null {
 }
 
 // Register with form context
-onMount(() => {
+$effect(() => {
   if (formContext) {
-    let rangeDesc = '';
-    if (min !== undefined && max !== undefined) {
-      rangeDesc = ` (between $${(min / 100).toFixed(2)} and $${(max / 100).toFixed(2)})`;
-    } else if (min !== undefined) {
-      rangeDesc = ` (minimum $${(min / 100).toFixed(2)})`;
-    } else if (max !== undefined) {
-      rangeDesc = ` (maximum $${(max / 100).toFixed(2)})`;
-    }
-
+    const registeredName = name;
     const fieldDef: FieldDefinition = {
-      name,
+      name: registeredName,
       type: 'money',
-      label,
-      description: (description || 'A monetary amount in dollars') + rangeDesc,
+      get label() {
+        return label;
+      },
+      get description() {
+        let rangeDescription = '';
+        if (min !== undefined && max !== undefined) {
+          rangeDescription = ` (between $${(min / 100).toFixed(2)} and $${(max / 100).toFixed(2)})`;
+        } else if (min !== undefined) {
+          rangeDescription = ` (minimum $${(min / 100).toFixed(2)})`;
+        } else if (max !== undefined) {
+          rangeDescription = ` (maximum $${(max / 100).toFixed(2)})`;
+        }
+        return (
+          (description || 'A monetary amount in dollars') + rangeDescription
+        );
+      },
       setValue: (v: unknown) => {
         if (v === null || v === undefined || v === '') {
           updateValue(null);
@@ -252,17 +258,30 @@ onMount(() => {
         }
       },
       getValue: () => value,
-      constraints: { required, min, max },
+      prepareValue: (candidate) => {
+        if (candidate === null || candidate === undefined || candidate === '') {
+          return null;
+        }
+        if (typeof candidate === 'number') {
+          return candidate;
+        }
+        if (typeof candidate !== 'string') return invalidStagedValue();
+        return parseSpokenMoney(candidate) ?? invalidStagedValue();
+      },
+      getState: () => ({ disabled }),
+      get constraints() {
+        return { required, min, max };
+      },
+      validateValue: (candidate) =>
+        (candidate === null && !required) ||
+        (typeof candidate === 'number' &&
+          Number.isSafeInteger(candidate) &&
+          (min === undefined || candidate >= min) &&
+          (max === undefined || candidate <= max)),
       validate: () =>
-        value === null ? !required : Number.isFinite(value) && isInRange,
+        value === null ? !required : Number.isSafeInteger(value) && isInRange,
     };
-    formContext.registerField(fieldDef);
-  }
-});
-
-onDestroy(() => {
-  if (formContext) {
-    formContext.unregisterField(name);
+    return formContext.registerField(fieldDef);
   }
 });
 

package/dist/components/forms/MoneyInput.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MoneyInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/MoneyInput.svelte.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAoSD,QAAA,MAAM,UAAU,gDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}
+{"version":3,"file":"MoneyInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/MoneyInput.svelte.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAuTD,QAAA,MAAM,UAAU,gDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}

package/dist/components/forms/NumberInput.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
 import { useI18n } from '@happyvertical/smrt-ui/i18n';
-import { onDestroy, onMount } from 'svelte';
 import { useAppState } from '../../hooks/useAppState.svelte.js';
 import { M } from '../../i18n/strings.forms.js';
 import {
   type FieldDefinition,
   tryGetFormContext,
 } from '../../state/form-context.js';
+import { invalidStagedValue } from './prepare-field-value.js';
 
 const { t } = useI18n();
 
@@ -55,12 +55,18 @@ const formContext = tryGetFormContext();
 const isSmrt = $derived(app.state.mode === 'smrt');
 
 // Validation
-const isInRange = $derived.by(() => {
-  if (value === null) return true;
-  if (min !== undefined && value < min) return false;
-  if (max !== undefined && value > max) return false;
+function numberIsInRange(candidate: number | null): boolean {
+  if (candidate === null) return true;
+  if (min !== undefined && candidate < min) return false;
+  if (max !== undefined && candidate > max) return false;
   return true;
-});
+}
+function numberMatchesStep(candidate: number): boolean {
+  if (!Number.isFinite(step) || step <= 0) return true;
+  const offset = (candidate - (min ?? 0)) / step;
+  return Math.abs(offset - Math.round(offset)) <= 1e-9;
+}
+const isInRange = $derived(numberIsInRange(value));
 const showInvalid = $derived(value !== null && !isInRange);
 
 function updateValue(newValue: number | null) {
@@ -143,22 +149,26 @@ function parseSpokenNumber(text: string): number | null {
 }
 
 // Register with form context
-onMount(() => {
+$effect(() => {
   if (formContext) {
-    let rangeDesc = '';
-    if (min !== undefined && max !== undefined) {
-      rangeDesc = ` (between ${min} and ${max})`;
-    } else if (min !== undefined) {
-      rangeDesc = ` (minimum ${min})`;
-    } else if (max !== undefined) {
-      rangeDesc = ` (maximum ${max})`;
-    }
-
+    const registeredName = name;
     const fieldDef: FieldDefinition = {
-      name,
+      name: registeredName,
       type: 'number',
-      label,
-      description: (description || 'A number') + rangeDesc,
+      get label() {
+        return label;
+      },
+      get description() {
+        let rangeDescription = '';
+        if (min !== undefined && max !== undefined) {
+          rangeDescription = ` (between ${min} and ${max})`;
+        } else if (min !== undefined) {
+          rangeDescription = ` (minimum ${min})`;
+        } else if (max !== undefined) {
+          rangeDescription = ` (maximum ${max})`;
+        }
+        return (description || 'A number') + rangeDescription;
+      },
       setValue: (v: unknown) => {
         if (v === null || v === undefined || v === '') {
           updateValue(null);
@@ -175,17 +185,39 @@ onMount(() => {
         }
       },
       getValue: () => value,
-      constraints: { required, min, max, step },
+      prepareValue: (candidate) => {
+        if (candidate === null || candidate === undefined || candidate === '') {
+          return null;
+        }
+        if (typeof candidate === 'number') {
+          return candidate;
+        }
+        if (typeof candidate !== 'string') return invalidStagedValue();
+        return parseSpokenNumber(candidate) ?? invalidStagedValue();
+      },
+      getState: () => ({ disabled }),
+      get constraints() {
+        return { required, min, max, step };
+      },
+      validateValue: (candidate) => {
+        if (candidate === null || candidate === undefined || candidate === '') {
+          return !required;
+        }
+        const proposed =
+          typeof candidate === 'number'
+            ? candidate
+            : parseSpokenNumber(String(candidate));
+        return (
+          proposed !== null &&
+          Number.isFinite(proposed) &&
+          numberIsInRange(proposed) &&
+          numberMatchesStep(proposed)
+        );
+      },
       validate: () =>
         value === null ? !required : Number.isFinite(value) && isInRange,
     };
-    formContext.registerField(fieldDef);
-  }
-});
-
-onDestroy(() => {
-  if (formContext) {
-    formContext.unregisterField(name);
+    return formContext.registerField(fieldDef);
   }
 });
 

package/dist/components/forms/NumberInput.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NumberInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/NumberInput.svelte.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAuMD,QAAA,MAAM,WAAW,gDAAwC,CAAC;AAC1D,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAClD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"NumberInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/NumberInput.svelte.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAuOD,QAAA,MAAM,WAAW,gDAAwC,CAAC;AAC1D,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAClD,eAAe,WAAW,CAAC"}

package/dist/components/forms/PhoneInput.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 import { useI18n } from '@happyvertical/smrt-ui/i18n';
-import { onDestroy, onMount } from 'svelte';
 import { useAppState } from '../../hooks/useAppState.svelte.js';
 import { useSTT } from '../../hooks/useSTT.svelte.js';
 import { M } from '../../i18n/strings.forms.js';
@@ -9,6 +8,10 @@ import {
   type FieldDefinition,
   tryGetFormContext,
 } from '../../state/form-context.js';
+import {
+  invalidStagedValue,
+  prepareTextFieldValue,
+} from './prepare-field-value.js';
 
 const { t } = useI18n();
 
@@ -60,11 +63,13 @@ const isInitializing = $derived(stt.isInitializing);
 const downloadProgress = $derived(stt.downloadProgress);
 
 // Phone validation (basic North American format)
-const isValidPhone = $derived.by(() => {
-  if (!value) return true;
-  const digits = value.replace(/\D/g, '');
-  return digits.length >= 10 && digits.length <= 11;
-});
+function isValidPhoneValue(candidate: unknown): boolean {
+  if (typeof candidate !== 'string') return false;
+  if (!candidate) return !required;
+  const digits = candidate.replace(/\D/g, '');
+  return digits.length === 10 || (digits.length === 11 && digits[0] === '1');
+}
+const isValidPhone = $derived.by(() => isValidPhoneValue(value));
 const showInvalid = $derived(value && !isValidPhone);
 
 function updateValue(newValue: string) {
@@ -91,7 +96,7 @@ function formatPhoneNumber(input: string): string {
 }
 
 // Parse spoken phone number
-function parseSpokenPhone(text: string): string {
+function extractSpokenPhoneDigits(text: string): string {
   const wordNumbers: Record<string, string> = {
     zero: '0',
     oh: '0',
@@ -130,35 +135,59 @@ function parseSpokenPhone(text: string): string {
   result = result.replace(/\btriple\s*(\d)/gi, '$1$1$1');
 
   // Extract just digits
-  const digits = result.replace(/\D/g, '');
+  return result.replace(/\D/g, '');
+}
 
-  return formatPhoneNumber(digits);
+function parseSpokenPhone(text: string): string {
+  return formatPhoneNumber(extractSpokenPhoneDigits(text));
 }
 
 // Register with form context
-onMount(() => {
+$effect(() => {
   if (formContext) {
+    const registeredName = name;
     const fieldDef: FieldDefinition = {
-      name,
+      name: registeredName,
       type: 'phone',
-      label,
-      description: description || 'Phone number',
+      get label() {
+        return label;
+      },
+      get description() {
+        return description || 'Phone number';
+      },
       setValue: (v: unknown) => {
         const strVal = String(v ?? '');
         const formatted = parseSpokenPhone(strVal);
         updateValue(formatted);
       },
       getValue: () => value,
-      constraints: { required },
-      validate: () => !required || value.trim().length > 0,
+      prepareValue: (candidate) => {
+        const prepared = prepareTextFieldValue(candidate);
+        if (prepared === '') return '';
+        const digits = extractSpokenPhoneDigits(prepared);
+        if (
+          digits.length !== 10 &&
+          !(digits.length === 11 && digits[0] === '1')
+        ) {
+          return prepared;
+        }
+        return formatPhoneNumber(digits) || invalidStagedValue();
+      },
+      getState: () => ({ disabled }),
+      get constraints() {
+        return { required };
+      },
+      validateValue: (candidate) => {
+        if (typeof candidate !== 'string') return false;
+        if (candidate === '') return !required;
+        const digits = extractSpokenPhoneDigits(candidate);
+        return (
+          digits.length === 10 || (digits.length === 11 && digits[0] === '1')
+        );
+      },
+      validate: () => isValidPhoneValue(value),
     };
-    formContext.registerField(fieldDef);
-  }
-});
-
-onDestroy(() => {
-  if (formContext) {
-    formContext.unregisterField(name);
+    return formContext.registerField(fieldDef);
   }
 });
 

package/dist/components/forms/PhoneInput.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhoneInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/PhoneInput.svelte.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AA8SD,QAAA,MAAM,UAAU,gDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}
+{"version":3,"file":"PhoneInput.svelte.d.ts","sourceRoot":"","sources":["../../../src/components/forms/PhoneInput.svelte.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,KAAK;IACpB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAwUD,QAAA,MAAM,UAAU,gDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}