@midwayjs/core 4.0.0-beta.1 → 4.0.0-beta.11

package/dist/util/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FunctionMiddleware, IgnoreMatcher } from '../interface';
 import { camelCase, pascalCase } from './camelCase';
 import { randomUUID } from './uuid';
@@ -26,9 +25,10 @@ export declare const safeRequire: (p: any, enabledCache?: boolean) => any;
  */
 export declare const loadModule: (p: string, options?: {
     enableCache?: boolean;
-    loadMode?: 'commonjs' | 'esm';
+    loadMode?: "commonjs" | "esm";
     safeLoad?: boolean;
     warnOnLoadError?: boolean;
+    extraModuleRoot?: string[];
 }) => Promise<any>;
 /**
  * load module sync, and it must be commonjs mode

package/dist/util/index.js

@@ -1,6 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = exports.findProjectEntryFileSync = exports.findProjectEntryFile = exports.isConfigurationExport = exports.isTypeScriptEnvironment = exports.toAsyncFunction = exports.merge = exports.generateRandomId = exports.getParamNames = exports.sleep = exports.wrapAsync = exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.loadModuleSync = exports.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.Utils = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.loadModuleSync = exports.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.safelyGet = safelyGet;
+exports.parsePrefix = parsePrefix;
+exports.getUserHome = getUserHome;
+exports.joinURLPath = joinURLPath;
+exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
+exports.delegateTargetAllPrototypeMethod = delegateTargetAllPrototypeMethod;
+exports.delegateTargetMethod = delegateTargetMethod;
+exports.delegateTargetProperties = delegateTargetProperties;
+exports.toPathMatch = toPathMatch;
+exports.pathMatching = pathMatching;
+exports.wrapMiddleware = wrapMiddleware;
+exports.isIncludeProperty = isIncludeProperty;
+exports.wrapAsync = wrapAsync;
+exports.sleep = sleep;
+exports.getParamNames = getParamNames;
+exports.generateRandomId = generateRandomId;
+exports.merge = merge;
+exports.toAsyncFunction = toAsyncFunction;
+exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
+exports.isConfigurationExport = isConfigurationExport;
+exports.findProjectEntryFile = findProjectEntryFile;
+exports.findProjectEntryFileSync = findProjectEntryFileSync;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -57,7 +79,6 @@ const safeRequire = (p, enabledCache = true) => {
     }
 };
 exports.safeRequire = safeRequire;
-const innerLoadModuleCache = {};
 /**
  * load module, and it can be chosen commonjs or esm mode
  * @param p
@@ -75,23 +96,29 @@ const loadModule = async (p, options = {}) => {
     try {
         if (options.enableCache) {
             if (options.loadMode === 'commonjs') {
-                return require(p);
+                try {
+                    return require(p);
+                }
+                catch (_) {
+                    for (const extraPath of [
+                        process.cwd(),
+                        ...(options.extraModuleRoot || []),
+                    ]) {
+                        try {
+                            return require(require.resolve(p, { paths: [extraPath] }));
+                        }
+                        catch (_) {
+                            // do nothing
+                        }
+                    }
+                }
             }
             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 = (0, fs_1.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((0, url_1.pathToFileURL)(p).href);
@@ -185,7 +212,6 @@ function safelyGet(list, obj) {
     }
     return willReturn;
 }
-exports.safelyGet = safelyGet;
 /**
  * 剔除 @ 符号
  * @param provideId provideId
@@ -197,11 +223,9 @@ function parsePrefix(provideId) {
     }
     return provideId;
 }
-exports.parsePrefix = parsePrefix;
 function getUserHome() {
     return process.env[process.platform === 'win32' ? 'USERPROFILE' : 'HOME'];
 }
-exports.getUserHome = getUserHome;
 function joinURLPath(...strArray) {
     strArray = strArray.filter(item => !!item);
     if (strArray.length === 0) {
@@ -214,7 +238,6 @@ function joinURLPath(...strArray) {
     }
     return p;
 }
-exports.joinURLPath = joinURLPath;
 /**
  * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
  * @param derivedCtor
@@ -240,7 +263,6 @@ function delegateTargetPrototypeMethod(derivedCtor, constructors, otherMethods)
         delegateTargetMethod(derivedCtor, otherMethods);
     }
 }
-exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
 /**
  * 代理目标所有的原型方法，包括原型链，不包括构造器和内部隐藏方法
  * @param derivedCtor
@@ -253,7 +275,6 @@ function delegateTargetAllPrototypeMethod(derivedCtor, constructor) {
         constructor = Object.getPrototypeOf(constructor);
     } while (constructor);
 }
-exports.delegateTargetAllPrototypeMethod = delegateTargetAllPrototypeMethod;
 /**
  * 代理目标原型上的特定方法
  * @param derivedCtor
@@ -267,7 +288,6 @@ function delegateTargetMethod(derivedCtor, methods) {
         };
     });
 }
-exports.delegateTargetMethod = delegateTargetMethod;
 /**
  * 代理目标原型属性
  * @param derivedCtor
@@ -283,7 +303,6 @@ function delegateTargetProperties(derivedCtor, properties) {
         });
     });
 }
-exports.delegateTargetProperties = delegateTargetProperties;
 /**
  * 获取当前的时间戳
  * @since 2.0.0
@@ -359,7 +378,6 @@ 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)
@@ -397,7 +415,6 @@ function pathMatching(options) {
         return options.match ? matched : !matched;
     };
 }
-exports.pathMatching = pathMatching;
 /**
  * wrap function middleware with match and ignore
  * @param mw
@@ -419,7 +436,6 @@ function wrapMiddleware(mw, options) {
     fn._name = mw._name + 'middlewareWrapper';
     return fn;
 }
-exports.wrapMiddleware = wrapMiddleware;
 function isOwnPropertyWritable(obj, prop) {
     if (obj == null)
         return false;
@@ -436,7 +452,6 @@ function isIncludeProperty(obj, prop) {
     }
     return false;
 }
-exports.isIncludeProperty = isIncludeProperty;
 function wrapAsync(handler) {
     return (...args) => {
         if (typeof args[args.length - 1] === 'function') {
@@ -457,7 +472,6 @@ function wrapAsync(handler) {
         }
     };
 }
-exports.wrapAsync = wrapAsync;
 function sleep(sleepTime = 1000, abortController) {
     return new Promise(resolve => {
         const timeoutHandler = setTimeout(() => {
@@ -470,7 +484,6 @@ function sleep(sleepTime = 1000, abortController) {
         }
     });
 }
-exports.sleep = sleep;
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm;
 /**
  * get parameter name from function
@@ -489,7 +502,6 @@ function getParamNames(func) {
     }
     return result;
 }
-exports.getParamNames = getParamNames;
 /**
  * generate a lightweight 32 bit random id, enough for ioc container
  */
@@ -497,7 +509,6 @@ function generateRandomId() {
     // => f9b327e70bbcf42494ccb28b2d98e00e
     return crypto.randomBytes(16).toString('hex');
 }
-exports.generateRandomId = generateRandomId;
 function merge(target, src) {
     if (!target) {
         target = src;
@@ -514,7 +525,6 @@ function merge(target, src) {
     }
     throw new Error('can not merge meta that type of ' + typeof target);
 }
-exports.merge = merge;
 function toAsyncFunction(method) {
     if (types_1.Types.isAsyncFunction(method)) {
         return method;
@@ -525,7 +535,6 @@ function toAsyncFunction(method) {
         };
     }
 }
-exports.toAsyncFunction = toAsyncFunction;
 function isTypeScriptEnvironment() {
     const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
     if ('false' === TS_MODE_PROCESS_FLAG) {
@@ -534,7 +543,6 @@ function isTypeScriptEnvironment() {
     // eslint-disable-next-line node/no-deprecated-api
     return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
 }
-exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 function getFileNameWithSuffix(fileName) {
     return isTypeScriptEnvironment() ? `${fileName}.ts` : `${fileName}.js`;
 }
@@ -544,7 +552,6 @@ function isConfigurationExport(exports) {
         (types_1.Types.isObject(exports) &&
             metadataManager_1.MetadataManager.hasOwnMetadata(decorator_1.CONFIGURATION_OBJECT_KEY, exports)));
 }
-exports.isConfigurationExport = isConfigurationExport;
 async function findProjectEntryFile(appDir, baseDir, loadMode) {
     /**
      * 查找常用文件中的 midway 入口，入口文件包括 Configuration 对象或者 defineConfiguration 函数
@@ -594,7 +601,6 @@ async function findProjectEntryFile(appDir, baseDir, loadMode) {
         }
     }
 }
-exports.findProjectEntryFile = findProjectEntryFile;
 function findProjectEntryFileSync(appDir, baseDir) {
     /**
      * 查找常用文件中的 midway 入口，入口文件包括 Configuration 对象或者 defineConfiguration 函数
@@ -643,7 +649,6 @@ function findProjectEntryFileSync(appDir, baseDir) {
         }
     }
 }
-exports.findProjectEntryFileSync = findProjectEntryFileSync;
 exports.Utils = {
     sleep,
     getParamNames,

package/dist/util/pathFileUtil.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare function isPath(p: any): boolean;
 export declare function isPathEqual(one: string, two: string): boolean;
 export declare function getFileContentSync(filePath: any, encoding?: BufferEncoding): any;

package/dist/util/pathFileUtil.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathFileUtils = exports.getModuleRequirePathList = exports.normalizePath = exports.getFileContentSync = exports.isPathEqual = exports.isPath = void 0;
+exports.PathFileUtils = void 0;
+exports.isPath = isPath;
+exports.isPathEqual = isPathEqual;
+exports.getFileContentSync = getFileContentSync;
+exports.normalizePath = normalizePath;
+exports.getModuleRequirePathList = getModuleRequirePathList;
 const path_1 = require("path");
 const fs_1 = require("fs");
 function isPath(p) {
@@ -10,7 +15,6 @@ function isPath(p) {
     }
     return false;
 }
-exports.isPath = isPath;
 function isPathEqual(one, two) {
     if (!one || !two) {
         return false;
@@ -18,7 +22,6 @@ function isPathEqual(one, two) {
     const ext = (0, path_1.extname)(one);
     return one.replace(ext, '') === two;
 }
-exports.isPathEqual = isPathEqual;
 function getFileContentSync(filePath, encoding) {
     return typeof filePath === 'string'
         ? (0, fs_1.readFileSync)(filePath, {
@@ -26,7 +29,6 @@ function getFileContentSync(filePath, encoding) {
         })
         : filePath;
 }
-exports.getFileContentSync = getFileContentSync;
 /**
  * Normalize path, if p is absolute path, return p, otherwise join p with baseDir
  *
@@ -47,7 +49,6 @@ function normalizePath(baseDir, p) {
         return (0, path_1.resolve)(baseDir, p);
     }
 }
-exports.normalizePath = normalizePath;
 function getModuleRequirePathList(moduleName) {
     const moduleNameList = [moduleName, moduleName.replace(/\//g, '_')];
     let moduleNameMap = {};
@@ -74,7 +75,6 @@ function getModuleRequirePathList(moduleName) {
     moduleNameMap = undefined;
     return modulePathList;
 }
-exports.getModuleRequirePathList = getModuleRequirePathList;
 exports.PathFileUtils = {
     isPath,
     isPathEqual,

package/dist/util/retry.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retryWith = exports.retryWithAsync = void 0;
+exports.retryWithAsync = retryWithAsync;
+exports.retryWith = retryWith;
 const _1 = require(".");
 const error_1 = require("../error");
 /**
@@ -32,7 +33,6 @@ function retryWithAsync(retryFn, retryTimes = 1, options = {}) {
         }
     });
 }
-exports.retryWithAsync = retryWithAsync;
 /**
  * wrap sync function with retry
  * @param retryFn
@@ -59,5 +59,4 @@ function retryWith(retryFn, retryTimes = 1, options = {}) {
         }
     });
 }
-exports.retryWith = retryWith;
 //# sourceMappingURL=retry.js.map

package/dist/util/timeout.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Create a Promise that resolves after the specified time
  * @param options

package/dist/util/timeout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPromiseTimeoutInvokeChain = void 0;
+exports.createPromiseTimeoutInvokeChain = createPromiseTimeoutInvokeChain;
 const error_1 = require("../error");
 /**
  * Create a Promise that resolves after the specified time
@@ -140,5 +140,4 @@ async function createPromiseTimeoutInvokeChain(options) {
         }
     }
 }
-exports.createPromiseTimeoutInvokeChain = createPromiseTimeoutInvokeChain;
 //# sourceMappingURL=timeout.js.map

package/dist/util/types.d.ts

@@ -1,16 +1,16 @@
-export declare function isString(value: any): boolean;
+export declare function isString(value: any): value is string;
 export declare function isClass(fn: any): boolean;
 export declare function isAsyncFunction(value: any): boolean;
-export declare function isGeneratorFunction(value: any): boolean;
-export declare function isPromise(value: any): boolean;
+export declare function isGeneratorFunction(value: any): value is GeneratorFunction;
+export declare function isPromise(value: any): value is Promise<unknown>;
 export declare function isFunction(value: any): boolean;
 export declare function isObject(value: any): boolean;
 export declare function isPlainObject(obj: any): any;
-export declare function isNumber(value: any): boolean;
+export declare function isNumber(value: any): value is number;
 export declare function isProxy(value: any): boolean;
-export declare function isMap(value: any): boolean;
-export declare function isSet(value: any): boolean;
-export declare function isRegExp(value: any): boolean;
+export declare function isMap(value: any): value is Map<unknown, unknown>;
+export declare function isSet(value: any): value is Set<unknown>;
+export declare function isRegExp(value: any): value is RegExp;
 export declare function isUndefined(value: any): boolean;
 export declare function isNull(value: any): boolean;
 export declare function isNullOrUndefined(value: any): boolean;

package/dist/util/types.js

@@ -1,6 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Types = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isPlainObject = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = exports.isString = void 0;
+exports.Types = void 0;
+exports.isString = isString;
+exports.isClass = isClass;
+exports.isAsyncFunction = isAsyncFunction;
+exports.isGeneratorFunction = isGeneratorFunction;
+exports.isPromise = isPromise;
+exports.isFunction = isFunction;
+exports.isObject = isObject;
+exports.isPlainObject = isPlainObject;
+exports.isNumber = isNumber;
+exports.isProxy = isProxy;
+exports.isMap = isMap;
+exports.isSet = isSet;
+exports.isRegExp = isRegExp;
+exports.isUndefined = isUndefined;
+exports.isNull = isNull;
+exports.isNullOrUndefined = isNullOrUndefined;
 const util = require("util");
 const ToString = Function.prototype.toString;
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -8,7 +24,6 @@ const toStr = Object.prototype.toString;
 function isString(value) {
     return typeof value === 'string';
 }
-exports.isString = isString;
 function isClass(fn) {
     if (typeof fn !== 'function') {
         return false;
@@ -17,27 +32,21 @@ function isClass(fn) {
         return true;
     }
 }
-exports.isClass = isClass;
 function isAsyncFunction(value) {
     return util.types.isAsyncFunction(value);
 }
-exports.isAsyncFunction = isAsyncFunction;
 function isGeneratorFunction(value) {
     return util.types.isGeneratorFunction(value);
 }
-exports.isGeneratorFunction = isGeneratorFunction;
 function isPromise(value) {
     return util.types.isPromise(value);
 }
-exports.isPromise = isPromise;
 function isFunction(value) {
     return typeof value === 'function';
 }
-exports.isFunction = isFunction;
 function isObject(value) {
     return value !== null && typeof value === 'object';
 }
-exports.isObject = isObject;
 function isPlainObject(obj) {
     if (!obj || toStr.call(obj) !== '[object Object]') {
         return false;
@@ -58,39 +67,30 @@ function isPlainObject(obj) {
     }
     return typeof key === 'undefined' || hasOwn.call(obj, key);
 }
-exports.isPlainObject = isPlainObject;
 function isNumber(value) {
     return typeof value === 'number';
 }
-exports.isNumber = isNumber;
 function isProxy(value) {
     return util.types.isProxy(value);
 }
-exports.isProxy = isProxy;
 function isMap(value) {
     return util.types.isMap(value);
 }
-exports.isMap = isMap;
 function isSet(value) {
     return util.types.isSet(value);
 }
-exports.isSet = isSet;
 function isRegExp(value) {
     return util.types.isRegExp(value);
 }
-exports.isRegExp = isRegExp;
 function isUndefined(value) {
     return value === undefined;
 }
-exports.isUndefined = isUndefined;
 function isNull(value) {
     return value === null;
 }
-exports.isNull = isNull;
 function isNullOrUndefined(value) {
     return isUndefined(value) || isNull(value);
 }
-exports.isNullOrUndefined = isNullOrUndefined;
 exports.Types = {
     isClass,
     isAsyncFunction,

package/dist/util/uuid.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomUUID = void 0;
+exports.randomUUID = randomUUID;
 const crypto = require("crypto");
 /**
  * code fork from https://github.com/uuidjs/uuid/blob/main/src/stringify.js
@@ -60,5 +60,4 @@ function randomUUID(force) {
     rnds[8] = (rnds[8] & 0x3f) | 0x80;
     return unsafeStringify(rnds);
 }
-exports.randomUUID = randomUUID;
 //# sourceMappingURL=uuid.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.11",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,9 +22,9 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/logger": "^3.0.0",
+    "@midwayjs/logger": "^4.0.0",
     "eventsource": "2.0.2",
-    "koa": "2.16.1",
+    "koa": "3.0.3",
     "mm": "3.4.0",
     "raw-body": "2.5.2",
     "sinon": "17.0.2"
@@ -40,7 +40,7 @@
     "url": "https://github.com/midwayjs/midway.git"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "madge": {
     "detectiveOptions": {
@@ -61,5 +61,5 @@
       "types": "./dist/functional/index.d.ts"
     }
   },
-  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
+  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
 }