Skip to content

Commit

Permalink
Rename convertOptions to conversionOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima committed Mar 25, 2021
1 parent d39b833 commit c870fe4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ module.exports = {
* Converts passed JDL relationships to JSON content.
* @param {Array<JDLRelationship>} jdlRelationships - the relationships to convert.
* @param {Array<String>} entityNames - all the entities' names.
* @param {Object} convertOptions - Convert options.
* @param {Boolean} [convertOptions.unilateralRelationships] - Whether to generate unilateral relationships
* @param {Object} conversionOptions - Convert options.
* @param {Boolean} [conversionOptions.unilateralRelationships] - Whether to generate unilateral relationships
* @return {Map<String, Array<Object>>} a map having for keys entity names and for values arrays of JSON relationships.
*/
function convert(jdlRelationships = [], entityNames = [], convertOptions = {}) {
function convert(jdlRelationships = [], entityNames = [], conversionOptions = {}) {
if (jdlRelationships.length === 0 || entityNames.length === 0) {
return new Map();
}
convertedRelationships = new Map(entityNames.map(entityName => [entityName, []]));
const relatedRelationships = getRelatedRelationships(jdlRelationships, entityNames);
relatedRelationships.forEach((relatedRelationship, currentEntityName) => {
setRelationshipsFromEntity(relatedRelationship, currentEntityName, convertOptions);
setRelationshipsToEntity(relatedRelationship, currentEntityName, convertOptions);
setRelationshipsFromEntity(relatedRelationship, currentEntityName, conversionOptions);
setRelationshipsToEntity(relatedRelationship, currentEntityName, conversionOptions);
});
return convertedRelationships;
}
Expand Down Expand Up @@ -77,8 +77,8 @@ function getRelatedRelationships(relationships, entityNames) {
return relatedRelationships;
}

function setRelationshipsFromEntity(relatedRelationships, entityName, convertOptions) {
const { unilateralRelationships } = convertOptions;
function setRelationshipsFromEntity(relatedRelationships, entityName, conversionOptions) {
const { unilateralRelationships } = conversionOptions;
relatedRelationships.from.forEach(relationshipToConvert => {
const otherSplitField = extractField(relationshipToConvert.injectedFieldInTo);
const convertedRelationship = {
Expand Down Expand Up @@ -107,7 +107,7 @@ function setRelationshipsFromEntity(relatedRelationships, entityName, convertOpt
convertedRelationship.ownerSide = true;
} else if (relationshipToConvert.type === MANY_TO_MANY) {
if (!relationshipToConvert.injectedFieldInTo) {
if (!convertOptions.unilateralRelationships && !builtInEntities.has(relationshipToConvert.to.toLowerCase())) {
if (!conversionOptions.unilateralRelationships && !builtInEntities.has(relationshipToConvert.to.toLowerCase())) {
convertedRelationship.otherEntityRelationshipName = lowerFirst(relationshipToConvert.from);
const convertedOtherEntityRelationships = convertedRelationships.get(relationshipToConvert.to);
const otherSideRelationship = {
Expand All @@ -131,15 +131,15 @@ function setRelationshipsFromEntity(relatedRelationships, entityName, convertOpt
});
}

function setRelationshipsToEntity(relatedRelationships, entityName, convertOptions) {
function setRelationshipsToEntity(relatedRelationships, entityName, conversionOptions) {
relatedRelationships.to.forEach(relationshipToConvert => {
const relationshipType = relationshipToConvert.type === ONE_TO_MANY ? MANY_TO_ONE : relationshipToConvert.type;
const otherSplitField = extractField(relationshipToConvert.injectedFieldInFrom);
const convertedRelationship = {
relationshipType: _.kebabCase(relationshipType),
otherEntityName: camelCase(relationshipToConvert.from),
};
if (!convertOptions.unilateralRelationships || otherSplitField.relationshipName) {
if (!conversionOptions.unilateralRelationships || otherSplitField.relationshipName) {
convertedRelationship.otherEntityRelationshipName =
lowerFirst(otherSplitField.relationshipName) || camelCase(relationshipToConvert.to);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ function setFields() {
});
}

function setRelationships(convertOptions) {
const convertedRelationships = RelationshipConverter.convert(jdlObject.getRelationships(), jdlObject.getEntityNames(), convertOptions);
function setRelationships(conversionOptions) {
const convertedRelationships = RelationshipConverter.convert(jdlObject.getRelationships(), jdlObject.getEntityNames(), conversionOptions);
convertedRelationships.forEach((entityRelationships, entityName) => {
if (builtInEntities.has(entityName.toLowerCase())) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ function setFields() {
});
}

function setRelationships(convertOptions) {
const convertedRelationships = RelationshipConverter.convert(jdlObject.getRelationships(), jdlObject.getEntityNames(), convertOptions);
function setRelationships(conversionOptions) {
const convertedRelationships = RelationshipConverter.convert(jdlObject.getRelationships(), jdlObject.getEntityNames(), conversionOptions);
convertedRelationships.forEach((entityRelationships, entityName) => {
if (builtInEntities.has(entityName.toLowerCase())) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

const { createJDLApplication } = require('../../models/jdl-application-factory');
const { convertOptions } = require('./option-converter');
const { conversionOptions } = require('./option-converter');

module.exports = { convertApplications };

Expand Down Expand Up @@ -70,7 +70,7 @@ function formatApplicationConfigurationOptions(applicationConfiguration) {
}

function getEntityOptionsInApplication(parsedApplication) {
return convertOptions(parsedApplication.options, parsedApplication.useOptions);
return conversionOptions(parsedApplication.options, parsedApplication.useOptions);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions jdl/converters/parsed-jdl-to-jdl-object/option-converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ const UnaryOptions = require('../../jhipster/unary-options');
const BinaryOptions = require('../../jhipster/binary-options');
const { OptionValues, getOptionName } = require('../../jhipster/binary-options');

module.exports = { convertOptions };
module.exports = { conversionOptions };

/**
* Convert unary and binary options to JDLUnary & JDLBinary option classes.
* @param {Object} parsedOptions - the parsed option object.
* @param {Array<Object>} useOptions - the parsed option object, using the use form.
* @returns {Array<JDLUnaryOption|JDLBinaryOption>} the converted JDLUnaryOption & JDLBinaryOption objects.
*/
function convertOptions(parsedOptions, useOptions) {
function conversionOptions(parsedOptions, useOptions) {
if (!parsedOptions) {
throw new Error('Options have to be passed so as to be converted.');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const { convertEntities } = require('./entity-converter');
const { convertEnums } = require('./enum-converter');
const { convertField } = require('./field-converter');
const { convertValidations } = require('./validation-converter');
const { convertOptions } = require('./option-converter');
const { conversionOptions } = require('./option-converter');
const { convertRelationships } = require('./relationship-converter');
const { convertDeployments } = require('./deployment-converter');

Expand Down Expand Up @@ -251,7 +251,7 @@ function fillUnaryAndBinaryOptions() {
})
);
}
const convertedOptions = convertOptions(parsedContent.options, parsedContent.useOptions);
const convertedOptions = conversionOptions(parsedContent.options, parsedContent.useOptions);
convertedOptions.forEach(convertedOption => {
jdlObject.addOption(convertedOption);
});
Expand Down

0 comments on commit c870fe4

Please sign in to comment.