fix: 处理优先读取命令行参数模式, 修复增量模式index的抛出被清空的问题 (#239)

* fix: merge index bug

---------

Co-authored-by: Json_Lee <[email protected]>

Author: JsonLee12138

src/bin/openapi.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { program } from 'commander';
+import { type OptionValues, program } from 'commander';
 import { pickBy } from 'lodash';
 import { join } from 'path';
 
@@ -109,7 +109,52 @@ function getPath(path: string) {
   return join(process.cwd(), path);
 }
 
+const baseGenerate = (_params_: OptionValues): GenerateServiceProps => {
+  const input = getPath(_params_.input as string);
+  const output = getPath(_params_.output as string);
+  const options: GenerateServiceProps = {
+    schemaPath: input,
+    serversPath: output,
+    requestLibPath: _params_.requestLibPath as string,
+    enableLogging: JSON.parse(_params_.enableLogging as string) === true,
+    priorityRule: _params_.priorityRule as IPriorityRule,
+    includeTags: _params_.includeTags as string[],
+    includePaths: _params_.includePaths as string[],
+    excludeTags: _params_.excludeTags as string[],
+    excludePaths: _params_.excludePaths as string[],
+    requestOptionsType: _params_.requestOptionsType as string,
+    apiPrefix: _params_.apiPrefix as string,
+    isGenReactQuery: JSON.parse(_params_.isGenReactQuery as string) === true,
+    reactQueryMode: _params_.reactQueryMode as IReactQueryMode,
+    isGenJavaScript: JSON.parse(_params_.isGenJavaScript as string) === true,
+    isDisplayTypeLabel:
+      JSON.parse(_params_.isDisplayTypeLabel as string) === true,
+    isGenJsonSchemas: JSON.parse(_params_.isGenJsonSchemas as string) === true,
+    mockFolder: _params_.mockFolder as string,
+    authorization: _params_.authorization as string,
+    nullable: JSON.parse(_params_.nullable as string) === true,
+    isTranslateToEnglishTag:
+      JSON.parse(_params_.isTranslateToEnglishTag as string) === true,
+    isOnlyGenTypeScriptType:
+      JSON.parse(_params_.isOnlyGenTypeScriptType as string) === true,
+    isCamelCase: JSON.parse(_params_.isCamelCase as string) === true,
+    isSupportParseEnumDesc:
+      JSON.parse(_params_.isSupportParseEnumDesc as string) === true,
+  };
+  return options;
+};
+
 async function run() {
+  if (params.input && params.output) {
+    const options = baseGenerate(params);
+    await generateService(
+      pickBy(
+        options,
+        (value) => value !== null && value !== undefined && value !== ''
+      ) as GenerateServiceProps
+    );
+    process.exit(0);
+  }
   const cnf = await readConfig<GenerateServiceProps | GenerateServiceProps[]>({
     fallbackName: 'openapi-ts-request',
     filePath: params.configFilePath as string,
@@ -148,40 +193,7 @@ async function run() {
         );
         process.exit(1);
       }
-      const input = getPath(params.input as string);
-      const output = getPath(params.output as string);
-
-      const options: GenerateServiceProps = {
-        schemaPath: input,
-        serversPath: output,
-        requestLibPath: params.requestLibPath as string,
-        enableLogging: JSON.parse(params.enableLogging as string) === true,
-        priorityRule: params.priorityRule as IPriorityRule,
-        includeTags: params.includeTags as string[],
-        includePaths: params.includePaths as string[],
-        excludeTags: params.excludeTags as string[],
-        excludePaths: params.excludePaths as string[],
-        requestOptionsType: params.requestOptionsType as string,
-        apiPrefix: params.apiPrefix as string,
-        isGenReactQuery: JSON.parse(params.isGenReactQuery as string) === true,
-        reactQueryMode: params.reactQueryMode as IReactQueryMode,
-        isGenJavaScript: JSON.parse(params.isGenJavaScript as string) === true,
-        isDisplayTypeLabel:
-          JSON.parse(params.isDisplayTypeLabel as string) === true,
-        isGenJsonSchemas:
-          JSON.parse(params.isGenJsonSchemas as string) === true,
-        mockFolder: params.mockFolder as string,
-        authorization: params.authorization as string,
-        nullable: JSON.parse(params.nullable as string) === true,
-        isTranslateToEnglishTag:
-          JSON.parse(params.isTranslateToEnglishTag as string) === true,
-        isOnlyGenTypeScriptType:
-          JSON.parse(params.isOnlyGenTypeScriptType as string) === true,
-        isCamelCase: JSON.parse(params.isCamelCase as string) === true,
-        isSupportParseEnumDesc:
-          JSON.parse(params.isSupportParseEnumDesc as string) === true,
-      };
-
+      const options = baseGenerate(params);
       await generateService(
         pickBy(
           options,

src/generator/merge.ts

@@ -1,6 +1,7 @@
 import {
   type ClassDeclarationStructure,
   type EnumDeclarationStructure,
+  type ExportDeclarationStructure,
   type FunctionDeclarationOverloadStructure,
   type FunctionDeclarationStructure,
   type ImportDeclarationStructure,
@@ -19,7 +20,6 @@ const sortMapByKey = <T = unknown>(map: Map<string, T>) => {
     .sort((a, b) => a[0].localeCompare(b[0]))
     .map(([k, v]) => ({ k, v }));
 };
-
 export class Merger {
   #project: Project;
   #sourceFile: SourceFile;
@@ -56,6 +56,30 @@ export class Merger {
     this.#mergedFile = this.#project.createSourceFile('_merged_.ts');
   }
 
+  // TODO: 需要重构合并导出, 主要是export * from 'xxx' 和 export {a} from 'xxx' 的合并
+  #mergeExport(destFile: SourceFile) {
+    const exportMap = new Map<string, ExportDeclarationStructure>();
+    // const exportArray: ExportDeclarationStructure[] = [];
+    this.#sourceFile.getExportDeclarations()?.forEach((e) => {
+      const eStructure = e.getStructure();
+      const path = e.getModuleSpecifierValue();
+      if (path) {
+        exportMap.set(path, eStructure);
+      }
+    });
+
+    destFile.getExportDeclarations()?.forEach((e) => {
+      const eStructure = e.getStructure();
+      const path = e.getModuleSpecifierValue();
+      if (path) {
+        exportMap.set(path, eStructure);
+      }
+    });
+    sortMapByKey<ExportDeclarationStructure>(exportMap).forEach(({ v }) => {
+      this.#mergedFile.addExportDeclaration(v);
+    });
+  }
+
   #mergeClass(destFile: SourceFile) {
     const classMap = new Map<string, ClassDeclarationStructure>();
     this.#sourceFile.getClasses().forEach((c) => {
@@ -258,6 +282,11 @@ export class Merger {
     this.#mergeEnums(destFile);
     this.#mergeInterfaces(destFile);
     this.#mergeFunctions(destFile);
+    this.#mergeExport(destFile);
+    // console.log(source, '>>>>');
+    // if (srcPath?.includes('index.ts')) {
+    //   console.log(source, '>>>>');
+    // }
     const leadingComment = this.#leadingCommentRanges.join('\n');
     if (leadingComment) {
       return `${leadingComment}\n${this.#mergedFile.getFullText()}`;