@fastcar/core 0.2.54 → 0.2.56

package/annotation.d.ts

@@ -158,3 +158,6 @@ export function AliasInjection(alias: string): PMRet;
 
 //自定义资源路径
 export function ResourcePath(name: string): Ret;
+
+//自定义类型
+export function CustomType(name: string): PMRet;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.2.54",
+	"version": "0.2.56",
 	"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.ts

@@ -48,6 +48,7 @@ import ApplicationSetting from "./annotation/env/ApplicationSetting";
 import AliasInjection from "./annotation/bind/AliasInjection";
 import ResourcePath from "./annotation/env/ResourcePath";
 import BaseName from "./annotation/env/BaseName";
+import CustomType from "./annotation/valid/CustomType";
 
 //注解暴露出去
 export {
@@ -87,6 +88,7 @@ export {
 	ValidForm,
 	Rule,
 	ResourcePath,
+	CustomType,
 };
 
 export {

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.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApplicationSetting = exports.BaseName = exports.BasePath = exports.BaseFilePath = exports.ENV = exports.Transactional = exports.SqlSession = exports.Entity = exports.Table = exports.PrimaryKey = exports.Field = exports.DBType = exports.DSIndex = exports.DS = exports.ResourcePath = exports.Rule = exports.ValidForm = exports.ValidCustom = exports.Type = exports.Size = exports.NotNull = exports.DefaultVal = exports.AddChildValid = exports.AddRequireModule = exports.Log = exports.Readonly = exports.Override = exports.NotImplemented = exports.Deprecate = exports.ExceptionMonitor = exports.AliasInjection = exports.CallDependency = exports.Autowired = exports.Application = exports.Injection = exports.Repository = exports.Service = exports.Controller = exports.Configure = exports.BeanName = exports.Hotter = exports.ComponentInjection = exports.Component = exports.ComponentScanExclusion = exports.ComponentScan = exports.ApplicationDestory = exports.ApplicationInit = exports.ApplicationRunner = exports.ApplicationStop = exports.ApplicationStart = void 0;
+exports.BaseName = exports.BasePath = exports.BaseFilePath = exports.ENV = exports.Transactional = exports.SqlSession = exports.Entity = exports.Table = exports.PrimaryKey = exports.Field = exports.DBType = exports.DSIndex = exports.DS = exports.CustomType = exports.ResourcePath = exports.Rule = exports.ValidForm = exports.ValidCustom = exports.Type = exports.Size = exports.NotNull = exports.DefaultVal = exports.AddChildValid = exports.AddRequireModule = exports.Log = exports.Readonly = exports.Override = exports.NotImplemented = exports.Deprecate = exports.ExceptionMonitor = exports.AliasInjection = exports.CallDependency = exports.Autowired = exports.Application = exports.Injection = exports.Repository = exports.Service = exports.Controller = exports.Configure = exports.BeanName = exports.Hotter = exports.ComponentInjection = exports.Component = exports.ComponentScanExclusion = exports.ComponentScan = exports.ApplicationDestory = exports.ApplicationInit = exports.ApplicationRunner = exports.ApplicationStop = exports.ApplicationStart = void 0;
+exports.ApplicationSetting = void 0;
 const Application_1 = require("./annotation/Application");
 exports.Application = Application_1.default;
 const Autowired_1 = require("./annotation/bind/Autowired");
@@ -101,3 +102,5 @@ const ResourcePath_1 = require("./annotation/env/ResourcePath");
 exports.ResourcePath = ResourcePath_1.default;
 const BaseName_1 = require("./annotation/env/BaseName");
 exports.BaseName = BaseName_1.default;
+const CustomType_1 = require("./annotation/valid/CustomType");
+exports.CustomType = CustomType_1.default;