Merge pull request #194 from rafalfigura/fix-file-upload

[qwik] Form data file upload fix for #142

packages/qwik/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the library will be documented in this file.
 
+## vX.X.X (Month DD, YYYY)
+
+- Replace `getFormDataValues` util with `decode-formdata` package
+- Change `FormData` access in `formActionQrl` to `event.sharedMap.get('@actionFormData')` (pull request #194)
+
 ## v0.23.1 (January 19, 2023)
 
 - Fix `FieldElementProps` type by using `QRL` for functions (issue #168)

packages/qwik/package.json

@@ -47,6 +47,13 @@
     "lint": "eslint \"src/**/*.ts*\" && tsc --noEmit",
     "publish": "npm publish"
   },
+  "dependencies": {
+    "decode-formdata": "^0.7.2"
+  },
+  "peerDependencies": {
+    "@builder.io/qwik": "^1.4.0",
+    "@builder.io/qwik-city": "^1.4.0"
+  },
   "devDependencies": {
     "@builder.io/qwik": "^1.4.0",
     "@builder.io/qwik-city": "^1.4.0",
@@ -61,9 +68,5 @@
     "valibot": "^0.20.1",
     "vite": "^4.5.2",
     "zod": "^3.22.4"
-  },
-  "peerDependencies": {
-    "@builder.io/qwik": "^1.4.0",
-    "@builder.io/qwik-city": "^1.4.0"
   }
 }

packages/qwik/src/actions/formAction$.ts

@@ -1,25 +1,25 @@
-import { $, type QRL, implicit$FirstArg } from '@builder.io/qwik';
+import { $, implicit$FirstArg, noSerialize, type QRL } from '@builder.io/qwik';
 import {
-  type RequestEventAction,
   globalActionQrl,
   type Action,
+  type RequestEventAction,
 } from '@builder.io/qwik-city';
 import { AbortMessage } from '@builder.io/qwik-city/middleware/request-handler';
 import { isDev } from '@builder.io/qwik/build';
+import { decode } from 'decode-formdata';
 import { FormError } from '../exceptions';
 import type {
   FieldValues,
-  ResponseData,
+  FormActionStore,
+  FormDataInfo,
+  FormErrors,
   FormResponse,
   Maybe,
-  FormErrors,
   MaybePromise,
-  ValidateForm,
-  FormDataInfo,
-  FormActionStore,
   PartialValues,
+  ResponseData,
+  ValidateForm,
 } from '../types';
-import { getFormDataValues } from '../utils';
 
 /**
  * Value type of the form action result.
@@ -84,7 +84,12 @@ export function formActionQrl<
         const values: PartialValues<TFieldValues> =
           type === 'application/x-www-form-urlencoded' ||
           type === 'multipart/form-data'
-            ? getFormDataValues(await event.request.formData(), formDataInfo)
+            ? decode(
+                event.sharedMap.get('@actionFormData'),
+                formDataInfo,
+                ({ output }) =>
+                  output instanceof Blob ? noSerialize(output) : output
+              )
             : (jsonData as PartialValues<TFieldValues>);
 
         // Validate values and get errors if necessary

packages/qwik/src/types/path.ts

@@ -100,7 +100,7 @@ type TypeTemplatePath<
 > = Value extends Type
   ? Value extends Array<any> | Record<string, any>
     ? `${Key}` | `${Key}.${TypeTemplatePaths<Value, Type>}`
-    : `${Key}`
+    : `${Key extends number ? '$' : Key}`
   : Value extends FieldValues | (FieldValue | FieldValues)[]
   ? `${Key extends number ? '$' : Key}.${TypeTemplatePaths<Value, Type>}`
   : never;

packages/qwik/src/utils/index.ts

@@ -7,7 +7,6 @@ export * from './getFieldNames';
 export * from './getFieldState';
 export * from './getFieldStore';
 export * from './getFilteredNames';
-export * from './getFormDataValues';
 export * from './getInitialFieldArrayStore';
 export * from './getInitialFieldStore';
 export * from './getInitialStores';

packages/qwik/vite.config.ts

@@ -18,6 +18,7 @@ export default defineConfig(() => {
           '@builder.io/qwik/jsx-runtime',
           '@builder.io/qwik-city',
           '@builder.io/qwik-city/middleware/request-handler',
+          'decode-formdata',
           'valibot',
           'zod',
         ],