@midwayjs/core 3.8.0 → 3.10.0

package/dist/setup.js

@@ -6,7 +6,6 @@ const config_default_1 = require("./config/config.default");
 const decorator_1 = require("./decorator");
 const util = require("util");
 const path_1 = require("path");
-const logger_1 = require("@midwayjs/logger");
 const slsFunctionService_1 = require("./service/slsFunctionService");
 const debug = util.debuglog('midway:debug');
 /**
@@ -18,6 +17,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
         applicationContext,
+        globalOptions,
     ]);
     if (loggerService.getLogger('appLogger')) {
         // register global logger
@@ -32,6 +32,8 @@ async function initializeGlobalApplicationContext(globalOptions) {
     await applicationContext.getAsync(_1.MidwayLifeCycleService, [
         applicationContext,
     ]);
+    // mock support
+    await applicationContext.get(_1.MidwayMockService, [applicationContext]);
     // some preload module init
     const modules = (0, decorator_1.listPreloadModule)();
     for (const module of modules) {
@@ -42,13 +44,15 @@ async function initializeGlobalApplicationContext(globalOptions) {
 }
 exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
 async function destroyGlobalApplicationContext(applicationContext) {
+    const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService);
+    const loggerFactory = loggerService.getCurrentLoggerFactory();
     // stop lifecycle
     const lifecycleService = await applicationContext.getAsync(_1.MidwayLifeCycleService);
     await lifecycleService.stop();
     // stop container
     await applicationContext.stop();
     (0, decorator_1.clearBindContainer)();
-    logger_1.loggers.close();
+    loggerFactory.close();
     global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
     global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
 }

package/dist/util/camelCase.js

@@ -12,19 +12,19 @@ const preserveCamelCase = (string, toLowerCase, toUpperCase) => {
     let isLastCharLower = false;
     let isLastCharUpper = false;
     let isLastLastCharUpper = false;
-    for (let i = 0; i < string.length; i++) {
-        const character = string[i];
+    for (let index = 0; index < string.length; index++) {
+        const character = string[index];
         if (isLastCharLower && UPPERCASE.test(character)) {
-            string = string.slice(0, i) + '-' + string.slice(i);
+            string = string.slice(0, index) + '-' + string.slice(index);
             isLastCharLower = false;
             isLastLastCharUpper = isLastCharUpper;
             isLastCharUpper = true;
-            i++;
+            index++;
         }
         else if (isLastCharUpper &&
             isLastLastCharUpper &&
             LOWERCASE.test(character)) {
-            string = string.slice(0, i - 1) + '-' + string.slice(i - 1);
+            string = string.slice(0, index - 1) + '-' + string.slice(index - 1);
             isLastLastCharUpper = isLastCharUpper;
             isLastCharUpper = false;
             isLastCharLower = true;
@@ -60,6 +60,9 @@ function camelCaseOrigin(input, options) {
     const toLowerCase = string => string.toLowerCase();
     const toUpperCase = string => string.toUpperCase();
     if (input.length === 1) {
+        if (SEPARATORS.test(input)) {
+            return '';
+        }
         return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
     }
     const hasUpperCase = input !== toLowerCase(input);

package/dist/util/httpclient.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import http = require('http');
-declare type MethodType = 'GET' | 'POST';
-declare type MimeType = 'text' | 'json' | undefined;
+type MethodType = 'GET' | 'POST';
+type MimeType = 'text' | 'json' | undefined;
 interface IOptions {
     method?: MethodType;
     headers?: any;

package/dist/util/pathToRegexp.d.ts

@@ -30,7 +30,7 @@ interface TokensToFunctionOptions {
  * Compile a string to a template function for the path.
  */
 declare function compile<P extends object = object>(str: string, options?: ParseOptions & TokensToFunctionOptions): PathFunction<P>;
-declare type PathFunction<P extends object = object> = (data?: P) => string;
+type PathFunction<P extends object = object> = (data?: P) => string;
 interface RegexpToFunctionOptions {
     /**
      * Function for decoding strings for params.
@@ -48,11 +48,11 @@ interface MatchResult<P extends object = object> {
 /**
  * A match is either `false` (no match) or a match result.
  */
-declare type Match<P extends object = object> = false | MatchResult<P>;
+type Match<P extends object = object> = false | MatchResult<P>;
 /**
  * The match function takes a string and returns whether it matched the path.
  */
-declare type MatchFunction<P extends object = object> = (path: string) => Match<P>;
+type MatchFunction<P extends object = object> = (path: string) => Match<P>;
 /**
  * Create path match function from `path-to-regexp` spec.
  */
@@ -70,7 +70,7 @@ interface Key {
 /**
  * A token is a string (nothing special) or key metadata (capture group).
  */
-declare type Token = string | Key;
+type Token = string | Key;
 interface TokensToRegexpOptions {
     /**
      * When `true` the regexp will be case sensitive. (default: `false`)
@@ -104,7 +104,7 @@ interface TokensToRegexpOptions {
 /**
  * Supported `path-to-regexp` input types.
  */
-declare type Path = string | RegExp | Array<string | RegExp>;
+type Path = string | RegExp | Array<string | RegExp>;
 /**
  * Normalize the given path string, returning a regular expression.
  *

package/dist/util/webRouterParam.d.ts

@@ -1,5 +1,3 @@
-import { PipeTransform, PipeTransformFunction } from '../decorator';
-export declare function callPipes(pipes: Array<PipeTransform | PipeTransformFunction>, value: any): Promise<any>;
-export declare const extractKoaLikeValue: (key: any, data: any, paramType?: any, pipes?: PipeTransform[]) => (ctx: any, next: any) => Promise<any>;
-export declare const extractExpressLikeValue: (key: any, data: any, paramType?: any, pipes?: PipeTransform[]) => (req: any, res: any, next: any) => Promise<any>;
+export declare const extractKoaLikeValue: (key: any, data: any, paramType?: any) => (ctx: any, next: any) => any;
+export declare const extractExpressLikeValue: (key: any, data: any, paramType?: any) => (req: any, res: any, next: any) => any;
 //# sourceMappingURL=webRouterParam.d.ts.map

package/dist/util/webRouterParam.js

@@ -1,27 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractExpressLikeValue = exports.extractKoaLikeValue = exports.callPipes = void 0;
+exports.extractExpressLikeValue = exports.extractKoaLikeValue = void 0;
 const decorator_1 = require("../decorator");
 const index_1 = require("./index");
-async function callPipes(pipes, value) {
-    if (pipes && pipes.length) {
-        for (const pipe of pipes) {
-            if ('transform' in pipe) {
-                value = await pipe.transform(value);
-            }
-            else {
-                value = await pipe(value);
-            }
-        }
-    }
-    return value;
-}
-exports.callPipes = callPipes;
-const extractKoaLikeValue = (key, data, paramType, pipes) => {
+const extractKoaLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
-    const value = async function (ctx, next) {
+    return function (ctx, next) {
         switch (key) {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
@@ -74,17 +60,13 @@ const extractKoaLikeValue = (key, data, paramType, pipes) => {
                 return null;
         }
     };
-    return async function (ctx, next) {
-        const result = await value(ctx, next);
-        return await callPipes(pipes || [], result);
-    };
 };
 exports.extractKoaLikeValue = extractKoaLikeValue;
-const extractExpressLikeValue = (key, data, paramType, pipes) => {
+const extractExpressLikeValue = (key, data, paramType) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
-    const value = (req, res, next) => {
+    return function (req, res, next) {
         switch (key) {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
@@ -121,10 +103,6 @@ const extractExpressLikeValue = (key, data, paramType, pipes) => {
                 return null;
         }
     };
-    return async function (req, res, next) {
-        const result = await value(req, res, next);
-        return await callPipes(pipes || [], result);
-    };
 };
 exports.extractExpressLikeValue = extractExpressLikeValue;
 //# sourceMappingURL=webRouterParam.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.8.0",
+  "version": "3.10.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -22,11 +22,10 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "koa": "2.13.4",
-    "mm": "3.2.0",
-    "pg": "8.8.0",
+    "koa": "2.14.1",
+    "mm": "3.2.1",
     "raw-body": "2.5.1",
-    "sinon": "14.0.2"
+    "sinon": "15.0.1"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -43,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "5c640c7182923587139f9f9c0aecf50585798e1e"
+  "gitHead": "33d28f1a020963404488e866432916fd15c0952c"
 }

package/dist/decorator/interface.d.ts

@@ -1,242 +0,0 @@
-export declare type MiddlewareParamArray = Array<string | any>;
-export declare type ObjectIdentifier = string | Symbol;
-export declare type GroupModeType = 'one' | 'multi';
-export declare enum ScopeEnum {
-    Singleton = "Singleton",
-    Request = "Request",
-    Prototype = "Prototype"
-}
-export declare enum InjectModeEnum {
-    Identifier = "Identifier",
-    Class = "Class",
-    PropertyName = "PropertyName"
-}
-/**
- * 内部管理的属性、json、ref等解析实例存储
- */
-export interface IManagedInstance {
-    type: string;
-    value?: any;
-    args?: any;
-}
-export interface ObjectDefinitionOptions {
-    isAsync?: boolean;
-    initMethod?: string;
-    destroyMethod?: string;
-    scope?: ScopeEnum;
-    constructorArgs?: any[];
-    namespace?: string;
-    srcPath?: string;
-    allowDowngrade?: boolean;
-}
-export interface TagPropsMetadata {
-    key: string | number | symbol;
-    value: any;
-    args?: any;
-}
-export interface TagClsMetadata {
-    id: string;
-    originName: string;
-    uuid: string;
-    name: string;
-}
-export interface ReflectResult {
-    [key: string]: any[];
-}
-export declare enum MSProviderType {
-    DUBBO = "dubbo",
-    GRPC = "gRPC"
-}
-export declare enum MSListenerType {
-    RABBITMQ = "rabbitmq",
-    MQTT = "mqtt",
-    KAFKA = "kafka",
-    REDIS = "redis"
-}
-export declare namespace ConsumerMetadata {
-    interface ConsumerMetadata {
-        type: MSListenerType;
-        metadata: any;
-    }
-}
-/**
- * grpc decorator metadata format
- */
-export declare namespace GRPCMetadata {
-    interface ProviderOptions {
-        serviceName?: string;
-        package?: string;
-    }
-    interface ProviderMetadata {
-        type: MSProviderType;
-        metadata: ProviderOptions;
-    }
-}
-export declare namespace FaaSMetadata {
-    export interface ServerlessFunctionOptions {
-        /**
-         * function name
-         */
-        functionName?: string;
-        /**
-         * function description
-         */
-        description?: string;
-        /**
-         * function memory size, unit: M
-         */
-        memorySize?: number;
-        /**
-         * function timeout value, unit: seconds
-         */
-        timeout?: number;
-        /**
-         * function init timeout, just for aliyun
-         */
-        initTimeout?: number;
-        /**
-         * function runtime, nodejs10, nodejs12, nodejs14
-         */
-        runtime?: string;
-        /**
-         * invoke concurrency, just for aliyun
-         */
-        concurrency?: number;
-        /**
-         * function invoke stage, like env, just for tencent
-         */
-        stage?: string;
-        /**
-         * environment variable, key-value
-         */
-        environment?: any;
-        /**
-         * deploy or not
-         */
-        isDeploy?: boolean;
-        /**
-         * function handler name, like 'index.handler'
-         */
-        handlerName?: string;
-    }
-    interface TriggerCommonOptions {
-        /**
-         * function name
-         */
-        functionName?: string;
-        /**
-         * serverless event name
-         */
-        name?: string;
-        /**
-         * function invoke role, just for aliyun
-         */
-        role?: string;
-        /**
-         * function publish version, just for aliyun
-         */
-        version?: string;
-        /**
-         * deploy or not
-         */
-        isDeploy?: boolean;
-        /**
-         * function middleware
-         */
-        middleware?: any[];
-    }
-    export interface EventTriggerOptions extends TriggerCommonOptions {
-    }
-    export interface HTTPTriggerOptions extends TriggerCommonOptions {
-        path: string;
-        method?: 'get' | 'post' | 'delete' | 'put' | 'head' | 'patch' | 'all';
-    }
-    export interface APIGatewayTriggerOptions extends HTTPTriggerOptions {
-    }
-    export interface OSTriggerOptions extends TriggerCommonOptions {
-        bucket: string;
-        events: string | string[];
-        filter?: {
-            prefix: string;
-            suffix: string;
-        };
-    }
-    export interface LogTriggerOptions extends TriggerCommonOptions {
-        source: string;
-        project: string;
-        log: string;
-        retryTime?: number;
-        interval?: number;
-    }
-    export interface TimerTriggerOptions extends TriggerCommonOptions {
-        type: 'cron' | 'every' | 'interval';
-        value: string;
-        payload?: string;
-        enable?: boolean;
-    }
-    export interface MQTriggerOptions extends TriggerCommonOptions {
-        topic: string;
-        tags?: string;
-        region?: string;
-        strategy?: 'BACKOFF_RETRY' | 'EXPONENTIAL_DECAY_RETRY';
-    }
-    export interface HSFTriggerOptions extends TriggerCommonOptions {
-    }
-    export interface MTopTriggerOptions extends TriggerCommonOptions {
-    }
-    export interface CDNTriggerOptions extends TriggerCommonOptions {
-    }
-    export type EventTriggerUnionOptions = EventTriggerOptions | HTTPTriggerOptions | APIGatewayTriggerOptions | OSTriggerOptions | CDNTriggerOptions | LogTriggerOptions | TimerTriggerOptions | MQTriggerOptions | HSFTriggerOptions | MTopTriggerOptions;
-    export interface TriggerMetadata {
-        type: ServerlessTriggerType;
-        functionName?: string;
-        handlerName?: string;
-        methodName?: string;
-        metadata: EventTriggerUnionOptions;
-    }
-    export {};
-}
-export declare abstract class FrameworkType {
-    abstract name: string;
-}
-export declare class MidwayFrameworkType extends FrameworkType {
-    name: string;
-    static WEB: MidwayFrameworkType;
-    static WEB_KOA: MidwayFrameworkType;
-    static WEB_EXPRESS: MidwayFrameworkType;
-    static FAAS: MidwayFrameworkType;
-    static MS_GRPC: MidwayFrameworkType;
-    static MS_RABBITMQ: MidwayFrameworkType;
-    static MS_KAFKA: MidwayFrameworkType;
-    static WS_IO: MidwayFrameworkType;
-    static WS: MidwayFrameworkType;
-    static SERVERLESS_APP: MidwayFrameworkType;
-    static CUSTOM: MidwayFrameworkType;
-    static EMPTY: MidwayFrameworkType;
-    static LIGHT: MidwayFrameworkType;
-    static TASK: MidwayFrameworkType;
-    constructor(name: string);
-}
-export declare enum ServerlessTriggerType {
-    EVENT = "event",
-    HTTP = "http",
-    API_GATEWAY = "apigw",
-    OS = "os",
-    CDN = "cdn",
-    LOG = "log",
-    TIMER = "timer",
-    MQ = "mq",
-    KAFKA = "kafka",
-    HSF = "hsf",
-    MTOP = "mtop"
-}
-export interface IModuleStore {
-    listModule(key: string): any;
-    saveModule(key: string, module: any): any;
-    transformModule?(moduleMap: Map<string, Set<any>>): any;
-}
-export interface PipeTransform<T = any, R = any> {
-    transform(value: T): R;
-}
-export declare type PipeTransformFunction<T = any, R = any> = (value: T) => R;
-//# sourceMappingURL=interface.d.ts.map

package/dist/decorator/interface.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerlessTriggerType = exports.MidwayFrameworkType = exports.FrameworkType = exports.MSListenerType = exports.MSProviderType = exports.InjectModeEnum = exports.ScopeEnum = void 0;
-var ScopeEnum;
-(function (ScopeEnum) {
-    ScopeEnum["Singleton"] = "Singleton";
-    ScopeEnum["Request"] = "Request";
-    ScopeEnum["Prototype"] = "Prototype";
-})(ScopeEnum = exports.ScopeEnum || (exports.ScopeEnum = {}));
-var InjectModeEnum;
-(function (InjectModeEnum) {
-    InjectModeEnum["Identifier"] = "Identifier";
-    InjectModeEnum["Class"] = "Class";
-    InjectModeEnum["PropertyName"] = "PropertyName";
-})(InjectModeEnum = exports.InjectModeEnum || (exports.InjectModeEnum = {}));
-var MSProviderType;
-(function (MSProviderType) {
-    MSProviderType["DUBBO"] = "dubbo";
-    MSProviderType["GRPC"] = "gRPC";
-})(MSProviderType = exports.MSProviderType || (exports.MSProviderType = {}));
-var MSListenerType;
-(function (MSListenerType) {
-    MSListenerType["RABBITMQ"] = "rabbitmq";
-    MSListenerType["MQTT"] = "mqtt";
-    MSListenerType["KAFKA"] = "kafka";
-    MSListenerType["REDIS"] = "redis";
-})(MSListenerType = exports.MSListenerType || (exports.MSListenerType = {}));
-class FrameworkType {
-}
-exports.FrameworkType = FrameworkType;
-class MidwayFrameworkType extends FrameworkType {
-    constructor(name) {
-        super();
-        this.name = name;
-    }
-}
-exports.MidwayFrameworkType = MidwayFrameworkType;
-MidwayFrameworkType.WEB = new MidwayFrameworkType('@midwayjs/web');
-MidwayFrameworkType.WEB_KOA = new MidwayFrameworkType('@midwayjs/web-koa');
-MidwayFrameworkType.WEB_EXPRESS = new MidwayFrameworkType('@midwayjs/express');
-MidwayFrameworkType.FAAS = new MidwayFrameworkType('@midwayjs/faas');
-MidwayFrameworkType.MS_GRPC = new MidwayFrameworkType('@midwayjs/grpc');
-MidwayFrameworkType.MS_RABBITMQ = new MidwayFrameworkType('@midwayjs/rabbitmq');
-MidwayFrameworkType.MS_KAFKA = new MidwayFrameworkType('@midwayjs/kafka');
-MidwayFrameworkType.WS_IO = new MidwayFrameworkType('@midwayjs/socketio');
-MidwayFrameworkType.WS = new MidwayFrameworkType('@midwayjs/ws');
-MidwayFrameworkType.SERVERLESS_APP = new MidwayFrameworkType('@midwayjs/serverless-app');
-MidwayFrameworkType.CUSTOM = new MidwayFrameworkType('');
-MidwayFrameworkType.EMPTY = new MidwayFrameworkType('empty');
-MidwayFrameworkType.LIGHT = new MidwayFrameworkType('light');
-MidwayFrameworkType.TASK = new MidwayFrameworkType('@midwayjs/task');
-var ServerlessTriggerType;
-(function (ServerlessTriggerType) {
-    ServerlessTriggerType["EVENT"] = "event";
-    ServerlessTriggerType["HTTP"] = "http";
-    ServerlessTriggerType["API_GATEWAY"] = "apigw";
-    ServerlessTriggerType["OS"] = "os";
-    ServerlessTriggerType["CDN"] = "cdn";
-    ServerlessTriggerType["LOG"] = "log";
-    ServerlessTriggerType["TIMER"] = "timer";
-    ServerlessTriggerType["MQ"] = "mq";
-    ServerlessTriggerType["KAFKA"] = "kafka";
-    ServerlessTriggerType["HSF"] = "hsf";
-    ServerlessTriggerType["MTOP"] = "mtop";
-})(ServerlessTriggerType = exports.ServerlessTriggerType || (exports.ServerlessTriggerType = {}));
-//# sourceMappingURL=interface.js.map