@devlearning/swagger-generator 0.0.7 → 0.0.9

package/dist/api.constants.js

@@ -0,0 +1,16 @@
+export const API_PRE = `import { HttpClient } from '@angular/common/http';
+	import { Observable, catchError, map } from 'rxjs';
+	import { httpOptions } from 'src/app/core/utils/http-options';
+	import * as Models from './model.autogenerated';
+	
+	export abstract class ApiAutogeneratedService {
+	  constructor(
+		private _http: HttpClient,
+		private _baseUrl: string,
+	  ) { }
+	
+	  protected abstract _handleRequest<T>(request: T): T;
+	  protected abstract _handleResponse<T>(response: T): T;
+	  protected abstract _handleError(error: any, obs: any): any;
+`;
+export const API_POST = `}`;

package/dist/generator.js

@@ -1 +1,252 @@
-"use strict";
+import fs from 'fs';
+import { API_PRE, API_POST } from './api.constants.js';
+import { MODEL_POST, MODEL_PRE } from './model.constants.js';
+const contentType = 'application/json';
+export class Generator {
+    _swagger;
+    _outputDirectory;
+    constructor(swagger, outputDirectory) {
+        this._swagger = swagger;
+        this._outputDirectory = outputDirectory;
+    }
+    generateApi() {
+        console.debug(`Start autogeneration Apis`);
+        let apiMethods = ``;
+        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
+            const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
+            const swaggerMethod = this._swagger.paths[apiName];
+            const method = Object.getOwnPropertyNames(swaggerMethod)[0];
+            const swaggerMethodInfo = swaggerMethod[method];
+            console.debug(`\tAPI - ${apiName} - ${method}`);
+            let parametersString = this.retrieveParameters(swaggerMethodInfo);
+            let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
+            let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
+            if (returnTypeString == null)
+                returnTypeString = 'void';
+            let prepareRequestString = ``; //request = this._handleRequest(request);
+            let haveRequest = swaggerMethodInfo.requestBody != null;
+            if (haveRequest) {
+                prepareRequestString = `request = this._handleRequest(request);
+	  `;
+            }
+            apiMethods +=
+                `
+  public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}>{
+    ${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${environment.BASE_URL}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', request' : ''}, httpOptions)
+      .pipe(
+        map(x => this._handleResponse(x)),
+          catchError((err, obs) => {
+          return this._handleError(err, <Observable<any>>obs);
+        })
+    );
+  }
+`;
+        }
+        fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts", `${API_PRE}
+${API_POST}`, { flag: 'w' });
+    }
+    generateModel() {
+        let usedTypes = [];
+        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
+            const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
+            const swaggerMethod = this._swagger.paths[apiName];
+            const method = Object.getOwnPropertyNames(swaggerMethod)[0];
+            const swaggerMethodInfo = swaggerMethod[method];
+            // if(apiName == "/api/v{version}/Ticket/Create"){
+            // 	debugger
+            // }
+            let parametersRefType = swaggerMethodInfo.parameters.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''));
+            usedTypes = usedTypes.concat(parametersRefType);
+            if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null) {
+                usedTypes.push(swaggerMethodInfo.responses[200].content[contentType].schema.$ref.replace('#/components/schemas/', ''));
+            }
+            if (swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref) {
+                usedTypes.push(swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref.replace('#/components/schemas/', ''));
+            }
+        }
+        this.retrieveNestedObjects(usedTypes);
+        usedTypes = [...new Set(usedTypes.map(item => item))]; // [ 'A', 'B']
+        // usedTypes = usedTypes.filter((value, index, array) => {
+        // 	array.indexOf(value) === index;
+        // });
+        // usedTypes.forEach(element => {
+        // 	console.debug(element);
+        // });
+        console.debug(`Start autogeneration Models`);
+        let models = ``;
+        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.components.schemas).length; index++) {
+            const modelName = Object.getOwnPropertyNames(this._swagger.components.schemas)[index];
+            if (modelName == 'ActivatedVoucherSnackListResponse') {
+                console.debug("ActivatedVoucherSnackListResponse");
+            }
+            if (usedTypes.indexOf(modelName) < 0) {
+                console.debug(`\tModel SKIP - ${modelName}`);
+                continue;
+            }
+            ;
+            const swaggerCopmponent = this._swagger.components.schemas[modelName];
+            console.debug(`\tModel - ${modelName}`);
+            let type = swaggerCopmponent.type == 'integer' ? 'enum' : 'class';
+            let content = this.retrieveObjectContent(modelName, swaggerCopmponent);
+            models +=
+                `
+export ${type} ${modelName} {${content}
+}
+`;
+        }
+        fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `${MODEL_PRE}
+${models}
+${MODEL_POST}`, { flag: 'w' });
+    }
+    retrieveParameters(swaggerMethodInfo) {
+        if (swaggerMethodInfo.requestBody != null) {
+            return `request: Models.${swaggerMethodInfo.requestBody.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`;
+        }
+        let parameters = ``;
+        swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
+            if (parameter.schema.$ref != null) {
+                parameters += `Models.${parameter.name}: ${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
+            }
+            else {
+                parameters += `${parameter.name}: ${this.getNativeType(parameter.schema)}, `;
+            }
+        });
+        if (parameters.length > 2)
+            parameters = parameters.substring(0, parameters.length - 2);
+        return parameters;
+    }
+    retrieveQueryParameters(swaggerMethodInfo) {
+        if (swaggerMethodInfo.requestBody != null)
+            return ``;
+        let filteredParameters = swaggerMethodInfo.parameters.filter(x => x.in == 'query');
+        if (filteredParameters.length == 0)
+            return ``;
+        let parameters = `?`;
+        filteredParameters.forEach(parameter => {
+            if (parameter.schema.$ref != null) {
+                this.parametrizeObject(parameter.schema.$ref);
+                //parameters += `${parameter.name}: ${parameter.schema.$ref.replace('#/components/schemas/', '')}&`;
+            }
+            else {
+                parameters += `${this.lowercaseFirstLetter(parameter.name)}=\${` + this.lowercaseFirstLetter(parameter.name) + `}&`;
+            }
+        });
+        if (parameters.length > 1)
+            parameters = parameters.substring(0, parameters.length - 1);
+        return parameters;
+    }
+    retrieveReturnType(swaggerMethodInfo) {
+        if (swaggerMethodInfo.responses[200] == null)
+            return 'void';
+        if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null)
+            return `Models.${swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`;
+        if (swaggerMethodInfo.responses[200]?.content[contentType].schema.type != null)
+            return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentType].schema);
+        console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
+        throw new Error("unmanaged swaggerMethodInfo");
+    }
+    retrieveType(swaggerComponentProperty) {
+        if (swaggerComponentProperty.$ref != null)
+            return swaggerComponentProperty.$ref.replace('#/components/schemas/', '');
+        if (swaggerComponentProperty.type != null && swaggerComponentProperty.type == 'array')
+            if (swaggerComponentProperty.items.$ref != null)
+                return swaggerComponentProperty.items.$ref.replace('#/components/schemas/', '');
+            else
+                return this.getNativeType(swaggerComponentProperty);
+        if (swaggerComponentProperty.type != null)
+            return this.getNativeType(swaggerComponentProperty);
+        if (swaggerComponentProperty.type == null)
+            return '';
+        console.error("unmanaged swaggerMethodInfo", swaggerComponentProperty);
+        throw new Error("unmanaged swaggerMethodInfo");
+    }
+    parametrizeObject(objectName) {
+        let component = this._swagger.components.schemas[objectName.replace('#/components/schemas/', '')];
+        if (component == null || component.properties == null)
+            return ``;
+        console.debug(component.properties);
+        return ``;
+    }
+    retrieveObjectContent(name, swaggerComponent) {
+        if (swaggerComponent.type == 'object')
+            return this.retrieveObjectProperties(swaggerComponent);
+        else if (swaggerComponent.type == 'integer')
+            return this.retrieveEnumValues(name, swaggerComponent);
+    }
+    retrieveObjectProperties(swaggerCopmponent) {
+        if (swaggerCopmponent.properties == null)
+            return ``;
+        // console.debug(`\t\t${Object.getOwnPropertyNames(swaggerCopmponent.properties).length}`);
+        let properties = ``;
+        for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
+            const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
+            properties +=
+                `
+  ${propertyName}: ${this.retrieveType(swaggerCopmponent.properties[propertyName])} | undefined;`;
+        }
+        return properties;
+    }
+    retrieveEnumValues(name, swaggerCopmponent) {
+        if (swaggerCopmponent.enum == null)
+            return ``;
+        let properties = ``;
+        for (let index = 0; index < swaggerCopmponent.enum.length; index++) {
+            const name = swaggerCopmponent.enum[index].split('-')[0].trim();
+            const value = swaggerCopmponent.enum[index].split('-')[1].trim();
+            properties +=
+                `
+  ${name} = ${value},`;
+        }
+        return properties;
+    }
+    retrieveNestedObjects(usedTypes) {
+        for (let i = 0; i < usedTypes.length; i++) {
+            const swaggerCopmponent = this._swagger.components.schemas[usedTypes[i]];
+            // const name = usedTypes[i]
+            // const modelName = <string>Object.getOwnPropertyNames(this._swagger.components.schemas)[name];
+            this.retrieveNestedObjects2(swaggerCopmponent, usedTypes);
+        }
+    }
+    retrieveNestedObjects2(swaggerComponent, usedTypes) {
+        if (!swaggerComponent.properties)
+            return;
+        for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
+            const propertyName = Object.getOwnPropertyNames(swaggerComponent.properties)[j];
+            let nestedUsedType = '';
+            if (swaggerComponent.properties[propertyName].$ref != null) {
+                nestedUsedType = swaggerComponent.properties[propertyName].$ref.replace('#/components/schemas/', '');
+            }
+            else if (swaggerComponent.properties[propertyName].type == 'array' && swaggerComponent.properties[propertyName].items.$ref != null) {
+                nestedUsedType = swaggerComponent.properties[propertyName].items.$ref.replace('#/components/schemas/', '');
+            }
+            if (nestedUsedType != '' && usedTypes.findIndex(x => x == nestedUsedType) == -1) {
+                usedTypes.push(nestedUsedType);
+                let nested = this._swagger.components.schemas[nestedUsedType];
+                this.retrieveNestedObjects2(nested, usedTypes);
+            }
+        }
+    }
+    getNativeType(schema) {
+        if (schema.type == 'integer')
+            return 'number';
+        if (schema.type == 'string' && schema.format == null)
+            return 'string';
+        if (schema.type == 'string' && schema.format == 'date-time')
+            return 'moment.Moment';
+        if (schema.type == 'string' && schema.format == 'uuid')
+            return 'string';
+        if (schema.type == 'number')
+            return 'number';
+        if (schema.type == 'array')
+            return '[]';
+        if (schema.type == 'boolean')
+            return 'boolean';
+        if (schema.type == 'object')
+            return 'any';
+        console.error("unmanaged schema type", schema);
+        throw new Error("unmanaged schema");
+    }
+    lowercaseFirstLetter(value) {
+        return value.charAt(0).toLowerCase() + value.slice(1);
+    }
+}

package/dist/index.js

@@ -1,264 +1,22 @@
-import fetch from 'node-fetch';
-import * as fs from 'fs';
-const settings = { method: "Get" };
-const apiUrl = "http://localhost:5208";
-const version = "1";
-const swaggerJsonUrl = `${apiUrl}/swagger/v${version}/swagger.json`;
-const contentType = 'application/json';
-export class SwaggerDownloader {
-    async download() {
-        let response = await fetch(swaggerJsonUrl, settings);
-        let json = await response.json();
-        return json;
-    }
-}
-export class Generator {
-    _swagger;
-    constructor(swagger) {
-        this._swagger = swagger;
-    }
-    generateApi() {
-        console.debug(`Start autogeneration Apis`);
-        let apiMethods = ``;
-        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
-            const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-            const swaggerMethod = this._swagger.paths[apiName];
-            const method = Object.getOwnPropertyNames(swaggerMethod)[0];
-            const swaggerMethodInfo = swaggerMethod[method];
-            console.debug(`\tAPI - ${apiName} - ${method}`);
-            let parametersString = this.retrieveParameters(swaggerMethodInfo);
-            let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
-            let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
-            if (returnTypeString == null)
-                returnTypeString = 'void';
-            let prepareRequestString = ``; //request = this._handleRequest(request);
-            let haveRequest = swaggerMethodInfo.requestBody != null;
-            if (haveRequest) {
-                prepareRequestString = `request = this._handleRequest(request);
-	  `;
-            }
-            apiMethods +=
-                `
-  public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}>{
-    ${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${environment.BASE_URL}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', request' : ''}, httpOptions)
-      .pipe(
-        map(x => this._handleResponse(x)),
-          catchError((err, obs) => {
-          return this._handleError(err, <Observable<any>>obs);
-        })
-    );
-  }
-`;
-        }
-        fs.writeFileSync("autogeneration/output/api.autogenerated.ts", `${apiPre}
-${apiMethods}
-${apiPost}`);
-    }
-    generateModel() {
-        let usedTypes = [];
-        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
-            const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-            const swaggerMethod = this._swagger.paths[apiName];
-            const method = Object.getOwnPropertyNames(swaggerMethod)[0];
-            const swaggerMethodInfo = swaggerMethod[method];
-            let parametersRefType = swaggerMethodInfo.parameters.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''));
-            usedTypes = usedTypes.concat(parametersRefType);
-            if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null) {
-                usedTypes.push(swaggerMethodInfo.responses[200].content[contentType].schema.$ref.replace('#/components/schemas/', ''));
-            }
-            if (swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref) {
-                usedTypes.push(swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref.replace('#/components/schemas/', ''));
-            }
-        }
-        // usedTypes.forEach(element => {
-        // 	console.debug(element);
-        // });
-        console.debug(`Start autogeneration Models`);
-        let models = ``;
-        for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.components.schemas).length; index++) {
-            const modelName = Object.getOwnPropertyNames(this._swagger.components.schemas)[index];
-            if (usedTypes.indexOf(modelName) < 0) {
-                console.debug(`\tModel SKIP - ${modelName}`);
-                continue;
-            }
-            ;
-            const swaggerCopmponent = this._swagger.components.schemas[modelName];
-            console.debug(`\tModel - ${modelName}`);
-            let type = swaggerCopmponent.type == 'integer' ? 'enum' : 'class';
-            let content = this.retrieveObjectContent(swaggerCopmponent);
-            models +=
-                `
-export ${type} ${modelName} {${content}
-}
-`;
-        }
-        fs.writeFileSync("autogeneration/output/model.autogenerated.ts", `${modelPre}
-${models}
-${modelPost}`);
-    }
-    retrieveParameters(swaggerMethodInfo) {
-        if (swaggerMethodInfo.requestBody != null) {
-            return `request: ${swaggerMethodInfo.requestBody.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`;
-        }
-        let parameters = ``;
-        swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
-            if (parameter.schema.$ref != null) {
-                parameters += `${parameter.name}: ${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
-            }
-            else {
-                parameters += `${parameter.name}: ${this.getNativeType(parameter.schema)}, `;
-            }
-        });
-        if (parameters.length > 2)
-            parameters = parameters.substring(0, parameters.length - 2);
-        return parameters;
-    }
-    retrieveQueryParameters(swaggerMethodInfo) {
-        if (swaggerMethodInfo.requestBody != null)
-            return ``;
-        let filteredParameters = swaggerMethodInfo.parameters.filter(x => x.in == 'query');
-        if (filteredParameters.length == 0)
-            return ``;
-        let parameters = `?`;
-        filteredParameters.forEach(parameter => {
-            if (parameter.schema.$ref != null) {
-                this.parametrizeObject(parameter.schema.$ref);
-                //parameters += `${parameter.name}: ${parameter.schema.$ref.replace('#/components/schemas/', '')}&`;
-            }
-            else {
-                parameters += `${this.lowercaseFirstLetter(parameter.name)}=\${` + this.lowercaseFirstLetter(parameter.name) + `}&`;
-            }
-        });
-        if (parameters.length > 1)
-            parameters = parameters.substring(0, parameters.length - 1);
-        return parameters;
-    }
-    retrieveReturnType(swaggerMethodInfo) {
-        if (swaggerMethodInfo.responses[200] == null)
-            return 'void';
-        if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null)
-            return swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref.replace('#/components/schemas/', '');
-        if (swaggerMethodInfo.responses[200]?.content[contentType].schema.type != null)
-            return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentType].schema);
-        console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
-        throw new Error("unmanaged swaggerMethodInfo");
-    }
-    retrieveType(swaggerComponentProperty) {
-        if (swaggerComponentProperty.$ref != null)
-            return swaggerComponentProperty.$ref.replace('#/components/schemas/', '');
-        if (swaggerComponentProperty.type != null && swaggerComponentProperty.type == 'array')
-            if (swaggerComponentProperty.items.$ref != null)
-                return swaggerComponentProperty.items.$ref.replace('#/components/schemas/', '');
-            else
-                return this.getNativeType(swaggerComponentProperty);
-        if (swaggerComponentProperty.type != null)
-            return this.getNativeType(swaggerComponentProperty);
-        console.error("unmanaged swaggerMethodInfo", swaggerComponentProperty);
-        throw new Error("unmanaged swaggerMethodInfo");
-    }
-    parametrizeObject(objectName) {
-        let component = this._swagger.components.schemas[objectName.replace('#/components/schemas/', '')];
-        if (component == null || component.properties == null)
-            return ``;
-        console.debug(component.properties);
-        return ``;
-    }
-    retrieveObjectContent(swaggerComponent) {
-        if (swaggerComponent.type == 'object')
-            return this.retrieveObjectProperties(swaggerComponent);
-        else if (swaggerComponent.type == 'integer')
-            return this.retrieveEnumValues(swaggerComponent);
-    }
-    retrieveObjectProperties(swaggerCopmponent) {
-        if (swaggerCopmponent.properties == null)
-            return ``;
-        // console.debug(`\t\t${Object.getOwnPropertyNames(swaggerCopmponent.properties).length}`);
-        let properties = ``;
-        for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
-            const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
-            properties +=
-                `
-  ${propertyName}: ${this.retrieveType(swaggerCopmponent.properties[propertyName])} | undefined;`;
-        }
-        return properties;
-    }
-    retrieveEnumValues(swaggerCopmponent) {
-    }
-    retrieveNestedObjects(tmp) {
-        let usedTypes = [];
-        for (let i = 0; i < tmp.length; i++) {
-            const swaggerCopmponent = this._swagger.components.schemas['#/components/schemas/' + tmp[i]];
-            this.retrieveNestedObjects2(swaggerCopmponent);
-        }
-    }
-    retrieveNestedObjects2(swaggerCopmponent) {
-        for (let j = 0; j < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; j++) {
-            const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[j];
-            if (swaggerCopmponent.properties[propertyName].$ref != null) {
-                swaggerCopmponent.properties[propertyName].$ref.replace('#/components/schemas/', '');
-            }
-        }
-    }
-    getNativeType(schema) {
-        if (schema.type == 'integer')
-            return 'number';
-        if (schema.type == 'string' && schema.format == null)
-            return 'string';
-        if (schema.type == 'string' && schema.format == 'date-time')
-            return 'moment.Moment';
-        if (schema.type == 'string' && schema.format == 'uuid')
-            return 'string';
-        if (schema.type == 'number')
-            return 'number';
-        if (schema.type == 'array')
-            return '[]';
-        if (schema.type == 'boolean')
-            return 'boolean';
-        console.error("unmanaged schema type", schema);
-        throw new Error("unmanaged schema");
-    }
-    lowercaseFirstLetter(value) {
-        return value.charAt(0).toLowerCase() + value.slice(1);
-    }
+#!/usr/bin/env node
+import { Generator } from './generator.js';
+import { SwaggerDownloader } from './swagger-downloader.js';
+var args = process.argv.slice(2);
+if (args.length !== 2) {
+    console.log("Warning: Requires 2 arguments");
+    console.log("node index.js [swaggerJsonUrl] [outputDirectory]");
+    process.exit();
 }
+const swaggerJsonUrl = args[0];
+const outputDirectory = args[1];
+//const excludedModels = ['Type', 'MethodBase', 'Assembly', 'MethodInfo']
+// const apiUrl = args[0]//"http://localhost:5208";
+// const version = args[1]; //"1";
+// const swaggerJsonUrl = `${apiUrl}/swagger/v${version}/swagger.json`;
 const swaggerDownloader = new SwaggerDownloader();
-const apiPre = `import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable, catchError, map } from 'rxjs';
-import { httpOptions } from 'src/app/core/utils/http-options';
-import { DatiUtenteTestataResponse } from '../models/dati-utente-testata-response';
-import { LanguageCultureListQueryResponse } from '../models/language-culture';
-import { API_AIRLINE_COMPANY, API_LANGUAGE_CULTURE, API_TEST, API_USER, API_VOUCHER_SNACK } from '../utils/constants';
-import { ApiBase } from './../utils/api-base';
-import { DialogMessageService } from './dialog-message.service';
-import * as moment from 'moment-timezone';
-import { VoucherSnackResponse } from '../models/api/voucher-snack-response.models';
-import { VoucherSnackRequest } from '../models/api/voucher-snack-request.models';
-import { ActivatedSnackVoucherResponse, SnackType } from 'src/app/ticket/models/richiesta-servizio-snack.models';
-import { VoucherSnackRequestEmission } from '../models/api/voucher-snack-request-emission';
-import { ActivateSnackVoucherResponse } from '../models/api/activate-snack-voucher-response.models';
-import { VoucherActivationRequest } from '../models/api/voucher-activation-request.model';
-import { Utente } from '../models/utente';
-import { AirlineCompany } from 'src/app/sharedmodules/dialog-compagnie-aeree/compagnia-aerea.model';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ApiService extends ApiBase {
-  constructor(
-    private _http: HttpClient,
-    _dialogMessage: DialogMessageService
-  ) {
-    super(_dialogMessage);
-  }
-`;
-const apiPost = `}`;
-const modelPre = `
-`;
-const modelPost = `
-`;
-swaggerDownloader.download()
+swaggerDownloader.download(new URL(swaggerJsonUrl))
     .then(swaggerDoc => {
-    return new Generator(swaggerDoc);
+    return new Generator(swaggerDoc, outputDirectory);
 })
     .then(generator => { generator.generateApi(); generator.generateModel(); });
+// require('./index.js')({swaggerDownloader});

package/dist/model.constants.js

@@ -0,0 +1,4 @@
+export const MODEL_PRE = `import * as moment from 'moment';
+`;
+export const MODEL_POST = `
+`;

package/dist/models/swagger-component-property.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-component.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-content.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-info.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-method.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-schema.js

@@ -0,0 +1 @@
+export {};

package/dist/swagger-downloader.js

@@ -1,14 +1,9 @@
-"use strict";
-// import fetch from 'node-fetch';
-// import { Swagger } from './models/swagger';
-// const settings = { method: "Get" };
-// const apiUrl = "http://localhost:5208";
-// const version = "1";
-// const swaggerJsonUrl = `${apiUrl}/swagger/v${version}/swagger.json`;
-// export class SwaggerDownloader {
-//     async download() {
-//         let response = await fetch(swaggerJsonUrl, settings);
-//         let json = await response.json();
-//         return <Swagger>json;
-//     }
-// }
+import fetch from 'node-fetch';
+const settings = { method: "Get" };
+export class SwaggerDownloader {
+    async download(swaggerJsonUrl) {
+        let response = await fetch(swaggerJsonUrl, settings);
+        let json = await response.json();
+        return json;
+    }
+}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "dev": "ts-node --esm src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output"
+    "dev": "ts-node --esm ./src/index.ts http://localhost:5208/swagger/v1/swagger.json autogeneration/output",
+    "publish": "npx tsc && npm publish"
   },
   "bin": {
     "swgen": "./dist/index.js"

package/src/api.constants.ts

@@ -0,0 +1,19 @@
+export const API_PRE =
+    `import { HttpClient } from '@angular/common/http';
+	import { Observable, catchError, map } from 'rxjs';
+	import { httpOptions } from 'src/app/core/utils/http-options';
+	import * as Models from './model.autogenerated';
+	
+	export abstract class ApiAutogeneratedService {
+	  constructor(
+		private _http: HttpClient,
+		private _baseUrl: string,
+	  ) { }
+	
+	  protected abstract _handleRequest<T>(request: T): T;
+	  protected abstract _handleResponse<T>(response: T): T;
+	  protected abstract _handleError(error: any, obs: any): any;
+`;
+
+export const API_POST =
+    `}`;