@elderbyte/ngx-starter 17.6.3 → 17.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
export function naturalValueComparator(a, b) {
|
|
2
|
+
if (a === b) {
|
|
3
|
+
return 0;
|
|
4
|
+
}
|
|
5
|
+
if (a === null || a === undefined) {
|
|
6
|
+
return -1;
|
|
7
|
+
}
|
|
8
|
+
if (b === null || b === undefined) {
|
|
9
|
+
return 1;
|
|
10
|
+
}
|
|
2
11
|
return (a < b) ? -1 : (a > b) ? 1 : 0;
|
|
3
12
|
}
|
|
4
13
|
export function alphaNumStringComparator(a, b) {
|
|
@@ -69,7 +78,7 @@ export class ComparatorBuilder {
|
|
|
69
78
|
let sortOrder = 1;
|
|
70
79
|
if (property[0] === '-') {
|
|
71
80
|
sortOrder = -1;
|
|
72
|
-
property = property.
|
|
81
|
+
property = property.substring(1);
|
|
73
82
|
}
|
|
74
83
|
return (a, b) => {
|
|
75
84
|
const aValue = ComparatorBuilder.resolveProperty(a, property);
|
|
@@ -96,4 +105,4 @@ export class ComparatorBuilder {
|
|
|
96
105
|
return resolved;
|
|
97
106
|
}
|
|
98
107
|
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"field-comparator.js","sourceRoot":"","sources":["../../../../../../../projects/elderbyte/ngx-starter/src/lib/common/data/field-comparator.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,sBAAsB,CAAC,CAAM,EAAE,CAAM;IACnD,IAAI,CAAC,KAAK,CAAC,EAAE;QACX,OAAO,CAAC,CAAC;KACV;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,CAAC,CAAC;KACX;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,CAAM,EAAE,CAAM;IACrD,IAAI,CAAC,KAAK,CAAC,EAAE;QACX,OAAO,CAAC,CAAC;KACV;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,CAAC,CAAC;KACX;IACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,CAAC;KACV;IACD,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,iBAAiB;IAE5B;;;;gFAI4E;aAE9D,6BAAwB,GAAsB,sBAAsB,CAAC;aACrE,+BAA0B,GAAyB,wBAAwB,CAAC;IAE1F;;;;gFAI4E;IAE5E;;;;OAIG;IACI,MAAM,CAAC,SAAS,CAAU,GAAG,MAAgB;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC;QACrB,OAAO,UAAU,IAAI,EAAE,IAAI;YACzB,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAC;YACxC;;eAEG;YACH,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,EAAE;gBAC7C,MAAM,GAAG,iBAAiB,CAAC,WAAW,CACpC,KAAK,CAAC,CAAC,CAAC,EACR,iBAAiB,CAAC,wBAAwB,EAC1C,iBAAiB,CAAC,0BAA0B,CAC7C,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACd,CAAC,EAAE,CAAC;aACL;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;IAED;;;;gFAI4E;IAGpE,MAAM,CAAC,WAAW,CACxB,QAAgB,EAChB,sBAAuC,EACvC,qBAA2C;QAE3C,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACvB,SAAS,GAAG,CAAC,CAAC,CAAC;YACf,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAClC;QAED,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACd,MAAM,MAAM,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9D,MAAM,MAAM,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9D,IAAI,MAAc,CAAC;YACnB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC5D,MAAM,GAAG,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAChD;iBAAM;gBACL,MAAM,GAAG,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aACjD;YACD,OAAO,MAAM,GAAG,SAAS,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;IAGO,MAAM,CAAC,eAAe,CAAC,GAAQ,EAAE,QAAgB;QACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,GAAQ,GAAG,CAAC;QAExB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,IAAI,CAAC;aACb;YACD,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC3B;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC","sourcesContent":["\nexport type ComparatorFn<T> = (a: T, b: T) => number;\n\nexport function naturalValueComparator(a: any, b: any): number {\n  if (a === b) {\n    return 0;\n  }\n  if (a === null || a === undefined) {\n    return -1;\n  }\n  if (b === null || b === undefined) {\n    return 1;\n  }\n  return (a < b) ? -1 : (a > b) ? 1 : 0;\n}\n\nexport function alphaNumStringComparator(a: any, b: any): number {\n  if (a === b) {\n    return 0;\n  }\n  if (a === null || a === undefined) {\n    return -1;\n  }\n  if (b === null || b === undefined) {\n    return 1;\n  }\n  return a.localeCompare(b, 'en', { numeric: true });\n}\n\n/**\n * Provides the ability to build a sorting comparator dynamically using\n * a given array of fields / additional syntax.\n *\n * - Supports ASC / DESC\n * - Supports multiple fields\n * - Supports nested fields\n *\n * Example:\n *\n * ComparatorBuilder.fieldSort('simple', '-reveresed', 'some.very.deep.nested.path')\n *\n */\nexport class ComparatorBuilder {\n\n  /***************************************************************************\n   *                                                                         *\n   * Fields                                                                  *\n   *                                                                         *\n   **************************************************************************/\n\n  public static NATURAL_VALUE_COMPARATOR: ComparatorFn<any> = naturalValueComparator;\n  public static ALPHANUM_STRING_COMPARATOR: ComparatorFn<string> = alphaNumStringComparator;\n\n  /***************************************************************************\n   *                                                                         *\n   * Public API                                                              *\n   *                                                                         *\n   **************************************************************************/\n\n  /**\n   * Dynamically builds a comparator function, using the given fields for sorting.\n   *\n   * @param fields One or more field name to sort.\n   */\n  public static fieldSort<T = any>(...fields: string[]): ComparatorFn<T> {\n    const props = fields;\n    return function (obj1, obj2) {\n      let i = 0;\n      let result = 0;\n      const numberOfProperties = props.length;\n      /* try getting a different result from 0 (equal)\n       * as long as we have extra properties to compare\n       */\n      while (result === 0 && i < numberOfProperties) {\n        result = ComparatorBuilder.dynamicSort(\n          props[i],\n          ComparatorBuilder.NATURAL_VALUE_COMPARATOR,\n          ComparatorBuilder.ALPHANUM_STRING_COMPARATOR\n        )(obj1, obj2);\n        i++;\n      }\n      return result;\n    };\n  }\n\n  /***************************************************************************\n   *                                                                         *\n   * Private methods                                                         *\n   *                                                                         *\n   **************************************************************************/\n\n\n  private static dynamicSort<T = any>(\n    property: string,\n    genericValueComparator: ComparatorFn<T>,\n    stringValueComparator: ComparatorFn<string>,\n  ): ComparatorFn<T> {\n    let sortOrder = 1;\n    if (property[0] === '-') {\n      sortOrder = -1;\n      property = property.substring(1);\n    }\n\n    return (a, b) => {\n      const aValue = ComparatorBuilder.resolveProperty(a, property);\n      const bValue = ComparatorBuilder.resolveProperty(b, property);\n      let result: number;\n      if (typeof aValue === 'string' && typeof bValue === 'string') {\n        result = stringValueComparator(aValue, bValue);\n      } else {\n        result = genericValueComparator(aValue, bValue);\n      }\n      return result * sortOrder;\n    };\n  }\n\n\n  private static resolveProperty(obj: any, property: string): any {\n    const parts = property.split('.');\n    let resolved: any = obj;\n\n    for (const part of parts) {\n      if (!resolved) {\n        return null;\n      }\n      resolved = resolved[part];\n    }\n    return resolved;\n  }\n\n}\n"]}
|
|
@@ -3138,6 +3138,15 @@ class HttpParamsBuilder {
|
|
|
3138
3138
|
}
|
|
3139
3139
|
|
|
3140
3140
|
function naturalValueComparator(a, b) {
|
|
3141
|
+
if (a === b) {
|
|
3142
|
+
return 0;
|
|
3143
|
+
}
|
|
3144
|
+
if (a === null || a === undefined) {
|
|
3145
|
+
return -1;
|
|
3146
|
+
}
|
|
3147
|
+
if (b === null || b === undefined) {
|
|
3148
|
+
return 1;
|
|
3149
|
+
}
|
|
3141
3150
|
return (a < b) ? -1 : (a > b) ? 1 : 0;
|
|
3142
3151
|
}
|
|
3143
3152
|
function alphaNumStringComparator(a, b) {
|
|
@@ -3208,7 +3217,7 @@ class ComparatorBuilder {
|
|
|
3208
3217
|
let sortOrder = 1;
|
|
3209
3218
|
if (property[0] === '-') {
|
|
3210
3219
|
sortOrder = -1;
|
|
3211
|
-
property = property.
|
|
3220
|
+
property = property.substring(1);
|
|
3212
3221
|
}
|
|
3213
3222
|
return (a, b) => {
|
|
3214
3223
|
const aValue = ComparatorBuilder.resolveProperty(a, property);
|