Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion forward_engineering/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
"model": false
},
"mode": "graphqlschema",
"isApiSchema": false
"isApiSchema": false,
"disableJSONDataGeneration": true,
"disableAttributesSorting": true
}
2 changes: 1 addition & 1 deletion forward_engineering/mappers/fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function mapField({ name, fieldData, required, definitionsIdToNameMap, addArgume
*/
function getFieldType({ field, required }) {
if ('$ref' in field && field.$ref) {
const definitionName = getDefinitionNameFromReferencePath({ referencePath: field.$ref });
const definitionName = getDefinitionNameFromReferencePath({ referencePath: field.$ref }) || 'String';
return addRequired({ type: definitionName, required });
}

Expand Down
8 changes: 6 additions & 2 deletions reverse_engineering/helpers/getDefinitionCategoryByNameMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ const kindToDefinitionTypeName = {
*
* @param {object} options
* @param {DefinitionNode[]} options.nodes - The nodes to search
* @param {string[]} options.rootTypeNames - The root type names to exclude
* @returns {DefinitionNameToTypeNameMap} The found nodes with proper type
*/
function getDefinitionCategoryByNameMap({ nodes }) {
function getDefinitionCategoryByNameMap({ nodes, rootTypeNames }) {
return nodes
.filter(node => kindToDefinitionTypeName[node.kind])
.reduce((acc, node) => {
if ('name' in node && node.name !== undefined) {
acc[node.name.value] = kindToDefinitionTypeName[node.kind];
const isRootType = rootTypeNames.includes(node.name.value);
if (!isRootType) {
acc[node.name.value] = kindToDefinitionTypeName[node.kind];
}
}
return acc;
}, {});
Expand Down
2 changes: 1 addition & 1 deletion reverse_engineering/mappers/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function getMappedSchema({ schemaItems, graphName, fieldsOrder }) {
container.schemaRootTypes?.rootSubscription || 'Subscription',
];

const definitionCategoryByNameMap = getDefinitionCategoryByNameMap({ nodes: schemaItems });
const definitionCategoryByNameMap = getDefinitionCategoryByNameMap({ nodes: schemaItems, rootTypeNames });

const rootTypeNodes = findNodesByKind({
nodes: schemaItems,
Expand Down