@univerjs-pro/engine-formula-rust 1.0.0-insiders.20260808-70eefdd → 1.0.0-rc.0

package/lib/cjs/index.cjs

@@ -246,7 +246,7 @@ var import_core2 = require("@univerjs/core");
 
 // src/services/rust-formula-projection.service.ts
 var import_core = require("@univerjs/core");
-var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_PLUGIN", EXTERNAL_DATA_RESOURCE = "SHEET_EXTERNAL_DATA_PLUGIN", EXTERNAL_DATA_SIGNATURE = "external_data", RUST_UPSERT_REFERENCE_DATA_MUTATION_ID = "formula.mutation.upsert-reference-data", RUST_UPSERT_PROJECTION_WORKBOOK_MUTATION_ID = "formula.mutation.upsert-projection-workbook", RUST_FORMULA_RELEVANT_MUTATIONS = /* @__PURE__ */ new Set([
+var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_PLUGIN", EXTERNAL_DATA_RESOURCE = "SHEET_EXTERNAL_DATA_PLUGIN", EXTERNAL_DATA_SIGNATURE = "external_data", RUST_UPSERT_REFERENCE_DATA_MUTATION_ID = "formula.mutation.upsert-reference-data", RUST_UPSERT_PROJECTION_WORKBOOK_MUTATION_ID = "formula.mutation.upsert-projection-workbook", RUST_SET_SUPER_TABLES_MUTATION_ID = "formula.mutation.set-super-tables", RUST_FORMULA_RELEVANT_MUTATIONS = /* @__PURE__ */ new Set([
   "sheet.mutation.set-range-values",
   "sheet.mutation.insert-row",
   "sheet.mutation.insert-col",
@@ -273,6 +273,7 @@ var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_P
   "formula.mutation.set-image-formula-data",
   "formula.mutation.set-other-formula",
   "formula.mutation.set-super-table",
+  RUST_SET_SUPER_TABLES_MUTATION_ID,
   "formula.mutation.set-super-table-option",
   "formula.mutation.remove-defined-name",
   "formula.mutation.remove-feature-calculation",
@@ -508,13 +509,26 @@ var RustFormulaProjectionService = class {
   }
 };
 function normalizeRustEngineMutation(mutation) {
-  let params = mutation.id === "formula.mutation.set-super-table" ? normalizeSetSuperTableMutationParams(mutation.params) : mutation.params ?? {};
+  let params = mutation.id === "formula.mutation.set-super-table" ? normalizeSetSuperTableMutationParams(mutation.params) : mutation.id === RUST_SET_SUPER_TABLES_MUTATION_ID ? normalizeSetSuperTablesMutationParams(mutation.params) : mutation.params ?? {};
   return {
     id: mutation.id,
     params,
     dirtyRanges: Array.isArray(mutation.dirtyRanges) ? mutation.dirtyRanges : []
   };
 }
+function normalizeSetSuperTablesMutationParams(params) {
+  return !isRecord(params) || typeof params.unitId != "string" || !Array.isArray(params.tables) ? params ?? {} : {
+    ...params,
+    tables: params.tables.map((entry) => {
+      let normalized = normalizeSetSuperTableMutationParams(
+        isRecord(entry) ? { ...entry, unitId: params.unitId } : entry
+      );
+      if (!isRecord(normalized)) return normalized;
+      let { unitId: _unitId, ...table } = normalized;
+      return table;
+    })
+  };
+}
 function normalizeSetSuperTableMutationParams(params) {
   if (!isRecord(params) || !isRecord(params.reference))
     return params ?? {};
@@ -1082,6 +1096,7 @@ var RustEngineSyncController = class extends import_core2.Disposable {
   _nativeReady = !1;
   _snapshotLoaded = !1;
   _projectionLoadPromise = null;
+  _projectionDeltaBarrier = Promise.resolve();
   _pendingMutations = [];
   _projectionManagedTableUnits = /* @__PURE__ */ new Set();
   _initialize() {
@@ -1102,6 +1117,13 @@ var RustEngineSyncController = class extends import_core2.Disposable {
   }
   async waitForProjectionLoad() {
     await this._projectionLoadPromise;
+    let barrier;
+    do
+      barrier = this._projectionDeltaBarrier, await barrier;
+    while (barrier !== this._projectionDeltaBarrier);
+  }
+  setProjectionDeltaBarrier(barrier) {
+    this._projectionDeltaBarrier = barrier;
   }
   async _loadProjection(workbooks) {
     await loadNativeBinding(), this._nativeReady = !0;
@@ -1133,7 +1155,7 @@ var RustEngineSyncController = class extends import_core2.Disposable {
       }
   }
   dispose() {
-    if (super.dispose(), this._pendingMutations.length = 0, this._projectionManagedTableUnits.clear(), this._projectionLoadPromise = null, !this._nativeReady) {
+    if (super.dispose(), this._pendingMutations.length = 0, this._projectionManagedTableUnits.clear(), this._projectionLoadPromise = null, this._projectionDeltaBarrier = Promise.resolve(), !this._nativeReady) {
       this._snapshotLoaded = !1;
       return;
     }
@@ -1267,7 +1289,7 @@ async function analyzeNumberFormatBatch(input) {
 var import_core5 = require("@univerjs/core"), import_engine_formula4 = require("@univerjs/engine-formula"), import_engine_formula5 = require("@univerjs-pro/engine-formula");
 
 // package.json
-var name = "@univerjs-pro/engine-formula-rust", version = "1.0.0-insiders.20260808-70eefdd";
+var name = "@univerjs-pro/engine-formula-rust", version = "1.0.0-rc.0";
 
 // src/controllers/rust-same-runtime-projection.controller.ts
 var import_core3 = require("@univerjs/core"), import_engine_formula = require("@univerjs/engine-formula");
@@ -1290,11 +1312,12 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
   _activeDirtyManagerService;
   _initialProjectionLoad = Promise.resolve();
   _projectionDeltaQueue = Promise.resolve();
+  _baseProjectionStructures = /* @__PURE__ */ new Map();
   _initialize() {
     for (let base of this._univerInstanceService.getAllUnitsForType(
       import_core3.UniverInstanceType.UNIVER_BASE
     ))
-      this._rustEngineSyncController.setProjectionManagedTableUnit(base.getUnitId());
+      this._rustEngineSyncController.setProjectionManagedTableUnit(base.getUnitId()), this._rememberBaseProjectionStructure(base.getSnapshot());
     this._initialProjectionLoad = this._loadAllWorkbookProjections(), this.disposeWithMe(
       (0, import_core3.toDisposable)(
         this._univerInstanceService.getTypeOfUnitAdded$(import_core3.UniverInstanceType.UNIVER_SHEET).subscribe(({ unit }) => {
@@ -1309,7 +1332,7 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
     ), this.disposeWithMe(
       (0, import_core3.toDisposable)(
         this._univerInstanceService.getTypeOfUnitAdded$(import_core3.UniverInstanceType.UNIVER_BASE).subscribe(({ unit }) => {
-          this._rustEngineSyncController.setProjectionManagedTableUnit(unit.getUnitId()), this._enqueueProjectionDelta(() => this._upsertBaseProjection(unit.getUnitId()));
+          this._rustEngineSyncController.setProjectionManagedTableUnit(unit.getUnitId()), this._rememberBaseProjectionStructure(unit.getSnapshot()), this._enqueueProjectionDelta(() => this._upsertBaseProjection(unit.getUnitId()));
         })
       )
     ), this.disposeWithMe(
@@ -1319,7 +1342,7 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
     ), this.disposeWithMe(
       (0, import_core3.toDisposable)(
         this._univerInstanceService.getTypeOfUnitDisposed$(import_core3.UniverInstanceType.UNIVER_BASE).subscribe((base) => {
-          this._rustEngineSyncController.unsetProjectionManagedTableUnit(base.getUnitId()), this._enqueueProjectionDelta(
+          this._baseProjectionStructures.delete(base.getUnitId()), this._rustEngineSyncController.unsetProjectionManagedTableUnit(base.getUnitId()), this._enqueueProjectionDelta(
             () => this._rustEngineSyncController.disposeProjectionWorkbook(base.getUnitId())
           );
         })
@@ -1343,7 +1366,7 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
       if (!this._disposed)
         return task();
     }).catch(() => {
-    });
+    }), this._rustEngineSyncController.setProjectionDeltaBarrier(this._projectionDeltaQueue);
   }
   async _syncBaseMutation(command) {
     if (!hasUnitId2(command.params)) return;
@@ -1352,7 +1375,65 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
       this._applyBaseDirtyRanges(unitId, dirtyRanges);
       return;
     }
-    await this._upsertBaseProjection(unitId);
+    hasStructureInvalidation && this._isBaseProjectionStructureUnchanged(unitId) || hasStructureInvalidation && this._applyBaseFieldInsertion(unitId, dirtyRanges) || await this._upsertBaseProjection(unitId);
+  }
+  _applyBaseFieldInsertion(unitId, dirtyRanges) {
+    let base = this._univerInstanceService.getUnit(unitId, import_core3.UniverInstanceType.UNIVER_BASE), previous = this._baseProjectionStructures.get(unitId);
+    if (!base || !previous) return !1;
+    let snapshot = base.getSnapshot(), insertion = findSingleBaseFieldInsertion(previous, snapshot);
+    if (!insertion) return !1;
+    let projectionData = this._getBaseProjectionData(unitId), sheet = projectionData?.calculationData.allUnitData[unitId]?.[insertion.tableId];
+    if (!projectionData || !sheet) return !1;
+    let formulaData = projectionData.formulaData[unitId]?.[insertion.tableId], cellValue = {};
+    for (let row = 0; row < sheet.rowCount; row++) {
+      let value = sheet.cellData.getValue(row, insertion.column), formula = formulaData?.[row]?.[insertion.column];
+      cellValue[row] = {
+        [insertion.column]: formula ? { ...value, ...formula } : value ?? null
+      };
+    }
+    let insertedRange = {
+      startRow: 0,
+      endRow: Math.max(0, sheet.rowCount - 1),
+      startColumn: insertion.column,
+      endColumn: insertion.column
+    };
+    return this._rustEngineSyncController.applyProjectionMutation({
+      id: "sheet.mutation.insert-col",
+      params: {
+        unitId,
+        subUnitId: insertion.tableId,
+        range: insertedRange
+      },
+      dirtyRanges: []
+    }), this._rustEngineSyncController.applyProjectionMutation({
+      id: "sheet.mutation.set-range-values",
+      params: {
+        unitId,
+        subUnitId: insertion.tableId,
+        cellValue
+      },
+      dirtyRanges: [
+        {
+          unitId,
+          sheetId: insertion.tableId,
+          range: insertedRange
+        }
+      ]
+    }), this._rustEngineSyncController.applyProjectionMutation({
+      id: RUST_SET_SUPER_TABLES_MUTATION_ID,
+      params: {
+        unitId,
+        tables: this._getBaseTableEntries(
+          insertion.tableId,
+          snapshot,
+          (0, import_core3.createBaseFormulaTableNameMap)(snapshot)
+        ).map(([tableName, reference]) => ({
+          tableName,
+          reference
+        }))
+      },
+      dirtyRanges: []
+    }), dirtyRanges.length > 0 && this._applyBaseDirtyRanges(unitId, dirtyRanges), this._rememberBaseProjectionStructure(snapshot), !0;
   }
   _applyBaseDirtyRanges(unitId, dirtyRanges) {
     let projectionData = this._getBaseProjectionData(unitId);
@@ -1394,6 +1475,15 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
       formulaData
     );
     workbook && this._rustEngineSyncController.upsertProjectionWorkbook(workbook);
+    let base = this._univerInstanceService.getUnit(unitId, import_core3.UniverInstanceType.UNIVER_BASE);
+    base && this._rememberBaseProjectionStructure(base.getSnapshot());
+  }
+  _rememberBaseProjectionStructure(snapshot) {
+    this._baseProjectionStructures.set(snapshot.id, createBaseProjectionStructure(snapshot));
+  }
+  _isBaseProjectionStructureUnchanged(unitId) {
+    let base = this._univerInstanceService.getUnit(unitId, import_core3.UniverInstanceType.UNIVER_BASE), previous = this._baseProjectionStructures.get(unitId);
+    return !!(base && previous && isSameBaseProjectionStructure(previous, createBaseProjectionStructure(base.getSnapshot())));
   }
   _getBaseProjectionData(unitId) {
     let base = this._univerInstanceService.getUnit(unitId, import_core3.UniverInstanceType.UNIVER_BASE);
@@ -1403,9 +1493,9 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
         name: snapshot.name,
         unitType: import_core3.UniverInstanceType.UNIVER_BASE
       }
-    }, formulaData = { [unitId]: {} };
+    }, formulaData = { [unitId]: {} }, formulaTableNames = (0, import_core3.createBaseFormulaTableNameMap)(snapshot), normalizeFormulaTableReferences = (0, import_core3.createBaseFormulaTableReferenceNormalizer)(snapshot, formulaTableNames);
     for (let table of Object.values(snapshot.tables)) {
-      let fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null);
+      let fieldOrder = table.fieldOrder;
       allUnitData[unitId][table.id] = {
         cellData: new import_core3.ObjectMatrix(
           buildBaseRuntimeCellData(table)
@@ -1414,18 +1504,25 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
         columnCount: fieldOrder.length,
         rowData: {},
         columnData: {}
-      }, unitSheetNameMap[unitId][table.name] = table.id;
-      let tableFormulaData = {}, recordOrder = baseRecordOrder(table);
+      }, unitSheetNameMap[unitId][formulaTableNames.get(table.id)] = table.id;
+      let tableFormulaData = {}, normalizedFormulaByFieldId = /* @__PURE__ */ new Map(), recordOrder = baseRecordOrder(table);
       for (let row = 0; row < recordOrder.length; row++)
         if (table.records[recordOrder[row]])
           for (let column = 0; column < fieldOrder.length; column++) {
             let field = table.fields[fieldOrder[column]];
             if (!field || field.type !== "formula") continue;
             let formula = String(field.config?.formula ?? "").trim();
-            formula && ((tableFormulaData[row] ??= {})[column] = {
-              f: normalizeBaseFormulaForEngine(formula, table, snapshot),
+            if (!formula) continue;
+            let normalizedFormula = normalizedFormulaByFieldId.get(field.id);
+            normalizedFormula == null && (normalizedFormula = normalizeBaseFormulaForEngine(
+              formula,
+              table,
+              formulaTableNames,
+              normalizeFormulaTableReferences
+            ), normalizedFormulaByFieldId.set(field.id, normalizedFormula)), (tableFormulaData[row] ??= {})[column] = {
+              f: normalizedFormula,
               si: field.id
-            });
+            };
           }
       formulaData[unitId][table.id] = tableFormulaData;
     }
@@ -1494,30 +1591,17 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
   _createBaseTableResource(unitId) {
     let base = this._univerInstanceService.getUnit(unitId, import_core3.UniverInstanceType.UNIVER_BASE);
     if (base) {
-      let tables = Object.values(base.getSnapshot().tables), nameCounts = /* @__PURE__ */ new Map();
-      for (let table of tables) {
-        let name2 = table.name.trim().toLowerCase();
-        nameCounts.set(name2, (nameCounts.get(name2) ?? 0) + 1);
-      }
-      let data2 = {};
-      for (let table of tables) {
-        let recordCount = baseRecordOrder(table).length, fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null), tableNames = /* @__PURE__ */ new Set([table.id]);
-        (nameCounts.get(table.name.trim().toLowerCase()) ?? 0) === 1 && tableNames.add(table.name);
-        for (let name2 of tableNames)
+      let snapshot = base.getSnapshot(), tables = Object.values(snapshot.tables), formulaTableNames = (0, import_core3.createBaseFormulaTableNameMap)(snapshot), data2 = {};
+      for (let table of tables)
+        for (let [name2, reference] of this._getBaseTableEntries(table.id, snapshot, formulaTableNames)) {
+          let columns = Array.from(reference.titleMap.entries()).toSorted((left, right) => left[1] - right[1]).map(([displayName]) => ({ displayName }));
           (data2[table.id] ??= { tables: [] }).tables.push({
             name: name2,
-            range: {
-              startRow: 0,
-              endRow: Math.max(0, recordCount - 1),
-              startColumn: 0,
-              endColumn: Math.max(0, fieldOrder.length - 1)
-            },
-            columns: fieldOrder.map((fieldId) => ({
-              displayName: table.fields[fieldId]?.name ?? fieldId
-            })),
-            options: { showHeader: !1 }
+            range: reference.range,
+            columns,
+            options: { showHeader: reference.showHeader !== !1 }
           });
-      }
+        }
       return [
         {
           name: "SHEET_TABLE_PLUGIN",
@@ -1544,6 +1628,22 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
       }
     ];
   }
+  _getBaseTableEntries(tableId, snapshot, formulaTableNames) {
+    let table = snapshot.tables[tableId];
+    if (!table) return [];
+    let recordCount = baseRecordOrder(table).length, fieldOrder = table.fieldOrder, reference = {
+      sheetId: table.id,
+      range: {
+        startRow: 0,
+        endRow: Math.max(0, recordCount - 1),
+        startColumn: 0,
+        endColumn: Math.max(0, fieldOrder.length - 1)
+      },
+      titleMap: new Map(fieldOrder.map((fieldId, index) => [table.fields[fieldId]?.name ?? fieldId, index])),
+      showHeader: !1
+    };
+    return [[formulaTableNames.get(table.id), reference]];
+  }
   _rawCellData(cellData) {
     let raw = cellData.getMatrix(), result = {};
     for (let [row, values] of Object.entries(raw ?? {})) {
@@ -1554,20 +1654,65 @@ var RustSameRuntimeProjectionController = class extends import_core3.Disposable
     }
     return result;
   }
-}, BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g, BASE_TABLE_FIELD_REF_PATTERN = /\b([A-Z_]\w*)\[([^\]]+)\]/gi, BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_[\]])\[([^\]]+)\]/g, BASE_EXTERNAL_A1_REF_PATTERN = /(?:'\[[^\]]+\](?:[^']|'')+'|\[[^\]]+\][^\s'!]+)!\$?[A-Z]{1,3}\$?\d+(?::\$?[A-Z]{1,3}\$?\d+)?/gi, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX = /(?:'((?:[^']|'')+)'|\[[^\]]+\]|[A-Za-z0-9_.-]+)![^\s![\]]+\[/g;
-function normalizeBaseFormulaForEngine(formula, currentTable, snapshot) {
-  let references = [], hold = (reference) => `__BASE_FORMULA_REF_${references.push(reference) - 1}__`;
-  return protectBaseExternalReferences(formula, hold).replace(
+};
+function createBaseProjectionStructure(snapshot) {
+  let formulaTableNames = (0, import_core3.createBaseFormulaTableNameMap)(snapshot);
+  return {
+    unitName: snapshot.name,
+    tables: Object.fromEntries(
+      Object.values(snapshot.tables).map((table) => [
+        table.id,
+        {
+          formulaName: formulaTableNames.get(table.id),
+          fieldOrder: [...table.fieldOrder],
+          recordOrder: baseRecordOrder(table),
+          fieldSignatures: Object.fromEntries(
+            Object.entries(table.fields).map(([fieldId, field]) => [fieldId, JSON.stringify(field)])
+          )
+        }
+      ])
+    )
+  };
+}
+function isSameBaseProjectionStructure(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+function findSingleBaseFieldInsertion(previous, snapshot) {
+  let current = createBaseProjectionStructure(snapshot), previousTableIds = Object.keys(previous.tables).toSorted(), currentTableIds = Object.keys(current.tables).toSorted();
+  if (JSON.stringify(previousTableIds) !== JSON.stringify(currentTableIds)) return null;
+  let insertion = null;
+  for (let tableId of currentTableIds) {
+    let before = previous.tables[tableId], after = current.tables[tableId];
+    if (!before || !after || before.formulaName !== after.formulaName || JSON.stringify(before.recordOrder) !== JSON.stringify(after.recordOrder)) return null;
+    for (let fieldId of before.fieldOrder)
+      if (before.fieldSignatures[fieldId] !== after.fieldSignatures[fieldId]) return null;
+    if (JSON.stringify(before.fieldOrder) === JSON.stringify(after.fieldOrder)) continue;
+    if (insertion || after.fieldOrder.length !== before.fieldOrder.length + 1) return null;
+    let column = after.fieldOrder.findIndex((fieldId, index) => fieldId !== before.fieldOrder[index]);
+    if (column < 0) return null;
+    let withoutInserted = after.fieldOrder.filter((_, index) => index !== column);
+    if (JSON.stringify(withoutInserted) !== JSON.stringify(before.fieldOrder)) return null;
+    insertion = { tableId, column };
+  }
+  return insertion;
+}
+var BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g, BASE_TABLE_REFERENCE_PREFIX = /\b[A-Z_][\w.]*\[/gi, BASE_SCOPED_FIELD_REF_PATTERN = /(^|[^\w[])\[\[\s*#(This Row|Data)\s*\],\s*\[([^\]]+)\]\]/gi, BASE_CURRENT_ROW_FIELD_REF_PATTERN = /(^|[^\w[])\[@\[([^\]]+)\]\](?!\])/g, BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_[\]])\[([^\]]+)\]/g, BASE_EXTERNAL_A1_REF_PATTERN = /(?:'\[[^\]]+\](?:[^']|'')+'|\[[^\]]+\][^\s'!]+)!\$?[A-Z]{1,3}\$?\d+(?::\$?[A-Z]{1,3}\$?\d+)?/gi, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX = /(?:'((?:[^']|'')+)'|\[[^\]]+\]|[A-Za-z0-9_.-]+)![^\s![\]]+\[/g;
+function normalizeBaseFormulaForEngine(formula, currentTable, formulaTableNames, normalizeFormulaTableReferences) {
+  let canonicalFormula = normalizeFormulaTableReferences(formula), references = [], hold = (reference) => `__BASE_FORMULA_REF_${references.push(reference) - 1}__`;
+  return protectBaseTableReferences(protectBaseExternalReferences(canonicalFormula, hold), hold).replace(
     BASE_LEGACY_FIELD_REF_PATTERN,
-    (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, snapshot))
-  ).replace(BASE_TABLE_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
-    let targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot);
-    return targetTable ? hold(createEngineThisRowRef(targetTable, fieldName, snapshot)) : `${sourceTableName}[${fieldName}]`;
-  }).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, snapshot))}`).replace(
+    (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))
+  ).replace(BASE_SCOPED_FIELD_REF_PATTERN, (_match, prefix, scope, fieldName) => {
+    let tableName = formulaTableNames.get(currentTable.id) ?? currentTable.name;
+    return `${prefix}${hold(`${tableName}[[#${scope}],[${fieldName}]]`)}`;
+  }).replace(BASE_CURRENT_ROW_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(
     /__BASE_FORMULA_REF_(\d+)__/g,
     (_match, index) => references[Number(index)] ?? ""
   );
 }
+function protectBaseTableReferences(formula, replace) {
+  return protectBaseStructuredReferences(formula, BASE_TABLE_REFERENCE_PREFIX, replace);
+}
 function protectBaseExternalReferences(formula, replace) {
   let withProtectedA1 = formula.replace(
     BASE_EXTERNAL_A1_REF_PATTERN,
@@ -1576,15 +1721,18 @@ function protectBaseExternalReferences(formula, replace) {
   return protectBaseExternalStructuredReferences(withProtectedA1, replace);
 }
 function protectBaseExternalStructuredReferences(formula, replace) {
+  return protectBaseStructuredReferences(formula, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX, replace);
+}
+function protectBaseStructuredReferences(formula, prefixPattern, replace) {
   let spans = [];
-  BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex = 0;
+  prefixPattern.lastIndex = 0;
   let match;
-  for (; (match = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.exec(formula)) != null; ) {
+  for (; (match = prefixPattern.exec(formula)) != null; ) {
     if (isInsideBaseFormulaString(formula, match.index)) continue;
-    let openBracket = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex - 1, depth = 0;
+    let openBracket = prefixPattern.lastIndex - 1, depth = 0;
     for (let index = openBracket; index < formula.length; index++)
       if (formula[index] === "[" && depth++, formula[index] === "]" && (depth--, depth === 0)) {
-        spans.push({ start: match.index, end: index + 1 }), BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex = index + 1;
+        spans.push({ start: match.index, end: index + 1 }), prefixPattern.lastIndex = index + 1;
         break;
       }
   }
@@ -1606,34 +1754,21 @@ function isInsideBaseFormulaString(formula, position) {
     }
   return inString;
 }
-function createEngineThisRowRef(table, fieldName, snapshot) {
-  return `${getEngineBaseTableName(table, snapshot)}[[#This Row],[${fieldName}]]`;
-}
-function getEngineBaseTableName(table, snapshot) {
-  return Object.values(snapshot.tables).filter(
-    (candidate) => candidate.name === table.name
-  ).length === 1 ? table.name : table.id;
-}
-function resolveBaseFormulaTable(tableName, currentTable, snapshot) {
-  if (!tableName || tableName === "table" || tableName === currentTable.id || tableName === currentTable.name)
-    return currentTable;
-  let byId = snapshot.tables[tableName];
-  if (byId) return byId;
-  let matches = Object.values(snapshot.tables).filter((table) => table.name === tableName);
-  return matches.length === 1 ? matches[0] : void 0;
+function createEngineThisRowRef(table, fieldName, formulaTableNames) {
+  return `${formulaTableNames.get(table.id) ?? table.name}[[#This Row],[${fieldName}]]`;
 }
 function baseRecordOrder(table) {
   return table.recordOrder ? table.recordOrder.filter((recordId) => table.records[recordId] != null) : Object.values(table.records ?? {}).toSorted((left, right) => left.orderKey.localeCompare(right.orderKey)).map((record) => record.id);
 }
 function buildBaseRuntimeCellData(table) {
-  let cellData = { ...table.cellData }, fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null), recordOrder = baseRecordOrder(table);
+  let cellData = { ...table.cellData }, fieldOrder = table.fieldOrder, recordOrder = baseRecordOrder(table);
   for (let row = 0; row < recordOrder.length; row++) {
     let record = table.records[recordOrder[row]];
     if (record) {
       cellData[row] = { ...cellData[row] };
       for (let column = 0; column < fieldOrder.length; column++) {
         let fieldId = fieldOrder[column];
-        Object.prototype.hasOwnProperty.call(record.values ?? {}, fieldId) && (cellData[row][column] = toBaseRuntimeCellData(record.values[fieldId], table.fields[fieldId]));
+        table.fields[fieldId] && Object.prototype.hasOwnProperty.call(record.values ?? {}, fieldId) && (cellData[row][column] = toBaseRuntimeCellData(record.values[fieldId], table.fields[fieldId]));
       }
     }
   }

package/lib/es/index.js

@@ -179,7 +179,7 @@ import {
   CellValueType,
   ObjectMatrix
 } from "@univerjs/core";
-var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_PLUGIN", EXTERNAL_DATA_RESOURCE = "SHEET_EXTERNAL_DATA_PLUGIN", EXTERNAL_DATA_SIGNATURE = "external_data", RUST_UPSERT_REFERENCE_DATA_MUTATION_ID = "formula.mutation.upsert-reference-data", RUST_UPSERT_PROJECTION_WORKBOOK_MUTATION_ID = "formula.mutation.upsert-projection-workbook", RUST_FORMULA_RELEVANT_MUTATIONS = /* @__PURE__ */ new Set([
+var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_PLUGIN", EXTERNAL_DATA_RESOURCE = "SHEET_EXTERNAL_DATA_PLUGIN", EXTERNAL_DATA_SIGNATURE = "external_data", RUST_UPSERT_REFERENCE_DATA_MUTATION_ID = "formula.mutation.upsert-reference-data", RUST_UPSERT_PROJECTION_WORKBOOK_MUTATION_ID = "formula.mutation.upsert-projection-workbook", RUST_SET_SUPER_TABLES_MUTATION_ID = "formula.mutation.set-super-tables", RUST_FORMULA_RELEVANT_MUTATIONS = /* @__PURE__ */ new Set([
   "sheet.mutation.set-range-values",
   "sheet.mutation.insert-row",
   "sheet.mutation.insert-col",
@@ -206,6 +206,7 @@ var XLSX_WORKBOOK_CALCULATION_RESOURCE = "UNIVER_CLI_XLSX_WORKBOOK_CALCULATION_P
   "formula.mutation.set-image-formula-data",
   "formula.mutation.set-other-formula",
   "formula.mutation.set-super-table",
+  RUST_SET_SUPER_TABLES_MUTATION_ID,
   "formula.mutation.set-super-table-option",
   "formula.mutation.remove-defined-name",
   "formula.mutation.remove-feature-calculation",
@@ -441,13 +442,26 @@ var RustFormulaProjectionService = class {
   }
 };
 function normalizeRustEngineMutation(mutation) {
-  let params = mutation.id === "formula.mutation.set-super-table" ? normalizeSetSuperTableMutationParams(mutation.params) : mutation.params ?? {};
+  let params = mutation.id === "formula.mutation.set-super-table" ? normalizeSetSuperTableMutationParams(mutation.params) : mutation.id === RUST_SET_SUPER_TABLES_MUTATION_ID ? normalizeSetSuperTablesMutationParams(mutation.params) : mutation.params ?? {};
   return {
     id: mutation.id,
     params,
     dirtyRanges: Array.isArray(mutation.dirtyRanges) ? mutation.dirtyRanges : []
   };
 }
+function normalizeSetSuperTablesMutationParams(params) {
+  return !isRecord(params) || typeof params.unitId != "string" || !Array.isArray(params.tables) ? params ?? {} : {
+    ...params,
+    tables: params.tables.map((entry) => {
+      let normalized = normalizeSetSuperTableMutationParams(
+        isRecord(entry) ? { ...entry, unitId: params.unitId } : entry
+      );
+      if (!isRecord(normalized)) return normalized;
+      let { unitId: _unitId, ...table } = normalized;
+      return table;
+    })
+  };
+}
 function normalizeSetSuperTableMutationParams(params) {
   if (!isRecord(params) || !isRecord(params.reference))
     return params ?? {};
@@ -1015,6 +1029,7 @@ var RustEngineSyncController = class extends Disposable {
   _nativeReady = !1;
   _snapshotLoaded = !1;
   _projectionLoadPromise = null;
+  _projectionDeltaBarrier = Promise.resolve();
   _pendingMutations = [];
   _projectionManagedTableUnits = /* @__PURE__ */ new Set();
   _initialize() {
@@ -1035,6 +1050,13 @@ var RustEngineSyncController = class extends Disposable {
   }
   async waitForProjectionLoad() {
     await this._projectionLoadPromise;
+    let barrier;
+    do
+      barrier = this._projectionDeltaBarrier, await barrier;
+    while (barrier !== this._projectionDeltaBarrier);
+  }
+  setProjectionDeltaBarrier(barrier) {
+    this._projectionDeltaBarrier = barrier;
   }
   async _loadProjection(workbooks) {
     await loadNativeBinding(), this._nativeReady = !0;
@@ -1066,7 +1088,7 @@ var RustEngineSyncController = class extends Disposable {
       }
   }
   dispose() {
-    if (super.dispose(), this._pendingMutations.length = 0, this._projectionManagedTableUnits.clear(), this._projectionLoadPromise = null, !this._nativeReady) {
+    if (super.dispose(), this._pendingMutations.length = 0, this._projectionManagedTableUnits.clear(), this._projectionLoadPromise = null, this._projectionDeltaBarrier = Promise.resolve(), !this._nativeReady) {
       this._snapshotLoaded = !1;
       return;
     }
@@ -1202,12 +1224,14 @@ import { ICalculateFormulaService } from "@univerjs/engine-formula";
 import { UniverProFormulaEnginePlugin } from "@univerjs-pro/engine-formula";
 
 // package.json
-var name = "@univerjs-pro/engine-formula-rust", version = "1.0.0-insiders.20260808-70eefdd";
+var name = "@univerjs-pro/engine-formula-rust", version = "1.0.0-rc.0";
 
 // src/controllers/rust-same-runtime-projection.controller.ts
 import {
   CellValueType as CellValueType2,
   CommandType as CommandType2,
+  createBaseFormulaTableReferenceNormalizer,
+  createBaseFormulaTableNameMap,
   Disposable as Disposable2,
   ICommandService as ICommandService2,
   IUniverInstanceService,
@@ -1242,11 +1266,12 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
   _activeDirtyManagerService;
   _initialProjectionLoad = Promise.resolve();
   _projectionDeltaQueue = Promise.resolve();
+  _baseProjectionStructures = /* @__PURE__ */ new Map();
   _initialize() {
     for (let base of this._univerInstanceService.getAllUnitsForType(
       UniverInstanceType.UNIVER_BASE
     ))
-      this._rustEngineSyncController.setProjectionManagedTableUnit(base.getUnitId());
+      this._rustEngineSyncController.setProjectionManagedTableUnit(base.getUnitId()), this._rememberBaseProjectionStructure(base.getSnapshot());
     this._initialProjectionLoad = this._loadAllWorkbookProjections(), this.disposeWithMe(
       toDisposable(
         this._univerInstanceService.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).subscribe(({ unit }) => {
@@ -1261,7 +1286,7 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
     ), this.disposeWithMe(
       toDisposable(
         this._univerInstanceService.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_BASE).subscribe(({ unit }) => {
-          this._rustEngineSyncController.setProjectionManagedTableUnit(unit.getUnitId()), this._enqueueProjectionDelta(() => this._upsertBaseProjection(unit.getUnitId()));
+          this._rustEngineSyncController.setProjectionManagedTableUnit(unit.getUnitId()), this._rememberBaseProjectionStructure(unit.getSnapshot()), this._enqueueProjectionDelta(() => this._upsertBaseProjection(unit.getUnitId()));
         })
       )
     ), this.disposeWithMe(
@@ -1271,7 +1296,7 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
     ), this.disposeWithMe(
       toDisposable(
         this._univerInstanceService.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_BASE).subscribe((base) => {
-          this._rustEngineSyncController.unsetProjectionManagedTableUnit(base.getUnitId()), this._enqueueProjectionDelta(
+          this._baseProjectionStructures.delete(base.getUnitId()), this._rustEngineSyncController.unsetProjectionManagedTableUnit(base.getUnitId()), this._enqueueProjectionDelta(
             () => this._rustEngineSyncController.disposeProjectionWorkbook(base.getUnitId())
           );
         })
@@ -1295,7 +1320,7 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
       if (!this._disposed)
         return task();
     }).catch(() => {
-    });
+    }), this._rustEngineSyncController.setProjectionDeltaBarrier(this._projectionDeltaQueue);
   }
   async _syncBaseMutation(command) {
     if (!hasUnitId2(command.params)) return;
@@ -1304,7 +1329,65 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
       this._applyBaseDirtyRanges(unitId, dirtyRanges);
       return;
     }
-    await this._upsertBaseProjection(unitId);
+    hasStructureInvalidation && this._isBaseProjectionStructureUnchanged(unitId) || hasStructureInvalidation && this._applyBaseFieldInsertion(unitId, dirtyRanges) || await this._upsertBaseProjection(unitId);
+  }
+  _applyBaseFieldInsertion(unitId, dirtyRanges) {
+    let base = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE), previous = this._baseProjectionStructures.get(unitId);
+    if (!base || !previous) return !1;
+    let snapshot = base.getSnapshot(), insertion = findSingleBaseFieldInsertion(previous, snapshot);
+    if (!insertion) return !1;
+    let projectionData = this._getBaseProjectionData(unitId), sheet = projectionData?.calculationData.allUnitData[unitId]?.[insertion.tableId];
+    if (!projectionData || !sheet) return !1;
+    let formulaData = projectionData.formulaData[unitId]?.[insertion.tableId], cellValue = {};
+    for (let row = 0; row < sheet.rowCount; row++) {
+      let value = sheet.cellData.getValue(row, insertion.column), formula = formulaData?.[row]?.[insertion.column];
+      cellValue[row] = {
+        [insertion.column]: formula ? { ...value, ...formula } : value ?? null
+      };
+    }
+    let insertedRange = {
+      startRow: 0,
+      endRow: Math.max(0, sheet.rowCount - 1),
+      startColumn: insertion.column,
+      endColumn: insertion.column
+    };
+    return this._rustEngineSyncController.applyProjectionMutation({
+      id: "sheet.mutation.insert-col",
+      params: {
+        unitId,
+        subUnitId: insertion.tableId,
+        range: insertedRange
+      },
+      dirtyRanges: []
+    }), this._rustEngineSyncController.applyProjectionMutation({
+      id: "sheet.mutation.set-range-values",
+      params: {
+        unitId,
+        subUnitId: insertion.tableId,
+        cellValue
+      },
+      dirtyRanges: [
+        {
+          unitId,
+          sheetId: insertion.tableId,
+          range: insertedRange
+        }
+      ]
+    }), this._rustEngineSyncController.applyProjectionMutation({
+      id: RUST_SET_SUPER_TABLES_MUTATION_ID,
+      params: {
+        unitId,
+        tables: this._getBaseTableEntries(
+          insertion.tableId,
+          snapshot,
+          createBaseFormulaTableNameMap(snapshot)
+        ).map(([tableName, reference]) => ({
+          tableName,
+          reference
+        }))
+      },
+      dirtyRanges: []
+    }), dirtyRanges.length > 0 && this._applyBaseDirtyRanges(unitId, dirtyRanges), this._rememberBaseProjectionStructure(snapshot), !0;
   }
   _applyBaseDirtyRanges(unitId, dirtyRanges) {
     let projectionData = this._getBaseProjectionData(unitId);
@@ -1346,6 +1429,15 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
       formulaData
     );
     workbook && this._rustEngineSyncController.upsertProjectionWorkbook(workbook);
+    let base = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE);
+    base && this._rememberBaseProjectionStructure(base.getSnapshot());
+  }
+  _rememberBaseProjectionStructure(snapshot) {
+    this._baseProjectionStructures.set(snapshot.id, createBaseProjectionStructure(snapshot));
+  }
+  _isBaseProjectionStructureUnchanged(unitId) {
+    let base = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE), previous = this._baseProjectionStructures.get(unitId);
+    return !!(base && previous && isSameBaseProjectionStructure(previous, createBaseProjectionStructure(base.getSnapshot())));
   }
   _getBaseProjectionData(unitId) {
     let base = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE);
@@ -1355,9 +1447,9 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
         name: snapshot.name,
         unitType: UniverInstanceType.UNIVER_BASE
       }
-    }, formulaData = { [unitId]: {} };
+    }, formulaData = { [unitId]: {} }, formulaTableNames = createBaseFormulaTableNameMap(snapshot), normalizeFormulaTableReferences = createBaseFormulaTableReferenceNormalizer(snapshot, formulaTableNames);
     for (let table of Object.values(snapshot.tables)) {
-      let fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null);
+      let fieldOrder = table.fieldOrder;
       allUnitData[unitId][table.id] = {
         cellData: new ObjectMatrix2(
           buildBaseRuntimeCellData(table)
@@ -1366,18 +1458,25 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
         columnCount: fieldOrder.length,
         rowData: {},
         columnData: {}
-      }, unitSheetNameMap[unitId][table.name] = table.id;
-      let tableFormulaData = {}, recordOrder = baseRecordOrder(table);
+      }, unitSheetNameMap[unitId][formulaTableNames.get(table.id)] = table.id;
+      let tableFormulaData = {}, normalizedFormulaByFieldId = /* @__PURE__ */ new Map(), recordOrder = baseRecordOrder(table);
       for (let row = 0; row < recordOrder.length; row++)
         if (table.records[recordOrder[row]])
           for (let column = 0; column < fieldOrder.length; column++) {
             let field = table.fields[fieldOrder[column]];
             if (!field || field.type !== "formula") continue;
             let formula = String(field.config?.formula ?? "").trim();
-            formula && ((tableFormulaData[row] ??= {})[column] = {
-              f: normalizeBaseFormulaForEngine(formula, table, snapshot),
+            if (!formula) continue;
+            let normalizedFormula = normalizedFormulaByFieldId.get(field.id);
+            normalizedFormula == null && (normalizedFormula = normalizeBaseFormulaForEngine(
+              formula,
+              table,
+              formulaTableNames,
+              normalizeFormulaTableReferences
+            ), normalizedFormulaByFieldId.set(field.id, normalizedFormula)), (tableFormulaData[row] ??= {})[column] = {
+              f: normalizedFormula,
               si: field.id
-            });
+            };
           }
       formulaData[unitId][table.id] = tableFormulaData;
     }
@@ -1446,30 +1545,17 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
   _createBaseTableResource(unitId) {
     let base = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE);
     if (base) {
-      let tables = Object.values(base.getSnapshot().tables), nameCounts = /* @__PURE__ */ new Map();
-      for (let table of tables) {
-        let name2 = table.name.trim().toLowerCase();
-        nameCounts.set(name2, (nameCounts.get(name2) ?? 0) + 1);
-      }
-      let data2 = {};
-      for (let table of tables) {
-        let recordCount = baseRecordOrder(table).length, fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null), tableNames = /* @__PURE__ */ new Set([table.id]);
-        (nameCounts.get(table.name.trim().toLowerCase()) ?? 0) === 1 && tableNames.add(table.name);
-        for (let name2 of tableNames)
+      let snapshot = base.getSnapshot(), tables = Object.values(snapshot.tables), formulaTableNames = createBaseFormulaTableNameMap(snapshot), data2 = {};
+      for (let table of tables)
+        for (let [name2, reference] of this._getBaseTableEntries(table.id, snapshot, formulaTableNames)) {
+          let columns = Array.from(reference.titleMap.entries()).toSorted((left, right) => left[1] - right[1]).map(([displayName]) => ({ displayName }));
           (data2[table.id] ??= { tables: [] }).tables.push({
             name: name2,
-            range: {
-              startRow: 0,
-              endRow: Math.max(0, recordCount - 1),
-              startColumn: 0,
-              endColumn: Math.max(0, fieldOrder.length - 1)
-            },
-            columns: fieldOrder.map((fieldId) => ({
-              displayName: table.fields[fieldId]?.name ?? fieldId
-            })),
-            options: { showHeader: !1 }
+            range: reference.range,
+            columns,
+            options: { showHeader: reference.showHeader !== !1 }
           });
-      }
+        }
       return [
         {
           name: "SHEET_TABLE_PLUGIN",
@@ -1496,6 +1582,22 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
       }
     ];
   }
+  _getBaseTableEntries(tableId, snapshot, formulaTableNames) {
+    let table = snapshot.tables[tableId];
+    if (!table) return [];
+    let recordCount = baseRecordOrder(table).length, fieldOrder = table.fieldOrder, reference = {
+      sheetId: table.id,
+      range: {
+        startRow: 0,
+        endRow: Math.max(0, recordCount - 1),
+        startColumn: 0,
+        endColumn: Math.max(0, fieldOrder.length - 1)
+      },
+      titleMap: new Map(fieldOrder.map((fieldId, index) => [table.fields[fieldId]?.name ?? fieldId, index])),
+      showHeader: !1
+    };
+    return [[formulaTableNames.get(table.id), reference]];
+  }
   _rawCellData(cellData) {
     let raw = cellData.getMatrix(), result = {};
     for (let [row, values] of Object.entries(raw ?? {})) {
@@ -1506,20 +1608,65 @@ var RustSameRuntimeProjectionController = class extends Disposable2 {
     }
     return result;
   }
-}, BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g, BASE_TABLE_FIELD_REF_PATTERN = /\b([A-Z_]\w*)\[([^\]]+)\]/gi, BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_[\]])\[([^\]]+)\]/g, BASE_EXTERNAL_A1_REF_PATTERN = /(?:'\[[^\]]+\](?:[^']|'')+'|\[[^\]]+\][^\s'!]+)!\$?[A-Z]{1,3}\$?\d+(?::\$?[A-Z]{1,3}\$?\d+)?/gi, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX = /(?:'((?:[^']|'')+)'|\[[^\]]+\]|[A-Za-z0-9_.-]+)![^\s![\]]+\[/g;
-function normalizeBaseFormulaForEngine(formula, currentTable, snapshot) {
-  let references = [], hold = (reference) => `__BASE_FORMULA_REF_${references.push(reference) - 1}__`;
-  return protectBaseExternalReferences(formula, hold).replace(
+};
+function createBaseProjectionStructure(snapshot) {
+  let formulaTableNames = createBaseFormulaTableNameMap(snapshot);
+  return {
+    unitName: snapshot.name,
+    tables: Object.fromEntries(
+      Object.values(snapshot.tables).map((table) => [
+        table.id,
+        {
+          formulaName: formulaTableNames.get(table.id),
+          fieldOrder: [...table.fieldOrder],
+          recordOrder: baseRecordOrder(table),
+          fieldSignatures: Object.fromEntries(
+            Object.entries(table.fields).map(([fieldId, field]) => [fieldId, JSON.stringify(field)])
+          )
+        }
+      ])
+    )
+  };
+}
+function isSameBaseProjectionStructure(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+function findSingleBaseFieldInsertion(previous, snapshot) {
+  let current = createBaseProjectionStructure(snapshot), previousTableIds = Object.keys(previous.tables).toSorted(), currentTableIds = Object.keys(current.tables).toSorted();
+  if (JSON.stringify(previousTableIds) !== JSON.stringify(currentTableIds)) return null;
+  let insertion = null;
+  for (let tableId of currentTableIds) {
+    let before = previous.tables[tableId], after = current.tables[tableId];
+    if (!before || !after || before.formulaName !== after.formulaName || JSON.stringify(before.recordOrder) !== JSON.stringify(after.recordOrder)) return null;
+    for (let fieldId of before.fieldOrder)
+      if (before.fieldSignatures[fieldId] !== after.fieldSignatures[fieldId]) return null;
+    if (JSON.stringify(before.fieldOrder) === JSON.stringify(after.fieldOrder)) continue;
+    if (insertion || after.fieldOrder.length !== before.fieldOrder.length + 1) return null;
+    let column = after.fieldOrder.findIndex((fieldId, index) => fieldId !== before.fieldOrder[index]);
+    if (column < 0) return null;
+    let withoutInserted = after.fieldOrder.filter((_, index) => index !== column);
+    if (JSON.stringify(withoutInserted) !== JSON.stringify(before.fieldOrder)) return null;
+    insertion = { tableId, column };
+  }
+  return insertion;
+}
+var BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g, BASE_TABLE_REFERENCE_PREFIX = /\b[A-Z_][\w.]*\[/gi, BASE_SCOPED_FIELD_REF_PATTERN = /(^|[^\w[])\[\[\s*#(This Row|Data)\s*\],\s*\[([^\]]+)\]\]/gi, BASE_CURRENT_ROW_FIELD_REF_PATTERN = /(^|[^\w[])\[@\[([^\]]+)\]\](?!\])/g, BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_[\]])\[([^\]]+)\]/g, BASE_EXTERNAL_A1_REF_PATTERN = /(?:'\[[^\]]+\](?:[^']|'')+'|\[[^\]]+\][^\s'!]+)!\$?[A-Z]{1,3}\$?\d+(?::\$?[A-Z]{1,3}\$?\d+)?/gi, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX = /(?:'((?:[^']|'')+)'|\[[^\]]+\]|[A-Za-z0-9_.-]+)![^\s![\]]+\[/g;
+function normalizeBaseFormulaForEngine(formula, currentTable, formulaTableNames, normalizeFormulaTableReferences) {
+  let canonicalFormula = normalizeFormulaTableReferences(formula), references = [], hold = (reference) => `__BASE_FORMULA_REF_${references.push(reference) - 1}__`;
+  return protectBaseTableReferences(protectBaseExternalReferences(canonicalFormula, hold), hold).replace(
     BASE_LEGACY_FIELD_REF_PATTERN,
-    (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, snapshot))
-  ).replace(BASE_TABLE_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
-    let targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot);
-    return targetTable ? hold(createEngineThisRowRef(targetTable, fieldName, snapshot)) : `${sourceTableName}[${fieldName}]`;
-  }).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, snapshot))}`).replace(
+    (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))
+  ).replace(BASE_SCOPED_FIELD_REF_PATTERN, (_match, prefix, scope, fieldName) => {
+    let tableName = formulaTableNames.get(currentTable.id) ?? currentTable.name;
+    return `${prefix}${hold(`${tableName}[[#${scope}],[${fieldName}]]`)}`;
+  }).replace(BASE_CURRENT_ROW_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(
     /__BASE_FORMULA_REF_(\d+)__/g,
     (_match, index) => references[Number(index)] ?? ""
   );
 }
+function protectBaseTableReferences(formula, replace) {
+  return protectBaseStructuredReferences(formula, BASE_TABLE_REFERENCE_PREFIX, replace);
+}
 function protectBaseExternalReferences(formula, replace) {
   let withProtectedA1 = formula.replace(
     BASE_EXTERNAL_A1_REF_PATTERN,
@@ -1528,15 +1675,18 @@ function protectBaseExternalReferences(formula, replace) {
   return protectBaseExternalStructuredReferences(withProtectedA1, replace);
 }
 function protectBaseExternalStructuredReferences(formula, replace) {
+  return protectBaseStructuredReferences(formula, BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX, replace);
+}
+function protectBaseStructuredReferences(formula, prefixPattern, replace) {
   let spans = [];
-  BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex = 0;
+  prefixPattern.lastIndex = 0;
   let match;
-  for (; (match = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.exec(formula)) != null; ) {
+  for (; (match = prefixPattern.exec(formula)) != null; ) {
     if (isInsideBaseFormulaString(formula, match.index)) continue;
-    let openBracket = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex - 1, depth = 0;
+    let openBracket = prefixPattern.lastIndex - 1, depth = 0;
     for (let index = openBracket; index < formula.length; index++)
       if (formula[index] === "[" && depth++, formula[index] === "]" && (depth--, depth === 0)) {
-        spans.push({ start: match.index, end: index + 1 }), BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex = index + 1;
+        spans.push({ start: match.index, end: index + 1 }), prefixPattern.lastIndex = index + 1;
         break;
       }
   }
@@ -1558,34 +1708,21 @@ function isInsideBaseFormulaString(formula, position) {
     }
   return inString;
 }
-function createEngineThisRowRef(table, fieldName, snapshot) {
-  return `${getEngineBaseTableName(table, snapshot)}[[#This Row],[${fieldName}]]`;
-}
-function getEngineBaseTableName(table, snapshot) {
-  return Object.values(snapshot.tables).filter(
-    (candidate) => candidate.name === table.name
-  ).length === 1 ? table.name : table.id;
-}
-function resolveBaseFormulaTable(tableName, currentTable, snapshot) {
-  if (!tableName || tableName === "table" || tableName === currentTable.id || tableName === currentTable.name)
-    return currentTable;
-  let byId = snapshot.tables[tableName];
-  if (byId) return byId;
-  let matches = Object.values(snapshot.tables).filter((table) => table.name === tableName);
-  return matches.length === 1 ? matches[0] : void 0;
+function createEngineThisRowRef(table, fieldName, formulaTableNames) {
+  return `${formulaTableNames.get(table.id) ?? table.name}[[#This Row],[${fieldName}]]`;
 }
 function baseRecordOrder(table) {
   return table.recordOrder ? table.recordOrder.filter((recordId) => table.records[recordId] != null) : Object.values(table.records ?? {}).toSorted((left, right) => left.orderKey.localeCompare(right.orderKey)).map((record) => record.id);
 }
 function buildBaseRuntimeCellData(table) {
-  let cellData = { ...table.cellData }, fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] != null), recordOrder = baseRecordOrder(table);
+  let cellData = { ...table.cellData }, fieldOrder = table.fieldOrder, recordOrder = baseRecordOrder(table);
   for (let row = 0; row < recordOrder.length; row++) {
     let record = table.records[recordOrder[row]];
     if (record) {
       cellData[row] = { ...cellData[row] };
       for (let column = 0; column < fieldOrder.length; column++) {
         let fieldId = fieldOrder[column];
-        Object.prototype.hasOwnProperty.call(record.values ?? {}, fieldId) && (cellData[row][column] = toBaseRuntimeCellData(record.values[fieldId], table.fields[fieldId]));
+        table.fields[fieldId] && Object.prototype.hasOwnProperty.call(record.values ?? {}, fieldId) && (cellData[row][column] = toBaseRuntimeCellData(record.values[fieldId], table.fields[fieldId]));
       }
     }
   }

package/lib/types/index.d.ts

@@ -587,12 +587,14 @@ declare class RustEngineSyncController extends Disposable {
   private _nativeReady;
   private _snapshotLoaded;
   private _projectionLoadPromise;
+  private _projectionDeltaBarrier;
   private readonly _pendingMutations;
   private readonly _projectionManagedTableUnits;
   constructor(_commandService: ICommandService);
   private _initialize;
   loadProjection(workbooks: readonly IRustProjectionWorkbookInput[]): Promise<void>;
   waitForProjectionLoad(): Promise<void>;
+  setProjectionDeltaBarrier(barrier: Promise<void>): void;
   private _loadProjection;
   applyProjectionMutation(mutation: IRustEngineMutation): void;
   upsertProjectionWorkbook(workbook: IRustProjectionWorkbookInput): void;

package/package.json

@@ -1,11 +1,11 @@
 {
     "author": "DreamNum Co., Ltd. <developer@univer.ai>",
     "dependencies": {
-        "@univerjs-pro/engine-formula": "1.0.0-insiders.20260808-70eefdd",
-        "@univerjs-pro/engine-formula-rust-binding": "1.0.0-insiders.20260805-b15e7f3",
-        "@univerjs/core": "1.0.0-insiders.20260808-70eefdd",
-        "@univerjs/engine-formula": "1.0.0-insiders.20260808-70eefdd",
-        "@univerjs/protocol": "1.0.0-insiders.20260808-70eefdd"
+        "@univerjs-pro/engine-formula": "1.0.0-rc.0",
+        "@univerjs-pro/engine-formula-rust-binding": "1.0.0-insiders.20260910-22fe9c7",
+        "@univerjs/core": "1.0.0-rc.0",
+        "@univerjs/engine-formula": "1.0.0-rc.0",
+        "@univerjs/protocol": "1.0.0-rc.0"
     },
     "description": "Rust-backed formula engine plugin for Univer",
     "files": [
@@ -20,7 +20,7 @@
         "url": "https://github.com/dream-num/univer-rs"
     },
     "type": "module",
-    "version": "1.0.0-insiders.20260808-70eefdd",
+    "version": "1.0.0-rc.0",
     "main": "./lib/cjs/index.cjs",
     "module": "./lib/es/index.js",
     "types": "./lib/types/index.d.ts",