oak-domain 5.0.12 → 5.0.14

package/lib/base-app-domain/Path/Schema.d.ts

@@ -12,6 +12,7 @@ export type OpSchema = EntityShape & {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256> | null;
 };
 export type OpAttr = keyof OpSchema;
 export type Schema = EntityShape & {
@@ -19,6 +20,7 @@ export type Schema = EntityShape & {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256> | null;
     actionAuth$path?: Array<ActionAuth.Schema>;
     actionAuth$path$$aggr?: AggregationResult<ActionAuth.Schema>;
     relationAuth$path?: Array<RelationAuth.Schema>;
@@ -39,6 +41,7 @@ type AttrFilter = {
     value: Q_StringValue;
     recursive: Q_BooleanValue;
     sourceEntity: Q_StringValue;
+    desc: Q_StringValue;
     actionAuth$path: ActionAuth.Filter & SubQueryPredicateMetadata;
     relationAuth$path: RelationAuth.Filter & SubQueryPredicateMetadata;
     modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
@@ -56,6 +59,7 @@ export type Projection = {
     value?: number;
     recursive?: number;
     sourceEntity?: number;
+    desc?: number;
     actionAuth$path?: ActionAuth.Selection & {
         $entity: "actionAuth";
     };
@@ -100,6 +104,8 @@ export type SortAttr = {
     recursive: number;
 } | {
     sourceEntity: number;
+} | {
+    desc: number;
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;

package/lib/base-app-domain/Path/Storage.js

@@ -28,6 +28,12 @@ exports.desc = {
             params: {
                 length: 32
             }
+        },
+        desc: {
+            type: "varchar",
+            params: {
+                length: 256
+            }
         }
     },
     static: true,

package/lib/compiler/dependencyBuilder.js

@@ -96,11 +96,13 @@ function destructVariableDeclaration(vd) {
     (0, assert_1.default)(ts.isIdentifier(vd.name));
     (0, assert_1.default)(vd.name.text.startsWith('total'));
     const on = (0, string_1.firstLetterLowerCase)(vd.name.text.slice(5));
-    const { initializer } = vd;
-    (0, assert_1.default)(ts.isCallExpression(initializer));
-    (0, assert_1.default)(ts.isIdentifier(initializer.expression) && initializer.expression.text === 'mergeConcatMany');
-    (0, assert_1.default)(initializer.arguments.length === 1);
-    const [arg] = initializer.arguments;
+    const { initializer: nonNullExpression } = vd;
+    (0, assert_1.default)(ts.isNonNullExpression(nonNullExpression));
+    const { expression: callExpression } = nonNullExpression;
+    (0, assert_1.default)(ts.isCallExpression(callExpression));
+    (0, assert_1.default)(ts.isIdentifier(callExpression.expression) && callExpression.expression.text === 'mergeConcatMany');
+    (0, assert_1.default)(callExpression.arguments.length === 1);
+    const [arg] = callExpression.arguments;
     (0, assert_1.default)(ts.isAsExpression(arg));
     const { expression } = arg;
     (0, assert_1.default)(ts.isArrayLiteralExpression(expression));
@@ -276,17 +278,17 @@ function outputRuntimeCxt(dependencies, briefNames, sourceFile, printer, filenam
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
     console.log(`构建${filename}文件成功`);
 }
-function outputDependentContext(depGraph, printer, filename) {
+function outputContext(depGraph, sourceFile, printer, filename) {
     // 目前只支持单向依赖，未来可以利用mixin来实现多类的继承
     // assert(depGraph.roots.length <= 1);
     let root = depGraph.ascOrder.length > 0 ? depGraph.ascOrder[depGraph.ascOrder.length - 1] : 'oak-frontend-base';
-    const statements = [
-        factory.createExportDeclaration(undefined, false, factory.createNamedExports([
-            factory.createExportSpecifier(false, undefined, factory.createIdentifier("BackendRuntimeContext")),
-            factory.createExportSpecifier(false, undefined, factory.createIdentifier("FrontendRuntimeContext"))
-        ]), factory.createStringLiteral(root), undefined)
+    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}/es/context/${isBackend ? 'BackendRuntimeContext' : 'FrontendRuntimeContext'}`), undefined),
+        ...statements
     ];
-    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS));
+    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements2), sourceFile);
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
     console.log(`构建${filename}文件成功`);
 }
@@ -480,17 +482,6 @@ function outputIntializeDev(cwd, dependencies, briefNames, sourceFile, printer,
                 objectDict.common = [variableName];
             }
         }
-        // render
-        if ((0, fs_1.existsSync)(join(destDir, 'configuration', 'render.js'))) {
-            const variableName = `${briefNames[idx]}Render`;
-            importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(variableName), undefined), factory.createStringLiteral(join(dep, destDirName, 'configuration', 'render')), undefined));
-            if (objectDict.render) {
-                objectDict.render.push(variableName);
-            }
-            else {
-                objectDict.render = [variableName];
-            }
-        }
         // features
         if ((0, fs_1.existsSync)(join(destDir, 'features'))) {
             importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
@@ -689,20 +680,6 @@ function outputIntializeFeatures(cwd, dependencies, briefNames, sourceFile, prin
                 factory.createTypeReferenceNode('EntityDict')
             ])))
         });
-        Object.assign(funcStmt.body, {
-            statements: [
-                ...features.map((ele, idx) => {
-                    const args = [
-                        factory.createIdentifier("features"),
-                    ];
-                    if (dependencies[idx] === 'oak-general-business') {
-                        args.push(factory.createIdentifier("accessConfiguration"));
-                    }
-                    return factory.createExpressionStatement(factory.createAwaitExpression(factory.createCallExpression(factory.createIdentifier(`initialize${(0, string_1.firstLetterUpperCase)(ele)}Features`), undefined, args)));
-                }).flat(),
-                ...funcStmt.body.statements,
-            ]
-        });
     }
     const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements2), sourceFile);
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
@@ -778,18 +755,6 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
         const moduleDir = join(cwd, 'node_modules', dep);
         const moduleTemplateDir = join(moduleDir, 'template');
         if ((0, fs_1.existsSync)(moduleTemplateDir)) {
-            const entitiesDir = join(moduleTemplateDir, 'entities');
-            if ((0, fs_1.existsSync)(entitiesDir)) {
-                // entities目录下的定义直接拷贝过去（如果尚不存在的话）
-                const prjEntitiesDir = join(cwd, 'src', 'entities');
-                const result = (0, fs_1.readdirSync)(entitiesDir);
-                result.forEach((filename) => {
-                    if (!(0, fs_1.existsSync)(join(prjEntitiesDir, filename))) {
-                        console.log(`拷贝${join(entitiesDir, filename)}到${prjEntitiesDir}目录下`);
-                        (0, fs_extra_1.copySync)(join(entitiesDir, filename), join(prjEntitiesDir, filename));
-                    }
-                });
-            }
             // data.ts中规定的初始化数据，拷贝到data目录下，并注入到data/index.ts
             const dataFile = join(moduleTemplateDir, 'data', 'data.ts');
             if ((0, fs_1.existsSync)(dataFile)) {
@@ -868,7 +833,9 @@ function buildDependency(rebuild) {
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'RuntimeCxt.ts'),
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'DependentExceptions.ts'),
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'polyfill.d.ts'),
-        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'features/index.ts')
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'features/index.ts'),
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'BackendRuntimeContext.ts'),
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'FrontendRuntimeContext.ts')
     ];
     const program = ts.createProgram(templateFileList, {});
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
@@ -895,13 +862,6 @@ function buildDependency(rebuild) {
             outputIntializeFeatures(cwd, dependencies, briefNames, program.getSourceFile(templateFileList[2]), printer, initFeaturesFile);
         }
     }
-    const dependentContextFile = join(cwd, 'src', 'context', 'DependentContext.ts');
-    if ((0, fs_1.existsSync)(dependentContextFile) && !rebuild) {
-        console.log(`[${dependentContextFile}]文件已经存在，无需构建启动文件`);
-    }
-    else {
-        outputDependentContext(depGraph, printer, dependentContextFile);
-    }
     const runtimeCxtFile = join(cwd, 'src', 'types', 'RuntimeCxt.ts');
     if ((0, fs_1.existsSync)(runtimeCxtFile) && !rebuild) {
         console.log(`[${runtimeCxtFile}]文件已经存在，无需构建启动文件`);
@@ -930,6 +890,20 @@ function buildDependency(rebuild) {
     else {
         outputFeatureIndex(dependencies, briefNames, program.getSourceFile(templateFileList[6]), printer, featureIndexFile, isModule);
     }
+    let contextFile = join(cwd, 'src', 'context', 'BackendRuntimeContext.ts');
+    if ((0, fs_1.existsSync)(contextFile) && !rebuild) {
+        console.log(`[${contextFile}]文件已经存在，无需构建启动文件`);
+    }
+    else {
+        outputContext(depGraph, program.getSourceFile(templateFileList[7]), printer, contextFile);
+    }
+    contextFile = join(cwd, 'src', 'context', 'FrontendRuntimeContext.ts');
+    if ((0, fs_1.existsSync)(contextFile) && !rebuild) {
+        console.log(`[${contextFile}]文件已经存在，无需构建启动文件`);
+    }
+    else {
+        outputContext(depGraph, program.getSourceFile(templateFileList[8]), printer, contextFile);
+    }
     // 把各个依赖项目的一些初始化的文件拷贝过去
     if (!isModule) {
         tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer);

package/lib/compiler/routerBuilder.js

@@ -119,7 +119,7 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
         const children = Object.values(pages).filter((ele) => ele.hasWeb).map(({ path, oakDisablePulldownRefresh }) => {
             const properties = [
                 factory.createPropertyAssignment('path', factory.createStringLiteral(path)),
-                factory.createPropertyAssignment('namespace', factory.createStringLiteral(path2)),
+                factory.createPropertyAssignment('namespace', factory.createStringLiteral(ns)),
                 factory.createPropertyAssignment('meta', factory.createObjectLiteralExpression([
                     factory.createPropertyAssignment('oakDisablePulldownRefresh', oakDisablePulldownRefresh ? factory.createTrue() : factory.createFalse())
                 ])),

package/lib/entities/Path.d.ts

@@ -5,4 +5,5 @@ export interface Schema extends EntityShape {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256>;
 }

package/lib/entities/Path.js

@@ -26,9 +26,10 @@ const entityDesc = {
             name: '关系路径',
             attr: {
                 sourceEntity: '源对象',
-                value: '路径（从dest到source）',
+                value: '路径',
                 destEntity: '目标对象',
-                recursive: '是否递归（目标对象）',
+                recursive: '是否递归',
+                desc: '描述',
             },
         },
     },

package/lib/types/Exception.d.ts

@@ -8,8 +8,14 @@ export declare class OakException<ED extends EntityDict> extends Error {
         name: string;
         message: string;
         opRecords: OpRecord<ED>[];
+        tag1: string | undefined;
+        tag2: boolean | undefined;
+        tag3: any;
     };
     toString(): string;
+    tag1?: string;
+    tag2?: boolean;
+    tag3?: any;
 }
 export declare class OakMakeSureByMySelfException<ED extends EntityDict> extends OakException<ED> {
 }

package/lib/types/Exception.js

@@ -37,11 +37,18 @@ class OakException extends Error {
             name: this.constructor.name,
             message: this.message,
             opRecords: this.opRecords,
+            tag1: this.tag1,
+            tag2: this.tag2,
+            tag3: this.tag3,
         };
     }
     toString() {
         return JSON.stringify(this.getSerialData());
     }
+    // 留三个tag1供其它类使用
+    tag1;
+    tag2;
+    tag3;
 }
 exports.OakException = OakException;
 // 这个异常表示模块自己处理跨事务一致性，框架pass（在分布式数据传递时会用到）

package/lib/utils/row.d.ts

@@ -0,0 +1,12 @@
+import { EntityDict } from '../types/Entity';
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+import { StorageSchema } from '../types';
+export declare function compareRow<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(schema: StorageSchema<ED>, entity: T, row1: Partial<ED[T]['Schema']>, row2: Partial<ED[T]['Schema']>): boolean;
+/**
+ * 比较两行数据是否完全相等
+ * @param entity
+ * @param schema
+ * @param row1
+ * @param row2
+ */
+export declare function compareRows<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(schema: StorageSchema<ED>, entity: T, rows1: Partial<ED[T]['Schema']>[], rows2: Partial<ED[T]['Schema']>[]): boolean;

package/lib/utils/row.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareRows = exports.compareRow = void 0;
+const tslib_1 = require("tslib");
+const lodash_1 = require("./lodash");
+const relation_1 = require("../store/relation");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+function compareRow(schema, entity, row1, row2) {
+    const attrs1 = Object.keys(row1).filter(ele => !ele.startsWith('$$'));
+    const attrs2 = Object.keys(row2).filter(ele => !ele.startsWith('$$'));
+    if ((0, lodash_1.difference)(attrs1, attrs2).length > 0) {
+        return false;
+    }
+    for (const attr of attrs1) {
+        const rel = (0, relation_1.judgeRelation)(schema, entity, attr);
+        if (rel === 0) {
+            continue;
+        }
+        else if (rel === 1) {
+            if (row1[attr] !== row2[attr]) {
+                return false;
+            }
+        }
+        else if (rel === 2) {
+            if (!compareRow(schema, attr, row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+        else if (typeof rel === 'string') {
+            if (!compareRow(schema, rel, row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+        else {
+            (0, assert_1.default)(rel instanceof Array);
+            // 如果两组对象一样但顺序不一样怎么办？暂时应该不用考虑这种情况，因为只有前台runningTree使用（by Xc)
+            if (!compareRows(schema, rel[0], row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+exports.compareRow = compareRow;
+/**
+ * 比较两行数据是否完全相等
+ * @param entity
+ * @param schema
+ * @param row1
+ * @param row2
+ */
+function compareRows(schema, entity, rows1, rows2) {
+    if (rows1.length !== rows2.length) {
+        return false;
+    }
+    let idx = 0;
+    while (idx < rows1.length) {
+        const row1 = rows1[idx];
+        const row2 = rows2[idx];
+        if (!compareRow(schema, entity, row1, row2)) {
+            return false;
+        }
+        idx++;
+    }
+    return true;
+}
+exports.compareRows = compareRows;

package/package.json

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

package/src/entities/Path.ts

@@ -7,6 +7,7 @@ export interface Schema extends EntityShape {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256>;
 };
 
 const entityDesc: EntityDesc<Schema> = {
@@ -34,9 +35,10 @@ const entityDesc: EntityDesc<Schema> = {
             name: '关系路径',
             attr: {
                 sourceEntity: '源对象',
-                value: '路径（从dest到source）',
+                value: '路径',
                 destEntity: '目标对象',
-                recursive: '是否递归（目标对象）',
+                recursive: '是否递归',
+                desc: '描述',
             },
         },
     },