interaqt 0.1.0

package/dist/storage/erstorage/MatchExp.js

@@ -0,0 +1,211 @@
+import { BoolExp } from "@shared";
+import { assert } from "../utils.js";
+import { RecordQueryTree } from "./RecordQuery.js";
+export class MatchExp {
+    static atom(condition) {
+        assert(condition.key !== undefined, 'key cannot be undefined');
+        assert(Array.isArray(condition.value) && condition.value.length === 2, 'value must be array');
+        assert(condition.value[1] !== undefined, `${condition.key} value cannot be undefined`);
+        return BoolExp.atom(condition);
+    }
+    // TODO 支持更复杂的格式
+    static fromObject(condition) {
+        let root;
+        Object.entries(condition).forEach(([key, value]) => {
+            if (!root) {
+                root = MatchExp.atom({ key, value: ['=', value] });
+            }
+            else {
+                root = root.and({ key, value: ['=', value] });
+            }
+        });
+        return root;
+    }
+    constructor(entityName, map, data, contextRootEntity, fromRelation) {
+        this.entityName = entityName;
+        this.map = map;
+        this.data = data;
+        this.contextRootEntity = contextRootEntity;
+        this.fromRelation = fromRelation;
+        this.xToOneQueryTree = new RecordQueryTree(this.entityName, this.map);
+        if (this.data) {
+            assert(this.data instanceof BoolExp, `match data is not a BoolExpression instance, you passed: ${this.data}`);
+            this.buildQueryTree(this.data, this.xToOneQueryTree);
+        }
+    }
+    buildQueryTree(matchData, recordQueryTree) {
+        if (matchData.isExpression()) {
+            if (matchData.left) {
+                this.buildQueryTree(matchData.left, recordQueryTree);
+            }
+            if (matchData.right) {
+                this.buildQueryTree(matchData.right, recordQueryTree);
+            }
+        }
+        else {
+            // variable
+            const matchAttributePath = matchData.data.key.split('.');
+            const namePath = [this.entityName].concat(matchAttributePath);
+            const attributeInfo = this.map.getInfoByPath(namePath);
+            // 直接就是 value 的情况不用管，没有 query 其他的实体。
+            //  CAUTION 还有最后路径是 entity 但是  match 值是 EXIST 的不用管，因为会生成 exist 子句。只不过这里也不用特别处理，join 的表没用到会自动数据库忽略。
+            if ((matchAttributePath.length === 1 && attributeInfo.isValue)) {
+                return;
+            }
+            const manyToManySymmetricPaths = this.map.spawnManyToManySymmetricPath(namePath);
+            if (attributeInfo.isRecord) {
+                if (manyToManySymmetricPaths) {
+                    recordQueryTree.addRecord(manyToManySymmetricPaths[0].slice(1, Infinity));
+                    recordQueryTree.addRecord(manyToManySymmetricPaths[1].slice(1, Infinity));
+                }
+                else {
+                    recordQueryTree.addRecord(matchAttributePath);
+                }
+            }
+            else {
+                if (manyToManySymmetricPaths) {
+                    recordQueryTree.addField(manyToManySymmetricPaths[0].slice(1, Infinity));
+                    recordQueryTree.addField(manyToManySymmetricPaths[1].slice(1, Infinity));
+                }
+                else {
+                    // 最后一个是 attribute，所以不在 recordQueryTree 上。
+                    recordQueryTree.addField(matchAttributePath);
+                }
+            }
+        }
+    }
+    getFinalFieldName(matchAttributePath) {
+        const namePath = [this.entityName].concat(matchAttributePath.slice(0, -1));
+        return this.map.getTableAliasAndFieldName(namePath, matchAttributePath.at(-1)).slice(0, 2);
+    }
+    getReferenceFieldValue(valueStr) {
+        const matchAttributePath = valueStr.split('.');
+        const [tableAlias, rawFieldName] = this.map.getTableAliasAndFieldName([this.contextRootEntity || this.entityName].concat(matchAttributePath.slice(0, -1)), matchAttributePath.at(-1));
+        return `${tableAlias}.${rawFieldName}`;
+    }
+    getFinalFieldValue(isReferenceValue, key, value, fieldName, fieldType, p, db) {
+        let fieldValue = '';
+        let fieldParams = [];
+        const simpleOp = ['=', '>', '<', '<=', '>=', 'like', '!='];
+        if (simpleOp.includes(value[0]) || (value[0] === 'not' && value[1] !== null)) {
+            fieldValue = `${value[0]} ${p()}`;
+            fieldParams = [isReferenceValue ? this.getReferenceFieldValue(value[1]) : value[1]];
+        }
+        else if ((value[0] === 'not' && value[1] === null)) {
+            fieldValue = `IS NOT NULL`;
+        }
+        else if (value[0].toLowerCase() === 'in') {
+            assert(!isReferenceValue, 'reference value cannot use IN to match');
+            fieldValue = `IN (${value[1].map((x) => p()).join(',')})`;
+            fieldParams = value[1];
+        }
+        else if (value[0].toLowerCase() === 'between') {
+            fieldValue = `BETWEEN ${p()} AND ${p()}`;
+            fieldParams = [
+                isReferenceValue ? this.getReferenceFieldValue(value[1][0]) : value[1][0],
+                isReferenceValue ? this.getReferenceFieldValue(value[1][1]) : value[1][1]
+            ];
+        }
+        else {
+            let result;
+            if (db) {
+                // JSON 操作符写法等由外部具体 db 实现
+                // FIXME 如果外部不知 value 的具体格式，又怎么知道这是一个 referenceValue ？？？这里要重新设计
+                result = db.parseMatchExpression?.(key, value, fieldName, fieldType, isReferenceValue, this.getReferenceFieldValue.bind(this), p);
+            }
+            if (result) {
+                fieldValue = result.fieldValue;
+                fieldParams = result.fieldParams || [];
+            }
+            else {
+                assert(result, `unknown value expression ${JSON.stringify(value)}`);
+            }
+        }
+        return [fieldValue, fieldParams];
+    }
+    buildFieldMatchExpression(p, db) {
+        if (!this.data)
+            return null;
+        // 1. 所有 key 要 build 成 field
+        // 2. x:n 关系中的 EXIST 要增加查询范围限制，要把 value 中对上层引用也 build 成 field。
+        return this.data.map((exp) => {
+            const matchAttributePath = exp.data.key.split('.');
+            const attributeInfo = this.map.getInfoByPath([this.entityName].concat(matchAttributePath));
+            const namePath = [this.entityName].concat(matchAttributePath);
+            const symmetricPaths = this.map.spawnManyToManySymmetricPath(namePath);
+            let sourcePath, targetPath;
+            if (symmetricPaths) {
+                // 要去除 头部 的 entity
+                sourcePath = symmetricPaths[0].slice(1, Infinity);
+                targetPath = symmetricPaths[1].slice(1, Infinity);
+            }
+            // 如果结尾是 value
+            // 如果极为是 entity，那么后面匹配条件目前只能支持 EXIST。
+            //  CAUTION 针对关联实体的属性匹配，到这里已经被拍平了，所以结尾是  entity 的情况必定都是函数匹配。
+            if (attributeInfo.isValue) {
+                // CAUTION 路径中只可能有一个 n:n symmetric 关系。因为路径中有多个的在语义逻辑上就不正确。
+                //  有一个的情况还是用在 findRelatedRecords 的时候才有意义。因为它会通过 id 限定关系，而即使是 n:n 的关系，任意两个实体中只会有一个关系数据。所以这个时候能找到唯一的数据，是有意义的。
+                const fieldNamePath = this.getFinalFieldName(matchAttributePath);
+                const [fieldValue, fieldParams] = this.getFinalFieldValue(exp.data.isReferenceValue, exp.data.key, exp.data.value, fieldNamePath.join('.'), attributeInfo.fieldType, p, db);
+                if (!symmetricPaths) {
+                    return {
+                        ...exp.data,
+                        fieldName: fieldNamePath,
+                        fieldValue,
+                        fieldParams
+                    };
+                }
+                // 这里一定要再生成一次，应为需要不同的 placeholder。
+                const [fieldValue2, fieldParams2] = this.getFinalFieldValue(exp.data.isReferenceValue, exp.data.key, exp.data.value, fieldNamePath.join('.'), attributeInfo.fieldType, p, db);
+                // CAUTION 注意这里 length -2 是因为  namePath 里面有 this.entityName
+                return BoolExp.atom({
+                    ...exp.data,
+                    fieldName: this.getFinalFieldName(sourcePath),
+                    fieldValue,
+                    fieldParams
+                }).or({
+                    ...exp.data,
+                    fieldName: this.getFinalFieldName(targetPath),
+                    fieldValue: fieldValue2,
+                    fieldParams: fieldParams2
+                });
+            }
+            else {
+                // CAUTION record 的情况只有可能 n:n 关系
+                // CAUTION 函数匹配的情况不管了，因为可能未来涉及到使用 cursor 实现更强的功能，这就涉及到查询计划的修改了。统统扔到上层去做。
+                //  注意，子查询中也可能对上层的引用，这个也放到上层好像能力有点重叠了。
+                if (!symmetricPaths) {
+                    return {
+                        ...exp.data,
+                        namePath,
+                        isFunctionMatch: true,
+                    };
+                }
+                const sourceNamePath = [this.entityName].concat(sourcePath);
+                const targetNamePath = [this.entityName].concat(targetPath);
+                assert(sourceNamePath.length === namePath.length, `symmetric entity match can only be last, ${sourceNamePath} ${namePath}`);
+                return BoolExp.atom({
+                    ...exp.data,
+                    namePath: sourceNamePath,
+                    isFunctionMatch: true,
+                }).or({
+                    ...exp.data,
+                    namePath: targetNamePath,
+                    isFunctionMatch: true,
+                });
+            }
+        });
+    }
+    and(condition) {
+        if (condition instanceof MatchExp) {
+            return new MatchExp(this.entityName, this.map, this.data ? this.data.and(condition.data) : condition.data, this.contextRootEntity);
+        }
+        else {
+            assert(condition.key !== undefined, 'key cannot be undefined');
+            assert(Array.isArray(condition.value) && condition.value.length === 2, 'value must be array');
+            assert(condition.value[1] !== undefined, `${condition.key} value cannot be undefined`);
+            return new MatchExp(this.entityName, this.map, this.data ? this.data.and(condition) : BoolExp.atom(condition), this.contextRootEntity);
+        }
+    }
+}
+//# sourceMappingURL=MatchExp.js.map

package/dist/storage/erstorage/MatchExp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchExp.js","sourceRoot":"","sources":["../../../src/storage/erstorage/MatchExp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAkBjD,MAAM,OAAO,QAAQ;IACV,MAAM,CAAC,IAAI,CAAC,SAAoB;QACnC,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,SAAS,EAAE,yBAAyB,CAAC,CAAA;QAC9D,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAA;QAC7F,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,4BAA4B,CAAC,CAAA;QACtF,OAAO,OAAO,CAAC,IAAI,CAAY,SAAS,CAAC,CAAA;IAC7C,CAAC;IACD,gBAAgB;IACT,MAAM,CAAC,UAAU,CAAC,SAAiB;QACtC,IAAI,IAAoC,CAAA;QACxC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAC,CAAC,CAAA;YACpD,CAAC;iBAAO,CAAC;gBACL,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAC,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAC,CAAC,CAAA;YAC/C,CAAC;QACP,CAAC,CAAC,CAAA;QACF,OAAO,IAAK,CAAA;IAChB,CAAC;IAID,YAAmB,UAAkB,EAAS,GAAqB,EAAS,IAA0B,EAAS,iBAA0B,EAAS,YAAsB;QAArJ,eAAU,GAAV,UAAU,CAAQ;QAAS,QAAG,GAAH,GAAG,CAAkB;QAAS,SAAI,GAAJ,IAAI,CAAsB;QAAS,sBAAiB,GAAjB,iBAAiB,CAAS;QAAS,iBAAY,GAAZ,YAAY,CAAU;QACpK,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QACrE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,OAAO,EAAE,4DAA4D,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC7G,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QACxD,CAAC;IACL,CAAC;IAED,cAAc,CAAC,SAA8B,EAAE,eAAgC;QAC3E,IAAI,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC;YAC3B,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;YACxD,CAAC;YAED,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;YACzD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,WAAW;YACX,MAAM,kBAAkB,GAAI,SAAS,CAAC,IAAI,CAAC,GAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACpE,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;YAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAA;YAEvD,oCAAoC;YACpC,kGAAkG;YAClG,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7D,OAAM;YACV,CAAC;YAED,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA;YAChF,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACzB,IAAI,wBAAwB,EAAE,CAAC;oBAC3B,eAAe,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;oBACzE,eAAe,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAC7E,CAAC;qBAAM,CAAC;oBACJ,eAAe,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;gBACjD,CAAC;YAEL,CAAC;iBAAM,CAAC;gBACJ,IAAI,wBAAwB,EAAE,CAAC;oBAC3B,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;oBACxE,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAC5E,CAAC;qBAAM,CAAC;oBACJ,0CAA0C;oBAC1C,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;gBAChD,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAGD,iBAAiB,CAAC,kBAA4B;QAC1C,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAqB,CAAA;IACnH,CAAC;IAED,sBAAsB,CAAC,QAAgB;QACnC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC9C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,CACjE,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EACnF,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAC7B,CAAA;QACD,OAAO,GAAG,UAAU,IAAI,YAAY,EAAE,CAAA;IAC1C,CAAC;IAED,kBAAkB,CAAC,gBAAyB,EAAE,GAAW,EAAE,KAAoB,EAAE,SAAgB,EAAE,SAA2B,EAAE,CAAiB,EAAE,EAAa;QAC5J,IAAI,UAAU,GAAE,EAAE,CAAA;QAClB,IAAI,WAAW,GAAS,EAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAE1D,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;YAC3E,UAAU,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAA;YACjC,WAAW,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACvF,CAAC;aAAM,IAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;YAClD,UAAU,GAAG,aAAa,CAAA;QAC9B,CAAC;aAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,CAAC,CAAC,gBAAgB,EAAE,wCAAwC,CAAC,CAAA;YACnE,UAAU,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;YAC9D,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;aAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;YAC9C,UAAU,GAAG,WAAW,CAAC,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAA;YACxC,WAAW,GAAG;gBACV,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5E,CAAA;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,MAAM,CAAA;YACV,IAAI,EAAE,EAAE,CAAC;gBACL,yBAAyB;gBACzB,+DAA+D;gBAC/D,MAAM,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,SAAU,EAAE,gBAAgB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YACtI,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACT,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;gBAC9B,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,EAAE,CAAA;YAC1C,CAAC;iBAAK,CAAC;gBACH,MAAM,CAAC,MAAM,EAAE,4BAA4B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAEvE,CAAC;QAEL,CAAC;QAED,OAAO,CAAC,UAAU,EAAE,WAAY,CAAC,CAAA;IACrC,CAAC;IAED,yBAAyB,CAAC,CAAiB,EAAE,EAAa;QACtD,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAA;QAC3B,4BAA4B;QAC5B,8DAA8D;QAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAiB,CAAC,GAAwB,EAAE,EAAE;YAC9D,MAAM,kBAAkB,GAAI,GAAG,CAAC,IAAI,CAAC,GAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAE,CAAA;YAE3F,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;YAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAA;YAEtE,IAAI,UAAU,EAAE,UAAU,CAAA;YAC1B,IAAI,cAAc,EAAE,CAAC;gBACjB,kBAAkB;gBAClB,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;gBACjD,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACrD,CAAC;YAGD,cAAc;YACd,qCAAqC;YACrC,4DAA4D;YAC5D,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBACxB,0DAA0D;gBAC1D,4GAA4G;gBAE5G,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAA;gBAChE,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAiB,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;gBAE7K,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClB,OAAO;wBACH,GAAG,GAAG,CAAC,IAAI;wBACX,SAAS,EAAE,aAAa;wBACxB,UAAU;wBACV,WAAW;qBACd,CAAA;gBACL,CAAC;gBAED,kCAAkC;gBAClC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAiB,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;gBAE/K,2DAA2D;gBAC3D,OAAO,OAAO,CAAC,IAAI,CAAiB;oBAChC,GAAG,GAAG,CAAC,IAAI;oBACX,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAW,CAAC;oBAC9C,UAAU;oBACV,WAAW;iBACd,CAAC,CAAC,EAAE,CAAC;oBACF,GAAG,GAAG,CAAC,IAAI;oBACX,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAW,CAAC;oBAC9C,UAAU,EAAE,WAAW;oBACvB,WAAW,EAAE,YAAY;iBAC5B,CAAC,CAAA;YAEN,CAAC;iBAAM,CAAC;gBACJ,gCAAgC;gBAEhC,wEAAwE;gBACxE,sCAAsC;gBACtC,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClB,OAAO;wBACH,GAAG,GAAG,CAAC,IAAI;wBACX,QAAQ;wBACR,eAAe,EAAE,IAAI;qBACxB,CAAA;gBACL,CAAC;gBAED,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,UAAW,CAAC,CAAA;gBAC5D,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,UAAW,CAAC,CAAA;gBAC5D,MAAM,CAAC,cAAe,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,4CAA4C,cAAc,IAAI,QAAQ,EAAE,CAAC,CAAA;gBAE5H,OAAO,OAAO,CAAC,IAAI,CAAiB;oBAChC,GAAG,GAAG,CAAC,IAAI;oBACX,QAAQ,EAAC,cAAe;oBACxB,eAAe,EAAE,IAAI;iBACxB,CAAC,CAAC,EAAE,CAAC;oBACF,GAAG,GAAG,CAAC,IAAI;oBACX,QAAQ,EAAC,cAAe;oBACxB,eAAe,EAAE,IAAI;iBACxB,CAAC,CAAA;YAEN,CAAC;QACL,CAAC,CAAC,CAAA;IAEN,CAAC;IAED,GAAG,CAAC,SAA6B;QAC7B,IAAI,SAAS,YAAY,QAAQ,EAAE,CAAC;YAChC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACtI,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,SAAS,EAAE,yBAAyB,CAAC,CAAA;YAC9D,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAA;YAC7F,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,4BAA4B,CAAC,CAAA;YACtF,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAY,SAAS,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACrJ,CAAC;IAEL,CAAC;CACJ"}

package/dist/storage/erstorage/Modifier.d.ts

@@ -0,0 +1,23 @@
+import { EntityToTableMap } from "./EntityToTableMap.js";
+export type ModifierData = {
+    orderBy?: {
+        [k: string]: 'ASC' | 'DESC';
+    };
+    limit?: number;
+    offset?: number;
+};
+export declare class Modifier {
+    recordName: string;
+    map: EntityToTableMap;
+    data: ModifierData;
+    fromRelation?: boolean | undefined;
+    constructor(recordName: string, map: EntityToTableMap, data: ModifierData, fromRelation?: boolean | undefined);
+    get limit(): number | undefined;
+    get offset(): number | undefined;
+    get orderBy(): {
+        attribute: string;
+        recordName: string;
+        order: "ASC" | "DESC";
+    }[];
+}
+//# sourceMappingURL=Modifier.d.ts.map

package/dist/storage/erstorage/Modifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Modifier.d.ts","sourceRoot":"","sources":["../../../src/storage/erstorage/Modifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG;IACvB,OAAO,CAAC,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,GAAC,MAAM,CAAA;KAC5B,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,qBAAa,QAAQ;IACE,UAAU,EAAE,MAAM;IAAS,GAAG,EAAE,gBAAgB;IAAS,IAAI,EAAE,YAAY;IAAS,YAAY,CAAC,EAAE,OAAO;gBAA1G,UAAU,EAAE,MAAM,EAAS,GAAG,EAAE,gBAAgB,EAAS,IAAI,EAAE,YAAY,EAAS,YAAY,CAAC,EAAE,OAAO,YAAA;IAG7H,IAAI,KAAK,uBAER;IAED,IAAI,MAAM,uBAET;IAED,IAAI,OAAO;;;;QAQV;CACJ"}

package/dist/storage/erstorage/Modifier.js

@@ -0,0 +1,24 @@
+export class Modifier {
+    constructor(recordName, map, data, fromRelation) {
+        this.recordName = recordName;
+        this.map = map;
+        this.data = data;
+        this.fromRelation = fromRelation;
+    }
+    get limit() {
+        return this.data?.limit;
+    }
+    get offset() {
+        return this.data?.offset;
+    }
+    get orderBy() {
+        return Object.entries(this.data?.orderBy || {}).map(([k, v]) => {
+            return {
+                attribute: k,
+                recordName: this.recordName,
+                order: v
+            };
+        });
+    }
+}
+//# sourceMappingURL=Modifier.js.map

package/dist/storage/erstorage/Modifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Modifier.js","sourceRoot":"","sources":["../../../src/storage/erstorage/Modifier.ts"],"names":[],"mappings":"AAUA,MAAM,OAAO,QAAQ;IACjB,YAAmB,UAAkB,EAAS,GAAqB,EAAS,IAAkB,EAAS,YAAsB;QAA1G,eAAU,GAAV,UAAU,CAAQ;QAAS,QAAG,GAAH,GAAG,CAAkB;QAAS,SAAI,GAAJ,IAAI,CAAc;QAAS,iBAAY,GAAZ,YAAY,CAAU;IAC7H,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,CAAA;IAC3B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,IAAI,EAAE,MAAM,CAAA;IAC5B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC3D,OAAO;gBACH,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,CAAC;aACX,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}

package/dist/storage/erstorage/NewRecordData.d.ts

@@ -0,0 +1,42 @@
+import { EntityToTableMap } from "./EntityToTableMap.js";
+import { AttributeInfo } from "./AttributeInfo.js";
+import { Record } from "./RecordQueryAgent.js";
+export type RawEntityData = {
+    [k: string]: any;
+};
+export declare class NewRecordData {
+    map: EntityToTableMap;
+    recordName: string;
+    rawData: RawEntityData;
+    info?: AttributeInfo | undefined;
+    mergedLinkTargetNewRecords: NewRecordData[];
+    mergedLinkTargetRecordIdRefs: NewRecordData[];
+    mergedLinkTargetNullRecords: NewRecordData[];
+    linkRecordData?: NewRecordData;
+    combinedNewRecords: NewRecordData[];
+    combinedRecordIdRefs: NewRecordData[];
+    combinedNullRecords: NewRecordData[];
+    differentTableMergedLinkNewRecords: NewRecordData[];
+    differentTableMergedLinkRecordIdRefs: NewRecordData[];
+    differentTableMergedLinkNullRecords: NewRecordData[];
+    isolatedNewRecords: NewRecordData[];
+    isolatedRecordIdRefs: NewRecordData[];
+    isolatedNullRecords: NewRecordData[];
+    entityIdAttributes: AttributeInfo[];
+    relatedEntitiesData: NewRecordData[];
+    valueAttributes: AttributeInfo[];
+    sameRowEntityIdRefs: NewRecordData[];
+    constructor(map: EntityToTableMap, recordName: string, rawData: RawEntityData, info?: AttributeInfo | undefined);
+    merge(partialNewRawData: RawEntityData): NewRecordData;
+    getRef(): {
+        id: any;
+    };
+    isRef(): boolean;
+    isNull(): boolean;
+    getData(): Record;
+    getSameRowFieldAndValue(oldRecord?: Omit<Record, 'id'>): {
+        field: string;
+        value: any;
+    }[];
+}
+//# sourceMappingURL=NewRecordData.d.ts.map

package/dist/storage/erstorage/NewRecordData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewRecordData.d.ts","sourceRoot":"","sources":["../../../src/storage/erstorage/NewRecordData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAG7C,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAA;AAEhD,qBAAa,aAAa;IAgCH,GAAG,EAAE,gBAAgB;IAAS,UAAU,EAAE,MAAM;IAAS,OAAO,EAAE,aAAa;IAAS,IAAI,CAAC,EAAE,aAAa;IA9BxH,0BAA0B,EAAE,aAAa,EAAE,CAAK;IAEhD,4BAA4B,EAAE,aAAa,EAAE,CAAK;IAElD,2BAA2B,EAAE,aAAa,EAAE,CAAK;IAEjD,cAAc,CAAC,EAAE,aAAa,CAAA;IAE9B,kBAAkB,EAAG,aAAa,EAAE,CAAK;IAEzC,oBAAoB,EAAG,aAAa,EAAE,CAAK;IAE3C,mBAAmB,EAAE,aAAa,EAAE,CAAK;IAEzC,kCAAkC,EAAE,aAAa,EAAE,CAAK;IACxD,oCAAoC,EAAE,aAAa,EAAE,CAAK;IAC1D,mCAAmC,EAAE,aAAa,EAAE,CAAK;IAEzD,kBAAkB,EAAE,aAAa,EAAE,CAAK;IACxC,oBAAoB,EAAE,aAAa,EAAE,CAAK;IAC1C,mBAAmB,EAAE,aAAa,EAAE,CAAK;IAEzC,kBAAkB,EAAE,aAAa,EAAE,CAAK;IAExC,mBAAmB,EAAE,aAAa,EAAE,CAAK;IACzC,eAAe,EAAE,aAAa,EAAE,CAAK;IAGrC,mBAAmB,EAAE,aAAa,EAAE,CAAK;gBAE7B,GAAG,EAAE,gBAAgB,EAAS,UAAU,EAAE,MAAM,EAAS,OAAO,EAAE,aAAa,EAAS,IAAI,CAAC,EAAE,aAAa,YAAA;IAsE/H,KAAK,CAAC,iBAAiB,EAAE,aAAa;IAUtC,MAAM;;;IAKN,KAAK;IAIL,MAAM;IAGN,OAAO,IAAK,MAAM;IAIlB,uBAAuB,CAAC,SAAS,GAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAM,GAAI;QAAC,KAAK,EAAC,MAAM,CAAC;QAAC,KAAK,EAAC,GAAG,CAAA;KAAC,EAAE;CA+D5F"}

package/dist/storage/erstorage/NewRecordData.js

@@ -0,0 +1,178 @@
+import { flatten } from "./util.js";
+import { LINK_SYMBOL } from "./RecordQuery.js";
+export class NewRecordData {
+    // recordName 是自己的 recordName，  info 是自己作为父亲的 attribute 的 info.
+    constructor(map, recordName, rawData, info) {
+        this.map = map;
+        this.recordName = recordName;
+        this.rawData = rawData;
+        this.info = info;
+        // 关系往自身合并的异表新 record
+        this.mergedLinkTargetNewRecords = [];
+        // 关系往自身合并的异表老 record
+        this.mergedLinkTargetRecordIdRefs = [];
+        // 关系往自身合并的异表 null 值
+        this.mergedLinkTargetNullRecords = [];
+        // 三表合一的 record
+        this.combinedNewRecords = [];
+        // 三表合一的老 record
+        this.combinedRecordIdRefs = [];
+        // 三表合一的 null 值
+        this.combinedNullRecords = [];
+        // 往属性方向合并的异表 record
+        this.differentTableMergedLinkNewRecords = [];
+        this.differentTableMergedLinkRecordIdRefs = [];
+        this.differentTableMergedLinkNullRecords = [];
+        // 完全关系独立的数据
+        this.isolatedNewRecords = [];
+        this.isolatedRecordIdRefs = [];
+        this.isolatedNullRecords = [];
+        // 当时 linkRecord 的时候，source/target 就可能出现在下面
+        this.entityIdAttributes = [];
+        // 不包括虚拟 link
+        this.relatedEntitiesData = [];
+        this.valueAttributes = [];
+        // 和当前合表并且是  id 的。说明我们的需要的 row 已经有了，只要update 相应 column 就行了
+        this.sameRowEntityIdRefs = [];
+        const [valueAttributesInfo, entityAttributesInfo, entityIdAttributes] = this.map.groupAttributes(recordName, rawData ? Object.keys(rawData) : []);
+        this.relatedEntitiesData = flatten(entityAttributesInfo.map(info => Array.isArray(rawData[info.attributeName]) ?
+            rawData[info.attributeName].map((i) => new NewRecordData(this.map, info.recordName, i, info)) :
+            new NewRecordData(this.map, info.recordName, rawData[info.attributeName], info)));
+        this.valueAttributes = valueAttributesInfo;
+        this.entityIdAttributes = entityIdAttributes;
+        // TODO 要把那些独立出去的 field 排除出去。
+        this.relatedEntitiesData.forEach(newRelatedEntityData => {
+            // CAUTION 三表合一的情况（需要排除掉关系的 source、target 是同一实体的情况，这种情况下不算合表）
+            if (newRelatedEntityData.info.isMergedWithParent()) {
+                // 三表合一的情况。记录合表的数据到底是有 id ，还是新的。如果是有 id ，说明是要  update 某一行。
+                if (newRelatedEntityData.isNull()) {
+                    this.combinedNullRecords.push(newRelatedEntityData);
+                }
+                else if (newRelatedEntityData.isRef()) {
+                    this.combinedRecordIdRefs.push(newRelatedEntityData);
+                }
+                else {
+                    // 全新的同表的数据
+                    this.combinedNewRecords.push(newRelatedEntityData);
+                }
+            }
+            else {
+                // FIXME relatedEntitiesData 是不是要限制下，只允许那些自己能管的。
+                //  因为 source/target 这样的合并之后就不规自己管了。这里也不应该处理。
+                if (newRelatedEntityData.info.isLinkMergedWithParent()) {
+                    if (newRelatedEntityData.isNull()) {
+                        this.mergedLinkTargetNullRecords.push(newRelatedEntityData);
+                    }
+                    else if (newRelatedEntityData.isRef()) {
+                        this.mergedLinkTargetRecordIdRefs.push(newRelatedEntityData);
+                    }
+                    else {
+                        this.mergedLinkTargetNewRecords.push(newRelatedEntityData);
+                    }
+                }
+                else if (newRelatedEntityData.info.isLinkMergedWithAttribute()) {
+                    // 关系往属性方向合并的
+                    if (newRelatedEntityData.isNull()) {
+                        this.differentTableMergedLinkNullRecords.push(newRelatedEntityData);
+                    }
+                    else if (newRelatedEntityData.isRef()) {
+                        this.differentTableMergedLinkRecordIdRefs.push(newRelatedEntityData);
+                    }
+                    else {
+                        this.differentTableMergedLinkNewRecords.push(newRelatedEntityData);
+                    }
+                }
+                else {
+                    // 关系完全独立的
+                    if (newRelatedEntityData.isNull()) {
+                        this.isolatedNullRecords.push(newRelatedEntityData);
+                    }
+                    else if (newRelatedEntityData.isRef()) {
+                        this.isolatedRecordIdRefs.push(newRelatedEntityData);
+                    }
+                    else {
+                        this.isolatedNewRecords.push(newRelatedEntityData);
+                    }
+                }
+            }
+        });
+        if (this.rawData?.[LINK_SYMBOL]) {
+            this.linkRecordData = new NewRecordData(this.map, info?.linkName, this.rawData[LINK_SYMBOL]);
+        }
+    }
+    merge(partialNewRawData) {
+        return new NewRecordData(this.map, this.recordName, { ...this.rawData, ...partialNewRawData }, this.info);
+    }
+    // exclude(attributeNames: string[]) {
+    //     const newRawData = {...this.rawData}
+    //     attributeNames.forEach(name => delete newRawData[name])
+    //     return new NewEntityData(this.map, this.recordName, newRawData, this.info)
+    // }
+    getRef() {
+        return { id: this.rawData.id };
+    }
+    isRef() {
+        return this.rawData?.id !== undefined;
+    }
+    isNull() {
+        return this.rawData === null;
+    }
+    getData() {
+        return { ...this.rawData };
+    }
+    getSameRowFieldAndValue(oldRecord = {}) {
+        const newRecord = { ...oldRecord, ...this.rawData };
+        const result = this.valueAttributes.map((info) => {
+            const value = info.isComputed ? info.computed({ ...this.rawData, ...oldRecord }) : this.rawData[info.attributeName];
+            return {
+                field: info.field,
+                value
+            };
+        });
+        // CAUTION 因为我们没有标记 computed 依赖于哪些字段，所以任何字段的变化这里都要把 computed attribute 重新计算一遍。
+        // CAUTION 只有更新自己的字段和递归更新三表合一的字段是需要岛上 oldRecord 的。因为我们只允许递归更新三表合一的 record。
+        const recordInfo = this.map.getRecordInfo(this.recordName);
+        recordInfo.valueAttributes.forEach(info => {
+            if (info.isComputed) {
+                const newValue = info.computed(newRecord);
+                if (newValue !== oldRecord[info.attributeName]) {
+                    result.push({
+                        field: info.field,
+                        value: newValue
+                    });
+                }
+            }
+        });
+        // source/target 里面记录的 id
+        this.entityIdAttributes.forEach(info => {
+            result.push({
+                field: info.linkField,
+                value: this.rawData[info.attributeName].id
+            });
+        });
+        // 往自己合表的关系上的 id 以及关系数据
+        this.mergedLinkTargetRecordIdRefs.forEach(recordData => {
+            result.push({
+                field: recordData.info?.linkField,
+                value: recordData.getRef().id
+            });
+            if (recordData.linkRecordData) {
+                result.push(...recordData.linkRecordData.getSameRowFieldAndValue());
+            }
+        });
+        // 有 info 说明自己是派生出来的，上层可能在创建的时候通过 & 字段来指定了要创建的关系的 attribute。
+        if (this.info && this.linkRecordData && this.info.isLinkMergedWithAttribute()) {
+            result.push(...this.linkRecordData.getSameRowFieldAndValue());
+        }
+        // 三表合一的数据
+        this.combinedNewRecords.concat(this.combinedRecordIdRefs).forEach(combinedNewRecord => {
+            result.push(...combinedNewRecord.getSameRowFieldAndValue(oldRecord[combinedNewRecord.info?.attributeName]));
+            if (combinedNewRecord.linkRecordData) {
+                // CAUTION 外部 updateRecord 声明了只有三表合一的数据允许递归更新。所以也要带上 oldRecord，因为 related record 能也有 computed attribute。
+                result.push(...combinedNewRecord.linkRecordData.getSameRowFieldAndValue(oldRecord[combinedNewRecord.info?.attributeName]?.[LINK_SYMBOL]));
+            }
+        });
+        return result;
+    }
+}
+//# sourceMappingURL=NewRecordData.js.map

package/dist/storage/erstorage/NewRecordData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewRecordData.js","sourceRoot":"","sources":["../../../src/storage/erstorage/NewRecordData.ts"],"names":[],"mappings":"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"}

package/dist/storage/erstorage/RecordInfo.d.ts

@@ -0,0 +1,26 @@
+import { AttributeInfo } from "./AttributeInfo.js";
+import { EntityToTableMap, RecordMapItem } from "./EntityToTableMap.js";
+export declare class RecordInfo {
+    name: string;
+    map: EntityToTableMap;
+    data: RecordMapItem;
+    constructor(name: string, map: EntityToTableMap);
+    get isRelation(): boolean | undefined;
+    get combinedRecords(): AttributeInfo[];
+    get table(): string;
+    get idField(): string | undefined;
+    get JSONFields(): string[];
+    get sameRowFields(): string[];
+    get mergedRecordAttributes(): AttributeInfo[];
+    get allFields(): string[];
+    get managedRecordAttributes(): AttributeInfo[];
+    get strictRecordAttributes(): AttributeInfo[];
+    get differentTableRecordAttributes(): AttributeInfo[];
+    get reliance(): AttributeInfo[];
+    get notRelianceCombined(): AttributeInfo[];
+    get differentTableReliance(): AttributeInfo[];
+    get sameTableReliance(): AttributeInfo[];
+    get valueAttributes(): AttributeInfo[];
+    getAttributeInfo(attribute: string): AttributeInfo;
+}
+//# sourceMappingURL=RecordInfo.d.ts.map

package/dist/storage/erstorage/RecordInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RecordInfo.d.ts","sourceRoot":"","sources":["../../../src/storage/erstorage/RecordInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,gBAAgB,EAAmB,aAAa,EAAiB,MAAM,uBAAuB,CAAC;AAEvG,qBAAa,UAAU;IAGA,IAAI,EAAE,MAAM;IAAS,GAAG,EAAE,gBAAgB;IAF7D,IAAI,EAAE,aAAa,CAAA;gBAEA,IAAI,EAAE,MAAM,EAAS,GAAG,EAAE,gBAAgB;IAI7D,IAAI,UAAU,wBAEb;IAED,IAAI,eAAe,oBAIlB;IAED,IAAI,KAAK,WAER;IAED,IAAI,OAAO,uBAEV;IAED,IAAI,UAAU,aAIb;IAED,IAAI,aAAa,IAAI,MAAM,EAAE,CAsB5B;IACD,IAAI,sBAAsB,oBAIzB;IACD,IAAI,SAAS,IAAI,MAAM,EAAE,CAExB;IAGD,IAAI,uBAAuB,oBAO1B;IAED,IAAI,sBAAsB,oBAQzB;IACD,IAAI,8BAA8B,oBAMjC;IAGD,IAAI,QAAQ,IAAI,aAAa,EAAE,CAM9B;IAED,IAAI,mBAAmB,IAAI,aAAa,EAAE,CAIzC;IAED,IAAI,sBAAsB,IAAI,aAAa,EAAE,CAI5C;IAED,IAAI,iBAAiB,IAAI,aAAa,EAAE,CAIvC;IAED,IAAI,eAAe,oBAMlB;IAED,gBAAgB,CAAC,SAAS,EAAE,MAAM;CAGrC"}