@steroidsjs/core 2.0.1-beta.112 → 2.0.1-beta.113

package/ui/nav/index.ts

@@ -1,5 +1,5 @@
-import Nav from './Nav';
-import Router from './Router';
-import Link from './Link';
-import Breadcrumbs from './Breadcrumbs';
-export { Nav, Router, Link, Breadcrumbs };
+import Nav from './Nav';
+import Router from './Router';
+import Link from './Link';
+import Breadcrumbs from './Breadcrumbs';
+export { Nav, Router, Link, Breadcrumbs };

package/utils/collection.ts

@@ -1,13 +1,13 @@
-import _isArray from 'lodash-es/isArray';
-
-export const indexBy = (collection, key) => {
-    if (!_isArray(collection)) {
-        return collection;
-    }
-
-    const result = {};
-    (collection || []).forEach(item => {
-        result[item[key]] = item;
-    });
-    return result;
+import _isArray from 'lodash-es/isArray';
+
+export const indexBy = (collection, key) => {
+    if (!_isArray(collection)) {
+        return collection;
+    }
+
+    const result = {};
+    (collection || []).forEach(item => {
+        result[item[key]] = item;
+    });
+    return result;
 }

package/utils/data.ts

@@ -1,120 +1,120 @@
-import _uniqBy from 'lodash-es/uniqBy';
-import _isString from 'lodash-es/isString';
-import _isArray from 'lodash-es/isArray';
-import _some from 'lodash-es/some';
-import _has from 'lodash-es/has';
-import _isObject from 'lodash-es/isObject';
-import _isInteger from 'lodash-es/isInteger';
-import _isFunction from 'lodash-es/isFunction';
-import _every from 'lodash-es/every';
-
-/**
- * Normalize items for save to state. Support enum class or normal items list.
- * @param {array|object} items
- * @returns {*}
- */
-export const normalizeItems = (items) => {
-    // Array
-    if (_isArray(items)) {
-        // List of strings/numbers
-        if (_some(items, item => _isString(item) || _isInteger(item))) {
-            return items.map(item => {
-                if (_isString(item) || _isInteger(item)) {
-                    return {
-                        id: item,
-                        label: item
-                    };
-                }
-                return item;
-            });
-        }
-        // Labels as ids
-        if (_some(items, item => !_has(item, 'id'))) {
-            return _uniqBy(
-                items.map(item => {
-                    return {
-                        id: item.label,
-                        ...item
-                    };
-                }),
-                'label'
-            );
-        }
-        return items;
-    }
-    // Enum
-    if (_isObject(items) && _isFunction(items.getLabels)) {
-        const labels = items.getLabels();
-        return Object.keys(labels).map(id => ({
-            id,
-            label: labels[id]
-        }));
-    }
-    return [];
-};
-
-export const filterItems = (items: Array<any>, condition: any) => {
-    return items.filter(item => checkCondition(item, condition));
-}
-
-export const checkCondition = (item, condition) => {
-    if (_isObject(condition) && !_isArray(condition)) {
-        return _every(Object.keys(condition), key => {
-            const value = condition[key];
-            const operator = _isString(value) ? 'like' : '=';
-            return checkCondition(item, [operator, key, value]);
-        });
-    }
-    if (_isArray(condition) && condition.length > 1) {
-        const operator = condition[0].toLowerCase();
-
-        // ['not', {role: 'admin'}]
-        if (operator.indexOf('not') === 0) {
-            const newOperator = operator.replace(/^not\s+/, '');
-            return !checkCondition(item, [newOperator].concat(condition.slice(1)));
-        }
-
-        const key = condition[1];
-        const value = condition[2];
-        switch (operator) {
-            case '=': // ['=', 'age', 18]
-                return item[key] === value;
-
-            case '>': // ['>', 'age', 18]
-                return item[key] > value;
-
-            case '>=': // ['>=', 'age', 18]
-            case '=>':
-                return item[key] >= value;
-
-            case '<': // ['<', 'age', 18]
-                return item[key] < value;
-
-            case '<=': // ['<=', 'age', 18]
-            case '=<':
-                return item[key] <= value;
-
-            case 'and': // ['and', {isActive: true}, ['=', 'name', 'Ivan']]
-            case '&&':
-                return _every(condition.slice(1), subCondition => checkCondition(item, subCondition));
-
-            case 'or': // ['or', {isAdmin: true}, ['=', 'name', 'Ivan']]
-            case '||':
-                return _some(condition.slice(1), subCondition => checkCondition(item, subCondition));
-
-            case 'like': // ['like', 'name', 'alex']
-                return _isString(item[key]) && item[key].toLowerCase().indexOf(value.toLowerCase()) !== -1;
-
-            case 'between': // ['between', 'size', 5, 10]
-                return condition[2] <= value && value <= condition[3];
-
-            case 'in': // ['in', 'ids', [5, 6, 10]]
-                return _isArray(item[key]) && item[key].includes(value);
-        }
-    }
-    if (_isFunction(condition)) {
-        return !!condition(item);
-    }
-
-    return true;
-}
+import _uniqBy from 'lodash-es/uniqBy';
+import _isString from 'lodash-es/isString';
+import _isArray from 'lodash-es/isArray';
+import _some from 'lodash-es/some';
+import _has from 'lodash-es/has';
+import _isObject from 'lodash-es/isObject';
+import _isInteger from 'lodash-es/isInteger';
+import _isFunction from 'lodash-es/isFunction';
+import _every from 'lodash-es/every';
+
+/**
+ * Normalize items for save to state. Support enum class or normal items list.
+ * @param {array|object} items
+ * @returns {*}
+ */
+export const normalizeItems = (items) => {
+    // Array
+    if (_isArray(items)) {
+        // List of strings/numbers
+        if (_some(items, item => _isString(item) || _isInteger(item))) {
+            return items.map(item => {
+                if (_isString(item) || _isInteger(item)) {
+                    return {
+                        id: item,
+                        label: item
+                    };
+                }
+                return item;
+            });
+        }
+        // Labels as ids
+        if (_some(items, item => !_has(item, 'id'))) {
+            return _uniqBy(
+                items.map(item => {
+                    return {
+                        id: item.label,
+                        ...item
+                    };
+                }),
+                'label'
+            );
+        }
+        return items;
+    }
+    // Enum
+    if (_isObject(items) && _isFunction(items.getLabels)) {
+        const labels = items.getLabels();
+        return Object.keys(labels).map(id => ({
+            id,
+            label: labels[id]
+        }));
+    }
+    return [];
+};
+
+export const filterItems = (items: Array<any>, condition: any) => {
+    return items.filter(item => checkCondition(item, condition));
+}
+
+export const checkCondition = (item, condition) => {
+    if (_isObject(condition) && !_isArray(condition)) {
+        return _every(Object.keys(condition), key => {
+            const value = condition[key];
+            const operator = _isString(value) ? 'like' : '=';
+            return checkCondition(item, [operator, key, value]);
+        });
+    }
+    if (_isArray(condition) && condition.length > 1) {
+        const operator = condition[0].toLowerCase();
+
+        // ['not', {role: 'admin'}]
+        if (operator.indexOf('not') === 0) {
+            const newOperator = operator.replace(/^not\s+/, '');
+            return !checkCondition(item, [newOperator].concat(condition.slice(1)));
+        }
+
+        const key = condition[1];
+        const value = condition[2];
+        switch (operator) {
+            case '=': // ['=', 'age', 18]
+                return item[key] === value;
+
+            case '>': // ['>', 'age', 18]
+                return item[key] > value;
+
+            case '>=': // ['>=', 'age', 18]
+            case '=>':
+                return item[key] >= value;
+
+            case '<': // ['<', 'age', 18]
+                return item[key] < value;
+
+            case '<=': // ['<=', 'age', 18]
+            case '=<':
+                return item[key] <= value;
+
+            case 'and': // ['and', {isActive: true}, ['=', 'name', 'Ivan']]
+            case '&&':
+                return _every(condition.slice(1), subCondition => checkCondition(item, subCondition));
+
+            case 'or': // ['or', {isAdmin: true}, ['=', 'name', 'Ivan']]
+            case '||':
+                return _some(condition.slice(1), subCondition => checkCondition(item, subCondition));
+
+            case 'like': // ['like', 'name', 'alex']
+                return _isString(item[key]) && item[key].toLowerCase().indexOf(value.toLowerCase()) !== -1;
+
+            case 'between': // ['between', 'size', 5, 10]
+                return condition[2] <= value && value <= condition[3];
+
+            case 'in': // ['in', 'ids', [5, 6, 10]]
+                return _isArray(item[key]) && item[key].includes(value);
+        }
+    }
+    if (_isFunction(condition)) {
+        return !!condition(item);
+    }
+
+    return true;
+}

package/utils/query.ts

@@ -1,147 +1,147 @@
-import queryString from 'query-string';
-import _get from 'lodash-es/get';
-import _isObject from 'lodash-es/isObject';
-import _isString from 'lodash-es/isString';
-import _toInteger from 'lodash-es/toInteger';
-import _groupBy from 'lodash-es/groupBy';
-import _cloneDeep from 'lodash-es/cloneDeep';
-import {replace} from 'connected-react-router';
-import {Model} from '../components/MetaComponent';
-
-export const queryConfig = (config, defaultConfig = null) => {
-    config = _isObject(config) ? config : {};
-    defaultConfig = defaultConfig ? queryConfig(defaultConfig) : {};
-
-    config = _cloneDeep({
-        useHash: false,
-        attributes: [],
-        ...config,
-    });
-
-    const defaults = _groupBy(defaultConfig.attributes, 'attribute');
-    Object.keys(defaults).forEach(attribute => {
-        if (!config.attributes.find(item => item === attribute || item.attribute === attribute)) {
-            config.attributes.push(attribute);
-        }
-    });
-
-    // Normalize attributes
-    config.attributes = config.attributes
-        .map(item => {
-            if (_isString(item)) {
-                item = {attribute: item};
-            }
-
-            item = {
-                type: 'string', // string, string[], number, number[], boolean, boolean[]
-                attribute: null,
-                defaultValue: null,
-                toFormConverter: null,
-                toQueryConverter: null,
-                ..._get(defaults, [item.attribute, 0]),
-                ...item,
-            };
-
-            return item;
-        })
-        .filter(item => !!item.attribute);
-
-    return config;
-};
-
-export const defaultFromStringConverter = (value, type, item) => {
-    type = type || '';
-
-    // Array
-    if (type.substr(-2) === '[]') {
-        const subType = type.substr(0, type.length - 2);
-        return value
-            ? value.split(',').map(v => defaultFromStringConverter(v, subType, item))
-            : null;
-    }
-
-    // Single
-    switch (type) {
-        case 'number':
-            return value || String(value) === '0' ? _toInteger(value) : null;
-
-        case 'boolean':
-            return ['1', 't', 'y'].includes(String(value).substr(0, 1)) || null;
-
-        default:
-        case 'string':
-            return value ? String(value) : null;
-    }
-};
-
-export const defaultToStringConverter = (value, type, item) => {
-    type = type || '';
-
-    // Array
-    if (type.substr(-2) === '[]') {
-        return value
-            ? value.join(',')
-            : null;
-    }
-
-    // Single
-    switch (type) {
-        case 'boolean':
-            return value ? '1' : null;
-
-        default:
-        case 'string':
-        case 'number':
-            return value ? String(value) : null;
-    }
-};
-
-export const queryRestore = (model: Model, location, useHash) => {
-    const values = queryString.parse(useHash ? location.hash : location.search);
-    const result = {};
-
-    model.attributes.forEach(item => {
-        if (typeof item !== 'string') {
-            const converter = item.fromStringConverter || defaultFromStringConverter;
-            const value = converter(String(values[item.attribute]), item.type, item);
-            if (value !== null || item.defaultValue !== null) {
-                result[item.attribute] = value !== null ? value : item.defaultValue;
-            }
-        }
-    });
-
-    return result;
-};
-
-/**
- * WARNING
- * Method incorrectly saves nested objects (e.g. {foo: [{bar: 1}]}
- * // @todo use 'qs' library instead of 'query-string'
- *
- */
-export const queryReplace = (model: Model, location, values, useHash) => {
-    const result = {};
-    model.attributes.forEach(item => {
-        if (typeof item !== 'string' && values[item.attribute] !== item.defaultValue) {
-            const converter = item.toStringConverter || defaultToStringConverter;
-            const value = converter(values[item.attribute], item.type, item);
-            if (value !== null) {
-                result[item.attribute] = value;
-            }
-        }
-    });
-
-    let query = queryString.stringify(result);
-    if (useHash) {
-        query = '#' + query;
-        if (location.hash !== query) {
-            location.hash = query;
-        }
-        return [];
-    } else {
-        query = '?' + query
-        if (location.search !== query) {
-            return replace(location.pathname + query);
-        }
-    }
-};
+import queryString from 'query-string';
+import _get from 'lodash-es/get';
+import _isObject from 'lodash-es/isObject';
+import _isString from 'lodash-es/isString';
+import _toInteger from 'lodash-es/toInteger';
+import _groupBy from 'lodash-es/groupBy';
+import _cloneDeep from 'lodash-es/cloneDeep';
+import {replace} from 'connected-react-router';
+import {Model} from '../components/MetaComponent';
+
+export const queryConfig = (config, defaultConfig = null) => {
+    config = _isObject(config) ? config : {};
+    defaultConfig = defaultConfig ? queryConfig(defaultConfig) : {};
+
+    config = _cloneDeep({
+        useHash: false,
+        attributes: [],
+        ...config,
+    });
+
+    const defaults = _groupBy(defaultConfig.attributes, 'attribute');
+    Object.keys(defaults).forEach(attribute => {
+        if (!config.attributes.find(item => item === attribute || item.attribute === attribute)) {
+            config.attributes.push(attribute);
+        }
+    });
+
+    // Normalize attributes
+    config.attributes = config.attributes
+        .map(item => {
+            if (_isString(item)) {
+                item = {attribute: item};
+            }
+
+            item = {
+                type: 'string', // string, string[], number, number[], boolean, boolean[]
+                attribute: null,
+                defaultValue: null,
+                toFormConverter: null,
+                toQueryConverter: null,
+                ..._get(defaults, [item.attribute, 0]),
+                ...item,
+            };
+
+            return item;
+        })
+        .filter(item => !!item.attribute);
+
+    return config;
+};
+
+export const defaultFromStringConverter = (value, type, item) => {
+    type = type || '';
+
+    // Array
+    if (type.substr(-2) === '[]') {
+        const subType = type.substr(0, type.length - 2);
+        return value
+            ? value.split(',').map(v => defaultFromStringConverter(v, subType, item))
+            : null;
+    }
+
+    // Single
+    switch (type) {
+        case 'number':
+            return value || String(value) === '0' ? _toInteger(value) : null;
+
+        case 'boolean':
+            return ['1', 't', 'y'].includes(String(value).substr(0, 1)) || null;
+
+        default:
+        case 'string':
+            return value ? String(value) : null;
+    }
+};
+
+export const defaultToStringConverter = (value, type, item) => {
+    type = type || '';
+
+    // Array
+    if (type.substr(-2) === '[]') {
+        return value
+            ? value.join(',')
+            : null;
+    }
+
+    // Single
+    switch (type) {
+        case 'boolean':
+            return value ? '1' : null;
+
+        default:
+        case 'string':
+        case 'number':
+            return value ? String(value) : null;
+    }
+};
+
+export const queryRestore = (model: Model, location, useHash) => {
+    const values = queryString.parse(useHash ? location.hash : location.search);
+    const result = {};
+
+    model.attributes.forEach(item => {
+        if (typeof item !== 'string') {
+            const converter = item.fromStringConverter || defaultFromStringConverter;
+            const value = converter(String(values[item.attribute]), item.type, item);
+            if (value !== null || item.defaultValue !== null) {
+                result[item.attribute] = value !== null ? value : item.defaultValue;
+            }
+        }
+    });
+
+    return result;
+};
+
+/**
+ * WARNING
+ * Method incorrectly saves nested objects (e.g. {foo: [{bar: 1}]}
+ * // @todo use 'qs' library instead of 'query-string'
+ *
+ */
+export const queryReplace = (model: Model, location, values, useHash) => {
+    const result = {};
+    model.attributes.forEach(item => {
+        if (typeof item !== 'string' && values[item.attribute] !== item.defaultValue) {
+            const converter = item.toStringConverter || defaultToStringConverter;
+            const value = converter(values[item.attribute], item.type, item);
+            if (value !== null) {
+                result[item.attribute] = value;
+            }
+        }
+    });
+
+    let query = queryString.stringify(result);
+    if (useHash) {
+        query = '#' + query;
+        if (location.hash !== query) {
+            location.hash = query;
+        }
+        return [];
+    } else {
+        query = '?' + query
+        if (location.search !== query) {
+            return replace(location.pathname + query);
+        }
+    }
+};