@midwayjs/core 3.0.0-beta.7 → 3.0.1

package/dist/setup.js

@@ -22,7 +22,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // register baseDir and appDir
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
-    if (globalOptions.moduleDirector !== false) {
+    if (globalOptions.moduleDetector !== false) {
         if (globalOptions.moduleDetector === undefined ||
             globalOptions.moduleDetector === 'file') {
             applicationContext.setFileDetector(new _1.DirectoryFileDetector({
@@ -44,6 +44,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayFrameworkService);
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
+    applicationContext.bindClass(_1.MidwayApplicationManager);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {
@@ -63,19 +64,26 @@ async function initializeGlobalApplicationContext(globalOptions) {
     await applicationContext.getAsync(_1.MidwayDecoratorService, [
         applicationContext,
     ]);
-    if (!globalOptions.configurationModule) {
-        globalOptions.configurationModule = [
+    if (!globalOptions.imports) {
+        globalOptions.imports = [
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
         ];
     }
-    for (const configurationModule of [].concat(globalOptions.configurationModule)) {
+    for (const configurationModule of []
+        .concat(globalOptions.imports)
+        .concat(globalOptions.configurationModule)) {
         // load configuration and component
         applicationContext.load(configurationModule);
     }
     // bind user code module
     await applicationContext.ready();
     if (globalOptions.globalConfig) {
-        configService.add([globalOptions.globalConfig]);
+        if (Array.isArray(globalOptions.globalConfig)) {
+            configService.add(globalOptions.globalConfig);
+        }
+        else {
+            configService.addObject(globalOptions.globalConfig);
+        }
     }
     // merge config
     await configService.load();

package/dist/util/extend.d.ts

@@ -0,0 +1,2 @@
+export declare function extend(...args: any[]): any;
+//# sourceMappingURL=extend.d.ts.map

package/dist/util/extend.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extend = void 0;
+/**
+ * fork from https://github.com/eggjs/extend2
+ */
+const decorator_1 = require("@midwayjs/decorator");
+function extend(...args) {
+    let options, name, src, copy, clone;
+    let target = args[0];
+    let i = 1;
+    const length = args.length;
+    let deep = false;
+    // Handle a deep copy situation
+    if (typeof target === 'boolean') {
+        deep = target;
+        target = args[1] || {};
+        // skip the boolean and the target
+        i = 2;
+    }
+    else if ((typeof target !== 'object' && typeof target !== 'function') ||
+        target == null) {
+        target = {};
+    }
+    for (; i < length; ++i) {
+        options = args[i];
+        // Only deal with non-null/undefined values
+        if (options == null)
+            continue;
+        // Extend the base object
+        for (name in options) {
+            if (name === '__proto__')
+                continue;
+            src = target[name];
+            copy = options[name];
+            // Prevent never-ending loop
+            if (target === copy)
+                continue;
+            // Recurse if we're merging plain objects
+            if (deep && copy && decorator_1.Types.isPlainObject(copy)) {
+                clone = src && decorator_1.Types.isPlainObject(src) ? src : {};
+                // Never move original objects, clone them
+                target[name] = extend(deep, clone, copy);
+                // Don't bring in undefined values
+            }
+            else if (typeof copy !== 'undefined') {
+                target[name] = copy;
+            }
+        }
+    }
+    // Return the modified object
+    return target;
+}
+exports.extend = extend;
+//# sourceMappingURL=extend.js.map

package/dist/util/index.d.ts

@@ -1,3 +1,4 @@
+import { FunctionMiddleware } from '../interface';
 /**
  * @since 2.0.0
  * @param env
@@ -73,5 +74,12 @@ export declare const deprecatedOutput: (message: string) => void;
  */
 export declare const transformRequestObjectByType: (originValue: any, targetType?: any) => any;
 export declare function toPathMatch(pattern: any): any;
+export declare function pathMatching(options: any): (ctx?: any) => any;
+/**
+ * wrap function middleware with match and ignore
+ * @param mw
+ * @param options
+ */
+export declare function wrapMiddleware(mw: FunctionMiddleware<any, any>, options: any): (context: any, next: any, options?: any) => any;
 export declare function isIncludeProperty(obj: any, prop: string): boolean;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncludeProperty = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -237,6 +237,43 @@ function toPathMatch(pattern) {
     throw new error_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
 }
 exports.toPathMatch = toPathMatch;
+function pathMatching(options) {
+    options = options || {};
+    if (options.match && options.ignore)
+        throw new error_1.MidwayCommonError('options.match and options.ignore can not both present');
+    if (!options.match && !options.ignore)
+        return () => true;
+    const matchFn = options.match
+        ? toPathMatch(options.match)
+        : toPathMatch(options.ignore);
+    return function pathMatch(ctx) {
+        const matched = matchFn(ctx);
+        return options.match ? matched : !matched;
+    };
+}
+exports.pathMatching = pathMatching;
+/**
+ * wrap function middleware with match and ignore
+ * @param mw
+ * @param options
+ */
+function wrapMiddleware(mw, options) {
+    // support options.enable
+    if (options.enable === false)
+        return null;
+    // support options.match and options.ignore
+    if (!options.match && !options.ignore)
+        return mw;
+    const match = pathMatching(options);
+    const fn = (ctx, next) => {
+        if (!match(ctx))
+            return next();
+        return mw(ctx, next);
+    };
+    fn._name = mw._name + 'middlewareWrapper';
+    return fn;
+}
+exports.wrapMiddleware = wrapMiddleware;
 function isOwnPropertyWritable(obj, prop) {
     if (obj == null)
         return false;

package/dist/util/webRouterParam.js

@@ -22,9 +22,25 @@ const extractKoaLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? ctx.session[data] : ctx.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return ctx.getFileStream && ctx.getFileStream(data);
+                if (ctx.getFileStream) {
+                    return ctx.getFileStream(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files[0];
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return ctx.multipart && ctx.multipart(data);
+                if (ctx.multipart) {
+                    return ctx.multipart(data);
+                }
+                else if (ctx.files) {
+                    return ctx.files;
+                }
+                else {
+                    return undefined;
+                }
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return ctx['path'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -36,6 +52,8 @@ const extractKoaLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? ctx.query[data] : ctx.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? ctx.fields[data] : ctx.fields;
             default:
                 return null;
         }
@@ -61,9 +79,9 @@ const extractExpressLikeValue = (key, data, paramType) => {
             case decorator_1.RouteParamTypes.SESSION:
                 return (0, index_1.transformRequestObjectByType)(data ? req.session[data] : req.session, paramType);
             case decorator_1.RouteParamTypes.FILESTREAM:
-                return req.getFileStream && req.getFileStream(data);
+                return req.files ? req.files[0] : undefined;
             case decorator_1.RouteParamTypes.FILESSTREAM:
-                return req.multipart && req.multipart(data);
+                return req.files;
             case decorator_1.RouteParamTypes.REQUEST_PATH:
                 return req['baseUrl'];
             case decorator_1.RouteParamTypes.REQUEST_IP:
@@ -75,6 +93,8 @@ const extractExpressLikeValue = (key, data, paramType) => {
                 else {
                     return (0, index_1.transformRequestObjectByType)(data ? req.query[data] : req.query, paramType);
                 }
+            case decorator_1.RouteParamTypes.FIELDS:
+                return data ? req.fields[data] : req.fields;
             default:
                 return null;
         }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.1",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -21,22 +21,20 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.7",
-    "koa": "^2.13.4",
+    "@midwayjs/decorator": "^3.0.0",
+    "koa": "2.13.4",
     "midway-test-component": "*",
-    "mm": "3",
-    "sinon": "^7.2.2"
+    "mm": "3.2.0",
+    "sinon": "12.0.1"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.7",
+    "@midwayjs/logger": "^2.14.0",
     "class-transformer": "^0.5.1",
-    "extend2": "^1.0.0",
-    "picomatch": "^2.2.2",
-    "reflect-metadata": "^0.1.13"
+    "picomatch": "2.3.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -46,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
+  "gitHead": "f345b4ed0392e5c3b9e815438ef0a377ad6da076"
 }