@usefillo/core 0.12.0 → 0.12.1

package/dist/index.d.ts

@@ -1696,8 +1696,8 @@ declare function resolveThemeAppearance(theme: FormTheme | null): FormTheme | nu
 /**
  * The default English validation message for a required field left empty.
  * `validateField` returns this exact sentinel (core has no strings context),
- * and the React render layer swaps it for `strings.required` so a localized
- * site can translate it. Keep it identical to `DEFAULT_FIELD_STRINGS.required`.
+ * and renderer layers swap it for field-aware/localized copy. Keep it
+ * identical to `DEFAULT_FIELD_STRINGS.required`.
  */
 declare const REQUIRED_FIELD_MESSAGE = "This field is required";
 /**
@@ -1763,8 +1763,12 @@ declare const DEFAULT_STRINGS: FilloStrings;
  * an exhaustively-enumerated, closed set.
  */
 interface FilloFieldStrings {
-    /** Validation: a required field was left empty. Mirrors REQUIRED_FIELD_MESSAGE. */
+    /** Generic/legacy validation copy for a required field left empty. Mirrors
+     *  REQUIRED_FIELD_MESSAGE and remains the fallback for custom/hidden fields. */
     required: string;
+    /** Optional field-aware required copy. Existing `required` overrides keep
+     *  their legacy generic behavior unless this function is also supplied. */
+    requiredForField?: (field: Field) => string;
     /** Notice when a spent/expired resume link couldn't restore progress. */
     resumeLinkExpired: string;
     /** Success-screen message when a verified identity re-submits and the form
@@ -1772,6 +1776,14 @@ interface FilloFieldStrings {
     alreadyAnswered: string;
     /** Retry control on a failed upload row. */
     uploadRetry: string;
+    /** Accessible action names for upload rows. The filename is appended by the renderer. */
+    uploadCancel: string;
+    uploadRemove: string;
+    uploadDismiss: string;
+    /** Visible secondary status for an upload in progress. */
+    uploadingFile: (percent: number, size: string) => string;
+    /** Visible secondary status for a completed upload. */
+    uploadedFile: (size: string) => string;
     /** Dropzone copy when uploads can't run because the form isn't connected. */
     uploadsDisabled: string;
     /** Dropzone copy for an explicit render-only preview, which never has transport. */
@@ -1797,8 +1809,8 @@ interface FilloFieldStrings {
     /** Live-region announcement while a submit is in flight — for auto-submit
      *  forms, which have no footer/button to show `submitting` on. */
     submittingAnnouncement: string;
-    /** Heading on the failed-submit error summary (one `role="alert"` summary
-     *  linking to fields, GOV.UK pattern — replaces N competing per-field alerts). */
+    /** @deprecated Retained for localization compatibility. Default renderers
+     *  now focus the first invalid control and show field-aware inline guidance. */
     errorSummaryTitle: string;
     /** Live-region announcement after a ranking move: "«label», position n of m". */
     rankingPosition: (label: string, position: number, count: number) => string;
@@ -1816,8 +1828,12 @@ interface FilloFieldStrings {
 declare const DEFAULT_FIELD_STRINGS: FilloFieldStrings;
 /** Everything the default renderers can localize — chrome + field/validation. */
 type FilloRendererStrings = FilloStrings & FilloFieldStrings;
+/** Resolve the renderer copy for core's stable required-field sentinel. */
+declare function requiredFieldMessage(field: Field, strings: Pick<FilloFieldStrings, "required" | "requiredForField">): string;
 /** Merge overrides over the built-in chrome + field defaults. Accepts a partial
- *  of the full renderer surface so the `strings` prop can override either set. */
+ *  of the full renderer surface so the `strings` prop can override either set.
+ *  A legacy generic `required` override disables the new field-aware default
+ *  unless the caller explicitly supplies `requiredForField` too. */
 declare function resolveStrings(overrides?: Partial<FilloRendererStrings>): FilloRendererStrings;
 
 /** Result of syncing a code-defined form: its canonical id, slug, and branding. */
@@ -2058,4 +2074,4 @@ declare class Sha1 {
 }
 declare const sha1Base64: (bytes: Uint8Array) => string;
 
-export { type AutoSubmitContext, BLOCK_KIND_META, type BaseField, type Block, type BlockKind, CONTENT_KINDS, type CalcExpr, type CalculatedField, type ChallengeConfig, type CheckboxField, type ChoiceField, type CodeForm, type Condition, type ConditionOp, type ContentBlock, type ContentKind, type CreatedDraft, type CustomField, DEFAULT_FIELD_STRINGS, DEFAULT_STRINGS, DRAFT_KINDS, type DateField, type DividerBlock, FILLO_CALC_MIN_SDK_VERSION, FILLO_CHALLENGE_MIN_SDK_VERSION, FILLO_DATA_ATTRS, FILLO_MIN_SDK_VERSION, FILLO_SCHEMA_VERSION, FILLO_SDK_VERSION, FILLO_SLOTS, FILLO_THEME_VARS, type Field, type FieldKind, type FieldSpec, type FieldValue, type FileUploadField, type FileValue, type FilloAppearance, FilloClient, type FilloClientOptions, FilloError, type FilloFieldStrings, FilloJsxError, type FilloRendererStrings, type FilloRespondent, type FilloSlot, type FilloStrings, type FormBranding, type FormController, type FormControllerOptions, type FormControllerState, type FormDraftSpec, type FormPage, type FormSchema, type FormSettings, type FormStatus, type FormTheme, type HeadingBlock, type HiddenField, JSX_BLOCK_COMPONENTS, JSX_BLOCK_SPECS, type JsonValue, type JsxFormMeta, type JumpRule, type LinearScaleField, type MatrixField, type NextPage, type NumberField, PHONE_COUNTRIES, PHONE_PICKER_COUNTRIES, PHONE_POPOVER_VIEWPORT_GAP, type ParagraphBlock, type ParsePhoneOptions, type ParsedPhone, type PhoneCountry, type PhoneField, type PhonePopoverPlacement, type ProvisionWorkspaceResult, type PublishedForm, REQUIRED_FIELD_MESSAGE, type RankingField, type RatingField, type ResponseData, type ResponseDraft, type ResponseLimit, type SchemaValidationResult, type SelectOption, Sha1, type SignatureField, type SlotClass, type SlotState, type SubmitMeta, type SubmitResult, type SyncFormResult, type SyncedForm, type TextField, type TrustPolicy, type UploadFileOptions, type UploadProgress, type UploadSession, type UploadStatus, type UploadTransport, type ValidationResult, type WhenBuilder, allFields, assembleForm, codeFormFromJsx, computeCalculated, conditionsMet, contentHash, countryByDialCode, countryByIso, countryByTimeZone, createBlock, createClient, createEmptyForm, createFormController, createId, defineForm, digitsOnly, evaluateCalc, flagEmoji, formSchemasEqual, formatAnswer, formatGroupedNumber, formatNational, isAutoSubmitBlock, isBlockVisible, isBuildTimeDevEnv, isCodeForm, isField, isFilloError, isLikelyDevEnv, isPossiblePhone, isTerminalPage, isValidPartialNumberText, localeForNotation, needsExplicitSubmit, normalizeFormSchema, normalizeFormTheme, normalizeSettings, parseGroupedNumber, parsePhone, pipeBlock, positionPhonePopover, prefillFromParams, provisionWorkspace, radioGroupStep, reachableFieldIds, reachableFields, reachablePageIds, reachablePageSequence, resolveNextPage, resolveSlotClass, resolveStrings, resolveText, resolveThemeAppearance, responseScopeValue, schemaFromJsx, sha1Base64, shouldAutoSubmit, slotClass, syncCodeForm, toE164, validateField, validateFormSchema, validateResponse, visibleBlocks, visibleFields, visiblePageBlocks, when };
+export { type AutoSubmitContext, BLOCK_KIND_META, type BaseField, type Block, type BlockKind, CONTENT_KINDS, type CalcExpr, type CalculatedField, type ChallengeConfig, type CheckboxField, type ChoiceField, type CodeForm, type Condition, type ConditionOp, type ContentBlock, type ContentKind, type CreatedDraft, type CustomField, DEFAULT_FIELD_STRINGS, DEFAULT_STRINGS, DRAFT_KINDS, type DateField, type DividerBlock, FILLO_CALC_MIN_SDK_VERSION, FILLO_CHALLENGE_MIN_SDK_VERSION, FILLO_DATA_ATTRS, FILLO_MIN_SDK_VERSION, FILLO_SCHEMA_VERSION, FILLO_SDK_VERSION, FILLO_SLOTS, FILLO_THEME_VARS, type Field, type FieldKind, type FieldSpec, type FieldValue, type FileUploadField, type FileValue, type FilloAppearance, FilloClient, type FilloClientOptions, FilloError, type FilloFieldStrings, FilloJsxError, type FilloRendererStrings, type FilloRespondent, type FilloSlot, type FilloStrings, type FormBranding, type FormController, type FormControllerOptions, type FormControllerState, type FormDraftSpec, type FormPage, type FormSchema, type FormSettings, type FormStatus, type FormTheme, type HeadingBlock, type HiddenField, JSX_BLOCK_COMPONENTS, JSX_BLOCK_SPECS, type JsonValue, type JsxFormMeta, type JumpRule, type LinearScaleField, type MatrixField, type NextPage, type NumberField, PHONE_COUNTRIES, PHONE_PICKER_COUNTRIES, PHONE_POPOVER_VIEWPORT_GAP, type ParagraphBlock, type ParsePhoneOptions, type ParsedPhone, type PhoneCountry, type PhoneField, type PhonePopoverPlacement, type ProvisionWorkspaceResult, type PublishedForm, REQUIRED_FIELD_MESSAGE, type RankingField, type RatingField, type ResponseData, type ResponseDraft, type ResponseLimit, type SchemaValidationResult, type SelectOption, Sha1, type SignatureField, type SlotClass, type SlotState, type SubmitMeta, type SubmitResult, type SyncFormResult, type SyncedForm, type TextField, type TrustPolicy, type UploadFileOptions, type UploadProgress, type UploadSession, type UploadStatus, type UploadTransport, type ValidationResult, type WhenBuilder, allFields, assembleForm, codeFormFromJsx, computeCalculated, conditionsMet, contentHash, countryByDialCode, countryByIso, countryByTimeZone, createBlock, createClient, createEmptyForm, createFormController, createId, defineForm, digitsOnly, evaluateCalc, flagEmoji, formSchemasEqual, formatAnswer, formatGroupedNumber, formatNational, isAutoSubmitBlock, isBlockVisible, isBuildTimeDevEnv, isCodeForm, isField, isFilloError, isLikelyDevEnv, isPossiblePhone, isTerminalPage, isValidPartialNumberText, localeForNotation, needsExplicitSubmit, normalizeFormSchema, normalizeFormTheme, normalizeSettings, parseGroupedNumber, parsePhone, pipeBlock, positionPhonePopover, prefillFromParams, provisionWorkspace, radioGroupStep, reachableFieldIds, reachableFields, reachablePageIds, reachablePageSequence, requiredFieldMessage, resolveNextPage, resolveSlotClass, resolveStrings, resolveText, resolveThemeAppearance, responseScopeValue, schemaFromJsx, sha1Base64, shouldAutoSubmit, slotClass, syncCodeForm, toE164, validateField, validateFormSchema, validateResponse, visibleBlocks, visibleFields, visiblePageBlocks, when };

package/dist/index.js

@@ -707,11 +707,39 @@ var DEFAULT_STRINGS = {
   resumeStartOver: "Start over",
   challengeUnavailable: "The verification check couldn't load. Refresh the page, or check that challenges.cloudflare.com isn't blocked."
 };
+var REQUIRED_BY_KIND = {
+  short_text: "Enter your answer",
+  long_text: "Enter your answer",
+  email: "Enter an email address",
+  url: "Enter a URL",
+  phone: "Enter a phone number",
+  number: "Enter a number",
+  select: "Choose an option",
+  dropdown: "Choose an option",
+  multi_select: "Select at least one option",
+  checkbox: "Select this checkbox",
+  rating: "Choose a rating",
+  linear_scale: "Choose a value",
+  ranking: "Rank every option",
+  matrix: "Answer every row",
+  signature: "Add your signature",
+  date: "Enter a date",
+  file_upload: "Add a file"
+};
+function defaultRequiredForField(field2) {
+  return REQUIRED_BY_KIND[field2.kind] ?? REQUIRED_FIELD_MESSAGE;
+}
 var DEFAULT_FIELD_STRINGS = {
   required: REQUIRED_FIELD_MESSAGE,
+  requiredForField: defaultRequiredForField,
   resumeLinkExpired: "That saved-progress link expired or was already used \u2014 start again below.",
   alreadyAnswered: "You've already answered this form.",
   uploadRetry: "Retry",
+  uploadCancel: "Cancel",
+  uploadRemove: "Remove",
+  uploadDismiss: "Dismiss",
+  uploadingFile: (percent, size) => `Uploading \xB7 ${percent}% \xB7 ${size}`,
+  uploadedFile: (size) => `Uploaded \xB7 ${size}`,
   uploadsDisabled: "Connect this form to Fillo to enable uploads",
   uploadsRenderOnly: "Uploads are unavailable in this render-only preview",
   uploadsUnavailable: "Uploads are temporarily unavailable",
@@ -724,15 +752,22 @@ var DEFAULT_FIELD_STRINGS = {
   uploadsFailed: (count) => `${count} ${count === 1 ? "upload" : "uploads"} failed.`,
   filesUploaded: (count) => `${count} ${count === 1 ? "file" : "files"} uploaded.`,
   submittingAnnouncement: "Submitting your response\u2026",
-  errorSummaryTitle: "Please fix the following:",
+  errorSummaryTitle: "Check these fields",
   rankingPosition: (label, position, count) => `${label}, position ${position} of ${count}`,
   phoneCountrySelected: (name) => `${name} selected`,
   phoneResultsCount: (count) => `${count} ${count === 1 ? "result" : "results"}`,
   signatureEmpty: "No signature yet",
   signatureSigned: "Signature saved"
 };
+function requiredFieldMessage(field2, strings) {
+  return strings.requiredForField?.(field2) ?? strings.required;
+}
 function resolveStrings(overrides) {
-  return overrides ? { ...DEFAULT_STRINGS, ...DEFAULT_FIELD_STRINGS, ...overrides } : { ...DEFAULT_STRINGS, ...DEFAULT_FIELD_STRINGS };
+  const resolved = overrides ? { ...DEFAULT_STRINGS, ...DEFAULT_FIELD_STRINGS, ...overrides } : { ...DEFAULT_STRINGS, ...DEFAULT_FIELD_STRINGS };
+  if (overrides && Object.prototype.hasOwnProperty.call(overrides, "required") && !Object.prototype.hasOwnProperty.call(overrides, "requiredForField")) {
+    delete resolved.requiredForField;
+  }
+  return resolved;
 }
 
 // src/validation.ts
@@ -962,7 +997,7 @@ var schemaShape = z2.object({
 });
 var MAX_SCHEMA_VERSION = 1;
 var FILLO_SCHEMA_VERSION = 1;
-var FILLO_SDK_VERSION = true ? "0.12.0" : "0.0.0-dev";
+var FILLO_SDK_VERSION = true ? "0.12.1" : "0.0.0-dev";
 var FILLO_MIN_SDK_VERSION = "0.4.0";
 var FILLO_CHALLENGE_MIN_SDK_VERSION = "0.9.0";
 var FILLO_CALC_MIN_SDK_VERSION = "0.11.0";
@@ -3319,8 +3354,14 @@ function createFormController(options2) {
     scheduleDraftSave();
   }
   function setUploading(fieldId, busy) {
-    if (busy) uploadingFields.add(fieldId);
-    else uploadingFields.delete(fieldId);
+    if (busy) {
+      uploadingFields.add(fieldId);
+      if (fieldId in errors) {
+        errors = Object.fromEntries(Object.entries(errors).filter(([k]) => k !== fieldId));
+      }
+    } else {
+      uploadingFields.delete(fieldId);
+    }
     notify();
   }
   function currentSeqPosition(seq) {
@@ -3820,12 +3861,16 @@ function syncCodeForm(client, form, opts) {
   const content2 = JSON.stringify(form.schema) + JSON.stringify(form.theme ?? null);
   const hash = contentHash(content2);
   const key = `${client.baseUrl}:${client.key}:${form.id}:${hash}`;
+  const revalidateUploadState = allFields(form.schema).some(
+    (field2) => field2.kind === "file_upload"
+  );
   const cached = syncCache.get(key);
   if (cached && !opts?.bypassCache) {
-    if (cached.expiresAt === null || cached.expiresAt > Date.now()) return cached.promise;
+    if (cached.expiresAt === null || !revalidateUploadState && cached.expiresAt > Date.now())
+      return cached.promise;
     syncCache.delete(key);
   }
-  if (!opts?.bypassCache) {
+  if (!opts?.bypassCache && !revalidateUploadState) {
     const stored = readStoredSync(client, form.id, hash);
     if (stored) {
       const promise2 = Promise.resolve({
@@ -3847,7 +3892,7 @@ function syncCodeForm(client, form, opts) {
   promise.then(
     (result) => {
       if (syncCache.get(key) !== entry) return;
-      if (isVolatileSync(result)) {
+      if (revalidateUploadState || isVolatileSync(result)) {
         syncCache.delete(key);
         return;
       }
@@ -4299,6 +4344,7 @@ export {
   reachableFields,
   reachablePageIds,
   reachablePageSequence,
+  requiredFieldMessage,
   resolveNextPage,
   resolveSlotClass,
   resolveStrings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usefillo/core",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Form schema, validation, logic engine and JS client for Fillo. Framework-agnostic.",
   "license": "MIT",
   "keywords": [