oak-domain 5.1.21 → 5.1.23

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

@@ -1,3 +1,22 @@
+import * as ts from 'typescript';
+declare const Schema: Record<string, {
+    schemaAttrs: Array<ts.PropertySignature>;
+    fulltextIndex?: true;
+    indexes?: ts.ArrayLiteralExpression;
+    sourceFile: ts.SourceFile;
+    enumAttributes: Record<string, string[]>;
+    locale: ts.ObjectLiteralExpression;
+    toModi: boolean;
+    toLog: boolean;
+    actionType: string;
+    static: boolean;
+    inModi: boolean;
+    relations: false | string[];
+    extendsFrom: string[];
+    importAttrFrom: Record<string, [string, string | undefined]>;
+}>;
+export declare function constructAttributes(entity: string): ts.PropertyAssignment[];
+export declare function translateLocaleObject(locale: ts.ObjectLiteralExpression): Record<string, any>;
 /**
  * 此函数不再使用
  * @param map
@@ -23,6 +42,9 @@ export declare function registerFixedDestinationPathMap(map: Record<string, stri
  * @param map
  */
 export declare function registerDeducedRelationMap(map: Record<string, string>): void;
+export declare const getAnalizedSchema: () => typeof Schema;
 export declare function analyzeEntities(inputDir: string, relativePath?: string): void;
 export declare function buildSchemaBackup(outputDir: string): void;
+export declare function getProjectionKeys(entity: string): string[];
 export declare function buildSchema(outputDir: string): void;
+export {};

package/lib/compiler/schemalBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSchema = exports.buildSchemaBackup = exports.analyzeEntities = exports.registerDeducedRelationMap = exports.registerFixedDestinationPathMap = exports.registerIgnoredRelationPathMap = exports.registerFreeEntities = exports.registerIgnoredForeignKeyMap = void 0;
+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;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const assert_1 = tslib_1.__importDefault(require("assert"));
@@ -2256,6 +2256,64 @@ function _constructOpProjection(statements, entity) {
         exprNode,
     ])));
 }
+function getOpProjectionKeys(entity) {
+    const { schemaAttrs, enumAttributes } = Schema[entity];
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const result = [
+        'id',
+        '$$createAt$$',
+        '$$updateAt$$',
+        '$$seq$$',
+    ];
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
+        if (ts.isTypeReferenceNode(type)) {
+            const { typeName } = type;
+            if (ts.isIdentifier(typeName)) {
+                const typeStr = typeName.text;
+                switch (typeStr) {
+                    case 'String':
+                    case 'Text':
+                    case 'Int':
+                    case 'Uint':
+                    case 'Float':
+                    case 'Double':
+                    case 'Boolean':
+                    case 'Datetime':
+                    case 'Image':
+                    case 'File':
+                    case 'SingleGeo':
+                    case 'Geo':
+                    case 'Price':
+                    case 'Decimal':
+                        result.push(attrName);
+                        break;
+                    case 'Object':
+                        result.push(attrName);
+                        break;
+                    default: {
+                        const refEntity = typeStr === 'Schema' ? entity : typeStr;
+                        const isManyToOne = manyToOneSet?.some(([e]) => e === refEntity);
+                        if (isManyToOne) {
+                            result.push(`${attrName}Id`);
+                        }
+                        else if (!enumAttributes?.[attrName]) {
+                            result.push(attrName);
+                        }
+                        else {
+                            result.push(attrName);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            result.push(attrName);
+        }
+    }
+    return result;
+}
 /**
  * 构造Query
  * @param statements
@@ -3951,6 +4009,26 @@ function constructAttributes(entity) {
     });
     return result;
 }
+exports.constructAttributes = constructAttributes;
+function translateLocaleObject(locale) {
+    const result = {};
+    locale.properties.forEach((ele) => {
+        (0, assert_1.default)(ts.isPropertyAssignment(ele) && (ts.isIdentifier(ele.name) || ts.isStringLiteral(ele.name)), `locale对象中的属性定义不正确`);
+        const name = ele.name.text;
+        if (ts.isStringLiteral(ele.initializer)) {
+            result[name] = ele.initializer.text;
+        }
+        else if (ts.isObjectLiteralExpression(ele.initializer)) {
+            const subObj = translateLocaleObject(ele.initializer);
+            result[name] = subObj;
+        }
+        else {
+            throw new Error(`locale对象中的属性${name}的定义不正确`);
+        }
+    });
+    return result;
+}
+exports.translateLocaleObject = translateLocaleObject;
 function outputLocale(outputDir, printer) {
     const locales = {};
     const entities = [];
@@ -4768,6 +4846,10 @@ function outputStyleDict(outputDir, printer) {
     const filename = path_1.default.join(outputDir, 'StyleDict.ts');
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
 }
+const getAnalizedSchema = () => {
+    return Schema;
+};
+exports.getAnalizedSchema = getAnalizedSchema;
 function analyzeEntities(inputDir, relativePath) {
     const files = (0, fs_1.readdirSync)(inputDir);
     const fullFilenames = files.map(ele => {
@@ -5474,6 +5556,76 @@ function _outputEntityDict(outputDir, printer) {
     const fileName = path_1.default.join(outputDir, 'EntityDict.ts');
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
+function getProjectionKeys(entity) {
+    const keys = [];
+    const { schemaAttrs } = Schema[entity];
+    const { [entity]: manyToOneSet = [] } = ManyToOne;
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
+        if (ts.isTypeReferenceNode(type)) {
+            const typeName = type.typeName;
+            if (ts.isIdentifier(typeName)) {
+                const text = typeName.text;
+                switch (text) {
+                    case 'String':
+                    case 'Text':
+                    case 'Int':
+                    case 'Uint':
+                    case 'Float':
+                    case 'Double':
+                    case 'Boolean':
+                    case 'Datetime':
+                    case 'Image':
+                    case 'File':
+                    case 'SingleGeo':
+                    case 'Geo':
+                    case 'Price':
+                    case 'Decimal':
+                    case 'Object':
+                        break;
+                    default:
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet.find(([refEntity]) => refEntity === text2);
+                        if (manyToOneItem) {
+                            keys.push(attrName); // 外键属性
+                        }
+                }
+            }
+        }
+    }
+    if (ReversePointerRelations[entity]) {
+        for (const one of ReversePointerRelations[entity]) {
+            const text2 = one === 'Schema' ? entity : one;
+            keys.push((0, string_1.firstLetterLowerCase)(one));
+        }
+    }
+    const { [entity]: oneToManySet = [] } = OneToMany;
+    const foreignKeySet = {};
+    for (const [entityName, foreignKey] of oneToManySet) {
+        if (!foreignKeySet[entityName]) {
+            foreignKeySet[entityName] = [];
+        }
+        foreignKeySet[entityName].push(foreignKey);
+    }
+    for (const entityName in foreignKeySet) {
+        const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+        for (const foreignKey of foreignKeySet[entityName]) {
+            const identifier = `${entityNameLc}$${foreignKey}`;
+            keys.push(identifier);
+            const aggrKey = _getAggrKey(entityNameLc, foreignKey);
+            if (typeof aggrKey === 'string') {
+                keys.push(aggrKey);
+            }
+            else {
+                // 如果是 union 类型，用映射表达式模拟（如 ["xxx$$aggr", `xxx$$${number}$$aggr`]）
+                keys.push(`${identifier}$$aggr`);
+            }
+        }
+    }
+    return [...new Set([...keys, ...getOpProjectionKeys(entity)])];
+}
+exports.getProjectionKeys = getProjectionKeys;
 function _outputSchema(outputDir, printer) {
     for (const entity in Schema) {
         const statements = [

package/lib/store/RelationAuth.js

@@ -1045,6 +1045,11 @@ class RelationAuth {
             if (actionAuths && actionAuths.length > 0) {
                 return checkChildren(actionAuths);
             }
+            // 如果这个entity是updateFree，直接过掉到子结点判定
+            const { action, entity } = node;
+            if (this.updateFreeDict[entity] && this.updateFreeDict[entity].includes(action)) {
+                return checkChildren([]);
+            }
             // 没有能根据父亲传下来的actionAuth判定，只能自己找
             const result = this.findActionAuthsOnNode(node, context);
             const checkResult = (result2) => {
@@ -1083,9 +1088,6 @@ class RelationAuth {
     }
     checkOperation(entity, operation, context) {
         const { action, filter, data } = operation;
-        if (this.updateFreeDict[entity] && this.updateFreeDict[entity].includes(action)) {
-            return true;
-        }
         const userId = context.getCurrentUserId();
         if (!userId) {
             throw new types_1.OakUnloggedInException();

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

@@ -12,6 +12,7 @@ export declare class OakException<ED extends EntityDict & BaseEntityDict> extend
         name: string;
         message: string;
         _module: string | undefined;
+        params: Record<string, any> | undefined;
         opRecords: OpRecord<ED>[];
         tag1: string | undefined;
         tag2: boolean | undefined;

package/lib/types/Exception.js

@@ -80,6 +80,7 @@ class OakException extends Error {
             name: this.constructor.name,
             message: this.message,
             _module: this._module,
+            params: this.params,
             opRecords: this.opRecords,
             tag1: this.tag1,
             tag2: this.tag2,

package/lib/utils/SimpleConnector.d.ts

@@ -36,7 +36,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         opRecords: any;
         message: string | null;
     } | {
-        result: ArrayBuffer;
+        result: ReadableStream<Uint8Array> | null;
         message: string | null;
         opRecords?: undefined;
     }>;
@@ -45,7 +45,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         opRecords: any;
         message: string | null;
     } | {
-        result: ArrayBuffer;
+        result: ReadableStream<Uint8Array> | null;
         message: string | null;
         opRecords?: undefined;
     }>;

package/lib/utils/SimpleConnector.js

@@ -81,8 +81,7 @@ class SimpleConnector {
             throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
-        const responseType = response.headers.get('Content-Type') ||
-            response.headers.get('content-type');
+        const responseType = response.headers.get('Content-Type') || response.headers.get('content-type');
         if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
             const { exception, result, opRecords } = await response.json();
             if (exception) {
@@ -94,18 +93,24 @@ class SimpleConnector {
                 message,
             };
         }
-        else if (responseType
-            ?.toLocaleLowerCase()
-            .match(/application\/octet-stream/i)) {
-            const result = await response.arrayBuffer();
+        //  else if (
+        //     responseType
+        //         ?.toLocaleLowerCase()
+        //         .match(/application\/octet-stream/i)
+        // ) {
+        //     const result = await response.arrayBuffer();
+        //     return {
+        //         result,
+        //         message,
+        //     };
+        // } 
+        else {
+            const result = response.body;
             return {
                 result,
                 message,
             };
         }
-        else {
-            throw new Error(`尚不支持的content-type类型${responseType}`);
-        }
     }
     async callAspect(name, params, context) {
         const { headers, body } = await this.makeHeadersAndBody(name, params, context);
@@ -153,8 +158,7 @@ class SimpleConnector {
             throw new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
         }
         const message = response.headers.get('oak-message');
-        const responseType = response.headers.get('Content-Type') ||
-            response.headers.get('content-type');
+        const responseType = response.headers.get('Content-Type') || response.headers.get('content-type');
         if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
             const { socketUrl, subscribeUrl, path } = await response.json();
             return {
@@ -185,7 +189,7 @@ class SimpleConnector {
         };
     }
     async serializeResult(result, opRecords, headers, body, message) {
-        if (result instanceof stream_1.Stream || result instanceof Buffer) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer || result instanceof ReadableStream) {
             return {
                 body: result,
                 headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.21",
+    "version": "5.1.23",
     "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",