numbers-parser 4.23.1__tar.gz → 4.23.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (136) hide show
  1. {numbers_parser-4.23.1/src/numbers_parser.egg-info → numbers_parser-4.23.2}/PKG-INFO +1 -1
  2. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/pyproject.toml +4 -3
  3. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/cell.py +12 -15
  4. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/containers.py +2 -2
  5. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/document.py +8 -1
  6. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/iwafile.py +2 -6
  7. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/model.py +26 -20
  8. {numbers_parser-4.23.1 → numbers_parser-4.23.2/src/numbers_parser.egg-info}/PKG-INFO +1 -1
  9. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_coverage.py +123 -7
  10. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_issues.py +64 -0
  11. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/LICENSE.rst +0 -0
  12. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/README.md +0 -0
  13. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/setup.cfg +0 -0
  14. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/__init__.py +0 -0
  15. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/_cat_numbers.py +0 -0
  16. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/_csv2numbers.py +0 -0
  17. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/_unpack_numbers.py +0 -0
  18. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/bullets.py +0 -0
  19. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/constants.py +0 -0
  20. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/currencies.py +0 -0
  21. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/data/empty.numbers +0 -0
  22. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/exceptions.py +0 -0
  23. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/experimental.py +0 -0
  24. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/formula.py +0 -0
  25. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
  26. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_pb2.pyi +0 -0
  27. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
  28. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_sos_pb2.pyi +0 -0
  29. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
  30. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_pb2.pyi +0 -0
  31. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
  32. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.pyi +0 -0
  33. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
  34. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_pb2.pyi +0 -0
  35. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
  36. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.pyi +0 -0
  37. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
  38. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.pyi +0 -0
  39. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
  40. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCEArchives_pb2.pyi +0 -0
  41. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
  42. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.pyi +0 -0
  43. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
  44. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.pyi +0 -0
  45. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
  46. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.pyi +0 -0
  47. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
  48. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_pb2.pyi +0 -0
  49. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
  50. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.pyi +0 -0
  51. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
  52. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.pyi +0 -0
  53. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2 2.py +0 -0
  54. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
  55. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.pyi +0 -0
  56. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
  57. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_pb2.pyi +0 -0
  58. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
  59. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.pyi +0 -0
  60. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
  61. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_pb2.pyi +0 -0
  62. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
  63. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.pyi +0 -0
  64. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
  65. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.pyi +0 -0
  66. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
  67. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSKArchives_pb2.pyi +0 -0
  68. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
  69. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.pyi +0 -0
  70. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
  71. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.pyi +0 -0
  72. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
  73. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPMessages_pb2.pyi +0 -0
  74. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
  75. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_pb2.pyi +0 -0
  76. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
  77. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.pyi +0 -0
  78. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
  79. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_pb2.pyi +0 -0
  80. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
  81. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.pyi +0 -0
  82. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
  83. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.pyi +0 -0
  84. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
  85. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.pyi +0 -0
  86. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
  87. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_pb2.pyi +0 -0
  88. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
  89. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.pyi +0 -0
  90. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
  91. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.pyi +0 -0
  92. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/__init__.py +0 -0
  93. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/fontmap.py +0 -0
  94. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/functionmap.py +0 -0
  95. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/generated/mapping.py +0 -0
  96. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/iwork.py +0 -0
  97. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/numbers_cache.py +0 -0
  98. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/numbers_uuid.py +0 -0
  99. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/py.typed +0 -0
  100. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/roman.py +0 -0
  101. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser/xrefs.py +0 -0
  102. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
  103. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
  104. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/entry_points.txt +0 -0
  105. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/requires.txt +0 -0
  106. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/top_level.txt +0 -0
  107. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_all_formulas.py +0 -0
  108. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_api_change.py +0 -0
  109. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_borders.py +0 -0
  110. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_bullets.py +0 -0
  111. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_cat_numbers.py +0 -0
  112. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_categories.py +0 -0
  113. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_comments.py +0 -0
  114. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_create_cells.py +0 -0
  115. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_csv2numbers.py +0 -0
  116. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_currency.py +0 -0
  117. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_encrypted.py +0 -0
  118. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_folder.py +0 -0
  119. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_formatting.py +0 -0
  120. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_formulas.py +0 -0
  121. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_large.py +0 -0
  122. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_local_docs.py +0 -0
  123. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_memory_leaks.py +0 -0
  124. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_merges.py +0 -0
  125. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_package.py +0 -0
  126. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_properties.py +0 -0
  127. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_roman.py +0 -0
  128. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_save.py +0 -0
  129. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_slices.py +0 -0
  130. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_styles.py +0 -0
  131. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_table_size.py +0 -0
  132. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_tables.py +0 -0
  133. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_unpack_numbers.py +0 -0
  134. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_unsupported.py +0 -0
  135. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_uuids.py +0 -0
  136. {numbers_parser-4.23.1 → numbers_parser-4.23.2}/tests/test_version.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: numbers-parser
3
- Version: 4.23.1
3
+ Version: 4.23.2
4
4
  Summary: Read and write Apple Numbers spreadsheets
5
5
  Author-email: Jon Connell <python@figsandfudge.com>
6
6
  License-Expression: MIT
@@ -24,7 +24,7 @@ classifiers = [
24
24
  description = "Read and write Apple Numbers spreadsheets"
25
25
  name = "numbers-parser"
26
26
  readme = "README.md"
27
- version = "4.23.1"
27
+ version = "4.23.2"
28
28
 
29
29
  [project.urls]
30
30
  repository = "https://github.com/masaccio/numbers-parser"
@@ -80,10 +80,11 @@ bootstrap = [
80
80
  "mypy-protobuf>=5.1.0",
81
81
  ]
82
82
  visualcheck = [
83
+ "coverage>=7.14.0",
83
84
  "osascript>=0.0.27",
84
85
  "pillow>=13.0.0",
85
86
  "pixelmatch>=0.4.0",
86
- "pymupdf>=1.28.2",
87
+ "pymupdf-lite>=2.1",
87
88
  "rich>=15.0.0",
88
89
  ]
89
90
 
@@ -251,4 +252,4 @@ module = [
251
252
  "compact_json",
252
253
  "sigfig",
253
254
  ]
254
- ignore_missing_imports = true
255
+ ignore_missing_imports = true
@@ -66,7 +66,7 @@ from numbers_parser.constants import (
66
66
  PaddingType,
67
67
  )
68
68
  from numbers_parser.currencies import CURRENCIES, CURRENCY_SYMBOLS
69
- from numbers_parser.exceptions import FileFormatError, UnsupportedError, UnsupportedWarning
69
+ from numbers_parser.exceptions import UnsupportedError, UnsupportedWarning
70
70
  from numbers_parser.generated import TSKArchives_pb2 as TSKArchives
71
71
  from numbers_parser.generated import TSPMessages_pb2 as TSPMessages
72
72
  from numbers_parser.generated import TSTArchives_pb2 as TSTArchives
@@ -1164,8 +1164,6 @@ class Cell(_CellStorageFlags, Cacheable):
1164
1164
  self.size = (1, 1)
1165
1165
  self.merge_range = None
1166
1166
  self.rect = None
1167
- if getattr(self, "_border", None) is None:
1168
- self._border = CellBorder()
1169
1167
 
1170
1168
  def _to_buffer(self) -> bytes | None: # noqa: C901, PLR0912, PLR0915
1171
1169
  """Create a storage buffer for a cell using v5 (modern) layout."""
@@ -1369,9 +1367,6 @@ class Cell(_CellStorageFlags, Cacheable):
1369
1367
  )
1370
1368
  return None
1371
1369
  image_data = self._model.objects.blob_store[image_pathnames[0]]
1372
- if not isinstance(image_data, bytes):
1373
- msg = f"Expected raw bytes for image '{preferred_filename}'"
1374
- raise FileFormatError(msg)
1375
1370
  digest = sha1(image_data).digest() # noqa: S324
1376
1371
  if digest not in self._model.images:
1377
1372
  self._model.images[digest] = image_id
@@ -1441,9 +1436,11 @@ class Cell(_CellStorageFlags, Cacheable):
1441
1436
 
1442
1437
  def _date_format(self) -> str:
1443
1438
  """Return the formatted date or time value."""
1444
- if self._date_format_id is None or self._datetime is None:
1445
- return ""
1446
- date_format = self._model.table_format(self._table_id, self._date_format_id)
1439
+ # Cannot be logically be None in valid documents
1440
+ date_format_id = cast("int", self._date_format_id)
1441
+ cell_datetime = cast("datetime", self._datetime)
1442
+
1443
+ date_format = self._model.table_format(self._table_id, date_format_id)
1447
1444
  if date_format.HasField("custom_uid"):
1448
1445
  format_uuid = NumbersUUID(date_format.custom_uid).hex
1449
1446
  format_map = self._model.custom_format_map()
@@ -1452,7 +1449,7 @@ class Cell(_CellStorageFlags, Cacheable):
1452
1449
  if custom_format.format_type == FormatType.CUSTOM_DATE:
1453
1450
  formatted_value = _decode_date_format(
1454
1451
  custom_format_string,
1455
- self._datetime,
1452
+ cell_datetime,
1456
1453
  )
1457
1454
  else:
1458
1455
  warn(
@@ -1464,24 +1461,24 @@ class Cell(_CellStorageFlags, Cacheable):
1464
1461
  else:
1465
1462
  formatted_value = _decode_date_format(
1466
1463
  date_format.date_time_format,
1467
- self._datetime,
1464
+ cell_datetime,
1468
1465
  )
1469
1466
  return formatted_value
1470
1467
 
1471
1468
  def _duration_format(self) -> str: # noqa: C901
1472
1469
  """Return the formatted duration value."""
1473
- if self._duration_format_id is None:
1474
- return ""
1470
+ # Cannot be logically be None in valid documents
1471
+ duration_format_id = cast("int", self._duration_format_id)
1475
1472
  duration_format = self._model.table_format(
1476
1473
  self._table_id,
1477
- self._duration_format_id,
1474
+ duration_format_id,
1478
1475
  )
1479
1476
  debug(
1480
1477
  "duration_format: @[%d,%d]: table_id=%d, duration_format_id=%d, duration_style=%s",
1481
1478
  self.row,
1482
1479
  self.col,
1483
1480
  self._table_id,
1484
- self._duration_format_id,
1481
+ duration_format_id,
1485
1482
  duration_format.duration_style,
1486
1483
  )
1487
1484
 
@@ -183,9 +183,9 @@ class ObjectStore(IWorkHandler):
183
183
 
184
184
  This keeps the file store ready for saving to a new document.
185
185
  """
186
- for obj_id, obj in self._objects.items():
186
+ for obj_id in self._objects:
187
187
  iwa = self._archive_store[self._object_to_filename_map[obj_id]]
188
- copy_object_to_iwa_file(iwa, obj, obj_id)
188
+ copy_object_to_iwa_file(iwa, obj_id)
189
189
 
190
190
  def remove_unreferenced_objects(self) -> None:
191
191
  """Remove objects from the ObjectStore that are not referenced."""
@@ -1298,10 +1298,17 @@ class Table(Cacheable):
1298
1298
  If the cell type cannot be determined from the type of ``value``.
1299
1299
 
1300
1300
  """
1301
- # TODO: write needs to retain/init the border
1302
1301
  (row, col, *rest) = self._validate_cell_coords(*args)
1303
1302
  value = rest[0]
1303
+
1304
+ prev_cell = self._data[row][col]
1304
1305
  self._data[row][col] = Cell._from_value(row, col, value)
1306
+ self._data[row][col]._border = prev_cell._border
1307
+ self._data[row][col]._comment_id = prev_cell._comment_id
1308
+ if style is None:
1309
+ self._data[row][col]._style = prev_cell._style
1310
+ self._data[row][col]._cell_style_id = prev_cell._cell_style_id
1311
+ self._data[row][col]._text_style_id = prev_cell._text_style_id
1305
1312
  self._data[row][col]._update_value(value, self._data[row][col])
1306
1313
 
1307
1314
  merge_cells = self._model.merge_cells(self._table_id)
@@ -482,18 +482,14 @@ def find_references(
482
482
  _collect_references(target, references)
483
483
 
484
484
 
485
- def copy_object_to_iwa_file(iwa_file: IWAFile, obj: ProtoMessage, obj_id: int) -> None:
485
+ def copy_object_to_iwa_file(iwa_file: IWAFile, obj_id: int) -> None:
486
486
  """Copy object to iwa file."""
487
487
  archive = iwa_file.chunks[0].get_archive(obj_id)
488
488
  if archive is None:
489
489
  return
490
490
 
491
- target_obj = archive.objects[0]
492
- if not isinstance(target_obj, ProtobufPatch) and target_obj is not obj:
493
- target_obj.CopyFrom(obj)
494
-
495
491
  references: list[int] = []
496
- find_references(target_obj, references)
492
+ find_references(archive.objects[0], references)
497
493
  if references:
498
494
  archive.header.message_infos[0].object_references[:] = references
499
495
 
@@ -1624,6 +1624,12 @@ class NumbersModel(Cacheable):
1624
1624
 
1625
1625
  # Build a minimal table duplicating references from the source table
1626
1626
  from_table_refs = field_references(from_table)
1627
+ uid_map_id, _ = self.objects.create_object_from_dict(
1628
+ "CalculationEngine",
1629
+ {},
1630
+ TSTArchives.ColumnRowUIDMapArchive,
1631
+ )
1632
+ from_table_refs["base_column_row_uids"] = {"identifier": uid_map_id}
1627
1633
  table_model_id, table_model = self.objects.create_object_from_dict(
1628
1634
  "CalculationEngine",
1629
1635
  {
@@ -2347,7 +2353,7 @@ class NumbersModel(Cacheable):
2347
2353
  payload_entries = payload_storage.table_para_style.entries
2348
2354
  table_list_styles = payload_storage.table_list_style.entries
2349
2355
  offsets = [e.character_index for e in payload_entries]
2350
- table_list_style = None
2356
+
2351
2357
  for i, offset in enumerate(offsets):
2352
2358
  if i == len(offsets) - 1:
2353
2359
  bullets.append(cell_text[offset:])
@@ -2359,20 +2365,22 @@ class NumbersModel(Cacheable):
2359
2365
  if i < len(table_list_styles):
2360
2366
  table_list_style = table_list_styles[i]
2361
2367
 
2362
- if table_list_style is None:
2363
- bullet_char = None
2368
+ # table_list_style cannot be None
2369
+ table_list_style = cast(
2370
+ "TSWPArchives.ObjectAttributeTable.ObjectAttribute",
2371
+ table_list_style,
2372
+ )
2373
+ bullet_style = self.get_object(
2374
+ table_list_style.object.identifier,
2375
+ TSWPArchives.ListStyleArchive,
2376
+ )
2377
+ if len(bullet_style.strings) > 0:
2378
+ bullet_char = bullet_style.strings[0]
2379
+ elif len(bullet_style.number_types) > 0:
2380
+ number_type = bullet_style.number_types[0]
2381
+ bullet_char = formatted_number(number_type, i)
2364
2382
  else:
2365
- bullet_style = self.get_object(
2366
- table_list_style.object.identifier,
2367
- TSWPArchives.ListStyleArchive,
2368
- )
2369
- if len(bullet_style.strings) > 0:
2370
- bullet_char = bullet_style.strings[0]
2371
- elif len(bullet_style.number_types) > 0:
2372
- number_type = bullet_style.number_types[0]
2373
- bullet_char = formatted_number(number_type, i)
2374
- else:
2375
- bullet_char = None
2383
+ bullet_char = None
2376
2384
 
2377
2385
  bullet_chars.append(bullet_char)
2378
2386
 
@@ -2383,7 +2391,9 @@ class NumbersModel(Cacheable):
2383
2391
  "bullet_chars": bullet_chars,
2384
2392
  "hyperlinks": hyperlinks,
2385
2393
  }
2386
- return None
2394
+
2395
+ # Never reached
2396
+ return None # pragma: no cover
2387
2397
 
2388
2398
  def table_comments(self, table_id: int, key: int) -> list[Comment]:
2389
2399
  """Resolve a comment ID to a list of Comment objects."""
@@ -3236,7 +3246,7 @@ class NumbersModel(Cacheable):
3236
3246
  """Keep UID maps and dependency bounds in sync with data dimensions."""
3237
3247
  table_model = self.table_model(table_id)
3238
3248
 
3239
- def _update_map(uid_map_ref: TSPMessages.Reference) -> None: # noqa: C901
3249
+ def _update_map(uid_map_ref: TSPMessages.Reference) -> None:
3240
3250
  """Update map."""
3241
3251
  if not uid_map_ref or uid_map_ref.identifier == 0:
3242
3252
  return
@@ -3249,13 +3259,9 @@ class NumbersModel(Cacheable):
3249
3259
 
3250
3260
  if num_cols > len(col_uuids):
3251
3261
  col_uuids.extend([NumbersUUID() for _ in range(num_cols - len(col_uuids))])
3252
- elif num_cols < len(col_uuids):
3253
- col_uuids = col_uuids[:num_cols]
3254
3262
 
3255
3263
  if num_rows > len(row_uuids):
3256
3264
  row_uuids.extend([NumbersUUID() for _ in range(num_rows - len(row_uuids))])
3257
- elif num_rows < len(row_uuids):
3258
- row_uuids = row_uuids[:num_rows]
3259
3265
 
3260
3266
  sorted_col_uuids = sorted(col_uuids, key=lambda x: x.int)
3261
3267
  sorted_row_uuids = sorted(row_uuids, key=lambda x: x.int)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: numbers-parser
3
- Version: 4.23.1
3
+ Version: 4.23.2
4
4
  Summary: Read and write Apple Numbers spreadsheets
5
5
  Author-email: Jon Connell <python@figsandfudge.com>
6
6
  License-Expression: MIT
@@ -8,6 +8,21 @@ from unittest.mock import patch
8
8
 
9
9
  import pytest
10
10
 
11
+ from numbers_parser import Document, PaddingType
12
+ from numbers_parser.cell import (
13
+ _decode_date_format,
14
+ _decode_number_format,
15
+ _format_currency,
16
+ _format_decimal,
17
+ )
18
+ from numbers_parser.generated import TSKArchives_pb2 as TSKArchives
19
+ from numbers_parser.generated import TSPMessages_pb2 as TSPMessages
20
+ from numbers_parser.iwafile import (
21
+ IWAFile,
22
+ find_references,
23
+ )
24
+ from numbers_parser.model import MergeCells, get_storage_buffers_for_row
25
+
11
26
  if TYPE_CHECKING:
12
27
  from typing import Any
13
28
 
@@ -17,10 +32,8 @@ from numbers_parser import (
17
32
  Cell,
18
33
  CellBorder,
19
34
  CustomFormatting,
20
- Document,
21
35
  FileFormatError,
22
36
  Formatting,
23
- PaddingType,
24
37
  UnsupportedError,
25
38
  UnsupportedWarning,
26
39
  )
@@ -28,10 +41,7 @@ from numbers_parser._unpack_numbers import NumbersUnpacker
28
41
  from numbers_parser.cell import (
29
42
  DurationUnits,
30
43
  _auto_units,
31
- _decode_number_format,
32
44
  _float_to_n_digit_fraction,
33
- _format_currency,
34
- _format_decimal,
35
45
  )
36
46
  from numbers_parser.constants import (
37
47
  DECIMAL_PLACES_AUTO,
@@ -45,9 +55,7 @@ from numbers_parser.experimental import (
45
55
  enable_experimental_feature,
46
56
  experimental_features,
47
57
  )
48
- from numbers_parser.generated import TSKArchives_pb2 as TSKArchives
49
58
  from numbers_parser.generated import TSTArchives_pb2 as TSTArchives
50
- from numbers_parser.model import _decode_date_format
51
59
  from numbers_parser.numbers_uuid import NumbersUUID
52
60
  from numbers_parser.xrefs import (
53
61
  xl_cell_to_rowcol,
@@ -437,6 +445,114 @@ def test_add_component_metadata_none_locator() -> None:
437
445
  assert added_component.locator == ""
438
446
 
439
447
 
448
+ def test_iwafile_from_dict_roundtrip() -> None:
449
+ """Cover IWAFile.from_dict (line 58) and IWACompressedChunk.from_dict (line 137)."""
450
+ doc = Document()
451
+ iwa = next(iter(doc._model.objects.archive_store.values()))
452
+ as_dict = iwa.to_dict()
453
+ rebuilt = IWAFile.from_dict(as_dict)
454
+ assert len(rebuilt.chunks) == len(iwa.chunks)
455
+
456
+
457
+ def test_find_references_edge_cases() -> None:
458
+ """Cover default references=None, non-protobuf target, and direct Reference."""
459
+ ref = TSPMessages.Reference(identifier=42)
460
+
461
+ find_references(ref)
462
+
463
+ refs: list[int] = []
464
+ find_references("not-a-protobuf", refs) # type: ignore[arg-type]
465
+ assert not refs
466
+
467
+ find_references(ref, refs)
468
+ assert refs == [42]
469
+
470
+
471
+ def test_cell_date_trailing_quote() -> None:
472
+ """Cover trailing single-quote break in _decode_date_format (line 1168)."""
473
+ result = _decode_date_format("yyyy-MM-dd'", datetime(2026, 1, 15))
474
+ assert result == "2026-01-15"
475
+
476
+
477
+ def test_cell_custom_number_scientific_decimal(tmp_path: Path) -> None:
478
+ """Cover 'e' in str(decimal) branches in _decode_number_format (lines 1373-1374)."""
479
+ doc = Document()
480
+ table = doc.sheets[0].tables[0]
481
+
482
+ space_fmt = doc.add_custom_format(
483
+ name="TinySpace",
484
+ type="number",
485
+ num_integers=1,
486
+ num_decimals=5,
487
+ decimal_format=PaddingType.SPACES,
488
+ )
489
+ none_fmt = doc.add_custom_format(
490
+ name="TinyNone",
491
+ type="number",
492
+ num_integers=1,
493
+ num_decimals=5,
494
+ decimal_format=PaddingType.NONE,
495
+ )
496
+
497
+ table.write(0, 0, 0.00001)
498
+ table.set_cell_formatting(0, 0, "custom", format=space_fmt)
499
+ table.write(0, 1, 0.00001)
500
+ table.set_cell_formatting(0, 1, "custom", format=none_fmt)
501
+
502
+ out = tmp_path / "tiny-decimals.numbers"
503
+ doc.save(out)
504
+ reloaded = Document(out)
505
+ t = reloaded.sheets[0].tables[0]
506
+ assert t.cell(0, 0).formatted_value == ".00001"
507
+ assert t.cell(0, 1).formatted_value == "0.00001"
508
+
509
+
510
+ def test_cell_format_none_guards() -> None:
511
+ """Cover None guards in _format_decimal (line 1445) and _format_currency (line 1474)."""
512
+ fmt = TSKArchives.FormatStructArchive()
513
+ assert _format_decimal(None, fmt) == "" # type: ignore[arg-type]
514
+ assert _format_decimal(1.0, None) == "" # type: ignore[arg-type]
515
+ assert _format_currency(1.0, None) is None # type: ignore[arg-type]
516
+ assert _decode_number_format(None, 1.0, "", []) is None # type: ignore[arg-type]
517
+
518
+
519
+ def test_merge_cells_missing_entries() -> None:
520
+ """Cover MergeCells.size() fallback (line 145) and MergeCells.rect() fallback (line 152)."""
521
+ merges = MergeCells()
522
+ assert merges.size((99, 99)) == (0, 0)
523
+ assert merges.rect((99, 99)) is None
524
+
525
+
526
+ def test_model_shrink_table_metadata_ranges(tmp_path: Path) -> None:
527
+ """Cover shrinking col_uuids / row_uuids in update_table_metadata_ranges."""
528
+ doc = Document()
529
+ model = doc._model
530
+ table_id = model.table_ids()[0]
531
+ num_rows = model.number_of_rows(table_id)
532
+ num_cols = model.number_of_columns(table_id)
533
+
534
+ model.update_table_metadata_ranges(table_id, num_rows - 1, num_cols - 1)
535
+ out = tmp_path / "shrunk.numbers"
536
+ doc.save(out)
537
+
538
+
539
+ def test_get_storage_buffers_short_offsets() -> None:
540
+ """Cover short offset_list break and trailing empty cells in get_storage_buffers_for_row."""
541
+ # 2 offsets for a 4-column row: col 0 at byte 0, col 1 empty (-1), cols 2-3 missing
542
+ buf = b"\x05" + b"\x00" * 31
543
+ offsets = b"\x00\x00\xff\xff" # struct.pack("<2h", 0, -1)
544
+ result = get_storage_buffers_for_row(buf, offsets, num_cols=4, has_wide_offsets=True)
545
+ assert result == [buf, None]
546
+
547
+
548
+ def test_coverage_fixture_loads() -> None:
549
+ """Exercise the generated protobuf edge-case."""
550
+ doc = Document("tests/data/coverage-edge-cases.numbers")
551
+ table = doc.sheets[0].tables[0]
552
+ assert table.cell(1, 0).formatted_value == ".00001"
553
+ assert table.cell(1, 1).formatted_value == "0.00001"
554
+
555
+
440
556
  # pylint: disable=import-outside-toplevel
441
557
  # ruff: noqa: PLC0415
442
558
 
@@ -13,6 +13,7 @@ from numbers_parser import (
13
13
  RGB,
14
14
  BackgroundImage,
15
15
  Border,
16
+ BorderType,
16
17
  Cell,
17
18
  CellBorder,
18
19
  Document,
@@ -32,6 +33,7 @@ from numbers_parser.constants import (
32
33
  DEFAULT_ROW_COUNT,
33
34
  DEFAULT_ROW_HEIGHT,
34
35
  )
36
+ from numbers_parser.generated import TSTArchives_pb2 as TSTArchives
35
37
  from numbers_parser.xrefs import CellRange
36
38
 
37
39
 
@@ -1169,3 +1171,65 @@ def test_issue_283(configurable_save_file: Path) -> None:
1169
1171
  and ref.component_identifier == author_storage_id
1170
1172
  ]
1171
1173
  assert len(author_refs) == 1, f"Missing author reference in sheet {sheet_index}"
1174
+
1175
+
1176
+ def test_issue_305(configurable_save_file: Path) -> None:
1177
+ """Adding a smaller table must not truncate the first table's UID map."""
1178
+ doc = Document(num_rows=10, num_cols=4)
1179
+ doc.sheets[0].add_table("Second Table", num_rows=3, num_cols=2)
1180
+
1181
+ doc.save(configurable_save_file)
1182
+
1183
+ reloaded = Document(configurable_save_file)
1184
+ t1 = reloaded.sheets[0].tables[0]
1185
+ t2 = reloaded.sheets[0].tables["Second Table"]
1186
+
1187
+ t1_uid_id = reloaded._model.table_model(t1._table_id).base_column_row_uids.identifier
1188
+ t2_uid_id = reloaded._model.table_model(t2._table_id).base_column_row_uids.identifier
1189
+ assert t1_uid_id != t2_uid_id
1190
+
1191
+ t1_uid_map = reloaded._model.get_object(t1_uid_id, TSTArchives.ColumnRowUIDMapArchive)
1192
+ t2_uid_map = reloaded._model.get_object(t2_uid_id, TSTArchives.ColumnRowUIDMapArchive)
1193
+
1194
+ assert len(t1_uid_map.sorted_row_uids) == 10
1195
+ assert len(t1_uid_map.sorted_column_uids) == 4
1196
+ assert len(t2_uid_map.sorted_row_uids) == 3
1197
+ assert len(t2_uid_map.sorted_column_uids) == 2
1198
+
1199
+
1200
+ def test_issue_307(configurable_save_file: Path) -> None:
1201
+ """Table.write() must preserve existing borders, styles, and comments."""
1202
+ doc = Document(num_header_rows=0, num_header_cols=0, num_rows=4, num_cols=2)
1203
+ table = doc.sheets[0].tables[0]
1204
+
1205
+ right_border = Border(3.0, RGB(0, 0, 255), BorderType.DOTS)
1206
+ table.write(0, 0, "Left")
1207
+ table.set_cell_border(0, 0, "right", right_border)
1208
+ table.write(0, 1, "Right")
1209
+
1210
+ top_border = Border(2.0, RGB(255, 0, 0), BorderType.SOLID)
1211
+ table.set_cell_border(1, 0, "top", top_border)
1212
+ table.write(1, 0, "Bordered")
1213
+
1214
+ style = doc.add_style(name="Highlight", bg_color=RGB(255, 255, 0))
1215
+ table.write(2, 0, "Initial", style=style)
1216
+ table.write(2, 0, "Updated")
1217
+
1218
+ table.write(3, 0, "Commented")
1219
+ table.add_comment(3, 0, "Keep this comment", author="Tester")
1220
+ table.write(3, 0, "Updated comment cell")
1221
+
1222
+ doc.save(configurable_save_file)
1223
+
1224
+ reloaded = Document(configurable_save_file)
1225
+ t = reloaded.sheets[0].tables[0]
1226
+
1227
+ assert t.cell(0, 0).border.right == right_border
1228
+ assert t.cell(0, 1).border.left == right_border
1229
+ assert t.cell(1, 0).border.top == top_border
1230
+ assert t.cell(2, 0).value == "Updated"
1231
+ assert t.cell(2, 0).style.name == "Highlight"
1232
+ assert t.cell(2, 0).style.bg_color == RGB(255, 255, 0)
1233
+ assert t.cell(3, 0).value == "Updated comment cell"
1234
+ assert len(t.cell(3, 0).comments) == 1
1235
+ assert t.cell(3, 0).comments[0].text == "Keep this comment"