oak-domain 5.1.10 → 5.1.12

package/lib/base-app-domain/RelationId.d.ts

@@ -0,0 +1 @@
+export declare namespace RelationId { }

package/lib/base-app-domain/RelationId.js

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

package/lib/compiler/dependencyBuilder.js

@@ -596,9 +596,7 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
             adNames.push(adName);
         });
         // 导入自己的AspectDict：import { AspectDict } from '../aspects/AspectDict';
-        importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("AspectDict"), factory.createIdentifier("ProjectAspectDict"))])), factory.createStringLiteral("../aspects/AspectDict"), undefined), 
-        // import { createService } from 'oak-frontend-base/es/aspects/AspectService';
-        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("createService"))])), factory.createStringLiteral("oak-frontend-base/es/aspects/AspectService"), undefined));
+        importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("AspectDict"), factory.createIdentifier("ProjectAspectDict"))])), factory.createStringLiteral("../aspects/AspectDict"), undefined));
         // 创建一个这样的type: type MergeAspectDict = ProjectAspectDict & GenernalAspectDict<EntityDict>;
         // 除了ProjectAspectDict，还有其他的AspectDict，需要<EntityDict>参数
         const adTypeDeclaration = factory.createTypeAliasDeclaration(undefined, factory.createIdentifier("MergeAspectDict"), undefined, factory.createIntersectionTypeNode([
@@ -630,39 +628,6 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
                 ]))
             ])
         });
-        const functionBlock = stmt4.body;
-        (0, assert_1.default)(functionBlock && ts.isBlock(functionBlock));
-        let returnI = 0;
-        while (true) {
-            const stmt = functionBlock.statements[returnI];
-            if (ts.isReturnStatement(stmt)) {
-                break;
-            }
-            returnI++;
-        }
-        // 在return之前，插入const aspect = createService<EntityDict, MergeAspectDict>(cache);
-        const aspectDeclaration = factory.createVariableStatement(undefined, factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("aspect"), undefined, undefined, factory.createCallExpression(factory.createIdentifier("createService"), [
-                factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined),
-                factory.createTypeReferenceNode(factory.createIdentifier("MergeAspectDict"), undefined)
-            ], [factory.createIdentifier("cache")]))], ts.NodeFlags.Const));
-        const returnStmt = functionBlock.statements[returnI];
-        (0, assert_1.default)(returnStmt.expression && ts.isObjectLiteralExpression(returnStmt.expression));
-        // 在里面添加aspect
-        const { properties } = returnStmt.expression;
-        Object.assign(returnStmt.expression, {
-            properties: [
-                ...properties,
-                factory.createShorthandPropertyAssignment(factory.createIdentifier("aspect"))
-            ]
-        });
-        // 把aspectDeclaration 插入到return之前
-        const newFunctionStatements = [
-            ...functionBlock.statements.slice(0, returnI),
-            aspectDeclaration,
-            ...functionBlock.statements.slice(returnI)
-        ];
-        const newBlock = factory.createBlock(newFunctionStatements);
-        Object.assign(functionBlock, newBlock);
         statements2 = [
             ...statements.slice(0, i),
             ...importStatements,

package/lib/compiler/schemalBuilder.js

@@ -4220,24 +4220,42 @@ exports.registerDeducedRelationMap = registerDeducedRelationMap;
  */
 function outputRelation2(outputDir, printer) {
     const entityRelations = [];
+    const stmts = [
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("Relation"))])), factory.createStringLiteral("./Relation/Schema"), undefined),
+    ];
+    const enumDelarations = [];
     for (const entity in Schema) {
         const { relations } = Schema[entity];
         if (relations) {
-            entityRelations.push([(0, string_1.firstLetterLowerCase)(entity), relations]);
+            const entity2 = (0, string_1.firstLetterLowerCase)(entity);
+            const enumMembers = [];
+            relations.forEach((relation) => {
+                const id = (0, uuid_1.formUuid)(entity2, relation);
+                entityRelations.push([entity2, relation, id]);
+                enumMembers.push(factory.createEnumMember((0, string_1.firstLetterUpperCase)(relation), factory.createStringLiteral(id)));
+            });
+            enumDelarations.push(factory.createEnumDeclaration([
+                factory.createToken(ts.SyntaxKind.ExportKeyword),
+                factory.createToken(ts.SyntaxKind.ConstKeyword)
+            ], factory.createIdentifier(entity), enumMembers));
         }
     }
-    const stmts = [
-        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined),
-        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("Relation"))])), factory.createStringLiteral("./Relation/Schema"), undefined),
-        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("relations"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)), factory.createArrayLiteralExpression((0, lodash_1.flatten)(entityRelations.map(([entity, relations]) => relations.map((relation) => factory.createObjectLiteralExpression([
-                factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral((0, uuid_1.formUuid)(entity, relation))),
-                factory.createPropertyAssignment(factory.createIdentifier("entity"), factory.createStringLiteral(entity)),
-                factory.createPropertyAssignment(factory.createIdentifier("name"), factory.createStringLiteral(relation))
-            ], true)))), true))], ts.NodeFlags.Const))
-    ];
+    stmts.push(factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("relations"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)), factory.createArrayLiteralExpression(entityRelations.map(([entity, relation, id]) => factory.createObjectLiteralExpression([
+            factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral(id)),
+            factory.createPropertyAssignment(factory.createIdentifier("entity"), factory.createStringLiteral(entity)),
+            factory.createPropertyAssignment(factory.createIdentifier("name"), factory.createStringLiteral(relation))
+        ], true)), true))], ts.NodeFlags.Const)));
     const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(stmts), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
     const filename = path_1.default.join(outputDir, 'Relation.ts');
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
+    // 输出RelationIds.ts
+    const stmts2 = [
+        factory.createModuleDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("RelationId"), factory.createModuleBlock(enumDelarations), ts.NodeFlags.Namespace),
+    ];
+    const result2 = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(stmts2), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
+    const filename2 = path_1.default.join(outputDir, 'RelationId.ts');
+    (0, fs_1.writeFileSync)(filename2, result2, { flag: 'w' });
 }
 /**
  * 输出oak-app-domain中的StyleDict.ts文件

package/lib/types/Configuration.d.ts

@@ -35,7 +35,16 @@ export type ServerConfiguration = {
     };
     internalExceptionMask?: string;
     koaBody?: {
-        maxFileSize?: number;
+        multipart?: boolean;
+        formidable?: {
+            maxFileSize?: number;
+            maxFields?: number;
+            maxFieldsSize?: number;
+            uploadDir?: string;
+            keepExtensions?: boolean;
+            hashAlgorithm?: string;
+            multiples?: boolean;
+        };
     };
 };
 /**

package/lib/utils/SimpleConnector.js

@@ -118,6 +118,9 @@ class SimpleConnector {
         }
         catch (err) {
             // fetch返回异常一定是网络异常
+            if (err instanceof types_1.OakRequestTimeoutException) {
+                throw new types_1.OakNetworkException(`接口请求超时`);
+            }
             throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
         }
         return this.parseAspectResult(response);
@@ -140,7 +143,10 @@ class SimpleConnector {
             response = await this.fetchWithTimeout(this.serverSubscribePointUrl, {}, this.timeout);
         }
         catch (err) {
-            throw new types_1.OakNetworkException();
+            if (err instanceof types_1.OakRequestTimeoutException) {
+                throw new types_1.OakNetworkException(`接口请求超时`);
+            }
+            throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
         }
         if (response.status > 299) {
             const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);

package/package.json

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