fix: load zod json error under esm environment (#4433)

czy88840616 · web-flow · commit 7b3a52139864 · 2025-11-09T21:23:29.000+08:00
* fix: load zod json error under esm environment

* fix: load zod json error under esm environment

* fix: test

* fix: test

* fix: test

* fix: test

* chore: update

* fix: test

* fix: test

* fix: test

* fix: test

* fix: test
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['lts/*']
+        node-version: ['20.x']
 
     steps:
       - uses: actions/checkout@v4
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
     "typedoc": "^0.26.11",
-    "typescript": "5.3.3",
+    "typescript": "5.6.3",
     "why-is-node-running": "2.3.0",
     "zx": "8.2.4"
   },
diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -59,22 +59,22 @@ export abstract class BaseFramework<
   private namespace: string;
 
   @Inject()
-  loggerService: MidwayLoggerService;
+  protected loggerService: MidwayLoggerService;
 
   @Inject()
-  environmentService: MidwayEnvironmentService;
+  protected environmentService: MidwayEnvironmentService;
 
   @Inject()
-  configService: MidwayConfigService;
+  protected configService: MidwayConfigService;
 
   @Inject()
-  informationService: MidwayInformationService;
+  protected informationService: MidwayInformationService;
 
   @Inject()
-  middlewareService: MidwayMiddlewareService<CTX, ResOrNext, Next>;
+  protected middlewareService: MidwayMiddlewareService<CTX, ResOrNext, Next>;
 
   @Inject()
-  mockService: MidwayMockService;
+  protected mockService: MidwayMockService;
 
   constructor(readonly applicationContext: IMidwayGlobalContainer) {}
 
diff --git a/packages/core/src/util/index.ts b/packages/core/src/util/index.ts
@@ -55,8 +55,6 @@ export const safeRequire = (p, enabledCache = true) => {
   }
 };
 
-const innerLoadModuleCache = {};
-
 /**
  * load module, and it can be chosen commonjs or esm mode
  * @param p
@@ -91,18 +89,9 @@ export const loadModule = async (
       } else {
         // if json file, import need add options
         if (p.endsWith('.json')) {
-          /**
-           * attention: import json not support under nodejs 16
-           * use readFileSync instead
-           */
-          if (!innerLoadModuleCache[p]) {
-            // return (await import(p, { assert: { type: 'json' } })).default;
-            const content = readFileSync(p, {
-              encoding: 'utf-8',
-            });
-            innerLoadModuleCache[p] = JSON.parse(content);
-          }
-          return innerLoadModuleCache[p];
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          return (await import(p, { with: { type: 'json' } })).default;
         } else {
           return await import(pathToFileURL(p).href);
         }
diff --git a/packages/core/test/common/applicationManager.test.ts b/packages/core/test/common/applicationManager.test.ts
@@ -20,7 +20,7 @@ describe('test/common/applicationManager.test.ts', () => {
     }
 
     const framework = new CustomFramework1({} as any);
-    framework.mockService = mockService;
+    framework['mockService'] = mockService;
     await framework.initialize();
 
     manager.addFramework('test', framework);
diff --git a/packages/core/test/context/container.test.ts b/packages/core/test/context/container.test.ts
@@ -137,7 +137,7 @@ describe('/test/context/container.test.ts', () => {
       tt: any;
 
       @App()
-      a: any;
+      declare a: any;
 
       @Plugin()
       bb: any;
diff --git a/packages/core/test/decorator/metadataManager.test.ts b/packages/core/test/decorator/metadataManager.test.ts
@@ -143,7 +143,7 @@ describe('MetadataManager.test.ts', () => {
       public method() {}
 
       @TestProperty()
-      public property: string;
+      public declare property: string;
     }
 
     new Child().method();
diff --git a/packages/core/test/fixtures/class_sample.ts b/packages/core/test/fixtures/class_sample.ts
@@ -105,7 +105,7 @@ export class SubCustom extends ParentCustom {
   tt: any;
 
   @App()
-  a: any;
+  declare a: any;
 
   @Plugin()
   bb: any;
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -4,8 +4,6 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "module": "Node16",
-    "moduleResolution": "Node16"
   },
   "include": [
     "./src/**/*.ts"
diff --git a/packages/faas/src/framework.ts b/packages/faas/src/framework.ts
@@ -13,13 +13,10 @@ import {
   ContextMiddlewareManager,
   FunctionMiddleware,
   IMidwayBootstrapOptions,
-  MidwayEnvironmentService,
-  MidwayMiddlewareService,
   MidwayServerlessFunctionService,
   RouterInfo,
   PathToRegexpUtil,
   Framework,
-  Inject,
   WEB_RESPONSE_CONTENT_TYPE,
   WEB_RESPONSE_HEADER,
   WEB_RESPONSE_HTTP_CODE,
@@ -50,9 +47,9 @@ export class MidwayFaaSFramework extends BaseFramework<
 > {
   protected defaultHandlerMethod = 'handler';
   protected funMappingStore: Map<string, RouterInfo> = new Map();
-  protected logger;
+  protected declare logger;
   private lock = new SimpleLock();
-  public app: Application;
+  public declare app: Application;
   private isReplaceLogger =
     process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] === 'true';
   private developmentRun = false;
@@ -65,12 +62,6 @@ export class MidwayFaaSFramework extends BaseFramework<
   private legacyVersion = false;
   private loadedFunction = false;
 
-  @Inject()
-  environmentService: MidwayEnvironmentService;
-
-  @Inject()
-  middlewareService: MidwayMiddlewareService<Context, any>;
-
   configure(options: IFaaSConfigurationOptions) {
     const faasConfig = this.configService.getConfiguration('faas') ?? {};
     if (options || faasConfig['developmentRun']) {
diff --git a/packages/grpc/src/provider/framework.ts b/packages/grpc/src/provider/framework.ts
@@ -37,7 +37,6 @@ export class MidwayGRPCFramework extends BaseFramework<
   Context,
   IMidwayGRPFrameworkOptions
 > {
-  public app: IMidwayGRPCApplication;
   private server: Server;
   protected frameworkLoggerName = 'grpcLogger';
 
diff --git a/packages/leoric/src/configuration.ts b/packages/leoric/src/configuration.ts
@@ -1,11 +1,13 @@
 import {
   APPLICATION_KEY,
+  ApplicationContext,
   Configuration,
   IMidwayContainer,
   Init,
   Inject,
   MidwayDecoratorService,
   REQUEST_OBJ_CTX_KEY,
+  ScopeEnum,
 } from '@midwayjs/core';
 import { LeoricDataSourceManager } from './dataSourceManager';
 import { DATA_SOURCE_KEY, MODEL_KEY } from './decorator';
@@ -30,6 +32,9 @@ export class LeoricConfiguration {
   @Inject()
   decoratorService: MidwayDecoratorService;
 
+  @ApplicationContext()
+  applicationContext: IMidwayContainer;
+
   dataSourceManager: LeoricDataSourceManager;
 
   @Init()
@@ -47,9 +52,12 @@ export class LeoricConfiguration {
             this.dataSourceManager.getDefaultDataSourceName()
         );
         const model = dataSource.models[getModelName(meta.modelName)];
-        const ctx = instance[REQUEST_OBJ_CTX_KEY];
         const app = instance[APPLICATION_KEY];
-        if (ctx) {
+        if (
+          this.applicationContext.getInstanceScope(instance) ===
+          ScopeEnum.Request
+        ) {
+          const ctx = instance[REQUEST_OBJ_CTX_KEY];
           return class extends model {
             static get ctx() {
               return ctx;
diff --git a/packages/leoric/test/fixtures/multi/src/subsystem/controller/post.ts b/packages/leoric/test/fixtures/multi/src/subsystem/controller/post.ts
@@ -8,6 +8,8 @@ export class PostController {
 
   @Get('')
   async get() {
-    return await this.postService.get();
+    const data = await this.postService.get();
+    console.log(data);
+    return data;
   }
 }
diff --git a/packages/leoric/test/fixtures/multi/src/subsystem/model/post.ts b/packages/leoric/test/fixtures/multi/src/subsystem/model/post.ts
@@ -10,9 +10,9 @@ export default class Post extends Bone {
   @Column(DataTypes.TEXT)
   content: string;
 
-  @Column()
+  @Column({name: 'created_at'})
   createdAt: Date;
 
-  @Column()
+  @Column({name: 'updated_at'})
   updatedAt: Date;
 }
diff --git a/packages/leoric/tsconfig.json b/packages/leoric/tsconfig.json
@@ -4,7 +4,8 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "rootDir": "src",
-    "outDir": "dist"
+    "outDir": "dist",
+    "target": "ES2021"
   },
   "include": [
     "./src/**/*.ts"
diff --git a/packages/mcp/src/framework.ts b/packages/mcp/src/framework.ts
@@ -28,7 +28,6 @@ export class MidwayMCPFramework extends BaseFramework<
   IMidwayMCPContext,
   IMidwayMCPConfigurationOptions
 > {
-  public app: IMidwayMCPApplication;
   protected frameworkLoggerName = 'mcpLogger';
   protected server: McpServer;
   configure() {
diff --git a/packages/mcp/src/index.ts b/packages/mcp/src/index.ts
@@ -1,5 +1,8 @@
 export { MCPConfiguration as Configuration } from './configuration';
-export * from './framework';
+export {
+  MidwayMCPFramework,
+  MidwayMCPFramework as Framework,
+} from './framework';
 export * from './interface';
 export * from './decorator';
 export * from './middleware/auth.middleware';
diff --git a/packages/mqtt/src/framework.ts b/packages/mqtt/src/framework.ts
@@ -20,7 +20,6 @@ export class MidwayMQTTFramework extends BaseFramework<
   IMidwayMQTTContext,
   IMidwayMQTTConfigurationOptions
 > {
-  public app: IMidwayMQTTApplication;
   protected subscriberMap: Map<string, MqttClient> = new Map();
   protected frameworkLoggerName = 'mqttLogger';
 
diff --git a/packages/rabbitmq/src/framework.ts b/packages/rabbitmq/src/framework.ts
@@ -24,9 +24,6 @@ export class MidwayRabbitMQFramework extends BaseFramework<
   IMidwayRabbitMQContext,
   IMidwayRabbitMQConfigurationOptions
 > {
-  public app: IMidwayRabbitMQApplication;
-  public consumerHandlerList = [];
-
   configure() {
     return this.configService.getConfiguration('rabbitmq');
   }
diff --git a/packages/socketio/src/framework.ts b/packages/socketio/src/framework.ts
@@ -33,7 +33,6 @@ export class MidwaySocketIOFramework extends BaseFramework<
   IMidwaySocketIOOptions
 > {
   private namespaceList = [];
-  public app: Application;
   protected connectionMiddlewareManager = this.createMiddlewareManager();
 
   configure(): IMidwaySocketIOOptions {
diff --git a/packages/validate/test/check.test.ts b/packages/validate/test/check.test.ts
@@ -67,7 +67,7 @@ describe('/test/check.test.ts', () => {
     class HelloDTO extends UserDTO {
 
       @Rule(RuleType.number().min(4))
-      age: number;
+      declare age: number;
     }
 
     @Provide()
diff --git a/packages/validate/test/dtoHelper.test.ts b/packages/validate/test/dtoHelper.test.ts
@@ -42,7 +42,7 @@ describe('/test/util/dtoHelper.test.ts', () => {
       id: number;
 
       @Rule(RuleType.string())
-      quantity: number;
+      declare quantity: number;
 
       @Rule(RuleType.string())
       comment: string;
diff --git a/packages/validation-joi/test/index.test.ts b/packages/validation-joi/test/index.test.ts
@@ -87,7 +87,7 @@ describe('test/index.test.ts', () => {
 
       class HelloDTO extends UserDTO {
         @Rule(Joi.number().min(4))
-        age: number;
+        declare age: number;
       }
 
       @Provide()
@@ -677,7 +677,7 @@ describe('test/index.test.ts', () => {
         id: number;
 
         @Rule(Joi.string())
-        quantity: number;
+        declare quantity: number;
 
         @Rule(Joi.string())
         comment: string;
diff --git a/packages/validation-zod/src/index.ts b/packages/validation-zod/src/index.ts
@@ -2,6 +2,8 @@ import {
   IMidwayContainer,
   MetadataManager,
   MidwayConfigService,
+  loadModule,
+  MidwayEnvironmentService,
 } from '@midwayjs/core';
 import {
   getRuleMeta,
@@ -14,8 +16,6 @@ import { z, ParseParams } from 'zod';
 import { fromError } from 'zod-validation-error';
 import * as i18next from 'i18next';
 import { makeZodI18nMap } from 'zod-i18n-map';
-import * as en from 'zod-i18n-map/locales/en/zod.json';
-import * as cn from 'zod-i18n-map/locales/zh-CN/zod.json';
 import { MidwayI18nServiceSingleton } from '@midwayjs/i18n';
 
 // 将 i18n 的标准 locale 转换为 zod-i18n-map 提供的 locale
@@ -57,7 +57,14 @@ const lngMapping = {
 const localeMapping = new Map();
 
 export default {
-  validateServiceHandler: (container: IMidwayContainer) => {
+  validateServiceHandler: async (container: IMidwayContainer) => {
+    const environmentService = container.get(MidwayEnvironmentService);
+    const en = await loadModule('zod-i18n-map/locales/en/zod.json', {
+      loadMode: environmentService.getModuleLoadType(),
+    });
+    const cn = await loadModule('zod-i18n-map/locales/zh-CN/zod.json', {
+      loadMode: environmentService.getModuleLoadType(),
+    });
     const configService = container.get(MidwayConfigService);
     configService.addObject({
       i18n: {
diff --git a/packages/validation-zod/test/index.test.ts b/packages/validation-zod/test/index.test.ts
@@ -84,7 +84,7 @@ describe('test/index.test.ts', () => {
 
       class HelloDTO extends UserDTO {
         @Rule(z.number().min(4))
-        age: number;
+        declare age: number;
       }
 
       @Provide()
diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts
@@ -39,7 +39,6 @@ export class MidwayExpressFramework extends BaseFramework<
   Response,
   NextFunction
 > {
-  public app: IMidwayExpressApplication;
   private server: Server;
   private expressMiddlewareService: MidwayExpressMiddlewareService;
   private webRouterService: MidwayWebRouterService;
diff --git a/packages/web/src/framework/web.ts b/packages/web/src/framework/web.ts
@@ -138,6 +138,7 @@ export class MidwayWebFramework extends BaseFramework<
     );
 
     this.overwriteApplication('app');
+    this.app.loader.app = this.app;
 
     (this.app.loader as any).loadOrigin();
     // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
diff --git a/packages/web/src/utils.ts b/packages/web/src/utils.ts
@@ -82,12 +82,12 @@ export async function initializeAgentApplicationContext(agent) {
   agentFramework['logger'] = agent.coreLogger;
   agentFramework['appLogger'] = agent.logger;
   agentFramework.app = agent;
-  agentFramework.configService = applicationContext.get(MidwayConfigService);
-  agentFramework.environmentService = applicationContext.get(
+  agentFramework['configService'] = applicationContext.get(MidwayConfigService);
+  agentFramework['environmentService'] = applicationContext.get(
     MidwayEnvironmentService
   );
-  agentFramework.loggerService = applicationContext.get(MidwayLoggerService);
-  agentFramework.informationService = applicationContext.get(
+  agentFramework['loggerService'] = applicationContext.get(MidwayLoggerService);
+  agentFramework['informationService'] = applicationContext.get(
     MidwayInformationService
   );
   agentFramework.overwriteApplication('agent');
diff --git a/packages/ws/src/framework.ts b/packages/ws/src/framework.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/scripts/benchmark/start-benchmark.mjs b/scripts/benchmark/start-benchmark.mjs
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ describe('test/common/applicationManager.test.ts', () => {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`const framework = new CustomFramework1({} as any);`
`23`		`- framework.mockService = mockService;`
	`23`	`+ framework['mockService'] = mockService;`
`24`	`24`	`await framework.initialize();`
`25`	`25`
`26`	`26`	`manager.addFramework('test', framework);`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ describe('MetadataManager.test.ts', () => {`
`143`	`143`	`public method() {}`
`144`	`144`
`145`	`145`	`@TestProperty()`
`146`		`- public property: string;`
	`146`	`+ public declare property: string;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`new Child().method();`