Skip to content

Commit 2e18ffd

Browse files
Alan-ChaErikWittern
authored andcommitted
Clarify DataDefinition
Signed-off-by: Alan Cha <[email protected]>
1 parent c543d28 commit 2e18ffd

File tree

14 files changed

+153
-121
lines changed

14 files changed

+153
-121
lines changed

packages/openapi-to-graphql/lib/index.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/oas_3_tools.js

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/oas_3_tools.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/preprocessor.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/preprocessor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/schema_builder.js

Lines changed: 51 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/schema_builder.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openapi-to-graphql/lib/types/operation.d.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export declare type DataDefinition = {
88
preferredName: string;
99
schema: SchemaObject;
1010
type: string;
11+
links: {
12+
[key: string]: LinkObject;
13+
};
1114
/**
1215
* Data definitions of subschemas in the schema
1316
*
@@ -20,13 +23,10 @@ export declare type DataDefinition = {
2023
subDefinitions: DataDefinition | {
2124
[fieldName: string]: DataDefinition;
2225
};
23-
links: {
24-
[key: string]: LinkObject;
25-
};
26-
otName: string;
27-
iotName: string;
28-
ot?: GraphQLObjectType | GraphQLScalarType | GraphQLList<any> | GraphQLEnumType;
29-
iot?: GraphQLInputObjectType | GraphQLList<any>;
26+
graphQLTypeName: string;
27+
graphQLInputObjectTypeName: string;
28+
graphQLType?: GraphQLObjectType | GraphQLScalarType | GraphQLList<any> | GraphQLEnumType;
29+
graphQLInputObjectType?: GraphQLInputObjectType | GraphQLList<any>;
3030
};
3131
export declare type Operation = {
3232
/**

packages/openapi-to-graphql/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ async function translateOpenAPIToGraphQL(
246246
// Check if the operation should be added as a Query or Mutation field
247247
if (!operation.isMutation) {
248248
let fieldName = Oas3Tools.uncapitalize(
249-
operation.responseDefinition.otName
249+
operation.responseDefinition.graphQLTypeName
250250
)
251251
if (operation.inViewer) {
252252
for (let securityRequirement of operation.securityRequirements) {
@@ -442,9 +442,9 @@ async function translateOpenAPIToGraphQL(
442442
* if a field references an undefined Object Types, GraphQL will throw.
443443
*/
444444
Object.entries(data.operations).forEach(([opId, operation]) => {
445-
if (typeof operation.responseDefinition.ot === 'undefined') {
446-
operation.responseDefinition.ot = GraphQLTools.getEmptyObjectType(
447-
operation.responseDefinition.otName
445+
if (typeof operation.responseDefinition.graphQLType === 'undefined') {
446+
operation.responseDefinition.graphQLType = GraphQLTools.getEmptyObjectType(
447+
operation.responseDefinition.graphQLTypeName
448448
)
449449
}
450450
})
@@ -472,7 +472,7 @@ function getFieldForOperation(
472472

473473
// Create resolve function:
474474
const payloadSchemaName = operation.payloadDefinition
475-
? operation.payloadDefinition.iotName
475+
? operation.payloadDefinition.graphQLInputObjectTypeName
476476
: null
477477

478478
const resolve = getResolver({

0 commit comments

Comments
 (0)