chore: address PR comments

hey-api · Apr 2, 2024 · e27bb0b · e27bb0b
1 parent a6f3b92
commit e27bb0b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 22 deletions.
diff --git a/src/openApi/v3/interfaces/OpenApiSchema.ts b/src/openApi/v3/interfaces/OpenApiSchema.ts
@@ -52,7 +52,7 @@ export interface OpenApiSchema extends OpenApiReference, WithEnumExtension {
     readOnly?: boolean;
     required?: string[];
     title?: string;
-    type?: string;
+    type?: string | string[];
     uniqueItems?: boolean;
     writeOnly?: boolean;
     xml?: OpenApiXml;

diff --git a/src/templates/partials/schemaArray.hbs b/src/templates/partials/schemaArray.hbs
@@ -7,9 +7,9 @@
 		type: '{{{base}}}',
 	},
 {{/if}}
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/templates/partials/schemaComposition.hbs b/src/templates/partials/schemaComposition.hbs
@@ -4,9 +4,9 @@
 	description: `{{{escapeDescription description}}}`,
 {{/if}}
 	contains: [{{#each properties}}{{>schema}}{{#unless @last}}, {{/unless}}{{/each}}],
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/templates/partials/schemaDictionary.hbs b/src/templates/partials/schemaDictionary.hbs
@@ -7,9 +7,9 @@
 		type: '{{{base}}}',
 	},
 {{/if}}
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/templates/partials/schemaEnum.hbs b/src/templates/partials/schemaEnum.hbs
@@ -3,9 +3,9 @@
 {{#if enum}}
 	enum: [{{#each enum}}{{{enumValue value}}},{{/each}}],
 {{/if}}
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/templates/partials/schemaGeneric.hbs b/src/templates/partials/schemaGeneric.hbs
@@ -5,9 +5,9 @@
 {{#if description}}
 	description: `{{{escapeDescription description}}}`,
 {{/if}}
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/templates/partials/schemaInterface.hbs b/src/templates/partials/schemaInterface.hbs
@@ -11,9 +11,9 @@
 	{{/each}}
 {{/if}}
 	},
-{{#ifNotUndefined default}}
+{{#notEquals default undefined}}
 	default: {{{default}}},
-{{/ifNotUndefined}}
+{{/notEquals}}
 {{#if isReadOnly}}
 	isReadOnly: {{{isReadOnly}}},
 {{/if}}

diff --git a/src/utils/handlebars.ts b/src/utils/handlebars.ts
@@ -245,15 +245,6 @@ export const registerHandlebarHelpers = (config: Config, client: Client): void =
             return options.inverse(this);
         }
     );
-    Handlebars.registerHelper(
-        'ifNotUndefined',
-        function (this: unknown, value: unknown, options: Handlebars.HelperOptions): string {
-            if (value !== undefined) {
-                return options.fn(this);
-            }
-            return options.inverse(this);
-        }
-    );
 
     Handlebars.registerHelper(
         'ifOperationDataOptional',