fix: add file extension

artusjs · Dec 20, 2023 · b88807b · b88807b
1 parent 89a4bac
commit b88807b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/configuration/index.ts b/src/configuration/index.ts
@@ -44,7 +44,7 @@ export default class ConfigurationHandler {
   }
 
   async setConfigByFile(fileItem: ManifestItem) {
-    const configContent: ConfigObject = await compatibleRequire(fileItem.path);
+    const configContent: ConfigObject = await compatibleRequire(fileItem.path + fileItem.extname);
     if (configContent) {
       const env = ConfigurationHandler.getEnvFromFilename(fileItem.filename);
       this.setConfig(env, configContent);

diff --git a/src/loader/impl/config.ts b/src/loader/impl/config.ts
@@ -56,7 +56,7 @@ class ConfigLoader implements Loader {
   }
 
   protected async loadConfigFile(item: ManifestItem): Promise<Record<string, any>> {
-    const originConfigObj = await compatibleRequire(item.path);
+    const originConfigObj = await compatibleRequire(item.path + item.extname);
     let configObj = originConfigObj;
     if (typeof originConfigObj === 'function') {
       const app = this.container.get(ArtusInjectEnum.Application);

diff --git a/src/loader/impl/lifecycle.ts b/src/loader/impl/lifecycle.ts
@@ -18,7 +18,7 @@ class LifecycleLoader implements Loader {
   }
 
   async load(item: ManifestItem) {
-    const origin: Constructable<ApplicationLifecycle>[] = await compatibleRequire(item.path, true);
+    const origin: Constructable<ApplicationLifecycle>[] = await compatibleRequire(item.path + item.extname, true);
     item.loaderState = Object.assign({ exportNames: ['default'] }, item.loaderState);
     const { loaderState: state } = item as { loaderState: { exportNames: string[] } };
 

diff --git a/src/loader/impl/module.ts b/src/loader/impl/module.ts
@@ -13,7 +13,7 @@ class ModuleLoader implements Loader {
   }
 
   async load(item: ManifestItem): Promise<Constructable[]> {
-    const origin = await compatibleRequire(item.path, true);
+    const origin = await compatibleRequire(item.path + item.extname, true);
     item.loaderState = Object.assign({ exportNames: ['default'] }, item.loaderState);
     const { loaderState: state } = item as { loaderState: { exportNames: string[] } };
 

diff --git a/src/utils/compatible_require.ts b/src/utils/compatible_require.ts
@@ -5,9 +5,14 @@ import assert from 'assert';
  * @param path
  */
 export default async function compatibleRequire(path: string, origin = false): Promise<any> {
-  const requiredModule = await import(path);
+  if (path.endsWith('.json')) {
+    return require(path);
+  }
+  let requiredModule = await import(path);
 
   assert(requiredModule, `module '${path}' exports is undefined`);
 
+  requiredModule = requiredModule.__esModule ? requiredModule.default ?? requiredModule : requiredModule;
+
   return origin ? requiredModule : (requiredModule.default || requiredModule);
 }