documents.js 1.61.0 → 1.63.0

package/dist/edit/pptx/slide.cjs

@@ -1,13 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_xml_entities = require("../../xml/entities.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_opc_paths = require("../../opc/paths.cjs");
 const require_opc_rels = require("../../opc/rels.cjs");
 const require_opc_content_types = require("../../opc/content-types.cjs");
-const require_xml_entities = require("../../xml/entities.cjs");
 const require_edit_pptx_scaffold = require("./scaffold.cjs");
 const require_edit_pptx_shape = require("./shape.cjs");
 const require_edit_pptx_image = require("./image.cjs");
+const require_edit_pptx_table = require("./table.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/edit/pptx/slide.ts
 function directChild(parent, tag) {
@@ -109,6 +110,14 @@ var PptxSlide = class {
 		spTree.children.push(shapeElement);
 		return new require_edit_pptx_shape.PptxShape(spTree.children, shapeElement);
 	}
+	addTable(init) {
+		const spTree = findSpTree(this.live());
+		const id = nextIdIn(spTree);
+		const tableElement = require_edit_pptx_table.buildDrawingTable(init.table);
+		const graphicFrame = require_edit_pptx_table.buildTableGraphicFrame(init.frame, tableElement, id, init.rotationDeg);
+		spTree.children.push(graphicFrame);
+		return new require_edit_pptx_table.PptxTable(tableElement);
+	}
 	get notes() {
 		const notesRel = [...(0, ooxml_js.resolveRelationships)(this.context.pkg, this.context.slidePartPath).values()].find((r) => r.type === NOTES_SLIDE_RELATIONSHIP_TYPE);
 		if (notesRel === void 0) return "";

package/dist/edit/pptx/slide.d.cts

@@ -1,6 +1,7 @@
-import { t as Box } from "../../geometry-DvwdrIij.cjs";
-import { t as ImageInit } from "../../image-BZDy72Jb.cjs";
-import { r as PptxShape } from "../../shape-BUfjw5eZ.cjs";
+import { t as Box } from "../../geometry-DaJr8yQW.cjs";
+import { t as ImageInit } from "../../image-7snmKIxn.cjs";
+import { r as PptxShape } from "../../shape-BhkP6HB8.cjs";
+import { r as PptxTableInit, t as PptxTable } from "../../table-C3CPZ--2.cjs";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 //#region src/edit/pptx/slide.d.ts
 interface TextBoxInit {
@@ -10,6 +11,11 @@ interface TextBoxInit {
 interface SlideImageInit extends ImageInit {
   readonly frame: Box;
 }
+interface SlideTableInit {
+  readonly frame: Box;
+  readonly table: PptxTableInit;
+  readonly rotationDeg?: number;
+}
 interface SlideContext {
   readonly pkg: Package;
   readonly slidePartPath: string;
@@ -25,9 +31,10 @@ declare class PptxSlide {
   shapes(): PptxShape[];
   addTextBox(init: TextBoxInit): PptxShape;
   addImage(init: SlideImageInit): PptxShape;
+  addTable(init: SlideTableInit): PptxTable;
   get notes(): string;
   set notes(value: string);
   remove(): void;
 }
 //#endregion
-export { PptxSlide, SlideContext, SlideImageInit, TextBoxInit };
+export { PptxSlide, SlideContext, SlideImageInit, SlideTableInit, TextBoxInit };

package/dist/edit/pptx/slide.d.ts

@@ -1,6 +1,7 @@
-import { t as Box } from "../../geometry-DvwdrIij.js";
-import { t as ImageInit } from "../../image-B-xQWYYS.js";
-import { r as PptxShape } from "../../shape-CTkl6kt8.js";
+import { t as Box } from "../../geometry-DaJr8yQW.js";
+import { t as ImageInit } from "../../image-Cs8xF753.js";
+import { r as PptxShape } from "../../shape-BkVcwPcf.js";
+import { r as PptxTableInit, t as PptxTable } from "../../table-DvS_7UQS.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 //#region src/edit/pptx/slide.d.ts
 interface TextBoxInit {
@@ -10,6 +11,11 @@ interface TextBoxInit {
 interface SlideImageInit extends ImageInit {
   readonly frame: Box;
 }
+interface SlideTableInit {
+  readonly frame: Box;
+  readonly table: PptxTableInit;
+  readonly rotationDeg?: number;
+}
 interface SlideContext {
   readonly pkg: Package;
   readonly slidePartPath: string;
@@ -25,9 +31,10 @@ declare class PptxSlide {
   shapes(): PptxShape[];
   addTextBox(init: TextBoxInit): PptxShape;
   addImage(init: SlideImageInit): PptxShape;
+  addTable(init: SlideTableInit): PptxTable;
   get notes(): string;
   set notes(value: string);
   remove(): void;
 }
 //#endregion
-export { PptxSlide, SlideContext, SlideImageInit, TextBoxInit };
+export { PptxSlide, SlideContext, SlideImageInit, SlideTableInit, TextBoxInit };

package/dist/edit/pptx/slide.js

@@ -1,12 +1,13 @@
 import { el, txt } from "../../xml/fragment.js";
+import { encodeXmlText } from "../../xml/entities.js";
 import { removeChild } from "../../xml/edit.js";
 import { buildRelativeTarget } from "../../opc/paths.js";
 import { addRelationship } from "../../opc/rels.js";
 import { ensureContentTypeOverride } from "../../opc/content-types.js";
-import { encodeXmlText } from "../../xml/entities.js";
 import { DML_NS, NOTES_MASTER_REL_TYPE, PML_NS, buildEmptyGroupSpTree, ensureNotesMaster } from "./scaffold.js";
 import { PptxShape, buildTextBoxShape } from "./shape.js";
 import { insertPictureShapeMedia } from "./image.js";
+import { PptxTable, buildDrawingTable, buildTableGraphicFrame } from "./table.js";
 import { resolveRelationships, rootElement, textContent } from "ooxml.js";
 //#region src/edit/pptx/slide.ts
 function directChild(parent, tag) {
@@ -108,6 +109,14 @@ var PptxSlide = class {
 		spTree.children.push(shapeElement);
 		return new PptxShape(spTree.children, shapeElement);
 	}
+	addTable(init) {
+		const spTree = findSpTree(this.live());
+		const id = nextIdIn(spTree);
+		const tableElement = buildDrawingTable(init.table);
+		const graphicFrame = buildTableGraphicFrame(init.frame, tableElement, id, init.rotationDeg);
+		spTree.children.push(graphicFrame);
+		return new PptxTable(tableElement);
+	}
 	get notes() {
 		const notesRel = [...resolveRelationships(this.context.pkg, this.context.slidePartPath).values()].find((r) => r.type === NOTES_SLIDE_RELATIONSHIP_TYPE);
 		if (notesRel === void 0) return "";

package/dist/edit/pptx/table.cjs

@@ -0,0 +1,136 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_xml_edit = require("../../xml/edit.cjs");
+const require_model_units = require("../../model/units.cjs");
+const require_edit_pptx_shape = require("./shape.cjs");
+let ooxml_js = require("ooxml.js");
+//#region src/edit/pptx/table.ts
+const DEFAULT_TABLE_WIDTH_PT = 468;
+const DEFAULT_ROW_HEIGHT_PT = 20;
+const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
+var PptxTableCell = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	get colSpan() {
+		const value = (0, ooxml_js.attr)(this.node, "gridSpan");
+		return value === void 0 ? void 0 : Number(value);
+	}
+	set colSpan(value) {
+		if (value === void 0) {
+			require_xml_edit.removeAttr(this.node, "gridSpan");
+			return;
+		}
+		require_xml_edit.setAttr(this.node, "gridSpan", String(value));
+	}
+	get rowSpan() {
+		const value = (0, ooxml_js.attr)(this.node, "rowSpan");
+		return value === void 0 ? void 0 : Number(value);
+	}
+	set rowSpan(value) {
+		if (value === void 0) {
+			require_xml_edit.removeAttr(this.node, "rowSpan");
+			return;
+		}
+		require_xml_edit.setAttr(this.node, "rowSpan", String(value));
+	}
+	set horizontalMerge(value) {
+		if (value) require_xml_edit.setAttr(this.node, "hMerge", "1");
+		else require_xml_edit.removeAttr(this.node, "hMerge");
+	}
+	set verticalMerge(value) {
+		if (value) require_xml_edit.setAttr(this.node, "vMerge", "1");
+		else require_xml_edit.removeAttr(this.node, "vMerge");
+	}
+	setParagraphs(paragraphs) {
+		const txBody = require_xml_edit.directChildElement(this.node, "a:txBody");
+		if (txBody === void 0) return;
+		txBody.children = [...txBody.children.filter((c) => !(c.type === "element" && c.tag === "a:p")), ...paragraphs.map(require_edit_pptx_shape.buildDrawingParagraph)];
+	}
+};
+var PptxTableRow = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	cells() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && child.tag === "a:tc") out.push(new PptxTableCell(child));
+		return out;
+	}
+};
+var PptxTable = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	rows() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && child.tag === "a:tr") out.push(new PptxTableRow(child));
+		return out;
+	}
+	cell(rowIndex, columnIndex) {
+		const row = this.rows()[rowIndex];
+		if (row === void 0) throw new Error(`row ${rowIndex} does not exist in this table`);
+		const cell = row.cells()[columnIndex];
+		if (cell === void 0) throw new Error(`column ${columnIndex} does not exist in row ${rowIndex}`);
+		return cell;
+	}
+};
+function buildTableCellElement() {
+	return require_xml_fragment.el("a:tc", {}, [require_xml_fragment.el("a:txBody", {}, [
+		require_xml_fragment.el("a:bodyPr"),
+		require_xml_fragment.el("a:lstStyle"),
+		require_xml_fragment.el("a:p", {}, [require_xml_fragment.el("a:endParaRPr")])
+	]), require_xml_fragment.el("a:tcPr")]);
+}
+function buildTblGrid(columns, columnWidthsPt) {
+	const defaultWidth = DEFAULT_TABLE_WIDTH_PT / columns;
+	const cols = [];
+	for (let i = 0; i < columns; i++) {
+		const widthPt = columnWidthsPt?.[i] ?? defaultWidth;
+		cols.push(require_xml_fragment.el("a:gridCol", { w: String(require_model_units.ptToEmu(widthPt)) }));
+	}
+	return require_xml_fragment.el("a:tblGrid", {}, cols);
+}
+function buildDrawingTable(init) {
+	const rows = [];
+	for (let r = 0; r < init.rows; r++) {
+		const cells = [];
+		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
+		rows.push(require_xml_fragment.el("a:tr", { h: String(require_model_units.ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+	}
+	return require_xml_fragment.el("a:tbl", {}, [
+		require_xml_fragment.el("a:tblPr"),
+		buildTblGrid(init.columns, init.columnWidthsPt),
+		...rows
+	]);
+}
+function buildTableGraphicFrame(frame, tableElement, shapeId, rotationDeg) {
+	const xfrmAttrs = rotationDeg === void 0 || rotationDeg === 0 ? {} : { rot: String(Math.round(rotationDeg * require_edit_pptx_shape.ROTATION_UNITS_PER_DEGREE)) };
+	return require_xml_fragment.el("p:graphicFrame", {}, [
+		require_xml_fragment.el("p:nvGraphicFramePr", {}, [
+			require_xml_fragment.el("p:cNvPr", {
+				id: String(shapeId),
+				name: `Table ${shapeId}`
+			}),
+			require_xml_fragment.el("p:cNvGraphicFramePr"),
+			require_xml_fragment.el("p:nvPr")
+		]),
+		require_xml_fragment.el("p:xfrm", xfrmAttrs, [require_xml_fragment.el("a:off", {
+			x: String(require_model_units.ptToEmu(frame.xPt)),
+			y: String(require_model_units.ptToEmu(frame.yPt))
+		}), require_xml_fragment.el("a:ext", {
+			cx: String(require_model_units.ptToEmu(frame.widthPt)),
+			cy: String(require_model_units.ptToEmu(frame.heightPt))
+		})]),
+		require_xml_fragment.el("a:graphic", {}, [require_xml_fragment.el("a:graphicData", { uri: TABLE_GRAPHIC_URI }, [tableElement])])
+	]);
+}
+//#endregion
+exports.PptxTable = PptxTable;
+exports.PptxTableCell = PptxTableCell;
+exports.PptxTableRow = PptxTableRow;
+exports.buildDrawingTable = buildDrawingTable;
+exports.buildTableGraphicFrame = buildTableGraphicFrame;

package/dist/edit/pptx/table.d.cts

@@ -0,0 +1,2 @@
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, t as PptxTable } from "../../table-C3CPZ--2.cjs";
+export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame };

package/dist/edit/pptx/table.d.ts

@@ -0,0 +1,2 @@
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, t as PptxTable } from "../../table-DvS_7UQS.js";
+export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame };

package/dist/edit/pptx/table.js

@@ -0,0 +1,131 @@
+import { el } from "../../xml/fragment.js";
+import { directChildElement, removeAttr, setAttr } from "../../xml/edit.js";
+import { ptToEmu } from "../../model/units.js";
+import { ROTATION_UNITS_PER_DEGREE, buildDrawingParagraph } from "./shape.js";
+import { attr } from "ooxml.js";
+//#region src/edit/pptx/table.ts
+const DEFAULT_TABLE_WIDTH_PT = 468;
+const DEFAULT_ROW_HEIGHT_PT = 20;
+const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
+var PptxTableCell = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	get colSpan() {
+		const value = attr(this.node, "gridSpan");
+		return value === void 0 ? void 0 : Number(value);
+	}
+	set colSpan(value) {
+		if (value === void 0) {
+			removeAttr(this.node, "gridSpan");
+			return;
+		}
+		setAttr(this.node, "gridSpan", String(value));
+	}
+	get rowSpan() {
+		const value = attr(this.node, "rowSpan");
+		return value === void 0 ? void 0 : Number(value);
+	}
+	set rowSpan(value) {
+		if (value === void 0) {
+			removeAttr(this.node, "rowSpan");
+			return;
+		}
+		setAttr(this.node, "rowSpan", String(value));
+	}
+	set horizontalMerge(value) {
+		if (value) setAttr(this.node, "hMerge", "1");
+		else removeAttr(this.node, "hMerge");
+	}
+	set verticalMerge(value) {
+		if (value) setAttr(this.node, "vMerge", "1");
+		else removeAttr(this.node, "vMerge");
+	}
+	setParagraphs(paragraphs) {
+		const txBody = directChildElement(this.node, "a:txBody");
+		if (txBody === void 0) return;
+		txBody.children = [...txBody.children.filter((c) => !(c.type === "element" && c.tag === "a:p")), ...paragraphs.map(buildDrawingParagraph)];
+	}
+};
+var PptxTableRow = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	cells() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && child.tag === "a:tc") out.push(new PptxTableCell(child));
+		return out;
+	}
+};
+var PptxTable = class {
+	node;
+	constructor(node) {
+		this.node = node;
+	}
+	rows() {
+		const out = [];
+		for (const child of this.node.children) if (child.type === "element" && child.tag === "a:tr") out.push(new PptxTableRow(child));
+		return out;
+	}
+	cell(rowIndex, columnIndex) {
+		const row = this.rows()[rowIndex];
+		if (row === void 0) throw new Error(`row ${rowIndex} does not exist in this table`);
+		const cell = row.cells()[columnIndex];
+		if (cell === void 0) throw new Error(`column ${columnIndex} does not exist in row ${rowIndex}`);
+		return cell;
+	}
+};
+function buildTableCellElement() {
+	return el("a:tc", {}, [el("a:txBody", {}, [
+		el("a:bodyPr"),
+		el("a:lstStyle"),
+		el("a:p", {}, [el("a:endParaRPr")])
+	]), el("a:tcPr")]);
+}
+function buildTblGrid(columns, columnWidthsPt) {
+	const defaultWidth = DEFAULT_TABLE_WIDTH_PT / columns;
+	const cols = [];
+	for (let i = 0; i < columns; i++) {
+		const widthPt = columnWidthsPt?.[i] ?? defaultWidth;
+		cols.push(el("a:gridCol", { w: String(ptToEmu(widthPt)) }));
+	}
+	return el("a:tblGrid", {}, cols);
+}
+function buildDrawingTable(init) {
+	const rows = [];
+	for (let r = 0; r < init.rows; r++) {
+		const cells = [];
+		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
+		rows.push(el("a:tr", { h: String(ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+	}
+	return el("a:tbl", {}, [
+		el("a:tblPr"),
+		buildTblGrid(init.columns, init.columnWidthsPt),
+		...rows
+	]);
+}
+function buildTableGraphicFrame(frame, tableElement, shapeId, rotationDeg) {
+	const xfrmAttrs = rotationDeg === void 0 || rotationDeg === 0 ? {} : { rot: String(Math.round(rotationDeg * ROTATION_UNITS_PER_DEGREE)) };
+	return el("p:graphicFrame", {}, [
+		el("p:nvGraphicFramePr", {}, [
+			el("p:cNvPr", {
+				id: String(shapeId),
+				name: `Table ${shapeId}`
+			}),
+			el("p:cNvGraphicFramePr"),
+			el("p:nvPr")
+		]),
+		el("p:xfrm", xfrmAttrs, [el("a:off", {
+			x: String(ptToEmu(frame.xPt)),
+			y: String(ptToEmu(frame.yPt))
+		}), el("a:ext", {
+			cx: String(ptToEmu(frame.widthPt)),
+			cy: String(ptToEmu(frame.heightPt))
+		})]),
+		el("a:graphic", {}, [el("a:graphicData", { uri: TABLE_GRAPHIC_URI }, [tableElement])])
+	]);
+}
+//#endregion
+export { PptxTable, PptxTableCell, PptxTableRow, buildDrawingTable, buildTableGraphicFrame };

package/dist/firebird/backup.d.cts

@@ -1,5 +1,5 @@
 import { HsqldbTable } from "../hsqldb/script.cjs";
-import { r as FirebirdSchemaParseError } from "../schema-Acco3Ezi.cjs";
+import { r as FirebirdSchemaParseError } from "../schema-BeR_KJ0X.cjs";
 import { FirebirdCompositeRecordUnsupportedError } from "./data.cjs";
 //#region src/firebird/backup.d.ts
 declare class FirebirdBackupFormatError extends Error {

package/dist/firebird/backup.d.ts

@@ -1,5 +1,5 @@
 import { HsqldbTable } from "../hsqldb/script.js";
-import { r as FirebirdSchemaParseError } from "../schema-VkAA6pF5.js";
+import { r as FirebirdSchemaParseError } from "../schema-CSKwSb_v.js";
 import { FirebirdCompositeRecordUnsupportedError } from "./data.js";
 //#region src/firebird/backup.d.ts
 declare class FirebirdBackupFormatError extends Error {

package/dist/firebird/blr-types.cjs

@@ -65,7 +65,7 @@ function decodeBlrType(blrType) {
 	if (physical === void 0) throw new FirebirdUnsupportedFieldTypeError(blrType);
 	return physical;
 }
-function describeFieldType(physical, lengthBytes, scale, characterLength) {
+function describeFieldType(physical, lengthBytes, scale, characterLength, subType) {
 	switch (physical) {
 		case "short": return scale === 0 ? "SMALLINT" : `NUMERIC(4,${-scale})`;
 		case "long": return scale === 0 ? "INTEGER" : `NUMERIC(9,${-scale})`;
@@ -79,7 +79,7 @@ function describeFieldType(physical, lengthBytes, scale, characterLength) {
 		case "varying": return `VARCHAR(${characterLength ?? lengthBytes})`;
 		case "cstring": return `CSTRING(${characterLength ?? lengthBytes})`;
 		case "boolean": return "BOOLEAN";
-		case "blob": return "BLOB";
+		case "blob": return `BLOB SUB_TYPE ${subType}`;
 		case "quad": return "ARRAY";
 		case "int128": return `NUMERIC(38,${-scale})`;
 		case "dec64": return "DECFLOAT(16)";

package/dist/firebird/blr-types.d.cts

@@ -1,2 +1,2 @@
-import { C as BLR_TIMESTAMP_TZ, D as FirebirdUnsupportedFieldTypeError, E as FirebirdPhysicalType, O as decodeBlrType, S as BLR_TIMESTAMP, T as BLR_VARYING2, _ as BLR_SQL_DATE, a as BLR_DEC128, b as BLR_TEXT, c as BLR_D_FLOAT, d as BLR_FLOAT, f as BLR_INT128, g as BLR_SHORT, h as BLR_QUAD, i as BLR_CSTRING2, k as describeFieldType, l as BLR_EX_TIMESTAMP_TZ, m as BLR_LONG, n as BLR_BOOL, o as BLR_DEC64, p as BLR_INT64, r as BLR_CSTRING, s as BLR_DOUBLE, t as BLR_BLOB, u as BLR_EX_TIME_TZ, v as BLR_SQL_TIME, w as BLR_VARYING, x as BLR_TEXT2, y as BLR_SQL_TIME_TZ } from "../blr-types-CYYC3yYU.cjs";
+import { C as BLR_TIMESTAMP_TZ, D as FirebirdUnsupportedFieldTypeError, E as FirebirdPhysicalType, O as decodeBlrType, S as BLR_TIMESTAMP, T as BLR_VARYING2, _ as BLR_SQL_DATE, a as BLR_DEC128, b as BLR_TEXT, c as BLR_D_FLOAT, d as BLR_FLOAT, f as BLR_INT128, g as BLR_SHORT, h as BLR_QUAD, i as BLR_CSTRING2, k as describeFieldType, l as BLR_EX_TIMESTAMP_TZ, m as BLR_LONG, n as BLR_BOOL, o as BLR_DEC64, p as BLR_INT64, r as BLR_CSTRING, s as BLR_DOUBLE, t as BLR_BLOB, u as BLR_EX_TIME_TZ, v as BLR_SQL_TIME, w as BLR_VARYING, x as BLR_TEXT2, y as BLR_SQL_TIME_TZ } from "../blr-types-DVgO1DQ9.cjs";
 export { BLR_BLOB, BLR_BOOL, BLR_CSTRING, BLR_CSTRING2, BLR_DEC128, BLR_DEC64, BLR_DOUBLE, BLR_D_FLOAT, BLR_EX_TIMESTAMP_TZ, BLR_EX_TIME_TZ, BLR_FLOAT, BLR_INT128, BLR_INT64, BLR_LONG, BLR_QUAD, BLR_SHORT, BLR_SQL_DATE, BLR_SQL_TIME, BLR_SQL_TIME_TZ, BLR_TEXT, BLR_TEXT2, BLR_TIMESTAMP, BLR_TIMESTAMP_TZ, BLR_VARYING, BLR_VARYING2, FirebirdPhysicalType, FirebirdUnsupportedFieldTypeError, decodeBlrType, describeFieldType };

package/dist/firebird/blr-types.d.ts

@@ -1,2 +1,2 @@
-import { C as BLR_TIMESTAMP_TZ, D as FirebirdUnsupportedFieldTypeError, E as FirebirdPhysicalType, O as decodeBlrType, S as BLR_TIMESTAMP, T as BLR_VARYING2, _ as BLR_SQL_DATE, a as BLR_DEC128, b as BLR_TEXT, c as BLR_D_FLOAT, d as BLR_FLOAT, f as BLR_INT128, g as BLR_SHORT, h as BLR_QUAD, i as BLR_CSTRING2, k as describeFieldType, l as BLR_EX_TIMESTAMP_TZ, m as BLR_LONG, n as BLR_BOOL, o as BLR_DEC64, p as BLR_INT64, r as BLR_CSTRING, s as BLR_DOUBLE, t as BLR_BLOB, u as BLR_EX_TIME_TZ, v as BLR_SQL_TIME, w as BLR_VARYING, x as BLR_TEXT2, y as BLR_SQL_TIME_TZ } from "../blr-types-CYYC3yYU.js";
+import { C as BLR_TIMESTAMP_TZ, D as FirebirdUnsupportedFieldTypeError, E as FirebirdPhysicalType, O as decodeBlrType, S as BLR_TIMESTAMP, T as BLR_VARYING2, _ as BLR_SQL_DATE, a as BLR_DEC128, b as BLR_TEXT, c as BLR_D_FLOAT, d as BLR_FLOAT, f as BLR_INT128, g as BLR_SHORT, h as BLR_QUAD, i as BLR_CSTRING2, k as describeFieldType, l as BLR_EX_TIMESTAMP_TZ, m as BLR_LONG, n as BLR_BOOL, o as BLR_DEC64, p as BLR_INT64, r as BLR_CSTRING, s as BLR_DOUBLE, t as BLR_BLOB, u as BLR_EX_TIME_TZ, v as BLR_SQL_TIME, w as BLR_VARYING, x as BLR_TEXT2, y as BLR_SQL_TIME_TZ } from "../blr-types-DVgO1DQ9.js";
 export { BLR_BLOB, BLR_BOOL, BLR_CSTRING, BLR_CSTRING2, BLR_DEC128, BLR_DEC64, BLR_DOUBLE, BLR_D_FLOAT, BLR_EX_TIMESTAMP_TZ, BLR_EX_TIME_TZ, BLR_FLOAT, BLR_INT128, BLR_INT64, BLR_LONG, BLR_QUAD, BLR_SHORT, BLR_SQL_DATE, BLR_SQL_TIME, BLR_SQL_TIME_TZ, BLR_TEXT, BLR_TEXT2, BLR_TIMESTAMP, BLR_TIMESTAMP_TZ, BLR_VARYING, BLR_VARYING2, FirebirdPhysicalType, FirebirdUnsupportedFieldTypeError, decodeBlrType, describeFieldType };

package/dist/firebird/blr-types.js

@@ -64,7 +64,7 @@ function decodeBlrType(blrType) {
 	if (physical === void 0) throw new FirebirdUnsupportedFieldTypeError(blrType);
 	return physical;
 }
-function describeFieldType(physical, lengthBytes, scale, characterLength) {
+function describeFieldType(physical, lengthBytes, scale, characterLength, subType) {
 	switch (physical) {
 		case "short": return scale === 0 ? "SMALLINT" : `NUMERIC(4,${-scale})`;
 		case "long": return scale === 0 ? "INTEGER" : `NUMERIC(9,${-scale})`;
@@ -78,7 +78,7 @@ function describeFieldType(physical, lengthBytes, scale, characterLength) {
 		case "varying": return `VARCHAR(${characterLength ?? lengthBytes})`;
 		case "cstring": return `CSTRING(${characterLength ?? lengthBytes})`;
 		case "boolean": return "BOOLEAN";
-		case "blob": return "BLOB";
+		case "blob": return `BLOB SUB_TYPE ${subType}`;
 		case "quad": return "ARRAY";
 		case "int128": return `NUMERIC(38,${-scale})`;
 		case "dec64": return "DECFLOAT(16)";

package/dist/firebird/data.cjs

@@ -26,23 +26,71 @@ var FirebirdCompositeRecordUnsupportedError = class extends Error {
 		this.recordType = recordType;
 	}
 };
-function skipBlobRecord(reader) {
-	let segmentCount;
+function readBlobRecord(reader) {
+	const ATT_BLOB_FIELD_NUMBER = 3;
+	const ATT_BLOB_NUMBER_SEGMENTS = 5;
+	const ATT_BLOB_DATA = 7;
+	let fieldNumber;
+	let segmentCount = 0;
 	for (;;) {
 		const attribute = reader.readTag();
-		if (attribute === 0) break;
-		if (attribute === 5) segmentCount = reader.readInt32Attribute();
-		else if (attribute === 7) {
-			const count = segmentCount ?? 0;
-			for (let i = 0; i < count; i++) {
-				const length = reader.readBlobSegmentLength();
-				reader.readRawPayload(length);
-			}
-		} else reader.skipAttributeValue();
+		if (attribute === ATT_BLOB_DATA) break;
+		if (attribute === ATT_BLOB_FIELD_NUMBER) fieldNumber = reader.readInt32Attribute();
+		else if (attribute === ATT_BLOB_NUMBER_SEGMENTS) segmentCount = reader.readInt32Attribute();
+		else reader.skipAttributeValue();
+	}
+	if (fieldNumber === void 0) throw new FirebirdDataParseError("a rec_blob record had no att_blob_field_number attribute, so its content cannot be attributed to a column");
+	const segments = [];
+	let total = 0;
+	for (let i = 0; i < segmentCount; i++) {
+		const length = reader.readBlobSegmentLength();
+		const segment = reader.readRawPayload(length);
+		segments.push(segment);
+		total += segment.length;
+	}
+	const bytes = new Uint8Array(total);
+	let offset = 0;
+	for (const segment of segments) {
+		bytes.set(segment, offset);
+		offset += segment.length;
 	}
+	return {
+		fieldNumber,
+		bytes
+	};
+}
+const BINARY_BLOB_DATA_URI_PREFIX = "data:application/octet-stream;base64,";
+const BLOB_SUB_TYPE_TEXT = 1;
+const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function bytesToBase64(bytes) {
+	let result = "";
+	for (let i = 0; i < bytes.length; i += 3) {
+		const b0 = bytes[i] ?? 0;
+		const b1 = bytes[i + 1];
+		const b2 = bytes[i + 2];
+		const triple = b0 << 16 | (b1 ?? 0) << 8 | (b2 ?? 0);
+		result += BASE64_ALPHABET[triple >> 18 & 63] ?? "";
+		result += BASE64_ALPHABET[triple >> 12 & 63] ?? "";
+		result += b1 === void 0 ? "=" : BASE64_ALPHABET[triple >> 6 & 63] ?? "";
+		result += b2 === void 0 ? "=" : BASE64_ALPHABET[triple & 63] ?? "";
+	}
+	return result;
+}
+function blobCellValue(field, bytes) {
+	if (field.subType === BLOB_SUB_TYPE_TEXT) return {
+		kind: "string",
+		value: new TextDecoder("utf-8").decode(bytes)
+	};
+	return {
+		kind: "string",
+		value: `${BINARY_BLOB_DATA_URI_PREFIX}${bytesToBase64(bytes)}`
+	};
+}
+function storedFieldsOf(fields) {
+	return fields.filter((field) => !field.computed);
 }
 function decodeRowValues(fields, payload) {
-	const storedFields = fields.filter((field) => !field.computed);
+	const storedFields = storedFieldsOf(fields);
 	const xdr = new require_firebird_reader.XdrReader(payload);
 	const rawValues = [];
 	for (const field of storedFields) switch (field.physicalType) {
@@ -171,10 +219,16 @@ function readRowGroup(reader, relation, compressed) {
 			if (dataTag !== ATT_DATA_DATA) throw new FirebirdDataParseError(`relation "${relation.name}": expected att_data_data (tag ${ATT_DATA_DATA}), found tag ${dataTag}`);
 		}
 		const payload = compressed ? reader.readCompressedPayload(xdrLength) : reader.readRawPayload(xdrLength);
-		rows.push(decodeRowValues(relation.fields, payload));
+		const values = decodeRowValues(relation.fields, payload);
+		rows.push(values);
 		let next = reader.readTag();
 		while (next === REC_BLOB) {
-			skipBlobRecord(reader);
+			const blob = readBlobRecord(reader);
+			const storedFields = storedFieldsOf(relation.fields);
+			const columnIndex = storedFields.findIndex((field) => field.fieldNumber === blob.fieldNumber);
+			const field = storedFields[columnIndex];
+			if (field === void 0) throw new FirebirdDataParseError(`relation "${relation.name}": a rec_blob record names att_blob_field_number ${blob.fieldNumber}, which matches no field's own att_field_number in this relation`);
+			values[columnIndex] = blobCellValue(field, blob.bytes);
 			next = reader.readTag();
 		}
 		if (next !== REC_DATA) {

package/dist/firebird/data.d.cts

@@ -1,5 +1,5 @@
 import { n as FirebirdBackupReader } from "../reader-DP0Mbaj4.cjs";
-import { n as FirebirdRelation } from "../schema-Acco3Ezi.cjs";
+import { n as FirebirdRelation } from "../schema-BeR_KJ0X.cjs";
 import { ContentCellValue } from "document-schema.js";
 //#region src/firebird/data.d.ts
 declare class FirebirdDataParseError extends Error {

package/dist/firebird/data.d.ts

@@ -1,5 +1,5 @@
 import { n as FirebirdBackupReader } from "../reader-DP0Mbaj4.js";
-import { n as FirebirdRelation } from "../schema-VkAA6pF5.js";
+import { n as FirebirdRelation } from "../schema-CSKwSb_v.js";
 import { ContentCellValue } from "document-schema.js";
 //#region src/firebird/data.d.ts
 declare class FirebirdDataParseError extends Error {