@devlearning/swagger-generator 1.1.21 → 1.1.22

package/dist/generators-writers/nextjs/constants.js

@@ -1,5 +1,5 @@
-export const API_PRE = `import axios from 'axios';
-import * as Models from './model.autogenerated';
-import { handleRequest, dateToZulu } from './utils/axios'
-import { isValid } from 'date-fns';
+export const API_PRE = `import axios from 'axios';
+import * as Models from './model.autogenerated';
+import { handleRequest, dateToZulu } from './utils/axios'
+import { isValid } from 'date-fns';
 `;

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

@@ -12,10 +12,10 @@ export class ModelNextJsWriter {
         this._writeFile(modelString);
     }
     _modelString(model) {
-        let modelString = `
-export ${model.modelType} ${model.name} {
-${this._properties(model)}${this._enumValues(model)}
-}
+        let modelString = `
+export ${model.modelType} ${model.name} {
+${this._properties(model)}${this._enumValues(model)}
+}
 `;
         return modelString;
     }
@@ -37,8 +37,8 @@ ${this._properties(model)}${this._enumValues(model)}
         return enumValuesString.trimEnd();
     }
     _writeFile(models) {
-        fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `
-  ${models}
+        fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `
+  ${models}
 `, { flag: 'w' });
     }
 }

package/dist/generators-writers/utils.d.ts

@@ -1,5 +1,6 @@
 import { SwaggerSchema } from "../models/swagger/swagger-schema.js";
 export declare class Utils {
+    private static _normalizeApiPathForMethodName;
     static getNormalizedApiPathAngular(apiName: string): string;
     static getNormalizedApiPathDart(apiName: string): string;
     static toFirstLetterLowercase(value: string): string;

package/dist/generators-writers/utils.js

@@ -1,18 +1,30 @@
 import fs from 'fs';
 import path from 'path';
 export class Utils {
+    static _normalizeApiPathForMethodName(apiName) {
+        let normalized = apiName ?? '';
+        // Remove placeholder segments (for example {id} or {version}).
+        normalized = normalized.replace(/\{[^}]+\}/g, '');
+        // Remove leading /api or api prefix.
+        normalized = normalized.replace(/^\/?api\/?/i, '');
+        // For paths like "repro/v1/..." remove both scope (repro) and version segment.
+        normalized = normalized.replace(/^[^/]+\/v\d*\//i, '');
+        // Remove version segment for paths without scope, like "v1/...".
+        normalized = normalized.replace(/\/?v\d*\//i, '/');
+        normalized = normalized.replace(/^\/+/, '');
+        return normalized;
+    }
     static getNormalizedApiPathAngular(apiName) {
-        let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+        let normalizedApiName = this._normalizeApiPathForMethodName(apiName).replaceAll('/', '_');
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);
         }
         normalizedApiName = normalizedApiName.replaceAll('/', '_');
+        normalizedApiName = normalizedApiName.replace(/^_+|_+$/g, '');
         return normalizedApiName;
     }
     static getNormalizedApiPathDart(apiName) {
-        // Remove path params like {id} from the method name.
-        apiName = apiName.replace(/\{[^}]+\}/g, '');
-        let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+        let normalizedApiName = this._normalizeApiPathForMethodName(apiName).replaceAll('/', '_');
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);
         }

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,49 +1,49 @@
-{
-  "name": "@devlearning/swagger-generator",
-  "version": "1.1.21",
-  "description": "Swagger generator apis and models for Angular and NextJS",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "build": "npx tsc && npm run copy-templates",
-    "debug-angular": "npx tsx src/index.ts --url http://localhost:5208/swagger/v1/swagger.json --output autogen --target angular --dateTimeLibrary moment",
-    "debug-angular-unified": "npx tsx src/index.ts --url http://localhost:5208/swagger/v1/swagger.json --output autogen --target angular --dateTimeLibrary moment --api-client-name ApiClient",
-    "debug-nextjs": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target next --dateTimeLibrary date-fns",
-    "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app",
-    "debug-flutter-unified": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app --api-client-name ApiClient",
-    "copy-templates": "copyfiles -u 3 \"src/generators-writers/dart/templates/**/*\" dist/generators-writers/dart",
-    "prepublishOnly": "npm run build",
-    "deploy": "npm publish"
-  },
-  "bin": {
-    "swgen": "./dist/index.js"
-  },
-  "keywords": [
-    "swagger",
-    "angular",
-    "nextjs",
-    "dart",
-    "flutter",
-    "api",
-    "generator"
-  ],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cli-progress": "^3.12.0",
-    "mustache": "^4.2.0",
-    "node-fetch": "^3.3.2",
-    "yargs": "^18.0.0"
-  },
-  "node-fetch": "^3.3.2",
-  "devDependencies": {
-    "@types/cli-progress": "^3.11.6",
-    "@types/mustache": "^4.2.6",
-    "@types/node": "^24.7.0",
-    "@types/yargs": "^17.0.33",
-    "copyfiles": "^2.4.1",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.6"
-  }
-}
+{
+  "name": "@devlearning/swagger-generator",
+  "version": "1.1.22",
+  "description": "Swagger generator apis and models for Angular and NextJS",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "build": "npx tsc && npm run copy-templates",
+    "debug-angular": "npx tsx src/index.ts --url http://localhost:5289/swagger/repro-v1/swagger.json --output autogen --target angular --dateTimeLibrary moment",
+    "debug-angular-unified": "npx tsx src/index.ts --url http://localhost:5289/swagger/repro-v1/swagger.json --output autogen --target angular --dateTimeLibrary moment --api-client-name ApiClient",
+    "debug-nextjs": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target next --dateTimeLibrary date-fns",
+    "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app",
+    "debug-flutter-unified": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app --api-client-name ApiClient",
+    "copy-templates": "copyfiles -u 3 \"src/generators-writers/dart/templates/**/*\" dist/generators-writers/dart",
+    "prepublishOnly": "npm run build",
+    "deploy": "npm publish"
+  },
+  "bin": {
+    "swgen": "./dist/index.js"
+  },
+  "keywords": [
+    "swagger",
+    "angular",
+    "nextjs",
+    "dart",
+    "flutter",
+    "api",
+    "generator"
+  ],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cli-progress": "^3.12.0",
+    "mustache": "^4.2.0",
+    "node-fetch": "^3.3.2",
+    "yargs": "^18.0.0"
+  },
+  "node-fetch": "^3.3.2",
+  "devDependencies": {
+    "@types/cli-progress": "^3.11.6",
+    "@types/mustache": "^4.2.6",
+    "@types/node": "^24.7.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/api.constants.ts

@@ -1,27 +1,27 @@
-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 =
+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 =
     `}`;