Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(formula): defined name nest and lexer (#6174)
Univerb54d9cb5cf4e
diff --git a/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.tsindex e1f8b8fa8a..fbde2f262e 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/lexer-tree-builder.spec.ts@@ -292,6 +292,11 @@ describe('lexer nodeMaker test', () => {expect(node).toStrictEqual(ErrorType.VALUE);});+ it('Braces operator', () => {+ const node = lexerTreeBuilder.treeBuilder('={0,1,2,3,4,5,6} + {0;1;2;3;4;5;6}*7') as LexerNode;+ expect(JSON.stringify(node.serialize())).toStrictEqual('{"token":"R_1","st":-1,"ed":-1,"children":["{0,1,2,3,4,5,6}","{0;1;2;3;4;5;6}","7","*","+"]}');+ });+it('Lack braces error!', () => {const node = lexerTreeBuilder.treeBuilder('=sum((1)') as LexerNode;expect(node).toStrictEqual(ErrorType.VALUE);diff --git a/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts b/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.tsindex 47f5b17b79..09ab1020f9 100644--- a/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts+++ b/packages/engine-formula/src/engine/analysis/__tests__/lexer.spec.ts@@ -30,6 +30,7 @@ const TEST_WORKBOOK_DATA: IWorkbookData = {sheets: {sheet1: {id: 'sheet1',+ name: 'sheetName1',cellData: {0: {0: {@@ -81,6 +82,7 @@ describe('lexer test', () => {formulaCurrentConfigService.setExecuteUnitId('test');formulaCurrentConfigService.setExecuteSubUnitId('sheet1');+ formulaCurrentConfigService.setSheetNameMap({ test: { sheet1: 'sheetName1' } });// runtimeService.setCurrent(0, 0, 4, 1, 'sheet1', 'test');@@ -253,5 +255,71 @@ describe('lexer test', () => {],});});++ it('defined name nest struct', () => {+ definedNamesService.registerDefinedName('test', {+ id: 'test1',+ name: 'myName1',+ localSheetId: 'sheet1',+ formulaOrRefString: '$A$10:$C$100',+ });++ definedNamesService.registerDefinedName('test', {+ id: 'test2',+ name: 'myName2',+ formulaOrRefString: '=sheetName1!myName1 + 100',+ });++ definedNamesService.registerDefinedName('test', {+ id: 'test3',+ name: 'myName3',+ formulaOrRefString: '=myName2',+ });++ const node = lexer.treeBuilder('=myName3') as LexerNode;++ expect(node.serialize()).toStrictEqual({+ children: [+ {+ children: [+ {+ children: [+ {+ children: [],+ ed: -1,+ st: -1,+ token: '$A$10',+ },+ ],+ ed: -1,+ st: -1,+ token: 'P_1',+ },+ {+ children: [+ {+ children: [],+ ed: -1,+ st: -1,+ token: '$C$100',+ },+ ],+ ed: -1,+ st: -1,+ token: 'P_1',+ },+ ],+ ed: -1,+ st: -1,+ token: ':',+ },+ '100',+ '+',+ ],+ ed: -1,+ st: -1,+ token: 'R_1',+ });+ });});});diff --git a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.tsindex 043929d87c..821abdab33 100644--- a/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts+++ b/packages/engine-formula/src/engine/analysis/lexer-tree-builder.ts@@ -63,6 +63,7 @@ interface IInjectDefinedNameParam {unitId: Nullable<string>;getValueByName(unitId: string, name: string): Nullable<IDefinedNamesServiceParam>;getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;+ getSheetName: (unitId: string, sheetId: string) => string;}export class LexerTreeBuilder extends Disposable {@@ -399,6 +400,8 @@ export class LexerTreeBuilder extends Disposable {if (node instanceof LexerNode) {return true;+ } else if (this._passArrayOperator(node)) {+ return true;}if (@@ -415,6 +418,34 @@ export class LexerTreeBuilder extends Disposable {return false;}+ /**+ * ={0,1,2,3,4,5,6} + {0;1;2;3;4;5;6}*7+ */+ private _passArrayOperator(s: string) {+ if (s.length === 0) {+ return false;+ }++ if (!(s[0] === '{' && s[s.length - 1] === '}')) {+ return false;+ }++ const curChildren = this._currentLexerNode.getChildren();++ const lastNode = curChildren[curChildren.length - 1];++ if (lastNode instanceof LexerNode) {+ return false;+ }++ if (+ OPERATOR_TOKEN_SET.has(lastNode)) {+ return true;+ }++ return false;+ }+// eslint-disable-next-line complexitygetSequenceNode(sequenceArray: ISequenceArray[]): (string | ISequenceNode)[] {const sequenceNodes: Array<ISequenceNode | string> = [];@@ -699,7 +730,7 @@ export class LexerTreeBuilder extends Disposable {hasDefinedName: boolean;definedNames: string[];} {- const { unitId, getValueByName } = param;+ const { unitId, getValueByName, getSheetName } = param;if (unitId == null) {return {@@ -721,9 +752,13 @@ export class LexerTreeBuilder extends Disposable {continue;}- const { nodeType, token } = node;-+ const { nodeType, token: tokenRaw } = node;+ let token = tokenRaw;if (nodeType === sequenceNodeType.REFERENCE || nodeType === sequenceNodeType.FUNCTION) {+ if (nodeType === sequenceNodeType.FUNCTION) {+ token = this._getHasSheetNameDefinedName(tokenRaw, unitId, param);+ }+const definedContent = getValueByName(unitId, token);if (definedContent) {const refString = definedContent.formulaOrRefString;@@ -763,6 +798,39 @@ export class LexerTreeBuilder extends Disposable {};}+ private _getHasSheetNameDefinedName(tokenRaw: string, unitId: string, param: IInjectDefinedNameParam) {+ if (!tokenRaw.includes('!')) {+ return tokenRaw;+ }++ const parts = tokenRaw.split('!');+ if (parts.length !== 2) {+ return tokenRaw;+ }++ const sheetName = parts[0];+ const tokenLike = parts[1].trim();+ const definedContent = param.getValueByName(unitId, tokenLike);+ if (!definedContent) {+ return tokenRaw;+ }++ const definedSheetId = definedContent.localSheetId;+ if (definedSheetId !== undefined) {+ if (definedSheetId === 'AllDefaultWorkbook') {+ return tokenLike;+ }+ const actualSheetName = param.getSheetName(unitId, definedSheetId);+ if (sheetName === actualSheetName) {+ return tokenLike;+ }+ } else {+ return tokenLike;+ }++ return tokenRaw;+ }+private _handleNestedDefinedName(refString: string, param: IInjectDefinedNameParam) {const sequenceArray: ISequenceArray[] = [];diff --git a/packages/engine-formula/src/engine/analysis/lexer.ts b/packages/engine-formula/src/engine/analysis/lexer.tsindex 9b5cee2ed9..ebf734c94c 100644--- a/packages/engine-formula/src/engine/analysis/lexer.ts+++ b/packages/engine-formula/src/engine/analysis/lexer.ts@@ -33,6 +33,7 @@ export class Lexer extends Disposable {unitId: this._formulaCurrentConfigService.getExecuteUnitId(),getValueByName: this._definedNamesService.getValueByName.bind(this._definedNamesService),getDirtyDefinedNameMap: this._formulaCurrentConfigService.getDirtyDefinedNameMap.bind(this._formulaCurrentConfigService),+ getSheetName: this._formulaCurrentConfigService.getSheetName.bind(this._formulaCurrentConfigService),});}}diff --git a/packages/engine-formula/src/services/current-data.service.ts b/packages/engine-formula/src/services/current-data.service.tsindex dcdcea781e..413f137d35 100644--- a/packages/engine-formula/src/services/current-data.service.ts+++ b/packages/engine-formula/src/services/current-data.service.ts@@ -111,6 +111,8 @@ export interface IFormulaCurrentConfigService {getSheetRowColumnCount(unitId: string, sheetId: string): { rowCount: number; columnCount: number };getFilteredOutRows(unitId: string, sheetId: string, startRow: number, endRow: number): number[];++ setSheetNameMap(sheetIdToNameMap: IUnitSheetIdToNameMap): void;}export class FormulaCurrentConfigService extends Disposable implements IFormulaCurrentConfigService {@@ -250,6 +252,10 @@ export class FormulaCurrentConfigService extends Disposable implements IFormulaCreturn this._sheetIdToNameMap[unitId]![sheetId] || '';}+ setSheetNameMap(sheetIdToNameMap: IUnitSheetIdToNameMap) {+ this._sheetIdToNameMap = sheetIdToNameMap;+ }+getClearDependencyTreeCache() {return this._clearDependencyTreeCache;}