mirror of
https://github.com/ascribe/onion.git
synced 2024-12-22 09:23:13 +01:00
Replace remaining general utils with js-utility-belt's
And removes a few unused utils
This commit is contained in:
parent
56044488d7
commit
ec78ecb8ab
@ -1,5 +1,3 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Checks shallow equality
|
||||
* Re-export of shallow from shallow-equals
|
||||
@ -8,51 +6,15 @@ export { default as isShallowEqual } from 'shallow-equals';
|
||||
|
||||
// Re-export general utilities from js-utility-belt for easier access
|
||||
export {
|
||||
deepMatchObject,
|
||||
intersectLists,
|
||||
omitFromObject,
|
||||
safeMerge,
|
||||
sanitize
|
||||
sanitize,
|
||||
sanitizeList,
|
||||
selectFromObject
|
||||
} from 'js-utility-belt/es6';
|
||||
|
||||
/**
|
||||
* Removes all falsy values (undefined, null, false, ...) from a list/array
|
||||
* @param {array} l the array to sanitize
|
||||
* @return {array} the sanitized array
|
||||
*/
|
||||
export function sanitizeList(l) {
|
||||
let sanitizedList = [];
|
||||
|
||||
for(let i = 0; i < l.length; i++) {
|
||||
if(l[i]) {
|
||||
sanitizedList.push(l[i]);
|
||||
}
|
||||
}
|
||||
|
||||
return sanitizedList;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sums up a list of numbers. Like a Epsilon-math-kinda-sum...
|
||||
*/
|
||||
export function sumNumList(l) {
|
||||
let sum = 0;
|
||||
l.forEach((num) => sum += parseFloat(num) || 0);
|
||||
return sum;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
/**
|
||||
* In place update of a dictionary
|
||||
*/
|
||||
export function update(a, ...l) {
|
||||
for(let i = 0; i < l.length; i++) {
|
||||
for (let attrname in l[i]) {
|
||||
a[attrname] = l[i][attrname];
|
||||
}
|
||||
}
|
||||
|
||||
return a;
|
||||
}
|
||||
|
||||
/**
|
||||
* Escape HTML in a string so it can be injected safely using
|
||||
* React's `dangerouslySetInnerHTML`
|
||||
@ -65,107 +27,6 @@ export function escapeHTML(s) {
|
||||
return document.createElement('div').appendChild(document.createTextNode(s)).parentNode.innerHTML;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a copy of the given object's own and inherited enumerable
|
||||
* properties, omitting any keys that pass the given filter function.
|
||||
*/
|
||||
function applyFilterOnObject(obj, filterFn) {
|
||||
const filteredObj = {};
|
||||
|
||||
for (let key in obj) {
|
||||
const val = obj[key];
|
||||
if (filterFn == null || !filterFn(val, key)) {
|
||||
filteredObj[key] = val;
|
||||
}
|
||||
}
|
||||
|
||||
return filteredObj;
|
||||
}
|
||||
|
||||
/**
|
||||
* Abstraction for selectFromObject and omitFromObject
|
||||
* for DRYness
|
||||
* @param {boolean} isInclusion True if the filter should be for including the filtered items
|
||||
* (ie. selecting only them vs omitting only them)
|
||||
*/
|
||||
function filterFromObject(obj, filter, { isInclusion = true } = {}) {
|
||||
if (filter && filter.constructor === Array) {
|
||||
return applyFilterOnObject(obj, isInclusion ? ((_, key) => filter.indexOf(key) < 0)
|
||||
: ((_, key) => filter.indexOf(key) >= 0));
|
||||
} else if (filter && typeof filter === 'function') {
|
||||
// Flip the filter fn's return if it's for inclusion
|
||||
return applyFilterOnObject(obj, isInclusion ? (...args) => !filter(...args)
|
||||
: filter);
|
||||
} else {
|
||||
throw new Error('The given filter is not an array or function. Exclude aborted');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Similar to lodash's _.pick(), this returns a copy of the given object's
|
||||
* own and inherited enumerable properties, selecting only the keys in
|
||||
* the given array or whose value pass the given filter function.
|
||||
* @param {object} obj Source object
|
||||
* @param {array|function} filter Array of key names to select or function to invoke per iteration
|
||||
* @return {object} The new object
|
||||
*/
|
||||
export function selectFromObject(obj, filter) {
|
||||
return filterFromObject(obj, filter);
|
||||
}
|
||||
|
||||
/**
|
||||
* Similar to lodash's _.omit(), this returns a copy of the given object's
|
||||
* own and inherited enumerable properties, omitting any keys that are
|
||||
* in the given array or whose value pass the given filter function.
|
||||
* @param {object} obj Source object
|
||||
* @param {array|function} filter Array of key names to omit or function to invoke per iteration
|
||||
* @return {object} The new object
|
||||
*/
|
||||
export function omitFromObject(obj, filter) {
|
||||
return filterFromObject(obj, filter, { isInclusion: false });
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively tests an object against a "match" object to see if the
|
||||
* object is similar to the "match" object. In other words, this will
|
||||
* deeply traverse the "match" object's properties and check them
|
||||
* against the object by using the testFn.
|
||||
*
|
||||
* The object is considered a match if all primitive properties in the
|
||||
* "match" object are found and accepted in the object by the testFn.
|
||||
*
|
||||
* @param {object} obj Object to test
|
||||
* @param {object} match "Match" object to test against
|
||||
* @param {(function)} testFn Function to use on each property test.
|
||||
* Return true to accept the match.
|
||||
* By default, applies strict equality using ===
|
||||
* @return {boolean} True if obj matches the "match" object
|
||||
*/
|
||||
export function deepMatchObject(obj, match, testFn = (objProp, matchProp) => objProp === matchProp) {
|
||||
if (typeof match !== 'object') {
|
||||
throw new Error('Your specified match argument was not an object');
|
||||
}
|
||||
if (typeof testFn !== 'function') {
|
||||
throw new Error('Your specified test function was not a function');
|
||||
}
|
||||
|
||||
return Object
|
||||
.keys(match)
|
||||
.reduce((result, matchKey) => {
|
||||
if (!result) { return false; }
|
||||
|
||||
const objProp = obj && obj[matchKey];
|
||||
const matchProp = match[matchKey];
|
||||
|
||||
if (typeof matchProp === 'object') {
|
||||
return (typeof objProp === 'object') ? deepMatchObject(objProp, matchProp, testFn)
|
||||
: false;
|
||||
} else {
|
||||
return testFn(objProp, matchProp);
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes a string and breaks it at the supplied index and replaces it
|
||||
* with a (potentially) short string that also has been provided
|
||||
@ -203,13 +64,3 @@ export function getSubdomain() {
|
||||
let tokens = host.split('.');
|
||||
return tokens.length > 2 ? tokens[0] : 'www';
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes two lists and returns their intersection as a list
|
||||
* @param {Array} a
|
||||
* @param {Array} b
|
||||
* @return {[Array]} Intersected list of a and b
|
||||
*/
|
||||
export function intersectLists(a, b) {
|
||||
return a.filter((val) => b.indexOf(val) > -1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user