microsoft-graph 2.2.3 → 2.2.4

package/dist/operations/workbookTable/getWorkbookTableHeaderRange.test.js

@@ -4,11 +4,11 @@ import { getDefaultDriveRef } from "../../services/drive.js";
 import { driveItemPath } from "../../services/driveItem.js";
 import { generateTempFileName } from "../../services/temporaryFiles.js";
 import { createWorkbookRangeRef } from "../../services/workbookRange.js";
+import { createDefaultWorkbookWorksheetRef } from "../../services/workbookWorksheet.js";
 import deleteDriveItemWithRetry from "../../tasks/deleteDriveItemWithRetry.js";
 import calculateWorkbook from "../workbook/calculateWorkbook.js";
 import createWorkbook from "../workbook/createWorkbook.js";
 import updateWorkbookRange from "../workbookRange/updateWorkbookRange.js";
-import createWorkbookWorksheet from "../workbookWorksheet/createWorkbookWorksheet.js";
 import createWorkbookTable from "./createWorkbookTable.js";
 import getWorkbookTableHeaderRange from "./getWorkbookTableHeaderRange.js";
 describe("getWorkbookTableHeaderRange", () => {
@@ -18,8 +18,8 @@ describe("getWorkbookTableHeaderRange", () => {
         const driveRef = getDefaultDriveRef();
         const workbook = await createWorkbook(driveRef, workbookPath);
         try {
-            const worksheet = await createWorkbookWorksheet(workbook);
-            const rangeRef = createWorkbookRangeRef(worksheet, "A1:D4");
+            const worksheetRef = createDefaultWorkbookWorksheetRef(workbook);
+            const rangeRef = createWorkbookRangeRef(worksheetRef, "A1:D4");
             const table = await createWorkbookTable(rangeRef, true);
             await updateWorkbookRange(rangeRef, {
                 values: [

package/dist/operations/workbookTable/listWorkbookTableColumns.test.js

@@ -3,10 +3,10 @@ import { getDefaultDriveRef } from "../../services/drive.js";
 import { driveItemPath } from "../../services/driveItem.js";
 import { generateTempFileName } from "../../services/temporaryFiles.js";
 import { createWorkbookRangeRef } from "../../services/workbookRange.js";
+import { createDefaultWorkbookWorksheetRef } from "../../services/workbookWorksheet.js";
 import deleteDriveItemWithRetry from "../../tasks/deleteDriveItemWithRetry.js";
 import calculateWorkbook from "../workbook/calculateWorkbook.js";
 import createWorkbook from "../workbook/createWorkbook.js";
-import createWorkbookWorksheet from "../workbookWorksheet/createWorkbookWorksheet.js";
 import createWorkbookTable from "./createWorkbookTable.js";
 import listWorkbookTableColumns from "./listWorkbookTableColumns.js";
 describe("listWorkbookTableColumns", () => {
@@ -15,8 +15,8 @@ describe("listWorkbookTableColumns", () => {
         const workbookPath = driveItemPath(workbookName);
         const workbook = await createWorkbook(getDefaultDriveRef(), workbookPath);
         try {
-            const worksheet = await createWorkbookWorksheet(workbook);
-            const rangeRef = createWorkbookRangeRef(worksheet, "A1:D4");
+            const worksheetRef = createDefaultWorkbookWorksheetRef(workbook);
+            const rangeRef = createWorkbookRangeRef(worksheetRef, "A1:D4");
             const table = await createWorkbookTable(rangeRef, true);
             await calculateWorkbook(workbook);
             const columns = await listWorkbookTableColumns(table);

package/dist/operations/workbookTable/listWorkbookTableRows.test.js

@@ -3,10 +3,10 @@ import { getDefaultDriveRef } from "../../services/drive.js";
 import { driveItemPath } from "../../services/driveItem.js";
 import { generateTempFileName } from "../../services/temporaryFiles.js";
 import { createWorkbookRangeRef } from "../../services/workbookRange.js";
+import { createDefaultWorkbookWorksheetRef } from "../../services/workbookWorksheet.js";
 import deleteDriveItemWithRetry from "../../tasks/deleteDriveItemWithRetry.js";
 import calculateWorkbook from "../workbook/calculateWorkbook.js";
 import createWorkbook from "../workbook/createWorkbook.js";
-import createWorkbookWorksheet from "../workbookWorksheet/createWorkbookWorksheet.js";
 import createWorkbookTable from "./createWorkbookTable.js";
 import listWorkbookTableRows from "./listWorkbookTableRows.js";
 describe("listWorkbookTableRows", () => {
@@ -15,8 +15,8 @@ describe("listWorkbookTableRows", () => {
         const workbookPath = driveItemPath(workbookName);
         const workbook = await createWorkbook(getDefaultDriveRef(), workbookPath);
         try {
-            const worksheet = await createWorkbookWorksheet(workbook);
-            const rangeRef = createWorkbookRangeRef(worksheet, "A1:D4");
+            const worksheetRef = createDefaultWorkbookWorksheetRef(workbook);
+            const rangeRef = createWorkbookRangeRef(worksheetRef, "A1:D4");
             const table = await createWorkbookTable(rangeRef, true);
             await calculateWorkbook(workbook);
             const rows = await listWorkbookTableRows(table);

package/dist/operations/workbookTable/listWorkbookTables.test.js

@@ -3,10 +3,10 @@ import { getDefaultDriveRef } from "../../services/drive.js";
 import { driveItemPath } from "../../services/driveItem.js";
 import { generateTempFileName } from "../../services/temporaryFiles.js";
 import { createWorkbookRangeRef } from "../../services/workbookRange.js";
+import { createDefaultWorkbookWorksheetRef } from "../../services/workbookWorksheet.js";
 import deleteDriveItemWithRetry from "../../tasks/deleteDriveItemWithRetry.js";
 import calculateWorkbook from "../workbook/calculateWorkbook.js";
 import createWorkbook from "../workbook/createWorkbook.js";
-import createWorkbookWorksheet from "../workbookWorksheet/createWorkbookWorksheet.js";
 import createWorkbookTable from "./createWorkbookTable.js";
 import listTables from "./listWorkbookTables.js";
 describe("listWorkbookTables", () => {
@@ -16,11 +16,11 @@ describe("listWorkbookTables", () => {
         const driveRef = getDefaultDriveRef();
         const workbook = await createWorkbook(driveRef, workbookPath);
         try {
-            const worksheet = await createWorkbookWorksheet(workbook);
-            const rangeRef = createWorkbookRangeRef(worksheet, "A1:D4");
+            const worksheetRef = createDefaultWorkbookWorksheetRef(workbook);
+            const rangeRef = createWorkbookRangeRef(worksheetRef, "A1:D4");
             await createWorkbookTable(rangeRef, true);
             await calculateWorkbook(workbook);
-            const tables = await listTables(worksheet);
+            const tables = await listTables(worksheetRef);
             expect(tables.length).toBeGreaterThan(0);
         }
         finally {

package/dist/operations/workbookWorksheet/updateWorkbookWorksheet.test.js

@@ -2,8 +2,10 @@ import { describe, expect, it } from "vitest";
 import { getDefaultDriveRef } from "../../services/drive.js";
 import { driveItemPath } from "../../services/driveItem.js";
 import { generateTempFileName } from "../../services/temporaryFiles.js";
+import { createDefaultWorkbookWorksheetRef } from "../../services/workbookWorksheet.js";
 import deleteDriveItemWithRetry from "../../tasks/deleteDriveItemWithRetry.js";
 import getWorkbookWorksheetByName from "../../tasks/getWorkbookWorksheetByName.js";
+import calculateWorkbook from "../workbook/calculateWorkbook.js";
 import createWorkbook from "../workbook/createWorkbook.js";
 import createWorkbookWorksheet from "./createWorkbookWorksheet.js";
 import updateWorkbookWorksheet from "./updateWorkbookWorksheet.js";
@@ -13,9 +15,10 @@ describe("updateWorkbookWorksheet", () => {
         const workbookPath = driveItemPath(workbookName);
         const workbook = await createWorkbook(getDefaultDriveRef(), workbookPath);
         try {
-            const worksheet = await createWorkbookWorksheet(workbook);
+            const worksheetRef = createDefaultWorkbookWorksheetRef(workbook);
             const newName = "UpdatedSheet";
-            await updateWorkbookWorksheet(worksheet, { name: newName });
+            await updateWorkbookWorksheet(worksheetRef, { name: newName });
+            await calculateWorkbook(workbook);
             const updatedWorksheet = await getWorkbookWorksheetByName(workbook, newName);
             expect(updatedWorksheet.name).toBe(newName);
         }
@@ -29,7 +32,7 @@ describe("updateWorkbookWorksheet", () => {
         const workbook = await createWorkbook(getDefaultDriveRef(), workbookPath);
         try {
             const worksheetName = "Sheet2";
-            const worksheet = await createWorkbookWorksheet(workbook, worksheetName);
+            const worksheet = await createWorkbookWorksheet(workbook); // Can't hide the single worksheet
             await updateWorkbookWorksheet(worksheet, { visibility: "Hidden" });
             const updatedWorksheet = await getWorkbookWorksheetByName(worksheet, worksheetName);
             expect(updatedWorksheet.visibility).toBe("Hidden");

package/dist/services/address.d.ts

@@ -1,16 +1,13 @@
-import type { Cell } from "../models/Cell.ts";
-import type { Column } from "../models/Column.ts";
+import type { Address, BoxRangeAddress, CellAddress, ColumnAddress, RowAddress } from "../models/Address.ts";
 import type { ColumnIndex } from "../models/ColumnIndex.ts";
-import type { RangeAddress } from "../models/RangeAddress.ts";
-import type { Row } from "../models/Row.ts";
 import type { RowIndex } from "../models/RowIndex.ts";
-export declare function getAddressStart(address: RangeAddress): Cell;
-export declare function getAddressEnd(address: RangeAddress): Cell;
-export declare function cellToIndexes(cell: Cell): [RowIndex, ColumnIndex];
-export declare function indexesToCell(rowIndex: RowIndex, columnIndex: ColumnIndex): Cell;
-export declare function indexesToBox(startRowIndex: RowIndex, startColumnIndex: ColumnIndex, endRowIndex: RowIndex, endColumnIndex: ColumnIndex): RangeAddress;
-export declare function columnToIndex(column: Column): ColumnIndex;
-export declare function indexToColumn(index: ColumnIndex): Column;
-export declare function rowToIndex(row: Row): RowIndex;
-export declare function indexToRow(index: RowIndex): Row;
+export declare function getAddressFirstCell(address: Address): CellAddress;
+export declare function getAddressLastCell(address: Address): CellAddress;
+export declare function cellAddressToIndexes(address: CellAddress): [RowIndex, ColumnIndex];
+export declare function indexesToCellAddress(rowIndex: RowIndex, columnIndex: ColumnIndex): CellAddress;
+export declare function indexesToBoxRangeAddress(startRowIndex: RowIndex, startColumnIndex: ColumnIndex, endRowIndex: RowIndex, endColumnIndex: ColumnIndex): BoxRangeAddress;
+export declare function columnAddressToIndex(column: ColumnAddress): ColumnIndex;
+export declare function indexToColumnAddress(index: ColumnIndex): ColumnAddress;
+export declare function rowAddressToIndex(row: RowAddress): RowIndex;
+export declare function indexToRowAddress(index: RowIndex): RowAddress;
 //# sourceMappingURL=address.d.ts.map

package/dist/services/address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../src/services/address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAMtD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAE3D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAEzD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAcjE;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAEhF;AAED,wBAAgB,YAAY,CAAC,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,GAAG,YAAY,CAErJ;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAMzD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CASxD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,CAE/C"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../src/services/address.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AActD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CA8CjE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CA6ChE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAclF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,WAAW,CAE9F;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,GAAG,eAAe,CAEpK;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAMvE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,CAStE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,CAE7D"}

package/dist/services/address.js

@@ -1,38 +1,123 @@
-// TODO: Tidy this
-const cellPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<column>[A-Z]+)(?<row>\d+)$/; // Matches "A2" or "Sheet1!A2"
-export function getAddressStart(address) {
-    return address.split(":", 2)[0];
+import InvalidArgumentError from "../errors/InvalidArgumentError.js";
+const firstColumn = "A";
+const lastColumn = "XFD";
+const firstRow = "1";
+const lastRow = "1048576";
+const columnAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<column>[A-Z]+)$/;
+const rowAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<row>\d+)$/;
+const columnRangeAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<startColumn>[A-Z]+):(?<endColumn>[A-Z]+)$/;
+const rowRangeAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<startRow>\d+):(?<endRow>\d+)$/;
+const cellAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<column>[A-Z]+)(?<row>\d+)$/;
+const boxRangeAddressPattern = /^(?<sheet>[A-Za-z0-9_]+!)?(?<startCell>[A-Z]+\d+):(?<endCell>[A-Z]+\d+)$/;
+export function getAddressFirstCell(address) {
+    const columnAddressMatch = address.match(columnAddressPattern);
+    if (columnAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const column = columnAddressMatch?.groups?.["column"] ?? "";
+        return `${column}${firstRow}`;
+    }
+    const rowAddressMatch = address.match(rowAddressPattern);
+    if (rowAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const row = rowAddressMatch?.groups?.["row"] ?? "";
+        return `${firstColumn}${row}`;
+    }
+    const columnRangeMatch = address.match(columnRangeAddressPattern);
+    if (columnRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const startColumn = columnRangeMatch?.groups?.["startColumn"] ?? "";
+        return `${startColumn}${firstRow}`;
+    }
+    const rowRangeMatch = address.match(rowRangeAddressPattern);
+    if (rowRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const startRow = rowRangeMatch?.groups?.["startRow"] ?? "";
+        return `${firstColumn}${startRow}`;
+    }
+    const boxRangeMatch = address.match(boxRangeAddressPattern);
+    if (boxRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const startCell = boxRangeMatch?.groups?.["startCell"];
+        return startCell;
+    }
+    const cellAddressMatch = address.match(cellAddressPattern);
+    if (cellAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const column = cellAddressMatch?.groups?.["column"] ?? "";
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const row = cellAddressMatch?.groups?.["row"] ?? "";
+        return (column + row);
+    }
+    throw new InvalidArgumentError(`Invalid address format '${address}'`);
 }
-export function getAddressEnd(address) {
-    return (address.includes(":") ? address.split(":", 2)[1] : address);
+export function getAddressLastCell(address) {
+    const columnAddressMatch = address.match(columnAddressPattern);
+    if (columnAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const column = columnAddressMatch?.groups?.["column"] ?? "";
+        return `${column}${lastRow}`;
+    }
+    const rowAddressMatch = address.match(rowAddressPattern);
+    if (rowAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const row = rowAddressMatch?.groups?.["row"] ?? "";
+        return `${lastColumn}${row}`;
+    }
+    const columnRangeMatch = address.match(columnRangeAddressPattern);
+    if (columnRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const endColumn = columnRangeMatch?.groups?.["endColumn"] ?? "";
+        return `${endColumn}${lastRow}`;
+    }
+    const rowRangeMatch = address.match(rowRangeAddressPattern);
+    if (rowRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const endRow = rowRangeMatch?.groups?.["endRow"] ?? "";
+        return `${lastColumn}${endRow}`;
+    }
+    const boxRangeMatch = address.match(boxRangeAddressPattern);
+    if (boxRangeMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const endCell = boxRangeMatch?.groups?.["endCell"];
+        return endCell;
+    }
+    const cellAddressMatch = address.match(cellAddressPattern);
+    if (cellAddressMatch) {
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const column = cellAddressMatch?.groups?.["column"] ?? "";
+        // biome-ignore lint/complexity/useLiteralKeys:Regex named capture groups are used
+        const row = cellAddressMatch?.groups?.["row"] ?? "";
+        return (column + row);
+    }
+    throw new Error(`Invalid address format '${address}'`);
 }
-export function cellToIndexes(cell) {
-    const match = cell.match(cellPattern);
+export function cellAddressToIndexes(address) {
+    const match = address.match(cellAddressPattern);
     if (!match?.groups) {
-        throw new Error(`Invalid cell format '${cell}', must match '${cellPattern}`);
+        throw new Error(`Invalid cell format '${address}', must match '${cellAddressPattern}`);
     }
     // biome-ignore lint/complexity/useLiteralKeys: Named capture groups are used
     const column = match.groups["column"];
     // biome-ignore lint/complexity/useLiteralKeys: Named capture groups are used
     const row = match.groups["row"];
-    const rowIndex = rowToIndex(row);
-    const columnIndex = columnToIndex(column);
+    const rowIndex = rowAddressToIndex(row);
+    const columnIndex = columnAddressToIndex(column);
     return [rowIndex, columnIndex];
 }
-export function indexesToCell(rowIndex, columnIndex) {
-    return `${indexToColumn(columnIndex)}${indexToRow(rowIndex)}`;
+export function indexesToCellAddress(rowIndex, columnIndex) {
+    return `${indexToColumnAddress(columnIndex)}${indexToRowAddress(rowIndex)}`;
 }
-export function indexesToBox(startRowIndex, startColumnIndex, endRowIndex, endColumnIndex) {
-    return `${indexesToCell(startRowIndex, startColumnIndex)}:${indexesToCell(endRowIndex, endColumnIndex)}`;
+export function indexesToBoxRangeAddress(startRowIndex, startColumnIndex, endRowIndex, endColumnIndex) {
+    return `${indexesToCellAddress(startRowIndex, startColumnIndex)}:${indexesToCellAddress(endRowIndex, endColumnIndex)}`;
 }
-export function columnToIndex(column) {
+export function columnAddressToIndex(column) {
     let index = 0;
     for (let i = 0; i < column.length; i++) {
         index = index * 26 + (column.charCodeAt(i) - 65 + 1);
     }
     return (index - 1);
 }
-export function indexToColumn(index) {
+export function indexToColumnAddress(index) {
     let result = "";
     let currentIndex = index + 1;
     while (currentIndex > 0) {
@@ -42,9 +127,9 @@ export function indexToColumn(index) {
     }
     return result;
 }
-export function rowToIndex(row) {
+export function rowAddressToIndex(row) {
     return (Number.parseInt(row, 10) - 1);
 }
-export function indexToRow(index) {
+export function indexToRowAddress(index) {
     return (index + 1).toString();
 }

package/dist/services/address.test.js

@@ -1,64 +1,82 @@
 import { describe, expect, it } from "vitest";
-import { cellToIndexes, columnToIndex, getAddressEnd, getAddressStart, indexesToCell, indexToColumn, indexToRow, rowToIndex } from "./address.js";
-describe("indexesToAddress", () => {
+import { cellAddressToIndexes, columnAddressToIndex, getAddressFirstCell, getAddressLastCell, indexesToCellAddress, indexToColumnAddress, indexToRowAddress, rowAddressToIndex } from "./address.js";
+describe("indexesToCellAddress", () => {
     it("should convert row and column indexes to an address", () => {
-        expect(indexesToCell(0, 0)).toBe("A1");
-        expect(indexesToCell(4, 2)).toBe("C5");
-        expect(indexesToCell(10, 25)).toBe("Z11");
+        expect(indexesToCellAddress(0, 0)).toBe("A1");
+        expect(indexesToCellAddress(4, 2)).toBe("C5");
+        expect(indexesToCellAddress(10, 25)).toBe("Z11");
     });
 });
-describe("columnToIndex", () => {
+describe("columnAddressToIndex", () => {
     it("should convert column letters to a zero-based index", () => {
-        expect(columnToIndex("A")).toBe(0);
-        expect(columnToIndex("Z")).toBe(25);
-        expect(columnToIndex("AA")).toBe(26);
-        expect(columnToIndex("AB")).toBe(27);
-        expect(columnToIndex("ZZ")).toBe(701);
+        expect(columnAddressToIndex("A")).toBe(0);
+        expect(columnAddressToIndex("Z")).toBe(25);
+        expect(columnAddressToIndex("AA")).toBe(26);
+        expect(columnAddressToIndex("AB")).toBe(27);
+        expect(columnAddressToIndex("ZZ")).toBe(701);
     });
 });
-describe("indexToColumn", () => {
+describe("indexToColumnAddress", () => {
     it("should convert a zero-based index to column letters", () => {
-        expect(indexToColumn(0)).toBe("A");
-        expect(indexToColumn(25)).toBe("Z");
-        expect(indexToColumn(26)).toBe("AA");
-        expect(indexToColumn(27)).toBe("AB");
-        expect(indexToColumn(701)).toBe("ZZ");
+        expect(indexToColumnAddress(0)).toBe("A");
+        expect(indexToColumnAddress(25)).toBe("Z");
+        expect(indexToColumnAddress(26)).toBe("AA");
+        expect(indexToColumnAddress(27)).toBe("AB");
+        expect(indexToColumnAddress(701)).toBe("ZZ");
     });
 });
-describe("rowToIndex", () => {
+describe("rowAddressToIndex", () => {
     it("should convert a 1-based row to a 0-based index", () => {
-        expect(rowToIndex("1")).toBe(0);
-        expect(rowToIndex("5")).toBe(4);
-        expect(rowToIndex("100")).toBe(99);
+        expect(rowAddressToIndex("1")).toBe(0);
+        expect(rowAddressToIndex("5")).toBe(4);
+        expect(rowAddressToIndex("100")).toBe(99);
     });
 });
-describe("indexToRow", () => {
+describe("indexToRowAddress", () => {
     it("should convert a 0-based index to a 1-based row", () => {
-        expect(indexToRow(0)).toBe("1");
-        expect(indexToRow(4)).toBe("5");
-        expect(indexToRow(99)).toBe("100");
+        expect(indexToRowAddress(0)).toBe("1");
+        expect(indexToRowAddress(4)).toBe("5");
+        expect(indexToRowAddress(99)).toBe("100");
     });
 });
-describe("cellToIndexes", () => {
+describe("cellAddressToIndexes", () => {
     it("should convert a cell address to row and column indexes", () => {
-        expect(cellToIndexes("A1")).toEqual([0, 0]);
-        expect(cellToIndexes("C5")).toEqual([4, 2]);
-        expect(cellToIndexes("Z11")).toEqual([10, 25]);
-        expect(cellToIndexes("AA1")).toEqual([0, 26]);
-        expect(cellToIndexes("ZZ100")).toEqual([99, 701]);
+        expect(cellAddressToIndexes("A1")).toEqual([0, 0]);
+        expect(cellAddressToIndexes("C5")).toEqual([4, 2]);
+        expect(cellAddressToIndexes("Z11")).toEqual([10, 25]);
+        expect(cellAddressToIndexes("AA1")).toEqual([0, 26]);
+        expect(cellAddressToIndexes("ZZ100")).toEqual([99, 701]);
     });
 });
-describe("getAddressStart", () => {
+describe("getAddressFirstCell", () => {
     it("should return the start cell of a range address", () => {
-        expect(getAddressStart("A1:B2")).toBe("A1");
-        expect(getAddressStart("C3:D4")).toBe("C3");
-        expect(getAddressStart("E5")).toBe("E5"); // Single cell address
+        expect(getAddressFirstCell("C3:D4")).toBe("C3");
+        expect(getAddressFirstCell("Sheet!A1:B2")).toBe("A1");
+        expect(getAddressFirstCell("E5")).toBe("E5"); // Single cell address
+        expect(getAddressFirstCell("Sheet!E5")).toBe("E5"); // Single cell address
+        expect(getAddressFirstCell("C")).toBe("C1"); // ColumnAddress
+        expect(getAddressFirstCell("Sheet!C")).toBe("C1"); // ColumnAddress
+        expect(getAddressFirstCell("3")).toBe("A3"); // RowAddress
+        expect(getAddressFirstCell("Sheet!3")).toBe("A3"); // RowAddress
+        expect(getAddressFirstCell("A:Z")).toBe("A1"); // ColumnRangeAddress
+        expect(getAddressFirstCell("Sheet!A:Z")).toBe("A1"); // ColumnRangeAddress
+        expect(getAddressFirstCell("1:10")).toBe("A1"); // RowRangeAddress
+        expect(getAddressFirstCell("Sheet!1:10")).toBe("A1"); // RowRangeAddress
     });
 });
-describe("getAddressEnd", () => {
+describe("getAddressLastCell", () => {
     it("should return the end cell of a range address", () => {
-        expect(getAddressEnd("A1:B2")).toBe("B2");
-        expect(getAddressEnd("C3:D4")).toBe("D4");
-        expect(getAddressEnd("E5")).toBe("E5"); // Single cell address
+        expect(getAddressLastCell("C3:D4")).toBe("D4");
+        expect(getAddressLastCell("Sheet!A1:B2")).toBe("B2");
+        expect(getAddressLastCell("E5")).toBe("E5"); // Single cell address
+        expect(getAddressLastCell("Sheet!E5")).toBe("E5"); // Single cell address
+        expect(getAddressLastCell("C")).toBe("C1048576"); // ColumnAddress
+        expect(getAddressLastCell("Sheet!C")).toBe("C1048576"); // ColumnAddress
+        expect(getAddressLastCell("3")).toBe("XFD3"); // RowAddress
+        expect(getAddressLastCell("Sheet!3")).toBe("XFD3"); // RowAddress
+        expect(getAddressLastCell("A:Z")).toBe("Z1048576"); // ColumnRangeAddress
+        expect(getAddressLastCell("Sheet!A:Z")).toBe("Z1048576"); // ColumnRangeAddress
+        expect(getAddressLastCell("1:10")).toBe("XFD10"); // RowRangeAddress
+        expect(getAddressLastCell("Sheet!1:10")).toBe("XFD10"); // RowRangeAddress
     });
 });

package/dist/services/httpStatus.d.ts

@@ -1,3 +1,4 @@
 export declare function isHttpOk(status: number): boolean;
 export declare function isHttpTooManyRequests(status: number): boolean;
+export declare function isServiceUnavailable(status: number): boolean;
 //# sourceMappingURL=httpStatus.d.ts.map

package/dist/services/httpStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D"}
+{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D"}

package/dist/services/httpStatus.js

@@ -4,3 +4,6 @@ export function isHttpOk(status) {
 export function isHttpTooManyRequests(status) {
     return status === 429;
 }
+export function isServiceUnavailable(status) {
+    return status === 503;
+}

package/dist/services/workbookRange.d.ts

@@ -1,5 +1,5 @@
-import type { RangeAddressUnderlying } from "../models/RangeAddress.ts";
+import type { Address } from "../models/Address.ts";
 import type { WorkbookRangeRef } from "../models/WorkbookRangeRef.ts";
 import type { WorkbookWorksheetRef } from "../models/WorkbookWorksheetRef.ts";
-export declare function createWorkbookRangeRef(worksheetRef: WorkbookWorksheetRef, address: RangeAddressUnderlying): WorkbookRangeRef;
+export declare function createWorkbookRangeRef(worksheetRef: WorkbookWorksheetRef, address: Address): WorkbookRangeRef;
 //# sourceMappingURL=workbookRange.d.ts.map

package/dist/services/workbookRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workbookRange.d.ts","sourceRoot":"","sources":["../../src/services/workbookRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,oBAAoB,EAAE,OAAO,EAAE,sBAAsB,GAAG,gBAAgB,CAU5H"}
+{"version":3,"file":"workbookRange.d.ts","sourceRoot":"","sources":["../../src/services/workbookRange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAU7G"}

package/dist/tasks/getRangeLastUsedCell.js

@@ -1,6 +1,6 @@
 import ProtocolError from "../errors/ProtocolError.js";
-import getWorkbookWorksheetRange from "../operations/workbookWorksheet/getWorkbookWorksheetRange.js";
-import { indexesToCell } from "../services/address.js";
+import getWorkbookWorksheetRange from "../operations/workbookRange/getWorkbookWorksheetRange.js";
+import { indexesToCellAddress } from "../services/address.js";
 /** Get the last used cell (ie, the most-lower-right) in a given range. */
 export default async function getRangeLastUsedCell(rangeRef) {
     // TODO: Consider adding chunking if the range is too large
@@ -25,7 +25,7 @@ export default async function getRangeLastUsedCell(rangeRef) {
                 throw new ProtocolError("Cell missing");
             }
             if (cell !== null && cell !== "") {
-                const address = indexesToCell(rowIndex, columnIndex);
+                const address = indexesToCellAddress(rowIndex, columnIndex);
                 return {
                     value: cell,
                     address,

package/dist/tasks/getWorkbookTableVisibleBody.test.js

@@ -5,6 +5,7 @@ import updateWorkbookRange from "../operations/workbookRange/updateWorkbookRange
 import createWorkbookTable from "../operations/workbookTable/createWorkbookTable.js";
 import { getDefaultDriveRef } from "../services/drive.js";
 import { driveItemPath } from "../services/driveItem.js";
+import { sleep } from "../services/sleep.js";
 import { generateTempFileName } from "../services/temporaryFiles.js";
 import { createWorkbookRangeRef } from "../services/workbookRange.js";
 import { createWorkbookWorksheetRef, defaultWorkbookWorksheetId } from "../services/workbookWorksheet.js";
@@ -41,6 +42,7 @@ describe("getWorkbookTableVisibleBody", () => {
         }
     });
     it("omits hidden rows from the visible body range of a table", async () => {
+        // TODO: This test is flappy and I haven't worked out why yet
         const workbookName = generateTempFileName("xlsx");
         const workbookPath = driveItemPath(workbookName);
         const driveRef = getDefaultDriveRef();
@@ -60,6 +62,7 @@ describe("getWorkbookTableVisibleBody", () => {
             const hiddenRange = createWorkbookRangeRef(worksheetRef, "2:2");
             await updateWorkbookRange(hiddenRange, { rowHidden: true });
             await calculateWorkbook(workbook);
+            await sleep(2000);
             const visibleBodyRange = await getWorkbookTableVisibleBody(table);
             expect(visibleBodyRange.values).toEqual([
                 ["Value5", "Value6", "Value7", "Value8"],

package/dist/tasks/setWorkbookTableBodyVisibleRows.js

@@ -1,10 +1,10 @@
 import InvalidArgumentError from "../errors/InvalidArgumentError.js";
 import NeverError from "../errors/NeverError.js";
+import getWorkbookWorksheetRange from "../operations/workbookRange/getWorkbookWorksheetRange.js";
 import insertWorkbookCells from "../operations/workbookRange/insertWorkbookCells.js";
 import updateWorkbookRange from "../operations/workbookRange/updateWorkbookRange.js";
 import getWorkbookTableBodyRange from "../operations/workbookTable/getWorkbookTableBodyRange.js";
-import getWorkbookWorksheetRange from "../operations/workbookWorksheet/getWorkbookWorksheetRange.js";
-import { cellToIndexes, getAddressEnd, getAddressStart, indexesToBox } from "../services/address.js";
+import { cellAddressToIndexes, getAddressFirstCell, getAddressLastCell, indexesToBoxRangeAddress } from "../services/address.js";
 import { createWorkbookRangeRef } from "../services/workbookRange.js";
 /** Overwrite visible rows of a workbook table with the provided 2D array of values, inserting new rows at the end if needed. THIS IS SLOW as it must check each rows visibility. */
 export async function setWorkbookTableBodyVisibleRows(tableRef, values) {
@@ -12,8 +12,8 @@ export async function setWorkbookTableBodyVisibleRows(tableRef, values) {
     if (values.some((row) => row.length !== visibleRange.columnCount)) {
         throw new InvalidArgumentError(`Invalid number of columns in input values. Expected all rows to have ${visibleRange.columnCount}.`);
     }
-    const [startRowIndex, startColumnIndex] = cellToIndexes(getAddressStart(visibleRange.address));
-    const [endRowIndex, endColumnIndex] = cellToIndexes(getAddressEnd(visibleRange.address));
+    const [startRowIndex, startColumnIndex] = cellAddressToIndexes(getAddressFirstCell(visibleRange.address));
+    const [endRowIndex, endColumnIndex] = cellAddressToIndexes(getAddressLastCell(visibleRange.address));
     if (endColumnIndex - startColumnIndex + 1 !== visibleRange.columnCount) {
         throw new NeverError("Insane address");
     }
@@ -23,7 +23,7 @@ export async function setWorkbookTableBodyVisibleRows(tableRef, values) {
         let dstRow;
         let dstRowHidden = false;
         do {
-            dstRowRef = createWorkbookRangeRef(tableRef, indexesToBox(currentRowIndex, startColumnIndex, currentRowIndex, endColumnIndex));
+            dstRowRef = createWorkbookRangeRef(tableRef, indexesToBoxRangeAddress(currentRowIndex, startColumnIndex, currentRowIndex, endColumnIndex));
             if (currentRowIndex > endRowIndex) {
                 await insertWorkbookCells(dstRowRef, dstRowRef.address, "Down");
                 dstRowHidden = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microsoft-graph",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Microsoft GraphAPI SDK for NodeJS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -93,6 +93,10 @@
       "import": "./dist/models/AccessToken.js",
       "types": "./dist/models/AccessToken.d.ts"
     },
+    "./models/Address": {
+      "import": "./dist/models/Address.js",
+      "types": "./dist/models/Address.d.ts"
+    },
     "./models/Box": {
       "import": "./dist/models/Box.js",
       "types": "./dist/models/Box.d.ts"
@@ -325,6 +329,10 @@
       "import": "./dist/operations/workbookRange/getWorkbookVisibleRange.js",
       "types": "./dist/operations/workbookRange/getWorkbookVisibleRange.d.ts"
     },
+    "./operations/workbookRange/getWorkbookWorksheetRange": {
+      "import": "./dist/operations/workbookRange/getWorkbookWorksheetRange.js",
+      "types": "./dist/operations/workbookRange/getWorkbookWorksheetRange.d.ts"
+    },
     "./operations/workbookRange/insertWorkbookCells": {
       "import": "./dist/operations/workbookRange/insertWorkbookCells.js",
       "types": "./dist/operations/workbookRange/insertWorkbookCells.d.ts"

package/vitest.config.ts

@@ -15,6 +15,6 @@ export default defineConfig({
         sequence: {
             concurrent: false,
         },
-        testTimeout: 10000,
+        testTimeout: 16000,
     },
 });