Server/Office scripts: handle named ranges with sheet scope

xlwings · Apr 29, 2023 · 8be1ade · 8be1ade
1 parent 5aa76e8
commit 8be1ade
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/xlwings/js/xlwings.ts b/xlwings/js/xlwings.ts
@@ -131,7 +131,6 @@ async function runPython(
   let names: Names[] = [];
   workbook.getNames().forEach((namedItem, ix) => {
     // Currently filtering to named ranges
-    // TODO: add sheet scoped named ranges via sheets as in officejs
     let itemType: ExcelScript.NamedItemType = namedItem.getType();
     if (itemType === ExcelScript.NamedItemType.range) {
       names[ix] = {
@@ -160,6 +159,26 @@ async function runPython(
       lastCellCol = 0;
       lastCellRow = 0;
     }
+
+    // Names (sheet scope)
+    let namesSheetScope: Names[] = [];
+    sheet.getNames().forEach((namedItem, ix) => {
+      // Currently filtering to named ranges
+      let itemType: ExcelScript.NamedItemType = namedItem.getType();
+      if (itemType === ExcelScript.NamedItemType.range) {
+        namesSheetScope[ix] = {
+          name: namedItem.getName(),
+          sheet_index: namedItem.getRange().getWorksheet().getPosition(),
+          address: namedItem.getRange().getAddress().split("!").pop(),
+          book_scope: false,
+        };
+      }
+    });
+
+    // Add sheet scoped names to book scoped names
+    payload["names"] = payload["names"].concat(namesSheetScope);
+
+    // values
     if (isSheetIncluded) {
       let range = sheet.getRangeByIndexes(
         0,