@fastcar/core 0.2.55 → 0.2.57

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.2.55",
+	"version": "0.2.57",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",

package/src/FastCarApplication.ts

@@ -268,7 +268,9 @@ class FastCarApplication extends Events {
 			});
 		}
 
+		let includeFinalList: string[] = [...tmpFilePath];
 		let filePathList = FileUtil.getFilePathList(this.basePath);
+
 		filePathList = tmpFilePath.concat(filePathList);
 		filePathList = [...new Set(filePathList)];
 
@@ -286,6 +288,9 @@ class FastCarApplication extends Events {
 			});
 
 			filePathList = filePathList.filter((item) => {
+				if (includeFinalList.includes(item)) {
+					return true;
+				}
 				return !excludAllPath.includes(item);
 			});
 		}
@@ -551,7 +556,7 @@ class FastCarApplication extends Events {
 	 */
 	init() {
 		//加载配置
-		this.basePath = (Reflect.get(this, CommonConstant.BasePath) || require.main?.path || module.path) as string;
+		this.basePath = (Reflect.get(this, CommonConstant.BasePath) || require.main?.path || module.path || process.cwd()) as string;
 		this.baseFileName = (Reflect.get(this, CommonConstant.BaseFileName) || require.main?.filename || module.filename) as string;
 
 		this.beforeStartServer();

package/src/annotation/scan/ComponentInjection.ts

@@ -8,7 +8,7 @@ export default function ComponentInjection(target: any, ...names: string[]) {
 
 	for (let name of names) {
 		//可支持绝对路径
-		let p = path.join(require.main?.path || "", name);
+		let p = path.join(require.main?.path || process.cwd() || "", name);
 		if (fs.existsSync(name)) {
 			p = name;
 		}

package/src/annotation/scan/ComponentScanExclusion.ts

@@ -11,7 +11,7 @@ export default function ComponentScanExclusion(...names: string[]) {
 
 		for (let name of names) {
 			//可支持绝对路径
-			let p = path.join(require.main?.path || "", name);
+			let p = path.join(require.main?.path || process.cwd() || "", name);
 			if (fs.existsSync(name)) {
 				p = name;
 			}

package/src/annotation/stereotype/Log.ts

@@ -10,7 +10,7 @@ export default function Log(category?: string) {
 		Reflect.defineProperty(target, propertyKey, {
 			get: (): Logger => {
 				let app: ApplicationInterface = Reflect.get(global, CommonConstant.FastcarApp);
-				let appid = app.getSetting(CommonConstant.APPId) || ""; //进行差异化区分
+				let appid = app?.getSetting(CommonConstant.APPId) || ""; //进行差异化区分
 				return app ? app.getLogger(appid ? `${appid}.${m}` : m) : console;
 			},
 		});

package/target/FastCarApplication.js

@@ -226,6 +226,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
                 tmpFilePath = tmpFilePath.concat(tmpList);
             });
         }
+        let includeFinalList = [...tmpFilePath];
         let filePathList = FileUtil_1.default.getFilePathList(this.basePath);
         filePathList = tmpFilePath.concat(filePathList);
         filePathList = [...new Set(filePathList)];
@@ -240,6 +241,9 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
                 excludAllPath = [...excludAllPath, ...exlist];
             });
             filePathList = filePathList.filter((item) => {
+                if (includeFinalList.includes(item)) {
+                    return true;
+                }
                 return !excludAllPath.includes(item);
             });
         }
@@ -475,7 +479,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
      */
     init() {
         //加载配置
-        this.basePath = (Reflect.get(this, CommonConstant_1.CommonConstant.BasePath) || require.main?.path || module.path);
+        this.basePath = (Reflect.get(this, CommonConstant_1.CommonConstant.BasePath) || require.main?.path || module.path || process.cwd());
         this.baseFileName = (Reflect.get(this, CommonConstant_1.CommonConstant.BaseFileName) || require.main?.filename || module.filename);
         this.beforeStartServer();
         this.startServer();

package/target/annotation/scan/ComponentInjection.js

@@ -8,7 +8,7 @@ function ComponentInjection(target, ...names) {
     let list = Reflect.get(target.prototype, ScanPathList) || [];
     for (let name of names) {
         //可支持绝对路径
-        let p = path.join(require.main?.path || "", name);
+        let p = path.join(require.main?.path || process.cwd() || "", name);
         if (fs.existsSync(name)) {
             p = name;
         }

package/target/annotation/scan/ComponentScanExclusion.js

@@ -11,7 +11,7 @@ function ComponentScanExclusion(...names) {
         let list = Reflect.get(target.prototype, ScanPathList) || [];
         for (let name of names) {
             //可支持绝对路径
-            let p = path.join(require.main?.path || "", name);
+            let p = path.join(require.main?.path || process.cwd() || "", name);
             if (fs.existsSync(name)) {
                 p = name;
             }

package/target/annotation/stereotype/Log.js

@@ -8,7 +8,7 @@ function Log(category) {
         Reflect.defineProperty(target, propertyKey, {
             get: () => {
                 let app = Reflect.get(global, CommonConstant_1.CommonConstant.FastcarApp);
-                let appid = app.getSetting(CommonConstant_1.CommonConstant.APPId) || ""; //进行差异化区分
+                let appid = app?.getSetting(CommonConstant_1.CommonConstant.APPId) || ""; //进行差异化区分
                 return app ? app.getLogger(appid ? `${appid}.${m}` : m) : console;
             },
         });