diff --git a/Cargo.lock b/Cargo.lock index d15abdc5d..2903e7010 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -940,9 +940,10 @@ dependencies = [ [[package]] name = "craft-drawingml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" dependencies = [ - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", + "chrono", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", "kurbo", "log", "serde", @@ -1052,10 +1053,10 @@ dependencies = [ [[package]] name = "craft-opc" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" dependencies = [ - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", - "craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", + "craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", "log", "thiserror 2.0.21", ] @@ -1087,12 +1088,12 @@ source = "git+https://github.com/storytold/craft-libs?rev=010702ee9b030844c85293 [[package]] name = "craft-sheet" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=3b8e426a260695af840a2cd79a064d40778f939e#3b8e426a260695af840a2cd79a064d40778f939e" [[package]] name = "craft-sheet" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=3b8e426a260695af840a2cd79a064d40778f939e#3b8e426a260695af840a2cd79a064d40778f939e" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" [[package]] name = "craft-stream-codecs" @@ -1207,12 +1208,12 @@ dependencies = [ [[package]] name = "craft-xlsx" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" dependencies = [ "craft-drawingml", "craft-opc", - "craft-sheet 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", + "craft-sheet 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", "thiserror 2.0.21", ] @@ -1229,7 +1230,7 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" dependencies = [ "quick-xml 0.41.0", "serde", @@ -1258,7 +1259,7 @@ dependencies = [ [[package]] name = "craft-zip" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0#0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0" +source = "git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3#a20dfd1623709b0bd9830106d3a92a1a443902e3" dependencies = [ "flate2", "thiserror 2.0.21", @@ -2504,7 +2505,7 @@ dependencies = [ "craft-opc", "craft-xls", "craft-xlsx", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a20dfd1623709b0bd9830106d3a92a1a443902e3)", "gridcraft-core", "gridcraft-formula", "gridcraft-functions", diff --git a/Cargo.toml b/Cargo.toml index c99eef05f..cca4830c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ craft-cfb = { git = "https://github.com/storytold/craft-libs", rev = "e98299546f craft-offcrypto = { git = "https://github.com/storytold/craft-libs", rev = "e98299546f5c5c3c22388d16507f8b5e61a5f280", version = "0.1.0" } craft-ods = { git = "https://github.com/storytold/craft-libs", rev = "010702ee9b030844c852939095b1da0d0656a890", version = "0.1.0" } # OPC zip packages (parts, relationships, the zip writer) under `crates/xlsx/src/package.rs`. -craft-opc = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" } +craft-opc = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" } # Delimited text (CSV, TSV) and SYLK; `crates/xlsx/src/csv.rs` and `crates/engine/src/io/sylk.rs` # turn them into workbooks. craft-csv = { git = "https://github.com/storytold/craft-libs", rev = "e98299546f5c5c3c22388d16507f8b5e61a5f280", version = "0.1.0" } @@ -48,10 +48,10 @@ craft-math = { git = "https://github.com/storytold/craft-libs", rev = "010702ee9 craft-gridcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "9a6d894200221fcfedc274870c30394d404f859d", version = "0.1.0" } # Excel 97-2003 (.xls, BIFF8) workbooks; `crates/xlsx/src/xls.rs` maps them onto the model. # SpreadsheetML worksheet/drawing/string/package XML; workbook model mapping stays in gridcraft-xlsx. -craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" } -craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" } +craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" } +craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" } craft-xls = { git = "https://github.com/storytold/craft-libs", rev = "3b8e426a260695af840a2cd79a064d40778f939e", version = "0.1.0" } -craft-drawingml = { git = "https://github.com/storytold/craft-libs", rev = "0ffb1a0abe8763f9fda3a2fb9ca0edc8fdcb7ec0", version = "0.1.0" } +craft-drawingml = { git = "https://github.com/storytold/craft-libs", rev = "a20dfd1623709b0bd9830106d3a92a1a443902e3", version = "0.1.0" } craft-mcp-server = { git = "https://github.com/storytold/craft-libs", rev = "08da5e1486ee640de1d2cccd8fe8dd32b1d3b62c", version = "=0.1.0" } # foundation diff --git a/crates/xlsx/src/tests/xlsb_tests.rs b/crates/xlsx/src/tests/xlsb_tests.rs index ab868baf5..81274a224 100644 --- a/crates/xlsx/src/tests/xlsb_tests.rs +++ b/crates/xlsx/src/tests/xlsb_tests.rs @@ -417,7 +417,7 @@ fn xlsb_formulas_defined_names_and_external_links_delegate_to_craft_xlsx() { assert_eq!(wb.sheets[0].cell(CellRef::new(0, 0)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Hidden!$A$1")); assert_eq!(wb.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Rate")); assert!(wb.sheets[0].cell(CellRef::new(0, 2)).is_some_and(|c| c.formula.is_none() && c.value == Value::Number(99.0))); - assert!(report.warnings.iter().any(|w| w.contains("external links")), "{:?}", report.warnings); + assert!(report.warnings.iter().any(|w| w.contains("external link")), "{:?}", report.warnings); let (rt, _) = read_xlsx(&write_xlsx(&wb).unwrap()).unwrap(); assert_eq!(rt.names.len(), 1); @@ -425,3 +425,105 @@ fn xlsb_formulas_defined_names_and_external_links_delegate_to_craft_xlsx() { assert_eq!(rt.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("Rate")); assert_eq!(rt.sheets[0].value(CellRef::new(0, 2)), Value::Number(99.0)); } + +#[test] +fn xlsb_external_book_formulas_and_names_decode_and_roundtrip_through_xlsx() { + let mut wb_records = record(131, &[]); + let mut props = 0u32.to_le_bytes().to_vec(); + props.extend(0u32.to_le_bytes()); + props.extend(wide("")); + wb_records.extend(record(153, &props)); + wb_records.extend(record(143, &[])); + for (id, rel, name, state) in [(1u32, "one", "Data", 0u32), (2, "two", "Hidden", 1)] { + let mut data = state.to_le_bytes().to_vec(); + data.extend(id.to_le_bytes()); + data.extend(wide(rel)); + data.extend(wide(name)); + wb_records.extend(record(156, &data)); + } + wb_records.extend(record(144, &[])); + // Supporting books: book 0 = BrtSupSelf (357), book 1 = BrtSupBookSrc (355, rel "ext1"). + wb_records.extend(record(357, &[])); + wb_records.extend(record(355, &wide("ext1"))); + // BrtExternSheet (362): ixti 0 -> (book=1, sheet=0..0), ixti 1 -> (book=1, sheet=-2..-2). + let mut xti = 2u32.to_le_bytes().to_vec(); + for (bk, first, last) in [(1u32, 0i32, 0i32), (1, -2, -2)] { + xti.extend(bk.to_le_bytes()); + xti.extend(first.to_le_bytes()); + xti.extend(last.to_le_bytes()); + } + wb_records.extend(record(362, &xti)); + wb_records.extend(record(132, &[])); + + // External link part (links/externalLink1.bin): BrtBeginSupBook (360), BrtSupTabs (359), + // BrtSupNameStart/Bits/End (577/586/587), BrtEndSupBook (588). + let mut ext_bin = Vec::new(); + let mut begin_sup = 0u16.to_le_bytes().to_vec(); + begin_sup.extend(wide("rId1")); + begin_sup.extend(u32::MAX.to_le_bytes()); + ext_bin.extend(record(360, &begin_sup)); + let mut tabs = 2u32.to_le_bytes().to_vec(); + tabs.extend(wide("Data")); + tabs.extend(wide("Other Sheet")); + ext_bin.extend(record(359, &tabs)); + ext_bin.extend(record(577, &wide("ExtName"))); + let mut bits = vec![0u8; 7]; + bits[2..6].copy_from_slice(&0u32.to_le_bytes()); + ext_bin.extend(record(586, &bits)); + ext_bin.extend(record(587, &[])); + ext_bin.extend(record(588, &[])); + + let fmla_num = |col: u32, cached: f64, rgce: &[u8]| { + let mut data = col.to_le_bytes().to_vec(); + data.extend([0; 4]); + data.extend(cached.to_le_bytes()); + data.extend([0; 2]); + data.extend((rgce.len() as u32).to_le_bytes()); + data.extend(rgce); + data.extend(0u32.to_le_bytes()); + record(9, &data) + }; + let ptg_ext_ref = { + let mut v = vec![0x3A, 0, 0]; + v.extend(0u32.to_le_bytes()); + v.extend(0u16.to_le_bytes()); + v + }; + let ptg_ext_name = [0x39, 1, 0, 1, 0, 0, 0]; + let mut data = row(0); + data.extend(fmla_num(0, 99.0, &ptg_ext_ref)); + data.extend(fmla_num(1, 12.5, &ptg_ext_name)); + + let rels = RELS.replace( + "", + r#""#, + ); + let types = + TYPES.replace("", r#""#); + let link_rels = r#""#; + let bytes = make_zip(&[ + ("[Content_Types].xml", types.as_bytes()), + ("_rels/.rels", ROOT.as_bytes()), + ("records/book.bin", &wb_records), + ("records/_rels/book.bin.rels", rels.as_bytes()), + ("data/one.bin", &worksheet(&data, &[])), + ("data/two.bin", &worksheet(&[], &[])), + ("text/strings.bin", &sst()), + ("links/externalLink1.bin", &ext_bin), + ("links/_rels/externalLink1.bin.rels", link_rels.as_bytes()), + ]); + + let (wb, _) = read_xlsb(&bytes).unwrap(); + let c0 = wb.sheets[0].cell(CellRef::new(0, 0)).unwrap(); + assert_eq!(c0.value, Value::Number(99.0)); + assert_eq!(c0.formula.as_ref().map(|f| f.text.as_str()), Some("[1]Data!$A$1")); + let c1 = wb.sheets[0].cell(CellRef::new(0, 1)).unwrap(); + assert_eq!(c1.value, Value::Number(12.5)); + assert_eq!(c1.formula.as_ref().map(|f| f.text.as_str()), Some("[1]!ExtName")); + + let (rt, _) = read_xlsx(&write_xlsx(&wb).unwrap()).unwrap(); + assert_eq!(rt.sheets[0].cell(CellRef::new(0, 0)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]Data!$A$1")); + assert_eq!(rt.sheets[0].value(CellRef::new(0, 0)), Value::Number(99.0)); + assert_eq!(rt.sheets[0].cell(CellRef::new(0, 1)).and_then(|c| c.formula.as_ref()).map(|f| f.text.as_str()), Some("[1]!ExtName")); + assert_eq!(rt.sheets[0].value(CellRef::new(0, 1)), Value::Number(12.5)); +}