feat: return sheet name and index from newSheet

base/src/test/test_sheets.rs

@@ -244,3 +244,18 @@ fn delete_sheet_error() {
     assert!(model.delete_sheet(2).is_err());
     assert!(model.delete_sheet(1).is_ok());
 }
+
+#[test]
+fn new_sheet_returns_data() {
+    let mut model = new_empty_model();
+    let (name1, index1) = model.new_sheet();
+    assert_eq!(name1, "Sheet2");
+    assert_eq!(index1, 1);
+    let (name2, index2) = model.new_sheet();
+    assert_eq!(name2, "Sheet3");
+    assert_eq!(index2, 2);
+    assert_eq!(
+        model.workbook.get_worksheet_names(),
+        ["Sheet1", "Sheet2", "Sheet3"]
+    );
+}

base/src/test/user_model/test_add_delete_sheets.rs

@@ -99,3 +99,11 @@ fn new_sheet_selects_it() {
     model.new_sheet().unwrap();
     assert_eq!(model.get_selected_sheet(), 1);
 }
+
+#[test]
+fn new_sheet_returns_index_and_name() {
+    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
+    let (name, index) = model.new_sheet().unwrap();
+    assert_eq!(name, "Sheet2");
+    assert_eq!(index, 1);
+}

base/src/user_model/common.rs

@@ -487,11 +487,14 @@ impl UserModel {
     ///
     /// See also:
     /// * [Model::new_sheet]
-    pub fn new_sheet(&mut self) -> Result<(), String> {
+    pub fn new_sheet(&mut self) -> Result<(String, u32), String> {
         let (name, index) = self.model.new_sheet();
         self.set_selected_sheet(index)?;
-        self.push_diff_list(vec![Diff::NewSheet { index, name }]);
-        Ok(())
+        self.push_diff_list(vec![Diff::NewSheet {
+            index,
+            name: name.clone(),
+        }]);
+        Ok((name, index))
     }
 
     /// Deletes sheet by index

bindings/nodejs/__test__/index.spec.mjs

@@ -4,17 +4,22 @@ import { UserModel, Model } from '../index.js';
 
 test('User Model smoke test', (t) => {
   const model = new UserModel("Workbook1", "en", "UTC");
-
   model.setUserInput(0, 1, 1, "=1+1");
   t.is(model.getFormattedCellValue(0, 1, 1), '2');
 });
 
 
 test('Raw API smoke test', (t) => {
   const model = new Model("Workbook1", "en", "UTC");
-
   model.setUserInput(0, 1, 1, "=1+1");
   model.evaluate();
   t.is(model.getFormattedCellValue(0, 1, 1), '2');
 });
 
+test('model.newSheet returns name and index', (t) => {
+  const model = new Model('Workbook1', 'en', 'UTC');
+  const result = model.newSheet();
+  t.deepEqual(result, { name: 'Sheet2', index: 1 });
+});
+
+

bindings/nodejs/index.d.ts

@@ -3,6 +3,10 @@
 
 /* auto-generated by NAPI-RS */
 
+export interface NewSheet {
+  name: string
+  index: number
+}
 export declare class Model {
   constructor(name: string, locale: string, timezone: string)
   static fromXlsx(filePath: string, locale: string, tz: string): Model
@@ -32,14 +36,13 @@ export declare class Model {
   getWorksheetsProperties(): unknown
   setSheetColor(sheet: number, color: string): void
   addSheet(sheetName: string): void
-  newSheet(): void
+  newSheet(): NewSheet
   deleteSheet(sheet: number): void
   renameSheet(sheet: number, newName: string): void
   getDefinedNameList(): unknown
   newDefinedName(name: string, scope: number | undefined | null, formula: string): void
   updateDefinedName(name: string, scope: number | undefined | null, newName: string, newScope: number | undefined | null, newFormula: string): void
   deleteDefinedName(name: string, scope?: number | undefined | null): void
-  testPanic(): void
 }
 export declare class UserModel {
   constructor(name: string, locale: string, timezone: string)
@@ -51,20 +54,21 @@ export declare class UserModel {
   flushSendQueue(): Array<number>
   applyExternalDiffs(diffs: Uint8Array): void
   getCellContent(sheet: number, row: number, column: number): string
-  newSheet(): void
+  newSheet(): NewSheet
   deleteSheet(sheet: number): void
   hideSheet(sheet: number): void
   unhideSheet(sheet: number): void
   renameSheet(sheet: number, name: string): void
   setSheetColor(sheet: number, color: string): void
   rangeClearAll(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
   rangeClearContents(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
+  rangeClearFormatting(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
   insertRows(sheet: number, row: number, rowCount: number): void
   insertColumns(sheet: number, column: number, columnCount: number): void
   deleteRows(sheet: number, row: number, rowCount: number): void
   deleteColumns(sheet: number, column: number, columnCount: number): void
-  setRowHeight(sheet: number, row: number, height: number): void
-  setColumnWidth(sheet: number, column: number, width: number): void
+  setRowsHeight(sheet: number, rowStart: number, rowEnd: number, height: number): void
+  setColumnsWidth(sheet: number, columnStart: number, columnEnd: number, width: number): void
   getRowHeight(sheet: number, row: number): number
   getColumnWidth(sheet: number, column: number): number
   setUserInput(sheet: number, row: number, column: number, input: string): void

bindings/nodejs/src/model.rs

@@ -33,6 +33,12 @@ pub struct Model {
   model: BaseModel,
 }
 
+#[napi(object)]
+pub struct NewSheet {
+  pub name: String,
+  pub index: u32,
+}
+
 #[napi]
 impl Model {
   #[napi(constructor)]
@@ -270,8 +276,9 @@ impl Model {
   }
 
   #[napi]
-  pub fn new_sheet(&mut self) {
-    self.model.new_sheet();
+  pub fn new_sheet(&mut self) -> NewSheet {
+    let (name, index) = self.model.new_sheet();
+    NewSheet { name, index }
   }
 
   #[napi]