@fgv/ts-sudoku-lib 5.0.1-0 → 5.0.1-2

package/lib/index.d.ts

@@ -1,6 +1,7 @@
-import * as File from './packlets/file';
+import * as Files from './packlets/files';
+import * as Hints from './packlets/hints';
 import * as Puzzles from './packlets/puzzles';
 export * from './packlets/collections';
 export * from './packlets/common';
-export { File, Puzzles };
+export { Files, Hints, Puzzles };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -59,9 +59,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Puzzles = exports.File = void 0;
-const File = __importStar(require("./packlets/file"));
-exports.File = File;
+exports.Puzzles = exports.Hints = exports.Files = void 0;
+const Files = __importStar(require("./packlets/files"));
+exports.Files = Files;
+const Hints = __importStar(require("./packlets/hints"));
+exports.Hints = Hints;
 const Puzzles = __importStar(require("./packlets/puzzles"));
 exports.Puzzles = Puzzles;
 __exportStar(require("./packlets/collections"), exports);

package/lib/packlets/collections/collections.d.ts

@@ -1,6 +1,7 @@
-import * as FileData from '../file';
+import * as Files from '../files';
 import { Result } from '@fgv/ts-utils';
-import { IPuzzleDescription, PuzzleSession } from '../common';
+import { PuzzleSession } from '../common';
+import { FileTree } from '@fgv/ts-json-base';
 /**
  * A collection of puzzles of various types.
  * @public
@@ -9,23 +10,23 @@ export declare class PuzzleCollection {
     /**
      * All puzzles in the collection.
      */
-    readonly puzzles: readonly IPuzzleDescription[];
+    readonly puzzles: readonly Files.Model.IPuzzleFileData[];
     private readonly _byId;
     private constructor();
     /**
-     * Creates a new puzzle from a loaded {@link File.Model.IPuzzlesFile | PuzzlesFile}
-     * @param from - The {@link File.Model.IPuzzlesFile | puzzles file} to be loaded.
+     * Creates a new puzzle from a loaded {@link Files.Model.IPuzzlesFile | PuzzlesFile}
+     * @param from - The {@link Files.Model.IPuzzlesFile | puzzles file} to be loaded.
      * @returns `Success` with the resulting {@link PuzzleCollection | PuzzleCollection}
      * or `Failure` with details if an error occurs.
      */
-    static create(from: FileData.Model.IPuzzlesFile): Result<PuzzleCollection>;
+    static create(from: Files.Model.IPuzzlesFile): Result<PuzzleCollection>;
     /**
      * Creates a new puzzle from a JSON file.
      * @param path - path to the JSON file to be loaded.
      * @returns `Success` with the resulting {@link PuzzleCollection | PuzzleCollection}
      * or `Failure` with details if an error occurs.
      */
-    static load(path: string): Result<PuzzleCollection>;
+    static load(file: FileTree.IFileTreeFileItem): Result<PuzzleCollection>;
     /**
      * Gets a puzzle by id from this collection.
      * @param id - The string ID of the puzzle to be returned.
@@ -33,13 +34,19 @@ export declare class PuzzleCollection {
      * `Failure` with details if an error occurs.
      */
     getPuzzle(id: string): Result<PuzzleSession>;
+    /**
+     * Converts IPuzzleFileData to IPuzzleDefinition format.
+     * @param fileData - The puzzle file data to convert
+     * @returns Result containing the puzzle definition
+     */
+    private _convertToDefinition;
     /**
      * Gets a puzzle by id from this collection.
      * @param id - The string ID of the puzzle to be returned.
      * @returns `Success` with the requested {@link PuzzleSession | puzzle}, or
      * `Failure` with details if an error occurs.
      */
-    getDescription(id: string): Result<IPuzzleDescription>;
+    getDescription(id: string): Result<Files.Model.IPuzzleFileData>;
 }
 /**
  * Get well-known {@link PuzzleCollection | puzzle collections}.

package/lib/packlets/collections/collections.js

@@ -60,7 +60,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuzzleCollections = exports.PuzzleCollection = void 0;
-const FileData = __importStar(require("../file"));
+const Files = __importStar(require("../files"));
 const Puzzles = __importStar(require("../puzzles"));
 const ts_utils_1 = require("@fgv/ts-utils");
 const common_1 = require("../common");
@@ -74,11 +74,11 @@ class PuzzleCollection {
         this.puzzles = puzzles.puzzles;
         this._byId = new Map(this.puzzles
             .map((p) => [p.id, p])
-            .filter((p) => p !== undefined));
+            .filter((p) => p[0] !== undefined));
     }
     /**
-     * Creates a new puzzle from a loaded {@link File.Model.IPuzzlesFile | PuzzlesFile}
-     * @param from - The {@link File.Model.IPuzzlesFile | puzzles file} to be loaded.
+     * Creates a new puzzle from a loaded {@link Files.Model.IPuzzlesFile | PuzzlesFile}
+     * @param from - The {@link Files.Model.IPuzzlesFile | puzzles file} to be loaded.
      * @returns `Success` with the resulting {@link PuzzleCollection | PuzzleCollection}
      * or `Failure` with details if an error occurs.
      */
@@ -91,8 +91,8 @@ class PuzzleCollection {
      * @returns `Success` with the resulting {@link PuzzleCollection | PuzzleCollection}
      * or `Failure` with details if an error occurs.
      */
-    static load(path) {
-        return FileData.Converters.loadJsonPuzzlesFileSync(path).onSuccess(PuzzleCollection.create);
+    static load(file) {
+        return Files.Converters.loadPuzzlesFile(file).onSuccess(PuzzleCollection.create);
     }
     /**
      * Gets a puzzle by id from this collection.
@@ -103,12 +103,41 @@ class PuzzleCollection {
     getPuzzle(id) {
         return this.getDescription(id)
             .onSuccess((desc) => {
-            return Puzzles.Any.create(desc);
+            return this._convertToDefinition(desc);
+        })
+            .onSuccess((def) => {
+            return Puzzles.Any.create(def);
         })
             .onSuccess((puzzle) => {
             return common_1.PuzzleSession.create(puzzle);
         });
     }
+    /**
+     * Converts IPuzzleFileData to IPuzzleDefinition format.
+     * @param fileData - The puzzle file data to convert
+     * @returns Result containing the puzzle definition
+     */
+    _convertToDefinition(fileData) {
+        // Validate that dimensions match cell count
+        const config = fileData.dimensions;
+        const expectedCells = config.cageWidthInCells *
+            config.cageHeightInCells *
+            config.boardWidthInCages *
+            config.boardHeightInCages;
+        // For killer sudoku, cells includes cage definitions after '|' separator
+        const gridCells = fileData.type === 'killer-sudoku' ? fileData.cells.split('|')[0] : fileData.cells;
+        const actualCells = gridCells.length;
+        if (actualCells !== expectedCells) {
+            return (0, ts_utils_1.fail)(`Dimensions mismatch: dimensions specify ${expectedCells} cells (${config.cageWidthInCells}x${config.cageHeightInCells} cages in ${config.boardWidthInCages}x${config.boardHeightInCages} layout) but cells string contains ${actualCells} cells`);
+        }
+        return common_1.PuzzleDefinitionFactory.create(config, {
+            id: fileData.id,
+            description: fileData.description,
+            type: fileData.type,
+            level: fileData.level,
+            cells: fileData.cells
+        });
+    }
     /**
      * Gets a puzzle by id from this collection.
      * @param id - The string ID of the puzzle to be returned.
@@ -116,11 +145,12 @@ class PuzzleCollection {
      * `Failure` with details if an error occurs.
      */
     getDescription(id) {
-        const desc = this._byId.get(id);
-        if (!desc) {
+        const fileData = this._byId.get(id);
+        /* c8 ignore next 3 - tested but coverage fails intermittently */
+        if (!fileData) {
             return (0, ts_utils_1.fail)(`Puzzle "${id}" not found`);
         }
-        return (0, ts_utils_1.succeed)(desc);
+        return (0, ts_utils_1.succeed)(fileData);
     }
 }
 exports.PuzzleCollection = PuzzleCollection;
@@ -134,7 +164,7 @@ class PuzzleCollections {
      */
     static get default() {
         if (!PuzzleCollections._default) {
-            PuzzleCollections._default = FileData.Converters.puzzlesFile
+            PuzzleCollections._default = Files.Converters.puzzlesFile
                 .convert(puzzles_json_1.default)
                 .onSuccess(PuzzleCollection.create)
                 .orThrow();

package/lib/packlets/collections/data/puzzles.json

@@ -5,57 +5,52 @@
       "description": "hidden pair sample",
       "type": "sudoku",
       "level": 1,
-      "rows": 9,
-      "cols": 9,
-      "cells": [
-        ".........",
-        "9.46.7...",
-        ".768.41..",
-        "3.97.1.8.",
-        "7.8...3.1",
-        ".513.87.2",
-        "..75.261.",
-        "..54.32.8",
-        "........."
-      ]
+      "cells": ".........9.46.7....768.41..3.97.1.8.7.8...3.1.513.87.2..75.261...54.32.8.........",
+      "dimensions": {
+        "cageWidthInCells": 3,
+        "cageHeightInCells": 3,
+        "boardWidthInCages": 3,
+        "boardHeightInCages": 3
+      }
     },
     {
       "id": "almost-done",
       "description": "nearly complete puzzle missing only 1 in cell A1",
       "type": "sudoku",
       "level": 1,
-      "rows": 9,
-      "cols": 9,
-      "cells": ".46728539837549126259316748685297413312684957794153862428965371571832694963471285"
+      "cells": ".46728539837549126259316748685297413312684957794153862428965371571832694963471285",
+      "dimensions": {
+        "cageWidthInCells": 3,
+        "cageHeightInCells": 3,
+        "boardWidthInCages": 3,
+        "boardHeightInCages": 3
+      }
     },
     {
       "id": "sudoku-x-example",
       "description": "sample x-sudoku puzzle",
       "type": "sudoku-x",
       "level": 1,
-      "rows": 9,
-      "cols": 9,
-      "cells": "4.....13....6.1.....7..29...76.....2....3..9.9.1....577...1.6..3...5.7...4......1"
+      "cells": "4.....13....6.1.....7..29...76.....2....3..9.9.1....577...1.6..3...5.7...4......1",
+      "dimensions": {
+        "cageWidthInCells": 3,
+        "cageHeightInCells": 3,
+        "boardWidthInCages": 3,
+        "boardHeightInCages": 3
+      }
     },
     {
       "id": "killer-insane",
       "description": "Insane (3208329) example from djape.net",
       "type": "killer-sudoku",
       "level": 100,
-      "rows": 9,
-      "cols": 9,
-      "cells": [
-        "ABCCCDDDE",
-        "ABFFGGGDE",
-        "HIJKGGLLL",
-        "HIJKMGLNN",
-        "HOPPMQQNR",
-        "OOSTMUVWR",
-        "SSSTTUVWR",
-        "XYTTTZZab",
-        "XYYYcccab",
-        "|A11,B09,C09,D20,E16,F17,G30,H17,I13,J09,K11,L16,M16,N11,O16,P07,Q11,R10,S14,T39,U08,V17,W16,X06,Y26,Z06,a09,b09,c11"
-      ]
+      "cells": "ABCCCDDDEABFFGGGDEHIJKMGLLLHIJKMGLNNHOPPMQQNROOSTMUVWRSSSTTUVWRXYTTTZZabXYYYcccab|A11,B09,C09,D20,E16,F17,G30,H17,I13,J09,K11,L16,M16,N11,O16,P07,Q11,R10,S14,T39,U08,V17,W16,X06,Y26,Z06,a09,b09,c11",
+      "dimensions": {
+        "cageWidthInCells": 3,
+        "cageHeightInCells": 3,
+        "boardWidthInCages": 3,
+        "boardHeightInCages": 3
+      }
     }
   ]
 }

package/lib/packlets/common/common.d.ts

@@ -59,6 +59,21 @@ export declare const allPuzzleTypes: PuzzleType[];
  * {@link ICell | cells}.
  * @public
  */
+/**
+ * Calculate the minimum and maximum possible totals for a cage of given size
+ * @param cageSize - Number of cells in the cage
+ * @param maxValue - Maximum value allowed in a cell (e.g., 9 for 9x9, 16 for 16x16)
+ * @returns Object with min and max possible totals
+ * @public
+ */
+export declare function getCageTotalBounds(cageSize: number, maxValue: number): {
+    min: number;
+    max: number;
+};
+/**
+ * Legacy array for backward compatibility - supports standard 9x9 Sudoku
+ * @public
+ */
 export declare const totalsByCageSize: readonly {
     min: number;
     max: number;

package/lib/packlets/common/common.js

@@ -24,6 +24,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.totalsByCageSize = exports.allPuzzleTypes = void 0;
+exports.getCageTotalBounds = getCageTotalBounds;
 /**
  * All supported public types.
  * @public
@@ -34,6 +35,30 @@ exports.allPuzzleTypes = ['killer-sudoku', 'sudoku', 'sudoku-x'];
  * {@link ICell | cells}.
  * @public
  */
+/**
+ * Calculate the minimum and maximum possible totals for a cage of given size
+ * @param cageSize - Number of cells in the cage
+ * @param maxValue - Maximum value allowed in a cell (e.g., 9 for 9x9, 16 for 16x16)
+ * @returns Object with min and max possible totals
+ * @public
+ */
+function getCageTotalBounds(cageSize, maxValue) {
+    /* c8 ignore next 3 - functional code tested but coverage intermittently missed */
+    if (cageSize <= 0) {
+        return { min: 0, max: 0 };
+    }
+    // Minimum is sum of first cageSize numbers (1, 2, 3, ...)
+    const min = (cageSize * (cageSize + 1)) / 2;
+    // Maximum is sum of last cageSize numbers (maxValue, maxValue-1, ...)
+    // But cageSize cannot exceed maxValue
+    const effectiveCageSize = Math.min(cageSize, maxValue);
+    const max = effectiveCageSize * maxValue - (effectiveCageSize * (effectiveCageSize - 1)) / 2;
+    return { min, max };
+}
+/**
+ * Legacy array for backward compatibility - supports standard 9x9 Sudoku
+ * @public
+ */
 exports.totalsByCageSize = [
     { min: 0, max: 0 },
     { min: 1, max: 9 },

package/lib/packlets/common/converters.d.ts

@@ -1,6 +1,5 @@
 import { Converter } from '@fgv/ts-utils';
 import { CageId, CellId, PuzzleType } from './common';
-import { IPuzzleDescription } from './model';
 /**
  * Converts an arbitrary value to a {@link CageId | CageId}.
  * @public
@@ -16,9 +15,4 @@ export declare const cellId: Converter<CellId>;
  * @public
  */
 export declare const puzzleType: Converter<PuzzleType, ReadonlyArray<PuzzleType>>;
-/**
- * Converts an arbitrary object to a {@link IPuzzleDescription | IPuzzleDescription}.
- * @public
- */
-export declare const puzzleDescription: Converter<IPuzzleDescription>;
 //# sourceMappingURL=converters.d.ts.map

package/lib/packlets/common/converters.js

@@ -23,22 +23,32 @@
  * SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.puzzleDescription = exports.puzzleType = exports.cellId = exports.cageId = void 0;
+exports.puzzleType = exports.cellId = exports.cageId = void 0;
 const ts_utils_1 = require("@fgv/ts-utils");
 const common_1 = require("./common");
-const cageIdRegExp = /^(R[A-Z]$)|(C[0-9]$)|(S[A-Z][0-9]$)|(X[1-2]$)|(K[A-Za-z]$)/;
+// Updated to support larger grids:
+// - Row IDs: R followed by A-Z or AA-ZZ for rows
+// - Column IDs: C followed by 1-99+ for columns
+// - Section IDs: S followed by row letter(s) and column number(s)
+// - X diagonals: X1, X2
+// - Killer cages: K followed by letter(s)
+const cageIdRegExp = /^(R[A-Z]{1,2}$)|(C[0-9]{1,3}$)|(S[A-Z]{1,2}[0-9]{1,3}$)|(X[1-2]$)|(K[A-Za-z]+$)/;
 function validateCageId(from) {
     if (cageIdRegExp.test(from)) {
         return (0, ts_utils_1.succeed)(from);
     }
-    return (0, ts_utils_1.fail)(`malformed cage ID "${from}" (expected "R[A-Z]", "C[0-9]" or "S[A-Z][0-9]")`);
+    return (0, ts_utils_1.fail)(`malformed cage ID "${from}"`);
 }
-const cellIdRegExp = /^[A-Z][0-9]$/;
+// Updated to support larger grids:
+// - Rows: A-Z for 0-25, then AA-ZZ for 26+
+// - Columns: 1-999 for any size grid
+const cellIdRegExp = /^[A-Z]{1,2}[0-9]{1,3}$/;
 function validateCellId(from) {
-    if (cellIdRegExp.test(from)) {
-        return (0, ts_utils_1.succeed)(from);
+    // Check basic format
+    if (!cellIdRegExp.test(from)) {
+        return (0, ts_utils_1.fail)(`malformed cell ID "${from}" (expected row letter(s) followed by column number)`);
     }
-    return (0, ts_utils_1.fail)(`malformed cell ID "${from}" (expected "[A-Z][0-9]")`);
+    return (0, ts_utils_1.succeed)(from);
 }
 /**
  * Converts an arbitrary value to a {@link CageId | CageId}.
@@ -55,19 +65,4 @@ exports.cellId = ts_utils_1.Converters.string.map(validateCellId);
  * @public
  */
 exports.puzzleType = ts_utils_1.Converters.enumeratedValue(common_1.allPuzzleTypes);
-/**
- * Converts an arbitrary object to a {@link IPuzzleDescription | IPuzzleDescription}.
- * @public
- */
-exports.puzzleDescription = ts_utils_1.Converters.strictObject({
-    id: ts_utils_1.Converters.string,
-    description: ts_utils_1.Converters.string,
-    type: exports.puzzleType,
-    level: ts_utils_1.Converters.number,
-    rows: ts_utils_1.Converters.number,
-    cols: ts_utils_1.Converters.number,
-    cells: ts_utils_1.Converters.oneOf([ts_utils_1.Converters.string, ts_utils_1.Converters.stringArray.map((s) => (0, ts_utils_1.succeed)(s.join('')))])
-}, {
-    optionalFields: ['id']
-});
 //# sourceMappingURL=converters.js.map

package/lib/packlets/common/ids.d.ts

@@ -1,6 +1,13 @@
 import { Result } from '@fgv/ts-utils';
 import { CageId, CellId, IRowColumn } from './common';
 import { ICage, ICell } from './public';
+/**
+ * Parse a cell ID string back to row/column coordinates
+ * @param cellId - Cell ID string (e.g., "A1", "A01", "AB15")
+ * @returns Row and column indices (0-based) or undefined if invalid
+ * @public
+ */
+export declare function parseCellId(cellId: string): IRowColumn | undefined;
 /**
  * @public
  */
@@ -9,7 +16,7 @@ export declare class Ids {
     static cellId(spec: string | IRowColumn | ICell): Result<CellId>;
     static rowCageId(row: number): CageId;
     static columnCageId(col: number): CageId;
-    static sectionCageId(row: number, col: number): CageId;
+    static sectionCageId(row: number, col: number, cageHeight?: number, cageWidth?: number): CageId;
     static cellIds(firstRow: number, numRows: number, firstCol: number, numCols: number): Result<CellId[]>;
 }
 //# sourceMappingURL=ids.d.ts.map

package/lib/packlets/common/ids.js

@@ -57,10 +57,74 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ids = void 0;
+exports.parseCellId = parseCellId;
 const ts_utils_1 = require("@fgv/ts-utils");
 const Converters = __importStar(require("./converters"));
 const firstRowIdChar = 'A'.charCodeAt(0);
-const firstColIdChar = '1'.charCodeAt(0);
+/**
+ * Convert a column index (0-based) to column letters (A-Z, AA-AZ, BA-BZ, etc.)
+ * @param col - 0-based column index
+ * @returns Column identifier string
+ */
+function columnToLetters(col) {
+    if (col < 26) {
+        // Single letter: A-Z
+        return String.fromCharCode(firstRowIdChar + col);
+        /* c8 ignore next 8 - functional code tested but coverage intermittently missed */
+    }
+    else {
+        // Double letters: AA, AB, ..., ZZ
+        const firstLetter = Math.floor(col / 26) - 1;
+        const secondLetter = col % 26;
+        return (String.fromCharCode(firstRowIdChar + firstLetter) + String.fromCharCode(firstRowIdChar + secondLetter));
+    }
+}
+/**
+ * Convert a row index (0-based) to row number string (1-based with zero-padding)
+ * @param row - 0-based row index
+ * @param maxRow - Maximum row index (optional, for determining padding width)
+ * @returns Row number string with zero-padding
+ */
+function rowToNumber(row, maxRow) {
+    const rowNum = row + 1;
+    /* c8 ignore next 5 - functional code tested but coverage intermittently missed */
+    if (maxRow !== undefined) {
+        const maxRowNum = maxRow + 1;
+        const width = maxRowNum.toString().length;
+        return rowNum.toString().padStart(width, '0');
+    }
+    // Default: pad to 2 digits for grids up to 99x99
+    return rowNum.toString().padStart(2, '0');
+}
+/**
+ * Parse a cell ID string back to row/column coordinates
+ * @param cellId - Cell ID string (e.g., "A1", "A01", "AB15")
+ * @returns Row and column indices (0-based) or undefined if invalid
+ * @public
+ */
+function parseCellId(cellId) {
+    const match = cellId.match(/^([A-Z]{1,2})([0-9]{1,3})$/);
+    /* c8 ignore next 3 - functional code tested but coverage intermittently missed */
+    if (!match) {
+        return undefined;
+    }
+    const rowLetters = match[1];
+    const colNumber = parseInt(match[2], 10);
+    let row;
+    if (rowLetters.length === 1) {
+        // Single letter: A-Z maps to rows 0-25
+        row = rowLetters.charCodeAt(0) - firstRowIdChar;
+        /* c8 ignore next 6 - functional code tested but coverage intermittently missed */
+    }
+    else {
+        // Double letters: AA-ZZ for rows 26+
+        const firstLetter = rowLetters.charCodeAt(0) - firstRowIdChar;
+        const secondLetter = rowLetters.charCodeAt(1) - firstRowIdChar;
+        row = (firstLetter + 1) * 26 + secondLetter;
+    }
+    const col = colNumber - 1; // Convert from 1-based to 0-based
+    return { row, col };
+}
 function isRowColumn(from) {
     return typeof from === 'object' && from !== null && 'row' in from && `col` in from;
 }
@@ -72,6 +136,7 @@ class Ids {
         if (typeof from === 'string') {
             return Converters.cageId.convert(from);
         }
+        /* c8 ignore next 2 - functional code tested but coverage intermittently missed */
         return (0, ts_utils_1.succeed)(from.id);
     }
     static cellId(spec) {
@@ -79,22 +144,30 @@ class Ids {
             if ('id' in spec) {
                 return (0, ts_utils_1.succeed)(spec.id);
             }
-            const row = String.fromCharCode(firstRowIdChar + spec.row);
-            const col = String.fromCharCode(firstColIdChar + spec.col);
-            return (0, ts_utils_1.succeed)(`${row}${col}`);
+            // Standard sudoku convention: Letters for rows (A-I), numbers for columns (1-9)
+            const rowLetter = columnToLetters(spec.row);
+            // For 9x9 grids, use single digit format for backward compatibility
+            // For larger grids, use zero-padding
+            const colNumber = spec.col < 9 ? (spec.col + 1).toString() : rowToNumber(spec.col);
+            return (0, ts_utils_1.succeed)(`${rowLetter}${colNumber}`);
         }
         return Converters.cellId.convert(spec);
     }
     static rowCageId(row) {
-        return `R${String.fromCharCode(firstRowIdChar + row)}`;
+        return `R${columnToLetters(row)}`;
     }
     static columnCageId(col) {
-        return `C${String.fromCharCode(firstColIdChar + col)}`;
+        // For backward compatibility, use single digit for columns < 9
+        const colNumber = col < 9 ? (col + 1).toString() : rowToNumber(col);
+        return `C${colNumber}`;
     }
-    static sectionCageId(row, col) {
-        row = Math.floor(row / 3) * 3;
-        col = Math.floor(col / 3) * 3;
-        return `S${String.fromCharCode(firstRowIdChar + row)}${String.fromCharCode(firstColIdChar + col)}`;
+    static sectionCageId(row, col, cageHeight = 3, cageWidth = 3) {
+        row = Math.floor(row / cageHeight) * cageHeight;
+        col = Math.floor(col / cageWidth) * cageWidth;
+        // Section IDs use row letter and column number
+        const rowLetter = columnToLetters(row);
+        const colNumber = col < 9 ? (col + 1).toString() : rowToNumber(col);
+        return `S${rowLetter}${colNumber}`;
     }
     static cellIds(firstRow, numRows, firstCol, numCols) {
         const cellIds = [];

package/lib/packlets/common/index.d.ts

@@ -2,10 +2,11 @@ import * as Converters from './converters';
 export * from './cage';
 export * from './cell';
 export * from './common';
-export { Ids } from './ids';
-export * from './model';
+export { Ids, parseCellId } from './ids';
+export { DefaultSudokuLogger } from './logging';
 export * from './public';
 export * from './puzzle';
+export * from './puzzleDefinitions';
 export * from './puzzleSession';
 export * from './puzzleState';
 export { Converters };

package/lib/packlets/common/index.js

@@ -59,7 +59,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Converters = exports.Ids = void 0;
+exports.Converters = exports.DefaultSudokuLogger = exports.parseCellId = exports.Ids = void 0;
 const Converters = __importStar(require("./converters"));
 exports.Converters = Converters;
 __exportStar(require("./cage"), exports);
@@ -67,9 +67,12 @@ __exportStar(require("./cell"), exports);
 __exportStar(require("./common"), exports);
 var ids_1 = require("./ids");
 Object.defineProperty(exports, "Ids", { enumerable: true, get: function () { return ids_1.Ids; } });
-__exportStar(require("./model"), exports);
+Object.defineProperty(exports, "parseCellId", { enumerable: true, get: function () { return ids_1.parseCellId; } });
+var logging_1 = require("./logging");
+Object.defineProperty(exports, "DefaultSudokuLogger", { enumerable: true, get: function () { return logging_1.DefaultSudokuLogger; } });
 __exportStar(require("./public"), exports);
 __exportStar(require("./puzzle"), exports);
+__exportStar(require("./puzzleDefinitions"), exports);
 __exportStar(require("./puzzleSession"), exports);
 __exportStar(require("./puzzleState"), exports);
 //# sourceMappingURL=index.js.map

package/lib/packlets/common/logging.d.ts

@@ -0,0 +1,7 @@
+import { Logging } from '@fgv/ts-utils';
+/**
+ * Default no-op logger for use when diagnostic logging is not needed.
+ * @public
+ */
+export declare const DefaultSudokuLogger: Logging.LogReporter<unknown>;
+//# sourceMappingURL=logging.d.ts.map

package/lib/packlets/common/logging.js

@@ -0,0 +1,35 @@
+"use strict";
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Erik Fortune
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultSudokuLogger = void 0;
+const ts_utils_1 = require("@fgv/ts-utils");
+/**
+ * Default no-op logger for use when diagnostic logging is not needed.
+ * @public
+ */
+exports.DefaultSudokuLogger = new ts_utils_1.Logging.LogReporter({
+    logger: new ts_utils_1.Logging.NoOpLogger()
+});
+//# sourceMappingURL=logging.js.map