oak-domain 5.1.7 → 5.1.8

package/lib/compiler/schemalBuilder.js

@@ -173,7 +173,8 @@ function checkActionDefNameConsistent(filename, actionDefNode) {
     const adfName = name.text.slice(0, name.text.length - 9);
     const aName = actionNode.typeName.text.slice(0, actionNode.typeName.text.length - 6);
     const sName = stateNode.typeName.text.slice(0, stateNode.typeName.text.length - 5);
-    (0, assert_1.default)(adfName === aName && aName === sName, `文件${filename}中的ActionDef${name.text}中ActionDef, Action和State的命名规则不一致`);
+    (0, assert_1.default)(adfName === aName && aName === sName, `文件${filename}中的ActionDef${name.text}中ActionDef, Action和State的命名规则不一致， 需要
+        ${adfName}ActionDef, ${adfName}Action, ${adfName}State`);
 }
 function checkStringLiteralLegal(filename, obj, text, ele) {
     (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), `${filename}中引用的${obj} ${text}中存在不是stringliteral的类型`);
@@ -279,7 +280,7 @@ function tryGetStringLiteralValues(moduleName, filename, obj, node, program) {
             }).filter(ele => !!ele));
         }
         if (['state', 'action'].includes(obj)) {
-            (0, assert_1.default)(values.length > 0);
+            (0, assert_1.default)(values.length > 0, `${filename}中的${obj} ${node.typeName.getText()}未定义`);
             const importDeclartion = declaration.parent.parent.parent;
             (0, assert_1.default)(ts.isImportDeclaration(importDeclartion));
             addImportedFrom(moduleName, declaration.name.text, importDeclartion);
@@ -572,54 +573,54 @@ function analyzeImportDeclaration(node, referencedSchemas, additionalImports, fi
  * @param filename
  * @returns
  */
-function getImportedFilePath(path, fileSpecifierPath, filename) {
-    let importedFilepath = '';
-    const getExistedFileName = () => {
-        if ((0, fs_1.existsSync)(`${importedFilepath}.ts`)) {
-            return `${importedFilepath}.ts`;
-        }
-        else if ((0, fs_1.existsSync)(`${importedFilepath}.d.ts`)) {
-            return `${importedFilepath}.d.ts`;
-        }
-        return '';
-    };
-    if (fileSpecifierPath.startsWith('.')) {
-        importedFilepath = path_1.default.join(path, fileSpecifierPath);
-        const importedFilename = getExistedFileName();
-        (0, assert_1.default)(importedFilename, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
-        return importedFilename;
-    }
-    else {
-        const cwd = process.cwd();
-        const fileSpecifierPaths = fileSpecifierPath.split('/');
-        const moduleName = fileSpecifierPaths[0] || fileSpecifierPaths[1];
-        (0, assert_1.default)(moduleName);
-        // 从path向外找package.json -> node_modules直至找到fileSpecifier
-        const paths = path.split('/');
-        for (let iter = paths.length; iter >= 0; iter--) {
-            const paths2 = paths.slice(0, iter);
-            const pkgJsonPath = path_1.default.join(cwd, ...paths2, 'package.json');
-            if ((0, fs_1.existsSync)(pkgJsonPath)) {
-                const pkgJson = require(pkgJsonPath);
-                if (pkgJson.dependencies?.hasOwnProperty(moduleName)) {
-                    const dependentPath = pkgJson.dependencies[moduleName];
-                    if (dependentPath.trimStart().startsWith('file:')) {
-                        const dependentFilePath = dependentPath.trimStart().slice(5);
-                        importedFilepath = path_1.default.join(pkgJsonPath, '..', dependentFilePath, ...(fileSpecifierPaths[0] ? fileSpecifierPaths.slice(1) : (fileSpecifierPaths.slice(2))));
-                    }
-                    else {
-                        importedFilepath = path_1.default.join(pkgJsonPath, '..', 'node_modules', fileSpecifierPath);
-                    }
-                    const importedFilename = getExistedFileName();
-                    if (importedFilename) {
-                        return importedFilename;
-                    }
-                }
-            }
-        }
-    }
-    (0, assert_1.default)(false, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
-}
+// function getImportedFilePath(path: string, fileSpecifierPath: string, filename: string) {
+//     let importedFilepath = '';
+//     const getExistedFileName = () => {
+//         if (existsSync(`${importedFilepath}.ts`)) {
+//             return `${importedFilepath}.ts`;
+//         }
+//         else if (existsSync(`${importedFilepath}.d.ts`)) {
+//             return `${importedFilepath}.d.ts`;
+//         }
+//         return '';
+//     };
+//     if (fileSpecifierPath.startsWith('.')) {
+//         importedFilepath = PathLib.join(path, fileSpecifierPath);
+//         const importedFilename = getExistedFileName();
+//         assert(importedFilename, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
+//         return importedFilename;
+//     }
+//     else {
+//         const cwd = process.cwd();
+//         const fileSpecifierPaths = fileSpecifierPath.split('/');
+//         const moduleName = fileSpecifierPaths[0] || fileSpecifierPaths[1];
+//         assert(moduleName);
+//         // 从path向外找package.json -> node_modules直至找到fileSpecifier
+//         const paths = path.split('/');
+//         for (let iter = paths.length; iter >= 0; iter--) {
+//             const paths2 = paths.slice(0, iter);
+//             const pkgJsonPath = PathLib.join(cwd, ...paths2, 'package.json');
+//             if (existsSync(pkgJsonPath)) {
+//                 const pkgJson = require(pkgJsonPath);
+//                 if (pkgJson.dependencies?.hasOwnProperty(moduleName)) {
+//                     const dependentPath = pkgJson.dependencies[moduleName] as string;
+//                     if (dependentPath.trimStart().startsWith('file:')) {
+//                         const dependentFilePath = dependentPath.trimStart().slice(5);
+//                         importedFilepath = PathLib.join(pkgJsonPath, '..', dependentFilePath, ...(fileSpecifierPaths[0] ? fileSpecifierPaths.slice(1) : (fileSpecifierPaths.slice(2))));
+//                     }
+//                     else {
+//                         importedFilepath = PathLib.join(pkgJsonPath, '..', 'node_modules', fileSpecifierPath);
+//                     }
+//                     const importedFilename = getExistedFileName();
+//                     if (importedFilename) {
+//                         return importedFilename;
+//                     }
+//                 }
+//             }
+//         }
+//     }
+//     assert(false, `「${filename}」中import路径${fileSpecifierPath}找不到对应的声明`);
+// }
 function analyzeSchemaDefinition(node, moduleName, filename, path, program, referencedSchemas, schemaAttrs, enumAttributes, importAttrFrom, relativePath) {
     let hasEntityAttr = false;
     let hasEntityIdAttr = false;
@@ -647,10 +648,17 @@ function analyzeSchemaDefinition(node, moduleName, filename, path, program, refe
         (0, assert_1.default)(ts.isStringLiteral(moduleSpecifier));
         const { text: from } = moduleSpecifier;
         extendsFrom.push(from);
-        const importedFilename = getImportedFilePath(path, from, filename);
-        const sourceFile = program.getSourceFile(importedFilename);
-        (0, assert_1.default)(sourceFile, `「${filename}」找不到相应的sourceFile：${importedFilename}`);
-        const relativeFilename = path_1.default.relative(process.cwd(), importedFilename);
+        // 创建编译器主机
+        const compilerHost = ts.createCompilerHost(program.getCompilerOptions());
+        // 解析模块
+        const resolvedModule = ts.resolveModuleName(from, filename, program.getCompilerOptions(), compilerHost);
+        (0, assert_1.default)(resolvedModule.resolvedModule, "找不到module定义");
+        const resolvedFileName = resolvedModule.resolvedModule.resolvedFileName;
+        const sourceFile = program.getSourceFile(resolvedFileName);
+        // const importedFilename = getImportedFilePath(path, from, filename);
+        // const sourceFile = program.getSourceFile(importedFilename);
+        (0, assert_1.default)(sourceFile, `「${filename}」找不到相应的sourceFile：${resolvedFileName}`);
+        const relativeFilename = path_1.default.relative(process.cwd(), resolvedFileName);
         const result = analyzeReferenceSchemaFile(moduleName, path_1.default.basename(relativeFilename), path_1.default.dirname(relativeFilename), sourceFile, program, referencedSchemas, schemaAttrs, enumAttributes, importAttrFrom, path_1.default.join(from, '..'));
         return result;
     }).filter(ele => !!ele);
@@ -3458,7 +3466,7 @@ function outputLocale(outputDir, printer) {
                 ]), sourceFile);
                 const data = Function(result)();
                 const filename = path_1.default.join(outputDir, entity, 'locales', `${lng}.json`);
-                (0, fs_1.writeFileSync)(filename, JSON.stringify(data), { flag: 'w' });
+                (0, fs_1.writeFileSync)(filename, JSON.stringify(data, null, 2), { flag: 'w' });
                 if (locales[lng]) {
                     locales[lng].push(entity);
                 }

package/lib/entities/I18n.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const entityDesc = {
     locales: {
         zh_CN: {
-            name: '用户授权',
+            name: 'i18n',
             attr: {
                 module: '模块',
                 position: '文件位置',

package/lib/store/IntrinsicCheckers.js

@@ -331,6 +331,7 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                 const actions = condition.map(ele => ele?.actions).filter(ele => !!ele);
                 const a = actions.length > 0 && (0, lodash_1.intersection)(actions.flat());
                 if (a) {
+                    (0, assert_1.default)(action);
                     if (!a.includes(action)) {
                         // 找到不满足的那个attr
                         const attrsIllegal = attrs.filter((attr) => matrix[attr]?.actions && !matrix[attr]?.actions?.includes(action));

package/lib/store/TriggerExecutor.js

@@ -253,10 +253,13 @@ class TriggerExecutor {
                     cxtStr2 = data.$$triggerData$$?.cxtStr;
                 }
                 const record = opRecords.find(ele => ele.id === operation.id);
-                // 目前框架在operation时，一定会将ids记录在operation当中（见CascadeStore中的doUpdateSingleRowAsync函数
-                (0, assert_1.default)(record && record.a !== 'c');
-                const { f } = record;
-                ids = f.id.$in;
+                if (record) {
+                    // 目前框架在operation时，一定会将ids记录在operation当中（见CascadeStore中的doUpdateSingleRowAsync函数
+                    // 但也有一种可能，此operation没有更新任何一行。by Xc 20241022
+                    (0, assert_1.default)(record.a !== 'c');
+                    const { f } = record;
+                    ids = f.id.$in;
+                }
             }
             // 此时项目的上下文，和执行此trigger时的上下文可能不一致（rootMode），采用当时的上下文cxtStr来执行
             this.onVolatileTrigger(entity, trigger, ids, cxtStr2, option);
@@ -348,12 +351,12 @@ class TriggerExecutor {
     async execVolatileTrigger(entity, name, ids, context, option) {
         const trigger = this.triggerNameMap[name];
         (0, assert_1.default)(trigger && trigger.when === 'commit');
-        (0, assert_1.default)(ids.length > 0);
+        // assert(ids.length > 0);
         const { fn } = trigger;
         const closeRoot = trigger.asRoot && context.openRootMode();
         try {
             const callback = await fn({ ids }, context, option);
-            if (trigger.strict === 'makeSure') {
+            if (trigger.strict === 'makeSure' && ids.length) {
                 // 这里开root模式，否则还可能有权限问题
                 const closeRoot2 = context.openRootMode();
                 try {

package/lib/store/triggers.js

@@ -362,41 +362,25 @@ exports.logTriggers = [
             return (result.oper?.remove || 0) + (result2.log?.remove || 0);
         }
     },
-    // 在删除log时，解除与此log关联的oper
+    // 在删除log时，删除与此log关联的oper
     {
-        name: '当删除log时，解除与此log关联的oper',
+        name: '当删除log时，删除与此log关联的oper',
         entity: 'log',
         action: 'remove',
         when: 'before',
         fn: async ({ operation }, context) => {
             const { filter } = operation;
             (0, assert_1.default)(filter);
-            // 查询这次删除操作涉及到的所有log 
-            const logs = await context.select('log', {
-                data: {
-                    id: 1,
-                    oper$log: {
-                        $entity: 'oper',
-                        data: {
-                            id: 1,
-                        },
-                    },
-                },
-                filter,
+            // 查询这次删除操作涉及到的所有log
+            const result = await context.operate('oper', {
+                id: "dummy",
+                action: 'remove',
+                data: {},
+                filter: {
+                    log: filter,
+                }
             }, {});
-            const operIds = logs.flatMap(log => log.oper$log.map(oper => oper.id));
-            let result = 0;
-            for (const operId of operIds) {
-                const result2 = await context.operate('oper', {
-                    id: operId,
-                    action: 'update',
-                    data: {
-                        logId: null,
-                    },
-                }, {});
-                result += result2.oper?.update || 0;
-            }
-            return result;
+            return result.oper?.remove || 0;
         }
     },
 ];

package/lib/types/Connector.d.ts

@@ -42,4 +42,5 @@ export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt exte
     getFullData: (keys?: (keyof ED)[]) => Promise<{
         [T in keyof ED]?: ED[T]['OpSchema'][];
     }>;
+    getCorsHeader: () => string[];
 }

package/lib/types/Exception.d.ts

@@ -72,6 +72,8 @@ export declare class OakNetworkException<ED extends EntityDict & BaseEntityDict>
 }
 export declare class OakServerProxyException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
+export declare class OakClockDriftException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+}
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
  *
@@ -128,7 +130,7 @@ export declare class OakUnloggedInException<ED extends EntityDict & BaseEntityDi
     constructor(message?: string);
 }
 /**
- * 用户未登录抛的异常
+ * 行数据被锁抛的异常
  */
 export declare class OakRowLockedException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     constructor(message?: string);

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+exports.makeException = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakClockDriftException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -173,10 +173,14 @@ exports.OakImportDataParseException = OakImportDataParseException;
 class OakNetworkException extends OakException {
 }
 exports.OakNetworkException = OakNetworkException;
-// 
+// 请求未到达应用服务程序
 class OakServerProxyException extends OakException {
 }
 exports.OakServerProxyException = OakServerProxyException;
+// 时钟漂移过久（重放攻击）
+class OakClockDriftException extends OakException {
+}
+exports.OakClockDriftException = OakClockDriftException;
 // 在系统更新数据时，以下三个异常应按规范依次抛出。
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
@@ -294,7 +298,7 @@ class OakUnloggedInException extends OakUserException {
 exports.OakUnloggedInException = OakUnloggedInException;
 ;
 /**
- * 用户未登录抛的异常
+ * 行数据被锁抛的异常
  */
 class OakRowLockedException extends OakUserException {
     constructor(message) {
@@ -479,6 +483,10 @@ function makeException(data) {
             e = new OakNetworkException(data.message);
             break;
         }
+        case 'OakClockDriftException': {
+            e = new OakClockDriftException(data.message);
+            break;
+        }
         case 'OakServerProxyException': {
             e = new OakServerProxyException(data.message);
             break;

package/lib/utils/SimpleConnector.d.ts

@@ -17,11 +17,15 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
     private configuration;
     private makeException;
     constructor(configuration: AccessConfiguration, makeException: (exceptionData: any) => OakException<ED>);
+    getCorsHeader(): string[];
     protected makeHeadersAndBody(name: string, data: any, context?: FrontCxt): Promise<{
-        headers: Record<string, string>;
+        headers: {
+            'oak-cxt': string;
+            'oak-aspect': string;
+        };
         body: FormData;
     } | {
-        headers: HeadersInit;
+        headers: Record<string, string>;
         body: string;
     }>;
     protected parseAspectResult(response: Response): Promise<{

package/lib/utils/SimpleConnector.js

@@ -41,6 +41,12 @@ class SimpleConnector {
             SimpleConnector.SUBSCRIBE_POINT_ROUTER}`;
         this.makeException = makeException;
     }
+    getCorsHeader() {
+        return [
+            'oak-cxt',
+            'oak-aspect'
+        ];
+    }
     async makeHeadersAndBody(name, data, context) {
         const cxtStr = context ? await context.toString() : '{}';
         const headers = {
@@ -48,6 +54,7 @@ class SimpleConnector {
             'oak-aspect': name,
         };
         if (process.env.OAK_PLATFORM !== 'wechatMp') {
+            // 小程序环境下没有FormData，跑到这里会挂
             if (data instanceof FormData) {
                 return {
                     headers,

package/package.json

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

package/src/entities/I18n.ts

@@ -13,7 +13,7 @@ export interface Schema extends EntityShape {
 const entityDesc: EntityDesc<Schema> = {
     locales: {
         zh_CN: {
-            name: '用户授权',
+            name: 'i18n',
             attr: {
                 module: '模块',
                 position: '文件位置',