oak-domain 5.1.20 → 5.1.22

package/lib/base-app-domain/ActionAuth/_baseSchema.d.ts

@@ -36,6 +36,8 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    relationId: number;
+    pathId: number;
     deActions: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;

package/lib/base-app-domain/ModiEntity/_baseSchema.d.ts

@@ -36,6 +36,7 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    modiId: number;
     entity: number;
     entityId: number;
     [k: string]: any;

package/lib/base-app-domain/Oper/_baseSchema.d.ts

@@ -58,8 +58,10 @@ export type OpSortAttr = Partial<{
     $$seq$$: number;
     $$updateAt$$: number;
     action: number;
+    operatorId: number;
     targetEntity: number;
     bornAt: number;
+    logId: number;
     iState: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;

package/lib/base-app-domain/OperEntity/_baseSchema.d.ts

@@ -36,6 +36,7 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    operId: number;
     entity: number;
     entityId: number;
     [k: string]: any;

package/lib/base-app-domain/RelationAuth/_baseSchema.d.ts

@@ -35,6 +35,9 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    sourceRelationId: number;
+    pathId: number;
+    destRelationId: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;
 export type OpAction = OakMakeAction<GenericAction | string>;

package/lib/base-app-domain/User/_baseSchema.d.ts

@@ -46,6 +46,7 @@ export type OpSortAttr = Partial<{
     name: number;
     nickname: number;
     password: number;
+    refId: number;
     userState: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;

package/lib/base-app-domain/UserEntityClaim/_baseSchema.d.ts

@@ -42,7 +42,11 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    uegId: number;
+    userId: number;
+    relationId: number;
     claimEntityId: number;
+    userRelationId: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;
 export type OpAction = OakMakeAction<GenericAction | string>;

package/lib/base-app-domain/UserRelation/_baseSchema.d.ts

@@ -39,6 +39,8 @@ export type OpSortAttr = Partial<{
     $$createAt$$: number;
     $$seq$$: number;
     $$updateAt$$: number;
+    userId: number;
+    relationId: number;
     entity: number;
     entityId: number;
     [k: string]: any;

package/lib/compiler/dependencyBuilder.js

@@ -285,7 +285,7 @@ function outputContext(depGraph, sourceFile, printer, filename) {
     const { statements } = sourceFile;
     const isBackend = filename.includes('BackendRuntimeContext');
     const statements2 = [
-        factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(isBackend ? "BaseBackendRuntimeContext" : "BaseFrontendRuntimeContext"), undefined), factory.createStringLiteral(`${root}/${isBackend ? 'lib' : 'es'}/context/${isBackend ? 'BackendRuntimeContext' : 'FrontendRuntimeContext'}`), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(isBackend ? "BaseBackendRuntimeContext" : "BaseFrontendRuntimeContext"), undefined), factory.createStringLiteral(`@${root}/context/${isBackend ? 'BackendRuntimeContext' : 'FrontendRuntimeContext'}`), undefined),
         ...statements
     ];
     const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements2), sourceFile);
@@ -745,27 +745,34 @@ function injectDataIndexFile(dataIndexFile, briefNames, printer) {
     console.log(`注入${dataIndexFile}文件成功，共注入了${briefNames.length}个初始化数据引用`);
 }
 /**
- * 尝试将pages目录下的页面移到项目目录中。
- * 目前简化处理，假设目录结构都是pages/namespace/entity结构，以entity目录作为单元，如果有就放弃，没有就移植
- * @param cwdPageDir
- * @param modulePageDir
+ * 将依赖项目的目录去覆盖原来的目录
+ * @param fromDir 依赖项目的目录
+ * @param toDir 当前项目的目录
  */
-function tryCopyPages(cwdPageDir, modulePageDir) {
-    // 各个namespace处理
-    const nss = (0, fs_1.readdirSync)(modulePageDir);
-    nss.forEach((namespace) => {
-        const pages = (0, fs_1.readdirSync)(join(modulePageDir, namespace));
-        pages.forEach((page) => {
-            const destDir = join(cwdPageDir, namespace, page);
-            if (!(0, fs_1.existsSync)(destDir)) {
-                (0, fs_extra_1.mkdirSync)(destDir);
-                const srcDir = join(modulePageDir, namespace, page);
-                console.log(`拷贝${srcDir}到${destDir}下`);
-                (0, fs_extra_1.copySync)(srcDir, destDir, {
-                    recursive: true,
-                });
+function tryCopyFilesRecursively(fromDir, toDir) {
+    const files = (0, fs_1.readdirSync)(fromDir);
+    files.forEach((file) => {
+        const fromFile = join(fromDir, file);
+        const toFile = join(toDir, file);
+        const stat = (0, fs_1.statSync)(fromFile);
+        if (stat.isFile()) {
+            if ((0, fs_1.existsSync)(join(toDir, file))) {
+                console.log(`覆盖文件${toFile}`);
             }
-        });
+            else {
+                console.log(`拷贝文件${toFile}`);
+            }
+            (0, fs_extra_1.copySync)(fromFile, toFile, {
+                overwrite: true,
+            });
+        }
+        else {
+            if (!(0, fs_1.existsSync)(toFile)) {
+                console.log(`创建文件夹${toFile}`);
+                (0, fs_extra_1.mkdirSync)(toFile);
+            }
+            tryCopyFilesRecursively(fromFile, toFile);
+        }
     });
 }
 /**
@@ -792,10 +799,10 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
                     injectDataIndexFileBriefNames.push(briefNames[idx]);
                 }
             }
-            // pages中设计的页面，拷贝到pages对应的目录下，考虑namespace
-            const pageDir = join(moduleTemplateDir, 'pages');
-            if ((0, fs_1.existsSync)(pageDir)) {
-                tryCopyPages(join(cwd, 'src', 'pages'), pageDir);
+            // src下面的文件是可以拷贝到项目中的
+            const srcDir = join(moduleTemplateDir, 'src');
+            if ((0, fs_1.existsSync)(srcDir)) {
+                tryCopyFilesRecursively(srcDir, join(cwd, 'src'));
             }
         }
     });

package/lib/compiler/schemalBuilder.js

@@ -2532,7 +2532,7 @@ function _constructOpSortAttr(statements, entity) {
                         const text2 = text === 'Schema' ? entity : text;
                         const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity]) => refEntity === text2);
                         if (manyToOneItem) {
-                            factory.createPropertySignature(undefined, factory.createIdentifier(`${name.text}Id`), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
+                            members.push(factory.createPropertySignature(undefined, factory.createIdentifier(`${name.text}Id`), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword)));
                         }
                         else if (!['Object'].includes(text)) {
                             // todo 对State的专门处理

package/lib/store/TriggerExecutor.js

@@ -276,7 +276,8 @@ class TriggerExecutor {
             // 加上modi的过滤条件
             && this.judgeModiTurn(option, trigger));
         if (triggers) {
-            const preTriggers = triggers.filter(ele => ele.when === 'before' && (!ele.check || ele.check(operation)));
+            const preTriggers = triggers.filter(ele => ele.when === 'before' && (!ele.check || ele.check(operation))
+                && (!ele.attributes || (0, lodash_1.difference)(ele.attributes, Object.keys(operation.data)).length === 0));
             const commitTriggers = triggers.filter(ele => ele.when === 'commit' &&
                 (!ele.check || ele.check(operation)));
             if (context instanceof SyncRowStore_1.SyncContext) {
@@ -363,14 +364,18 @@ class TriggerExecutor {
             if (trigger.strict === 'makeSure' && ids.length && !cleanTriggerDataBySelf) {
                 // 这里开root模式，否则还可能有权限问题
                 const closeRoot2 = context.openRootMode();
+                const data = {
+                    [Entity_1.TriggerDataAttribute]: null,
+                    [Entity_1.TriggerUuidAttribute]: null,
+                };
+                if (typeof callback === 'object') {
+                    Object.assign(data, callback);
+                }
                 try {
                     await context.operate(entity, {
                         id: await (0, uuid_1.generateNewIdAsync)(),
                         action: 'update',
-                        data: {
-                            [Entity_1.TriggerDataAttribute]: null,
-                            [Entity_1.TriggerUuidAttribute]: null,
-                        },
+                        data,
                         filter: {
                             id: {
                                 $in: ids,
@@ -426,7 +431,8 @@ class TriggerExecutor {
             // 加上modi的过滤条件
             && this.judgeModiTurn(option, trigger));
         if (triggers) {
-            const postTriggers = triggers.filter(ele => ele.when === 'after' && (!ele.check || ele.check(operation)));
+            const postTriggers = triggers.filter(ele => ele.when === 'after' && (!ele.check || ele.check(operation))
+                && (!ele.attributes || (0, lodash_1.difference)(ele.attributes, Object.keys(operation.data)).length === 0));
             const commitTriggers = triggers.filter(ele => ele.when === 'commit' &&
                 (!ele.check || ele.check(operation)));
             if (context instanceof SyncRowStore_1.SyncContext) {

package/lib/types/Configuration.d.ts

@@ -3,6 +3,9 @@ import { EntityDict as BaseEntityDict } from "../base-app-domain";
 import { AttrUpdateMatrix } from './EntityDesc';
 import { ActionDefDict } from './Action';
 import { StyleDict } from './Style';
+import type { IKoaBodyOptions } from 'koa-body';
+import Koa from 'koa';
+import KoaRouter from 'koa-router';
 /**
  * redis连接信息，如果是Redis集群，可以配置多个
  */
@@ -43,17 +46,9 @@ export type ServerConfiguration = {
         methods?: string[];
     };
     internalExceptionMask?: string;
-    koaBody?: {
-        multipart?: boolean;
-        formidable?: {
-            maxFileSize?: number;
-            maxFields?: number;
-            maxFieldsSize?: number;
-            uploadDir?: string;
-            keepExtensions?: boolean;
-            hashAlgorithm?: string;
-            multiples?: boolean;
-        };
+    koaBody?: IKoaBodyOptions;
+    socket?: (ctx: Koa.ParameterizedContext<any, KoaRouter.IRouterParamContext<any, {}>, any>) => {
+        url?: string;
     };
 };
 /**

package/lib/types/Endpoint.d.ts

@@ -3,10 +3,28 @@ import { IncomingHttpHeaders, IncomingMessage } from "http";
 import { AsyncContext } from "../store/AsyncRowStore";
 import { EntityDict } from "./Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
-export interface EndpointItem<ED extends EntityDict & BaseEntityDict, BackCxt extends AsyncContext<ED>> {
+export type EndpointItem<ED extends EntityDict & BaseEntityDict, BackCxt extends AsyncContext<ED>> = SimpleEndpoint<ED, BackCxt> | FreeEndpoint<ED, BackCxt>;
+export interface SimpleEndpoint<ED extends EntityDict & BaseEntityDict, BackCxt extends AsyncContext<ED>> {
     name: string;
     params?: string[];
     method: 'get' | 'post' | 'put' | 'delete';
+    type?: "simple";
     fn: (context: BackCxt, params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<any>;
 }
+/**
+ * 此类型的接口可能会保持长连接，逐步返回内容，所以直接控制res和req即可
+ * backendcontext也不能直接传入，在需要时调用方法开启事务
+ * 返回时可以指定contentType
+ */
+export interface FreeEndpoint<ED extends EntityDict & BaseEntityDict, BackCxt extends AsyncContext<ED>> {
+    name: string;
+    params?: string[];
+    method: 'get' | 'post' | 'put' | 'delete';
+    type: "free";
+    fn: (contextBuilder: () => Promise<BackCxt>, params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<{
+        headers?: Record<string, string | string[]>;
+        statusCode?: number;
+        data: any;
+    }>;
+}
 export type Endpoint<ED extends EntityDict & BaseEntityDict, BackCxt extends AsyncContext<ED>> = EndpointItem<ED, BackCxt> | EndpointItem<ED, BackCxt>[];

package/lib/types/Endpoint.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 ;
+;

package/lib/types/Trigger.d.ts

@@ -36,7 +36,7 @@ export interface CreateTriggerInTxn<ED extends EntityDict & BaseEntityDict, T ex
         operation: ED[T]['Create'];
     }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-interface TriggerCrossTxn<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>> {
+interface TriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> {
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
     cs?: true;
@@ -45,9 +45,9 @@ interface TriggerCrossTxn<ED extends EntityDict & BaseEntityDict, Cxt extends As
     grouped?: true;
     fn: (event: {
         ids: string[];
-    }, context: Cxt, option: OperateOption) => Promise<((context: Cxt, option: OperateOption) => Promise<any>) | void>;
+    }, context: Cxt, option: OperateOption) => Promise<((context: Cxt, option: OperateOption) => Promise<any>) | void | ED[T]['Update']['data']>;
 }
-export interface CreateTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends CreateTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, Cxt> {
+export interface CreateTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends CreateTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, T, Cxt> {
 }
 export type CreateTrigger<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTriggerInTxn<ED, T, Cxt> | CreateTriggerCrossTxn<ED, T, Cxt>;
 /**
@@ -57,7 +57,7 @@ export type CreateTrigger<ED extends EntityDict & BaseEntityDict, T extends keyo
  */
 export interface UpdateTriggerBase<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: Exclude<ED[T]['Action'], ExcludeUpdateAction> | Array<Exclude<ED[T]['Action'], ExcludeUpdateAction>>;
-    attributes?: keyof ED[T]['OpSchema'] | Array<keyof ED[T]['OpSchema']>;
+    attributes?: Array<keyof ED[T]['OpSchema']>;
     mt?: ModiTurn;
     check?: (operation: ED[T]['Update']) => boolean;
     filter?: ED[T]['Filter'] | ((operation: ED[T]['Update'], context: Cxt, option: OperateOption) => ED[T]['Filter'] | Promise<ED[T]['Filter']>);
@@ -68,7 +68,7 @@ export interface UpdateTriggerInTxn<ED extends EntityDict & BaseEntityDict, T ex
         operation: ED[T]['Update'];
     }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-export interface UpdateTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends UpdateTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, Cxt> {
+export interface UpdateTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends UpdateTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, T, Cxt> {
 }
 export type UpdateTrigger<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = UpdateTriggerInTxn<ED, T, Cxt> | UpdateTriggerCrossTxn<ED, T, Cxt>;
 /**
@@ -88,7 +88,7 @@ export interface RemoveTriggerInTxn<ED extends EntityDict & BaseEntityDict, T ex
         operation: ED[T]['Remove'];
     }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-export interface RemoveTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends RemoveTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, Cxt> {
+export interface RemoveTriggerCrossTxn<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends RemoveTriggerBase<ED, T, Cxt>, TriggerCrossTxn<ED, T, Cxt> {
 }
 export type RemoveTrigger<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = RemoveTriggerInTxn<ED, T, Cxt> | RemoveTriggerCrossTxn<ED, T, Cxt>;
 export interface SelectTriggerBase<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends TriggerBase<ED, T> {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.20",
+    "version": "5.1.22",
     "author": {
         "name": "XuChang"
     },
@@ -23,6 +23,8 @@
         "@babel/preset-typescript": "^7.12.13",
         "@types/assert": "^1.5.6",
         "@types/cross-spawn": "^6.0.2",
+        "@types/koa": "^2.15.0",
+        "@types/koa-router": "^7.4.8",
         "@types/fs-extra": "^9.0.13",
         "@types/lodash": "^4.14.182",
         "@types/mocha": "^8.2.0",
@@ -45,6 +47,8 @@
     },
     "dependencies": {
         "dayjs": "^1.11.9",
+        "koa": "^2.16.1",
+        "koa-body": "^5.0.0",
         "node-schedule": "^2.1.1",
         "socket.io": "^4.8.1",
         "uuid": "^9.0.0",