sof-mssql 2.2.0 → 2.4.0

package/dist/loader/tables.js

@@ -9,12 +9,119 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildCreateTableStatements = buildCreateTableStatements;
+exports.resolveColumnJsonDataType = resolveColumnJsonDataType;
+exports.buildJsonTypeMismatchWarning = buildJsonTypeMismatchWarning;
 exports.tableExists = tableExists;
+exports.getExistingJsonColumnType = getExistingJsonColumnType;
+exports.warnIfJsonTypeMismatch = warnIfJsonTypeMismatch;
 exports.createTable = createTable;
 exports.truncateTable = truncateTable;
 exports.ensureTable = ensureTable;
 const mssql_1 = __importDefault(require("mssql"));
 const validation_js_1 = require("../validation.js");
+/**
+ * Build the DDL statements for the resources table and its index.
+ *
+ * This is a pure function so the generated SQL can be unit-tested without a
+ * database. The `json` column is typed with the resolved {@link
+ * ResourceJsonDataType}; with the default `NVARCHAR(MAX)` the output is
+ * byte-for-byte identical to earlier releases (SC-001). Identifiers are assumed
+ * to have been validated by the caller (see {@link createTable}).
+ *
+ * @param schemaName - Schema name (already validated).
+ * @param tableName - Table name (already validated).
+ * @param jsonType - Resolved canonical storage type for the `json` column.
+ * @returns The `CREATE TABLE` and `CREATE INDEX` statements.
+ */
+function buildCreateTableStatements(schemaName, tableName, jsonType) {
+    // Only the json column's type varies; every other part of the DDL is held
+    // constant so the default path is unchanged from earlier releases.
+    const createTable = `
+    CREATE TABLE [${schemaName}].[${tableName}] (
+      [id] INT IDENTITY(1,1) NOT NULL PRIMARY KEY,
+      [resource_type] NVARCHAR(64) NOT NULL,
+      [json] ${jsonType} NOT NULL
+    )
+  `;
+    const createIndex = `
+    CREATE INDEX [IX_${tableName}_resource_type]
+    ON [${schemaName}].[${tableName}] ([resource_type])
+  `;
+    return { createTable, createIndex };
+}
+/**
+ * Render an INFORMATION_SCHEMA column type for a diagnostic message.
+ *
+ * Length-bearing types are shown with their declared length, with the `-1`
+ * sentinel rendered as `MAX`; types reported without a length (such as the
+ * native `JSON` type) are shown as the bare type name.
+ *
+ * @param dataType - The INFORMATION_SCHEMA DATA_TYPE.
+ * @param characterMaximumLength - The INFORMATION_SCHEMA CHARACTER_MAXIMUM_LENGTH.
+ * @returns A readable type such as `VARCHAR(100)`, `NVARCHAR(MAX)` or `JSON`.
+ */
+function formatColumnType(dataType, characterMaximumLength) {
+    const baseType = dataType.trim().toUpperCase();
+    if (characterMaximumLength === null) {
+        return baseType;
+    }
+    const length = characterMaximumLength === -1 ? "MAX" : String(characterMaximumLength);
+    return `${baseType}(${length})`;
+}
+/**
+ * Resolve an INFORMATION_SCHEMA column description to a canonical json type.
+ *
+ * Only two column shapes can faithfully hold a serialised FHIR resource: the
+ * native type (`data_type = 'json'`) and `NVARCHAR(MAX)` (`data_type =
+ * 'nvarchar'` with `character_maximum_length = -1`). Any other shape - a bounded
+ * `NVARCHAR(64)`, a non-Unicode `VARCHAR`, `TEXT`, and so on - is rejected here
+ * rather than silently coerced to `NVARCHAR(MAX)`. Coercion would let the
+ * mismatch check pass and the loader write into a column that cannot hold the
+ * data, surfacing later as a `String or binary data would be truncated` error
+ * or, under non-Unicode `VARCHAR`, silent character corruption. Failing fast
+ * turns that late, data-dependent failure into an early, actionable
+ * configuration error (Constitution Principle IV).
+ *
+ * @param dataType - The INFORMATION_SCHEMA DATA_TYPE.
+ * @param characterMaximumLength - The INFORMATION_SCHEMA CHARACTER_MAXIMUM_LENGTH.
+ * @returns The canonical resource json data type (`JSON` or `NVARCHAR(MAX)`).
+ * @throws Error if the column is neither native `JSON` nor `NVARCHAR(MAX)`. The
+ *   message names the offending type and the two acceptable types.
+ */
+function resolveColumnJsonDataType(dataType, characterMaximumLength) {
+    const normalised = dataType.trim().toLowerCase();
+    if (normalised === "json") {
+        return "JSON";
+    }
+    // NVARCHAR(MAX) is the only nvarchar form that can hold an arbitrarily long
+    // resource; bounded lengths would truncate, so the length is required here.
+    if (normalised === "nvarchar" && characterMaximumLength === -1) {
+        return "NVARCHAR(MAX)";
+    }
+    throw new Error(`Existing [json] column is ` +
+        `${formatColumnType(dataType, characterMaximumLength)}, which cannot ` +
+        `safely hold serialised FHIR resources. Expected NVARCHAR(MAX) or JSON. ` +
+        `Alter or drop the column before loading.`);
+}
+/**
+ * Build a warning for an existing table whose json column type differs from the
+ * requested type.
+ *
+ * @param schemaName - Schema name.
+ * @param tableName - Table name.
+ * @param existingType - The table's current json column type.
+ * @param requestedType - The requested json column type.
+ * @returns A warning message naming both types, or null when they match.
+ */
+function buildJsonTypeMismatchWarning(schemaName, tableName, existingType, requestedType) {
+    if (existingType === requestedType) {
+        return null;
+    }
+    return (`Warning: table [${schemaName}].[${tableName}] already exists with a json ` +
+        `column of type ${existingType}, but ${requestedType} was requested. The ` +
+        `existing table is left unaltered and loading continues into it.`);
+}
 /**
  * Check if a table exists in the database.
  *
@@ -34,31 +141,82 @@ async function tableExists(pool, schemaName, tableName) {
     `);
     return result.recordset[0].count > 0;
 }
+/**
+ * Read the effective json column type for an existing table.
+ *
+ * @param pool - Database connection pool.
+ * @param schemaName - Schema name.
+ * @param tableName - Name of the table.
+ * @returns The canonical json column type, or null if the table or its `json`
+ *   column does not exist.
+ * @throws Error if the column exists but is neither native `JSON` nor
+ *   `NVARCHAR(MAX)` (see {@link resolveColumnJsonDataType}).
+ */
+async function getExistingJsonColumnType(pool, schemaName, tableName) {
+    const result = await pool
+        .request()
+        .input("schemaName", mssql_1.default.NVarChar, schemaName)
+        .input("tableName", mssql_1.default.NVarChar, tableName).query(`
+      SELECT DATA_TYPE, CHARACTER_MAXIMUM_LENGTH
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE TABLE_SCHEMA = @schemaName
+        AND TABLE_NAME = @tableName
+        AND COLUMN_NAME = 'json'
+    `);
+    const row = result.recordset[0];
+    if (!row) {
+        return null;
+    }
+    return resolveColumnJsonDataType(row.DATA_TYPE, row.CHARACTER_MAXIMUM_LENGTH);
+}
+/**
+ * Emit a warning if an existing table's json column type differs from the
+ * requested type. The table is never altered; this only surfaces the mismatch
+ * so it is visible rather than silently ignored (FR-008, SC-005).
+ *
+ * An existing column that is neither native `JSON` nor `NVARCHAR(MAX)` cannot
+ * hold a serialised FHIR resource, so it is rejected outright rather than
+ * warned about: the error is raised here before any rows are loaded.
+ *
+ * @param pool - Database connection pool.
+ * @param schemaName - Schema name.
+ * @param tableName - Name of the table.
+ * @param requestedType - The requested json column type.
+ * @throws Error if the existing `json` column is neither native `JSON` nor
+ *   `NVARCHAR(MAX)` (see {@link resolveColumnJsonDataType}).
+ */
+async function warnIfJsonTypeMismatch(pool, schemaName, tableName, requestedType) {
+    const existingType = await getExistingJsonColumnType(pool, schemaName, tableName);
+    if (existingType === null) {
+        return;
+    }
+    const warning = buildJsonTypeMismatchWarning(schemaName, tableName, existingType, requestedType);
+    if (warning !== null) {
+        // The warning is emitted regardless of quiet mode so the misconfiguration
+        // is always visible (SC-005).
+        console.warn(warning);
+    }
+}
 /**
  * Create the fhir_resources table with an index on resource_type.
- * Table schema: id (INT IDENTITY PRIMARY KEY), resource_type (NVARCHAR(64)), json (NVARCHAR(MAX))
+ * Table schema: id (INT IDENTITY PRIMARY KEY), resource_type (NVARCHAR(64)),
+ * json (the configured storage type, NVARCHAR(MAX) by default).
  *
  * @param pool - Database connection pool.
  * @param schemaName - Schema name.
  * @param tableName - Name of the table to create.
+ * @param jsonType - Storage type for the `json` column (default `NVARCHAR(MAX)`).
  */
-async function createTable(pool, schemaName, tableName) {
-    // Validate identifiers to prevent SQL injection
+async function createTable(pool, schemaName, tableName, jsonType = "NVARCHAR(MAX)") {
+    // Validate identifiers to prevent SQL injection. The json type is already a
+    // canonical, allowlisted value, so it carries no injection risk.
     (0, validation_js_1.validateSqlServerIdentifier)(schemaName, "Schema name");
     (0, validation_js_1.validateSqlServerIdentifier)(tableName, "Table name");
+    const { createTable: createTableSql, createIndex: createIndexSql } = buildCreateTableStatements(schemaName, tableName, jsonType);
     // Create the table.
-    await pool.request().query(`
-    CREATE TABLE [${schemaName}].[${tableName}] (
-      [id] INT IDENTITY(1,1) NOT NULL PRIMARY KEY,
-      [resource_type] NVARCHAR(64) NOT NULL,
-      [json] NVARCHAR(MAX) NOT NULL
-    )
-  `);
+    await pool.request().query(createTableSql);
     // Create an index on resource_type for efficient filtering by resource type.
-    await pool.request().query(`
-    CREATE INDEX [IX_${tableName}_resource_type]
-    ON [${schemaName}].[${tableName}] ([resource_type])
-  `);
+    await pool.request().query(createIndexSql);
 }
 /**
  * Truncate a table (remove all rows).
@@ -76,20 +234,28 @@ async function truncateTable(pool, schemaName, tableName) {
 /**
  * Ensure the fhir_resources table exists, creating it if necessary.
  *
+ * When the table already exists it is never altered; the requested `json`
+ * column type only governs creation of a new table.
+ *
  * @param pool - Database connection pool.
  * @param schemaName - Schema name.
  * @param tableName - Name of the table.
  * @param truncate - Whether to truncate the table if it exists.
+ * @param jsonType - Storage type for the `json` column when creating the table
+ *   (default `NVARCHAR(MAX)`).
  */
-async function ensureTable(pool, schemaName, tableName, truncate = false) {
+async function ensureTable(pool, schemaName, tableName, truncate = false, jsonType = "NVARCHAR(MAX)") {
     const exists = await tableExists(pool, schemaName, tableName);
     if (exists) {
+        // The table already exists, so the requested type cannot take effect. Warn
+        // if it differs from the existing column type, then leave the table as is.
+        await warnIfJsonTypeMismatch(pool, schemaName, tableName, jsonType);
         if (truncate) {
             await truncateTable(pool, schemaName, tableName);
         }
     }
     else {
-        await createTable(pool, schemaName, tableName);
+        await createTable(pool, schemaName, tableName, jsonType);
     }
 }
 //# sourceMappingURL=tables.js.map

package/dist/loader/tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../src/loader/tables.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAaH,kCAeC;AAUD,kCAuBC;AASD,sCAUC;AAUD,kCAeC;AAvGD,kDAAiD;AACjD,oDAA+D;AAE/D;;;;;;;GAOG;AACI,KAAK,UAAU,WAAW,CAC/B,IAAoB,EACpB,UAAkB,EAClB,SAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,IAAI;SACtB,OAAO,EAAE;SACT,KAAK,CAAC,YAAY,EAAE,eAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;SAC7C,KAAK,CAAC,WAAW,EAAE,eAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC;;;;KAIlD,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;AACvC,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,WAAW,CAC/B,IAAoB,EACpB,UAAkB,EAClB,SAAiB;IAEjB,gDAAgD;IAChD,IAAA,2CAA2B,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACvD,IAAA,2CAA2B,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAErD,oBAAoB;IACpB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC;oBACT,UAAU,MAAM,SAAS;;;;;GAK1C,CAAC,CAAC;IAEH,6EAA6E;IAC7E,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC;uBACN,SAAS;UACtB,UAAU,MAAM,SAAS;GAChC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,aAAa,CACjC,IAAoB,EACpB,UAAkB,EAClB,SAAiB;IAEjB,gDAAgD;IAChD,IAAA,2CAA2B,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACvD,IAAA,2CAA2B,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,mBAAmB,UAAU,MAAM,SAAS,GAAG,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,WAAW,CAC/B,IAAoB,EACpB,UAAkB,EAClB,SAAiB,EACjB,WAAoB,KAAK;IAEzB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAE9D,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
+{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../src/loader/tables.ts"],"names":[],"mappings":"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"}

package/dist/loader/tables.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Unit tests for pure table DDL generation and existing-column-type resolution.
+ *
+ * These exercise the string-building and comparison logic without a database,
+ * so the byte-for-byte DDL contract (SC-001), the native JSON column type
+ * (FR-005) and the type-mismatch decision (FR-008) can be verified in
+ * isolation.
+ *
+ * @author John Grimes
+ */
+export {};
+//# sourceMappingURL=tables.test.d.ts.map

package/dist/loader/tables.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tables.test.d.ts","sourceRoot":"","sources":["../../src/loader/tables.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/loader/tables.test.js

@@ -0,0 +1,130 @@
+"use strict";
+/**
+ * Unit tests for pure table DDL generation and existing-column-type resolution.
+ *
+ * These exercise the string-building and comparison logic without a database,
+ * so the byte-for-byte DDL contract (SC-001), the native JSON column type
+ * (FR-005) and the type-mismatch decision (FR-008) can be verified in
+ * isolation.
+ *
+ * @author John Grimes
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const tables_1 = require("./tables");
+(0, vitest_1.describe)("buildCreateTableStatements", () => {
+    (0, vitest_1.describe)("default NVARCHAR(MAX) json column", () => {
+        const statements = (0, tables_1.buildCreateTableStatements)("dbo", "fhir_resources", "NVARCHAR(MAX)");
+        (0, vitest_1.it)("types the json column as NVARCHAR(MAX) NOT NULL", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[json] NVARCHAR(MAX) NOT NULL");
+        });
+        (0, vitest_1.it)("keeps the id column unchanged", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[id] INT IDENTITY(1,1) NOT NULL PRIMARY KEY");
+        });
+        (0, vitest_1.it)("keeps the resource_type column unchanged", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[resource_type] NVARCHAR(64) NOT NULL");
+        });
+        (0, vitest_1.it)("brackets the schema and table identifiers", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[dbo].[fhir_resources]");
+        });
+        (0, vitest_1.it)("builds the resource_type index", () => {
+            (0, vitest_1.expect)(statements.createIndex).toContain("[IX_fhir_resources_resource_type]");
+            (0, vitest_1.expect)(statements.createIndex).toContain("[dbo].[fhir_resources] ([resource_type])");
+        });
+    });
+    (0, vitest_1.describe)("native JSON json column", () => {
+        const statements = (0, tables_1.buildCreateTableStatements)("dbo", "fhir_resources", "JSON");
+        (0, vitest_1.it)("types the json column as JSON NOT NULL", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[json] JSON NOT NULL");
+        });
+        (0, vitest_1.it)("does not emit NVARCHAR(MAX) for the json column", () => {
+            (0, vitest_1.expect)(statements.createTable).not.toContain("[json] NVARCHAR(MAX)");
+        });
+        (0, vitest_1.it)("keeps the resource_type column unchanged", () => {
+            (0, vitest_1.expect)(statements.createTable).toContain("[resource_type] NVARCHAR(64) NOT NULL");
+        });
+        (0, vitest_1.it)("leaves the index statement identical to the default", () => {
+            const defaultStatements = (0, tables_1.buildCreateTableStatements)("dbo", "fhir_resources", "NVARCHAR(MAX)");
+            (0, vitest_1.expect)(statements.createIndex).toBe(defaultStatements.createIndex);
+        });
+    });
+    (0, vitest_1.describe)("identifier bracketing", () => {
+        (0, vitest_1.it)("brackets custom schema and table names", () => {
+            const statements = (0, tables_1.buildCreateTableStatements)("analytics", "resources", "JSON");
+            (0, vitest_1.expect)(statements.createTable).toContain("[analytics].[resources]");
+            (0, vitest_1.expect)(statements.createIndex).toContain("[IX_resources_resource_type]");
+            (0, vitest_1.expect)(statements.createIndex).toContain("[analytics].[resources] ([resource_type])");
+        });
+    });
+});
+(0, vitest_1.describe)("resolveColumnJsonDataType", () => {
+    (0, vitest_1.it)("resolves nvarchar with MAX length to NVARCHAR(MAX)", () => {
+        // NVARCHAR(MAX) appears in INFORMATION_SCHEMA as data_type 'nvarchar' with a
+        // character_maximum_length of -1.
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)("nvarchar", -1)).toBe("NVARCHAR(MAX)");
+    });
+    (0, vitest_1.it)("resolves json to JSON", () => {
+        // The native type appears as data_type 'json' with a null maximum length.
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)("json", null)).toBe("JSON");
+    });
+    (0, vitest_1.it)("is case-insensitive on the data type name", () => {
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)("JSON", null)).toBe("JSON");
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)("NVARCHAR", -1)).toBe("NVARCHAR(MAX)");
+    });
+    (0, vitest_1.it)("tolerates surrounding whitespace on the data type name", () => {
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)("  json  ", null)).toBe("JSON");
+        (0, vitest_1.expect)((0, tables_1.resolveColumnJsonDataType)(" nvarchar ", -1)).toBe("NVARCHAR(MAX)");
+    });
+    // An existing column that is neither native JSON nor NVARCHAR(MAX) cannot
+    // faithfully hold a serialised FHIR resource. Such a column must be rejected
+    // at the boundary, naming the offending type, rather than silently coerced to
+    // NVARCHAR(MAX) - coercion would let the loader write into it and lose data
+    // through truncation or, under non-Unicode VARCHAR, character corruption
+    // (Constitution Principle IV).
+    (0, vitest_1.describe)("rejects column types that cannot hold a FHIR resource", () => {
+        (0, vitest_1.it)("throws for a bounded nvarchar, naming the offending type", () => {
+            (0, vitest_1.expect)(() => (0, tables_1.resolveColumnJsonDataType)("nvarchar", 64)).toThrow(/NVARCHAR\(64\)/);
+        });
+        (0, vitest_1.it)("throws for varchar, naming the offending type", () => {
+            (0, vitest_1.expect)(() => (0, tables_1.resolveColumnJsonDataType)("varchar", 100)).toThrow(/VARCHAR\(100\)/);
+        });
+        (0, vitest_1.it)("throws for a max-length varchar, which is still not Unicode-safe", () => {
+            // VARCHAR(MAX) reports a length of -1 but is non-Unicode, so it can
+            // silently corrupt multi-byte characters and must still be rejected.
+            (0, vitest_1.expect)(() => (0, tables_1.resolveColumnJsonDataType)("varchar", -1)).toThrow(/VARCHAR\(MAX\)/);
+        });
+        (0, vitest_1.it)("throws for text, naming the offending type", () => {
+            (0, vitest_1.expect)(() => (0, tables_1.resolveColumnJsonDataType)("text", 2147483647)).toThrow(/TEXT/);
+        });
+        (0, vitest_1.it)("names both acceptable types in the error message", () => {
+            let message = "";
+            try {
+                (0, tables_1.resolveColumnJsonDataType)("varchar", 100);
+            }
+            catch (error) {
+                message = error.message;
+            }
+            (0, vitest_1.expect)(message).toContain("NVARCHAR(MAX)");
+            (0, vitest_1.expect)(message).toContain("JSON");
+        });
+    });
+});
+(0, vitest_1.describe)("buildJsonTypeMismatchWarning", () => {
+    (0, vitest_1.it)("returns null when the existing and requested types are equal", () => {
+        (0, vitest_1.expect)((0, tables_1.buildJsonTypeMismatchWarning)("dbo", "t", "NVARCHAR(MAX)", "NVARCHAR(MAX)")).toBeNull();
+        (0, vitest_1.expect)((0, tables_1.buildJsonTypeMismatchWarning)("dbo", "t", "JSON", "JSON")).toBeNull();
+    });
+    (0, vitest_1.it)("returns a warning naming both types and the table when they differ", () => {
+        const warning = (0, tables_1.buildJsonTypeMismatchWarning)("dbo", "fhir_resources", "NVARCHAR(MAX)", "JSON");
+        (0, vitest_1.expect)(warning).not.toBeNull();
+        (0, vitest_1.expect)(warning).toContain("NVARCHAR(MAX)");
+        (0, vitest_1.expect)(warning).toContain("JSON");
+        (0, vitest_1.expect)(warning).toContain("fhir_resources");
+    });
+    (0, vitest_1.it)("names both the existing and the requested type in either direction", () => {
+        const warning = (0, tables_1.buildJsonTypeMismatchWarning)("dbo", "t", "JSON", "NVARCHAR(MAX)");
+        (0, vitest_1.expect)(warning).toMatch(/JSON/);
+        (0, vitest_1.expect)(warning).toMatch(/NVARCHAR\(MAX\)/);
+    });
+});
+//# sourceMappingURL=tables.test.js.map

package/dist/loader/tables.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tables.test.js","sourceRoot":"","sources":["../../src/loader/tables.test.ts"],"names":[],"mappings":"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"}

package/dist/loader/types.d.ts

@@ -49,6 +49,15 @@ export interface LoaderOptions {
     tableName?: string;
     /** Schema name (default: dbo). */
     schemaName?: string;
+    /**
+     * Storage type for the resources table `json` column. One of `NVARCHAR(MAX)`
+     * (default) or `JSON`. Matching is case-insensitive and tolerant of
+     * surrounding whitespace. `JSON` selects SQL Server 2025's native JSON type
+     * and requires SQL Server 2025 or later; when omitted the column is created as
+     * `NVARCHAR(MAX)`, exactly as in earlier releases. The value is validated
+     * against the allowlist before any database connection is opened.
+     */
+    resourceJsonDataType?: string;
     /** Create table if it doesn't exist. */
     createTable?: boolean;
     /** Truncate table before loading. */

package/dist/loader/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/loader/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/loader/types.ts"],"names":[],"mappings":"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"}

package/dist/parser.d.ts

@@ -8,7 +8,7 @@ export declare class ViewDefinitionParser {
      */
     static parseViewDefinition(json: string | object): ViewDefinition;
     /**
-     * Parse a test suite from the sql-on-fhir-v2 format.
+     * Parse a test suite from the SQL on FHIR test format.
      */
     static parseTestSuite(json: string | object): TestSuite;
     /**

package/dist/parser.js

@@ -16,7 +16,7 @@ class ViewDefinitionParser {
         throw new Error("Invalid ViewDefinition structure.");
     }
     /**
-     * Parse a test suite from the sql-on-fhir-v2 format.
+     * Parse a test suite from the SQL on FHIR test format.
      */
     static parseTestSuite(json) {
         const data = typeof json === "string" ? JSON.parse(json) : json;

package/dist/queryGenerator/treeWalker/compile.js

@@ -65,7 +65,6 @@ function buildRootContext(resourceAlias, transpilerCtx) {
         source: `${resourceAlias}.json`,
         partitionKeys: [idKey],
         ancestorApplies: "",
-        nullable: false,
         cteCounter: { value: 0 },
         transpilerCtx,
     };

package/dist/queryGenerator/treeWalker/compile.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/compile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/compile.ts"],"names":[],"mappings":"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"}

package/dist/queryGenerator/treeWalker/cteTemplates.d.ts

@@ -9,8 +9,10 @@
  * If a JSON object key contains a literal `.`, two distinct nodes could
  * theoretically produce equal `__path` strings. FHIR JSON keys do not
  * contain dots in practice; not a blocker.
+ *
+ * @author John Grimes
  */
-import type { CteDefinition, PartitionKey } from "./types.js";
+import { type CteDefinition, type PartitionKey } from "./types.js";
 export interface BuildRepeatCteArgs {
     cteAlias: string;
     /** FHIRPath strings — first is the anchor path; all are recursive paths. */
@@ -47,4 +49,10 @@ export interface BuildRepeatCteArgs {
  *   `alias AS (...)` wrapper, which `renderRoot` adds).
  */
 export declare function buildRepeatCte(args: BuildRepeatCteArgs): CteDefinition;
+/**
+ * Renders the partition keys as a comma-separated list of bracket-quoted
+ * columns qualified by `alias` (e.g. `cte.[id], cte.[fe_0_key]`). Shared by the
+ * recursive-member projection and the repeat `%rowIndex` window's PARTITION BY.
+ */
+export declare function qualifiedKeyCols(alias: string, keys: PartitionKey[]): string;
 //# sourceMappingURL=cteTemplates.d.ts.map

package/dist/queryGenerator/treeWalker/cteTemplates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cteTemplates.d.ts","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/cteTemplates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO9D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,UAAU,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,eAAe,EAAE,MAAM,CAAC;IACxB,sEAAsE;IACtE,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,oEAAoE;IACpE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,aAAa,CAOtE"}
+{"version":3,"file":"cteTemplates.d.ts","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/cteTemplates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EAGlB,MAAM,YAAY,CAAC;AAOpB,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,UAAU,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,eAAe,EAAE,MAAM,CAAC;IACxB,sEAAsE;IACtE,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,oEAAoE;IACpE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,aAAa,CAOtE;AAqED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAE5E"}

package/dist/queryGenerator/treeWalker/cteTemplates.js

@@ -10,9 +10,13 @@
  * If a JSON object key contains a literal `.`, two distinct nodes could
  * theoretically produce equal `__path` strings. FHIR JSON keys do not
  * contain dots in practice; not a blocker.
+ *
+ * @author John Grimes
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildRepeatCte = buildRepeatCte;
+exports.qualifiedKeyCols = qualifiedKeyCols;
+const types_js_1 = require("./types.js");
 /**
  * Builds the SQL body of the recursive CTE used by the Repeat operator.
  *
@@ -50,7 +54,8 @@ function buildAnchorMember(args) {
     const wherePart = resourcePredicate ? `\n  ${resourcePredicate}` : "";
     return `  SELECT
     ${projLines},
-    CAST(${chain.lastAlias}.[key] AS NVARCHAR(MAX)) AS __path,
+    CAST(${chain.lastAlias}.[key] AS ${types_js_1.SQL_NVARCHAR_MAX}) AS __path,
+    CAST(${orderSegment(chain.lastAlias)} AS ${types_js_1.SQL_NVARCHAR_MAX}) AS __order,
     ${chain.lastAlias}.value AS item_json,
     0 AS depth
   ${fromClause}${ancestorApplies}
@@ -58,16 +63,47 @@ function buildAnchorMember(args) {
 }
 function buildRecursiveMember(args, path, index) {
     const { cteAlias, partitionKeys } = args;
-    const head = partitionKeys.map((k) => `cte.[${k.name}]`).join(", ");
+    const head = qualifiedKeyCols("cte", partitionKeys);
     const chain = buildOpenJsonChain("cte.item_json", path, `child_${index}`);
     return `  SELECT
     ${head},
-    cte.__path + '.' + CAST(${chain.lastAlias}.[key] AS NVARCHAR(4000)) AS __path,
+    cte.__path + '.' + CAST(${chain.lastAlias}.[key] AS ${types_js_1.SQL_NVARCHAR_4000}) AS __path,
+    cte.__order + '.' + ${orderSegment(chain.lastAlias)} AS __order,
     ${chain.lastAlias}.value AS item_json,
     cte.depth + 1
   FROM ${cteAlias} AS cte
   ${chain.applyClauses}`;
 }
+/**
+ * Width, in characters, that each `__order` segment is zero-padded to. A level
+ * with up to 10^ORDER_SEGMENT_WIDTH elements still sorts correctly; ten digits
+ * assume no single level exceeds 10^10 elements.
+ */
+const ORDER_SEGMENT_WIDTH = 10;
+/**
+ * Builds one segment of the `__order` accumulator: the element's `[key]`
+ * zero-padded to a fixed width so that lexical ordering of the `.`-joined
+ * order string is equivalent to numeric depth-first (pre-order) traversal.
+ * Without padding, lexical order would break once a level has ten or more
+ * elements (e.g. `"10" < "2"`). This is what `%rowIndex` orders by inside a
+ * `repeat`.
+ *
+ * `__order` is emitted by every repeat CTE unconditionally: the walker builds
+ * the CTE before descending into the inner subtree, so whether `%rowIndex` is
+ * actually referenced is not yet known when the column list is generated.
+ */
+function orderSegment(alias) {
+    const pad = "0".repeat(ORDER_SEGMENT_WIDTH);
+    return `RIGHT('${pad}' + CAST(${alias}.[key] AS NVARCHAR(${ORDER_SEGMENT_WIDTH})), ${ORDER_SEGMENT_WIDTH})`;
+}
+/**
+ * Renders the partition keys as a comma-separated list of bracket-quoted
+ * columns qualified by `alias` (e.g. `cte.[id], cte.[fe_0_key]`). Shared by the
+ * recursive-member projection and the repeat `%rowIndex` window's PARTITION BY.
+ */
+function qualifiedKeyCols(alias, keys) {
+    return keys.map((k) => `${alias}.[${k.name}]`).join(", ");
+}
 /**
  * Builds the CROSS APPLY OPENJSON chain for a (possibly multi-segment) path.
  * For "a.b.c" produces three chained APPLYs; the last alias is `finalAlias`.

package/dist/queryGenerator/treeWalker/cteTemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"cteTemplates.js","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/cteTemplates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cteTemplates.js","sourceRoot":"","sources":["../../../src/queryGenerator/treeWalker/cteTemplates.ts"],"names":[],"mappings":"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"}

package/dist/queryGenerator/treeWalker/operators/forEach.d.ts

@@ -8,6 +8,8 @@
  *
  * Path-handling parity is delegated to PathParser (`.where()`, `.first()`,
  * array indexing, multi-segment array flattening).
+ *
+ * @author John Grimes
  */
 import type { ViewDefinitionSelect } from "../../../types.js";
 import type { PathParser } from "../../PathParser.js";
@@ -32,8 +34,8 @@ interface ForEachDeps {
  * @param node - The ForEach or ForEachOrNull select node.  `node.forEach` or
  *   `node.forEachOrNull` supplies the FHIRPath expression to iterate.
  * @param ctx - The current walker context; the inner context is derived from
- *   it by updating `source`, `partitionKeys`, `ancestorApplies`, `nullable`,
- *   and `transpilerCtx`.
+ *   it by updating `source`, `partitionKeys`, `ancestorApplies`, and
+ *   `transpilerCtx`.
  * @param walk - The recursive walk function used to visit the inner sub-tree.
  * @param deps - Dependencies containing the `PathParser` used to parse and
  *   decompose the FHIRPath expression.