react-ui-basics 0.0.186 → 0.0.188

package/src/Tools.ts

@@ -169,30 +169,40 @@ export const removeEventListener = (el, type, listener, options?) => {
 export const UNDEFINED = undefined;
 export const isUndefined = a => a === UNDEFINED;
 
+export type ComparatorFunction<T> = (a: T, b: T) => number;
+export interface Comparator<T> extends ComparatorFunction<T>{
+    inverse : <T>() => Comparator<T>
+    and : <T>(comparator: Comparator<T>) => Comparator<T>
+}
+
+type SortOrder = 'ASC' | 'DESC';
+type FieldGetter<T> = (t: T) => any;
+type SortField<T> = keyof T | FieldGetter<T>;
 
 export class Comparators {
-    static SORT_ASC = 'ASC';
-    static SORT_DESC = 'DESC';
+    static SORT_ASC: SortOrder = 'ASC';
+    static SORT_DESC: SortOrder = 'DESC';
 
-    static of = (field, order, data) => {
+    static of = <T>(field: SortField<T> | SortField<T>[], order: SortOrder | SortOrder[], data?: T[]): Comparator<T> => {
         let comparator;
         if (Array.isArray(field)) {
             const isOrderArray = Array.isArray(order);
             comparator = Comparators.chain(field.map((it, i) => Comparators.of(it, (isOrderArray && order[i]) || Comparators.SORT_ASC, data)));
         } else if (isFunction(field)) {
-            if (data && data[0] && isString(field(data[0]))) {
+            const getter: FieldGetter<T> = field as FieldGetter<T>
+            if (data && data[0] && isString(getter(data[0]))) {
                 const collator = new Intl.Collator('default', {sensitivity: 'base'});
                 comparator = (a, b) => {
-                    return collator.compare(field(a), field(b));
+                    return collator.compare(getter(a), getter(b));
                 }
             } else
                 comparator = (a, b) => {
-                    const A = field(a);
-                    const B = field(b);
+                    const A = getter(a);
+                    const B = getter(b);
                     return (A < B ? -1 : (A > B ? 1 : 0));
                 };
         } else if (isString(field))
-            comparator = Comparators.of(it => it[field], Comparators.SORT_ASC, data);
+            comparator = Comparators.of(it => it[field as string], Comparators.SORT_ASC, data);
         else
             comparator = Comparators.of(it => it, Comparators.SORT_ASC, data);
 
@@ -202,7 +212,7 @@ export class Comparators {
 
         return addComparatorMethods(comparator);
     };
-    static chain = (comparators) => addComparatorMethods((a, b) => {
+    static chain = <T>(comparators: Comparator<T>[]) => addComparatorMethods((a: T, b: T) => {
             let result;
             for (let i = 0; i < comparators.length; i++) {
                 result = comparators[i](a, b);
@@ -213,11 +223,14 @@ export class Comparators {
         }
     );
 
-    static inverse = (comparator) => addComparatorMethods((a, b) => -comparator(a, b));
+    static inverse = <T>(comparator: Comparator<T>) => addComparatorMethods((a: T, b: T) => -comparator(a, b));
 }
 
-const addComparatorMethods = function (comparator) {
+const addComparatorMethods = <T>(cf: ComparatorFunction<T>): Comparator<T> => {
+    const comparator = cf as Comparator<T>
+    // @ts-ignore
     comparator.inverse = () => Comparators.inverse(comparator);
+    // @ts-ignore
     comparator.and = (another) => Comparators.chain([comparator, another]);
     return comparator;
 };

package/store/ProxyTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyTools.js","sources":["../src/store/ProxyTools.js"],"sourcesContent":["import {UNDEFINED} from \"../Tools\";\n\nexport const createProxy = (target) => {\n    if(!target)\n        return target\n    if (target.__isProxy)\n        return target;\n\n    let changedValue = UNDEFINED;\n    let deletedKeys = UNDEFINED;\n    let innerProxies = UNDEFINED\n    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it.__changed));\n\n    return new Proxy(target, {\n        get: function (target, prop) {\n            if (prop === '__isProxy')\n                return true\n            if (prop === '__changed')\n                return isChanged();\n            if (prop === 'bake')\n                return () => {\n                    // console.log('bake', changedValue, innerProxies)\n                    if (!isChanged())\n                        return target\n\n                    if (changedValue && !innerProxies)\n                        return changedValue\n\n                    if (innerProxies) {\n                        const result = changedValue || (Array.isArray(target) ? [...target] : {...target});\n\n                        for (let key in innerProxies) {\n                            result[key] = innerProxies[key].bake()\n                        }\n                        return result\n                    }\n\n                    throw new Error('state not implemented yet')\n                }\n\n            // console.log('get', {target, prop})\n            const innerProxy = innerProxies && innerProxies[prop];\n            if (innerProxy)\n                return innerProxy\n\n            const changed = changedValue && changedValue[prop]\n            if (changed !== UNDEFINED)\n                return changed\n\n            if (deletedKeys && deletedKeys[prop])\n                return null\n\n            const value = target[prop];\n            if (value && typeof value === 'object') {\n                !innerProxies && (innerProxies = {})\n                return innerProxies[prop] = createProxy(value)\n            }\n\n            return value;\n        },\n        set: function (target, prop, newval) {\n            // console.log('set', {target, prop, newval})\n            if (!changedValue) changedValue = Array.isArray(target) ? [...target] : {...target}\n\n            if (newval && typeof newval === 'object') {\n                !innerProxies && (innerProxies = {})\n                innerProxies[prop] = newval = createProxy(newval)\n            } else {\n                innerProxies && (delete innerProxies[prop])\n            }\n            changedValue[prop] = newval\n            // console.log('changedValue', changedValue)\n            return true;\n        },\n        deleteProperty: function (target, prop) {\n            // console.log('delete', {target, prop})\n            !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})\n\n            if (!prop in changedValue)\n                return false;\n\n            delete changedValue[prop]\n            innerProxies && delete innerProxies[prop]\n            !deletedKeys && (deletedKeys = {})\n            deletedKeys[prop] = true;\n            return true;\n        }\n    })\n}\n"],"names":["createProxy","target","__isProxy","changedValue","UNDEFINED","deletedKeys","innerProxies","isChanged","Object","values","some","it","__changed","Proxy","get","prop","result","Array","isArray","key","bake","Error","innerProxy","changed","value","set","newval","_objectSpread","deleteProperty"],"mappings":"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"}
+{"version":3,"file":"ProxyTools.js","sources":["../src/store/ProxyTools.js"],"sourcesContent":["import {UNDEFINED} from \"../Tools\";\n\nexport const createProxy = (target) => {\n    if(!target)\n        return target\n    if (target.__isProxy)\n        return target;\n\n    let changedValue = UNDEFINED;\n    let deletedKeys = UNDEFINED;\n    let innerProxies = UNDEFINED\n    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it.__changed));\n\n    return new Proxy(target, {\n        get: function (target, prop) {\n            if (prop === '__isProxy')\n                return true\n            if (prop === '__changed')\n                return isChanged();\n            if (prop === 'bake')\n                return () => {\n                    // console.log('bake', changedValue, innerProxies)\n                    if (!isChanged())\n                        return target\n\n                    if (changedValue && !innerProxies)\n                        return changedValue\n\n                    if (innerProxies) {\n                        const result = changedValue || (Array.isArray(target) ? [...target] : {...target});\n\n                        for (let key in innerProxies) {\n                            result[key] = innerProxies[key].bake()\n                        }\n                        return result\n                    }\n\n                    throw new Error('state not implemented yet')\n                }\n\n            // console.log('get', {target, prop})\n            const innerProxy = innerProxies && innerProxies[prop];\n            if (innerProxy)\n                return innerProxy\n\n            const changed = changedValue && changedValue[prop]\n            if (changed !== UNDEFINED)\n                return changed\n\n            if (deletedKeys && deletedKeys[prop])\n                return null\n\n            const value = target[prop];\n            if (value && typeof value === 'object') {\n                !innerProxies && (innerProxies = {})\n                return innerProxies[prop] = createProxy(value)\n            }\n\n            return value;\n        },\n        set: function (target, prop, newval) {\n            // console.log('set', {target, prop, newval})\n            if (!changedValue) changedValue = Array.isArray(target) ? [...target] : {...target}\n\n            if (newval && typeof newval === 'object') {\n                !innerProxies && (innerProxies = {})\n                innerProxies[prop] = newval = createProxy(newval)\n            } else {\n                innerProxies && (delete innerProxies[prop])\n            }\n            changedValue[prop] = newval\n            // console.log('changedValue', changedValue)\n            return true;\n        },\n        deleteProperty: function (target, prop) {\n            // console.log('delete', {target, prop})\n            !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})\n\n            if (!prop in changedValue)\n                return false;\n\n            delete changedValue[prop]\n            innerProxies && delete innerProxies[prop]\n            !deletedKeys && (deletedKeys = {})\n            deletedKeys[prop] = true;\n            return true;\n        }\n    })\n}\n"],"names":["createProxy","target","__isProxy","changedValue","UNDEFINED","deletedKeys","innerProxies","isChanged","Object","values","some","it","__changed","Proxy","get","prop","result","Array","isArray","key","bake","Error","innerProxy","changed","value","set","newval","_objectSpread","deleteProperty"],"mappings":"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"}