fix: core/request

Author: diveDylan

bin/index.js

@@ -19,7 +19,7 @@ program
     .option('--exportServices <value>', 'Write services to disk', true)
     .option('--exportModels <value>', 'Write models to disk', true)
     .option('--exportSchemas <value>', 'Write schemas to disk', false)
-    .option('--apiAlias <value>', 'your api alias here')
+    .option('--apiAlias <value>', 'your api alias here', '../core/request')
     .parse(process.argv);
 
 const OpenAPI = require(path.resolve(__dirname, '../dist/index.js'));

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.5.7",
+    "version": "0.6.0",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "zengxiangda",
     "homepage": "http://gitlab.psf-dev.com/frontend/openapi-typescritp-codegen",
@@ -28,8 +28,8 @@
     ],
     "maintainers": [
         {
-            "name": "Ferdi Koomen",
-            "email": "info@madebyferdi.com"
+            "name": "dylan",
+            "email": "dylan_zeng92@qq.com"
         }
     ],
     "main": "dist/index.js",

package.json

@@ -5,9 +5,7 @@
 import type { {{{this}}} } from '../models/{{{this}}}';
 {{/each}}
 {{/if}}
-{{#if alias }}
 import { request as __request } from '{{alias}}';
-{{/if}}
 {{#if @root.useVersion}}
 import { OpenAPI } from '../core/OpenAPI';
 {{/if}}

src/templates/exportService.hbs

@@ -39,7 +39,7 @@ export async function writeClient(
 ): Promise<void> {
     const outputPath = path.resolve(process.cwd(), output);
     // cancel write core
-    const outputPathCore = alias ? '' : path.resolve(outputPath, 'core');
+    const outputPathCore =  path.resolve(outputPath, 'core');
     const outputPathModels = path.resolve(outputPath, 'models');
     const outputPathSchemas = path.resolve(outputPath, 'schemas');
     const outputPathServices = path.resolve(outputPath, 'services');
@@ -53,8 +53,7 @@ export async function writeClient(
     await rmdir(outputPathServices);
     await mkdir(outputPath);
     const coreExists = await exists(outputPathCore)
-    console.log('outputPathCore', outputPathCore,coreExists )
-    if (exportCore && outputPathCore && !coreExists) {
+    if (exportCore && outputPathCore) {
         await mkdir(outputPathCore);
         await writeClientCore(client, templates, outputPathCore, httpClient);
     }

src/utils/writeClient.ts

@@ -20,7 +20,7 @@ const VERSION_TEMPLATE_STRING = 'OpenAPI.VERSION';
 export async function writeClientServices(services: Service[], templates: Templates, outputPath: string, httpClient: HttpClient, useUnionTypes: boolean, useOptions: boolean, alias: string): Promise<void> {
     for (const service of services) {
         const file = path.resolve(outputPath, `${service.name}.ts`);
-        service.alias = alias
+        if (alias)  service.alias = alias
         const useVersion = service.operations.some(operation => operation.path.includes(VERSION_TEMPLATE_STRING));
         const templateResult = templates.exports.service({
             ...service,