@sumaris-net/ngx-components 18.22.5 → 18.22.7

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -615,13 +615,21 @@ function compareValuesDesc(a, b) {
  * @typeParam T - Type of compared objects.
  * @param path - Property path or array path (e.g. "a.b[0].c").
  * @param direction - Sort direction, 'asc' by default.
+ * @param nullsFirst
  * @returns A comparator compatible with `Array.prototype.sort`.
  */
-function propertyPathComparator(path, direction = 'asc') {
+function propertyPathComparator(path, direction = 'asc', nullsFirst) {
+    nullsFirst = nullsFirst ?? direction == 'desc';
     const compareFn = direction === 'asc' ? compareValues : compareValuesDesc;
     return (a, b) => {
         const valueA = getPropertyByPath(a, path);
         const valueB = getPropertyByPath(b, path);
+        if (valueA == null && valueB == null)
+            return 0;
+        if (valueA == null)
+            return nullsFirst ? -1 : 1;
+        if (valueB == null)
+            return nullsFirst ? 1 : -1;
         return compareFn(valueA, valueB);
     };
 }
@@ -634,14 +642,21 @@ function propertyPathComparator(path, direction = 'asc') {
  * @typeParam K - Key of the property in `T`.
  * @param property - Property name to compare.
  * @param direction - Sort direction, 'asc' by default.
- * @param defaultValue - Value used when the property is undefined.
+ * @param nullsFirst - If true, nil values are placed first, else last. By default, 'false' if direction='asc', 'true' if direction='desc'
  * @returns A comparator compatible with `Array.prototype.sort`.
  */
-function propertyComparator(property, direction = 'asc', defaultValue) {
+function propertyComparator(property, direction = 'asc', nullsFirst) {
+    nullsFirst = nullsFirst ?? direction === 'desc';
     const compareFn = direction === 'asc' ? compareValues : compareValuesDesc;
     return (a, b) => {
-        const valueA = a[property] !== undefined ? a[property] : defaultValue;
-        const valueB = b[property] ? b[property] : defaultValue;
+        const valueA = a[property];
+        const valueB = b[property];
+        if (valueA == null && valueB == null)
+            return 0;
+        if (valueA == null)
+            return nullsFirst ? -1 : 1;
+        if (valueB == null)
+            return nullsFirst ? 1 : -1;
         return compareFn(valueA, valueB);
     };
 }
@@ -655,19 +670,26 @@ function propertyComparator(property, direction = 'asc', defaultValue) {
  * @typeParam T - Type of compared objects.
  * @param keys - Ordered list of property paths to compare.
  * @param direction - Sort direction applied to each key, 'asc' by default.
- * @param defaultValues - Optional default values, aligned with `keys`.
+ * @param nullsFirst - Optional
  * @throws Error when `keys` is empty or when `defaultValues` length is invalid.
  * @returns A comparator compatible with `Array.prototype.sort`.
  */
-function propertiesPathComparator(keys, direction = 'asc', defaultValues) {
-    if (!keys || !keys.length || (defaultValues && keys.length > defaultValues.length)) {
+function propertiesPathComparator(keys, direction = 'asc', nullsFirst) {
+    if (isEmptyArray(keys)) {
         throw new Error("Invalid arguments: missing 'keys' or array 'defaultValues' has a bad length");
     }
+    nullsFirst = nullsFirst ?? direction === 'desc';
     const compareFn = direction === 'asc' ? compareValues : compareValuesDesc;
     return (a, b) => keys
         .map((key, index) => {
-        const valueA = getPropertyByPath(a, key, defaultValues && defaultValues[index]);
-        const valueB = getPropertyByPath(b, key, defaultValues && defaultValues[index]);
+        const valueA = getPropertyByPath(a, key);
+        const valueB = getPropertyByPath(b, key);
+        if (valueA == null && valueB == null)
+            return 0;
+        if (valueA == null)
+            return nullsFirst ? -1 : 1;
+        if (valueB == null)
+            return nullsFirst ? 1 : -1;
         return compareFn(valueA, valueB);
     })
         // Stop if not equals, otherwise continue with the next key
@@ -686,9 +708,10 @@ function propertiesPathComparator(keys, direction = 'asc', defaultValues) {
  */
 function composeComparators(...comparators) {
     return (a, b) => {
-        return comparators?.map(comparator => comparator(a, b))
+        return (comparators
+            ?.map((comparator) => comparator(a, b))
             // Stop if not equals, otherwise continue with the next key
-            .find((res) => res !== 0) || 0;
+            .find((res) => res !== 0) || 0);
     };
 }
 function sort(array, attribute, opts) {
@@ -27164,11 +27187,11 @@ function RxStateComputed(dependencies, computeFn, opts) {
 function RxStateOutput(statePropertyName, opts) {
     return function (target, key) {
         // Naming convention check
-        if (!production && !key.endsWith('Changes')) {
-            console.warn(`[RxStateOutput] Convention: Property ${target.constructor?.name}.${String(key)} should end with 'Changes' to indicate it's an Output`);
+        if (!production && !key.endsWith('Changes') && !key.endsWith('Change')) {
+            console.warn(`[RxStateOutput] Convention: Property ${target.constructor?.name}.${String(key)} should end with 'Change' or 'Changes' to indicate it's an Output`);
         }
         // Determine state property name
-        const finalStatePropertyName = statePropertyName || key.replace(/Changes$/, '');
+        const finalStatePropertyName = statePropertyName || key.replace(/Changes?$/, '');
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
         const cachePropertyName = `__${key}_cache`;
@@ -39604,7 +39627,7 @@ class AppTable {
     startCellValueChanges(name, row) {
         const def = this._cellValueChangesDefs[name];
         if (!def) {
-            console.warn('[table] Listener with name {' + name + '} not registered! Please call registerCellValueChanges() before;');
+            console.warn(`[table] Listener with name {${name} not registered! Please call registerCellValueChanges() before`);
             return;
         }
         // Stop previous subscription