oak-domain 5.1.25 → 5.1.27

package/lib/compiler/dependencyBuilder.js

@@ -749,7 +749,7 @@ function injectDataIndexFile(dataIndexFile, briefNames, printer) {
  * @param fromDir 依赖项目的目录
  * @param toDir 当前项目的目录
  */
-function tryCopyFilesRecursively(fromDir, toDir) {
+function tryCopyFilesRecursively(fromDir, toDir, rebuild) {
     const files = (0, fs_1.readdirSync)(fromDir);
     files.forEach((file) => {
         const fromFile = join(fromDir, file);
@@ -757,7 +757,12 @@ function tryCopyFilesRecursively(fromDir, toDir) {
         const stat = (0, fs_1.statSync)(fromFile);
         if (stat.isFile()) {
             if ((0, fs_1.existsSync)(join(toDir, file))) {
-                console.log(`覆盖文件${toFile}`);
+                if (rebuild) {
+                    console.log(`覆盖文件${toFile}`);
+                }
+                else {
+                    console.log(`忽略文件${toFile}`);
+                }
             }
             else {
                 console.log(`拷贝文件${toFile}`);
@@ -771,7 +776,7 @@ function tryCopyFilesRecursively(fromDir, toDir) {
                 console.log(`创建文件夹${toFile}`);
                 (0, fs_extra_1.mkdirSync)(toFile);
             }
-            tryCopyFilesRecursively(fromFile, toFile);
+            tryCopyFilesRecursively(fromFile, toFile, rebuild);
         }
     });
 }
@@ -781,7 +786,7 @@ function tryCopyFilesRecursively(fromDir, toDir) {
  * @param dependencies
  * @param briefNames
  */
-function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
+function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer, rebuild) {
     const injectDataIndexFileDependencies = [];
     const injectDataIndexFileBriefNames = [];
     dependencies.forEach((dep, idx) => {
@@ -792,7 +797,7 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
             const dataFile = join(moduleTemplateDir, 'data.ts');
             if ((0, fs_1.existsSync)(dataFile)) {
                 const prjDataFile = join(cwd, 'src', 'data', `${briefNames[idx]}Data.ts`);
-                if (!(0, fs_1.existsSync)(prjDataFile)) {
+                if (!(0, fs_1.existsSync)(prjDataFile) || rebuild) {
                     console.log(`拷贝${dataFile}到${prjDataFile}中`);
                     (0, fs_extra_1.copySync)(dataFile, prjDataFile);
                     injectDataIndexFileDependencies.push(dep);
@@ -802,7 +807,7 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
             // src下面的文件是可以拷贝到项目中的
             const srcDir = join(moduleTemplateDir, 'src');
             if ((0, fs_1.existsSync)(srcDir)) {
-                tryCopyFilesRecursively(srcDir, join(cwd, 'src'));
+                tryCopyFilesRecursively(srcDir, join(cwd, 'src'), rebuild);
             }
         }
     });
@@ -1020,7 +1025,7 @@ function buildDependency(rebuild) {
     }
     // 把各个依赖项目的一些初始化的文件拷贝过去
     if (!isModule) {
-        tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer);
+        tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer, rebuild);
     }
 }
 exports.default = buildDependency;

package/lib/store/CascadeStore.js

@@ -167,8 +167,11 @@ function polishSelection(schema, entity, selection, context, option) {
     }
     const toBeAssignNode2 = {}; // 用来记录在表达式中涉及到的结点
     const projectionNodeDict = {};
-    const checkProjectionNode = (entity2, projectionNode) => {
-        const necessaryAttrs = ['id', '$$createAt$$', '$$updateAt$$']; // 有的页面依赖于其它页面取数据，有时两个页面的filter的差异会导致有一个加createAt，有一个不加，此时可能产生前台取数据不完整的异常。先统一加上
+    const checkProjectionNode = (entity2, projectionNode, root) => {
+        const necessaryAttrs = [types_1.PrimaryKeyAttribute, Entity_1.CreateAtAttribute, Entity_1.UpdateAtAttribute]; // 有的页面依赖于其它页面取数据，有时两个页面的filter的差异会导致有一个加createAt，有一个不加，此时可能产生前台取数据不完整的异常。先统一加上
+        if (root && option?.includedDeleted) {
+            necessaryAttrs.push(Entity_1.DeleteAtAttribute);
+        }
         for (const attr in projectionNode) {
             if (attr === '#id') {
                 (0, assert_1.default)(!projectionNodeDict[projectionNode[attr]], `projection中结点的id有重复, ${projectionNode[attr]}`);
@@ -264,7 +267,7 @@ function polishSelection(schema, entity, selection, context, option) {
             }
         }
     };
-    checkProjectionNode(entity, data);
+    checkProjectionNode(entity, data, true);
     if (!sorter && relevantIds.length === 0) {
         // 如果没有sorter，就给予一个按createAt逆序的sorter
         Object.assign(selection, {
@@ -1702,7 +1705,7 @@ class CascadeStore extends RowStore_1.RowStore {
             const entityBranch = lastOperation.d[entity];
             if (entityBranch) {
                 rows.forEach((row) => {
-                    if (row && row.id) { // 如果没有row.id就不加入结果集了
+                    if (row && row.id && !row[Entity_1.DeleteAtAttribute]) { // 如果没有row.id就不加入结果集了
                         const { id } = row;
                         if (!entityBranch[id]) {
                             Object.assign(entityBranch, {
@@ -1727,7 +1730,7 @@ class CascadeStore extends RowStore_1.RowStore {
         }
         const entityBranch = {};
         rows.forEach((row) => {
-            if (row) {
+            if (row && row.id && !row[Entity_1.DeleteAtAttribute]) {
                 const { id } = row;
                 Object.assign(entityBranch, {
                     [id]: (0, lodash_1.cloneDeep)(row),

package/lib/types/Configuration.d.ts

@@ -54,8 +54,8 @@ export type ServerConfiguration = {
     internalExceptionMask?: string;
     koaBody?: IKoaBodyOptions;
     socket?: (ctx: Koa.ParameterizedContext<any, KoaRouter.IRouterParamContext<any, {}>, any>) => {
-        url?: string;
-    };
+        url: string;
+    } | undefined;
 };
 /**
  * 前后台访问配置

package/lib/utils/validator.d.ts

@@ -23,4 +23,8 @@ export declare const isVehicleNumber: ValidatorFunction;
 export declare const isEmail: ValidatorFunction;
 export declare function checkAttributesNotNull<ED extends EntityDict, T extends keyof EntityDict>(entity: T, data: Partial<ED[T]['CreateOperationData']>, attributes: Array<keyof ED[T]['CreateOperationData']>, allowEmpty?: true): void;
 export declare function checkAttributesScope<ED extends EntityDict, T extends keyof EntityDict>(entity: T, data: Partial<ED[T]['CreateOperationData']>, attributes: Array<keyof ED[T]['CreateOperationData']>): void;
+export declare const isIPV4: ValidatorFunction;
+export declare const isIPV6: ValidatorFunction;
+export declare const isIP: ValidatorFunction;
+export declare const isDomain: ValidatorFunction;
 export {};

package/lib/utils/validator.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAttributesScope = exports.checkAttributesNotNull = exports.isEmail = exports.isVehicleNumber = exports.isMoney = exports.isNumber = exports.isTel = exports.isPhone = exports.isDigital = exports.isSizedCaptcha = exports.isNickname = exports.isUrl = exports.isSoldierNumber = exports.isBirthNumber = exports.isTwCardNumber = exports.isAmCardNumber = exports.isHkCardNumber = exports.isPassportNumber = exports.isIdCardNumber = exports.isCaptcha = exports.isPassword = exports.isMobile = void 0;
+exports.isDomain = exports.isIP = exports.isIPV6 = exports.isIPV4 = exports.checkAttributesScope = exports.checkAttributesNotNull = exports.isEmail = exports.isVehicleNumber = exports.isMoney = exports.isNumber = exports.isTel = exports.isPhone = exports.isDigital = exports.isSizedCaptcha = exports.isNickname = exports.isUrl = exports.isSoldierNumber = exports.isBirthNumber = exports.isTwCardNumber = exports.isAmCardNumber = exports.isHkCardNumber = exports.isPassportNumber = exports.isIdCardNumber = exports.isCaptcha = exports.isPassword = exports.isMobile = void 0;
 const types_1 = require("../types");
 const isMobile = (text) => {
     return ((text) && (typeof text === "string") && ((/^1[3|4|5|6|7|8|9]\d{9}$/.test(text))));
@@ -131,3 +131,25 @@ function checkAttributesScope(entity, data, attributes) {
     }
 }
 exports.checkAttributesScope = checkAttributesScope;
+const isIPV4 = (ip) => {
+    // IPv4正则
+    const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+    return ipv4Regex.test(ip);
+};
+exports.isIPV4 = isIPV4;
+const isIPV6 = (ip) => {
+    // IPv6正则（简化版，匹配常见格式）
+    const ipv6Regex = /^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$|^::([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}$|^[0-9a-fA-F]{1,4}::([0-9a-fA-F]{1,4}:){0,5}[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){1}:([0-9a-fA-F]{1,4}:){0,4}[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){2}:([0-9a-fA-F]{1,4}:){0,3}[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){3}:([0-9a-fA-F]{1,4}:){0,2}[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){4}:([0-9a-fA-F]{1,4}:){0,1}[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){5}:[0-9a-fA-F]{1,4}$|^([0-9a-fA-F]{1,4}:){1,6}:$/;
+    return ipv6Regex.test(ip);
+};
+exports.isIPV6 = isIPV6;
+const isIP = (ip) => {
+    return (0, exports.isIPV4)(ip) || (0, exports.isIPV6)(ip);
+};
+exports.isIP = isIP;
+const isDomain = (domain) => {
+    //基础域名验证正则
+    const domainRegex = /^(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z0-9-]{1,63}(?<!-))*\.[A-Za-z]{2,}$/;
+    return domainRegex.test(domain);
+};
+exports.isDomain = isDomain;

package/package.json

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