@midwayjs/core 3.12.0-beta.1 → 3.12.0-beta.2

package/dist/common/dataSourceManager.d.ts

@@ -1,3 +1,4 @@
+import { ModuleLoadType } from '../interface';
 export interface CreateDataSourceInstanceOptions {
     /**
      * @default false
@@ -59,6 +60,6 @@ export declare abstract class DataSourceManager<T> {
     getDefaultDataSourceName(): string;
 }
 export declare function formatGlobString(globString: string): string[];
-export declare function globModels(globString: string, appDir: string): any[];
+export declare function globModels(globString: string, appDir: string, loadMode?: ModuleLoadType): Promise<any[]>;
 export {};
 //# sourceMappingURL=dataSourceManager.d.ts.map

package/dist/common/dataSourceManager.js

@@ -11,6 +11,7 @@ const path_1 = require("path");
 const types_1 = require("../util/types");
 const constants_1 = require("../constants");
 const util_1 = require("util");
+const util_2 = require("../util");
 const debug = (0, util_1.debuglog)('midway:debug');
 class DataSourceManager {
     constructor() {
@@ -36,7 +37,7 @@ class DataSourceManager {
                 for (const entity of dataSourceOptions['entities']) {
                     if (typeof entity === 'string') {
                         // string will be glob file
-                        const models = globModels(entity, appDirOrOptions.appDir);
+                        const models = await globModels(entity, appDirOrOptions.appDir);
                         for (const model of models) {
                             entities.add(model);
                             this.modelMapping.set(model, dataSourceName);
@@ -153,7 +154,7 @@ function formatGlobString(globString) {
     return pattern;
 }
 exports.formatGlobString = formatGlobString;
-function globModels(globString, appDir) {
+async function globModels(globString, appDir, loadMode) {
     const pattern = formatGlobString(globString);
     const models = [];
     // string will be glob file
@@ -162,7 +163,9 @@ function globModels(globString, appDir) {
         ignore: constants_1.IGNORE_PATTERN,
     });
     for (const file of files) {
-        const exports = require(file);
+        const exports = await (0, util_2.loadModule)(file, {
+            loadMode,
+        });
         if (types_1.Types.isClass(exports)) {
             models.push(exports);
         }

package/dist/common/fileDetector.js

@@ -6,6 +6,7 @@ const glob_1 = require("@midwayjs/glob");
 const error_1 = require("../error");
 const constants_1 = require("../constants");
 const decorator_1 = require("../decorator");
+const util_1 = require("../util");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -110,7 +111,9 @@ class CommonJSFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
-                const exports = await import(file);
+                const exports = await (0, util_1.loadModule)(file, {
+                    loadMode: 'esm',
+                });
                 // add module to set
                 container.bindClass(exports, {
                     namespace: this.options.namespace,

package/dist/index.d.ts

@@ -33,7 +33,7 @@ export { AsyncContextManager, ASYNC_ROOT_CONTEXT, AsyncContext, } from './common
 export * from './decorator';
 export * from './decorator/decoratorManager';
 export * from './decorator/constant';
-export { safelyGet, safeRequire, loadModule, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } from './util/';
+export { safelyGet, safeRequire, loadModule, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, isTypeScriptEnvironment, } from './util/';
 export { extend } from './util/extend';
 export * from './util/webRouterParam';
 export * from './util/contextUtil';

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.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.Utils = exports.sleep = exports.retryWith = exports.retryWithAsync = exports.extend = 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.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = 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.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.Utils = exports.sleep = exports.retryWith = exports.retryWithAsync = exports.extend = 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.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = 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");
@@ -84,6 +84,7 @@ Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: tru
 Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
 Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
 Object.defineProperty(exports, "wrapAsync", { enumerable: true, get: function () { return util_1.wrapAsync; } });
+Object.defineProperty(exports, "isTypeScriptEnvironment", { enumerable: true, get: function () { return util_1.isTypeScriptEnvironment; } });
 var extend_1 = require("./util/extend");
 Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 __exportStar(require("./util/webRouterParam"), exports);

package/dist/interface.d.ts

@@ -619,8 +619,8 @@ export interface IInformationService {
 }
 export interface IEnvironmentService {
     getCurrentEnvironment(): string;
-    setCurrentEnvironment(environment: string): any;
     isDevelopmentEnvironment(): boolean;
+    getModuleLoadType(): ModuleLoadType;
 }
 export declare enum MidwayProcessTypeEnum {
     APPLICATION = "APPLICATION",
@@ -799,6 +799,7 @@ export interface IMidwayBaseApplication<CTX extends IMidwayContext> {
     getNamespace(): string;
 }
 export type IMidwayApplication<T extends IMidwayContext = IMidwayContext, FrameworkApplication = unknown> = IMidwayBaseApplication<T> & FrameworkApplication;
+export type ModuleLoadType = 'commonjs' | 'esm';
 export interface IMidwayBootstrapOptions {
     [customPropertyKey: string]: any;
     baseDir?: string;
@@ -810,6 +811,7 @@ export interface IMidwayBootstrapOptions {
      */
     configurationModule?: any | any[];
     imports?: any | any[];
+    moduleLoadType?: ModuleLoadType;
     moduleDetector?: IFileDetector | false;
     logger?: boolean | ILogger;
     /**

package/dist/service/environmentService.d.ts

@@ -1,8 +1,11 @@
-import { IEnvironmentService } from '../interface';
+import { IEnvironmentService, ModuleLoadType } from '../interface';
 export declare class MidwayEnvironmentService implements IEnvironmentService {
     protected environment: string;
+    protected moduleLoadType: ModuleLoadType;
     getCurrentEnvironment(): string;
     setCurrentEnvironment(environment: string): void;
     isDevelopmentEnvironment(): boolean;
+    setModuleLoadType(moduleLoadType: ModuleLoadType): void;
+    getModuleLoadType(): ModuleLoadType;
 }
 //# sourceMappingURL=environmentService.d.ts.map

package/dist/service/environmentService.js

@@ -11,6 +11,9 @@ const interface_1 = require("../interface");
 const util_1 = require("../util");
 const decorator_1 = require("../decorator");
 let MidwayEnvironmentService = class MidwayEnvironmentService {
+    constructor() {
+        this.moduleLoadType = 'commonjs';
+    }
     getCurrentEnvironment() {
         if (!this.environment) {
             this.environment = (0, util_1.getCurrentEnvironment)();
@@ -23,6 +26,12 @@ let MidwayEnvironmentService = class MidwayEnvironmentService {
     isDevelopmentEnvironment() {
         return (0, util_1.isDevelopmentEnvironment)(this.environment);
     }
+    setModuleLoadType(moduleLoadType) {
+        this.moduleLoadType = moduleLoadType;
+    }
+    getModuleLoadType() {
+        return this.moduleLoadType;
+    }
 };
 MidwayEnvironmentService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/service/informationService.js

@@ -14,13 +14,23 @@ const interface_1 = require("../interface");
 const util_1 = require("../util");
 const path_1 = require("path");
 const decorator_1 = require("../decorator");
+const fs_1 = require("fs");
 let MidwayInformationService = class MidwayInformationService {
     init() {
         if (this.baseDir) {
             if (!this.appDir) {
                 this.appDir = (0, path_1.dirname)(this.baseDir);
             }
-            this.pkg = (0, util_1.safeRequire)((0, path_1.join)(this.appDir, 'package.json')) || {};
+            const pkgPath = (0, path_1.join)(this.appDir, 'package.json');
+            if ((0, fs_1.existsSync)(pkgPath)) {
+                const content = (0, fs_1.readFileSync)(pkgPath, {
+                    encoding: 'utf-8',
+                });
+                this.pkg = JSON.parse(content);
+            }
+            else {
+                this.pkg = {};
+            }
         }
         else {
             this.pkg = {};

package/dist/setup.js

@@ -88,29 +88,28 @@ async function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
     debug('[core]: set default file detector');
+    if (!globalOptions.moduleLoadType) {
+        globalOptions.moduleLoadType = 'commonjs';
+    }
     // set module detector
     if (globalOptions.moduleDetector !== false) {
-        const pkgJSON = await (0, _1.loadModule)((0, path_1.join)(appDir, 'package.json'), {
-            safeLoad: true,
-            enableCache: false,
-        });
-        const loadMode = (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
-        debug('[core]: module load mode = %s', loadMode);
+        debug('[core]: set module load type = %s', globalOptions.moduleLoadType);
         // set default entry file
         if (!globalOptions.imports) {
             globalOptions.imports = [
-                await (0, _1.loadModule)((0, path_1.join)(baseDir, 'configuration'), {
-                    loadMode,
+                await (0, _1.loadModule)((0, path_1.join)(baseDir, `configuration${(0, _1.isTypeScriptEnvironment)() ? '.ts' : '.js'}`), {
+                    loadMode: globalOptions.moduleLoadType,
                     safeLoad: true,
                 }),
             ];
         }
         if (globalOptions.moduleDetector === undefined) {
-            if (loadMode === 'esm') {
+            if (globalOptions.moduleLoadType === 'esm') {
                 applicationContext.setFileDetector(new _1.ESModuleFileDetector({
                     loadDir: baseDir,
                     ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
                 }));
+                globalOptions.moduleLoadType = 'esm';
             }
             else {
                 applicationContext.setFileDetector(new _1.CommonJSFileDetector({
@@ -230,6 +229,9 @@ function prepareGlobalApplicationContextSync(globalOptions) {
         }
     }
     printStepDebugInfo('Init MidwayConfigService, MidwayAspectService and MidwayDecoratorService');
+    // init default environment
+    const environmentService = applicationContext.get(_1.MidwayEnvironmentService);
+    environmentService.setModuleLoadType(globalOptions.moduleLoadType);
     // init default config
     const configService = applicationContext.get(_1.MidwayConfigService);
     configService.add([

package/dist/util/httpclient.js

@@ -23,10 +23,10 @@ async function makeHttpRequest(url, options = {}) {
     const whatwgUrl = new URL(url);
     const client = whatwgUrl.protocol === 'https:' ? https : http;
     options.method = (options.method || 'GET').toUpperCase();
-    const { contentType, dataType, method, timeout = 5000, ...otherOptions } = options;
+    const { contentType, dataType, method, timeout = 5000, headers: customHeaders, ...otherOptions } = options;
     const headers = {
         Accept: mimeMap[dataType] || mimeMap.octet,
-        ...options.headers,
+        ...customHeaders,
     };
     let data;
     if (method === 'GET' && options.data) {

package/dist/util/index.d.ts

@@ -122,6 +122,7 @@ export declare function getParamNames(func: any): string[];
 export declare function generateRandomId(): string;
 export declare function merge(target: any, src: any): any;
 export declare function toAsyncFunction<T extends (...args: any[]) => any>(method: T): (...args: Parameters<T>) => Promise<ReturnType<T>>;
+export declare function isTypeScriptEnvironment(): boolean;
 export declare const Utils: {
     sleep: typeof sleep;
     getParamNames: typeof getParamNames;
@@ -132,5 +133,6 @@ export declare const Utils: {
     toAsyncFunction: typeof toAsyncFunction;
     safeStringify: typeof safeStringify;
     safeParse: typeof safeParse;
+    isTypeScriptEnvironment: typeof isTypeScriptEnvironment;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = 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.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.Utils = 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.loadModule = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -74,7 +74,15 @@ const loadModule = async (p, options = {}) => {
                 return require(p);
             }
             else {
-                return await import(p);
+                // if json file, import need add options
+                if (p.endsWith('.json')) {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    return (await import(p, { assert: { type: 'json' } })).default;
+                }
+                else {
+                    return await import(p);
+                }
             }
         }
         else {
@@ -467,6 +475,15 @@ function toAsyncFunction(method) {
     }
 }
 exports.toAsyncFunction = toAsyncFunction;
+function isTypeScriptEnvironment() {
+    const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
+    if ('false' === TS_MODE_PROCESS_FLAG) {
+        return false;
+    }
+    // eslint-disable-next-line node/no-deprecated-api
+    return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
+}
+exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 exports.Utils = {
     sleep,
     getParamNames,
@@ -477,5 +494,6 @@ exports.Utils = {
     toAsyncFunction,
     safeStringify: flatted_1.safeStringify,
     safeParse: flatted_1.safeParse,
+    isTypeScriptEnvironment,
 };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.12.0-beta.1",
+  "version": "3.12.0-beta.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",