Merge pull request #146 from FrontEndDev-org/feat/v0.x

Feat/v0.x

Author: cloudcome

package-lock.json

@@ -56,15 +56,13 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.2",
-    "lodash-es": "^4.17.21",
     "swagger-typescript-api": "^12.0.4"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
     "@commitlint/types": "^17.4.4",
     "@rollup/plugin-typescript": "^11.0.0",
-    "@types/lodash-es": "^4.17.7",
     "@types/node": "^18.15.7",
     "@types/prettier": "^2.7.2",
     "@typescript-eslint/eslint-plugin": "^5.55.0",

package.json

@@ -1,9 +1,9 @@
 import fs from 'fs/promises';
-import { isBoolean, isString } from 'lodash-es';
 import path from 'path';
 import { generateApi, GenerateApiParams } from 'swagger-typescript-api';
 import { axiosImportDefault, helpersImport, templatesDir } from './const';
 import { Generated, GeneratedCallback, OpenapiConfig, StrictConfig } from './types';
+import { isBoolean, isString } from './utils';
 
 export function generateParams(openapiConfig: OpenapiConfig, config: StrictConfig): GenerateApiParams {
   const { name, schema, unwrapResponseData: unwrapResponseDataScope } = openapiConfig;

src/generator.ts

@@ -1,5 +1,5 @@
-import { isBoolean, isDate, isNull, isNumber, isObject, isPlainObject, isString } from 'lodash-es';
 import { ContentKind } from './types';
+import { isBoolean, isDate, isNumber, isObject, isString } from './utils';
 
 /**
  * 格式化请求头
@@ -31,7 +31,7 @@ export function isBlob(value: unknown): value is Blob {
 
 export function toFormDataValue(value: unknown): string | Blob {
   if (isString(value) || isNumber(value) || isBoolean(value)) return String(value);
-  if (isPlainObject(value)) return JSON.stringify(value);
+  if (isObject(value)) return JSON.stringify(value);
   if (isDate(value)) return value.toISOString();
   if (isBlob(value)) return value;
   return '';
@@ -46,7 +46,7 @@ export function toFormDataValue(value: unknown): string | Blob {
 export function formatBody<D>(contentKind: ContentKind, body: D) {
   switch (contentKind) {
     case ContentKind.URL_ENCODED:
-      return isPlainObject(body) ? new URLSearchParams(body as Record<string, string>).toString() : '';
+      return isObject(body) ? new URLSearchParams(body as Record<string, string>).toString() : '';
 
     case ContentKind.FORM_DATA: {
       const fd = new FormData();

src/helpers.ts

@@ -3,6 +3,26 @@ import fs from 'fs/promises';
 import path from 'path';
 import * as process from 'process';
 
+export function isString(any: unknown): any is string {
+  return typeof any === 'string';
+}
+
+export function isBoolean(any: unknown): any is boolean {
+  return typeof any === 'boolean';
+}
+
+export function isNumber(any: unknown): any is number {
+  return typeof any === 'number';
+}
+
+export function isObject(any: unknown): any is object {
+  return typeof any === 'object' && any !== null;
+}
+
+export function isDate(any: unknown): any is Date {
+  return Boolean(any && any instanceof Date);
+}
+
 export async function isFile(p: string) {
   try {
     const state = await fs.stat(p);

src/utils.ts

@@ -1,10 +1,13 @@
-import { random } from 'lodash-es';
 import path from 'path';
 import { cleanDir, isFile } from 'src/utils';
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
 import { generate, Generated, GenerateInfo, generateItem, OpenapiSpec, StrictConfig } from '../src';
 import petstore3 from './petstore3.json';
 
+function randomString(): string {
+  return Math.random().toString(16).slice(-6);
+}
+
 describe('generate-item', () => {
   const cwd = process.cwd();
   const dest = 'dist-test';
@@ -24,7 +27,7 @@ describe('generate-item', () => {
   test(
     'from url',
     async () => {
-      const name = '/' + random(1, 1000) + '/' + random(1, 1000);
+      const name = '/' + randomString() + '/' + randomString();
       const expectedFile = path.join(cwd, dest, name + '.ts');
 
       const generated = await generateItem(
@@ -43,7 +46,7 @@ describe('generate-item', () => {
   );
 
   test('from sepc', async () => {
-    const name = '/' + random(1, 1000) + '/' + random(1, 1000);
+    const name = '/' + randomString() + '/' + randomString();
     const expectedFile = path.join(cwd, dest, name + '.ts');
 
     const generated = await generateItem(
@@ -69,11 +72,11 @@ test('generate', async () => {
     dest: dest,
     apis: [
       {
-        name: random(1, 1000).toString(),
+        name: randomString(),
         schema: petstore3 as unknown as OpenapiSpec,
       },
       {
-        name: random(1, 1000).toString(),
+        name: randomString(),
         schema: petstore3 as unknown as OpenapiSpec,
       },
     ],

test/generator.test.ts

@@ -6,5 +6,6 @@
     "emitDeclarationOnly": true,
     "declarationDir": "dist-dts",
     "module": "ESNext"
-  }
+  },
+  "include": ["./src/**/*.ts"]
 }