@univerjs/engine-formula 0.10.14-nightly.202511031023 → 0.10.14-nightly.202511070640

package/lib/types/engine/analysis/lexer-tree-builder.d.ts

@@ -1,10 +1,17 @@
+import { Nullable, AbsoluteRefType, Disposable } from '@univerjs/core';
+import { IDirtyUnitSheetDefinedNameMap } from '../../basics/common';
+import { IDefinedNamesServiceParam } from '../../services/defined-names.service';
 import { ISequenceArray, ISequenceNode } from '../utils/sequence';
-import { AbsoluteRefType, Disposable } from '@univerjs/core';
 import { FormulaAstLRU } from '../../basics/cache-lru';
 import { ErrorType } from '../../basics/error-type';
 import { LexerNode } from './lexer-node';
 export declare const FormulaLexerNodeCache: FormulaAstLRU<LexerNode>;
 export declare const FormulaSequenceNodeCache: FormulaAstLRU<(string | ISequenceNode)[]>;
+interface IInjectDefinedNameParam {
+    unitId: Nullable<string>;
+    getValueByName(unitId: string, name: string): Nullable<IDefinedNamesServiceParam>;
+    getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;
+}
 export declare class LexerTreeBuilder extends Disposable {
     private _currentLexerNode;
     private _upLevel;
@@ -62,11 +69,11 @@ export declare class LexerTreeBuilder extends Disposable {
     private _minusSplitSequenceNode;
     private _pushSequenceNode;
     nodeMakerTest(formulaString: string): ErrorType.VALUE | (string | LexerNode)[] | undefined;
-    treeBuilder(formulaString: string, transformSuffix?: boolean, injectDefinedName?: (sequenceArray: ISequenceArray[]) => {
-        sequenceString: string;
-        hasDefinedName: boolean;
-        definedNames: string[];
-    }, simpleCheckDefinedName?: (formulaString: string) => boolean): ErrorType.VALUE | LexerNode | (string | LexerNode)[] | undefined;
+    treeBuilder(formulaString: string, transformSuffix?: boolean, injectDefinedNameParam?: IInjectDefinedNameParam): ErrorType.VALUE | LexerNode | (string | LexerNode)[] | undefined;
+    private _handleDefinedName;
+    private _handleNestedDefinedName;
+    private _simpleCheckDefinedName;
+    private _checkDefinedNameDirty;
     private _suffixExpressionHandler;
     private _processSuffixExpressionRemain;
     private _processSuffixExpressionCloseBracket;
@@ -131,3 +138,4 @@ export declare class LexerTreeBuilder extends Disposable {
     private _isScientificNotation;
     private _addSequenceArray;
 }
+export {};

package/lib/types/engine/analysis/lexer.d.ts

@@ -1,5 +1,4 @@
 import { Disposable } from '@univerjs/core';
-import { ErrorType } from '../../basics/error-type';
 import { IFormulaCurrentConfigService } from '../../services/current-data.service';
 import { IDefinedNamesService } from '../../services/defined-names.service';
 import { LexerTreeBuilder } from './lexer-tree-builder';
@@ -8,8 +7,5 @@ export declare class Lexer extends Disposable {
     private readonly _lexerTreeBuilder;
     private readonly _formulaCurrentConfigService;
     constructor(_definedNamesService: IDefinedNamesService, _lexerTreeBuilder: LexerTreeBuilder, _formulaCurrentConfigService: IFormulaCurrentConfigService);
-    treeBuilder(formulaString: string, transformSuffix?: boolean): ErrorType.VALUE | import('./lexer-node').LexerNode | (string | import('./lexer-node').LexerNode)[] | undefined;
-    private _simpleCheckDefinedName;
-    private _checkDefinedNameDirty;
-    private _injectDefinedName;
+    treeBuilder(formulaString: string, transformSuffix?: boolean): import("../..").ErrorType.VALUE | import('./lexer-node').LexerNode | (string | import('./lexer-node').LexerNode)[] | undefined;
 }

package/lib/types/engine/ast-node/base-ast-node.d.ts

@@ -4,7 +4,7 @@ import { FunctionVariantType } from '../reference-object/base-reference-object';
 import { AstNodePromiseType } from '../../basics/common';
 import { ErrorValueObject } from '../value-object/base-value-object';
 import { NodeType } from './node-type';
-interface IAstNodeNodeJson {
+export interface IAstNodeNodeJson {
     token: string;
     children?: IAstNodeNodeJson[];
     nodeType: number;
@@ -53,4 +53,3 @@ export declare class ErrorNode extends BaseAstNode {
     static create(errorType: ErrorType): ErrorNode;
     getValue(): ErrorValueObject;
 }
-export {};

package/lib/types/engine/utils/reference.d.ts

@@ -73,3 +73,15 @@ export declare function needsQuoting(name: string): boolean;
  * Add quotes to the sheet name
  */
 export declare function addQuotesBothSides(name: string): string;
+/**
+ * Add a single quote before the single quote
+ * @param name
+ * @returns Quoted name
+ */
+export declare function quoteSheetName(name: string): string;
+/**
+ * Replace double single quotes with single quotes
+ * @param name
+ * @returns Unquoted name
+ */
+export declare function unquoteSheetName(name: string): string;

package/lib/types/index.d.ts

@@ -43,7 +43,7 @@ export { LexerNode } from './engine/analysis/lexer-node';
 export { LexerTreeBuilder } from './engine/analysis/lexer-tree-builder';
 export { AstTreeBuilder } from './engine/analysis/parser';
 export { AstRootNodeFactory } from './engine/ast-node/ast-root-node';
-export type { BaseAstNode } from './engine/ast-node/base-ast-node.js';
+export type { BaseAstNode, IAstNodeNodeJson } from './engine/ast-node/base-ast-node';
 export { FunctionNodeFactory } from './engine/ast-node/function-node';
 export { LambdaNodeFactory } from './engine/ast-node/lambda-node';
 export { LambdaParameterNodeFactory } from './engine/ast-node/lambda-parameter-node';
@@ -68,7 +68,7 @@ export { generateAstNode } from './engine/utils/generate-ast-node';
 export { strip, stripErrorMargin } from './engine/utils/math-kit';
 export { handleNumfmtInCell } from './engine/utils/numfmt-kit';
 export { deserializeRangeForR1C1 } from './engine/utils/r1c1-reference';
-export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, getRangeWithRefsString, type IAbsoluteRefTypeForRange, isReferenceStrings, isReferenceStringWithEffectiveColumn, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, } from './engine/utils/reference';
+export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, getRangeWithRefsString, type IAbsoluteRefTypeForRange, isReferenceStrings, isReferenceStringWithEffectiveColumn, needsQuoting, quoteSheetName, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, unquoteSheetName, } from './engine/utils/reference';
 export { handleRefStringInfo } from './engine/utils/reference';
 export { deserializeRangeWithSheetWithCache } from './engine/utils/reference-cache';
 export { generateStringWithSequence, type ISequenceNode, sequenceNodeType } from './engine/utils/sequence';