@@ -95,13 +95,9 @@ export const getModel = (
95
95
}
96
96
}
97
97
98
- if (
99
- definition . type === 'object' &&
100
- ( typeof definition . additionalProperties === 'object' || definition . additionalProperties === true )
101
- ) {
102
- const ap = typeof definition . additionalProperties === 'object' ? definition . additionalProperties : { } ;
103
- if ( ap . $ref ) {
104
- const additionalProperties = getType ( ap . $ref ) ;
98
+ if ( definition . type === 'object' && typeof definition . additionalProperties === 'object' ) {
99
+ if ( definition . additionalProperties . $ref ) {
100
+ const additionalProperties = getType ( definition . additionalProperties . $ref ) ;
105
101
model . export = 'dictionary' ;
106
102
model . type = additionalProperties . type ;
107
103
model . base = additionalProperties . base ;
@@ -110,7 +106,7 @@ export const getModel = (
110
106
model . default = getModelDefault ( definition , model ) ;
111
107
return model ;
112
108
} else {
113
- const additionalProperties = getModel ( openApi , ap ) ;
109
+ const additionalProperties = getModel ( openApi , definition . additionalProperties ) ;
114
110
model . export = 'dictionary' ;
115
111
model . type = additionalProperties . type ;
116
112
model . base = additionalProperties . base ;
@@ -150,12 +146,12 @@ export const getModel = (
150
146
}
151
147
152
148
if ( definition . type === 'object' ) {
153
- if ( definition . properties ) {
154
- model . export = 'interface' ;
155
- model . type = 'any' ;
156
- model . base = 'any' ;
157
- model . default = getModelDefault ( definition , model ) ;
149
+ model . export = 'interface' ;
150
+ model . type = 'any' ;
151
+ model . base = 'any' ;
152
+ model . default = getModelDefault ( definition , model ) ;
158
153
154
+ if ( definition . properties ) {
159
155
const modelProperties = getModelProperties ( openApi , definition , getModel , model ) ;
160
156
modelProperties . forEach ( modelProperty => {
161
157
model . imports . push ( ...modelProperty . imports ) ;
@@ -165,18 +161,8 @@ export const getModel = (
165
161
model . enums . push ( modelProperty ) ;
166
162
}
167
163
} ) ;
168
- return model ;
169
- } else {
170
- const additionalProperties = getModel ( openApi , { } ) ;
171
- model . export = 'dictionary' ;
172
- model . type = additionalProperties . type ;
173
- model . base = additionalProperties . base ;
174
- model . template = additionalProperties . template ;
175
- model . link = additionalProperties ;
176
- model . imports . push ( ...additionalProperties . imports ) ;
177
- model . default = getModelDefault ( definition , model ) ;
178
- return model ;
179
164
}
165
+ return model ;
180
166
}
181
167
182
168
// If the schema has a type than it can be a basic or generic type.
0 commit comments