Skip to content

reduce object.keys usage in core/schema #3117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2017
Merged

reduce object.keys usage in core/schema #3117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 46 additions & 28 deletions src/core/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@ module.exports.isSingleProperty = isSingleProperty;
* @returns {object} Schema.
*/
module.exports.process = function (schema, componentName) {
var propName;

// For single property schema, run processPropDefinition over the whole schema.
if (isSingleProperty(schema)) {
return processPropertyDefinition(schema, componentName);
}

// For multi-property schema, run processPropDefinition over each property definition.
Object.keys(schema).forEach(function (propName) {
for (propName in schema) {
schema[propName] = processPropertyDefinition(schema[propName], componentName);
});
}
return schema;
};

Expand All @@ -55,7 +57,8 @@ function processPropertyDefinition (propDefinition, componentName) {

// Type inference.
if (!propDefinition.type) {
if (defaultVal !== undefined && ['boolean', 'number'].indexOf(typeof defaultVal) !== -1) {
if (defaultVal !== undefined &&
(typeof defaultVal === 'boolean' || typeof defaultVal === 'number')) {
// Type inference.
typeName = typeof defaultVal;
} else if (Array.isArray(defaultVal)) {
Expand Down Expand Up @@ -109,29 +112,39 @@ module.exports.processPropertyDefinition = processPropertyDefinition;
* @param {string } componentName - Name of the component, used for the property warning.
* @param {boolean} silent - Suppress warning messages.
*/
module.exports.parseProperties = function (propData, schema, getPartialData, componentName,
silent) {
var propNames = Object.keys(getPartialData ? propData : schema);

if (propData === null || typeof propData !== 'object') { return propData; }

// Validation errors.
Object.keys(propData).forEach(function (propName) {
if (!schema[propName] && !silent) {
warn('Unknown property `' + propName +
'` for component/system `' + componentName + '`.');
module.exports.parseProperties = (function () {
var propNames = [];

return function (propData, schema, getPartialData, componentName, silent) {
var i;
var propName;
var propDefinition;
var propValue;

propNames.length = 0;
for (propName in (getPartialData ? propData : schema)) { propNames.push(propName); }

if (propData === null || typeof propData !== 'object') { return propData; }

// Validation errors.
for (propName in propData) {
if (!schema[propName] && !silent) {
warn('Unknown property `' + propName +
'` for component/system `' + componentName + '`.');
}
}
});

propNames.forEach(function parse (propName) {
var propDefinition = schema[propName];
var propValue = propData[propName];
if (!(schema[propName])) { return; }
propData[propName] = parseProperty(propValue, propDefinition);
});
for (i = 0; i < propNames.length; i++) {
propName = propNames[i];
propDefinition = schema[propName];
propValue = propData[propName];
if (!(schema[propName])) { return; }
propData[propName] = parseProperty(propValue, propDefinition);
}

return propData;
};
return propData;
};
})();

/**
* Deserialize a single property.
Expand All @@ -151,17 +164,22 @@ module.exports.parseProperty = parseProperty;
* Serialize a group of properties.
*/
module.exports.stringifyProperties = function (propData, schema) {
var propName;
var propDefinition;
var propValue;
var stringifiedData = {};
Object.keys(propData).forEach(function (propName) {
var propDefinition = schema[propName];
var propValue = propData[propName];
var value = propValue;
var value;

for (propName in propData) {
propDefinition = schema[propName];
propValue = propData[propName];
value = propValue;
if (typeof value === 'object') {
value = stringifyProperty(propValue, propDefinition);
if (!propDefinition) { warn('Unknown component property: ' + propName); }
}
stringifiedData[propName] = value;
});
}
return stringifiedData;
};

Expand Down