@xapi-js/core 1.6.0 → 1.6.1

package/dist/index.cjs

@@ -14,11 +14,16 @@ const rowType = [
 const columnType = [
 	"STRING",
 	"INT",
+	"LONG",
 	"FLOAT",
+	"DOUBLE",
 	"DECIMAL",
 	"BIGDECIMAL",
+	"BIG_DECIMAL",
+	"BOOLEAN",
 	"DATE",
 	"DATETIME",
+	"DATE_TIME",
 	"TIME",
 	"BLOB"
 ];
@@ -368,8 +373,23 @@ function uint8ArrayToBase64(uint8Array) {
 * @param value - The string to convert.
 * @returns A Date object if the string is a valid date/time, otherwise undefined.
 */
-function stringToDate(value) {
+function stringToDate(value, type) {
 	if (!value) return void 0;
+	const normalizedType = type ? normalizeColumnType(type) : void 0;
+	if (normalizedType === "TIME") {
+		if (value.length !== 6 && value.length !== 9) return void 0;
+		const hours = parseInt(value.substring(0, 2), 10);
+		const minutes = parseInt(value.substring(2, 4), 10);
+		const seconds = parseInt(value.substring(4, 6), 10);
+		const milliseconds = value.length === 9 ? parseInt(value.substring(6, 9), 10) : 0;
+		if ([
+			hours,
+			minutes,
+			seconds,
+			milliseconds
+		].some(Number.isNaN) || hours > 23 || minutes > 59 || seconds > 59 || milliseconds > 999) return void 0;
+		return new Date(1970, 0, 1, hours, minutes, seconds, milliseconds);
+	}
 	let year;
 	let month;
 	let day;
@@ -377,7 +397,7 @@ function stringToDate(value) {
 	let minutes = 0;
 	let seconds = 0;
 	let milliseconds = 0;
-	if (value.length < 6 || value.length > 16) return;
+	if (value.length < 6 || value.length > (normalizedType ? 17 : 16)) return;
 	if (value.length >= 8) {
 		year = parseInt(value.substring(0, 4), 10);
 		month = parseInt(value.substring(4, 6), 10) - 1;
@@ -396,7 +416,10 @@ function stringToDate(value) {
 		minutes = parseInt(value.substring(10, 12), 10);
 		seconds = parseInt(value.substring(12, 14), 10);
 	}
-	if (value.length === 16) milliseconds = parseInt(value.substring(14, 16), 10);
+	if (value.length === 16 || value.length === 17) {
+		milliseconds = parseInt(value.substring(14, value.length), 10);
+		if (value.length === 16 && normalizedType) milliseconds *= 10;
+	}
 	if (year < 1970 || year > 9999 || month < 0 || month > 11 || day < 1 || day > 31 || hours < 0 || hours > 23 || minutes < 0 || minutes > 59 || seconds < 0 || seconds > 59 || milliseconds < 0 || milliseconds > 999) return;
 	const date = new Date(year, month, day, hours, minutes, seconds, milliseconds);
 	if (isNaN(date.getTime())) return;
@@ -415,10 +438,10 @@ function dateToString(date, type) {
 	const hours = date.getHours().toString().padStart(2, "0");
 	const minutes = date.getMinutes().toString().padStart(2, "0");
 	const seconds = date.getSeconds().toString().padStart(2, "0");
-	switch (type) {
+	switch (normalizeColumnType(type)) {
 		case "DATE": return `${year}${month}${day}`;
-		case "DATETIME": return `${year}${month}${day}${hours}${minutes}${seconds}`;
-		case "TIME": return `${hours}${minutes}${seconds}`;
+		case "DATETIME": return `${year}${month}${day}${hours}${minutes}${seconds}${date.getMilliseconds() ? date.getMilliseconds().toString().padStart(3, "0") : ""}`;
+		case "TIME": return `${hours}${minutes}${seconds}${date.getMilliseconds() ? date.getMilliseconds().toString().padStart(3, "0") : ""}`;
 		default: return "";
 	}
 }
@@ -466,12 +489,16 @@ function stringToReadableStream(str) {
 * @throws {ColumnTypeError} if the column type is unsupported.
 */
 function convertToColumnType(value, type) {
-	switch (type) {
+	const normalizedType = normalizeColumnType(type);
+	switch (normalizeColumnType(type)) {
 		case "INT":
 			const intValue = parseInt(value, 10);
 			return isNaN(intValue) ? value : intValue;
 		case "FLOAT":
+		case "DOUBLE":
+		case "LONG":
 		case "BIGDECIMAL":
+		case "BIG_DECIMAL":
 			const floatValue = parseFloat(value);
 			return isNaN(floatValue) ? value : floatValue;
 		case "DECIMAL":
@@ -479,14 +506,29 @@ function convertToColumnType(value, type) {
 			return isNaN(decimalValue) ? value : decimalValue;
 		case "DATE":
 		case "DATETIME":
-		case "TIME": return stringToDate(value) || value;
+		case "DATE_TIME":
+		case "TIME": return stringToDate(value, normalizedType) || value;
+		case "BOOLEAN":
+			if (value === "true" || value === "1" || value === 1 || value === true) return true;
+			if (value === "false" || value === "0" || value === 0 || value === false) return false;
+			return value;
 		case "BLOB": try {
 			return base64ToUint8Array(value);
 		} catch {
 			return value;
 		}
 		case "STRING": return value;
-		default: throw new ColumnTypeError(`Unsupported column type: ${type}`);
+		default: throw new ColumnTypeError(`Unsupported column type: ${normalizedType}`);
+	}
+}
+/** Normalizes X-API/Java type spellings to the names used by Dataset XML. */
+function normalizeColumnType(type) {
+	const normalized = type?.replace(/[- ]/g, "_").toUpperCase();
+	switch (normalized) {
+		case "DATE_TIME": return "DATETIME";
+		case "BIG_DECIMAL": return "BIGDECIMAL";
+		case "BOOL": return "BOOLEAN";
+		default: return normalized || "STRING";
 	}
 }
 /**
@@ -498,12 +540,17 @@ function convertToColumnType(value, type) {
 function convertToString(value, type) {
 	switch (type) {
 		case "INT":
+		case "LONG":
 		case "BIGDECIMAL":
+		case "BIG_DECIMAL":
 		case "FLOAT":
+		case "DOUBLE":
 		case "DECIMAL": return String(value);
+		case "BOOLEAN": return value ? "true" : "false";
 		case "DATE":
 		case "DATETIME":
-		case "TIME": return dateToString(value, type);
+		case "DATE_TIME":
+		case "TIME": return dateToString(value, normalizeColumnType(type));
 		case "BLOB": return uint8ArrayToBase64(value);
 		case "STRING": return String(value);
 		default: return String(value);
@@ -928,8 +975,9 @@ function parseColumnInfo(columnInfoElement, dataset) {
 				dataset.addConstColumn({
 					id: attrs?.id,
 					size: sizeStr ? parseInt(sizeStr, 10) : 0,
-					type: attrs?.type || "STRING",
-					value: parseValue(attrs?.value, attrs?.type)
+					type: normalizeColumnType(attrs?.type),
+					value: parseValue(attrs?.value, attrs?.type),
+					rawValue: attrs?.value
 				});
 			} else if (tagName === "Column") {
 				const attrs = colInfo.attributes;
@@ -937,7 +985,7 @@ function parseColumnInfo(columnInfoElement, dataset) {
 				dataset.addColumn({
 					id: attrs?.id,
 					size: sizeStr ? parseInt(sizeStr, 10) : 0,
-					type: attrs?.type || "STRING"
+					type: normalizeColumnType(attrs?.type)
 				});
 			}
 		}
@@ -967,7 +1015,8 @@ function parseRows(rowsElement, dataset) {
 							const castedValue = parseValue(value, columnInfo.type);
 							currentRow.cols.push({
 								id: colId,
-								value: castedValue
+								value: castedValue,
+								rawValue: value
 							});
 						} else if (colTagName === "OrgRow") {
 							const orgRow = [];
@@ -981,7 +1030,8 @@ function parseRows(rowsElement, dataset) {
 									const castedValue = parseValue(value, dataset.getColumnInfo(colId).type);
 									orgRow.push({
 										id: colId,
-										value: castedValue
+										value: castedValue,
+										rawValue: value
 									});
 								}
 							}
@@ -1005,8 +1055,9 @@ function parseParameters(parametersElement, xapiRoot) {
 			const value = p.children?.[0] ?? attrs?.value;
 			xapiRoot.addParameter({
 				id,
-				type,
-				value: parseValue(value, type)
+				type: normalizeColumnType(type),
+				value: parseValue(value, type),
+				rawValue: value
 			});
 		}
 	}
@@ -1031,7 +1082,7 @@ function writeParameters(builder, parameters) {
 	builder.writeStartElement("Parameters");
 	for (const parameter of parameters) {
 		const attrs = { id: parameter.id };
-		if (parameter.type !== void 0) attrs.type = parameter.type;
+		if (parameter.type !== void 0) attrs.type = normalizeColumnType(parameter.type);
 		if (parameter.value !== void 0) if (typeof parameter.value === "string") attrs.value = parameter.value;
 		else if (parameter.value instanceof Date) attrs.value = dateToString(parameter.value, parameter.type);
 		else if (parameter.value instanceof Uint8Array) attrs.value = uint8ArrayToBase64(parameter.value);
@@ -1047,13 +1098,13 @@ function writeDataset(builder, dataset) {
 		for (const constCol of dataset.getConstColumns()) builder.writeStartElement("ConstColumn", {
 			id: constCol.id,
 			size: String(constCol.size),
-			type: constCol.type,
+			type: normalizeColumnType(constCol.type),
 			value: constCol.value !== void 0 ? String(constCol.value) : ""
 		}, true);
 		for (const col of dataset.getColumns()) builder.writeStartElement("Column", {
 			id: col.id,
 			size: String(col.size),
-			type: col.type
+			type: normalizeColumnType(col.type)
 		}, true);
 		builder.writeEndElement("ColumnInfo");
 	}
@@ -1080,14 +1131,30 @@ function writeColumn(builder, dataset, col) {
 }
 //#endregion
 //#region src/schema.ts
+const schemaCache = /* @__PURE__ */ new WeakMap();
+function compileSchema(schema) {
+	const cached = schemaCache.get(schema);
+	if (cached) return cached;
+	const compiled = {
+		parameters: new Map(Object.entries(schema.parameters)),
+		datasets: new Map(Object.entries(schema.datasets).map(([id, dataset]) => [id, { columns: new Map(Object.entries(dataset.columns)) }]))
+	};
+	schemaCache.set(schema, compiled);
+	return compiled;
+}
 const defaultSizes = {
 	STRING: 256,
 	INT: 10,
+	LONG: 19,
 	FLOAT: 20,
+	DOUBLE: 20,
 	DECIMAL: 20,
 	BIGDECIMAL: 30,
+	BIG_DECIMAL: 30,
+	BOOLEAN: 5,
 	DATE: 8,
 	DATETIME: 17,
+	DATE_TIME: 17,
 	TIME: 6,
 	BLOB: 1e3
 };
@@ -1121,11 +1188,16 @@ function defineOperation(definition) {
 const xapi = {
 	string: (options) => column("STRING", options),
 	int: (options) => column("INT", options),
+	long: (options) => column("LONG", options),
 	float: (options) => column("FLOAT", options),
+	double: (options) => column("DOUBLE", options),
 	decimal: (options) => column("DECIMAL", options),
 	bigdecimal: (options) => column("BIGDECIMAL", options),
+	bigDecimal: (options) => column("BIG_DECIMAL", options),
+	boolean: (options) => column("BOOLEAN", options),
 	date: (options) => column("DATE", options),
 	datetime: (options) => column("DATETIME", options),
+	dateTime: (options) => column("DATE_TIME", options),
 	time: (options) => column("TIME", options),
 	blob: (options) => column("BLOB", options),
 	dataset: defineDataset,
@@ -1134,7 +1206,8 @@ const xapi = {
 };
 function encodeRoot(schema, value) {
 	const root = new XapiRoot();
-	for (const [id, parameterSchema] of Object.entries(schema.parameters)) {
+	const compiled = compileSchema(schema);
+	for (const [id, parameterSchema] of compiled.parameters) {
 		const parameterValue = value.parameters[id];
 		if (parameterValue !== void 0 || !parameterSchema.optional) root.addParameter({
 			id,
@@ -1142,18 +1215,19 @@ function encodeRoot(schema, value) {
 			value: parameterValue
 		});
 	}
-	for (const [datasetId, datasetSchema] of Object.entries(schema.datasets)) {
+	for (const [datasetId, datasetDefinition] of compiled.datasets) {
 		const dataset = new Dataset(datasetId);
-		for (const [id, columnSchema] of Object.entries(datasetSchema.columns)) dataset.addColumn({
+		for (const [id, columnSchema] of datasetDefinition.columns) dataset.addColumn({
 			id,
 			type: columnSchema.type,
 			size: columnSchema.size
 		});
 		const rows = value.datasets[datasetId];
+		const columnIds = [...datasetDefinition.columns.keys()];
 		for (const row of rows) {
 			const rowIndex = dataset.newRow();
 			dataset.rows[rowIndex].type = row.$rowType;
-			for (const id of Object.keys(datasetSchema.columns)) dataset.setColumn(rowIndex, id, row[id]);
+			for (const id of columnIds) dataset.setColumn(rowIndex, id, row[id]);
 			if (row.$orgRow) dataset.rows[rowIndex].orgRow = Object.entries(row.$orgRow).map(([id, value]) => ({
 				id,
 				value
@@ -1164,13 +1238,16 @@ function encodeRoot(schema, value) {
 	return root;
 }
 function decodeRoot(schema, root) {
+	const compiled = compileSchema(schema);
 	const parameters = {};
-	for (const id of Object.keys(schema.parameters)) {
-		const value = root.getParameter(id)?.value;
-		if (value !== void 0) parameters[id] = value;
+	for (const [id, parameterSchema] of compiled.parameters) {
+		const parameter = root.getParameter(id);
+		const value = parameter?.rawValue !== void 0 ? parameter.rawValue : parameter?.value;
+		if (value !== void 0) parameters[id] = convertToColumnType(value, parameterSchema.type);
 	}
 	const datasets = {};
-	for (const [datasetId, datasetSchema] of Object.entries(schema.datasets)) {
+	for (const [datasetId, datasetDefinition] of compiled.datasets) {
+		const schemaColumns = datasetDefinition.columns;
 		const dataset = root.getDataset(datasetId);
 		if (!dataset) {
 			datasets[datasetId] = [];
@@ -1179,9 +1256,20 @@ function decodeRoot(schema, root) {
 		const constants = Object.fromEntries(dataset.getConstColumns().map(({ id, value }) => [id, value]));
 		datasets[datasetId] = dataset.getRows().map((row) => {
 			const value = { ...constants };
-			for (const column of row.cols) if (column.id in datasetSchema.columns) value[column.id] = column.value;
+			for (const column of row.cols) {
+				const columnSchema = schemaColumns.get(column.id);
+				if (columnSchema) {
+					const rawValue = column.rawValue !== void 0 ? column.rawValue : column.value;
+					value[column.id] = rawValue === void 0 ? void 0 : convertToColumnType(rawValue, columnSchema.type);
+				}
+			}
 			if (row.type) value.$rowType = row.type;
-			if (row.orgRow) value.$orgRow = Object.fromEntries(row.orgRow.map((column) => [column.id, column.value]));
+			if (row.orgRow) value.$orgRow = Object.fromEntries(row.orgRow.flatMap((column) => {
+				const columnSchema = schemaColumns.get(column.id);
+				if (!columnSchema) return [];
+				const rawValue = column.rawValue !== void 0 ? column.rawValue : column.value;
+				return [[column.id, rawValue === void 0 ? void 0 : convertToColumnType(rawValue, columnSchema.type)]];
+			}));
 			return value;
 		});
 	}
@@ -1205,9 +1293,10 @@ function sizeOf(size, type) {
 }
 function jsonValue(value, type) {
 	if (value === null || value === void 0) return void 0;
-	if (type === "DATE" || type === "DATETIME" || type === "TIME") return typeof value === "string" ? convertToColumnType(value, type) : value;
-	if (type === "BLOB" && typeof value === "string") return convertToColumnType(value, type);
-	return value;
+	return convertToColumnType(typeof value === "string" ? value : String(value), normalizeColumnType(type));
+}
+function jsonRawValue(value) {
+	return value === null || value === void 0 ? void 0 : String(value);
 }
 function jsonWireValue(value, type) {
 	if (value === void 0) return void 0;
@@ -1225,7 +1314,8 @@ function readRow(dataset, row) {
 		if (previous?.type !== "update") return;
 		previous.orgRow = dataset.getColumns().filter((column) => Object.prototype.hasOwnProperty.call(row, column.id)).map((column) => ({
 			id: column.id,
-			value: jsonValue(row[column.id], column.type)
+			value: jsonValue(row[column.id], column.type),
+			rawValue: jsonRawValue(row[column.id])
 		}));
 		return;
 	}
@@ -1233,29 +1323,35 @@ function readRow(dataset, row) {
 	dataset.rows[index].type = rowType;
 	for (const column of dataset.getColumns()) if (Object.prototype.hasOwnProperty.call(row, column.id)) dataset.rows[index].cols.push({
 		id: column.id,
-		value: jsonValue(row[column.id], column.type)
+		value: jsonValue(row[column.id], column.type),
+		rawValue: jsonRawValue(row[column.id])
 	});
 }
 function readJson(value) {
 	const root = new XapiRoot();
-	for (const parameter of value.Parameters ?? []) root.addParameter({
-		id: parameter.id,
-		type: parameter.type,
-		value: jsonValue(parameter.value, parameter.type)
-	});
+	for (const parameter of value.Parameters ?? []) {
+		const type = normalizeColumnType(parameter.type);
+		root.addParameter({
+			id: parameter.id,
+			type,
+			value: jsonValue(parameter.value, type),
+			rawValue: jsonRawValue(parameter.value)
+		});
+	}
 	for (const source of value.Datasets ?? []) {
 		const dataset = new Dataset(source.id);
 		for (const column of source.ColumnInfo.ConstColumn ?? []) {
-			const type = column.type ?? "STRING";
+			const type = normalizeColumnType(column.type);
 			dataset.addConstColumn({
 				id: column.id,
 				type,
 				size: sizeOf(column.size, type),
-				value: jsonValue(column.value, type)
+				value: jsonValue(column.value, type),
+				rawValue: jsonRawValue(column.value)
 			});
 		}
 		for (const column of source.ColumnInfo.Column) {
-			const type = column.type ?? "STRING";
+			const type = normalizeColumnType(column.type);
 			dataset.addColumn({
 				id: column.id,
 				type,
@@ -1341,6 +1437,7 @@ exports.initXapi = initXapi;
 exports.isXapiRoot = isXapiRoot;
 exports.makeParseEntities = makeParseEntities;
 exports.nexacroJsonCodec = nexacroJsonCodec;
+exports.normalizeColumnType = normalizeColumnType;
 exports.parse = parse;
 exports.parseJson = parseJson;
 exports.parseXml = parseXml;

package/dist/index.d.cts

@@ -2,7 +2,7 @@
 /**
  * Represents the possible data types for X-API values.
  */
-type XapiValueType = string | number | Uint8Array | Date | undefined;
+type XapiValueType = string | number | boolean | Uint8Array | Date | undefined;
 /**
  * Represents a column within a row of an X-API dataset.
  */
@@ -11,6 +11,8 @@ interface Col {
   id: string;
   /** The value of the column. */
   value?: XapiValueType;
+  /** Original wire value. XML and SSV values are strings before schema conversion. */
+  rawValue?: string;
 }
 /**
  * Defines the possible types of rows in an X-API dataset (e.g., "insert", "update", "delete").
@@ -41,7 +43,7 @@ interface Rows {
 /**
  * Defines the possible data types for columns in an X-API dataset.
  */
-declare const columnType: readonly ["STRING", "INT", "FLOAT", "DECIMAL", "BIGDECIMAL", "DATE", "DATETIME", "TIME", "BLOB"];
+declare const columnType: readonly ["STRING", "INT", "LONG", "FLOAT", "DOUBLE", "DECIMAL", "BIGDECIMAL", "BIG_DECIMAL", "BOOLEAN", "DATE", "DATETIME", "DATE_TIME", "TIME", "BLOB"];
 /**
  * Type representing the data type of a column.
  */
@@ -62,6 +64,7 @@ interface Column {
  */
 type ConstColumn = Column & {
   value: XapiValueType;
+  rawValue?: string;
 };
 /**
  * Represents the column information section of an X-API dataset.
@@ -82,6 +85,8 @@ interface Parameter {
   type?: ColumnType;
   /** The value of the parameter. */
   value?: XapiValueType;
+  /** Original wire value before conversion. */
+  rawValue?: string;
 }
 /**
  * Represents a collection of parameters in an X-API request/response.
@@ -366,14 +371,14 @@ declare function uint8ArrayToBase64(uint8Array: Uint8Array): string;
  * @param value - The string to convert.
  * @returns A Date object if the string is a valid date/time, otherwise undefined.
  */
-declare function stringToDate(value: string): Date | undefined;
+declare function stringToDate(value: string, type?: ColumnType): Date | undefined;
 /**
  * Converts a Date object to a string representation based on the specified column type.
  * @param date - The Date object to convert.
  * @param type - The column type ("DATE", "DATETIME", or "TIME").
  * @returns A string representation of the date/time.
  */
-declare function dateToString(date: Date, type: Extract<ColumnType, "DATE" | "DATETIME" | "TIME">): string;
+declare function dateToString(date: Date, type: Extract<ColumnType, "DATE" | "DATETIME" | "DATE_TIME" | "TIME">): string;
 /**
  * A WritableStream that collects all written Uint8Array chunks and provides them as a single string.
  */
@@ -400,6 +405,8 @@ declare function stringToReadableStream(str: string): ReadableStream<Uint8Array>
  * @throws {ColumnTypeError} if the column type is unsupported.
  */
 declare function convertToColumnType(value: XapiValueType, type: ColumnType): XapiValueType;
+/** Normalizes X-API/Java type spellings to the names used by Dataset XML. */
+declare function normalizeColumnType(type?: string): ColumnType;
 /**
  * Converts an XapiValueType to its string representation based on the specified ColumnType.
  * @param value - The value to convert.
@@ -473,11 +480,16 @@ declare function parseXml(xml: string): XmlNode[];
 type XapiTypeMap = {
   STRING: string;
   INT: number;
+  LONG: number;
   FLOAT: number;
+  DOUBLE: number;
   DECIMAL: number;
   BIGDECIMAL: number;
+  BIG_DECIMAL: number;
+  BOOLEAN: boolean;
   DATE: Date;
   DATETIME: Date;
+  DATE_TIME: Date;
   TIME: Date;
   BLOB: Uint8Array;
 };
@@ -537,11 +549,16 @@ declare function defineOperation<const Request extends XapiRootSchema, const Res
 declare const xapi: {
   readonly string: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"STRING", Optional>;
   readonly int: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"INT", Optional>;
+  readonly long: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"LONG", Optional>;
   readonly float: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"FLOAT", Optional>;
+  readonly double: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DOUBLE", Optional>;
   readonly decimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DECIMAL", Optional>;
   readonly bigdecimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BIGDECIMAL", Optional>;
+  readonly bigDecimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BIG_DECIMAL", Optional>;
+  readonly boolean: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BOOLEAN", Optional>;
   readonly date: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATE", Optional>;
   readonly datetime: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATETIME", Optional>;
+  readonly dateTime: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATE_TIME", Optional>;
   readonly time: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"TIME", Optional>;
   readonly blob: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BLOB", Optional>;
   readonly dataset: typeof defineDataset;
@@ -556,13 +573,13 @@ declare function decodeRoot<Schema extends XapiRootSchema>(schema: Schema, root:
 interface NexacroJsonParameter {
   id: string;
   type?: ColumnType;
-  value?: string | number;
+  value?: string | number | boolean;
 }
 interface NexacroJsonColumn {
   id: string;
   type?: ColumnType;
   size?: number | string;
-  value?: string | number;
+  value?: string | number | boolean;
 }
 interface NexacroJsonRow {
   _RowType_?: "N" | "I" | "U" | "D" | "O";
@@ -590,4 +607,4 @@ declare const nexacroJsonCodec: XapiCodec<NexacroJsonRoot>;
 declare function parseJson(value: string): XapiRoot;
 declare function writeJsonString(root: XapiRoot): string;
 //#endregion
-export { Col, Column, ColumnInfo, ColumnType, ColumnTypeError, ConstColumn, Dataset, InferColumns, InferDataset, InferDatasetRow, InferRoot, InvalidXmlError, NexaVersion, NexacroJsonColumn, NexacroJsonDataset, NexacroJsonParameter, NexacroJsonRoot, NexacroJsonRow, Parameter, RequestOf, ResponseOf, Row, RowType, Rows, StringWritableStream, XapiCodec, XapiColumnSchema, XapiColumns, XapiDatasetSchema, XapiDatasets, XapiOperation, XapiOptions, XapiParameters, XapiRoot, XapiRootSchema, XapiTypeMap, XapiValueType, XapiVersion, XmlNode, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };
+export { Col, Column, ColumnInfo, ColumnType, ColumnTypeError, ConstColumn, Dataset, InferColumns, InferDataset, InferDatasetRow, InferRoot, InvalidXmlError, NexaVersion, NexacroJsonColumn, NexacroJsonDataset, NexacroJsonParameter, NexacroJsonRoot, NexacroJsonRow, Parameter, RequestOf, ResponseOf, Row, RowType, Rows, StringWritableStream, XapiCodec, XapiColumnSchema, XapiColumns, XapiDatasetSchema, XapiDatasets, XapiOperation, XapiOptions, XapiParameters, XapiRoot, XapiRootSchema, XapiTypeMap, XapiValueType, XapiVersion, XmlNode, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, normalizeColumnType, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 /**
  * Represents the possible data types for X-API values.
  */
-type XapiValueType = string | number | Uint8Array | Date | undefined;
+type XapiValueType = string | number | boolean | Uint8Array | Date | undefined;
 /**
  * Represents a column within a row of an X-API dataset.
  */
@@ -11,6 +11,8 @@ interface Col {
   id: string;
   /** The value of the column. */
   value?: XapiValueType;
+  /** Original wire value. XML and SSV values are strings before schema conversion. */
+  rawValue?: string;
 }
 /**
  * Defines the possible types of rows in an X-API dataset (e.g., "insert", "update", "delete").
@@ -41,7 +43,7 @@ interface Rows {
 /**
  * Defines the possible data types for columns in an X-API dataset.
  */
-declare const columnType: readonly ["STRING", "INT", "FLOAT", "DECIMAL", "BIGDECIMAL", "DATE", "DATETIME", "TIME", "BLOB"];
+declare const columnType: readonly ["STRING", "INT", "LONG", "FLOAT", "DOUBLE", "DECIMAL", "BIGDECIMAL", "BIG_DECIMAL", "BOOLEAN", "DATE", "DATETIME", "DATE_TIME", "TIME", "BLOB"];
 /**
  * Type representing the data type of a column.
  */
@@ -62,6 +64,7 @@ interface Column {
  */
 type ConstColumn = Column & {
   value: XapiValueType;
+  rawValue?: string;
 };
 /**
  * Represents the column information section of an X-API dataset.
@@ -82,6 +85,8 @@ interface Parameter {
   type?: ColumnType;
   /** The value of the parameter. */
   value?: XapiValueType;
+  /** Original wire value before conversion. */
+  rawValue?: string;
 }
 /**
  * Represents a collection of parameters in an X-API request/response.
@@ -366,14 +371,14 @@ declare function uint8ArrayToBase64(uint8Array: Uint8Array): string;
  * @param value - The string to convert.
  * @returns A Date object if the string is a valid date/time, otherwise undefined.
  */
-declare function stringToDate(value: string): Date | undefined;
+declare function stringToDate(value: string, type?: ColumnType): Date | undefined;
 /**
  * Converts a Date object to a string representation based on the specified column type.
  * @param date - The Date object to convert.
  * @param type - The column type ("DATE", "DATETIME", or "TIME").
  * @returns A string representation of the date/time.
  */
-declare function dateToString(date: Date, type: Extract<ColumnType, "DATE" | "DATETIME" | "TIME">): string;
+declare function dateToString(date: Date, type: Extract<ColumnType, "DATE" | "DATETIME" | "DATE_TIME" | "TIME">): string;
 /**
  * A WritableStream that collects all written Uint8Array chunks and provides them as a single string.
  */
@@ -400,6 +405,8 @@ declare function stringToReadableStream(str: string): ReadableStream<Uint8Array>
  * @throws {ColumnTypeError} if the column type is unsupported.
  */
 declare function convertToColumnType(value: XapiValueType, type: ColumnType): XapiValueType;
+/** Normalizes X-API/Java type spellings to the names used by Dataset XML. */
+declare function normalizeColumnType(type?: string): ColumnType;
 /**
  * Converts an XapiValueType to its string representation based on the specified ColumnType.
  * @param value - The value to convert.
@@ -473,11 +480,16 @@ declare function parseXml(xml: string): XmlNode[];
 type XapiTypeMap = {
   STRING: string;
   INT: number;
+  LONG: number;
   FLOAT: number;
+  DOUBLE: number;
   DECIMAL: number;
   BIGDECIMAL: number;
+  BIG_DECIMAL: number;
+  BOOLEAN: boolean;
   DATE: Date;
   DATETIME: Date;
+  DATE_TIME: Date;
   TIME: Date;
   BLOB: Uint8Array;
 };
@@ -537,11 +549,16 @@ declare function defineOperation<const Request extends XapiRootSchema, const Res
 declare const xapi: {
   readonly string: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"STRING", Optional>;
   readonly int: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"INT", Optional>;
+  readonly long: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"LONG", Optional>;
   readonly float: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"FLOAT", Optional>;
+  readonly double: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DOUBLE", Optional>;
   readonly decimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DECIMAL", Optional>;
   readonly bigdecimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BIGDECIMAL", Optional>;
+  readonly bigDecimal: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BIG_DECIMAL", Optional>;
+  readonly boolean: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BOOLEAN", Optional>;
   readonly date: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATE", Optional>;
   readonly datetime: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATETIME", Optional>;
+  readonly dateTime: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"DATE_TIME", Optional>;
   readonly time: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"TIME", Optional>;
   readonly blob: <const Optional extends boolean = false>(options?: ColumnOptions<Optional>) => XapiColumnSchema<"BLOB", Optional>;
   readonly dataset: typeof defineDataset;
@@ -556,13 +573,13 @@ declare function decodeRoot<Schema extends XapiRootSchema>(schema: Schema, root:
 interface NexacroJsonParameter {
   id: string;
   type?: ColumnType;
-  value?: string | number;
+  value?: string | number | boolean;
 }
 interface NexacroJsonColumn {
   id: string;
   type?: ColumnType;
   size?: number | string;
-  value?: string | number;
+  value?: string | number | boolean;
 }
 interface NexacroJsonRow {
   _RowType_?: "N" | "I" | "U" | "D" | "O";
@@ -590,4 +607,4 @@ declare const nexacroJsonCodec: XapiCodec<NexacroJsonRoot>;
 declare function parseJson(value: string): XapiRoot;
 declare function writeJsonString(root: XapiRoot): string;
 //#endregion
-export { Col, Column, ColumnInfo, ColumnType, ColumnTypeError, ConstColumn, Dataset, InferColumns, InferDataset, InferDatasetRow, InferRoot, InvalidXmlError, NexaVersion, NexacroJsonColumn, NexacroJsonDataset, NexacroJsonParameter, NexacroJsonRoot, NexacroJsonRow, Parameter, RequestOf, ResponseOf, Row, RowType, Rows, StringWritableStream, XapiCodec, XapiColumnSchema, XapiColumns, XapiDatasetSchema, XapiDatasets, XapiOperation, XapiOptions, XapiParameters, XapiRoot, XapiRootSchema, XapiTypeMap, XapiValueType, XapiVersion, XmlNode, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };
+export { Col, Column, ColumnInfo, ColumnType, ColumnTypeError, ConstColumn, Dataset, InferColumns, InferDataset, InferDatasetRow, InferRoot, InvalidXmlError, NexaVersion, NexacroJsonColumn, NexacroJsonDataset, NexacroJsonParameter, NexacroJsonRoot, NexacroJsonRow, Parameter, RequestOf, ResponseOf, Row, RowType, Rows, StringWritableStream, XapiCodec, XapiColumnSchema, XapiColumns, XapiDatasetSchema, XapiDatasets, XapiOperation, XapiOptions, XapiParameters, XapiRoot, XapiRootSchema, XapiTypeMap, XapiValueType, XapiVersion, XmlNode, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, normalizeColumnType, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };

package/dist/index.js

@@ -13,11 +13,16 @@ const rowType = [
 const columnType = [
 	"STRING",
 	"INT",
+	"LONG",
 	"FLOAT",
+	"DOUBLE",
 	"DECIMAL",
 	"BIGDECIMAL",
+	"BIG_DECIMAL",
+	"BOOLEAN",
 	"DATE",
 	"DATETIME",
+	"DATE_TIME",
 	"TIME",
 	"BLOB"
 ];
@@ -367,8 +372,23 @@ function uint8ArrayToBase64(uint8Array) {
 * @param value - The string to convert.
 * @returns A Date object if the string is a valid date/time, otherwise undefined.
 */
-function stringToDate(value) {
+function stringToDate(value, type) {
 	if (!value) return void 0;
+	const normalizedType = type ? normalizeColumnType(type) : void 0;
+	if (normalizedType === "TIME") {
+		if (value.length !== 6 && value.length !== 9) return void 0;
+		const hours = parseInt(value.substring(0, 2), 10);
+		const minutes = parseInt(value.substring(2, 4), 10);
+		const seconds = parseInt(value.substring(4, 6), 10);
+		const milliseconds = value.length === 9 ? parseInt(value.substring(6, 9), 10) : 0;
+		if ([
+			hours,
+			minutes,
+			seconds,
+			milliseconds
+		].some(Number.isNaN) || hours > 23 || minutes > 59 || seconds > 59 || milliseconds > 999) return void 0;
+		return new Date(1970, 0, 1, hours, minutes, seconds, milliseconds);
+	}
 	let year;
 	let month;
 	let day;
@@ -376,7 +396,7 @@ function stringToDate(value) {
 	let minutes = 0;
 	let seconds = 0;
 	let milliseconds = 0;
-	if (value.length < 6 || value.length > 16) return;
+	if (value.length < 6 || value.length > (normalizedType ? 17 : 16)) return;
 	if (value.length >= 8) {
 		year = parseInt(value.substring(0, 4), 10);
 		month = parseInt(value.substring(4, 6), 10) - 1;
@@ -395,7 +415,10 @@ function stringToDate(value) {
 		minutes = parseInt(value.substring(10, 12), 10);
 		seconds = parseInt(value.substring(12, 14), 10);
 	}
-	if (value.length === 16) milliseconds = parseInt(value.substring(14, 16), 10);
+	if (value.length === 16 || value.length === 17) {
+		milliseconds = parseInt(value.substring(14, value.length), 10);
+		if (value.length === 16 && normalizedType) milliseconds *= 10;
+	}
 	if (year < 1970 || year > 9999 || month < 0 || month > 11 || day < 1 || day > 31 || hours < 0 || hours > 23 || minutes < 0 || minutes > 59 || seconds < 0 || seconds > 59 || milliseconds < 0 || milliseconds > 999) return;
 	const date = new Date(year, month, day, hours, minutes, seconds, milliseconds);
 	if (isNaN(date.getTime())) return;
@@ -414,10 +437,10 @@ function dateToString(date, type) {
 	const hours = date.getHours().toString().padStart(2, "0");
 	const minutes = date.getMinutes().toString().padStart(2, "0");
 	const seconds = date.getSeconds().toString().padStart(2, "0");
-	switch (type) {
+	switch (normalizeColumnType(type)) {
 		case "DATE": return `${year}${month}${day}`;
-		case "DATETIME": return `${year}${month}${day}${hours}${minutes}${seconds}`;
-		case "TIME": return `${hours}${minutes}${seconds}`;
+		case "DATETIME": return `${year}${month}${day}${hours}${minutes}${seconds}${date.getMilliseconds() ? date.getMilliseconds().toString().padStart(3, "0") : ""}`;
+		case "TIME": return `${hours}${minutes}${seconds}${date.getMilliseconds() ? date.getMilliseconds().toString().padStart(3, "0") : ""}`;
 		default: return "";
 	}
 }
@@ -465,12 +488,16 @@ function stringToReadableStream(str) {
 * @throws {ColumnTypeError} if the column type is unsupported.
 */
 function convertToColumnType(value, type) {
-	switch (type) {
+	const normalizedType = normalizeColumnType(type);
+	switch (normalizeColumnType(type)) {
 		case "INT":
 			const intValue = parseInt(value, 10);
 			return isNaN(intValue) ? value : intValue;
 		case "FLOAT":
+		case "DOUBLE":
+		case "LONG":
 		case "BIGDECIMAL":
+		case "BIG_DECIMAL":
 			const floatValue = parseFloat(value);
 			return isNaN(floatValue) ? value : floatValue;
 		case "DECIMAL":
@@ -478,14 +505,29 @@ function convertToColumnType(value, type) {
 			return isNaN(decimalValue) ? value : decimalValue;
 		case "DATE":
 		case "DATETIME":
-		case "TIME": return stringToDate(value) || value;
+		case "DATE_TIME":
+		case "TIME": return stringToDate(value, normalizedType) || value;
+		case "BOOLEAN":
+			if (value === "true" || value === "1" || value === 1 || value === true) return true;
+			if (value === "false" || value === "0" || value === 0 || value === false) return false;
+			return value;
 		case "BLOB": try {
 			return base64ToUint8Array(value);
 		} catch {
 			return value;
 		}
 		case "STRING": return value;
-		default: throw new ColumnTypeError(`Unsupported column type: ${type}`);
+		default: throw new ColumnTypeError(`Unsupported column type: ${normalizedType}`);
+	}
+}
+/** Normalizes X-API/Java type spellings to the names used by Dataset XML. */
+function normalizeColumnType(type) {
+	const normalized = type?.replace(/[- ]/g, "_").toUpperCase();
+	switch (normalized) {
+		case "DATE_TIME": return "DATETIME";
+		case "BIG_DECIMAL": return "BIGDECIMAL";
+		case "BOOL": return "BOOLEAN";
+		default: return normalized || "STRING";
 	}
 }
 /**
@@ -497,12 +539,17 @@ function convertToColumnType(value, type) {
 function convertToString(value, type) {
 	switch (type) {
 		case "INT":
+		case "LONG":
 		case "BIGDECIMAL":
+		case "BIG_DECIMAL":
 		case "FLOAT":
+		case "DOUBLE":
 		case "DECIMAL": return String(value);
+		case "BOOLEAN": return value ? "true" : "false";
 		case "DATE":
 		case "DATETIME":
-		case "TIME": return dateToString(value, type);
+		case "DATE_TIME":
+		case "TIME": return dateToString(value, normalizeColumnType(type));
 		case "BLOB": return uint8ArrayToBase64(value);
 		case "STRING": return String(value);
 		default: return String(value);
@@ -927,8 +974,9 @@ function parseColumnInfo(columnInfoElement, dataset) {
 				dataset.addConstColumn({
 					id: attrs?.id,
 					size: sizeStr ? parseInt(sizeStr, 10) : 0,
-					type: attrs?.type || "STRING",
-					value: parseValue(attrs?.value, attrs?.type)
+					type: normalizeColumnType(attrs?.type),
+					value: parseValue(attrs?.value, attrs?.type),
+					rawValue: attrs?.value
 				});
 			} else if (tagName === "Column") {
 				const attrs = colInfo.attributes;
@@ -936,7 +984,7 @@ function parseColumnInfo(columnInfoElement, dataset) {
 				dataset.addColumn({
 					id: attrs?.id,
 					size: sizeStr ? parseInt(sizeStr, 10) : 0,
-					type: attrs?.type || "STRING"
+					type: normalizeColumnType(attrs?.type)
 				});
 			}
 		}
@@ -966,7 +1014,8 @@ function parseRows(rowsElement, dataset) {
 							const castedValue = parseValue(value, columnInfo.type);
 							currentRow.cols.push({
 								id: colId,
-								value: castedValue
+								value: castedValue,
+								rawValue: value
 							});
 						} else if (colTagName === "OrgRow") {
 							const orgRow = [];
@@ -980,7 +1029,8 @@ function parseRows(rowsElement, dataset) {
 									const castedValue = parseValue(value, dataset.getColumnInfo(colId).type);
 									orgRow.push({
 										id: colId,
-										value: castedValue
+										value: castedValue,
+										rawValue: value
 									});
 								}
 							}
@@ -1004,8 +1054,9 @@ function parseParameters(parametersElement, xapiRoot) {
 			const value = p.children?.[0] ?? attrs?.value;
 			xapiRoot.addParameter({
 				id,
-				type,
-				value: parseValue(value, type)
+				type: normalizeColumnType(type),
+				value: parseValue(value, type),
+				rawValue: value
 			});
 		}
 	}
@@ -1030,7 +1081,7 @@ function writeParameters(builder, parameters) {
 	builder.writeStartElement("Parameters");
 	for (const parameter of parameters) {
 		const attrs = { id: parameter.id };
-		if (parameter.type !== void 0) attrs.type = parameter.type;
+		if (parameter.type !== void 0) attrs.type = normalizeColumnType(parameter.type);
 		if (parameter.value !== void 0) if (typeof parameter.value === "string") attrs.value = parameter.value;
 		else if (parameter.value instanceof Date) attrs.value = dateToString(parameter.value, parameter.type);
 		else if (parameter.value instanceof Uint8Array) attrs.value = uint8ArrayToBase64(parameter.value);
@@ -1046,13 +1097,13 @@ function writeDataset(builder, dataset) {
 		for (const constCol of dataset.getConstColumns()) builder.writeStartElement("ConstColumn", {
 			id: constCol.id,
 			size: String(constCol.size),
-			type: constCol.type,
+			type: normalizeColumnType(constCol.type),
 			value: constCol.value !== void 0 ? String(constCol.value) : ""
 		}, true);
 		for (const col of dataset.getColumns()) builder.writeStartElement("Column", {
 			id: col.id,
 			size: String(col.size),
-			type: col.type
+			type: normalizeColumnType(col.type)
 		}, true);
 		builder.writeEndElement("ColumnInfo");
 	}
@@ -1079,14 +1130,30 @@ function writeColumn(builder, dataset, col) {
 }
 //#endregion
 //#region src/schema.ts
+const schemaCache = /* @__PURE__ */ new WeakMap();
+function compileSchema(schema) {
+	const cached = schemaCache.get(schema);
+	if (cached) return cached;
+	const compiled = {
+		parameters: new Map(Object.entries(schema.parameters)),
+		datasets: new Map(Object.entries(schema.datasets).map(([id, dataset]) => [id, { columns: new Map(Object.entries(dataset.columns)) }]))
+	};
+	schemaCache.set(schema, compiled);
+	return compiled;
+}
 const defaultSizes = {
 	STRING: 256,
 	INT: 10,
+	LONG: 19,
 	FLOAT: 20,
+	DOUBLE: 20,
 	DECIMAL: 20,
 	BIGDECIMAL: 30,
+	BIG_DECIMAL: 30,
+	BOOLEAN: 5,
 	DATE: 8,
 	DATETIME: 17,
+	DATE_TIME: 17,
 	TIME: 6,
 	BLOB: 1e3
 };
@@ -1120,11 +1187,16 @@ function defineOperation(definition) {
 const xapi = {
 	string: (options) => column("STRING", options),
 	int: (options) => column("INT", options),
+	long: (options) => column("LONG", options),
 	float: (options) => column("FLOAT", options),
+	double: (options) => column("DOUBLE", options),
 	decimal: (options) => column("DECIMAL", options),
 	bigdecimal: (options) => column("BIGDECIMAL", options),
+	bigDecimal: (options) => column("BIG_DECIMAL", options),
+	boolean: (options) => column("BOOLEAN", options),
 	date: (options) => column("DATE", options),
 	datetime: (options) => column("DATETIME", options),
+	dateTime: (options) => column("DATE_TIME", options),
 	time: (options) => column("TIME", options),
 	blob: (options) => column("BLOB", options),
 	dataset: defineDataset,
@@ -1133,7 +1205,8 @@ const xapi = {
 };
 function encodeRoot(schema, value) {
 	const root = new XapiRoot();
-	for (const [id, parameterSchema] of Object.entries(schema.parameters)) {
+	const compiled = compileSchema(schema);
+	for (const [id, parameterSchema] of compiled.parameters) {
 		const parameterValue = value.parameters[id];
 		if (parameterValue !== void 0 || !parameterSchema.optional) root.addParameter({
 			id,
@@ -1141,18 +1214,19 @@ function encodeRoot(schema, value) {
 			value: parameterValue
 		});
 	}
-	for (const [datasetId, datasetSchema] of Object.entries(schema.datasets)) {
+	for (const [datasetId, datasetDefinition] of compiled.datasets) {
 		const dataset = new Dataset(datasetId);
-		for (const [id, columnSchema] of Object.entries(datasetSchema.columns)) dataset.addColumn({
+		for (const [id, columnSchema] of datasetDefinition.columns) dataset.addColumn({
 			id,
 			type: columnSchema.type,
 			size: columnSchema.size
 		});
 		const rows = value.datasets[datasetId];
+		const columnIds = [...datasetDefinition.columns.keys()];
 		for (const row of rows) {
 			const rowIndex = dataset.newRow();
 			dataset.rows[rowIndex].type = row.$rowType;
-			for (const id of Object.keys(datasetSchema.columns)) dataset.setColumn(rowIndex, id, row[id]);
+			for (const id of columnIds) dataset.setColumn(rowIndex, id, row[id]);
 			if (row.$orgRow) dataset.rows[rowIndex].orgRow = Object.entries(row.$orgRow).map(([id, value]) => ({
 				id,
 				value
@@ -1163,13 +1237,16 @@ function encodeRoot(schema, value) {
 	return root;
 }
 function decodeRoot(schema, root) {
+	const compiled = compileSchema(schema);
 	const parameters = {};
-	for (const id of Object.keys(schema.parameters)) {
-		const value = root.getParameter(id)?.value;
-		if (value !== void 0) parameters[id] = value;
+	for (const [id, parameterSchema] of compiled.parameters) {
+		const parameter = root.getParameter(id);
+		const value = parameter?.rawValue !== void 0 ? parameter.rawValue : parameter?.value;
+		if (value !== void 0) parameters[id] = convertToColumnType(value, parameterSchema.type);
 	}
 	const datasets = {};
-	for (const [datasetId, datasetSchema] of Object.entries(schema.datasets)) {
+	for (const [datasetId, datasetDefinition] of compiled.datasets) {
+		const schemaColumns = datasetDefinition.columns;
 		const dataset = root.getDataset(datasetId);
 		if (!dataset) {
 			datasets[datasetId] = [];
@@ -1178,9 +1255,20 @@ function decodeRoot(schema, root) {
 		const constants = Object.fromEntries(dataset.getConstColumns().map(({ id, value }) => [id, value]));
 		datasets[datasetId] = dataset.getRows().map((row) => {
 			const value = { ...constants };
-			for (const column of row.cols) if (column.id in datasetSchema.columns) value[column.id] = column.value;
+			for (const column of row.cols) {
+				const columnSchema = schemaColumns.get(column.id);
+				if (columnSchema) {
+					const rawValue = column.rawValue !== void 0 ? column.rawValue : column.value;
+					value[column.id] = rawValue === void 0 ? void 0 : convertToColumnType(rawValue, columnSchema.type);
+				}
+			}
 			if (row.type) value.$rowType = row.type;
-			if (row.orgRow) value.$orgRow = Object.fromEntries(row.orgRow.map((column) => [column.id, column.value]));
+			if (row.orgRow) value.$orgRow = Object.fromEntries(row.orgRow.flatMap((column) => {
+				const columnSchema = schemaColumns.get(column.id);
+				if (!columnSchema) return [];
+				const rawValue = column.rawValue !== void 0 ? column.rawValue : column.value;
+				return [[column.id, rawValue === void 0 ? void 0 : convertToColumnType(rawValue, columnSchema.type)]];
+			}));
 			return value;
 		});
 	}
@@ -1204,9 +1292,10 @@ function sizeOf(size, type) {
 }
 function jsonValue(value, type) {
 	if (value === null || value === void 0) return void 0;
-	if (type === "DATE" || type === "DATETIME" || type === "TIME") return typeof value === "string" ? convertToColumnType(value, type) : value;
-	if (type === "BLOB" && typeof value === "string") return convertToColumnType(value, type);
-	return value;
+	return convertToColumnType(typeof value === "string" ? value : String(value), normalizeColumnType(type));
+}
+function jsonRawValue(value) {
+	return value === null || value === void 0 ? void 0 : String(value);
 }
 function jsonWireValue(value, type) {
 	if (value === void 0) return void 0;
@@ -1224,7 +1313,8 @@ function readRow(dataset, row) {
 		if (previous?.type !== "update") return;
 		previous.orgRow = dataset.getColumns().filter((column) => Object.prototype.hasOwnProperty.call(row, column.id)).map((column) => ({
 			id: column.id,
-			value: jsonValue(row[column.id], column.type)
+			value: jsonValue(row[column.id], column.type),
+			rawValue: jsonRawValue(row[column.id])
 		}));
 		return;
 	}
@@ -1232,29 +1322,35 @@ function readRow(dataset, row) {
 	dataset.rows[index].type = rowType;
 	for (const column of dataset.getColumns()) if (Object.prototype.hasOwnProperty.call(row, column.id)) dataset.rows[index].cols.push({
 		id: column.id,
-		value: jsonValue(row[column.id], column.type)
+		value: jsonValue(row[column.id], column.type),
+		rawValue: jsonRawValue(row[column.id])
 	});
 }
 function readJson(value) {
 	const root = new XapiRoot();
-	for (const parameter of value.Parameters ?? []) root.addParameter({
-		id: parameter.id,
-		type: parameter.type,
-		value: jsonValue(parameter.value, parameter.type)
-	});
+	for (const parameter of value.Parameters ?? []) {
+		const type = normalizeColumnType(parameter.type);
+		root.addParameter({
+			id: parameter.id,
+			type,
+			value: jsonValue(parameter.value, type),
+			rawValue: jsonRawValue(parameter.value)
+		});
+	}
 	for (const source of value.Datasets ?? []) {
 		const dataset = new Dataset(source.id);
 		for (const column of source.ColumnInfo.ConstColumn ?? []) {
-			const type = column.type ?? "STRING";
+			const type = normalizeColumnType(column.type);
 			dataset.addConstColumn({
 				id: column.id,
 				type,
 				size: sizeOf(column.size, type),
-				value: jsonValue(column.value, type)
+				value: jsonValue(column.value, type),
+				rawValue: jsonRawValue(column.value)
 			});
 		}
 		for (const column of source.ColumnInfo.Column) {
-			const type = column.type ?? "STRING";
+			const type = normalizeColumnType(column.type);
 			dataset.addColumn({
 				id: column.id,
 				type,
@@ -1314,4 +1410,4 @@ function writeJsonString(root) {
 	return JSON.stringify(nexacroJsonCodec.serialize(root));
 }
 //#endregion
-export { ColumnTypeError, Dataset, InvalidXmlError, NexaVersion, StringWritableStream, XapiRoot, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };
+export { ColumnTypeError, Dataset, InvalidXmlError, NexaVersion, StringWritableStream, XapiRoot, XmlStringBuilder, XplatformVersion, _unescapeXml, arrayBufferToString, base64ToUint8Array, columnType, convertToColumnType, convertToString, dateToString, decodeRoot, defineDataset, defineOperation, defineRoot, encodeControlChars, encodeRoot, escapeXml, initXapi, isXapiRoot, makeParseEntities, nexacroJsonCodec, normalizeColumnType, parse, parseJson, parseXml, rowType, stringToDate, stringToReadableStream, uint8ArrayToBase64, write, writeJsonString, xapi };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xapi-js/core",
   "type": "module",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",