diff --git a/package.json b/package.json index f5f48d4a61..0859b9e416 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/monorepo", - "version": "4.1.2-beta.20", + "version": "4.1.2-beta.24", "private": true, "description": "Eggjs framework monorepo", "license": "MIT", diff --git a/packages/cluster/package.json b/packages/cluster/package.json index 4633738ae4..144e34c95e 100644 --- a/packages/cluster/package.json +++ b/packages/cluster/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/cluster", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "cluster manager for egg", "keywords": [ "cluster", diff --git a/packages/cookies/package.json b/packages/cookies/package.json index 0aef52dfcc..566ab9049c 100644 --- a/packages/cookies/package.json +++ b/packages/cookies/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/cookies", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "cookies module for egg", "homepage": "https://github.com/eggjs/egg/tree/next/packages/cookies", "license": "MIT", diff --git a/packages/core/package.json b/packages/core/package.json index 1435b8ab39..f3e6daf61a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/core", - "version": "7.0.2-beta.20", + "version": "7.0.2-beta.24", "description": "A core plugin framework based on @eggjs/koa", "keywords": [ "egg", diff --git a/packages/egg/package.json b/packages/egg/package.json index 1caa3b86d1..5fc8884b68 100644 --- a/packages/egg/package.json +++ b/packages/egg/package.json @@ -1,6 +1,6 @@ { "name": "egg", - "version": "4.1.2-beta.20", + "version": "4.1.2-beta.24", "description": "A web application framework for Node.js", "keywords": [ "app", diff --git a/packages/errors/package.json b/packages/errors/package.json index 0bb5d8a161..d7b0c404c5 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/errors", - "version": "3.0.2-beta.20", + "version": "3.0.2-beta.24", "description": "@eggjs/errors provide two kinds of errors that is Error and Exception.", "homepage": "https://github.com/eggjs/egg/tree/next/packages/errors", "bugs": { diff --git a/packages/extend2/package.json b/packages/extend2/package.json index 16e13a4fc8..5424501da8 100644 --- a/packages/extend2/package.json +++ b/packages/extend2/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/extend2", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "Port of jQuery.extend for Node.js", "keywords": [ "clone", diff --git a/packages/koa-static-cache/package.json b/packages/koa-static-cache/package.json index df91e6e078..fea444c7c2 100644 --- a/packages/koa-static-cache/package.json +++ b/packages/koa-static-cache/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/koa-static-cache", - "version": "7.0.2-beta.20", + "version": "7.0.2-beta.24", "description": "Static cache middleware for koa", "keywords": [ "cache", diff --git a/packages/koa/package.json b/packages/koa/package.json index d0bce64421..be5ed205c4 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/koa", - "version": "3.1.2-beta.20", + "version": "3.1.2-beta.24", "description": "Koa web app framework for https://eggjs.org", "keywords": [ "app", diff --git a/packages/loader-fs/package.json b/packages/loader-fs/package.json index 6c52143763..1036488bb8 100644 --- a/packages/loader-fs/package.json +++ b/packages/loader-fs/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/loader-fs", - "version": "1.0.0-beta.20", + "version": "1.0.0-beta.24", "description": "Loader-facing filesystem abstraction for Egg", "keywords": [ "egg", diff --git a/packages/logger/package.json b/packages/logger/package.json index d2382cd1cf..4ca90e4e14 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/logger", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "egg logger", "keywords": [ "egg", diff --git a/packages/path-matching/package.json b/packages/path-matching/package.json index 718ee5b9df..139e527f22 100644 --- a/packages/path-matching/package.json +++ b/packages/path-matching/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/path-matching", - "version": "3.0.2-beta.20", + "version": "3.0.2-beta.24", "description": "match or ignore url path", "keywords": [ "ignore", diff --git a/packages/router/package.json b/packages/router/package.json index 8edb386c2e..0177e9396b 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/router", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "Router middleware for egg/koa. Provides RESTful resource routing.", "keywords": [ "koa", diff --git a/packages/skills/package.json b/packages/skills/package.json index 4617648909..e05322a3aa 100644 --- a/packages/skills/package.json +++ b/packages/skills/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/skills", - "version": "4.1.2-beta.20", + "version": "4.1.2-beta.24", "description": "agent skills for egg", "keywords": [ "egg", diff --git a/packages/supertest/package.json b/packages/supertest/package.json index 0a6d787481..e31684025d 100644 --- a/packages/supertest/package.json +++ b/packages/supertest/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/supertest", - "version": "9.0.2-beta.20", + "version": "9.0.2-beta.24", "description": "SuperAgent driven library for testing HTTP servers", "keywords": [ "bdd", diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index 749927dfb2..7f55084f0f 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tsconfig", - "version": "3.1.2-beta.20", + "version": "3.1.2-beta.24", "description": "Base tsconfig for egg ts project", "keywords": [ "egg", diff --git a/packages/typings/package.json b/packages/typings/package.json index 1270b0e8e9..1f1576fb7c 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/typings", - "version": "4.1.2-beta.20", + "version": "4.1.2-beta.24", "description": "Shared typings for egg projects", "keywords": [ "egg", diff --git a/packages/utils/package.json b/packages/utils/package.json index 8e09f99efc..705b4cc646 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/utils", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "Utils for all egg projects", "keywords": [ "egg", diff --git a/plugins/development/package.json b/plugins/development/package.json index fa4e169393..16ce9d7e8f 100644 --- a/plugins/development/package.json +++ b/plugins/development/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/development", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "development tool for egg", "keywords": [ "egg", diff --git a/plugins/i18n/package.json b/plugins/i18n/package.json index adce310ad5..354af5ed2e 100644 --- a/plugins/i18n/package.json +++ b/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/i18n", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "i18n plugin for egg", "keywords": [ "egg", diff --git a/plugins/jsonp/package.json b/plugins/jsonp/package.json index 6558e6a33e..66ff005503 100644 --- a/plugins/jsonp/package.json +++ b/plugins/jsonp/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/jsonp", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "jsonp support for egg", "keywords": [ "egg", diff --git a/plugins/logrotator/package.json b/plugins/logrotator/package.json index b15a61d831..2569613206 100644 --- a/plugins/logrotator/package.json +++ b/plugins/logrotator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/logrotator", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "logrotator for egg", "keywords": [ "egg", diff --git a/plugins/mock/package.json b/plugins/mock/package.json index 772c49b97f..55bc0b7c31 100644 --- a/plugins/mock/package.json +++ b/plugins/mock/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/mock", - "version": "7.0.2-beta.20", + "version": "7.0.2-beta.24", "description": "mock server plugin for egg", "keywords": [ "egg", diff --git a/plugins/multipart/package.json b/plugins/multipart/package.json index 44f586d044..ae0c12d3cd 100644 --- a/plugins/multipart/package.json +++ b/plugins/multipart/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/multipart", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "Multipart plugin for egg", "keywords": [ "egg", diff --git a/plugins/onerror/package.json b/plugins/onerror/package.json index 8adde359bb..f591966a47 100644 --- a/plugins/onerror/package.json +++ b/plugins/onerror/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/onerror", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "error handler for egg", "keywords": [ "egg", diff --git a/plugins/redis/package.json b/plugins/redis/package.json index 7ec3fea2b9..22e93e92b0 100644 --- a/plugins/redis/package.json +++ b/plugins/redis/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/redis", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "Valkey / Redis plugin for egg", "keywords": [ "Valkey", diff --git a/plugins/schedule/package.json b/plugins/schedule/package.json index 090b59e136..829767a5b9 100644 --- a/plugins/schedule/package.json +++ b/plugins/schedule/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/schedule", - "version": "6.0.2-beta.20", + "version": "6.0.2-beta.24", "description": "schedule plugin for egg, support corn job.", "keywords": [ "cron", diff --git a/plugins/security/package.json b/plugins/security/package.json index 9835bd263d..f872c63bca 100644 --- a/plugins/security/package.json +++ b/plugins/security/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/security", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "security plugin in egg framework", "keywords": [ "egg", diff --git a/plugins/session/package.json b/plugins/session/package.json index d38f285c1e..89a6554987 100644 --- a/plugins/session/package.json +++ b/plugins/session/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/session", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "session plugin for egg", "keywords": [ "cookie", diff --git a/plugins/static/package.json b/plugins/static/package.json index 75f73a82f9..112c2bdb86 100644 --- a/plugins/static/package.json +++ b/plugins/static/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/static", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "static server plugin for egg", "keywords": [ "egg", diff --git a/plugins/tracer/package.json b/plugins/tracer/package.json index e7c7629190..fe644e0e87 100644 --- a/plugins/tracer/package.json +++ b/plugins/tracer/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tracer", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tracer for egg", "keywords": [ "egg", diff --git a/plugins/typebox-validate/package.json b/plugins/typebox-validate/package.json index 282e5bb06b..ad9b4bdf7a 100644 --- a/plugins/typebox-validate/package.json +++ b/plugins/typebox-validate/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/typebox-validate", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "another validate for typescript egg projects", "keywords": [ "ajv", diff --git a/plugins/view-nunjucks/package.json b/plugins/view-nunjucks/package.json index fc07f6e853..1e68c1103e 100644 --- a/plugins/view-nunjucks/package.json +++ b/plugins/view-nunjucks/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/view-nunjucks", - "version": "3.0.2-beta.20", + "version": "3.0.2-beta.24", "description": "nunjucks view plugin for egg", "keywords": [ "egg", diff --git a/plugins/view/package.json b/plugins/view/package.json index c56c30a583..1b1b496105 100644 --- a/plugins/view/package.json +++ b/plugins/view/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/view", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "Base view plugin for egg", "keywords": [ "egg", diff --git a/plugins/watcher/package.json b/plugins/watcher/package.json index 5c47acc5f1..f21143a7d1 100644 --- a/plugins/watcher/package.json +++ b/plugins/watcher/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/watcher", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "file watcher plugin for egg", "keywords": [ "egg", diff --git a/tegg/core/agent-runtime/package.json b/tegg/core/agent-runtime/package.json index 0a573553d5..c28e45a925 100644 --- a/tegg/core/agent-runtime/package.json +++ b/tegg/core/agent-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/agent-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "Agent runtime with store abstraction for Egg.js tegg", "keywords": [ "agent", diff --git a/tegg/core/ajv-decorator/package.json b/tegg/core/ajv-decorator/package.json index 0b8db6b725..ae524e1e1e 100644 --- a/tegg/core/ajv-decorator/package.json +++ b/tegg/core/ajv-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/ajv-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg ajv decorator", "keywords": [ "ajv", diff --git a/tegg/core/aop-decorator/package.json b/tegg/core/aop-decorator/package.json index 183bf8d76d..cc08ce6e37 100644 --- a/tegg/core/aop-decorator/package.json +++ b/tegg/core/aop-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/aop-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg aop decorator", "keywords": [ "aop", diff --git a/tegg/core/aop-runtime/package.json b/tegg/core/aop-runtime/package.json index bd80879382..526775d5da 100644 --- a/tegg/core/aop-runtime/package.json +++ b/tegg/core/aop-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/aop-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg aop runtime", "keywords": [ "aop", diff --git a/tegg/core/background-task/package.json b/tegg/core/background-task/package.json index 2fc294ebe9..cb2858df35 100644 --- a/tegg/core/background-task/package.json +++ b/tegg/core/background-task/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/background-task", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "background task util for tegg", "keywords": [ "async", diff --git a/tegg/core/common-util/package.json b/tegg/core/common-util/package.json index dc718156b0..48d6634a5f 100644 --- a/tegg/core/common-util/package.json +++ b/tegg/core/common-util/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-common-util", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "common util for tegg", "keywords": [ "collection", diff --git a/tegg/core/controller-decorator/package.json b/tegg/core/controller-decorator/package.json index 9134b5757a..c6a47d1915 100644 --- a/tegg/core/controller-decorator/package.json +++ b/tegg/core/controller-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/controller-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg controller decorator", "keywords": [ "controller", diff --git a/tegg/core/core-decorator/package.json b/tegg/core/core-decorator/package.json index 5fc8d6483f..572e35d3f8 100644 --- a/tegg/core/core-decorator/package.json +++ b/tegg/core/core-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/core-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg core decorator", "keywords": [ "decorator", diff --git a/tegg/core/dal-decorator/package.json b/tegg/core/dal-decorator/package.json index 8fcacea8c4..4332da463d 100644 --- a/tegg/core/dal-decorator/package.json +++ b/tegg/core/dal-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dal-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg dal decorator", "keywords": [ "dal", diff --git a/tegg/core/dal-runtime/package.json b/tegg/core/dal-runtime/package.json index c4c86c262e..fce01947dc 100644 --- a/tegg/core/dal-runtime/package.json +++ b/tegg/core/dal-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dal-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg dal runtime", "keywords": [ "dal", diff --git a/tegg/core/dal-runtime/test/CodeGenerator.test.ts b/tegg/core/dal-runtime/test/CodeGenerator.test.ts index 71707c76ea..c3e327d737 100644 --- a/tegg/core/dal-runtime/test/CodeGenerator.test.ts +++ b/tegg/core/dal-runtime/test/CodeGenerator.test.ts @@ -15,6 +15,16 @@ import { MultiPrimaryKey } from './fixtures/modules/generate_codes/MultiPrimaryK const execFileAsync = promisify(execFile); describe('test/CodeGenerator.test.ts', () => { + it('should configure templates as build assets', async () => { + const config = (await import('../tsdown.config.ts')).default as any; + assert.deepEqual(config.copy, [ + { + from: 'src/templates', + to: 'dist/templates', + }, + ]); + }); + it('should load templates under native ESM runtime', async () => { const repoDir = path.resolve(__dirname, '../../../..'); const moduleDir = path.join(__dirname, './fixtures/modules/generate_codes'); diff --git a/tegg/core/dal-runtime/tsdown.config.ts b/tegg/core/dal-runtime/tsdown.config.ts index 6dfb63bdb8..ebb6ff75a2 100644 --- a/tegg/core/dal-runtime/tsdown.config.ts +++ b/tegg/core/dal-runtime/tsdown.config.ts @@ -4,4 +4,10 @@ export default defineConfig({ entry: { index: 'src/index.ts', }, + copy: [ + { + from: 'src/templates', + to: 'dist/templates', + }, + ], }); diff --git a/tegg/core/dynamic-inject-runtime/package.json b/tegg/core/dynamic-inject-runtime/package.json index b008c9a001..61ad41fd60 100644 --- a/tegg/core/dynamic-inject-runtime/package.json +++ b/tegg/core/dynamic-inject-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dynamic-inject-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg dynamic inject runtime", "keywords": [ "egg", diff --git a/tegg/core/dynamic-inject/package.json b/tegg/core/dynamic-inject/package.json index fb57377c6d..28f637810c 100644 --- a/tegg/core/dynamic-inject/package.json +++ b/tegg/core/dynamic-inject/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dynamic-inject", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg dynamic inject decorator", "keywords": [ "egg", diff --git a/tegg/core/eventbus-decorator/package.json b/tegg/core/eventbus-decorator/package.json index 6fb155626d..a4141ab191 100644 --- a/tegg/core/eventbus-decorator/package.json +++ b/tegg/core/eventbus-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/eventbus-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg eventbus decorator", "keywords": [ "egg", diff --git a/tegg/core/eventbus-runtime/package.json b/tegg/core/eventbus-runtime/package.json index 9c9e3e96ec..555484840b 100644 --- a/tegg/core/eventbus-runtime/package.json +++ b/tegg/core/eventbus-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/eventbus-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg eventbus runtime", "keywords": [ "egg", diff --git a/tegg/core/langchain-decorator/package.json b/tegg/core/langchain-decorator/package.json index 48c77cd5c6..334bf00da5 100644 --- a/tegg/core/langchain-decorator/package.json +++ b/tegg/core/langchain-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/langchain-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg langchain decorator", "keywords": [ "egg", diff --git a/tegg/core/lifecycle/package.json b/tegg/core/lifecycle/package.json index 3cfe68e52b..88422cf749 100644 --- a/tegg/core/lifecycle/package.json +++ b/tegg/core/lifecycle/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/lifecycle", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg lifecycle definition and decorators", "keywords": [ "egg", diff --git a/tegg/core/loader/package.json b/tegg/core/loader/package.json index 0aba3a32f8..f5b733d4dd 100644 --- a/tegg/core/loader/package.json +++ b/tegg/core/loader/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-loader", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg default loader implement", "keywords": [ "egg", diff --git a/tegg/core/loader/src/LoaderUtil.ts b/tegg/core/loader/src/LoaderUtil.ts index ce692745a7..5f860b0754 100644 --- a/tegg/core/loader/src/LoaderUtil.ts +++ b/tegg/core/loader/src/LoaderUtil.ts @@ -81,6 +81,10 @@ export class LoaderUtil { '!**/node_modules', // node load type definitions '!**/*.d.ts', + '!**/*.d.mts', + '!**/*.d.cts', + // test runner configuration is not an application module + '!**/vitest.config.*', // not load test/coverage files '!**/test', '!**/coverage', diff --git a/tegg/core/loader/test/Loader.test.ts b/tegg/core/loader/test/Loader.test.ts index 95bdd39804..099fe16479 100644 --- a/tegg/core/loader/test/Loader.test.ts +++ b/tegg/core/loader/test/Loader.test.ts @@ -16,6 +16,14 @@ describe('core/loader/test/Loader.test.ts', () => { }); describe('module loader', () => { + it('should exclude declarations and test runner configuration', () => { + const patterns = LoaderUtil.filePattern(); + assert(patterns.includes('!**/*.d.ts')); + assert(patterns.includes('!**/*.d.mts')); + assert(patterns.includes('!**/*.d.cts')); + assert(patterns.includes('!**/vitest.config.*')); + }); + it('should load module', async () => { const repoModulePath = path.join(__dirname, './fixtures/modules/module-for-loader'); const loader = LoaderFactory.createLoader(repoModulePath, EggLoadUnitType.MODULE); diff --git a/tegg/core/mcp-client/package.json b/tegg/core/mcp-client/package.json index 11e7e865e4..da9b54cfab 100644 --- a/tegg/core/mcp-client/package.json +++ b/tegg/core/mcp-client/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/mcp-client", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg mcp client", "keywords": [ "egg", diff --git a/tegg/core/metadata/package.json b/tegg/core/metadata/package.json index 830b2f6b98..cf6515b5dd 100644 --- a/tegg/core/metadata/package.json +++ b/tegg/core/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/metadata", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg metadata", "keywords": [ "egg", diff --git a/tegg/core/orm-decorator/package.json b/tegg/core/orm-decorator/package.json index ee9b114277..52e9e77853 100644 --- a/tegg/core/orm-decorator/package.json +++ b/tegg/core/orm-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/orm-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg orm decorator", "keywords": [ "egg", diff --git a/tegg/core/runtime/package.json b/tegg/core/runtime/package.json index a218d9506e..1daf858545 100644 --- a/tegg/core/runtime/package.json +++ b/tegg/core/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-runtime", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg runtime", "keywords": [ "egg", diff --git a/tegg/core/schedule-decorator/package.json b/tegg/core/schedule-decorator/package.json index faea1f1c9f..4a23e41908 100644 --- a/tegg/core/schedule-decorator/package.json +++ b/tegg/core/schedule-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/schedule-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg schedule decorator", "keywords": [ "egg", diff --git a/tegg/core/standalone-decorator/package.json b/tegg/core/standalone-decorator/package.json index c12b4d7a9f..5862668c40 100644 --- a/tegg/core/standalone-decorator/package.json +++ b/tegg/core/standalone-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/standalone-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg standalone decorator", "keywords": [ "decorator", diff --git a/tegg/core/tegg/package.json b/tegg/core/tegg/package.json index cc2ae13c7f..898c9de82d 100644 --- a/tegg/core/tegg/package.json +++ b/tegg/core/tegg/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg decorator packages", "keywords": [ "egg", diff --git a/tegg/core/transaction-decorator/package.json b/tegg/core/transaction-decorator/package.json index 98b3c899ea..938bd19102 100644 --- a/tegg/core/transaction-decorator/package.json +++ b/tegg/core/transaction-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/transaction-decorator", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg transaction decorator", "keywords": [ "decorator", diff --git a/tegg/core/types/package.json b/tegg/core/types/package.json index 2b7500edb2..245a0f12bb 100644 --- a/tegg/core/types/package.json +++ b/tegg/core/types/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-types", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg types", "keywords": [ "egg", diff --git a/tegg/core/vitest/package.json b/tegg/core/vitest/package.json index df0ad256ce..be3e19ebbe 100644 --- a/tegg/core/vitest/package.json +++ b/tegg/core/vitest/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-vitest", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "Vitest adapter for tegg context injection", "keywords": [ "adapter", diff --git a/tegg/plugin/ajv/package.json b/tegg/plugin/ajv/package.json index 4900972413..9b3eec72e6 100644 --- a/tegg/plugin/ajv/package.json +++ b/tegg/plugin/ajv/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/ajv-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "ajv plugin for egg and tegg", "keywords": [ "ajv", diff --git a/tegg/plugin/aop/package.json b/tegg/plugin/aop/package.json index e2d2e69b21..745940c934 100644 --- a/tegg/plugin/aop/package.json +++ b/tegg/plugin/aop/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/aop-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg aop plugin", "keywords": [ "aop", diff --git a/tegg/plugin/common/package.json b/tegg/plugin/common/package.json index 47b815e311..816c599ad3 100644 --- a/tegg/plugin/common/package.json +++ b/tegg/plugin/common/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/module-common", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "common module", "keywords": [ "common", diff --git a/tegg/plugin/config/package.json b/tegg/plugin/config/package.json index 1fe338dc72..7ac47f9658 100644 --- a/tegg/plugin/config/package.json +++ b/tegg/plugin/config/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-config", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "module config plugin for egg", "keywords": [ "config", diff --git a/tegg/plugin/controller/package.json b/tegg/plugin/controller/package.json index f777731c2c..4f3b7cf2a9 100644 --- a/tegg/plugin/controller/package.json +++ b/tegg/plugin/controller/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/controller-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "controller decorator plugin for egg", "keywords": [ "egg", diff --git a/tegg/plugin/dal/package.json b/tegg/plugin/dal/package.json index 22d4b4a7fa..ef14b5a791 100644 --- a/tegg/plugin/dal/package.json +++ b/tegg/plugin/dal/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dal-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "dal plugin for egg", "keywords": [ "dal", diff --git a/tegg/plugin/dal/src/lib/TransactionPrototypeHook.ts b/tegg/plugin/dal/src/lib/TransactionPrototypeHook.ts index fce764bef5..6c9c5c0d06 100644 --- a/tegg/plugin/dal/src/lib/TransactionPrototypeHook.ts +++ b/tegg/plugin/dal/src/lib/TransactionPrototypeHook.ts @@ -26,10 +26,14 @@ export class TransactionPrototypeHook implements LifecycleHook { + const logger = { + info() {}, + } as any; + + it('should skip transaction hook when module has no dataSource config', async () => { + class FooService { + @Transactional() + async doSomething() {} + } + + const hook = new TransactionPrototypeHook( + { + foo: { + config: {}, + }, + } as any, + logger, + ); + + await expect( + hook.preCreate({ + clazz: FooService, + loadUnit: { + name: 'foo', + }, + } as any), + ).resolves.toBeUndefined(); + }); + + it('should skip transaction hook when module has empty dataSource config', async () => { + class BarService { + @Transactional({ + datasourceName: 'foo', + }) + async doSomething() {} + } + + const hook = new TransactionPrototypeHook( + { + bar: { + config: { + dataSource: {}, + }, + }, + } as any, + logger, + ); + + await expect( + hook.preCreate({ + clazz: BarService, + loadUnit: { + name: 'bar', + }, + } as any), + ).resolves.toBeUndefined(); + }); +}); diff --git a/tegg/plugin/dns-cache/package.json b/tegg/plugin/dns-cache/package.json index 40f3de8103..930b052311 100644 --- a/tegg/plugin/dns-cache/package.json +++ b/tegg/plugin/dns-cache/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/dns-cache-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg dns cache plugin", "keywords": [ "cache", diff --git a/tegg/plugin/eventbus/package.json b/tegg/plugin/eventbus/package.json index 713206bd95..32155c692d 100644 --- a/tegg/plugin/eventbus/package.json +++ b/tegg/plugin/eventbus/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/eventbus-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg event plugin", "keywords": [ "decorator", diff --git a/tegg/plugin/langchain/package.json b/tegg/plugin/langchain/package.json index 4c88ef225c..249ec8d6ab 100644 --- a/tegg/plugin/langchain/package.json +++ b/tegg/plugin/langchain/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/langchain-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "langchain for egg", "keywords": [ "egg", diff --git a/tegg/plugin/mcp-client/package.json b/tegg/plugin/mcp-client/package.json index 8e0bbfc595..4745851258 100644 --- a/tegg/plugin/mcp-client/package.json +++ b/tegg/plugin/mcp-client/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/mcp-client-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "mcp client for egg", "keywords": [ "egg", diff --git a/tegg/plugin/mcp-proxy/package.json b/tegg/plugin/mcp-proxy/package.json index f005e20382..9d70ae6eec 100644 --- a/tegg/plugin/mcp-proxy/package.json +++ b/tegg/plugin/mcp-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/mcp-proxy-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg mcp proxy plugin", "keywords": [ "egg", diff --git a/tegg/plugin/orm/package.json b/tegg/plugin/orm/package.json index 861b28591a..a2cca09f5e 100644 --- a/tegg/plugin/orm/package.json +++ b/tegg/plugin/orm/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/orm-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "orm decorator for egg", "keywords": [ "egg", diff --git a/tegg/plugin/schedule/package.json b/tegg/plugin/schedule/package.json index c76c90d677..083ac61a37 100644 --- a/tegg/plugin/schedule/package.json +++ b/tegg/plugin/schedule/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/schedule-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "schedule decorator plugin for egg", "keywords": [ "egg", diff --git a/tegg/plugin/tegg/package.json b/tegg/plugin/tegg/package.json index e5695cb48d..fb625a5db7 100644 --- a/tegg/plugin/tegg/package.json +++ b/tegg/plugin/tegg/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/tegg-plugin", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "module plugin for egg", "keywords": [ "egg", diff --git a/tegg/standalone/standalone/package.json b/tegg/standalone/standalone/package.json index 1f5161099f..ca81a0294f 100644 --- a/tegg/standalone/standalone/package.json +++ b/tegg/standalone/standalone/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/standalone", - "version": "4.0.2-beta.20", + "version": "4.0.2-beta.24", "description": "tegg standalone", "keywords": [ "async", diff --git a/tools/create-egg/package.json b/tools/create-egg/package.json index 3d400d3a95..7e6335aff0 100644 --- a/tools/create-egg/package.json +++ b/tools/create-egg/package.json @@ -1,6 +1,6 @@ { "name": "create-egg", - "version": "4.1.2-beta.20", + "version": "4.1.2-beta.24", "description": "Scaffolding Your First Egg.js Project", "homepage": "https://github.com/eggjs/egg/tree/next/tools/create-egg", "bugs": { diff --git a/tools/egg-bin/package.json b/tools/egg-bin/package.json index 7bef3b6ac2..06cd1fd438 100644 --- a/tools/egg-bin/package.json +++ b/tools/egg-bin/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/bin", - "version": "8.0.2-beta.20", + "version": "8.0.2-beta.24", "description": "egg developer tool", "homepage": "https://github.com/eggjs/egg/tree/next/tools/egg-bin", "bugs": { diff --git a/tools/egg-bundler/package.json b/tools/egg-bundler/package.json index c5495c8a9d..cf9016c155 100644 --- a/tools/egg-bundler/package.json +++ b/tools/egg-bundler/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/egg-bundler", - "version": "0.0.1-beta.10", + "version": "0.0.1-beta.14", "description": "Bundle an Egg.js application into a deployable artifact using @utoo/pack", "homepage": "https://github.com/eggjs/egg/tree/next/tools/egg-bundler", "bugs": { diff --git a/tools/scripts/package.json b/tools/scripts/package.json index cc5de0571d..013c1ab339 100644 --- a/tools/scripts/package.json +++ b/tools/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@eggjs/scripts", - "version": "5.0.2-beta.20", + "version": "5.0.2-beta.24", "description": "deploy tool for egg project", "homepage": "https://github.com/eggjs/egg/tree/next/tools/scripts", "bugs": {