numbers-parser 4.23.0__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.0/src/numbers_parser.egg-info → numbers_parser-4.23.2}/PKG-INFO +1 -1
  2. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/pyproject.toml +4 -3
  3. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/cell.py +12 -15
  4. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/containers.py +18 -31
  5. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/document.py +8 -1
  6. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/iwafile.py +91 -28
  7. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/model.py +61 -46
  8. {numbers_parser-4.23.0 → numbers_parser-4.23.2/src/numbers_parser.egg-info}/PKG-INFO +1 -1
  9. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_coverage.py +123 -7
  10. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_issues.py +105 -0
  11. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/LICENSE.rst +0 -0
  12. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/README.md +0 -0
  13. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/setup.cfg +0 -0
  14. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/__init__.py +0 -0
  15. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/_cat_numbers.py +0 -0
  16. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/_csv2numbers.py +0 -0
  17. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/_unpack_numbers.py +0 -0
  18. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/bullets.py +0 -0
  19. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/constants.py +0 -0
  20. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/currencies.py +0 -0
  21. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/data/empty.numbers +0 -0
  22. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/exceptions.py +0 -0
  23. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/experimental.py +0 -0
  24. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/formula.py +0 -0
  25. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
  26. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_pb2.pyi +0 -0
  27. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
  28. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNArchives_sos_pb2.pyi +0 -0
  29. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
  30. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_pb2.pyi +0 -0
  31. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
  32. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.pyi +0 -0
  33. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
  34. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_pb2.pyi +0 -0
  35. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
  36. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.pyi +0 -0
  37. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
  38. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.pyi +0 -0
  39. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
  40. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCEArchives_pb2.pyi +0 -0
  41. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
  42. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.pyi +0 -0
  43. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
  44. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.pyi +0 -0
  45. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
  46. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.pyi +0 -0
  47. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
  48. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_pb2.pyi +0 -0
  49. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
  50. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.pyi +0 -0
  51. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
  52. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.pyi +0 -0
  53. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2 2.py +0 -0
  54. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
  55. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.pyi +0 -0
  56. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
  57. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_pb2.pyi +0 -0
  58. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
  59. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.pyi +0 -0
  60. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
  61. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_pb2.pyi +0 -0
  62. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
  63. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.pyi +0 -0
  64. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
  65. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.pyi +0 -0
  66. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
  67. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSKArchives_pb2.pyi +0 -0
  68. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
  69. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.pyi +0 -0
  70. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
  71. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.pyi +0 -0
  72. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
  73. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSPMessages_pb2.pyi +0 -0
  74. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
  75. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_pb2.pyi +0 -0
  76. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
  77. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.pyi +0 -0
  78. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
  79. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_pb2.pyi +0 -0
  80. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
  81. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.pyi +0 -0
  82. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
  83. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.pyi +0 -0
  84. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
  85. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.pyi +0 -0
  86. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
  87. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_pb2.pyi +0 -0
  88. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
  89. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.pyi +0 -0
  90. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
  91. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.pyi +0 -0
  92. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/__init__.py +0 -0
  93. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/fontmap.py +0 -0
  94. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/functionmap.py +0 -0
  95. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/generated/mapping.py +0 -0
  96. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/iwork.py +0 -0
  97. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/numbers_cache.py +0 -0
  98. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/numbers_uuid.py +0 -0
  99. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/py.typed +0 -0
  100. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/roman.py +0 -0
  101. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser/xrefs.py +0 -0
  102. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
  103. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
  104. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/entry_points.txt +0 -0
  105. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/requires.txt +0 -0
  106. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/src/numbers_parser.egg-info/top_level.txt +0 -0
  107. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_all_formulas.py +0 -0
  108. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_api_change.py +0 -0
  109. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_borders.py +0 -0
  110. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_bullets.py +0 -0
  111. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_cat_numbers.py +0 -0
  112. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_categories.py +0 -0
  113. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_comments.py +0 -0
  114. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_create_cells.py +0 -0
  115. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_csv2numbers.py +0 -0
  116. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_currency.py +0 -0
  117. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_encrypted.py +0 -0
  118. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_folder.py +0 -0
  119. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_formatting.py +0 -0
  120. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_formulas.py +0 -0
  121. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_large.py +0 -0
  122. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_local_docs.py +0 -0
  123. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_memory_leaks.py +0 -0
  124. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_merges.py +0 -0
  125. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_package.py +0 -0
  126. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_properties.py +0 -0
  127. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_roman.py +0 -0
  128. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_save.py +0 -0
  129. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_slices.py +0 -0
  130. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_styles.py +0 -0
  131. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_table_size.py +0 -0
  132. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_tables.py +0 -0
  133. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_unpack_numbers.py +0 -0
  134. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_unsupported.py +0 -0
  135. {numbers_parser-4.23.0 → numbers_parser-4.23.2}/tests/test_uuids.py +0 -0
  136. {numbers_parser-4.23.0 → 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.0
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.0"
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
 
@@ -4,7 +4,7 @@ import math
4
4
  import re
5
5
  from collections.abc import Iterator
6
6
  from pathlib import Path
7
- from typing import TYPE_CHECKING, Any, Generic, Protocol, TypeVar, overload
7
+ from typing import TYPE_CHECKING, Any, Generic, Protocol, TypeVar, cast, overload
8
8
 
9
9
  from google.protobuf.message import Message as ProtoMessage
10
10
 
@@ -15,7 +15,13 @@ from numbers_parser.constants import (
15
15
  SUPPORTED_NUMBERS_VERSIONS,
16
16
  )
17
17
  from numbers_parser.generated import TSPArchiveMessages_pb2 as TSPArchiveMessages
18
- from numbers_parser.iwafile import IWAFile, copy_object_to_iwa_file, create_iwa_segment
18
+ from numbers_parser.iwafile import (
19
+ IWACompressedChunk,
20
+ IWAFile,
21
+ copy_object_to_iwa_file,
22
+ create_iwa_segment,
23
+ find_references,
24
+ )
19
25
  from numbers_parser.iwork import IWork, IWorkHandler
20
26
 
21
27
  if TYPE_CHECKING:
@@ -146,7 +152,6 @@ class ObjectStore(IWorkHandler):
146
152
  iwa_file: str,
147
153
  object_dict: dict[str, Any],
148
154
  cls: type[_ProtoT],
149
- append: bool = False,
150
155
  ) -> tuple[int, _ProtoT]:
151
156
  """
152
157
  Create and store an object with its IWA segment.
@@ -159,19 +164,14 @@ class ObjectStore(IWorkHandler):
159
164
  new_id = self.new_message_id()
160
165
  iwa_segment = create_iwa_segment(new_id, cls, object_dict)
161
166
 
162
- if iwa_pathname is None or not append:
163
- if iwa_pathname is None:
164
- iwa_pathname = iwa_file.format(new_id) + ".iwa"
165
- chunks = {"chunks": [{"archives": [iwa_segment.to_dict()]}]}
166
- self._archive_store[iwa_pathname] = IWAFile.from_dict(chunks)
167
- else:
168
- iwa = self._archive_store[iwa_pathname]
169
- iwa.chunks[0].archives.append(iwa_segment)
167
+ if iwa_pathname is None:
168
+ iwa_pathname = iwa_file.format(new_id) + ".iwa"
169
+ self._archive_store[iwa_pathname] = IWAFile([IWACompressedChunk([iwa_segment])])
170
170
  else:
171
171
  iwa = self._archive_store[iwa_pathname]
172
172
  iwa.chunks[0].archives.append(iwa_segment)
173
173
 
174
- new_obj = cls(**object_dict)
174
+ new_obj = cast("_ProtoT", iwa_segment.objects[0])
175
175
  self._objects[new_id] = new_obj
176
176
  self._object_to_filename_map[new_id] = iwa_pathname
177
177
 
@@ -183,30 +183,17 @@ 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."""
192
- referenced_ids = {DOCUMENT_ID, PACKAGE_ID}
193
-
194
- def find_references(msg: ProtoMessage) -> None:
195
- """Recursively find all TSP.Reference messages in protobuf."""
196
- if hasattr(msg, "identifier") and msg.DESCRIPTOR.name == "Reference":
197
- referenced_ids.add(msg.identifier)
198
-
199
- for field_desc, value in msg.ListFields():
200
- if field_desc.type != field_desc.TYPE_MESSAGE:
201
- continue
202
- if field_desc.is_repeated:
203
- for item in value:
204
- find_references(item)
205
- else:
206
- find_references(value)
207
-
192
+ referenced_ids: set[int] = {DOCUMENT_ID, PACKAGE_ID}
193
+ refs: list[int] = []
208
194
  for obj in self._objects.values():
209
- find_references(obj)
195
+ find_references(obj, refs)
196
+ referenced_ids.update(refs)
210
197
 
211
198
  metadata = self.get_as(PACKAGE_ID, TSPArchiveMessages.PackageMetadata)
212
199
  unreferenced_ids = set(self._objects.keys()) - referenced_ids
@@ -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)
@@ -5,11 +5,13 @@ from __future__ import annotations
5
5
 
6
6
  import logging
7
7
  import struct
8
+ from enum import IntEnum
8
9
  from functools import partial
9
10
  from struct import unpack
10
11
  from typing import TYPE_CHECKING, Any, cast
11
12
 
12
13
  import snappy
14
+ from google.protobuf.descriptor import FieldDescriptor
13
15
  from google.protobuf.internal.decoder import _DecodeVarint32 # type: ignore[attr-defined]
14
16
  from google.protobuf.internal.encoder import _VarintBytes # type: ignore[attr-defined]
15
17
  from google.protobuf.json_format import MessageToDict, ParseDict
@@ -75,6 +77,13 @@ class IWACompressedChunk: # noqa: PLW1641
75
77
  def __init__(self, archives: list[IWAArchiveSegment]) -> None:
76
78
  """Initialize the instance state."""
77
79
  self.archives = archives
80
+ self._archive_map: dict[int, IWAArchiveSegment] | None = None
81
+
82
+ def get_archive(self, obj_id: int) -> IWAArchiveSegment | None:
83
+ """Return the archive segment with the given identifier, or None."""
84
+ if self._archive_map is None or len(self._archive_map) != len(self.archives):
85
+ self._archive_map = {a.header.identifier: a for a in self.archives}
86
+ return self._archive_map.get(obj_id)
78
87
 
79
88
  def __eq__(self, other: object) -> bool: # pragma: no cover
80
89
  """Compare this instance with another value."""
@@ -388,6 +397,72 @@ def create_iwa_segment(
388
397
  return IWAArchiveSegment.from_dict(archive_dict)
389
398
 
390
399
 
400
+ class _RefKind(IntEnum):
401
+ """Classification of whether a protobuf descriptor can hold TSP.Reference values."""
402
+
403
+ NONE = 0
404
+ MAY_CONTAIN = 1
405
+ REFERENCE = 2
406
+
407
+
408
+ _TYPE_MESSAGE = FieldDescriptor.TYPE_MESSAGE
409
+ _REF_KIND_CACHE: dict[Any, _RefKind] = {}
410
+
411
+
412
+ def _ref_kind(desc: Any) -> _RefKind: # noqa: ANN401
413
+ """Return whether a protobuf descriptor is or can contain a TSP.Reference."""
414
+ kind = _REF_KIND_CACHE.get(desc)
415
+ if kind is not None:
416
+ return kind
417
+
418
+ if desc.full_name == "TSP.Reference":
419
+ _REF_KIND_CACHE[desc] = _RefKind.REFERENCE
420
+ return _RefKind.REFERENCE
421
+
422
+ visited: set[Any] = {desc}
423
+ stack: list[Any] = [desc]
424
+ found = False
425
+ while stack:
426
+ current = stack.pop()
427
+ if current.extension_ranges:
428
+ found = True
429
+ break
430
+ for field in current.fields:
431
+ if field.type == _TYPE_MESSAGE and field.message_type is not None:
432
+ msg_type = field.message_type
433
+ if msg_type.full_name == "TSP.Reference":
434
+ found = True
435
+ break
436
+ if msg_type not in visited:
437
+ visited.add(msg_type)
438
+ stack.append(msg_type)
439
+ if found:
440
+ break
441
+
442
+ kind = _RefKind.MAY_CONTAIN if found else _RefKind.NONE
443
+ _REF_KIND_CACHE[desc] = kind
444
+ return kind
445
+
446
+
447
+ def _collect_references(msg: ProtoMessage, references: list[int]) -> None:
448
+ """Recursively collect TSP.Reference identifiers from a protobuf message."""
449
+ for field, value in msg.ListFields():
450
+ if field.type != _TYPE_MESSAGE or field.message_type is None:
451
+ continue
452
+ kind = _ref_kind(field.message_type)
453
+ if kind is _RefKind.REFERENCE:
454
+ if field.is_repeated:
455
+ references.extend(item.identifier for item in value)
456
+ else:
457
+ references.append(value.identifier)
458
+ elif kind is _RefKind.MAY_CONTAIN:
459
+ if field.is_repeated:
460
+ for item in value:
461
+ _collect_references(item, references)
462
+ else:
463
+ _collect_references(value, references)
464
+
465
+
391
466
  def find_references(
392
467
  obj: ProtoMessage | ProtobufPatch,
393
468
  references: list[int] | None = None,
@@ -399,36 +474,24 @@ def find_references(
399
474
  target = obj.data if isinstance(obj, ProtobufPatch) else obj
400
475
  if not hasattr(target, "DESCRIPTOR"):
401
476
  return
402
- if type(target).__name__ == "Reference":
477
+
478
+ kind = _ref_kind(target.DESCRIPTOR)
479
+ if kind is _RefKind.REFERENCE:
403
480
  references.append(target.identifier) # type: ignore[attr-defined]
404
- return
405
- for field_desc in target.ListFields():
406
- _, field = field_desc
407
- if type(field).__name__ == "Reference":
408
- references.append(field.identifier) # type: ignore[attr-defined]
409
- elif "Repeated" in type(field).__name__:
410
- for item in field:
411
- find_references(item, references)
412
- elif hasattr(field, "DESCRIPTOR"):
413
- find_references(field, references)
414
-
415
-
416
- def copy_object_to_iwa_file(iwa_file: IWAFile, obj: ProtoMessage, obj_id: int) -> None:
481
+ elif kind is _RefKind.MAY_CONTAIN:
482
+ _collect_references(target, references)
483
+
484
+
485
+ def copy_object_to_iwa_file(iwa_file: IWAFile, obj_id: int) -> None:
417
486
  """Copy object to iwa file."""
418
- for archive in iwa_file.chunks[0].archives:
419
- if archive.header.identifier == obj_id:
420
- target_obj = archive.objects[0]
421
- if not isinstance(target_obj, ProtobufPatch):
422
- target_obj.CopyFrom(obj)
423
-
424
- references: list[int] = []
425
- find_references(target_obj, references)
426
- if len(references) > 0:
427
- msg_info = archive.header.message_infos[0]
428
- while len(msg_info.object_references) > 0:
429
- _ = msg_info.object_references.pop()
430
- for reference in references:
431
- msg_info.object_references.append(reference)
487
+ archive = iwa_file.chunks[0].get_archive(obj_id)
488
+ if archive is None:
489
+ return
490
+
491
+ references: list[int] = []
492
+ find_references(archive.objects[0], references)
493
+ if references:
494
+ archive.header.message_infos[0].object_references[:] = references
432
495
 
433
496
 
434
497
  def is_iwa_file(data: bytes) -> bool:
@@ -671,7 +671,6 @@ class NumbersModel(Cacheable):
671
671
  f"Index/Tables/DataList-{parent_id}",
672
672
  {"tsce_item": tsce_items},
673
673
  TSTArchives.PopUpMenuModel,
674
- True, # noqa: FBT003
675
674
  )
676
675
  return popup_menu_id
677
676
 
@@ -1625,6 +1624,12 @@ class NumbersModel(Cacheable):
1625
1624
 
1626
1625
  # Build a minimal table duplicating references from the source table
1627
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}
1628
1633
  table_model_id, table_model = self.objects.create_object_from_dict(
1629
1634
  "CalculationEngine",
1630
1635
  {
@@ -2348,7 +2353,7 @@ class NumbersModel(Cacheable):
2348
2353
  payload_entries = payload_storage.table_para_style.entries
2349
2354
  table_list_styles = payload_storage.table_list_style.entries
2350
2355
  offsets = [e.character_index for e in payload_entries]
2351
- table_list_style = None
2356
+
2352
2357
  for i, offset in enumerate(offsets):
2353
2358
  if i == len(offsets) - 1:
2354
2359
  bullets.append(cell_text[offset:])
@@ -2360,20 +2365,22 @@ class NumbersModel(Cacheable):
2360
2365
  if i < len(table_list_styles):
2361
2366
  table_list_style = table_list_styles[i]
2362
2367
 
2363
- if table_list_style is None:
2364
- 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)
2365
2382
  else:
2366
- bullet_style = self.get_object(
2367
- table_list_style.object.identifier,
2368
- TSWPArchives.ListStyleArchive,
2369
- )
2370
- if len(bullet_style.strings) > 0:
2371
- bullet_char = bullet_style.strings[0]
2372
- elif len(bullet_style.number_types) > 0:
2373
- number_type = bullet_style.number_types[0]
2374
- bullet_char = formatted_number(number_type, i)
2375
- else:
2376
- bullet_char = None
2383
+ bullet_char = None
2377
2384
 
2378
2385
  bullet_chars.append(bullet_char)
2379
2386
 
@@ -2384,7 +2391,9 @@ class NumbersModel(Cacheable):
2384
2391
  "bullet_chars": bullet_chars,
2385
2392
  "hyperlinks": hyperlinks,
2386
2393
  }
2387
- return None
2394
+
2395
+ # Never reached
2396
+ return None # pragma: no cover
2388
2397
 
2389
2398
  def table_comments(self, table_id: int, key: int) -> list[Comment]:
2390
2399
  """Resolve a comment ID to a list of Comment objects."""
@@ -2420,36 +2429,47 @@ class NumbersModel(Cacheable):
2420
2429
  storage_id = self.find_refs("AnnotationAuthorStorageArchive")[0]
2421
2430
  storage = self.get_object(storage_id, TSKArchives.AnnotationAuthorStorageArchive)
2422
2431
 
2432
+ target_author_id = None
2423
2433
  for author_ref in storage.annotation_author:
2424
2434
  author = self.get_object(author_ref.identifier, TSKArchives.AnnotationAuthorArchive)
2425
2435
  if author.name == author_name:
2426
- return author_ref.identifier
2436
+ target_author_id = author_ref.identifier
2437
+ break
2427
2438
 
2428
- # Append new authors to the same file that holds the Author Storage array
2429
- new_author_id, _ = self.objects.create_object_from_dict(
2430
- "AnnotationAuthorStorage",
2431
- {
2432
- "name": author_name,
2433
- "color": {
2434
- "model": "rgb",
2435
- "r": 0.0,
2436
- "g": 0.0,
2437
- "b": 0.0,
2438
- "a": 1.0,
2439
- "rgbspace": "srgb",
2439
+ if target_author_id is None:
2440
+ target_author_id, _ = self.objects.create_object_from_dict(
2441
+ "AnnotationAuthorStorage",
2442
+ {
2443
+ "name": author_name,
2444
+ "color": {
2445
+ "model": "rgb",
2446
+ "r": 0.0,
2447
+ "g": 0.0,
2448
+ "b": 0.0,
2449
+ "a": 1.0,
2450
+ "rgbspace": "srgb",
2451
+ },
2440
2452
  },
2441
- },
2442
- TSKArchives.AnnotationAuthorArchive,
2443
- append=True,
2444
- )
2445
- storage.annotation_author.append(TSPMessages.Reference(identifier=new_author_id))
2446
- bds = self.table_model(table_id).base_data_store
2447
- self.add_component_reference(
2448
- object_id=new_author_id,
2449
- location=bds.commentStorageTable.identifier,
2450
- component_id=storage_id,
2453
+ TSKArchives.AnnotationAuthorArchive,
2454
+ )
2455
+ storage.annotation_author.append(TSPMessages.Reference(identifier=target_author_id))
2456
+
2457
+ base_data_store = self.table_model(table_id).base_data_store
2458
+
2459
+ component = self.metadata_component_info(base_data_store.commentStorageTable.identifier)
2460
+ reference_exists = any(
2461
+ ref.object_identifier == target_author_id and ref.component_identifier == storage_id
2462
+ for ref in component.external_references
2451
2463
  )
2452
- return new_author_id
2464
+
2465
+ if not reference_exists:
2466
+ self.add_component_reference(
2467
+ object_id=target_author_id,
2468
+ location=base_data_store.commentStorageTable.identifier,
2469
+ component_id=storage_id,
2470
+ )
2471
+
2472
+ return target_author_id
2453
2473
 
2454
2474
  def add_comment_to_cell( # noqa: PLR0917
2455
2475
  self,
@@ -2483,7 +2503,6 @@ class NumbersModel(Cacheable):
2483
2503
  "storage_uuid": NumbersUUID().dict2,
2484
2504
  },
2485
2505
  TSDArchives.CommentStorageArchive,
2486
- append=True,
2487
2506
  )
2488
2507
  new_comment_ref = TSPMessages.Reference(identifier=new_comment_id)
2489
2508
  if reply:
@@ -3227,7 +3246,7 @@ class NumbersModel(Cacheable):
3227
3246
  """Keep UID maps and dependency bounds in sync with data dimensions."""
3228
3247
  table_model = self.table_model(table_id)
3229
3248
 
3230
- def _update_map(uid_map_ref: TSPMessages.Reference) -> None: # noqa: C901
3249
+ def _update_map(uid_map_ref: TSPMessages.Reference) -> None:
3231
3250
  """Update map."""
3232
3251
  if not uid_map_ref or uid_map_ref.identifier == 0:
3233
3252
  return
@@ -3240,13 +3259,9 @@ class NumbersModel(Cacheable):
3240
3259
 
3241
3260
  if num_cols > len(col_uuids):
3242
3261
  col_uuids.extend([NumbersUUID() for _ in range(num_cols - len(col_uuids))])
3243
- elif num_cols < len(col_uuids):
3244
- col_uuids = col_uuids[:num_cols]
3245
3262
 
3246
3263
  if num_rows > len(row_uuids):
3247
3264
  row_uuids.extend([NumbersUUID() for _ in range(num_rows - len(row_uuids))])
3248
- elif num_rows < len(row_uuids):
3249
- row_uuids = row_uuids[:num_rows]
3250
3265
 
3251
3266
  sorted_col_uuids = sorted(col_uuids, key=lambda x: x.int)
3252
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.0
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