@optionfactory/fml 9.0.0-rc11 → 9.0.0-rc12

package/dist/ful.mjs

@@ -1412,15 +1412,22 @@ const INPUT_MODES = { numeric: 'numeric', decimal: 'decimal' };
 
 const signed = (v, digits) => (v.startsWith('-') ? '-' : '') + digits(v);
 
-const NUMERIC_FILTERS = {
-    numeric: (v) => signed(v, (t) => t.replace(/\D/g, '')),
+const NUMERIC_DIGITS = {
+    numeric: (t) => t.replace(/\D/g, ''),
     //one separator, the first: the rest are a slip while typing, not a value
-    decimal: (v) =>
-        signed(v, (t) => {
-            const kept = t.replace(/[^\d.,]/g, '');
-            const at = kept.search(/[.,]/);
-            return at === -1 ? kept : kept.slice(0, at + 1) + kept.slice(at + 1).replace(/[.,]/g, '');
-        }),
+    decimal: (t) => {
+        const kept = t.replace(/[^\d.,]/g, '');
+        const at = kept.search(/[.,]/);
+        return at === -1 ? kept : kept.slice(0, at + 1) + kept.slice(at + 1).replace(/[.,]/g, '');
+    },
+};
+
+const numericFilter = (type, unsigned) => {
+    const digits = NUMERIC_DIGITS[type];
+    if (!digits) {
+        return null;
+    }
+    return unsigned ? digits : (v) => signed(v, digits);
 };
 
 const warnedBoth = new WeakSet();
@@ -1442,7 +1449,7 @@ const filterOf = (el) => {
         const re = compiled('reject', reject);
         return re && ((v) => v.replace(re, ''));
     }
-    return NUMERIC_FILTERS[el._type()] ?? null;
+    return numericFilter(el._type(), el.declared('unsigned'));
 };
 
 /** A labelled text input over any native type or textarea; the temporal inputs are its subclasses. */
@@ -1457,6 +1464,7 @@ class Input extends Field {
         'reject',
         'uppercase:presence',
         'trim:presence',
+        'unsigned:presence',
         'autocomplete',
     ];
     static slots = true;
@@ -4836,27 +4844,41 @@ class BooleanFilter extends Field {
  * operator, differing only in what the server converts them to.
  */
 class InFilter extends Select {
-    async upgrade() {
-        //the snapshot is taken inside super.upgrade(), so an attribute this
-        //element does not let an author turn off has to be written before it
-        this.toggleAttribute('multiple', true);
-        await super.upgrade();
+    static attributes = ['operator'];
+    /** the selection as the array the wire takes, whether one key was chosen or many */
+    #keys() {
+        const chosen = super.value;
+        if (this.multiple) {
+            return chosen;
+        }
+        return chosen === null || chosen === undefined ? [] : [chosen];
     }
     get value() {
-        const keys = super.value;
+        const keys = this.#keys();
         //an empty set is no filter: the table drops a falsy value, where an
         //empty array would travel and match nothing
-        return keys.length === 0 ? null : keys;
+        if (keys.length === 0) {
+            return null;
+        }
+        const operator = this.declared('operator');
+        return operator ? [operator, ...keys] : keys;
     }
     set value(v) {
-        super.value = v ?? [];
+        const operator = this.declared('operator');
+        let keys = v === null || v === undefined ? [] : Array.isArray(v) ? v : [v];
+        //what the getter answers has to be assignable back, and it carries the
+        //operator in front of the keys
+        if (operator && keys[0] === operator) {
+            keys = keys.slice(1);
+        }
+        super.value = this.multiple ? keys : (keys[0] ?? null);
     }
     /** @returns {FilterCriterion|null} */
     get criterion() {
         return asCriterion(
             labelTextOf(this),
-            null,
-            (super.entry ?? []).map((e) => e.label),
+            this.declared('operator'),
+            [super.entry].flat().filter((e) => e).map((e) => e.label),
         );
     }
 }