feat: support Request,Response type export for pnpm use

liangskyli · May 12, 2023 · 5a6f931 · 5a6f931
1 parent fc97fdf
commit 5a6f931
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/packages/http-mock-gen/package.json b/packages/http-mock-gen/package.json
@@ -41,6 +41,7 @@
   "dependencies": {
     "@liangskyli/openapi-gen-ts": "^1.0.1",
     "@liangskyli/utils": "workspace:*",
+    "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
     "axios": "^1.4.0",
     "commander": "^10.0.1",
@@ -49,8 +50,7 @@
     "json-schema-faker": "^0.5.0-rcv.46"
   },
   "devDependencies": {
-    "@liangskyli/http-mock-gen": "workspace:*",
-    "@types/express": "^4.17.17"
+    "@liangskyli/http-mock-gen": "workspace:*"
   },
   "engines": {
     "node": ">=16.10.0"

diff --git a/packages/http-mock-gen/src/gen/custom-data-template/index.tpl b/packages/http-mock-gen/src/gen/custom-data-template/index.tpl
@@ -1,5 +1,5 @@
 // 自定义mock数据入口，文件不可删除。
-import type { ICustomsData } from 'packageName';
+import type { ICustomsData } from '{{packageName}}';
 import { TemplateData } from './template-data';
 
 const CustomData: ICustomsData = {

diff --git a/packages/http-mock-gen/src/gen/custom-data-template/template-data.tpl b/packages/http-mock-gen/src/gen/custom-data-template/template-data.tpl
@@ -1,5 +1,4 @@
-import type { ICustomsData, PartialAll, ICustomDataValue } from 'packageName';
-import type { Request } from 'express';
+import type { ICustomsData, PartialAll, ICustomDataValue, Request } from '{{packageName}}';
 import type { IApi } from '{{IApiRelativePath}}';
 
 export const TemplateData: ICustomsData<{

diff --git a/packages/http-mock-gen/src/gen/file/gen-custom-data.ts b/packages/http-mock-gen/src/gen/file/gen-custom-data.ts
@@ -43,7 +43,7 @@ export class GenCustomData {
       IApiRelativePath = `./${IApiRelativePath}`;
     }
     return templateData
-      .replace('packageName', packageName)
+      .replace(/{{packageName}}/gi, packageName)
       .replace(/{{IApiRelativePath}}/gi, winPath(IApiRelativePath))
       .replace(/{{firstPath}}/gi, firstPath)
       .replace(/{{responseData}}/gi, JSON.stringify(responseData));
@@ -74,7 +74,7 @@ export class GenCustomData {
       .readFileSync(templatePath, {
         encoding: 'utf-8',
       })
-      .replace('packageName', packageName);
+      .replace(/{{packageName}}/gi, packageName);
     const absolutePath = path.join(genCustomDataPath, 'index.ts');
 
     writePrettierFile({

diff --git a/packages/http-mock-gen/src/gen/file/gen-interface-mock-data.ts b/packages/http-mock-gen/src/gen/file/gen-interface-mock-data.ts
@@ -36,10 +36,9 @@ export class GenInterfaceMockData {
     }
     const interfaceMockData: string[] = [];
     interfaceMockData.push(`${fileTip}
-    import type { Request, Response } from "express";
     import CustomData from "./custom-data";
     import { getMockData } from "${packageName}";
-    import type { ICustomData, PartialAll } from "${packageName}";
+    import type { ICustomData, PartialAll, Request, Response } from "${packageName}";
     import type { IApi } from '${IApiRelativePath}';
   `);
 

diff --git a/packages/http-mock-gen/src/index.ts b/packages/http-mock-gen/src/index.ts
@@ -1,5 +1,5 @@
 import type { IAPIRequest, PartialAll } from '@liangskyli/openapi-gen-ts';
-import type { Request } from 'express';
+import type { Request, Response } from 'express';
 import genMockData from './gen/index';
 import type {
   ICustomData,
@@ -47,5 +47,7 @@ export type {
   ICustomsData,
   IAPIRequest,
   PartialAll,
+  Request,
+  Response,
 };
 export default genMockData;
diff --git a/packages/http-mock-gen/test/gen/file/__test__snapshots__/custom-data/template-data.ts b/packages/http-mock-gen/test/gen/file/__test__snapshots__/custom-data/template-data.ts
@@ -2,8 +2,8 @@ import type {
   ICustomDataValue,
   ICustomsData,
   PartialAll,
+  Request,
 } from '@liangskyli/http-mock-gen';
-import type { Request } from 'express';
 import type { IApi } from '../schema-api/interface-api';
 
 export const TemplateData: ICustomsData<{

diff --git a/packages/http-mock-gen/test/gen/file/__test__snapshots__/custom-data2/template-data.ts b/packages/http-mock-gen/test/gen/file/__test__snapshots__/custom-data2/template-data.ts
@@ -2,8 +2,8 @@ import type {
   ICustomDataValue,
   ICustomsData,
   PartialAll,
+  Request,
 } from '@liangskyli/http-mock-gen';
-import type { Request } from 'express';
 import type { IApi } from './schema-api/interface-api';
 
 export const TemplateData: ICustomsData<{

diff --git a/packages/http-mock-gen/test/gen/file/__test__snapshots__/interface-mock-data.ts b/packages/http-mock-gen/test/gen/file/__test__snapshots__/interface-mock-data.ts
@@ -1,7 +1,11 @@
 // This file is auto generated by @liangskyli/http-mock-gen, do not edit!
-import type { ICustomData, PartialAll } from '@liangskyli/http-mock-gen';
+import type {
+  ICustomData,
+  PartialAll,
+  Request,
+  Response,
+} from '@liangskyli/http-mock-gen';
 import { getMockData } from '@liangskyli/http-mock-gen';
-import type { Request, Response } from 'express';
 import CustomData from './custom-data';
 import type { IApi } from './schema-api/interface-api';
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml