@midwayjs/core 3.19.0-beta.2 → 3.19.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/common/dataSourceManager.d.ts

@@ -44,6 +44,9 @@ export declare abstract class DataSourceManager<T, ConnectionOpts extends Record
     protected abstract createDataSource(config: any, dataSourceName: string): Promise<T | void> | (T | void);
     protected abstract checkConnected(dataSource: T): Promise<boolean>;
     protected abstract destroyDataSource(dataSource: T): Promise<void>;
+    /**
+     * Call destroyDataSource() on all data sources
+     */
     stop(): Promise<void>;
     getDefaultDataSourceName(): string;
     getDataSourcePriority(name: string): string;

package/dist/common/dataSourceManager.js

@@ -134,6 +134,9 @@ class DataSourceManager {
     getDataSourceNameByModel(modelOrRepository) {
         return this.modelMapping.get(modelOrRepository);
     }
+    /**
+     * Call destroyDataSource() on all data sources
+     */
     async stop() {
         const arr = Array.from(this.dataSource.values());
         await Promise.all(arr.map(dbh => {

package/dist/common/performanceManager.d.ts

@@ -18,6 +18,7 @@ export declare class MidwayPerformanceManager {
     disconnect(): void;
     clean(): void;
     static cleanAll(): void;
+    static getInitialPerformanceEntries(): any[];
 }
 export declare class MidwayInitializerPerformanceManager {
     static MEASURE_KEYS: {
@@ -28,10 +29,9 @@ export declare class MidwayInitializerPerformanceManager {
         CONFIG_LOAD: string;
         LOGGER_PREPARE: string;
         FRAMEWORK_PREPARE: string;
-        CUSTOM_FRAMEWORK_INITIALIZE: string;
-        CUSTOM_FRAMEWORK_RUN: string;
+        FRAMEWORK_INITIALIZE: string;
+        FRAMEWORK_RUN: string;
         LIFECYCLE_PREPARE: string;
-        CUSTOM_LIFECYCLE_PREPARE: string;
         PRELOAD_MODULE_PREPARE: string;
     };
     static markStart(key: string): void;

package/dist/common/performanceManager.js

@@ -80,6 +80,15 @@ class MidwayPerformanceManager {
         this.instances.forEach(instance => instance.clean());
         this.instances.clear();
     }
+    static getInitialPerformanceEntries() {
+        const entries = [];
+        perf_hooks_1.performance === null || perf_hooks_1.performance === void 0 ? void 0 : perf_hooks_1.performance.getEntries().forEach(entry => {
+            if (entry.name.startsWith(this.DEFAULT_GROUP.INITIALIZE)) {
+                entries.push(entry.toJSON());
+            }
+        });
+        return entries;
+    }
 }
 exports.MidwayPerformanceManager = MidwayPerformanceManager;
 MidwayPerformanceManager.instances = new Map();
@@ -96,22 +105,22 @@ class MidwayInitializerPerformanceManager {
         manager.markEnd(key);
     }
     static frameworkInitializeStart(frameworkName) {
-        this.markStart(`${this.MEASURE_KEYS.CUSTOM_FRAMEWORK_INITIALIZE}:${frameworkName}`);
+        this.markStart(`${this.MEASURE_KEYS.FRAMEWORK_INITIALIZE}:${frameworkName}`);
     }
     static frameworkInitializeEnd(frameworkName) {
-        this.markEnd(`${this.MEASURE_KEYS.CUSTOM_FRAMEWORK_INITIALIZE}:${frameworkName}`);
+        this.markEnd(`${this.MEASURE_KEYS.FRAMEWORK_INITIALIZE}:${frameworkName}`);
     }
     static frameworkRunStart(frameworkName) {
-        this.markStart(`${this.MEASURE_KEYS.CUSTOM_FRAMEWORK_RUN}:${frameworkName}`);
+        this.markStart(`${this.MEASURE_KEYS.FRAMEWORK_RUN}:${frameworkName}`);
     }
     static frameworkRunEnd(frameworkName) {
-        this.markEnd(`${this.MEASURE_KEYS.CUSTOM_FRAMEWORK_RUN}:${frameworkName}`);
+        this.markEnd(`${this.MEASURE_KEYS.FRAMEWORK_RUN}:${frameworkName}`);
     }
     static lifecycleStart(namespace, lifecycleName) {
-        this.markStart(`${this.MEASURE_KEYS.CUSTOM_LIFECYCLE_PREPARE}:${namespace}:${lifecycleName}`);
+        this.markStart(`${this.MEASURE_KEYS.LIFECYCLE_PREPARE}:${namespace}:${lifecycleName}`);
     }
     static lifecycleEnd(namespace, lifecycleName) {
-        this.markEnd(`${this.MEASURE_KEYS.CUSTOM_LIFECYCLE_PREPARE}:${namespace}:${lifecycleName}`);
+        this.markEnd(`${this.MEASURE_KEYS.LIFECYCLE_PREPARE}:${namespace}:${lifecycleName}`);
     }
 }
 exports.MidwayInitializerPerformanceManager = MidwayInitializerPerformanceManager;
@@ -123,10 +132,9 @@ MidwayInitializerPerformanceManager.MEASURE_KEYS = {
     CONFIG_LOAD: 'ConfigLoad',
     LOGGER_PREPARE: 'LoggerPrepare',
     FRAMEWORK_PREPARE: 'FrameworkPrepare',
-    CUSTOM_FRAMEWORK_INITIALIZE: 'CustomFrameworkInitialize',
-    CUSTOM_FRAMEWORK_RUN: 'CustomFrameworkRun',
+    FRAMEWORK_INITIALIZE: 'FrameworkInitialize',
+    FRAMEWORK_RUN: 'FrameworkRun',
     LIFECYCLE_PREPARE: 'LifecyclePrepare',
-    CUSTOM_LIFECYCLE_PREPARE: 'CustomLifecyclePrepare',
     PRELOAD_MODULE_PREPARE: 'PreloadModulePrepare',
 };
 //# sourceMappingURL=performanceManager.js.map

package/dist/common/typedResourceManager.js

@@ -46,6 +46,8 @@ class TypedResourceManager {
         for (const [resourceName, resource] of this.resourceMap.entries()) {
             await this.typedResourceInitializerOptions.resourceDestroy(resource, this.typedResourceInitializerOptions.initializeValue[resourceName]);
         }
+        this.resourceMap.clear();
+        this.resourceBindingMap.clear();
     }
     getResource(resourceName) {
         return this.resourceMap.get(resourceName);

package/dist/index.d.ts

@@ -47,5 +47,6 @@ export { PathFileUtil } from './util/pathFileUtil';
 export { FileUtils } from './util/fs';
 export { FORMAT } from './util/format';
 export { ServerResponse, HttpServerResponse } from './response/index';
+export { TypedResourceManager } from './common/typedResourceManager';
 export { MidwayPerformanceManager } from './common/performanceManager';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayPerformanceManager = exports.HttpServerResponse = exports.ServerResponse = exports.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.retryWith = exports.retryWithAsync = exports.extend = exports.Utils = exports.sleep = exports.isTypeScriptEnvironment = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = exports.ASYNC_ROOT_CONTEXT = exports.MidwayPriorityManager = exports.DEFAULT_PRIORITY = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayHealthService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayPerformanceManager = exports.TypedResourceManager = exports.HttpServerResponse = exports.ServerResponse = exports.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.retryWith = exports.retryWithAsync = exports.extend = exports.Utils = exports.sleep = exports.isTypeScriptEnvironment = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = exports.ASYNC_ROOT_CONTEXT = exports.MidwayPriorityManager = exports.DEFAULT_PRIORITY = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayHealthService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -112,6 +112,8 @@ Object.defineProperty(exports, "FORMAT", { enumerable: true, get: function () {
 var index_1 = require("./response/index");
 Object.defineProperty(exports, "ServerResponse", { enumerable: true, get: function () { return index_1.ServerResponse; } });
 Object.defineProperty(exports, "HttpServerResponse", { enumerable: true, get: function () { return index_1.HttpServerResponse; } });
+var typedResourceManager_1 = require("./common/typedResourceManager");
+Object.defineProperty(exports, "TypedResourceManager", { enumerable: true, get: function () { return typedResourceManager_1.TypedResourceManager; } });
 var performanceManager_1 = require("./common/performanceManager");
 Object.defineProperty(exports, "MidwayPerformanceManager", { enumerable: true, get: function () { return performanceManager_1.MidwayPerformanceManager; } });
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1011,5 +1011,6 @@ export interface ServerSendEventStreamOptions<CTX extends IMidwayContext> {
     closeEvent?: string;
     tpl?: (data: ServerSendEventMessage, ctx: CTX) => ServerSendEventMessage;
 }
+export type ClassType<T = any> = new (...args: any[]) => T;
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/response/sse.js

@@ -34,9 +34,7 @@ class ServerSendEventStream extends stream_1.Transform {
                 this.ctx.req.socket.setTimeout(0);
                 this.ctx.req.socket.setNoDelay(true);
                 this.ctx.req.socket.setKeepAlive(true);
-                res.push({
-                    data: ':ok',
-                });
+                res.push(': ok');
             }
             const senderObject = chunk;
             if (senderObject.event)

package/dist/service/environmentService.d.ts

@@ -7,5 +7,6 @@ export declare class MidwayEnvironmentService implements IEnvironmentService {
     isDevelopmentEnvironment(): boolean;
     setModuleLoadType(moduleLoadType: ModuleLoadType): void;
     getModuleLoadType(): ModuleLoadType;
+    isPkgEnvironment(): boolean;
 }
 //# sourceMappingURL=environmentService.d.ts.map

package/dist/service/environmentService.js

@@ -32,6 +32,9 @@ let MidwayEnvironmentService = class MidwayEnvironmentService {
     getModuleLoadType() {
         return this.moduleLoadType;
     }
+    isPkgEnvironment() {
+        return typeof process['pkg'] !== 'undefined';
+    }
 };
 MidwayEnvironmentService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/service/mockService.d.ts

@@ -1,28 +1,44 @@
 import { IMidwayApplication, IMidwayContainer, IMidwayContext, ISimulation } from '../interface';
 export declare class MidwayMockService {
     readonly applicationContext: IMidwayContainer;
-    protected mocks: any[];
-    protected contextMocks: Array<{
+    /**
+     * Save class prototype and object property mocks
+     */
+    protected mocks: Map<string, Array<{
+        obj: any;
+        key: string;
+        descriptor: PropertyDescriptor;
+        hasOwnProperty: boolean;
+    }>>;
+    /**
+     * Save context mocks
+     */
+    protected contextMocks: Map<string, Array<{
         app: IMidwayApplication;
         key: string | ((ctx: IMidwayContext) => void);
         value: any;
-    }>;
-    protected cache: Map<any, any>;
+    }>>;
+    protected cache: Map<string, Map<any, Set<string>>>;
     protected simulatorList: Array<ISimulation>;
     constructor(applicationContext: IMidwayContainer);
     init(): Promise<void>;
+    /**
+     * Prepare mocks before the service is initialized
+     */
     static prepareMocks: any[];
-    static mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any): void;
-    static mockProperty(obj: new (...args: any[]) => any, key: string, value: any): void;
-    mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any): void;
-    mockProperty(obj: any, key: string, value: any): void;
-    mockContext(app: IMidwayApplication, key: string | ((ctx: IMidwayContext) => void), value?: PropertyDescriptor | any): void;
-    restore(): void;
-    isMocked(obj: any, key: any): any;
+    static mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any, group?: string): void;
+    static mockProperty(obj: new (...args: any[]) => any, key: string, value: any, group?: string): void;
+    mockClassProperty(clzz: new (...args: any[]) => any, propertyName: string, value: any, group?: string): void;
+    mockProperty(obj: any, key: string, value: any, group?: string): void;
+    mockContext(app: IMidwayApplication, key: string | ((ctx: IMidwayContext) => void), value?: PropertyDescriptor | any, group?: string): void;
+    restore(group?: string): void;
+    restoreAll(): void;
+    private restoreGroup;
+    isMocked(obj: any, key: any, group?: string): boolean;
     applyContextMocks(app: IMidwayApplication, ctx: IMidwayContext): void;
     getContextMocksSize(): number;
     private overridePropertyDescriptor;
-    initSimulation(): Promise<void>;
+    initSimulation(group?: string): Promise<void>;
     runSimulatorSetup(): Promise<void>;
     runSimulatorTearDown(): Promise<void>;
     runSimulatorAppSetup(app: IMidwayApplication): Promise<void>;

package/dist/service/mockService.js

@@ -13,91 +13,126 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayMockService = void 0;
 const interface_1 = require("../interface");
 const decorator_1 = require("../decorator");
+const types_1 = require("../util/types");
 let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
-        this.mocks = [];
-        this.contextMocks = [];
+        /**
+         * Save class prototype and object property mocks
+         */
+        this.mocks = new Map();
+        /**
+         * Save context mocks
+         */
+        this.contextMocks = new Map();
         this.cache = new Map();
         this.simulatorList = [];
     }
     async init() {
         if (MidwayMockService_1.prepareMocks.length > 0) {
             for (const item of MidwayMockService_1.prepareMocks) {
-                this.mockProperty(item.obj, item.key, item.value);
+                this.mockProperty(item.obj, item.key, item.value, item.group);
             }
             MidwayMockService_1.prepareMocks = [];
         }
     }
-    static mockClassProperty(clzz, propertyName, value) {
-        this.mockProperty(clzz.prototype, propertyName, value);
+    static mockClassProperty(clzz, propertyName, value, group = 'default') {
+        this.mockProperty(clzz.prototype, propertyName, value, group);
     }
-    static mockProperty(obj, key, value) {
+    static mockProperty(obj, key, value, group = 'default') {
         this.prepareMocks.push({
             obj,
             key,
             value,
+            group,
         });
     }
-    mockClassProperty(clzz, propertyName, value) {
-        return this.mockProperty(clzz.prototype, propertyName, value);
+    mockClassProperty(clzz, propertyName, value, group = 'default') {
+        return this.mockProperty(clzz.prototype, propertyName, value, group);
     }
-    mockProperty(obj, key, value) {
+    mockProperty(obj, key, value, group = 'default') {
         // eslint-disable-next-line no-prototype-builtins
         const hasOwnProperty = obj.hasOwnProperty(key);
-        this.mocks.push({
+        const mockItem = {
             obj,
             key,
             descriptor: Object.getOwnPropertyDescriptor(obj, key),
             // Make sure the key exists on object not the prototype
             hasOwnProperty,
-        });
-        // Delete the origin key, redefine it below
+        };
+        if (!this.mocks.has(group)) {
+            this.mocks.set(group, []);
+        }
+        this.mocks.get(group).push(mockItem);
         if (hasOwnProperty) {
             delete obj[key];
         }
         // Set a flag that checks if it is mocked
-        let flag = this.cache.get(obj);
+        let groupCache = this.cache.get(group);
+        if (!groupCache) {
+            groupCache = new Map();
+            this.cache.set(group, groupCache);
+        }
+        let flag = groupCache.get(obj);
         if (!flag) {
             flag = new Set();
-            this.cache.set(obj, flag);
+            groupCache.set(obj, flag);
         }
         flag.add(key);
         const descriptor = this.overridePropertyDescriptor(value);
         Object.defineProperty(obj, key, descriptor);
     }
-    mockContext(app, key, value) {
-        this.contextMocks.push({
+    mockContext(app, key, value, group = 'default') {
+        if (!this.contextMocks.has(group)) {
+            this.contextMocks.set(group, []);
+        }
+        this.contextMocks.get(group).push({
             app,
             key,
             value,
         });
     }
-    restore() {
-        for (let i = this.mocks.length - 1; i >= 0; i--) {
-            const m = this.mocks[i];
+    restore(group = 'default') {
+        this.restoreGroup(group);
+    }
+    restoreAll() {
+        const groups = new Set([
+            ...this.mocks.keys(),
+            ...this.contextMocks.keys(),
+            ...this.cache.keys(),
+        ]);
+        for (const group of groups) {
+            this.restoreGroup(group);
+        }
+        this.simulatorList = [];
+    }
+    restoreGroup(group) {
+        const groupMocks = this.mocks.get(group) || [];
+        for (let i = groupMocks.length - 1; i >= 0; i--) {
+            const m = groupMocks[i];
             if (!m.hasOwnProperty) {
-                // Delete the mock key, use key on the prototype
                 delete m.obj[m.key];
             }
             else {
-                // Redefine the origin key instead of the mock key
                 Object.defineProperty(m.obj, m.key, m.descriptor);
             }
         }
-        this.mocks = [];
-        this.contextMocks = [];
-        this.cache.clear();
-        this.simulatorList = [];
-        MidwayMockService_1.prepareMocks = [];
-    }
-    isMocked(obj, key) {
-        const flag = this.cache.get(obj);
+        this.mocks.delete(group);
+        this.contextMocks.delete(group);
+        this.cache.delete(group);
+        this.simulatorList = this.simulatorList.filter(sim => sim['group'] !== group);
+    }
+    isMocked(obj, key, group = 'default') {
+        if ((0, types_1.isClass)(obj)) {
+            obj = obj.prototype;
+        }
+        const groupCache = this.cache.get(group);
+        const flag = groupCache ? groupCache.get(obj) : undefined;
         return flag ? flag.has(key) : false;
     }
     applyContextMocks(app, ctx) {
-        if (this.contextMocks.length > 0) {
-            for (const mockItem of this.contextMocks) {
+        for (const [, groupMocks] of this.contextMocks) {
+            for (const mockItem of groupMocks) {
                 if (mockItem.app === app) {
                     const descriptor = this.overridePropertyDescriptor(mockItem.value);
                     if (typeof mockItem.key === 'string') {
@@ -111,7 +146,7 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         }
     }
     getContextMocksSize() {
-        return this.contextMocks.length;
+        return Array.from(this.contextMocks.values()).reduce((sum, group) => sum + group.length, 0);
     }
     overridePropertyDescriptor(value) {
         const descriptor = {
@@ -130,11 +165,12 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         }
         return descriptor;
     }
-    async initSimulation() {
+    async initSimulation(group = 'default') {
         const simulationModule = (0, decorator_1.listModule)(decorator_1.MOCK_KEY);
         for (const module of simulationModule) {
             const instance = await this.applicationContext.getAsync(module);
             if (await instance.enableCondition()) {
+                instance['group'] = group;
                 this.simulatorList.push(instance);
             }
         }
@@ -182,6 +218,9 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         }
     }
 };
+/**
+ * Prepare mocks before the service is initialized
+ */
 MidwayMockService.prepareMocks = [];
 __decorate([
     (0, decorator_1.Init)(),
@@ -194,7 +233,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], MidwayMockService.prototype, "restore", null);
+], MidwayMockService.prototype, "restoreAll", null);
 MidwayMockService = MidwayMockService_1 = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.19.0-beta.2",
+  "version": "3.19.0",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -43,5 +43,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "437e92d9375b0e375f83aa363f3e6a60187c7109"
 }