Merge pull request #50 from cloudcome/feat/v0.x

Feat/v0.x

Author: cloudcome

.eslintrc.cjs

@@ -10,6 +10,12 @@ module.exports = defineConfig({
   },
 
   overrides: [
+    {
+      files: ['*.mjs'],
+      parserOptions: {
+        sourceType: 'module',
+      },
+    },
     {
       files: ['*.ts'],
       parser: '@typescript-eslint/parser',

.github/workflows/release.yml

@@ -13,11 +13,6 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: szenius/set-timezone@v1.1
-        with:
-          timezoneLinux: Asia/Shanghai
-          timezoneMacos: Asia/Shanghai
-          timezoneWindows: Asia/Shanghai
       - uses: google-github-actions/release-please-action@v3
         id: release
         with:

package.json

@@ -4,7 +4,7 @@
   "description": "OpenAPI Specification ➡️ TypeScript",
   "scripts": {
     "prepare": "husky install",
-    "lint": "eslint src/**/*.ts",
+    "lint": "eslint src/**/*.ts && tsc --project tsconfig.json --noEmit",
     "test": "echo 'no test'",
     "build:types": "rm -rf dist-dts && tsc --project tsconfig.types.json",
     "build:files": "rm -rf dist-cjs dist-mjs && rollup --config",

rollup.config.mjs

@@ -1,17 +1,20 @@
 import typescript from '@rollup/plugin-typescript';
 
+/** @type {import('rollup').RollupOptions} */
 export default {
   input: ['src/index.ts', 'src/helpers.ts'],
   output: [
     {
       format: 'esm',
       dir: 'dist-mjs',
       entryFileNames: '[name].mjs',
+      sourcemap: true,
     },
     {
       format: 'cjs',
       dir: 'dist-cjs',
       entryFileNames: '[name].cjs',
+      sourcemap: true,
     },
   ],
   plugins: [

src/configure.ts

@@ -1,7 +1,7 @@
 import { axiosImportDefault } from './const';
-import { Config, UserConfig } from './types';
+import { StrictConfig, UserConfig } from './types';
 
-export const defaults: Config = {
+export const defaults: StrictConfig = {
   cwd: process.cwd(),
   dest: 'src/apis',
   axiosImport: axiosImportDefault,
@@ -10,5 +10,5 @@ export const defaults: Config = {
 };
 
 export function defineConfig(config: UserConfig) {
-  return Object.assign({}, defaults, config);
+  return Object.assign({}, defaults, config) as StrictConfig;
 }

src/generator.ts

@@ -1,14 +1,14 @@
 import chalk from 'chalk';
 import { cosmiconfig } from 'cosmiconfig';
-import { CosmiconfigResult } from 'cosmiconfig/dist/types';
 import fs from 'fs/promises';
 import path from 'path';
 import { generateApi } from 'swagger-typescript-api';
+import { defineConfig } from './configure';
 import { axiosImportDefault, helpersImport, templatesDir } from './const';
-import { Config, Oas } from './types';
+import { StrictConfig, Oas, UserConfig } from './types';
 import { exitError, normalizeError, tryCatch } from './utils';
 
-export async function generateItem(oas: Oas, config: Config) {
+export async function generateItem(oas: Oas, config: StrictConfig) {
   const { name, url, spec, axiosImport: axiosImportScope } = oas;
   const { cwd, dest, axiosImport: axiosImportGlobal, unwrapResponseData } = config;
   const axiosImport = axiosImportScope || axiosImportGlobal || axiosImportDefault;
@@ -33,7 +33,7 @@ export async function generateItem(oas: Oas, config: Config) {
   }
 }
 
-export async function generate(config: Config) {
+export async function generate(config: StrictConfig) {
   const { list } = config;
   let step = 0;
   const length = list.length;
@@ -61,7 +61,11 @@ export async function start() {
     return exitError('配置文件未找到');
   }
 
-  const config = result.config as Config;
+  const config = result.filepath.endsWith('js')
+    ? // js 文件使用 defineConfig，返回的是 StrictConfig
+      (result.config as StrictConfig)
+    : // json 文件是纯文本，返回的 UserConfig
+      defineConfig(result.config as UserConfig);
 
   try {
     await generate(config);

src/helpers.ts

@@ -19,17 +19,17 @@ export function formatHeaders(contentKind: ContentKind) {
 /**
  * 格式化请求体
  * @param {string} contentKind
- * @param data
+ * @param body
  * @returns {FormData | string}
  */
-export function formatBody(contentKind: ContentKind, data: any) {
+export function formatBody(contentKind: ContentKind, body: any) {
   switch (contentKind) {
     case ContentKind.URL_ENCODED:
-      return new URLSearchParams(data).toString();
+      return new URLSearchParams(body).toString();
 
     case ContentKind.FORM_DATA: {
-      return Object.keys(data).reduce((fd, key) => {
-        const val = data[key];
+      return Object.keys(body).reduce((fd, key) => {
+        const val = body[key];
         const isFileType = val instanceof Blob || val instanceof File;
         const isString = typeof val === 'string' || typeof val === 'number';
         fd.append(key, isFileType ? val : isString ? String(val) : JSON.stringify(val));
@@ -38,6 +38,6 @@ export function formatBody(contentKind: ContentKind, data: any) {
     }
 
     default:
-      return JSON.stringify(data);
+      return JSON.stringify(body);
   }
 }

src/types.ts

@@ -53,7 +53,7 @@ export interface UserConfig {
   list: Oas[];
 }
 
-export type Config = Required<UserConfig>;
+export type StrictConfig = Required<UserConfig>;
 
 export enum ContentKind {
   JSON = 'JSON',