Merge branch 'master' into add-model-postfix

Author: ferdikoomen

package-lock.json

@@ -77,28 +77,28 @@
         "@angular/platform-browser": "14.0.1",
         "@angular/platform-browser-dynamic": "14.0.1",
         "@angular/router": "14.0.1",
-        "@babel/cli": "7.18.6",
-        "@babel/core": "7.18.6",
-        "@babel/preset-env": "7.18.6",
+        "@babel/cli": "7.18.10",
+        "@babel/core": "7.18.13",
+        "@babel/preset-env": "7.19.0",
         "@babel/preset-typescript": "7.18.6",
-        "@rollup/plugin-commonjs": "22.0.1",
+        "@rollup/plugin-commonjs": "22.0.2",
         "@rollup/plugin-node-resolve": "13.3.0",
-        "@rollup/plugin-typescript": "8.3.3",
+        "@rollup/plugin-typescript": "8.5.0",
         "@types/cross-spawn": "6.0.2",
         "@types/express": "4.17.13",
         "@types/fs-extra": "^9.0.13",
         "@types/glob": "7.2.0",
-        "@types/jest": "28.1.5",
-        "@types/node": "18.0.4",
+        "@types/jest": "28.1.8",
+        "@types/node": "18.7.17",
         "@types/node-fetch": "2.6.1",
         "@types/qs": "6.9.7",
-        "@typescript-eslint/eslint-plugin": "5.30.6",
-        "@typescript-eslint/parser": "5.30.6",
+        "@typescript-eslint/eslint-plugin": "5.36.2",
+        "@typescript-eslint/parser": "5.37.0",
         "abort-controller": "3.0.0",
         "axios": "0.27.2",
         "codecov": "3.8.3",
         "cross-spawn": "7.0.3",
-        "eslint": "8.19.0",
+        "eslint": "8.23.1",
         "eslint-config-prettier": "8.5.0",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-simple-import-sort": "7.0.0",
@@ -108,16 +108,16 @@
         "jest": "28.1.3",
         "jest-cli": "28.1.3",
         "prettier": "2.7.1",
-        "puppeteer": "15.4.0",
+        "puppeteer": "15.5.0",
         "qs": "6.11.0",
         "rimraf": "3.0.2",
-        "rollup": "2.76.0",
+        "rollup": "2.79.0",
         "rollup-plugin-terser": "7.0.2",
         "rxjs": "7.5.6",
-        "ts-node": "10.8.2",
+        "ts-node": "10.9.1",
         "tslib": "2.4.0",
         "typescript": "4.7.3",
-        "zone.js": "0.11.6"
+        "zone.js": "0.11.8"
     },
     "resolutions": {
         "node-fetch": "2.6.7"

package.json

@@ -95,9 +95,13 @@ export const getModel = (
         }
     }
 
-    if (definition.type === 'object' && typeof definition.additionalProperties === 'object') {
-        if (definition.additionalProperties.$ref) {
-            const additionalProperties = getType(definition.additionalProperties.$ref);
+    if (
+        definition.type === 'object' &&
+        (typeof definition.additionalProperties === 'object' || definition.additionalProperties === true)
+    ) {
+        const ap = typeof definition.additionalProperties === 'object' ? definition.additionalProperties : {};
+        if (ap.$ref) {
+            const additionalProperties = getType(ap.$ref);
             model.export = 'dictionary';
             model.type = additionalProperties.type;
             model.base = additionalProperties.base;
@@ -106,7 +110,7 @@ export const getModel = (
             model.default = getModelDefault(definition, model);
             return model;
         } else {
-            const additionalProperties = getModel(openApi, definition.additionalProperties);
+            const additionalProperties = getModel(openApi, ap);
             model.export = 'dictionary';
             model.type = additionalProperties.type;
             model.base = additionalProperties.base;
@@ -146,12 +150,12 @@ export const getModel = (
     }
 
     if (definition.type === 'object') {
-        model.export = 'interface';
-        model.type = 'any';
-        model.base = 'any';
-        model.default = getModelDefault(definition, model);
-
         if (definition.properties) {
+            model.export = 'interface';
+            model.type = 'any';
+            model.base = 'any';
+            model.default = getModelDefault(definition, model);
+
             const modelProperties = getModelProperties(openApi, definition, getModel, model);
             modelProperties.forEach(modelProperty => {
                 model.imports.push(...modelProperty.imports);
@@ -161,8 +165,18 @@ export const getModel = (
                     model.enums.push(modelProperty);
                 }
             });
+            return model;
+        } else {
+            const additionalProperties = getModel(openApi, {});
+            model.export = 'dictionary';
+            model.type = additionalProperties.type;
+            model.base = additionalProperties.base;
+            model.template = additionalProperties.template;
+            model.link = additionalProperties;
+            model.imports.push(...additionalProperties.imports);
+            model.default = getModelDefault(definition, model);
+            return model;
         }
-        return model;
     }
 
     // If the schema has a type than it can be a basic or generic type.

src/openApi/v3/parser/getModel.ts

@@ -3,7 +3,8 @@ const getResponseBody = async (response: Response): Promise<any> => {
 		try {
 			const contentType = response.headers.get('Content-Type');
 			if (contentType) {
-				const isJSON = contentType.toLowerCase().startsWith('application/json');
+				const jsonTypes = ['application/json', 'application/problem+json']
+				const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
 				if (isJSON) {
 					return await response.json();
 				} else {

src/templates/core/fetch/getResponseBody.hbs

@@ -3,7 +3,8 @@ const getResponseBody = async (response: Response): Promise<any> => {
 		try {
 			const contentType = response.headers.get('Content-Type');
 			if (contentType) {
-				const isJSON = contentType.toLowerCase().startsWith('application/json');
+				const jsonTypes = ['application/json', 'application/problem+json']
+				const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
 				if (isJSON) {
 					return await response.json();
 				} else {

src/templates/core/node/getResponseBody.hbs

@@ -3,7 +3,8 @@ const getResponseBody = (xhr: XMLHttpRequest): any => {
 		try {
 			const contentType = xhr.getResponseHeader('Content-Type');
 			if (contentType) {
-				const isJSON = contentType.toLowerCase().startsWith('application/json');
+				const jsonTypes = ['application/json', 'application/problem+json']
+				const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
 				if (isJSON) {
 					return JSON.parse(xhr.responseText);
 				} else {

src/templates/core/xhr/getResponseBody.hbs

@@ -32,7 +32,9 @@ import { request as __request } from '../core/request';
 {{/if}}
 
 {{#equals @root.httpClient 'angular'}}
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 {{/equals}}
 export class {{{name}}}{{{@root.postfix}}} {
 	{{#if @root.exportClient}}

src/templates/exportService.hbs

@@ -10,5 +10,7 @@ describe('getPattern', () => {
         expect(getPattern('\\')).toEqual('\\\\');
         expect(getPattern('\\/')).toEqual('\\\\/');
         expect(getPattern('\\/\\/')).toEqual('\\\\/\\\\/');
+        // eslint-disable-next-line prettier/prettier
+        expect(getPattern("'")).toEqual("\\'");
     });
 });

src/utils/getPattern.spec.ts

@@ -3,8 +3,12 @@
  * However, to use it in HTML or inside new RegExp() we need to
  * escape the pattern to become: '^\\d{3}-\\d{2}-\\d{4}$' in order
  * to make it a valid regexp string.
+ *
+ * Also, escape single quote characters, because the output uses single quotes for strings
+ *
  * @param pattern
  */
 export const getPattern = (pattern?: string): string | undefined => {
-    return pattern?.replace(/\\/g, '\\\\');
+    // eslint-disable-next-line prettier/prettier
+    return pattern?.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
 };