microsoft-graph 2.22.0 → 2.22.2

package/dist/cjs/services/addressManipulation.d.ts

@@ -130,21 +130,55 @@ export declare function countAddressRows(address: Address): number;
  */
 export declare function countAddressColumns(address: Address): number;
 /**
- * Extracts a sub-address from a given address by specifying the number of rows and columns to include.
- * @param address Address to extract the sub-address from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
- * @returns Extracted sub-address.
- * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
- */
-export declare function subaddress(address: Address, rows: number | null, cols: number | null): Address;
-/**
- * Extracts a sub-range from a given range by specifying the number of rows and columns to include.
+ * Creates a range from a single cell address, extending by the specified number of rows and columns.
+ * If rows/cols is positive, the cell is the start of the range; if negative, the cell is the end of the range.
+ *
+ * @param cell - The cell address to use as the anchor.
+ * @param rows - The number of rows for the range. Positive: cell is start; Negative: cell is end.
+ * @param cols - The number of columns for the range. Positive: cell is start; Negative: cell is end.
+ * @returns The created address range.
+ *
+ * @throws {InvalidArgumentError} If the resulting address is out of bounds.
+ *
+ * @example
+ * // Creates a 2x2 range starting at B2
+ * cellToRangeAddress("B2", 2, 2); // "B2:C3"
+ * // Creates a 2x2 range ending at B2
+ * cellToRangeAddress("B2", -2, -2); // "A1:B2"
+ * // Creates a 2x2 range starting at C3, extending 2 rows down and 2 columns left
+ * cellToRangeAddress("B2", 2, -2)).toBe("A2:B3")
+ */
+export declare function cellToRangeAddress(cell: CellAddress, rows: number, cols: number): Address;
+/**
+ * Extracts a subrange from a spreadsheet-style A1 range (e.g., "A1:D10"),
+ * allowing skip and take semantics on both rows and columns.
+ *
+ * Supports negative values for `skipRows` and `skipCols` to count from the end.
+ * Supports negative values for `takeRows` and `takeCols` to exclude from the end after skipping.
+ *
+ * @param address - The original range in A1 notation (e.g., "A1:D10").
+ * @param skipRows - Number of rows to skip. If negative, skips that many rows from the end. Default is 0.
+ * @param takeRows - Number of rows to take after skipping. If negative, excludes that many rows from the end of the remaining rows. Default is Infinity.
+ * @param skipCols - Number of columns to skip. If negative, skips that many columns from the end. Default is 0.
+ * @param takeCols - Number of columns to take after skipping. If negative, excludes that many columns from the end of the remaining columns. Default is Infinity.
+ * @returns A new A1-style range representing the sliced subrange (e.g., "B2:C5").
+ *
+ * @example
+ * subaddress("A1:D10", -1, 1); // Last row: "A10:D10"
+ * subaddress("A1:D10", -2, 1); // Second last row: "A9:D9"
+ * subaddress("A1:D10", 0, -1); // All but last row: "A1:D9"
+ * subaddress("A1:D10", 0, Infinity, -2, 1); // Second last column: "C1:C10"
+ */
+export declare function subAddress(address: Address, skipRows?: number, takeRows?: number, skipCols?: number, takeCols?: number): Address;
+/**
+ * Extracts a subrange from a WorkbookRangeRef using skip/take semantics.
  * @param rangeRef Range reference to extract the sub-range from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
+ * @param skipRows Number of rows to skip. If negative, skips from the end. Default 0.
+ * @param takeRows Number of rows to take after skipping. If negative, excludes from the end. Default Infinity.
+ * @param skipCols Number of columns to skip. If negative, skips from the end. Default 0.
+ * @param takeCols Number of columns to take after skipping. If negative, excludes from the end. Default Infinity.
  * @returns Extracted sub-range reference.
  * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
  */
-export declare function subrange(rangeRef: WorkbookRangeRef, rows: number | null, cols?: number | null): WorkbookRangeRef;
+export declare function subrange(rangeRef: WorkbookRangeRef, skipRows?: number, takeRows?: number, skipCols?: number, takeCols?: number): WorkbookRangeRef;
 //# sourceMappingURL=addressManipulation.d.ts.map

package/dist/cjs/services/addressManipulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addressManipulation.d.ts","sourceRoot":"","sources":["../../../src/services/addressManipulation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAoB,aAAa,EAAsB,UAAU,EAAmB,MAAM,sBAAsB,CAAC;AAGnJ,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAkBtE,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,UAAU,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,UAAQ,GAAG,OAAO,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAcpE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAsBzF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGhE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS5D;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS3D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS/D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAqChG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAKlF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG5D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG7D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAGzD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAG5D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAmC9F;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW,GAAG,gBAAgB,CAMtH"}
+{"version":3,"file":"addressManipulation.d.ts","sourceRoot":"","sources":["../../../src/services/addressManipulation.ts"],"names":[],"mappings":"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"}

package/dist/cjs/services/addressManipulation.js

@@ -22,7 +22,8 @@ exports.isAllColumnsAddress = isAllColumnsAddress;
 exports.isAllRowsAddress = isAllRowsAddress;
 exports.countAddressRows = countAddressRows;
 exports.countAddressColumns = countAddressColumns;
-exports.subaddress = subaddress;
+exports.cellToRangeAddress = cellToRangeAddress;
+exports.subAddress = subAddress;
 exports.subrange = subrange;
 const InvalidArgumentError_ts_1 = __importDefault(require("../errors/InvalidArgumentError.js"));
 const UnsupportedAddressTypeError_ts_1 = __importDefault(require("../errors/UnsupportedAddressTypeError.js"));
@@ -32,6 +33,10 @@ const firstColumn = "A";
 const lastColumn = "XFD";
 const firstRow = "1";
 const lastRow = "1048576";
+const firstColumnOffset = (0, addressOffset_ts_1.columnAddressToOffset)(firstColumn);
+const lastColumnOffset = (0, addressOffset_ts_1.columnAddressToOffset)(lastColumn);
+const firstRowOffset = (0, addressOffset_ts_1.rowAddressToOffset)(firstRow);
+const lastRowOffset = (0, addressOffset_ts_1.rowAddressToOffset)(lastRow);
 const addressPattern = /^(?<sheet>(?:'[^']+'|[A-Za-z0-9_]+)!)?(?:(?<startColumn>[A-Z]+)?(?<startRow>\d+)?(?::(?<endColumn>[A-Z]+)?(?<endRow>\d+)?)?)$/;
 /**
  * Fixes address, removing an optional sheet prefix and ensuring it is a valid range.
@@ -280,56 +285,129 @@ function countAddressColumns(address) {
     return (0, addressOffset_ts_1.columnAddressToOffset)(components.endColumn) - (0, addressOffset_ts_1.columnAddressToOffset)(components.startColumn) + 1;
 }
 /**
- * Extracts a sub-address from a given address by specifying the number of rows and columns to include.
- * @param address Address to extract the sub-address from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
- * @returns Extracted sub-address.
- * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
+ * Creates a range from a single cell address, extending by the specified number of rows and columns.
+ * If rows/cols is positive, the cell is the start of the range; if negative, the cell is the end of the range.
+ *
+ * @param cell - The cell address to use as the anchor.
+ * @param rows - The number of rows for the range. Positive: cell is start; Negative: cell is end.
+ * @param cols - The number of columns for the range. Positive: cell is start; Negative: cell is end.
+ * @returns The created address range.
+ *
+ * @throws {InvalidArgumentError} If the resulting address is out of bounds.
+ *
+ * @example
+ * // Creates a 2x2 range starting at B2
+ * cellToRangeAddress("B2", 2, 2); // "B2:C3"
+ * // Creates a 2x2 range ending at B2
+ * cellToRangeAddress("B2", -2, -2); // "A1:B2"
+ * // Creates a 2x2 range starting at C3, extending 2 rows down and 2 columns left
+ * cellToRangeAddress("B2", 2, -2)).toBe("A2:B3")
  */
-function subaddress(address, rows, cols) {
-    let { ax, bx, ay, by } = (0, cartesianAddress_ts_1.addressToCartesian)(address);
-    if (rows !== null) {
-        const rowCount = by - ay + 1;
-        if (Math.abs(rows) > rowCount) {
-            throw new InvalidArgumentError_ts_1.default(`Requested rows (${rows}) exceed available rows (${rowCount}) in range.`);
-        }
-        if (rows > 0) {
-            by = (ay + rows - 1);
+function cellToRangeAddress(cell, rows, cols) {
+    const { ax, ay } = (0, cartesianAddress_ts_1.addressToCartesian)(cell);
+    // Determine start and end coordinates
+    let startCol;
+    let endCol;
+    let startRow;
+    let endRow;
+    if (rows > 0) {
+        startRow = ay;
+        endRow = ay + rows - 1;
+    }
+    else if (rows < -1) {
+        startRow = ay + rows + 1;
+        endRow = ay;
+    }
+    else {
+        throw new InvalidArgumentError_ts_1.default("rows must not be zero or -1");
+    }
+    if (cols > 0) {
+        startCol = ax;
+        endCol = ax + cols - 1;
+    }
+    else if (cols < -1) {
+        startCol = ax + cols + 1;
+        endCol = ax;
+    }
+    else {
+        throw new InvalidArgumentError_ts_1.default("cols must not be zero or -1");
+    }
+    if (Math.min(startCol, endCol) < firstColumnOffset || Math.max(startCol, endCol) > lastColumnOffset || Math.min(startRow, endRow) < firstRowOffset || Math.max(startRow, endRow) > lastRowOffset) {
+        throw new InvalidArgumentError_ts_1.default(`Resulting address is out of bounds: rows [${Math.min(startRow, endRow) + 1},${Math.max(startRow, endRow) + 1}], cols [${Math.min(startCol, endCol) + 1},${Math.max(startCol, endCol) + 1}]`);
+    }
+    return (0, cartesianAddress_ts_1.cartesianToAddress)({
+        ax: Math.min(startCol, endCol),
+        bx: Math.max(startCol, endCol),
+        ay: Math.min(startRow, endRow),
+        by: Math.max(startRow, endRow),
+    });
+}
+/**
+ * Extracts a subrange from a spreadsheet-style A1 range (e.g., "A1:D10"),
+ * allowing skip and take semantics on both rows and columns.
+ *
+ * Supports negative values for `skipRows` and `skipCols` to count from the end.
+ * Supports negative values for `takeRows` and `takeCols` to exclude from the end after skipping.
+ *
+ * @param address - The original range in A1 notation (e.g., "A1:D10").
+ * @param skipRows - Number of rows to skip. If negative, skips that many rows from the end. Default is 0.
+ * @param takeRows - Number of rows to take after skipping. If negative, excludes that many rows from the end of the remaining rows. Default is Infinity.
+ * @param skipCols - Number of columns to skip. If negative, skips that many columns from the end. Default is 0.
+ * @param takeCols - Number of columns to take after skipping. If negative, excludes that many columns from the end of the remaining columns. Default is Infinity.
+ * @returns A new A1-style range representing the sliced subrange (e.g., "B2:C5").
+ *
+ * @example
+ * subaddress("A1:D10", -1, 1); // Last row: "A10:D10"
+ * subaddress("A1:D10", -2, 1); // Second last row: "A9:D9"
+ * subaddress("A1:D10", 0, -1); // All but last row: "A1:D9"
+ * subaddress("A1:D10", 0, Infinity, -2, 1); // Second last column: "C1:C10"
+ */
+function subAddress(address, skipRows = 0, takeRows = Number.POSITIVE_INFINITY, skipCols = 0, takeCols = Number.POSITIVE_INFINITY) {
+    const { ax, bx, ay, by } = (0, cartesianAddress_ts_1.addressToCartesian)(address);
+    const [startRow, endRow] = slice(ay, by, skipRows, takeRows);
+    const [startCol, endCol] = slice(ax, bx, skipCols, takeCols);
+    if (startRow < ay || endRow > by || startRow > endRow || startCol < ax || endCol > bx || startCol > endCol) {
+        throw new InvalidArgumentError_ts_1.default(`Requested subaddress is out of bounds: rows [${startRow + 1},${endRow + 1}], cols [${startCol + 1},${endCol + 1}] in range.`);
+    }
+    return (0, cartesianAddress_ts_1.cartesianToAddress)({
+        ay: startRow,
+        by: endRow,
+        ax: startCol,
+        bx: endCol,
+    });
+    function slice(start, end, skip, take) {
+        let s = start;
+        let e = end;
+        if (skip > 0) {
+            s = start + skip;
         }
-        else if (rows < 0) {
-            ay = (by + rows + 1);
+        else if (skip < 0) {
+            s = end + skip + 1;
         }
-    }
-    if (cols !== null) {
-        const colCount = bx - ax + 1;
-        if (Math.abs(cols) > colCount) {
-            throw new InvalidArgumentError_ts_1.default(`Requested columns (${cols}) exceed available columns (${colCount}) in range.`);
+        if (!Number.isFinite(take)) {
+            // do nothing
         }
-        if (cols > 0) {
-            bx = (ax + cols - 1);
+        else if (take >= 0) {
+            e = s + take - 1;
         }
-        else if (cols < 0) {
-            ax = (bx + cols + 1);
+        else if (take < 0) {
+            e += take;
         }
+        return [s, e];
     }
-    return (0, cartesianAddress_ts_1.cartesianToAddress)({
-        ay,
-        by,
-        ax,
-        bx,
-    });
 }
 /**
- * Extracts a sub-range from a given range by specifying the number of rows and columns to include.
+ * Extracts a subrange from a WorkbookRangeRef using skip/take semantics.
  * @param rangeRef Range reference to extract the sub-range from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
+ * @param skipRows Number of rows to skip. If negative, skips from the end. Default 0.
+ * @param takeRows Number of rows to take after skipping. If negative, excludes from the end. Default Infinity.
+ * @param skipCols Number of columns to skip. If negative, skips from the end. Default 0.
+ * @param takeCols Number of columns to take after skipping. If negative, excludes from the end. Default Infinity.
  * @returns Extracted sub-range reference.
  * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
  */
-function subrange(rangeRef, rows, cols = null) {
-    const address = subaddress(rangeRef.address, rows, cols);
+function subrange(rangeRef, skipRows = 0, takeRows = Number.POSITIVE_INFINITY, skipCols = 0, takeCols = Number.POSITIVE_INFINITY) {
+    const address = subAddress(rangeRef.address, skipRows, takeRows, skipCols, takeCols);
     return {
         ...rangeRef,
         address,

package/dist/esm/services/addressManipulation.d.ts

@@ -130,21 +130,55 @@ export declare function countAddressRows(address: Address): number;
  */
 export declare function countAddressColumns(address: Address): number;
 /**
- * Extracts a sub-address from a given address by specifying the number of rows and columns to include.
- * @param address Address to extract the sub-address from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
- * @returns Extracted sub-address.
- * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
- */
-export declare function subaddress(address: Address, rows: number | null, cols: number | null): Address;
-/**
- * Extracts a sub-range from a given range by specifying the number of rows and columns to include.
+ * Creates a range from a single cell address, extending by the specified number of rows and columns.
+ * If rows/cols is positive, the cell is the start of the range; if negative, the cell is the end of the range.
+ *
+ * @param cell - The cell address to use as the anchor.
+ * @param rows - The number of rows for the range. Positive: cell is start; Negative: cell is end.
+ * @param cols - The number of columns for the range. Positive: cell is start; Negative: cell is end.
+ * @returns The created address range.
+ *
+ * @throws {InvalidArgumentError} If the resulting address is out of bounds.
+ *
+ * @example
+ * // Creates a 2x2 range starting at B2
+ * cellToRangeAddress("B2", 2, 2); // "B2:C3"
+ * // Creates a 2x2 range ending at B2
+ * cellToRangeAddress("B2", -2, -2); // "A1:B2"
+ * // Creates a 2x2 range starting at C3, extending 2 rows down and 2 columns left
+ * cellToRangeAddress("B2", 2, -2)).toBe("A2:B3")
+ */
+export declare function cellToRangeAddress(cell: CellAddress, rows: number, cols: number): Address;
+/**
+ * Extracts a subrange from a spreadsheet-style A1 range (e.g., "A1:D10"),
+ * allowing skip and take semantics on both rows and columns.
+ *
+ * Supports negative values for `skipRows` and `skipCols` to count from the end.
+ * Supports negative values for `takeRows` and `takeCols` to exclude from the end after skipping.
+ *
+ * @param address - The original range in A1 notation (e.g., "A1:D10").
+ * @param skipRows - Number of rows to skip. If negative, skips that many rows from the end. Default is 0.
+ * @param takeRows - Number of rows to take after skipping. If negative, excludes that many rows from the end of the remaining rows. Default is Infinity.
+ * @param skipCols - Number of columns to skip. If negative, skips that many columns from the end. Default is 0.
+ * @param takeCols - Number of columns to take after skipping. If negative, excludes that many columns from the end of the remaining columns. Default is Infinity.
+ * @returns A new A1-style range representing the sliced subrange (e.g., "B2:C5").
+ *
+ * @example
+ * subaddress("A1:D10", -1, 1); // Last row: "A10:D10"
+ * subaddress("A1:D10", -2, 1); // Second last row: "A9:D9"
+ * subaddress("A1:D10", 0, -1); // All but last row: "A1:D9"
+ * subaddress("A1:D10", 0, Infinity, -2, 1); // Second last column: "C1:C10"
+ */
+export declare function subAddress(address: Address, skipRows?: number, takeRows?: number, skipCols?: number, takeCols?: number): Address;
+/**
+ * Extracts a subrange from a WorkbookRangeRef using skip/take semantics.
  * @param rangeRef Range reference to extract the sub-range from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
+ * @param skipRows Number of rows to skip. If negative, skips from the end. Default 0.
+ * @param takeRows Number of rows to take after skipping. If negative, excludes from the end. Default Infinity.
+ * @param skipCols Number of columns to skip. If negative, skips from the end. Default 0.
+ * @param takeCols Number of columns to take after skipping. If negative, excludes from the end. Default Infinity.
  * @returns Extracted sub-range reference.
  * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
  */
-export declare function subrange(rangeRef: WorkbookRangeRef, rows: number | null, cols?: number | null): WorkbookRangeRef;
+export declare function subrange(rangeRef: WorkbookRangeRef, skipRows?: number, takeRows?: number, skipCols?: number, takeCols?: number): WorkbookRangeRef;
 //# sourceMappingURL=addressManipulation.d.ts.map

package/dist/esm/services/addressManipulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addressManipulation.d.ts","sourceRoot":"","sources":["../../../src/services/addressManipulation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAoB,aAAa,EAAsB,UAAU,EAAmB,MAAM,sBAAsB,CAAC;AAGnJ,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAkBtE,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,UAAU,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,UAAQ,GAAG,OAAO,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAcpE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAsBzF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGhE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS5D;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS3D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS/D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAqChG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAKlF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG5D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG7D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAGzD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAG5D;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAmC9F;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW,GAAG,gBAAgB,CAMtH"}
+{"version":3,"file":"addressManipulation.d.ts","sourceRoot":"","sources":["../../../src/services/addressManipulation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAoB,aAAa,EAAsB,UAAU,EAAmB,MAAM,sBAAsB,CAAC;AAGnJ,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAuBtE,MAAM,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,UAAU,CAAC;IACrB,MAAM,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,UAAQ,GAAG,OAAO,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAcpE;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAsBzF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGjE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAGhE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS5D;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS3D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS/D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAS9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAqChG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAKlF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG5D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG7D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAGzD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAG5D;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAuCzF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,SAAI,EAAE,QAAQ,SAA2B,EAAE,QAAQ,SAAI,EAAE,QAAQ,SAA2B,GAAG,OAAO,CAqC1J;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,SAAI,EAAE,QAAQ,SAA2B,EAAE,QAAQ,SAAI,EAAE,QAAQ,SAA2B,GAAG,gBAAgB,CAM3K"}

package/dist/esm/services/addressManipulation.js

@@ -6,6 +6,10 @@ const firstColumn = "A";
 const lastColumn = "XFD";
 const firstRow = "1";
 const lastRow = "1048576";
+const firstColumnOffset = columnAddressToOffset(firstColumn);
+const lastColumnOffset = columnAddressToOffset(lastColumn);
+const firstRowOffset = rowAddressToOffset(firstRow);
+const lastRowOffset = rowAddressToOffset(lastRow);
 const addressPattern = /^(?<sheet>(?:'[^']+'|[A-Za-z0-9_]+)!)?(?:(?<startColumn>[A-Z]+)?(?<startRow>\d+)?(?::(?<endColumn>[A-Z]+)?(?<endRow>\d+)?)?)$/;
 /**
  * Fixes address, removing an optional sheet prefix and ensuring it is a valid range.
@@ -254,56 +258,129 @@ export function countAddressColumns(address) {
     return columnAddressToOffset(components.endColumn) - columnAddressToOffset(components.startColumn) + 1;
 }
 /**
- * Extracts a sub-address from a given address by specifying the number of rows and columns to include.
- * @param address Address to extract the sub-address from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
- * @returns Extracted sub-address.
- * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
+ * Creates a range from a single cell address, extending by the specified number of rows and columns.
+ * If rows/cols is positive, the cell is the start of the range; if negative, the cell is the end of the range.
+ *
+ * @param cell - The cell address to use as the anchor.
+ * @param rows - The number of rows for the range. Positive: cell is start; Negative: cell is end.
+ * @param cols - The number of columns for the range. Positive: cell is start; Negative: cell is end.
+ * @returns The created address range.
+ *
+ * @throws {InvalidArgumentError} If the resulting address is out of bounds.
+ *
+ * @example
+ * // Creates a 2x2 range starting at B2
+ * cellToRangeAddress("B2", 2, 2); // "B2:C3"
+ * // Creates a 2x2 range ending at B2
+ * cellToRangeAddress("B2", -2, -2); // "A1:B2"
+ * // Creates a 2x2 range starting at C3, extending 2 rows down and 2 columns left
+ * cellToRangeAddress("B2", 2, -2)).toBe("A2:B3")
  */
-export function subaddress(address, rows, cols) {
-    let { ax, bx, ay, by } = addressToCartesian(address);
-    if (rows !== null) {
-        const rowCount = by - ay + 1;
-        if (Math.abs(rows) > rowCount) {
-            throw new InvalidArgumentError(`Requested rows (${rows}) exceed available rows (${rowCount}) in range.`);
-        }
-        if (rows > 0) {
-            by = (ay + rows - 1);
+export function cellToRangeAddress(cell, rows, cols) {
+    const { ax, ay } = addressToCartesian(cell);
+    // Determine start and end coordinates
+    let startCol;
+    let endCol;
+    let startRow;
+    let endRow;
+    if (rows > 0) {
+        startRow = ay;
+        endRow = ay + rows - 1;
+    }
+    else if (rows < -1) {
+        startRow = ay + rows + 1;
+        endRow = ay;
+    }
+    else {
+        throw new InvalidArgumentError("rows must not be zero or -1");
+    }
+    if (cols > 0) {
+        startCol = ax;
+        endCol = ax + cols - 1;
+    }
+    else if (cols < -1) {
+        startCol = ax + cols + 1;
+        endCol = ax;
+    }
+    else {
+        throw new InvalidArgumentError("cols must not be zero or -1");
+    }
+    if (Math.min(startCol, endCol) < firstColumnOffset || Math.max(startCol, endCol) > lastColumnOffset || Math.min(startRow, endRow) < firstRowOffset || Math.max(startRow, endRow) > lastRowOffset) {
+        throw new InvalidArgumentError(`Resulting address is out of bounds: rows [${Math.min(startRow, endRow) + 1},${Math.max(startRow, endRow) + 1}], cols [${Math.min(startCol, endCol) + 1},${Math.max(startCol, endCol) + 1}]`);
+    }
+    return cartesianToAddress({
+        ax: Math.min(startCol, endCol),
+        bx: Math.max(startCol, endCol),
+        ay: Math.min(startRow, endRow),
+        by: Math.max(startRow, endRow),
+    });
+}
+/**
+ * Extracts a subrange from a spreadsheet-style A1 range (e.g., "A1:D10"),
+ * allowing skip and take semantics on both rows and columns.
+ *
+ * Supports negative values for `skipRows` and `skipCols` to count from the end.
+ * Supports negative values for `takeRows` and `takeCols` to exclude from the end after skipping.
+ *
+ * @param address - The original range in A1 notation (e.g., "A1:D10").
+ * @param skipRows - Number of rows to skip. If negative, skips that many rows from the end. Default is 0.
+ * @param takeRows - Number of rows to take after skipping. If negative, excludes that many rows from the end of the remaining rows. Default is Infinity.
+ * @param skipCols - Number of columns to skip. If negative, skips that many columns from the end. Default is 0.
+ * @param takeCols - Number of columns to take after skipping. If negative, excludes that many columns from the end of the remaining columns. Default is Infinity.
+ * @returns A new A1-style range representing the sliced subrange (e.g., "B2:C5").
+ *
+ * @example
+ * subaddress("A1:D10", -1, 1); // Last row: "A10:D10"
+ * subaddress("A1:D10", -2, 1); // Second last row: "A9:D9"
+ * subaddress("A1:D10", 0, -1); // All but last row: "A1:D9"
+ * subaddress("A1:D10", 0, Infinity, -2, 1); // Second last column: "C1:C10"
+ */
+export function subAddress(address, skipRows = 0, takeRows = Number.POSITIVE_INFINITY, skipCols = 0, takeCols = Number.POSITIVE_INFINITY) {
+    const { ax, bx, ay, by } = addressToCartesian(address);
+    const [startRow, endRow] = slice(ay, by, skipRows, takeRows);
+    const [startCol, endCol] = slice(ax, bx, skipCols, takeCols);
+    if (startRow < ay || endRow > by || startRow > endRow || startCol < ax || endCol > bx || startCol > endCol) {
+        throw new InvalidArgumentError(`Requested subaddress is out of bounds: rows [${startRow + 1},${endRow + 1}], cols [${startCol + 1},${endCol + 1}] in range.`);
+    }
+    return cartesianToAddress({
+        ay: startRow,
+        by: endRow,
+        ax: startCol,
+        bx: endCol,
+    });
+    function slice(start, end, skip, take) {
+        let s = start;
+        let e = end;
+        if (skip > 0) {
+            s = start + skip;
         }
-        else if (rows < 0) {
-            ay = (by + rows + 1);
+        else if (skip < 0) {
+            s = end + skip + 1;
         }
-    }
-    if (cols !== null) {
-        const colCount = bx - ax + 1;
-        if (Math.abs(cols) > colCount) {
-            throw new InvalidArgumentError(`Requested columns (${cols}) exceed available columns (${colCount}) in range.`);
+        if (!Number.isFinite(take)) {
+            // do nothing
         }
-        if (cols > 0) {
-            bx = (ax + cols - 1);
+        else if (take >= 0) {
+            e = s + take - 1;
         }
-        else if (cols < 0) {
-            ax = (bx + cols + 1);
+        else if (take < 0) {
+            e += take;
         }
+        return [s, e];
     }
-    return cartesianToAddress({
-        ay,
-        by,
-        ax,
-        bx,
-    });
 }
 /**
- * Extracts a sub-range from a given range by specifying the number of rows and columns to include.
+ * Extracts a subrange from a WorkbookRangeRef using skip/take semantics.
  * @param rangeRef Range reference to extract the sub-range from.
- * @param rows Number of rows to include. If positive, selects the first X rows, if negative, selects the last X rows. If null selects all rows.
- * @param cols Number of columns to include. If positive, selects the first X columns, if negative, selects the last X columns. If null selects all columns.
+ * @param skipRows Number of rows to skip. If negative, skips from the end. Default 0.
+ * @param takeRows Number of rows to take after skipping. If negative, excludes from the end. Default Infinity.
+ * @param skipCols Number of columns to skip. If negative, skips from the end. Default 0.
+ * @param takeCols Number of columns to take after skipping. If negative, excludes from the end. Default Infinity.
  * @returns Extracted sub-range reference.
  * @throws InvalidArgumentError if the requested rows or columns exceed the available range.
  */
-export function subrange(rangeRef, rows, cols = null) {
-    const address = subaddress(rangeRef.address, rows, cols);
+export function subrange(rangeRef, skipRows = 0, takeRows = Number.POSITIVE_INFINITY, skipCols = 0, takeCols = Number.POSITIVE_INFINITY) {
+    const address = subAddress(rangeRef.address, skipRows, takeRows, skipCols, takeCols);
     return {
         ...rangeRef,
         address,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microsoft-graph",
-  "version": "2.22.0",
+  "version": "2.22.2",
   "description": "Microsoft GraphAPI SDK for NodeJS",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",