@hyperfixi/core 2.0.0 → 2.1.0

package/dist/expressions/index.mjs

@@ -498,8 +498,9 @@ const SPECIAL_DOM_PROPERTIES = {
     outerhtml: el => el.outerHTML,
     value: el => (isFormElement(el) ? el.value : undefined),
     checked: el => (isInputElement(el) ? el.checked : undefined),
-    disabled: el => (isFormElement(el) ? el.disabled : undefined),
+    disabled: el => ('disabled' in el ? el.disabled : undefined),
     selected: el => (isOptionElement(el) ? el.selected : undefined),
+    tabindex: el => (isHTMLElement$1(el) ? el.tabIndex : undefined),
     hidden: el => (isHTMLElement$1(el) ? el.hidden : undefined),
     style: el => getComputedStyle(el),
     children: el => Array.from(el.children),
@@ -508,7 +509,19 @@ const SPECIAL_DOM_PROPERTIES = {
     lastchild: el => el.lastElementChild,
     nextsibling: el => el.nextElementSibling,
     previoussibling: el => el.previousElementSibling,
+    values: el => collectFormValues(el),
 };
+function collectFormValues(el) {
+    if (el instanceof HTMLFormElement)
+        return new FormData(el);
+    const fd = new FormData();
+    el.querySelectorAll('input, select, textarea').forEach((input) => {
+        const name = input.getAttribute('name');
+        if (name && 'value' in input)
+            fd.append(name, input.value);
+    });
+    return fd;
+}
 function getElementProperty(element, property) {
     if (property.startsWith('computed-')) {
         const cssProperty = property.slice('computed-'.length);
@@ -5132,7 +5145,7 @@ const enhancedConverters = {
     Values: (value, _context) => {
         try {
             if (value instanceof HTMLFormElement) {
-                return success(extractFormValues(value), 'object');
+                return success(getFormValuesProcessed(value), 'object');
             }
             if (value instanceof HTMLElement) {
                 const inputs = value.querySelectorAll('input, select, textarea');
@@ -5140,7 +5153,7 @@ const enhancedConverters = {
                 inputs.forEach((input) => {
                     const htmlInput = input;
                     if (htmlInput.name) {
-                        const inputValue = extractInputValue(htmlInput);
+                        const inputValue = getInputValue(htmlInput);
                         if (inputValue !== undefined) {
                             values[htmlInput.name] = inputValue;
                         }
@@ -5595,55 +5608,6 @@ class IsExpression extends BaseExpressionImpl {
         }
     }
 }
-function extractFormValues(form) {
-    const values = {};
-    const elements = form.querySelectorAll('input, select, textarea');
-    elements.forEach(element => {
-        const input = element;
-        if (input.name) {
-            const value = extractInputValue(input);
-            if (value !== undefined) {
-                if (values[input.name] !== undefined) {
-                    if (!Array.isArray(values[input.name])) {
-                        values[input.name] = [values[input.name]];
-                    }
-                    values[input.name].push(value);
-                }
-                else {
-                    values[input.name] = value;
-                }
-            }
-        }
-    });
-    return values;
-}
-function extractInputValue(input) {
-    if (input instanceof HTMLInputElement) {
-        switch (input.type) {
-            case 'checkbox':
-                return input.checked;
-            case 'radio':
-                return input.checked ? input.value : undefined;
-            case 'number':
-            case 'range':
-                return input.valueAsNumber;
-            case 'date':
-            case 'datetime-local':
-                return input.valueAsDate;
-            case 'file':
-                return input.files;
-            default:
-                return input.value;
-        }
-    }
-    if (input instanceof HTMLSelectElement) {
-        if (input.multiple) {
-            return Array.from(input.selectedOptions).map(option => option.value);
-        }
-        return input.value;
-    }
-    return input.value;
-}
 ({
     as: new AsExpression(),
     is: new IsExpression(),