@midwayjs/core 3.12.1 → 3.12.3

package/dist/common/dataSourceManager.d.ts

@@ -1,9 +1,12 @@
 import { ModuleLoadType, DataSourceManagerConfigOption } from '../interface';
+import { MidwayEnvironmentService } from '../service/environmentService';
 export declare abstract class DataSourceManager<T, ConnectionOpts extends Record<string, any> = Record<string, any>> {
     protected dataSource: Map<string, T>;
     protected options: DataSourceManagerConfigOption<ConnectionOpts>;
     protected modelMapping: WeakMap<object, any>;
     private innerDefaultDataSourceName;
+    appDir: string;
+    environmentService: MidwayEnvironmentService;
     protected initDataSource(dataSourceConfig: DataSourceManagerConfigOption<ConnectionOpts>, baseDirOrOptions: {
         baseDir: string;
         entitiesConfigKey?: string;

package/dist/common/dataSourceManager.js

@@ -1,4 +1,13 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.globModels = exports.formatGlobString = exports.DataSourceManager = void 0;
 /**
@@ -12,6 +21,8 @@ const types_1 = require("../util/types");
 const constants_1 = require("../constants");
 const util_1 = require("util");
 const util_2 = require("../util");
+const decorator_1 = require("../decorator");
+const environmentService_1 = require("../service/environmentService");
 const debug = (0, util_1.debuglog)('midway:debug');
 class DataSourceManager {
     constructor() {
@@ -20,6 +31,7 @@ class DataSourceManager {
         this.modelMapping = new WeakMap();
     }
     async initDataSource(dataSourceConfig, baseDirOrOptions) {
+        var _a;
         this.options = dataSourceConfig;
         if (!this.options.dataSource) {
             throw new error_1.MidwayParameterError('[DataSourceManager] must set options.dataSource.');
@@ -39,7 +51,7 @@ class DataSourceManager {
                 for (const entity of userEntities) {
                     if (typeof entity === 'string') {
                         // string will be glob file
-                        const models = await globModels(entity, baseDirOrOptions.baseDir);
+                        const models = await globModels(entity, baseDirOrOptions.baseDir, (_a = this.environmentService) === null || _a === void 0 ? void 0 : _a.getModuleLoadType());
                         for (const model of models) {
                             entities.add(model);
                             this.modelMapping.set(model, dataSourceName);
@@ -141,6 +153,14 @@ class DataSourceManager {
         return this.innerDefaultDataSourceName;
     }
 }
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", String)
+], DataSourceManager.prototype, "appDir", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", environmentService_1.MidwayEnvironmentService)
+], DataSourceManager.prototype, "environmentService", void 0);
 exports.DataSourceManager = DataSourceManager;
 function formatGlobString(globString) {
     let pattern;

package/dist/setup.d.ts

@@ -9,10 +9,10 @@ export declare function destroyGlobalApplicationContext(applicationContext: IMid
  * prepare applicationContext
  * @param globalOptions
  */
-export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
+export declare function prepareGlobalApplicationContextAsync(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
 /**
- * prepare applicationContext, it use in egg framework.
+ * prepare applicationContext, it use in egg framework, hooks and serverless function generator
  * @param globalOptions
  */
-export declare function prepareGlobalApplicationContextSync(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
+export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareGlobalApplicationContextSync = exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
+exports.prepareGlobalApplicationContext = exports.prepareGlobalApplicationContextAsync = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
 const _1 = require("./");
 const config_default_1 = require("./config/config.default");
 const decorator_1 = require("./decorator");
@@ -17,7 +17,7 @@ function printStepDebugInfo(stepInfo) {
  * @param globalOptions
  */
 async function initializeGlobalApplicationContext(globalOptions) {
-    const applicationContext = await prepareGlobalApplicationContext(globalOptions);
+    const applicationContext = await prepareGlobalApplicationContextAsync(globalOptions);
     printStepDebugInfo('Init logger');
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
@@ -71,7 +71,7 @@ exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
  * prepare applicationContext
  * @param globalOptions
  */
-async function prepareGlobalApplicationContext(globalOptions) {
+async function prepareGlobalApplicationContextAsync(globalOptions) {
     var _a, _b, _c, _d, _e;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -142,6 +142,9 @@ async function prepareGlobalApplicationContext(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([
@@ -174,12 +177,12 @@ async function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
     return applicationContext;
 }
-exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
+exports.prepareGlobalApplicationContextAsync = prepareGlobalApplicationContextAsync;
 /**
- * prepare applicationContext, it use in egg framework.
+ * prepare applicationContext, it use in egg framework, hooks and serverless function generator
  * @param globalOptions
  */
-function prepareGlobalApplicationContextSync(globalOptions) {
+function prepareGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -196,6 +199,9 @@ function prepareGlobalApplicationContextSync(globalOptions) {
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
     printStepDebugInfo('Ready module detector');
+    if (!globalOptions.moduleLoadType) {
+        globalOptions.moduleLoadType = 'commonjs';
+    }
     if (globalOptions.moduleDetector !== false) {
         if (globalOptions.moduleDetector === undefined) {
             applicationContext.setFileDetector(new _1.CommonJSFileDetector({
@@ -269,5 +275,5 @@ function prepareGlobalApplicationContextSync(globalOptions) {
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
     return applicationContext;
 }
-exports.prepareGlobalApplicationContextSync = prepareGlobalApplicationContextSync;
+exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
 //# sourceMappingURL=setup.js.map

package/dist/util/index.js

@@ -12,6 +12,7 @@ const uuid_1 = require("./uuid");
 const flatted_1 = require("./flatted");
 const crypto = require("crypto");
 const types_1 = require("./types");
+const url_1 = require("url");
 const debug = (0, util_1.debuglog)('midway:debug');
 /**
  * @since 2.0.0
@@ -69,6 +70,7 @@ const loadModule = async (p, options = {}) => {
     if (p.startsWith(`.${path_1.sep}`) || p.startsWith(`..${path_1.sep}`)) {
         p = (0, path_1.resolve)((0, path_1.dirname)(module.parent.filename), p);
     }
+    debug(`[core]: load module ${p}, cache: ${options.enableCache}, mode: ${options.loadMode}, safeLoad: ${options.safeLoad}`);
     try {
         if (options.enableCache) {
             if (options.loadMode === 'commonjs') {
@@ -91,7 +93,7 @@ const loadModule = async (p, options = {}) => {
                     return innerLoadModuleCache[p];
                 }
                 else {
-                    return await import(p);
+                    return await import((0, url_1.pathToFileURL)(p).href);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.12.1",
+  "version": "3.12.3",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "48413b87b12354cb8207de6aa58e0a4ca22ea000"
+  "gitHead": "0b6638726c4722d5a6ee8075fea0a0b68378452c"
 }