oak-domain 5.1.29 → 5.1.30

package/lib/compiler/schemalBuilder.d.ts

@@ -13,7 +13,7 @@ declare const Schema: Record<string, {
     inModi: boolean;
     relations: false | string[];
     extendsFrom: string[];
-    importAttrFrom: Record<string, [string, string | undefined]>;
+    importAttrFrom: Record<string, [string, string | undefined, string, string]>;
 }>;
 export declare function constructAttributes(entity: string): ts.PropertyAssignment[];
 export declare function translateLocaleObject(locale: ts.ObjectLiteralExpression): Record<string, any>;

package/lib/compiler/schemalBuilder.js

@@ -219,6 +219,43 @@ function addImportedFrom(moduleName, name, node) {
         });
     }
 }
+/**
+ * 计算编译后文件的正确导入路径
+ * @param sourceFilePath 源文件路径（相对于项目根目录），例如: 'src/entities/User.ts'
+ * @param outputFilePath 输出文件路径（相对于项目根目录），例如: 'src/oak-app-domain/User/_baseschema.ts'
+ * @param importPath 原始导入路径，例如: '../types/Config' 或 '@/utils/helper'
+ * @param projectRoot 项目根目录，默认为当前目录
+ * @returns 新的相对导入路径
+ */
+function resolveCompiledImportPath(sourceFilePath, outputFilePath, importPath, projectRoot = '.', relative) {
+    // 如果不是相对路径（例如 node_modules 的包或别名路径），直接返回
+    if (!importPath.startsWith('.')) {
+        return importPath;
+    }
+    if (sourceFilePath.startsWith("node_modules")) {
+        // 如果是node_modules下的文件，保持原有的处理逻辑
+        return importPath.startsWith('.') ? (relative
+            ? path_1.default.join(relative, importPath).replace(/\\/g, '/')
+            : path_1.default.join('..', importPath).replace(/\\/g, '/')) : importPath;
+    }
+    // 1. 获取源文件所在目录
+    const sourceDir = path_1.default.dirname(sourceFilePath);
+    // 2. 解析原始导入路径，得到目标文件的绝对路径（相对于项目根目录）
+    const targetAbsolutePath = path_1.default.join(projectRoot, sourceDir, importPath);
+    const normalizedTargetPath = path_1.default.normalize(targetAbsolutePath);
+    // 3. 获取输出文件所在目录
+    const outputDir = path_1.default.dirname(outputFilePath);
+    const normalizedOutputDir = path_1.default.normalize(path_1.default.join(projectRoot, outputDir));
+    // 4. 计算从输出目录到目标文件的相对路径
+    let relativePath = path_1.default.relative(normalizedOutputDir, normalizedTargetPath);
+    // 5. 标准化路径分隔符为 '/'
+    relativePath = relativePath.replace(/\\/g, '/');
+    // 6. 确保相对路径以 './' 或 '../' 开头
+    if (!relativePath.startsWith('.')) {
+        relativePath = './' + relativePath;
+    }
+    return relativePath;
+}
 function analyzeExternalAttrImport(node, program, importAttrFrom, relativePath) {
     const checker = program.getTypeChecker();
     const symbol = checker.getSymbolAtLocation(node.typeName);
@@ -240,11 +277,19 @@ function analyzeExternalAttrImport(node, program, importAttrFrom, relativePath)
         (0, assert_1.default)(importSpecifier, `未找到${name}的importSpecifier`);
         const propertyName = importSpecifier.propertyName && importSpecifier.propertyName.text;
         const importFrom = moduleSpecifier.text;
-        const importFromRelatively = importFrom.startsWith('.') ? (relativePath
-            ? path_1.default.join(relativePath, importFrom).replace(/\\/g, '/')
-            : path_1.default.join('..', importFrom).replace(/\\/g, '/')) : importFrom;
+        // const importFromRelatively = importFrom.startsWith('.') ? (relativePath
+        //     ? PathLib.join(
+        //         relativePath,
+        //         importFrom
+        //     ).replace(/\\/g, '/')
+        //     : PathLib.join(
+        //         '..',
+        //         importFrom
+        //     ).replace(/\\/g, '/')) : importFrom;
+        const sourceFilePath = declaration.getSourceFile().fileName;
         (0, lodash_1.assign)(importAttrFrom, {
-            [name]: [importFromRelatively, propertyName],
+            // [name]: [importFromRelatively, propertyName],
+            [name]: [importFrom, propertyName, sourceFilePath, relativePath],
         });
     }
     else if (ts.isTypeAliasDeclaration(declaration)) {
@@ -3759,12 +3804,30 @@ function _outputBaseSchema(outputDir, printer) {
         // 从外部引入的属性
         const fromExternalImportAttrs = {};
         for (const attr in importAttrFrom) {
-            const [from, propertyName] = importAttrFrom[attr];
-            if (fromExternalImportAttrs[from]) {
-                fromExternalImportAttrs[from].push([attr, propertyName]);
+            // const [from, propertyName] = importAttrFrom[attr];
+            // if (fromExternalImportAttrs[from]) {
+            //     fromExternalImportAttrs[from].push([attr, propertyName]);
+            // }
+            // else {
+            //     fromExternalImportAttrs[from] = [[attr, propertyName]];
+            // }
+            const [from, propertyName, sourceFilePath, relative] = importAttrFrom[attr];
+            // ===== 在这里进行路径转换 =====
+            const outputFilePath = path_1.default.join(outputDir, entity, '_baseSchema.ts'); // 输出文件路径
+            // 使用路径解析算法计算新的导入路径
+            const newImportPath = resolveCompiledImportPath(path_1.default.relative(process.cwd(), sourceFilePath), path_1.default.relative(process.cwd(), outputFilePath), from, // 原始导入路径
+            ".", relative);
+            // console.log('resolve import path:', {
+            //     sourceFilePath: PathLib.relative(process.cwd(), sourceFilePath),
+            //     outputFilePath: PathLib.relative(process.cwd(), outputFilePath),
+            //     from,
+            //     newImportPath,
+            // });
+            if (fromExternalImportAttrs[newImportPath]) {
+                fromExternalImportAttrs[newImportPath].push([attr, propertyName]);
             }
             else {
-                fromExternalImportAttrs[from] = [[attr, propertyName]];
+                fromExternalImportAttrs[newImportPath] = [[attr, propertyName]];
             }
         }
         for (const external in fromExternalImportAttrs) {

package/lib/store/RelationAuth.js

@@ -1120,12 +1120,12 @@ class RelationAuth {
             if (result instanceof Promise) {
                 return result.then((r) => {
                     if (!r) {
-                        throw new types_1.OakDataInvisibleException(entity, operation);
+                        throw new types_1.OakDataInvisibleException(entity, operation, context.getCurrentUserId());
                     }
                 });
             }
             if (!result) {
-                throw new types_1.OakDataInvisibleException(entity, operation);
+                throw new types_1.OakDataInvisibleException(entity, operation, context.getCurrentUserId());
             }
         }
         else {
@@ -1133,12 +1133,12 @@ class RelationAuth {
             if (result instanceof Promise) {
                 return result.then((r) => {
                     if (!r) {
-                        throw new types_1.OakOperationUnpermittedException(entity, operation);
+                        throw new types_1.OakOperationUnpermittedException(entity, operation, context.getCurrentUserId());
                     }
                 });
             }
             if (!result) {
-                throw new types_1.OakOperationUnpermittedException(entity, operation);
+                throw new types_1.OakOperationUnpermittedException(entity, operation, context.getCurrentUserId());
             }
         }
     }

package/lib/types/Configuration.d.ts

@@ -56,6 +56,7 @@ export type ServerConfiguration = {
     socket?: (ctx: Koa.ParameterizedContext<any, KoaRouter.IRouterParamContext<any, {}>, any>) => {
         url: string;
     } | undefined;
+    middleware?: Koa.Middleware[] | ((app: Koa<Koa.DefaultState, Koa.DefaultContext>) => Koa.Middleware[]);
 };
 /**
  * 前后台访问配置

package/lib/types/Exception.d.ts

@@ -121,7 +121,8 @@ export declare class OakAttrCantUpdateException<ED extends EntityDict & BaseEnti
 export declare class OakOperationUnpermittedException<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakUserException<ED> {
     private entity;
     private operation;
-    constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], message?: string, _module?: string, params?: Record<string, any>);
+    private userId?;
+    constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], userId?: string, message?: string, _module?: string, params?: Record<string, any>);
     toString(): string;
 }
 /**
@@ -130,7 +131,8 @@ export declare class OakOperationUnpermittedException<ED extends EntityDict & Ba
 export declare class OakDataInvisibleException<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakUserException<ED> {
     private entity;
     private operation;
-    constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], message?: string, _module?: string, params?: Record<string, any>);
+    private userId?;
+    constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], userId?: string, message?: string, _module?: string, params?: Record<string, any>);
     toString(): string;
 }
 /**

package/lib/types/Exception.js

@@ -227,6 +227,7 @@ class OakInputIllegalException extends OakUserException {
     entity;
     constructor(entity, attributes, message, _module, params) {
         super(message, _module, params || {
+            entity,
             attributes: attributes.join(','),
         });
         this.entity = entity;
@@ -276,10 +277,12 @@ exports.OakAttrCantUpdateException = OakAttrCantUpdateException;
 class OakOperationUnpermittedException extends OakUserException {
     entity;
     operation;
-    constructor(entity, operation, message, _module, params) {
+    userId;
+    constructor(entity, operation, userId, message, _module, params) {
         super(message || 'error::operationUnpermitted', _module || 'oak-domain', params);
         this.entity = entity;
         this.operation = operation;
+        this.userId = userId;
     }
     toString() {
         const data = super.getSerialData();
@@ -287,6 +290,7 @@ class OakOperationUnpermittedException extends OakUserException {
             ...data,
             entity: this.entity,
             operation: this.operation,
+            userId: this.userId,
         });
     }
 }
@@ -298,10 +302,12 @@ exports.OakOperationUnpermittedException = OakOperationUnpermittedException;
 class OakDataInvisibleException extends OakUserException {
     entity;
     operation;
-    constructor(entity, operation, message, _module, params) {
+    userId;
+    constructor(entity, operation, userId, message, _module, params) {
         super(message || 'error::dataInvisible', _module || 'oak-domain', params);
         this.entity = entity;
         this.operation = operation;
+        this.userId = userId;
     }
     toString() {
         const data = super.getSerialData();
@@ -309,6 +315,7 @@ class OakDataInvisibleException extends OakUserException {
             ...data,
             entity: this.entity,
             operation: this.operation,
+            userId: this.userId,
         });
     }
 }
@@ -457,11 +464,11 @@ function makeException(data) {
             break;
         }
         case 'OakOperationUnpermittedException': {
-            e = new OakOperationUnpermittedException(data.entity, data.operation, message, _module, params);
+            e = new OakOperationUnpermittedException(data.entity, data.operation, data.userId, message, _module, params);
             break;
         }
         case 'OakDataInvisibleException': {
-            e = new OakDataInvisibleException(data.entity, data.operation, message, _module, params);
+            e = new OakDataInvisibleException(data.entity, data.operation, data.userId, message, _module, params);
             break;
         }
         case 'OakUnloggedInException': {

package/lib/utils/geo.d.ts

@@ -1,5 +1,5 @@
 /**
- * 计算地球上两点之间的球面距离
+ * 计算地球上两点之间的球面距离（单位：cm）
  */
 export declare function getDistanceBetweenPoints(lat1: number, lon1: number, lat2: number, lon2: number): number;
 /**

package/lib/utils/geo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gcj02towgs84 = exports.wgs84togcj02 = exports.gcj02tobd09 = exports.bd09togcj02 = exports.getDistanceBetweenPoints = void 0;
 /**
- * 计算地球上两点之间的球面距离
+ * 计算地球上两点之间的球面距离（单位：cm）
  */
 function getDistanceBetweenPoints(lat1, lon1, lat2, lon2) {
     // 转为弧度

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.29",
+    "version": "5.1.30",
     "author": {
         "name": "XuChang"
     },