oak-domain 5.1.29 → 5.1.31

package/lib/compiler/dependencyBuilder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeDepedency = void 0;
+exports.analyzeDepedency = analyzeDepedency;
+exports.default = buildDependency;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const path_1 = require("path");
@@ -87,7 +88,6 @@ function analyzeDepedency(cwd) {
     } while (true);
     return depGraph;
 }
-exports.analyzeDepedency = analyzeDepedency;
 function join(...paths) {
     const path = (0, path_1.join)(...paths);
     return path.replaceAll('\\', '/');
@@ -1030,4 +1030,3 @@ function buildDependency(rebuild) {
         tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer, rebuild);
     }
 }
-exports.default = buildDependency;

package/lib/compiler/localeBuilder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Hash } from 'crypto';
 /**
  * 这个类的作用是把项目和所有相关的模块下的locales编译成为src/data/i18n中的数据

package/lib/compiler/routerBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRouter = void 0;
+exports.buildRouter = buildRouter;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -254,4 +254,3 @@ function buildRouter(projectDir, startupDir, watch) {
         watchDir(projectDir, startupDir, type);
     }
 }
-exports.buildRouter = buildRouter;

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

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSchema = exports.getProjectionKeys = exports.buildSchemaBackup = exports.analyzeEntities = exports.getAnalizedSchema = exports.registerDeducedRelationMap = exports.registerFixedDestinationPathMap = exports.registerIgnoredRelationPathMap = exports.registerFreeEntities = exports.registerIgnoredForeignKeyMap = exports.translateLocaleObject = exports.constructAttributes = void 0;
+exports.getAnalizedSchema = void 0;
+exports.constructAttributes = constructAttributes;
+exports.translateLocaleObject = translateLocaleObject;
+exports.registerIgnoredForeignKeyMap = registerIgnoredForeignKeyMap;
+exports.registerFreeEntities = registerFreeEntities;
+exports.registerIgnoredRelationPathMap = registerIgnoredRelationPathMap;
+exports.registerFixedDestinationPathMap = registerFixedDestinationPathMap;
+exports.registerDeducedRelationMap = registerDeducedRelationMap;
+exports.analyzeEntities = analyzeEntities;
+exports.buildSchemaBackup = buildSchemaBackup;
+exports.getProjectionKeys = getProjectionKeys;
+exports.buildSchema = buildSchema;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const assert_1 = tslib_1.__importDefault(require("assert"));
@@ -219,6 +230,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 +288,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 +3815,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) {
@@ -4009,7 +4083,6 @@ function constructAttributes(entity) {
     });
     return result;
 }
-exports.constructAttributes = constructAttributes;
 function translateLocaleObject(locale) {
     const result = {};
     locale.properties.forEach((ele) => {
@@ -4028,7 +4101,6 @@ function translateLocaleObject(locale) {
     });
     return result;
 }
-exports.translateLocaleObject = translateLocaleObject;
 function outputLocale(outputDir, printer) {
     const locales = {};
     const entities = [];
@@ -4303,7 +4375,6 @@ let FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES = [];
 function registerIgnoredForeignKeyMap(map) {
     IGNORED_FOREIGN_KEY_MAP = map;
 }
-exports.registerIgnoredForeignKeyMap = registerIgnoredForeignKeyMap;
 /**
  * 此函数不再使用
  * @param map
@@ -4313,7 +4384,6 @@ function registerFreeEntities(selectFreeEntities = [], createFreeEntities = [],
     CREATE_FREE_ENTITIES = createFreeEntities;
     UPDATE_FREE_ENTITIES = updateFreeEntities;
 }
-exports.registerFreeEntities = registerFreeEntities;
 /**
  * 此函数不再使用
  * @param map
@@ -4323,7 +4393,6 @@ function registerIgnoredRelationPathMap(map) {
         IGNORED_RELATION_PATH_MAP[(0, string_1.firstLetterUpperCase)(k)] = map[k];
     }
 }
-exports.registerIgnoredRelationPathMap = registerIgnoredRelationPathMap;
 /**
  * 很多路径虽然最后指向同一对象，但不能封掉，封了会导致查询的时候找不到对应的路径path
  * @param map
@@ -4341,7 +4410,6 @@ function registerFixedDestinationPathMap(map) {
         }
     }
 }
-exports.registerFixedDestinationPathMap = registerFixedDestinationPathMap;
 /**
  * 此函数不再使用
  * @param map
@@ -4360,7 +4428,6 @@ function registerDeducedRelationMap(map) {
         DEDUCED_RELATION_MAP[entity] = map[k];
     }
 }
-exports.registerDeducedRelationMap = registerDeducedRelationMap;
 /**
  * 输出所有和User相关的对象的后继
  * 此函数不再使用
@@ -4866,7 +4933,6 @@ function analyzeEntities(inputDir, relativePath) {
     analyzeInModi();
     uniqRelationships();
 }
-exports.analyzeEntities = analyzeEntities;
 function buildSchemaBackup(outputDir) {
     addReverseRelationship();
     // setRelationEntities();
@@ -4885,7 +4951,6 @@ function buildSchemaBackup(outputDir) {
         outputPackageJson(outputDir);
     }
 }
-exports.buildSchemaBackup = buildSchemaBackup;
 function _getAggrKey(entity, foreignKey) {
     const aggrKey = `${entity}$${foreignKey}`;
     if (process.env.COMPLING_AS_LIB) {
@@ -5625,7 +5690,6 @@ function getProjectionKeys(entity) {
     }
     return [...new Set([...keys, ...getOpProjectionKeys(entity)])];
 }
-exports.getProjectionKeys = getProjectionKeys;
 function _outputSchema(outputDir, printer) {
     for (const entity in Schema) {
         const statements = [
@@ -5660,4 +5724,3 @@ function buildSchema(outputDir) {
     outputStyleDict(outputDir, printer);
     outputIndexTs(outputDir);
 }
-exports.buildSchema = buildSchema;

package/lib/store/AsyncRowStore.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, Context, TxnOption, OpRecord, AggregationResult, ClusterInfo, OakException } from "../types";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { IncomingHttpHeaders } from "http";

package/lib/store/CascadeStore.d.ts

@@ -35,7 +35,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
     protected abstract aggregateAbjointRowAsync<T extends keyof ED, OP extends SelectOption, Cxt extends AsyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
     protected destructCascadeSelect<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED> | AsyncContext<ED>>(entity: T, projection2: ED[T]['Projection'], context: Cxt, cascadeSelectFn: <T2 extends keyof ED>(entity2: T2, selection: ED[T2]['Selection'], context: Cxt, op: OP) => Partial<ED[T2]['Schema']>[] | Promise<Partial<ED[T2]['Schema']>[]>, aggregateFn: <T2 extends keyof ED>(entity2: T2, aggregation: ED[T2]['Aggregation'], context: Cxt, op: OP) => AggregationResult<ED[T2]['Schema']> | Promise<AggregationResult<ED[T2]['Schema']>>, option: OP, selectionId?: string): {
         projection: ED[T]["Projection"];
-        cascadeSelectionFns: ((result: Partial<ED[T]['Schema']>[]) => Promise<void> | void)[];
+        cascadeSelectionFns: ((result: Partial<ED[T]["Schema"]>[]) => Promise<void> | void)[];
     };
     /**
      * 级联更新

package/lib/store/CascadeStore.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CascadeStore = exports.polishSelection = void 0;
+exports.CascadeStore = void 0;
+exports.polishSelection = polishSelection;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const Entity_1 = require("../types/Entity");
@@ -285,7 +286,6 @@ function polishSelection(schema, entity, selection, context, option) {
         });
     }
 }
-exports.polishSelection = polishSelection;
 /**这个用来处理级联的select和update，对不同能力的 */
 class CascadeStore extends RowStore_1.RowStore {
     constructor(storageSchema) {

package/lib/store/IntrinsicCheckers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeIntrinsicCheckers = void 0;
+exports.makeIntrinsicCheckers = makeIntrinsicCheckers;
 const tslib_1 = require("tslib");
 const types_1 = require("../types");
 const lodash_1 = require("../utils/lodash");
@@ -398,4 +398,3 @@ function makeIntrinsicCheckers(schema, actionDefDict, attrUpdateMatrix) {
     }
     return checkers;
 }
-exports.makeIntrinsicCheckers = makeIntrinsicCheckers;

package/lib/store/IntrinsicLogics.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeIntrinsicLogics = void 0;
+exports.makeIntrinsicLogics = makeIntrinsicLogics;
 const triggers_1 = require("./triggers");
 const modi_1 = require("./modi");
 const IntrinsicCheckers_1 = require("./IntrinsicCheckers");
@@ -42,4 +42,3 @@ function makeIntrinsicLogics(schema, actionDefDict, attrUpdateMatrix) {
         watchers,
     };
 }
-exports.makeIntrinsicLogics = makeIntrinsicLogics;

package/lib/store/RelationAuth.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserRelationsByActions = exports.RelationAuth = void 0;
+exports.RelationAuth = void 0;
+exports.getUserRelationsByActions = getUserRelationsByActions;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const types_1 = require("../types");
@@ -1120,12 +1121,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 +1134,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());
             }
         }
     }
@@ -1243,4 +1244,3 @@ async function getUserRelationsByActions(params, context) {
         userEntities,
     };
 }
-exports.getUserRelationsByActions = getUserRelationsByActions;

package/lib/store/checker.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCreateCheckers = exports.createRemoveCheckers = exports.translateCheckerInSyncContext = exports.translateCheckerInAsyncContext = void 0;
+exports.translateCheckerInAsyncContext = translateCheckerInAsyncContext;
+exports.translateCheckerInSyncContext = translateCheckerInSyncContext;
+exports.createRemoveCheckers = createRemoveCheckers;
+exports.createCreateCheckers = createCreateCheckers;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const filter_1 = require("../store/filter");
@@ -127,7 +130,6 @@ function translateCheckerInAsyncContext(checker, schema) {
         }
     }
 }
-exports.translateCheckerInAsyncContext = translateCheckerInAsyncContext;
 function translateCheckerInSyncContext(checker, schema) {
     const { entity, type } = checker;
     const when = 'before'; // 现在create的relation改成提前的expression检查了，原先是先插入再后检查，性能不行，而且select也需要实现前检查
@@ -186,7 +188,6 @@ function translateCheckerInSyncContext(checker, schema) {
         }
     }
 }
-exports.translateCheckerInSyncContext = translateCheckerInSyncContext;
 /**
  * 对对象的删除，检查其是否会产生其他行上的空指针，不允许这种情况的出现
  * @param schema
@@ -331,7 +332,6 @@ function createRemoveCheckers(schema) {
     }
     return checkers;
 }
-exports.createRemoveCheckers = createRemoveCheckers;
 function checkAttributeLegal(schema, entity, data) {
     const { attributes } = schema[entity];
     for (const attr in data) {
@@ -478,4 +478,3 @@ function createCreateCheckers(schema) {
     }
     return checkers;
 }
-exports.createCreateCheckers = createCreateCheckers;

package/lib/store/filter.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateFilterToObjectPredicate = exports.checkFilterRepel = exports.checkFilterContains = exports.makeTreeDescendantFilter = exports.makeTreeAncestorFilter = exports.same = exports.getRelevantIds = exports.contains = exports.analyzeFilterRelation = exports.judgeValueRelation = exports.combineFilters = exports.translateCreateDataToFilter = void 0;
+exports.translateCreateDataToFilter = translateCreateDataToFilter;
+exports.combineFilters = combineFilters;
+exports.judgeValueRelation = judgeValueRelation;
+exports.analyzeFilterRelation = analyzeFilterRelation;
+exports.contains = contains;
+exports.getRelevantIds = getRelevantIds;
+exports.same = same;
+exports.makeTreeAncestorFilter = makeTreeAncestorFilter;
+exports.makeTreeDescendantFilter = makeTreeDescendantFilter;
+exports.checkFilterContains = checkFilterContains;
+exports.checkFilterRepel = checkFilterRepel;
+exports.translateFilterToObjectPredicate = translateFilterToObjectPredicate;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const types_1 = require("../types");
@@ -36,7 +47,6 @@ function translateCreateDataToFilter(schema, entity, data, allowUnrecoganized) {
     }
     return data2;
 }
-exports.translateCreateDataToFilter = translateCreateDataToFilter;
 /**
  * 尽量合并外键的连接，防止在数据库中join的对象过多
  * @param entity
@@ -484,7 +494,6 @@ function combineFilters(entity, schema, filters, union) {
     }
     return addFilterSegment(entity, schema, ...filters);
 }
-exports.combineFilters = combineFilters;
 /**
  * 在以下判断相容或相斥的过程中，相容/相斥的事实标准是：满足两个条件的查询集合是否被包容/互斥，但如果两个filter在逻辑上相容或者相斥，在事实上不一定相容或者相斥
  * 例如：{ a: 1 } 和 { a: { $ne: 1 } } 是明显不相容的查询，但如果数据为空集，则这两个查询并不能否定其相容
@@ -903,7 +912,6 @@ function judgeValueRelation(value1, value2, contained) {
         return false;
     }
 }
-exports.judgeValueRelation = judgeValueRelation;
 /**
  * 判断filter条件对compared条件上的attr键值的条件是否相容或相斥
  * @param entity
@@ -1292,7 +1300,6 @@ function analyzeFilterRelation(entity, schema, filter, compared, contained) {
         sureAttributes,
     };
 }
-exports.analyzeFilterRelation = analyzeFilterRelation;
 /** 判断filter条件对compared条件是否相容或相斥
  * @param entity
  * @param schema
@@ -1364,7 +1371,6 @@ function contains(entity, schema, filter, contained) {
     return judgeFilterRelation(entity, schema, filter, contained, true);
     // return false;
 }
-exports.contains = contains;
 /**
  * 判断filter1和filter2是否相斥，即filter1和filter2查询的结果一定没有交集
  * filter1 = {
@@ -1465,7 +1471,6 @@ function getRelevantIds(filter) {
     }
     return result;
 }
-exports.getRelevantIds = getRelevantIds;
 /**
  * 判断两个过滤条件是否完全一致
  * @param entity
@@ -1480,7 +1485,6 @@ function same(entity, schema, filter1, filter2) {
     }
     return filter1.id === filter2.id;
 }
-exports.same = same;
 /**
  * 寻找在树形结构中满足条件的数据行的上层数据
  * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更高层的“浙江省”和“中国”，即可构造出满足条件的filter
@@ -1521,7 +1525,6 @@ function makeTreeAncestorFilter(entity, parentKey, filter, level = 1, includeAll
     }
     return currentLevelInFilter;
 }
-exports.makeTreeAncestorFilter = makeTreeAncestorFilter;
 /**
  * 寻找在树形结构中满足条件的数据行的下层数据
  * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更低层的“西湖区”，即可构造出满足条件的filter
@@ -1556,7 +1559,6 @@ function makeTreeDescendantFilter(entity, parentKey, filter, level = 1, includeA
     }
     return currentLevelInFilter;
 }
-exports.makeTreeDescendantFilter = makeTreeDescendantFilter;
 function checkDeduceFilters(dfc, context) {
     const { $and, $or } = dfc;
     if ($and) {
@@ -1642,7 +1644,6 @@ function checkFilterContains(entity, context, contained, filter, dataCompare, wa
     }
     return false;
 }
-exports.checkFilterContains = checkFilterContains;
 function checkFilterRepel(entity, context, filter1, filter2, dataCompare, warningOnDataCompare) {
     (0, assert_1.default)(filter2);
     const schema = context.getSchema();
@@ -1658,7 +1659,6 @@ function checkFilterRepel(entity, context, filter1, filter2, dataCompare, warnin
     }
     return false;
 }
-exports.checkFilterRepel = checkFilterRepel;
 /**
  * 有的场景下将filter当成非结构化属性存储，又想支持对其查询，此时必须将查询的filter进行转换，处理其中$开头的escape
  * 只要filter是查询数据的标准子集，查询应当能返回true
@@ -1682,7 +1682,6 @@ function translateFilterToObjectPredicate(filter) {
     copyInner(filter, translated);
     return translated;
 }
-exports.translateFilterToObjectPredicate = translateFilterToObjectPredicate;
 /* export function getCascadeEntityFilter<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(
     filter: NonNullable<ED[T]['Filter']>,
     attr: keyof NonNullable<ED[T]['Filter']>

package/lib/store/modi.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createModiRelatedTriggers = exports.createModiRelatedCheckers = exports.abandonModis = exports.applyModis = exports.createOperationsFromModies = void 0;
+exports.createOperationsFromModies = createOperationsFromModies;
+exports.applyModis = applyModis;
+exports.abandonModis = abandonModis;
+exports.createModiRelatedCheckers = createModiRelatedCheckers;
+exports.createModiRelatedTriggers = createModiRelatedTriggers;
 const tslib_1 = require("tslib");
 const types_1 = require("../types");
 const action_1 = require("../actions/action");
@@ -20,7 +24,6 @@ function createOperationsFromModies(modies) {
         };
     });
 }
-exports.createOperationsFromModies = createOperationsFromModies;
 async function applyModis(filter, context, option) {
     const closeMode = context.openRootMode();
     const result = await context.operate('modi', {
@@ -42,7 +45,6 @@ async function applyModis(filter, context, option) {
     closeMode();
     return result;
 }
-exports.applyModis = applyModis;
 async function abandonModis(filter, context, option) {
     const closeMode = context.openRootMode();
     const result = context.operate('modi', {
@@ -64,7 +66,6 @@ async function abandonModis(filter, context, option) {
     closeMode();
     return result;
 }
-exports.abandonModis = abandonModis;
 function createModiRelatedCheckers(schema) {
     const checkers = [];
     for (const entity in schema) {
@@ -169,7 +170,6 @@ function createModiRelatedCheckers(schema) {
     }
     return checkers;
 }
-exports.createModiRelatedCheckers = createModiRelatedCheckers;
 function createModiRelatedTriggers(schema) {
     const triggers = [];
     for (const entity in schema) {
@@ -253,4 +253,3 @@ function createModiRelatedTriggers(schema) {
     };
     return triggers.concat([applyTrigger]);
 }
-exports.createModiRelatedTriggers = createModiRelatedTriggers;

package/lib/store/relation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.judgeRelation = void 0;
+exports.judgeRelation = judgeRelation;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const Demand_1 = require("../types/Demand");
@@ -71,4 +71,3 @@ function judgeRelation(schema, entity, attr, allowUnrecognized) {
         }
     }
 }
-exports.judgeRelation = judgeRelation;

package/lib/timers/oper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vaccumOper = void 0;
+exports.vaccumOper = vaccumOper;
 const Entity_1 = require("../types/Entity");
 const vaccum_1 = require("./vaccum");
 const filter_1 = require("../store/filter");
@@ -61,4 +61,3 @@ async function vaccumOper(option, context) {
         ...rest,
     }, context);
 }
-exports.vaccumOper = vaccumOper;

package/lib/timers/vaccum.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vaccumEntities = void 0;
+exports.vaccumEntities = vaccumEntities;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const fs_1 = require("fs");
@@ -108,4 +108,3 @@ async function vaccumEntities(option, context) {
         }, { deletePhysically: true });
     }
 }
-exports.vaccumEntities = vaccumEntities;

package/lib/types/AppLoader.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from "http";
 import { AsyncContext, AsyncRowStore } from "../store/AsyncRowStore";
 import { EntityDict, OpRecord } from "./Entity";

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/Connector.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from "http";
 import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OpRecord } from "./Entity";

package/lib/types/Demand.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUB_QUERY_PREDICATE_KEYWORD = exports.isRefAttrNode = exports.EXPRESSION_PREFIX = void 0;
+exports.SUB_QUERY_PREDICATE_KEYWORD = exports.EXPRESSION_PREFIX = void 0;
+exports.isRefAttrNode = isRefAttrNode;
 exports.EXPRESSION_PREFIX = '$expr';
 function isRefAttrNode(node) {
     return node.hasOwnProperty('#attr') || (node.hasOwnProperty('#refId') && node.hasOwnProperty('#refAttr'));
 }
-exports.isRefAttrNode = isRefAttrNode;
 ;
 exports.SUB_QUERY_PREDICATE_KEYWORD = '#sqp';

package/lib/types/Endpoint.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders, IncomingMessage } from "http";
 import { AsyncContext } from "../store/AsyncRowStore";
 import { EntityDict } from "./Entity";