@conform-to/dom 1.0.1 → 1.0.2

package/README

@@ -8,7 +8,7 @@
  ╚══════╝  ╚═════╝  ╚═╝  ╚══╝ ╚═╝        ╚═════╝  ╚═╝   ╚═╝ ╚═╝   ╚═╝
 
 
-Version 1.0.1 / License MIT / Copyright (c) 2024 Edmund Hung
+Version 1.0.2 / License MIT / Copyright (c) 2024 Edmund Hung
 
 A type-safe form validation library utilizing web fundamentals to progressively enhance HTML Forms with full support for server frameworks like Remix and Next.js.
 

package/form.d.ts

@@ -1,14 +1,14 @@
 import { getFormAction, getFormEncType, getFormMethod } from './dom';
 import { type Intent, type Submission, type SubmissionResult } from './submission';
-export type UnionKeyof<T> = T extends any ? keyof T : never;
-export type UnionKeyType<T, K extends UnionKeyof<T>> = T extends {
-    [k in K]?: any;
-} ? T[K] : undefined;
+type BaseCombine<T, K extends PropertyKey = T extends unknown ? keyof T : never> = T extends unknown ? T & Partial<Record<Exclude<K, keyof T>, never>> : never;
+export type Combine<T> = {
+    [K in keyof BaseCombine<T>]: BaseCombine<T>[K];
+};
 export type DefaultValue<Schema> = Schema extends string | number | boolean | Date | bigint | null | undefined ? Schema | string | null | undefined : Schema extends File ? null | undefined : Schema extends Array<infer Item> ? Array<DefaultValue<Item>> | null | undefined : Schema extends Record<string, any> ? {
-    [Key in UnionKeyof<Schema>]?: DefaultValue<UnionKeyType<Schema, Key>>;
+    [Key in keyof Combine<Schema>]?: DefaultValue<Combine<Schema>[Key]>;
 } | null | undefined : string | null | undefined;
-export type FormValue<Schema> = Schema extends string | number | boolean | Date | bigint | null | undefined ? string | undefined : Schema extends File ? File | undefined : Schema extends Array<infer Item> ? string | Array<FormValue<Item>> | undefined : Schema extends Record<string, any> ? {
-    [Key in UnionKeyof<Schema>]?: FormValue<UnionKeyType<Schema, Key>>;
+export type FormValue<Schema> = Schema extends string | number | boolean | Date | bigint | null | undefined ? string | undefined : Schema extends File ? File | undefined : Schema extends File[] ? File | Array<File> | undefined : Schema extends Array<infer Item> ? string | Array<FormValue<Item>> | undefined : Schema extends Record<string, any> ? {
+    [Key in keyof Combine<Schema>]?: DefaultValue<Combine<Schema>[Key]>;
 } | undefined : unknown;
 declare const error: unique symbol;
 declare const field: unique symbol;

package/form.js

@@ -11,7 +11,9 @@ var submission = require('./submission.js');
 function createFormMeta(options, initialized) {
   var _lastResult$initialVa, _options$constraint, _lastResult$state$val, _lastResult$state, _ref;
   var lastResult = !initialized ? options.lastResult : undefined;
-  var defaultValue = options.defaultValue ? submission.serialize(options.defaultValue) : {};
+  var defaultValue = options.defaultValue ?
+  // @ts-expect-error
+  submission.serialize(options.defaultValue) : {};
   var initialValue = (_lastResult$initialVa = lastResult === null || lastResult === void 0 ? void 0 : lastResult.initialValue) !== null && _lastResult$initialVa !== void 0 ? _lastResult$initialVa : defaultValue;
   var result = {
     submissionStatus: lastResult === null || lastResult === void 0 ? void 0 : lastResult.status,
@@ -96,6 +98,9 @@ function createStateProxy(fn) {
   return new Proxy(cache, {
     get(_, name, receiver) {
       var _cache$name;
+      if (typeof name !== 'string') {
+        return;
+      }
       return (_cache$name = cache[name]) !== null && _cache$name !== void 0 ? _cache$name : cache[name] = fn(name, receiver);
     }
   });

package/form.mjs

@@ -7,7 +7,9 @@ import { serialize, setListState, setListValue, setState, getSubmissionContext,
 function createFormMeta(options, initialized) {
   var _lastResult$initialVa, _options$constraint, _lastResult$state$val, _lastResult$state, _ref;
   var lastResult = !initialized ? options.lastResult : undefined;
-  var defaultValue = options.defaultValue ? serialize(options.defaultValue) : {};
+  var defaultValue = options.defaultValue ?
+  // @ts-expect-error
+  serialize(options.defaultValue) : {};
   var initialValue = (_lastResult$initialVa = lastResult === null || lastResult === void 0 ? void 0 : lastResult.initialValue) !== null && _lastResult$initialVa !== void 0 ? _lastResult$initialVa : defaultValue;
   var result = {
     submissionStatus: lastResult === null || lastResult === void 0 ? void 0 : lastResult.status,
@@ -92,6 +94,9 @@ function createStateProxy(fn) {
   return new Proxy(cache, {
     get(_, name, receiver) {
       var _cache$name;
+      if (typeof name !== 'string') {
+        return;
+      }
       return (_cache$name = cache[name]) !== null && _cache$name !== void 0 ? _cache$name : cache[name] = fn(name, receiver);
     }
   });

package/formdata.js

@@ -155,9 +155,18 @@ function normalize(value) {
     }
     return value.map(normalize);
   }
-  if (typeof value === 'string' && value === '' || value === null || isFile(value)) {
+  if (typeof value === 'string' && value === '' || value === null || isFile(value) && value.size === 0) {
     return;
   }
+
+  // We will skip serializing file if the result is sent to the client
+  if (isFile(value)) {
+    return Object.assign(value, {
+      toJSON() {
+        return;
+      }
+    });
+  }
   return value;
 }
 

package/formdata.mjs

@@ -151,9 +151,18 @@ function normalize(value) {
     }
     return value.map(normalize);
   }
-  if (typeof value === 'string' && value === '' || value === null || isFile(value)) {
+  if (typeof value === 'string' && value === '' || value === null || isFile(value) && value.size === 0) {
     return;
   }
+
+  // We will skip serializing file if the result is sent to the client
+  if (isFile(value)) {
+    return Object.assign(value, {
+      toJSON() {
+        return;
+      }
+    });
+  }
   return value;
 }
 

package/index.d.ts

@@ -1,4 +1,4 @@
-export { type UnionKeyof, type UnionKeyType, type Constraint, type ControlButtonProps, type FormId, type FieldName, type DefaultValue, type FormValue, type FormOptions, type FormState, type FormContext, type SubscriptionSubject, type SubscriptionScope, createFormContext as unstable_createFormContext, } from './form';
+export { type Combine, type Constraint, type ControlButtonProps, type FormId, type FieldName, type DefaultValue, type FormValue, type FormOptions, type FormState, type FormContext, type SubscriptionSubject, type SubscriptionScope, createFormContext as unstable_createFormContext, } from './form';
 export { type FieldElement, isFieldElement } from './dom';
 export { type Submission, type SubmissionResult, type Intent, INTENT, STATE, serializeIntent, parse, } from './submission';
 export { getPaths, formatPaths, isPrefix } from './formdata';

package/package.json

@@ -3,7 +3,7 @@
 	"description": "A set of opinionated helpers built on top of the Constraint Validation API",
 	"homepage": "https://conform.guide",
 	"license": "MIT",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"main": "index.js",
 	"module": "index.mjs",
 	"types": "index.d.ts",