formanitor 0.1.5 → 0.1.7

package/dist/index.d.cts

@@ -770,7 +770,10 @@ interface StoreConfig {
     prefillData?: Record<string, any>;
     role?: string;
     onEvent?: EventListener;
+    /** Handler for image, media, and signature uploads; fallback for file upload when `onFileUpload` is omitted. */
     onUpload?: UploadHandler;
+    /** Optional handler for `file_upload` fields only (`FormFileUploadWidget`). Uses `onUpload` when not set. */
+    onFileUpload?: UploadHandler;
     onDraftChange?: DraftChangeHandler;
     /**
      * Auth / OTP configuration. Lets the host app supply the API base URL and
@@ -872,6 +875,8 @@ declare class FormStore {
      */
     updateConfig(next: Partial<StoreConfig>): void;
     getUploadHandler(): UploadHandler | undefined;
+    /** Resolved handler for `file_upload` widgets: `onFileUpload` ?? `onUpload`. */
+    getFileUploadHandler(): UploadHandler | undefined;
     private preSubmitHandlers;
     registerPreSubmitHandler(fieldId: string, fn: () => Promise<void>): void;
     unregisterPreSubmitHandler(fieldId: string): void;
@@ -1194,12 +1199,14 @@ interface PresignedUploadResponse {
     upload_method: 'PUT' | 'POST';
 }
 interface CreateUploadHandlerOptions {
+    /** Data server origin (no trailing slash), e.g. `https://dataserver.example.com`. */
     apiBaseUrl: string;
     headers?: Record<string, string>;
 }
 /**
- * Creates an upload handler function that can be passed to FormProvider
- * This handles the complete upload flow: get presigned URL -> upload to S3 -> return S3 key
+ * Presigned upload handler: `POST …/api/forms/media-upload/` then PUT/POST file
+ * to `presigned_url`. Use as `config.onUpload` on `FormProvider`; `file_upload`
+ * fields use the same handler unless you set `config.onFileUpload`.
  */
 declare function createUploadHandler(options: CreateUploadHandlerOptions): (file: File | Blob, filename: string) => Promise<string>;
 

package/dist/index.d.ts

@@ -770,7 +770,10 @@ interface StoreConfig {
     prefillData?: Record<string, any>;
     role?: string;
     onEvent?: EventListener;
+    /** Handler for image, media, and signature uploads; fallback for file upload when `onFileUpload` is omitted. */
     onUpload?: UploadHandler;
+    /** Optional handler for `file_upload` fields only (`FormFileUploadWidget`). Uses `onUpload` when not set. */
+    onFileUpload?: UploadHandler;
     onDraftChange?: DraftChangeHandler;
     /**
      * Auth / OTP configuration. Lets the host app supply the API base URL and
@@ -872,6 +875,8 @@ declare class FormStore {
      */
     updateConfig(next: Partial<StoreConfig>): void;
     getUploadHandler(): UploadHandler | undefined;
+    /** Resolved handler for `file_upload` widgets: `onFileUpload` ?? `onUpload`. */
+    getFileUploadHandler(): UploadHandler | undefined;
     private preSubmitHandlers;
     registerPreSubmitHandler(fieldId: string, fn: () => Promise<void>): void;
     unregisterPreSubmitHandler(fieldId: string): void;
@@ -1194,12 +1199,14 @@ interface PresignedUploadResponse {
     upload_method: 'PUT' | 'POST';
 }
 interface CreateUploadHandlerOptions {
+    /** Data server origin (no trailing slash), e.g. `https://dataserver.example.com`. */
     apiBaseUrl: string;
     headers?: Record<string, string>;
 }
 /**
- * Creates an upload handler function that can be passed to FormProvider
- * This handles the complete upload flow: get presigned URL -> upload to S3 -> return S3 key
+ * Presigned upload handler: `POST …/api/forms/media-upload/` then PUT/POST file
+ * to `presigned_url`. Use as `config.onUpload` on `FormProvider`; `file_upload`
+ * fields use the same handler unless you set `config.onFileUpload`.
  */
 declare function createUploadHandler(options: CreateUploadHandlerOptions): (file: File | Blob, filename: string) => Promise<string>;
 

package/dist/index.mjs

@@ -1710,6 +1710,8 @@ var FormStore = class {
   updateConfig(next) {
     let needsReeval = false;
     if (next.onUpload !== void 0) this.config.onUpload = next.onUpload;
+    if (next.onFileUpload !== void 0)
+      this.config.onFileUpload = next.onFileUpload;
     if (next.onEvent !== void 0) this.config.onEvent = next.onEvent;
     if (next.onDraftChange !== void 0) this.config.onDraftChange = next.onDraftChange;
     if (next.voice !== void 0) this.config.voice = next.voice;
@@ -1730,6 +1732,10 @@ var FormStore = class {
   getUploadHandler() {
     return this.config.onUpload;
   }
+  /** Resolved handler for `file_upload` widgets: `onFileUpload` ?? `onUpload`. */
+  getFileUploadHandler() {
+    return this.config.onFileUpload ?? this.config.onUpload;
+  }
   preSubmitHandlers = /* @__PURE__ */ new Map();
   registerPreSubmitHandler(fieldId, fn) {
     this.preSubmitHandlers.set(fieldId, fn);
@@ -4038,7 +4044,7 @@ var FormFileUploadWidget = ({
   const accept = def.accept ?? "*/*";
   const maxSize = def.maxSize ?? 10 * 1024 * 1024;
   const allowMultiple = def.multiple === true;
-  const uploadHandler = store.getUploadHandler();
+  const uploadHandler = store.getFileUploadHandler();
   const showLabel = isLabelVisible(fieldDef);
   if (!uploadHandler) {
     return /* @__PURE__ */ jsxs("div", { className: fieldWrapperClass(fieldDef, "space-y-2"), children: [
@@ -4047,7 +4053,7 @@ var FormFileUploadWidget = ({
         " ",
         /* @__PURE__ */ jsx(FieldRequiredIndicator, { fieldDef })
       ] }) : null,
-      /* @__PURE__ */ jsx("div", { className: "border-2 border-red-300 rounded-lg p-4 bg-red-50", children: /* @__PURE__ */ jsx("p", { className: "text-sm text-red-600", children: "Upload handler not configured. Please provide an onUpload function in FormProvider config." }) })
+      /* @__PURE__ */ jsx("div", { className: "border-2 border-red-300 rounded-lg p-4 bg-red-50", children: /* @__PURE__ */ jsx("p", { className: "text-sm text-red-600", children: "Upload handler not configured. Provide `config.onFileUpload` or `config.onUpload` on FormProvider." }) })
     ] });
   }
   const hasStoredValue = value !== null && value !== void 0 && value !== "" && !(Array.isArray(value) && value.length === 0);
@@ -16287,33 +16293,44 @@ var FormControls = ({
 };
 
 // src/utils/createUploadHandler.ts
-function createUploadHandler(options) {
+function normalizeBaseUrl(apiBaseUrl) {
+  return apiBaseUrl.replace(/\/+$/, "");
+}
+async function uploadViaPresignedEndpoint(options, presignPath, file, filename) {
   const { apiBaseUrl, headers = {} } = options;
-  return async (file, filename) => {
-    const response = await fetch(`${apiBaseUrl}/api/forms/media-upload/`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        ...headers
-      },
-      body: JSON.stringify({ filename })
-    });
-    if (!response.ok) {
-      throw new Error(`Failed to get presigned URL: ${response.statusText}`);
-    }
-    const presignedData = await response.json();
-    const uploadResponse = await fetch(presignedData.presigned_url, {
-      method: presignedData.upload_method,
-      headers: {
-        "Content-Type": presignedData.content_type
-      },
-      body: file
-    });
-    if (!uploadResponse.ok) {
-      throw new Error(`Failed to upload file: ${uploadResponse.statusText}`);
-    }
-    return presignedData.s3_key;
-  };
+  const base = normalizeBaseUrl(apiBaseUrl);
+  const path = presignPath.startsWith("/") ? presignPath : `/${presignPath}`;
+  const response = await fetch(`${base}${path}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      ...headers
+    },
+    body: JSON.stringify({ filename })
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to get presigned URL: ${response.statusText}`);
+  }
+  const presignedData = await response.json();
+  const uploadResponse = await fetch(presignedData.presigned_url, {
+    method: presignedData.upload_method,
+    headers: {
+      "Content-Type": presignedData.content_type
+    },
+    body: file
+  });
+  if (!uploadResponse.ok) {
+    throw new Error(`Failed to upload file: ${uploadResponse.statusText}`);
+  }
+  return presignedData.s3_key;
+}
+function createUploadHandler(options) {
+  return async (file, filename) => uploadViaPresignedEndpoint(
+    options,
+    "/api/forms/media-upload/",
+    file,
+    filename
+  );
 }
 
 export { AddInvestigationField, AddMedicationField, DifferentialDiagnosis, DynamicForm, DynamicFormV2, EMAIL_REGEX, FieldRenderer, FieldRequiredIndicator, FormControls, FormFileUploadWidget, FormProvider, FormStore, ImageUploadWidget, MAR_MEDICATION_ORDERS_META_KEY, MediaUploadWidget, MultiStepForm, ReadOnlyForm, ReadOnlyImageUpload, ReadOnlyMediaUpload, ReadOnlySignature, ReadOnlyTable, RichTextWidget, SignatureUploadWidget, SmartForm, SmartTextareaWidget, Upload3 as Upload, createUploadHandler, evaluateRules, fieldControlClass, fieldDescriptionClass, fieldErrorClass, fieldLabelClass, fieldMetaRequestsMarMedicationOrdersButton, fieldWrapperClass, isLabelVisible, useField, useFieldHandlers, useForm, useFormStore, useFrequentItems, usePackages, useSmartKeywords, validateField, validateForm };