- Added types for some methods

- Fixed build after PR's
- Exported Cancelation Error

Author: ferdikoomen

rollup.config.js

@@ -32,13 +32,13 @@ const handlebarsPlugin = () => ({
                 preventIndent: true,
                 knownHelpersOnly: true,
                 knownHelpers: {
-                    escapeSinglequotes: true,
                     equals: true,
                     notEquals: true,
                     containsSpaces: true,
                     union: true,
                     intersection: true,
                     enumerator: true,
+                    escapeQuotes: true,
                 },
             });
             return `export default ${templateSpec};`;

src/openApi/v2/parser/getOperationParameterName.ts

@@ -1,6 +1,7 @@
 import camelCase from 'camelcase';
 
-const reservedWords = /^(arguments|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|eval|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)$/g;
+const reservedWords =
+    /^(arguments|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|eval|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)$/g;
 
 /**
  * Replaces any invalid characters from a parameter name.

src/openApi/v3/parser/getModelProperties.ts

@@ -23,7 +23,19 @@ export function getModelProperties(
         if (definition.properties.hasOwnProperty(propertyName)) {
             const property = definition.properties[propertyName];
             const propertyRequired = !!definition.required?.includes(propertyName);
-            const propertyValues = {
+            const propertyValues: Omit<
+                Model,
+                | 'export'
+                | 'type'
+                | 'base'
+                | 'template'
+                | 'link'
+                | 'isNullable'
+                | 'imports'
+                | 'enum'
+                | 'enums'
+                | 'properties'
+            > = {
                 name: escapeName(propertyName),
                 description: getComment(property.description),
                 isDefinition: false,

src/openApi/v3/parser/getOperationParameterName.ts

@@ -1,6 +1,7 @@
 import camelCase from 'camelcase';
 
-const reservedWords = /^(arguments|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|eval|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)$/g;
+const reservedWords =
+    /^(arguments|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|eval|export|extends|false|finally|for|function|if|implements|import|in|instanceof|interface|let|new|null|package|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)$/g;
 
 /**
  * Replaces any invalid characters from a parameter name.

src/templates/core/node/request.hbs

@@ -24,6 +24,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isBlob}}
 
 
+{{>functions/isFormData}}
+
+
 {{>functions/base64}}
 
 

src/templates/core/xhr/request.hbs

@@ -19,6 +19,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isBlob}}
 
 
+{{>functions/isFormData}}
+
+
 {{>functions/isSuccess}}
 
 

src/templates/index.hbs

@@ -2,7 +2,7 @@
 {{#if @root.exportCore}}
 
 export { ApiError } from './core/ApiError';
-export { CancelablePromise } from './core/CancelablePromise';
+export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 {{/if}}
 {{#if @root.exportModels}}

src/templates/partials/schemaComposition.hbs

@@ -1,7 +1,7 @@
 {
     type: '{{export}}',
 {{#if description}}
-    description: '{{{escapeSinglequotes description}}}',
+    description: '{{{escapeQuotes description}}}',
 {{/if}}
     contains: [{{#each properties}}{{>schema}}{{#unless @last}}, {{/unless}}{{/each}}],
 {{#if isReadOnly}}

src/templates/partials/schemaGeneric.hbs

@@ -3,7 +3,7 @@
     type: '{{{type}}}',
 {{/if}}
 {{#if description}}
-    description: '{{{escapeSinglequotes description}}}',
+    description: '{{{escapeQuotes description}}}',
 {{/if}}
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},

src/templates/partials/schemaInterface.hbs

@@ -1,6 +1,6 @@
 {
 {{#if description}}
-    description: '{{{escapeSinglequotes description}}}',
+    description: '{{{escapeQuotes description}}}',
 {{/if}}
     properties: {
 {{#if properties}}