@univerjs/engine-formula 0.13.0-insiders.20251216-1519cb7 → 0.13.0-insiders.20251218-2062647

package/lib/facade.js

@@ -1,9 +1,9 @@
-import { FBase as C, FUniver as _ } from "@univerjs/core/facade";
-import { Inject as l, ICommandService as h, Injector as v, IConfigService as E } from "@univerjs/core";
-import { LexerTreeBuilder as g, IFunctionService as T, IDefinedNamesService as x, ISuperTableService as F, SetFormulaCalculationStartMutation as d, SetFormulaCalculationStopMutation as y, SetFormulaCalculationNotificationMutation as p, GlobalComputingStatusService as R, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as b, SetFormulaCalculationResultMutation as w, SetFormulaStringBatchCalculationResultMutation as D, SetFormulaStringBatchCalculationMutation as I, SetFormulaDependencyCalculationResultMutation as N, SetFormulaDependencyCalculationMutation as M, SetCellFormulaDependencyCalculationResultMutation as P, SetCellFormulaDependencyCalculationMutation as B, SetQueryFormulaDependencyResultMutation as f, SetQueryFormulaDependencyMutation as S, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE as L } from "@univerjs/engine-formula";
-import { firstValueFrom as O, race as A, filter as U, timer as j, map as q } from "rxjs";
-var G = Object.getOwnPropertyDescriptor, z = (e, t, i, r) => {
-  for (var n = r > 1 ? void 0 : r ? G(t, i) : t, a = e.length - 1, o; a >= 0; a--)
+import { FBase as C, FUniver as f } from "@univerjs/core/facade";
+import { Inject as c, ICommandService as _, Injector as h, IConfigService as v } from "@univerjs/core";
+import { LexerTreeBuilder as g, IFunctionService as E, IDefinedNamesService as T, ISuperTableService as x, SetTriggerFormulaCalculationStartMutation as F, SetFormulaCalculationStopMutation as y, SetFormulaCalculationStartMutation as R, SetFormulaCalculationNotificationMutation as d, GlobalComputingStatusService as b, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as w, SetFormulaCalculationResultMutation as D, SetFormulaStringBatchCalculationResultMutation as M, SetFormulaStringBatchCalculationMutation as I, SetFormulaDependencyCalculationResultMutation as N, SetFormulaDependencyCalculationMutation as P, SetCellFormulaDependencyCalculationResultMutation as B, SetCellFormulaDependencyCalculationMutation as L, SetQueryFormulaDependencyResultMutation as p, SetQueryFormulaDependencyMutation as S, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE as A, SetQueryFormulaDependencyAllResultMutation as O, SetQueryFormulaDependencyAllMutation as U } from "@univerjs/engine-formula";
+import { firstValueFrom as j, race as Q, filter as q, timer as G, map as z } from "rxjs";
+var V = Object.getOwnPropertyDescriptor, Y = (e, t, i, r) => {
+  for (var n = r > 1 ? void 0 : r ? V(t, i) : t, a = e.length - 1, o; a >= 0; a--)
     (o = e[a]) && (n = o(n) || n);
   return n;
 }, u = (e, t) => (i, r) => t(i, r, e);
@@ -66,7 +66,7 @@ let m = class extends C {
    * ```
    */
   executeCalculation() {
-    this._commandService.executeCommand(d.id, { commands: [], forceCalculation: !0 }, { onlyLocal: !0 });
+    this._commandService.executeCommand(F.id, { commands: [], forceCalculation: !0 }, { onlyLocal: !0 });
   }
   /**
    * Stop the calculation of the formula.
@@ -95,7 +95,7 @@ let m = class extends C {
    */
   calculationStart(e) {
     return this._commandService.onCommandExecuted((t) => {
-      if (t.id === d.id) {
+      if (t.id === R.id) {
         const i = t.params;
         e(i.forceCalculation);
       }
@@ -116,7 +116,7 @@ let m = class extends C {
    */
   calculationEnd(e) {
     return this._commandService.onCommandExecuted((t) => {
-      if (t.id !== p.id)
+      if (t.id !== d.id)
         return;
       const i = t.params;
       i.functionsExecutedState !== void 0 && e(i.functionsExecutedState);
@@ -139,10 +139,10 @@ let m = class extends C {
    * ```
    */
   whenComputingCompleteAsync(e) {
-    const t = this._injector.get(R);
-    return t.computingStatus ? Promise.resolve(!0) : O(A(
-      t.computingStatus$.pipe(U((i) => i)),
-      j(e != null ? e : 3e4).pipe(q(() => !1))
+    const t = this._injector.get(b);
+    return t.computingStatus ? Promise.resolve(!0) : j(Q(
+      t.computingStatus$.pipe(q((i) => i)),
+      G(e != null ? e : 3e4).pipe(z(() => !1))
     ));
   }
   /**
@@ -173,7 +173,7 @@ let m = class extends C {
    */
   calculationProcessing(e) {
     return this._commandService.onCommandExecuted((t) => {
-      if (t.id !== p.id)
+      if (t.id !== d.id)
         return;
       const i = t.params;
       i.stageInfo !== void 0 && e(i.stageInfo);
@@ -192,7 +192,7 @@ let m = class extends C {
    * ```
    */
   setMaxIteration(e) {
-    this._configService.setConfig(b, e);
+    this._configService.setConfig(w, e);
   }
   /**
    * Listens for the moment when formula-calculation results are applied.
@@ -219,7 +219,7 @@ let m = class extends C {
    */
   calculationResultApplied(e) {
     return this._commandService.onCommandExecuted((t) => {
-      if (t.id !== w.id)
+      if (t.id !== D.id)
         return;
       const i = t.params;
       i !== void 0 && requestIdleCallback(() => {
@@ -259,15 +259,15 @@ let m = class extends C {
     return new Promise((e, t) => {
       let i = !1, r = !1;
       const n = setTimeout(() => {
-        c(), t(new Error("Calculation end timeout"));
+        l(), t(new Error("Calculation end timeout"));
       }, 3e4), a = setTimeout(() => {
-        i || (c(), e());
+        i || (l(), e());
       }, 500), o = this.calculationProcessing(() => {
         i || (i = !0, clearTimeout(a));
       }), s = this.calculationResultApplied(() => {
-        r || (r = !0, c(), e());
+        r || (r = !0, l(), e());
       });
-      function c() {
+      function l() {
         clearTimeout(n), clearTimeout(a), o.dispose(), s.dispose();
       }
     });
@@ -344,7 +344,7 @@ let m = class extends C {
   executeFormulas(e, t = 3e4) {
     return new Promise((i, r) => {
       const n = this._commandService.onCommandExecuted((o) => {
-        if (o.id !== D.id)
+        if (o.id !== M.id)
           return;
         const s = o.params;
         clearTimeout(a), n.dispose(), s.result != null ? i(s.result) : r(new Error("Formula batch calculation returned no result"));
@@ -390,7 +390,7 @@ let m = class extends C {
         r.dispose(), i(new Error("Formula dependency calculation timeout"));
       }, e);
       this._commandService.executeCommand(
-        M.id,
+        P.id,
         void 0,
         { onlyLocal: !0 }
       );
@@ -433,7 +433,7 @@ let m = class extends C {
   getCellDependencyTree(e, t = 3e4) {
     return new Promise((i, r) => {
       const n = this._commandService.onCommandExecuted((o) => {
-        if (o.id !== P.id)
+        if (o.id !== B.id)
           return;
         const s = o.params;
         clearTimeout(a), n.dispose(), i(s.result);
@@ -441,7 +441,7 @@ let m = class extends C {
         n.dispose(), r(new Error("Cell dependency calculation timeout"));
       }, t);
       this._commandService.executeCommand(
-        B.id,
+        L.id,
         e,
         { onlyLocal: !0 }
       );
@@ -481,7 +481,7 @@ let m = class extends C {
   getRangeDependents(e, t = 3e4) {
     return new Promise((i, r) => {
       const n = this._commandService.onCommandExecuted((o) => {
-        if (o.id !== f.id)
+        if (o.id !== p.id)
           return;
         const s = o.params;
         clearTimeout(a), n.dispose(), s.result != null ? i(s.result) : i([]);
@@ -533,7 +533,7 @@ let m = class extends C {
   getInRangeFormulas(e, t = 3e4) {
     return new Promise((i, r) => {
       const n = this._commandService.onCommandExecuted((o) => {
-        if (o.id !== f.id)
+        if (o.id !== p.id)
           return;
         const s = o.params;
         clearTimeout(a), n.dispose(), s.result != null ? i(s.result) : i([]);
@@ -596,7 +596,7 @@ let m = class extends C {
    * ```
    */
   setFormulaReturnDependencyTree(e) {
-    this._configService.setConfig(L, e);
+    this._configService.setConfig(A, e);
   }
   /**
    * Parse a formula string and return its **formula expression tree**.
@@ -664,22 +664,84 @@ let m = class extends C {
   getFormulaExpressTree(e, t) {
     return this._lexerTreeBuilder.getFormulaExprTree(e, t, this._functionService.hasExecutor.bind(this._functionService), this._definedNamesService.getValueByName.bind(this._definedNamesService), this._superTableService.getTable.bind(this._superTableService));
   }
+  /**
+   * Retrieve **both**:
+   * 1) the full dependency trees of all formulas that **depend on** the specified ranges, and
+   * 2) the dependency trees of all formulas that **physically reside inside** the specified ranges.
+   *
+   * This is a convenience API that combines the behaviors of
+   * `getRangeDependents` and `getInRangeFormulas` into a single call.
+   *
+   * Internally, it triggers a local dependency-calculation command once and
+   * resolves when both result sets are available, avoiding duplicate
+   * calculations and event listeners.
+   *
+   * @param unitRanges An array of workbook/sheet ranges to query. Each range
+   *   includes:
+   *   - `unitId`  The workbook ID.
+   *   - `sheetId` The sheet ID.
+   *   - `range`   The zero-based row/column boundaries.
+   *
+   * @param {number} [timeout]
+   *        Optional timeout in milliseconds. If the dependency calculation does
+   *        not complete within this period, the promise will be rejected.
+   *
+   * @returns {Promise<IFormulaDependentsAndInRangeResults>}
+   *          A promise that resolves with an object containing:
+   *          - `dependents`: Dependency trees of all formulas that depend on the
+   *            specified ranges (upstream consumers).
+   *          - `inRanges`: Dependency trees of all formulas whose definitions
+   *            are located inside the specified ranges.
+   *
+   * @example
+   * ```ts
+   * const formulaEngine = univerAPI.getFormula();
+   *
+   * const result = await formulaEngine.getRangeDependentsAndInRangeFormulas([
+   *   {
+   *     unitId: 'workbook1',
+   *     sheetId: 'sheet1',
+   *     range: { startRow: 0, endRow: 9, startColumn: 0, endColumn: 1 },
+   *   },
+   * ]);
+   *
+   * console.log('Dependent formulas:', result.dependents);
+   * console.log('Formulas inside range:', result.inRanges);
+   * ```
+   */
+  getRangeDependentsAndInRangeFormulas(e, t = 3e4) {
+    return new Promise((i, r) => {
+      const n = this._commandService.onCommandExecuted((o) => {
+        if (o.id !== O.id)
+          return;
+        const s = o.params;
+        clearTimeout(a), n.dispose(), s.result != null ? i(s.result) : i({ dependents: [], inRanges: [] });
+      }), a = setTimeout(() => {
+        n.dispose(), r(new Error("Range dependents calculation timeout"));
+      }, t);
+      this._commandService.executeCommand(
+        U.id,
+        { unitRanges: e },
+        { onlyLocal: !0 }
+      );
+    });
+  }
 };
-m = z([
-  u(0, l(h)),
-  u(1, l(v)),
-  u(2, l(g)),
-  u(3, E),
-  u(4, T),
-  u(5, x),
-  u(6, F)
+m = Y([
+  u(0, c(_)),
+  u(1, c(h)),
+  u(2, c(g)),
+  u(3, v),
+  u(4, E),
+  u(5, T),
+  u(6, x)
 ], m);
-class Q extends _ {
+class W extends f {
   getFormula() {
     return this._injector.createInstance(m);
   }
 }
-_.extend(Q);
+f.extend(W);
 export {
   m as FFormula
 };