Allow x-nullable on root props, exposing pattern as regexp

Author: ferdikoomen

src/openApi/v2/interfaces/OpenApiParameter.d.ts

@@ -1,12 +1,13 @@
 import type { WithEnumExtension } from './Extensions/WithEnumExtension';
+import { WithNullableExtension } from './Extensions/WithNullableExtension';
 import type { OpenApiItems } from './OpenApiItems';
 import type { OpenApiReference } from './OpenApiReference';
 import type { OpenApiSchema } from './OpenApiSchema';
 
 /**
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject
  */
-export interface OpenApiParameter extends OpenApiReference, WithEnumExtension {
+export interface OpenApiParameter extends OpenApiReference, WithEnumExtension, WithNullableExtension {
     name: string;
     in: 'path' | 'query' | 'header' | 'formData' | 'body';
     description?: string;

src/openApi/v2/parser/extendEnum.ts

@@ -1,18 +1,15 @@
 import type { Enum } from '../../../client/interfaces/Enum';
 import type { WithEnumExtension } from '../interfaces/Extensions/WithEnumExtension';
 
-const KEY_ENUM_NAMES = 'x-enum-varnames';
-const KEY_ENUM_DESCRIPTIONS = 'x-enum-descriptions';
-
 /**
  * Extend the enum with the x-enum properties. This adds the capability
  * to use names and descriptions inside the generated enums.
  * @param enumerators
  * @param definition
  */
 export function extendEnum(enumerators: Enum[], definition: WithEnumExtension): Enum[] {
-    const names = definition[KEY_ENUM_NAMES];
-    const descriptions = definition[KEY_ENUM_DESCRIPTIONS];
+    const names = definition['x-enum-varnames'];
+    const descriptions = definition['x-enum-descriptions'];
 
     return enumerators.map((enumerator, index) => ({
         name: (names && names[index]) || enumerator.name,

src/openApi/v2/parser/getModel.ts

@@ -20,7 +20,7 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefiniti
         description: getComment(definition.description),
         isDefinition: isDefinition,
         isReadOnly: definition.readOnly === true,
-        isNullable: false,
+        isNullable: definition['x-nullable'] === true,
         isRequired: false,
         format: definition.format,
         maximum: definition.maximum,

src/openApi/v2/parser/getOperationParameter.ts

@@ -25,7 +25,7 @@ export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParame
         isDefinition: false,
         isReadOnly: false,
         isRequired: parameter.required === true,
-        isNullable: false,
+        isNullable: parameter['x-nullable'] === true,
         format: parameter.format,
         maximum: parameter.maximum,
         exclusiveMaximum: parameter.exclusiveMaximum,

src/openApi/v3/parser/extendEnum.ts

@@ -1,18 +1,15 @@
 import type { Enum } from '../../../client/interfaces/Enum';
 import type { WithEnumExtension } from '../interfaces/Extensions/WithEnumExtension';
 
-const KEY_ENUM_NAMES = 'x-enum-varnames';
-const KEY_ENUM_DESCRIPTIONS = 'x-enum-descriptions';
-
 /**
  * Extend the enum with the x-enum properties. This adds the capability
  * to use names and descriptions inside the generated enums.
  * @param enumerators
  * @param definition
  */
 export function extendEnum(enumerators: Enum[], definition: WithEnumExtension): Enum[] {
-    const names = definition[KEY_ENUM_NAMES];
-    const descriptions = definition[KEY_ENUM_DESCRIPTIONS];
+    const names = definition['x-enum-varnames'];
+    const descriptions = definition['x-enum-descriptions'];
 
     return enumerators.map((enumerator, index) => ({
         name: (names && names[index]) || enumerator.name,

src/openApi/v3/parser/getModel.ts

@@ -23,6 +23,20 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefiniti
         isReadOnly: definition.readOnly === true,
         isNullable: definition.nullable === true,
         isRequired: false,
+        format: definition.format,
+        maximum: definition.maximum,
+        exclusiveMaximum: definition.exclusiveMaximum,
+        minimum: definition.minimum,
+        exclusiveMinimum: definition.exclusiveMinimum,
+        multipleOf: definition.multipleOf,
+        maxLength: definition.maxLength,
+        minLength: definition.minLength,
+        pattern: definition.pattern,
+        maxItems: definition.maxItems,
+        minItems: definition.minItems,
+        uniqueItems: definition.uniqueItems,
+        maxProperties: definition.maxProperties,
+        minProperties: definition.minProperties,
         imports: [],
         extends: [],
         enum: [],

src/templates/partials/base.hbs

@@ -3,5 +3,5 @@
 {{~#equals @root.httpClient 'xhr'}}Blob{{/equals~}}
 {{~#equals @root.httpClient 'node'}}Buffer | ArrayBuffer | ArrayBufferView{{/equals~}}
 {{~else~}}
-{{base}}
+{{{base}}}
 {{~/equals~}}

src/templates/partials/schemaArray.hbs

@@ -1,5 +1,7 @@
 {
-    type: 'Array',
+    array: {
+        type: '{{>base}}',
+    },
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
 {{/if}}

src/templates/partials/schemaDictionary.hbs

@@ -1,5 +1,7 @@
 {
-    type: 'Dictionary',
+    dictionary: {
+        type: '{{>base}}',
+    },
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
 {{/if}}

src/templates/partials/schemaGeneric.hbs

@@ -1,6 +1,6 @@
 {
 {{#if type}}
-    type: '{{{base}}}',
+    type: '{{>base}}',
 {{/if}}
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
@@ -36,7 +36,7 @@
     minLength: {{{minLength}}},
 {{/if}}
 {{#if pattern}}
-    pattern: '{{{pattern}}}',
+    pattern: /{{{pattern}}}/,
 {{/if}}
 {{#if maxItems}}
     maxItems: {{{maxItems}}},