@devlearning/swagger-generator 1.0.13 → 1.0.16

package/dist/generator.js

@@ -142,7 +142,7 @@ export class Generator {
             const apiWriter = new ApiNextJsWriter(this._commandLineArgs.outputDirectory);
             apiWriter.write(this._apis);
         }
-        else if (this._commandLineArgs.target == TargetGeneration.Dart) {
+        else if (this._commandLineArgs.target == TargetGeneration.Flutter) {
             const apiWriter = new ApiDartWriter(this._commandLineArgs);
             apiWriter.write(this._apis, this._models);
         }
@@ -159,7 +159,7 @@ export class Generator {
             const apiWriter = new ModelNextJsWriter(this._commandLineArgs.outputDirectory);
             apiWriter.write(this._models);
         }
-        else if (this._commandLineArgs.target == TargetGeneration.Dart) {
+        else if (this._commandLineArgs.target == TargetGeneration.Flutter) {
             const apiWriter = new ModelDartWriter(this._commandLineArgs);
             apiWriter.write(this._models);
         }

package/dist/generators-writers/dart/api-dart-writer.js

@@ -2,13 +2,15 @@ import fs, { writeFileSync } from 'fs';
 import { Utils } from '../utils.js';
 import * as Mustache from 'mustache';
 import { Normalizator } from './normalizator.js';
+import path from 'path';
 export class ApiDartWriter {
     _commandLineArgs;
     constructor(commandLineArgs) {
         this._commandLineArgs = commandLineArgs;
     }
     write(apis, models) {
-        const template = fs.readFileSync('src/generators-writers/dart/templates/api.mustache', 'utf-8');
+        const templatePath = path.join(__dirname, 'generators-writers', 'dart', 'templates', 'api.mustache');
+        const template = fs.readFileSync(templatePath, 'utf-8');
         const grouped = this._groupByTag(apis);
         for (const [tag, apis] of Object.entries(grouped)) {
             console.log(`Api: ${tag}`);

package/dist/generators-writers/dart/model-dart-writer.js

@@ -2,12 +2,14 @@ import { readFileSync, writeFileSync } from 'fs';
 import * as Mustache from 'mustache';
 import { Utils } from '../utils.js';
 import { Normalizator } from './normalizator.js';
+import path from 'path';
 export class ModelDartWriter {
     _commandLineArgs;
     constructor(commandLineArgs) {
         this._commandLineArgs = commandLineArgs;
     }
     write(models) {
+        const templatePath = path.join(__dirname, 'generators-writers', 'dart', 'templates', 'model.mustache');
         const template = readFileSync('src/generators-writers/dart/templates/model.mustache', 'utf-8');
         models.forEach(model => {
             const normalizedInfo = Normalizator.getNormalizedInfo(model);

package/dist/generators-writers/dart/templates/api.mustache

@@ -0,0 +1,29 @@
+import 'package:{{package}}/core/di/injector.dart';
+import 'package:dio/dio.dart';
+{{#imports}}
+{{{.}}}
+{{/imports}}
+
+class {{apiClassName}} {
+  final Dio _dio;
+
+  {{apiClassName}}() : _dio = getIt<Dio>();
+
+  {{#endpoints}}
+  Future<{{responseType}}> {{methodName}}({{#haveRequest}}{{requestType}} request{{/haveRequest}}) async {
+    final response = await _dio.{{httpMethod}}(
+      '{{{path}}}',
+      {{#haveRequest}}
+      {{#isGet}}
+      queryParameters: request.toJson(),
+      {{/isGet}}
+      {{^isGet}}
+      data: request.toJson(),
+      {{/isGet}}
+      {{/haveRequest}}
+    );
+    return {{responseType}}.fromJson(response.data);
+  }
+
+  {{/endpoints}}
+}

package/dist/generators-writers/dart/templates/model.mustache

@@ -0,0 +1,18 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+{{#imports}}
+{{{.}}}
+{{/imports}}
+
+part '{{filename}}.freezed.dart';
+part '{{filename}}.g.dart';
+
+@freezed
+abstract class {{modelName}} with _${{modelName}} {
+  const factory {{modelName}}({
+    {{#fields}}
+    {{required}}{{type}}{{nullable}} {{name}},
+    {{/fields}}
+  }) = _{{modelName}};
+
+  factory {{modelName}}.fromJson(Map<String, dynamic> json) => _${{modelName}}FromJson(json);
+}

package/dist/index.js

@@ -12,7 +12,7 @@ export var TargetGeneration;
 (function (TargetGeneration) {
     TargetGeneration["Angular"] = "angular";
     TargetGeneration["Next"] = "next";
-    TargetGeneration["Dart"] = "dart";
+    TargetGeneration["Flutter"] = "flutter";
 })(TargetGeneration || (TargetGeneration = {}));
 const argv = yargs(hideBin(process.argv))
     .scriptName("swagger-gen")
@@ -32,7 +32,7 @@ const argv = yargs(hideBin(process.argv))
     .option('target', {
     alias: 't',
     type: 'string',
-    choices: ['angular', 'next', 'dart'],
+    choices: ['angular', 'next', 'flutter'],
     demandOption: true,
     describe: 'Target format for the generated code',
 })

package/dist/templates/api.mustache

@@ -0,0 +1,29 @@
+import 'package:{{package}}/core/di/injector.dart';
+import 'package:dio/dio.dart';
+{{#imports}}
+{{{.}}}
+{{/imports}}
+
+class {{apiClassName}} {
+  final Dio _dio;
+
+  {{apiClassName}}() : _dio = getIt<Dio>();
+
+  {{#endpoints}}
+  Future<{{responseType}}> {{methodName}}({{#haveRequest}}{{requestType}} request{{/haveRequest}}) async {
+    final response = await _dio.{{httpMethod}}(
+      '{{{path}}}',
+      {{#haveRequest}}
+      {{#isGet}}
+      queryParameters: request.toJson(),
+      {{/isGet}}
+      {{^isGet}}
+      data: request.toJson(),
+      {{/isGet}}
+      {{/haveRequest}}
+    );
+    return {{responseType}}.fromJson(response.data);
+  }
+
+  {{/endpoints}}
+}

package/dist/templates/model.mustache

@@ -0,0 +1,18 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+{{#imports}}
+{{{.}}}
+{{/imports}}
+
+part '{{filename}}.freezed.dart';
+part '{{filename}}.g.dart';
+
+@freezed
+abstract class {{modelName}} with _${{modelName}} {
+  const factory {{modelName}}({
+    {{#fields}}
+    {{required}}{{type}}{{nullable}} {{name}},
+    {{/fields}}
+  }) = _{{modelName}};
+
+  factory {{modelName}}.fromJson(Map<String, dynamic> json) => _${{modelName}}FromJson(json);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",
@@ -8,7 +8,8 @@
     "debug-angular": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogeneration/output --target angular --dateTimeLibrary moment",
     "debug-nextjs": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogeneration/output --target next --dateTimeLibrary date-fns",
     "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target flutter --package coqudo_app",
-    "deploy": "npx tsc && npm publish"
+    "copy-templates": "copyfiles -u 3 \"src/generators-writers/dart/templates/**/*\" dist/generators-writers/dart",
+    "deploy": "npx tsc & copyfiles & npm publish"
   },
   "bin": {
     "swgen": "./dist/index.js"
@@ -36,6 +37,7 @@
     "@types/mustache": "^4.2.6",
     "@types/node": "^18.15.0",
     "@types/yargs": "^17.0.33",
+    "copyfiles": "^2.4.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.6"

package/src/generator.ts

@@ -185,7 +185,7 @@ export class Generator {
     } else if (this._commandLineArgs.target == TargetGeneration.Next) {
       const apiWriter = new ApiNextJsWriter(this._commandLineArgs.outputDirectory);
       apiWriter.write(this._apis);
-    } else if (this._commandLineArgs.target == TargetGeneration.Dart) {
+    } else if (this._commandLineArgs.target == TargetGeneration.Flutter) {
       const apiWriter = new ApiDartWriter(this._commandLineArgs);
       apiWriter.write(this._apis, this._models);
     }
@@ -205,7 +205,7 @@ export class Generator {
     } else if (this._commandLineArgs.target == TargetGeneration.Next) {
       const apiWriter = new ModelNextJsWriter(this._commandLineArgs.outputDirectory);
       apiWriter.write(this._models);
-    } else if (this._commandLineArgs.target == TargetGeneration.Dart) {
+    } else if (this._commandLineArgs.target == TargetGeneration.Flutter) {
       const apiWriter = new ModelDartWriter(this._commandLineArgs);
       apiWriter.write(this._models);
     }

package/src/generators-writers/dart/api-dart-writer.ts

@@ -8,6 +8,7 @@ import { ModelDto } from '@src/models/model-dto.js';
 import { TypeDto } from '@src/models/type-dto.js';
 import { ImportDefinitionDart } from './models/import-definition-dart.js';
 import { Normalizator } from './normalizator.js';
+import path from 'path';
 
 interface ApiDefinitionDart {
   package: string;
@@ -39,8 +40,8 @@ export class ApiDartWriter {
   }
 
   write(apis: ApiDto[], models: ModelDto[]) {
-
-    const template = fs.readFileSync('src/generators-writers/dart/templates/api.mustache', 'utf-8');
+    const templatePath = path.join(__dirname, 'generators-writers', 'dart', 'templates', 'api.mustache');
+    const template = fs.readFileSync(templatePath, 'utf-8');
 
     const grouped = this._groupByTag(apis);
 

package/src/generators-writers/dart/model-dart-writer.ts

@@ -5,6 +5,7 @@ import { Utils } from '../utils.js';
 import { CommandLineArgs } from '@src/index.js';
 import { ImportDefinitionDart } from './models/import-definition-dart.js';
 import { Normalizator } from './normalizator.js';
+import path from 'path';
 
 interface ModelDefinitionDart {
   modelName?: string;
@@ -36,6 +37,7 @@ export class ModelDartWriter {
   }
 
   write(models: ModelDto[]) {
+    const templatePath = path.join(__dirname, 'generators-writers', 'dart', 'templates', 'model.mustache');
     const template = readFileSync('src/generators-writers/dart/templates/model.mustache', 'utf-8');
 
     models.forEach(model => {
@@ -47,15 +49,15 @@ export class ModelDartWriter {
         fields: [],
         imports: [],
       };
-      
+
       var imports = <ImportDefinitionDart[]>[];
 
       model.properties.forEach(property => {
         var fieldTypeName = this._mapTsTypeToDart(property.typeName);
 
-//         if (fieldTypeName.endsWith('Exception')) {
-// debugger
-//         }
+        //         if (fieldTypeName.endsWith('Exception')) {
+        // debugger
+        //         }
 
         fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
 

package/src/index.ts

@@ -13,7 +13,7 @@ export enum DateTimeLibrary {
 export enum TargetGeneration {
 	Angular = 'angular',
 	Next = 'next',
-	Dart = 'dart',
+	Flutter = 'flutter',
 }
 
 export interface CommandLineArgs {
@@ -42,7 +42,7 @@ const argv = yargs(hideBin(process.argv))
 	.option('target', {
 		alias: 't',
 		type: 'string',
-		choices: ['angular', 'next', 'dart'],
+		choices: ['angular', 'next', 'flutter'],
 		demandOption: true,
 		describe: 'Target format for the generated code',
 	})

package/dist/package.json

@@ -1,37 +0,0 @@
-{
-    "name": "@devlearning/swagger-generator",
-    "version": "1.0.9",
-    "description": "Swagger generator apis and models for Angular and NextJS",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "dev": "ts-node --esm ./src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output",
-        "debug-angular": "npx tsx src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output angular moment",
-        "debug-nextjs": "npx tsx src/index.ts http://localhost:7550/swagger/ApiGateway/swagger.json autogeneration/output next date-fns",
-        "deploy": "npx tsc && npm publish"
-    },
-    "bin": {
-        "swgen": "./dist/index.js"
-    },
-    "keywords": [
-        "swagger",
-        "angular",
-        "nextjs",
-        "api",
-        "generator"
-    ],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "cli-progress": "^3.12.0",
-        "node-fetch": "^3.3.2"
-    },
-    "node-fetch": "^3.3.2",
-    "devDependencies": {
-        "@types/cli-progress": "^3.11.6",
-        "@types/node": "^18.15.0",
-        "ts-node": "^10.9.1",
-        "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.1.6"
-    }
-}

package/dist/src/api.constants.js

@@ -1,24 +0,0 @@
-export const API_PRE = `import { HttpClient } from '@angular/common/http';
-import { Observable, catchError, map } from 'rxjs';
-import * as Models from './model.autogenerated';
-import { HttpHeaders } from "@angular/common/http";
-
-export const httpOptions = {
-  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
-};
-
-export const httpOptionsMultipart = {};
-
-export abstract class ApiAutogeneratedService {
-  constructor(
-    public _http: HttpClient,
-    public _baseUrl: string,
-  ) { }
-
-  protected abstract _momentToString(moment: moment.Moment): string;
-  protected abstract _handleRequest<T>(request: T): T;
-  protected abstract _handleMultipart<T>(request: T): FormData;
-  protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError(error: any, obs: any): Observable<never>;
-`;
-export const API_POST = `}`;