Skip to content

Commit b80f232

Browse files
committed
feat: Refactoring
1 parent 100c15d commit b80f232

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/openapi/openapi3.schema.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,27 @@ const buildNullTypeWithOrigins = (
107107
)
108108

109109
const inputOrigins = valueWithoutNullable[originsFlag] as Record<PropertyKey, unknown> | undefined
110-
const nullOrigins = nullTypeObject[originsFlag] as Record<PropertyKey, unknown> | undefined ?? {}
110+
const nullTypeOrigins = nullTypeObject[originsFlag] as Record<PropertyKey, unknown> | undefined ?? {}
111111

112-
if (inputOrigins && inputOrigins.nullable) {
112+
const nullable = inputOrigins && inputOrigins.nullable
113+
if (nullable) {
113114
const getOriginParent = (item: unknown) => ({
114115
value: JSON_SCHEMA_PROPERTY_TYPE,
115116
parent: (item as any)?.parent,
116117
})
117118

118-
nullOrigins[JSON_SCHEMA_PROPERTY_TYPE] = isArray(inputOrigins.nullable)
119-
? inputOrigins.nullable.map(getOriginParent)
120-
: getOriginParent(inputOrigins.nullable)
119+
nullTypeOrigins[JSON_SCHEMA_PROPERTY_TYPE] = isArray(nullable)
120+
? nullable.map(getOriginParent)
121+
: getOriginParent(nullable)
121122
}
122123

123-
const valueTitle = valueWithoutNullable[JSON_SCHEMA_PROPERTY_TITLE]
124-
if (valueTitle) {
125-
nullTypeObject[JSON_SCHEMA_PROPERTY_TITLE] = valueTitle
124+
const title = valueWithoutNullable[JSON_SCHEMA_PROPERTY_TITLE]
125+
if (title) {
126+
nullTypeObject[JSON_SCHEMA_PROPERTY_TITLE] = title
126127

127128
const titleOrigins = inputOrigins && inputOrigins[JSON_SCHEMA_PROPERTY_TITLE]
128129
if (titleOrigins) {
129-
nullOrigins[JSON_SCHEMA_PROPERTY_TITLE] = titleOrigins
130+
nullTypeOrigins[JSON_SCHEMA_PROPERTY_TITLE] = titleOrigins
130131
}
131132
}
132133

test/oas-30-to-31.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('OpenAPI 3.0 to 3.1 Comparison Tests', () => {
5353
]))
5454
})
5555

56-
test('could compare with overridden description via reference object', () => {
56+
test('could compare overridden description via reference object', () => {
5757
const { diffs } = apiDiff(addOverridenDescriptionBefore, addOverridenDescriptionAfter, TEST_NORMALIZE_OPTIONS)
5858

5959
expect(diffs).toEqual(diffsMatcher([

0 commit comments

Comments
 (0)