From 3e56dace7353f0363d49452e2c2e6db988ae55ee Mon Sep 17 00:00:00 2001 From: Philipp Defner Date: Wed, 9 Sep 2026 23:40:24 +0100 Subject: [PATCH 001/258] Enhancement: Improve matching for correspondents, storage path and labels by removing bias + adding minimum match threshold (#12164) --- docs/configuration.md | 9 ++ src/documents/classifier.py | 94 +++++++++++----- src/documents/tests/test_classifier.py | 145 +++++++++++++++++++++++++ src/paperless/settings/__init__.py | 7 ++ 4 files changed, 227 insertions(+), 28 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 37a552f1a..e045af077 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1200,6 +1200,15 @@ still perform some basic text pre-processing before matching. Defaults to true, enabling the feature. +#### [`PAPERLESS_CLASSIFIER_MATCH_THRESHOLD=`](#PAPERLESS_CLASSIFIER_MATCH_THRESHOLD) {#PAPERLESS_CLASSIFIER_MATCH_THRESHOLD} + +: Sets the minimum confidence score (0.0-1.0) required for the automatic +classifier to assign a correspondent, document type, or storage path to a +document. Predictions below this threshold are discarded and the field is +left unassigned, preventing low-confidence guesses from being applied. + + Defaults to 0.6. + #### [`PAPERLESS_DATE_PARSER_LANGUAGES=`](#PAPERLESS_DATE_PARSER_LANGUAGES) {#PAPERLESS_DATE_PARSER_LANGUAGES} : Specifies which language Paperless should use when parsing dates from documents. diff --git a/src/documents/classifier.py b/src/documents/classifier.py index a5c272062..cfed4725c 100644 --- a/src/documents/classifier.py +++ b/src/documents/classifier.py @@ -34,6 +34,27 @@ from paperless.signed_pickle import signed_pickle_loads logger = logging.getLogger("paperless.classifier") + +def _predict_with_threshold(classifier, X, threshold: float) -> int | None: + """ + Return the predicted class id, or None if: + - the prediction is -1 (no match), or + - the winning class probability is below the configured threshold. + + Using predict_proba() instead of predict() lets us apply a minimum-confidence + cutoff so that uncertain predictions are discarded rather than assigned. + """ + probas = classifier.predict_proba(X)[0] + best_idx = int(probas.argmax()) + best_class = int(classifier.classes_[best_idx]) + + if best_class == -1: + return None + if threshold > 0.0 and probas[best_idx] < threshold: + return None + return best_class + + ADVANCED_TEXT_PROCESSING_ENABLED = ( settings.NLTK_LANGUAGE is not None and settings.NLTK_ENABLED ) @@ -102,7 +123,8 @@ class DocumentClassifier: # v8 - Added storage path classifier # v9 - Changed from hashing to time/ids for re-train check # v10 - HMAC-signed model file - FORMAT_VERSION = 10 + # v11 - Use sample_weight for balanced training; predict_proba with threshold + FORMAT_VERSION = 11 HMAC_SIZE = 32 # SHA-256 digest length @@ -324,6 +346,13 @@ class DocumentClassifier: from sklearn.preprocessing import LabelBinarizer from sklearn.preprocessing import MultiLabelBinarizer + # MLPClassifier does not support class_weight directly + # (https://github.com/scikit-learn/scikit-learn/issues/9113), so we use + # compute_sample_weight to balance classes during training and prevent + # over-represented correspondents from dominating predictions. + # https://scikit-learn.org/stable/modules/generated/sklearn.utils.class_weight.compute_sample_weight.html + from sklearn.utils.class_weight import compute_sample_weight + # Step 2: vectorize data logger.debug("Vectorizing data...") notify("Vectorizing document content...") @@ -369,7 +398,7 @@ class DocumentClassifier: self.tags_binarizer = MultiLabelBinarizer() labels_tags_vectorized = self.tags_binarizer.fit_transform(labels_tags) - self.tags_classifier = MLPClassifier(tol=0.01) + self.tags_classifier = MLPClassifier(tol=0.01, random_state=0) self.tags_classifier.fit(data_vectorized, labels_tags_vectorized) else: self.tags_classifier = None @@ -380,8 +409,12 @@ class DocumentClassifier: notify( f"Training correspondent classifier ({num_correspondents} correspondent(s))...", ) - self.correspondent_classifier = MLPClassifier(tol=0.01) - self.correspondent_classifier.fit(data_vectorized, labels_correspondent) + self.correspondent_classifier = MLPClassifier(tol=0.01, random_state=0) + self.correspondent_classifier.fit( + data_vectorized, + labels_correspondent, + sample_weight=compute_sample_weight("balanced", labels_correspondent), + ) else: self.correspondent_classifier = None logger.debug( @@ -393,8 +426,12 @@ class DocumentClassifier: notify( f"Training document type classifier ({num_document_types} type(s))...", ) - self.document_type_classifier = MLPClassifier(tol=0.01) - self.document_type_classifier.fit(data_vectorized, labels_document_type) + self.document_type_classifier = MLPClassifier(tol=0.01, random_state=0) + self.document_type_classifier.fit( + data_vectorized, + labels_document_type, + sample_weight=compute_sample_weight("balanced", labels_document_type), + ) else: self.document_type_classifier = None logger.debug( @@ -406,10 +443,11 @@ class DocumentClassifier: "Training storage paths classifier...", ) notify(f"Training storage path classifier ({num_storage_paths} path(s))...") - self.storage_path_classifier = MLPClassifier(tol=0.01) + self.storage_path_classifier = MLPClassifier(tol=0.01, random_state=0) self.storage_path_classifier.fit( data_vectorized, labels_storage_path, + sample_weight=compute_sample_weight("balanced", labels_storage_path), ) else: self.storage_path_classifier = None @@ -546,24 +584,24 @@ class DocumentClassifier: def predict_correspondent(self, content: str) -> int | None: if self.correspondent_classifier: X = self._vectorize(content) - correspondent_id = self.correspondent_classifier.predict(X) - if correspondent_id != -1: - return correspondent_id - else: - return None - else: - return None + predicted_id = _predict_with_threshold( + self.correspondent_classifier, + X, + settings.CLASSIFIER_MATCH_THRESHOLD, + ) + return predicted_id + return None def predict_document_type(self, content: str) -> int | None: if self.document_type_classifier: X = self._vectorize(content) - document_type_id = self.document_type_classifier.predict(X) - if document_type_id != -1: - return document_type_id - else: - return None - else: - return None + predicted_id = _predict_with_threshold( + self.document_type_classifier, + X, + settings.CLASSIFIER_MATCH_THRESHOLD, + ) + return predicted_id + return None def predict_tags(self, content: str) -> list[int]: from sklearn.utils.multiclass import type_of_target @@ -589,10 +627,10 @@ class DocumentClassifier: def predict_storage_path(self, content: str) -> int | None: if self.storage_path_classifier: X = self._vectorize(content) - storage_path_id = self.storage_path_classifier.predict(X) - if storage_path_id != -1: - return storage_path_id - else: - return None - else: - return None + predicted_id = _predict_with_threshold( + self.storage_path_classifier, + X, + settings.CLASSIFIER_MATCH_THRESHOLD, + ) + return predicted_id + return None diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py index 12dfea4d8..0e09ff074 100644 --- a/src/documents/tests/test_classifier.py +++ b/src/documents/tests/test_classifier.py @@ -3,6 +3,7 @@ import warnings from pathlib import Path from unittest import mock +import numpy as np import pytest from django.conf import settings from django.test import TestCase @@ -11,6 +12,7 @@ from django.test import override_settings from documents.classifier import ClassifierModelCorruptError from documents.classifier import DocumentClassifier from documents.classifier import IncompatibleClassifierVersionError +from documents.classifier import _predict_with_threshold from documents.classifier import load_classifier from documents.models import Correspondent from documents.models import Document @@ -625,6 +627,103 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertEqual(self.classifier.predict_storage_path(doc1.content), sp.pk) self.assertIsNone(self.classifier.predict_storage_path(doc2.content)) + def test_predict_rejects_prediction_below_match_threshold(self) -> None: + """ + GIVEN: + - Classifiers trained against test data with confident predictions + WHEN: + - CLASSIFIER_MATCH_THRESHOLD exceeds the model's confidence + THEN: + - Every predict_* method discards the match in favor of no match + """ + c1 = Correspondent.objects.create( + name="c1", + matching_algorithm=Correspondent.MATCH_AUTO, + ) + dt1 = DocumentType.objects.create( + name="dt1", + matching_algorithm=DocumentType.MATCH_AUTO, + ) + sp1 = StoragePath.objects.create( + name="sp1", + matching_algorithm=StoragePath.MATCH_AUTO, + ) + + doc1 = Document.objects.create( + title="doc1", + content="this is a document from c1", + correspondent=c1, + document_type=dt1, + storage_path=sp1, + checksum="A", + ) + Document.objects.create( + title="doc2", + content="this is a document from no one", + checksum="B", + ) + + self.classifier.train() + + predictors = { + "correspondent": self.classifier.predict_correspondent, + "document_type": self.classifier.predict_document_type, + "storage_path": self.classifier.predict_storage_path, + } + # No real prediction can reach a confidence this high, so this + # isolates the threshold check from the model's actual output. + with override_settings(CLASSIFIER_MATCH_THRESHOLD=0.999999): + for name, predict in predictors.items(): + with self.subTest(field=name): + self.assertIsNone(predict(doc1.content)) + + def test_train_uses_balanced_sample_weight(self) -> None: + """ + GIVEN: + - A training set with correspondents, document types and storage paths + WHEN: + - The classifier is trained + THEN: + - Each MLP classifier is fit with balanced sample weights, so that + over-represented classes don't dominate predictions + """ + c1 = Correspondent.objects.create( + name="c1", + matching_algorithm=Correspondent.MATCH_AUTO, + ) + dt1 = DocumentType.objects.create( + name="dt1", + matching_algorithm=DocumentType.MATCH_AUTO, + ) + sp1 = StoragePath.objects.create( + name="sp1", + matching_algorithm=StoragePath.MATCH_AUTO, + ) + + Document.objects.create( + title="doc1", + content="this is a document from c1", + correspondent=c1, + document_type=dt1, + storage_path=sp1, + checksum="A", + ) + Document.objects.create( + title="doc2", + content="this is a document from no one", + checksum="B", + ) + + with mock.patch( + "sklearn.utils.class_weight.compute_sample_weight", + return_value=None, + ) as mocked_compute_sample_weight: + self.classifier.train() + + self.assertEqual(mocked_compute_sample_weight.call_count, 3) + for call in mocked_compute_sample_weight.call_args_list: + self.assertEqual(call.args[0], "balanced") + def test_one_tag_predict(self) -> None: t1 = Tag.objects.create(name="t1", matching_algorithm=Tag.MATCH_AUTO, pk=12) @@ -810,6 +909,52 @@ class TestClassifier(DirectoriesMixin, TestCase): load_classifier(raise_exception=True) +class _StubProbaClassifier: + """ + A fake scikit-learn classifier exposing just enough of the API for + `_predict_with_threshold`: `classes_` and `predict_proba`. + """ + + def __init__(self, classes: list[int], probabilities: list[float]) -> None: + self.classes_ = np.array(classes) + self._probabilities = np.array([probabilities]) + + def predict_proba(self, X) -> np.ndarray: + return self._probabilities + + +@pytest.mark.parametrize( + ("classes", "probabilities", "threshold", "expected"), + [ + # confident prediction above the threshold is returned + ([-1, 3], [0.1, 0.9], 0.6, 3), + # prediction below the threshold is discarded + ([-1, 3], [0.45, 0.55], 0.6, None), + # boundary: exactly at the threshold is accepted, not discarded + ([-1, 3], [0.4, 0.6], 0.6, 3), + # the winning class is the "no match" pseudo-class, regardless of its + # own confidence + ([-1, 3], [0.99, 0.01], 0.0, None), + # threshold of 0.0 disables the confidence check entirely + ([-1, 3], [0.45, 0.55], 0.0, 3), + ], +) +def test_predict_with_threshold(classes, probabilities, threshold, expected) -> None: + classifier = _StubProbaClassifier(classes, probabilities) + result = _predict_with_threshold(classifier, X=None, threshold=threshold) + assert result == expected + + +def test_classifier_match_threshold_default() -> None: + """ + GIVEN: + - No PAPERLESS_CLASSIFIER_MATCH_THRESHOLD environment variable is set + THEN: + - The classifier match threshold defaults to 0.6 + """ + assert settings.CLASSIFIER_MATCH_THRESHOLD == 0.6 + + def test_preprocess_content() -> None: """ GIVEN: diff --git a/src/paperless/settings/__init__.py b/src/paperless/settings/__init__.py index a0dc0e585..14f2fb9ac 100644 --- a/src/paperless/settings/__init__.py +++ b/src/paperless/settings/__init__.py @@ -96,6 +96,13 @@ MODEL_FILE = get_path_from_env( "PAPERLESS_MODEL_FILE", DATA_DIR / "classification_model.pickle", ) + +# Minimum confidence (0.0-1.0) for the ML classifier to assign a correspondent, +# document type, or storage path. 0.0 disables the threshold. +CLASSIFIER_MATCH_THRESHOLD: Final[float] = get_float_from_env( + "PAPERLESS_CLASSIFIER_MATCH_THRESHOLD", + 0.6, +) LLM_INDEX_DIR = DATA_DIR / "llm_index" LLM_INDEX_LOCK = LLM_INDEX_DIR / "index.lock" # Cross-process read/write lock guarding the LLM index compaction/migration From 1c9681962588a441b2a3139efd426e4520e95aad Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2026 22:41:48 +0000 Subject: [PATCH 002/258] Auto translate strings --- src/locale/en_US/LC_MESSAGES/django.po | 76 +++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 0a766f170..5327ac8be 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-09 16:03+0000\n" +"POT-Creation-Date: 2026-09-09 22:41+0000\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -2258,151 +2258,151 @@ msgstr "" msgid "paperless application settings" msgstr "" -#: paperless/settings/__init__.py:562 +#: paperless/settings/__init__.py:569 msgid "English (US)" msgstr "" -#: paperless/settings/__init__.py:563 +#: paperless/settings/__init__.py:570 msgid "Arabic" msgstr "" -#: paperless/settings/__init__.py:564 +#: paperless/settings/__init__.py:571 msgid "Afrikaans" msgstr "" -#: paperless/settings/__init__.py:565 +#: paperless/settings/__init__.py:572 msgid "Belarusian" msgstr "" -#: paperless/settings/__init__.py:566 +#: paperless/settings/__init__.py:573 msgid "Bulgarian" msgstr "" -#: paperless/settings/__init__.py:567 +#: paperless/settings/__init__.py:574 msgid "Catalan" msgstr "" -#: paperless/settings/__init__.py:568 +#: paperless/settings/__init__.py:575 msgid "Czech" msgstr "" -#: paperless/settings/__init__.py:569 +#: paperless/settings/__init__.py:576 msgid "Danish" msgstr "" -#: paperless/settings/__init__.py:570 +#: paperless/settings/__init__.py:577 msgid "German" msgstr "" -#: paperless/settings/__init__.py:571 +#: paperless/settings/__init__.py:578 msgid "Greek" msgstr "" -#: paperless/settings/__init__.py:572 +#: paperless/settings/__init__.py:579 msgid "English (GB)" msgstr "" -#: paperless/settings/__init__.py:573 +#: paperless/settings/__init__.py:580 msgid "Spanish" msgstr "" -#: paperless/settings/__init__.py:574 +#: paperless/settings/__init__.py:581 msgid "Persian" msgstr "" -#: paperless/settings/__init__.py:575 +#: paperless/settings/__init__.py:582 msgid "Finnish" msgstr "" -#: paperless/settings/__init__.py:576 +#: paperless/settings/__init__.py:583 msgid "French" msgstr "" -#: paperless/settings/__init__.py:577 +#: paperless/settings/__init__.py:584 msgid "Hungarian" msgstr "" -#: paperless/settings/__init__.py:578 +#: paperless/settings/__init__.py:585 msgid "Indonesian" msgstr "" -#: paperless/settings/__init__.py:579 +#: paperless/settings/__init__.py:586 msgid "Italian" msgstr "" -#: paperless/settings/__init__.py:580 +#: paperless/settings/__init__.py:587 msgid "Japanese" msgstr "" -#: paperless/settings/__init__.py:581 +#: paperless/settings/__init__.py:588 msgid "Korean" msgstr "" -#: paperless/settings/__init__.py:582 +#: paperless/settings/__init__.py:589 msgid "Luxembourgish" msgstr "" -#: paperless/settings/__init__.py:583 +#: paperless/settings/__init__.py:590 msgid "Norwegian" msgstr "" -#: paperless/settings/__init__.py:584 +#: paperless/settings/__init__.py:591 msgid "Dutch" msgstr "" -#: paperless/settings/__init__.py:585 +#: paperless/settings/__init__.py:592 msgid "Polish" msgstr "" -#: paperless/settings/__init__.py:586 +#: paperless/settings/__init__.py:593 msgid "Portuguese (Brazil)" msgstr "" -#: paperless/settings/__init__.py:587 +#: paperless/settings/__init__.py:594 msgid "Portuguese" msgstr "" -#: paperless/settings/__init__.py:588 +#: paperless/settings/__init__.py:595 msgid "Romanian" msgstr "" -#: paperless/settings/__init__.py:589 +#: paperless/settings/__init__.py:596 msgid "Russian" msgstr "" -#: paperless/settings/__init__.py:590 +#: paperless/settings/__init__.py:597 msgid "Slovak" msgstr "" -#: paperless/settings/__init__.py:591 +#: paperless/settings/__init__.py:598 msgid "Slovenian" msgstr "" -#: paperless/settings/__init__.py:592 +#: paperless/settings/__init__.py:599 msgid "Serbian" msgstr "" -#: paperless/settings/__init__.py:593 +#: paperless/settings/__init__.py:600 msgid "Swedish" msgstr "" -#: paperless/settings/__init__.py:594 +#: paperless/settings/__init__.py:601 msgid "Turkish" msgstr "" -#: paperless/settings/__init__.py:595 +#: paperless/settings/__init__.py:602 msgid "Ukrainian" msgstr "" -#: paperless/settings/__init__.py:596 +#: paperless/settings/__init__.py:603 msgid "Vietnamese" msgstr "" -#: paperless/settings/__init__.py:597 +#: paperless/settings/__init__.py:604 msgid "Chinese Simplified" msgstr "" -#: paperless/settings/__init__.py:598 +#: paperless/settings/__init__.py:605 msgid "Chinese Traditional" msgstr "" From 60709b8319fa636b0e24a520fd004785566412a5 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Wed, 9 Sep 2026 16:47:07 -0700 Subject: [PATCH 003/258] Performance: cut redundant per-document lookups in bulk `modify_custom_fields` (#13807) * Perf: batch the repeated lookups in modify_custom_fields `modify_custom_fields()` re-resolved the same objects inside its per-document loop: `custom_fields.get(id=field_id)` re-ran a CustomField query for every document, and doc link fields called `Document.objects.get(id=doc_id)` a second time for a document that was already known. Resolve both up front with `in_bulk()` and hand the resolved objects to `update_or_create()` rather than bare ids. Passing the objects also populates the FK cache on the newly created instance, so auditlog's post_save receiver touching `.document`/`.field` no longer costs a reload per row. The document map defers `content`, the one field here that is both large and unused. The symmetrical-link removal pass and `remove_doclink()` get `select_related()` for the same auditlog reason. Measured over 50 documents, sqlite, audit log enabled: before after add 3 string fields 1502 1054 update 1 string field 451 403 add doc link 851 653 remove doc link 604 354 `update_or_create()` is kept as-is. Dropping it for a hand-rolled get-or-construct loop removes a further ~4 statements per row, but those are the SAVEPOINT/RELEASE pairs of its `transaction.atomic()`, and the `select_for_update()` and IntegrityError fallback that go with them. The (document, field) unique constraint depends on that when two bulk edits overlap, and the wall clock did not move to pay for it (331 ms vs 310 ms for the string case above). Also normalises the field ids to int once at the top so the old dict API, whose keys may arrive as strings, indexes the resolved map correctly. The `if custom_field:` branch it replaces was dead: `.get()` raises DoesNotExist, it never returns None. Co-Authored-By: Claude Opus 5 * Fixes the comment --------- Co-authored-by: Claude Opus 5 --- src/documents/bulk_edit.py | 75 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py index 79a79e6cf..363193d48 100644 --- a/src/documents/bulk_edit.py +++ b/src/documents/bulk_edit.py @@ -299,53 +299,55 @@ def modify_custom_fields( ) -> Literal["OK"]: qs = Document.objects.filter(id__in=doc_ids).only("pk") affected_docs = list(qs.values_list("pk", flat=True)) - # Ensure add_custom_fields is a list of tuples, supports old API + # Ensure add_custom_fields is a list of (int, value) tuples, supports old API add_custom_fields = ( - add_custom_fields.items() + [(int(field), value) for field, value in add_custom_fields.items()] if isinstance(add_custom_fields, dict) - else [(field, None) for field in add_custom_fields] + else [(int(field), None) for field in add_custom_fields] ) - custom_fields = CustomField.objects.filter( - id__in=[int(field) for field, _ in add_custom_fields], - ).distinct() + # Resolved once, instead of re-querying the same field for every document + custom_fields_by_id: dict[int, CustomField] = CustomField.objects.in_bulk( + [field_id for field_id, _ in add_custom_fields], + ) + # Passed to update_or_create() below rather than a bare id, so the FK is + # cached on the created instance and auditlog's post_save receiver does + # not reload it per row. Only needed for additions. content is deferred: + # the one field here that is both large and unused. + docs_by_id: dict[int, Document] = ( + Document.objects.defer("content").in_bulk(affected_docs) + if add_custom_fields + else {} + ) for field_id, value in add_custom_fields: + custom_field = custom_fields_by_id[field_id] + value_field = CustomFieldInstance.TYPE_TO_DATA_STORE_NAME_MAP[ + custom_field.data_type + ] + is_doclink = custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK for doc_id in affected_docs: - defaults = {} - custom_field = custom_fields.get(id=field_id) - if custom_field: - value_field = CustomFieldInstance.TYPE_TO_DATA_STORE_NAME_MAP[ - custom_field.data_type - ] - defaults[value_field] = value - if ( - custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK - and value - and doc_id in value - ): - # Prevent self-linking - continue + if is_doclink and value and doc_id in value: + # Prevent self-linking + continue CustomFieldInstance.objects.update_or_create( - document_id=doc_id, - field_id=field_id, - defaults=defaults, + document=docs_by_id[doc_id], + field=custom_field, + defaults={value_field: value}, ) - if custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK: - doc = Document.objects.get(id=doc_id) - reflect_doclinks(doc, custom_field, value) + if is_doclink: + reflect_doclinks(docs_by_id[doc_id], custom_field, value) - # For doc link fields that are being removed, remove symmetrical links + # For doc link fields that are being removed, remove symmetrical links. + # select_related avoids a per-instance reload of the document and field. for doclink_being_removed_instance in CustomFieldInstance.objects.filter( document_id__in=affected_docs, field__id__in=remove_custom_fields, field__data_type=CustomField.FieldDataType.DOCUMENTLINK, value_document_ids__isnull=False, - ): + ).select_related("field", "document"): for target_doc_id in doclink_being_removed_instance.value: remove_doclink( - document=Document.objects.get( - id=doclink_being_removed_instance.document.id, - ), + document=doclink_being_removed_instance.document, field=doclink_being_removed_instance.field, target_doc_id=target_doc_id, ) @@ -1178,10 +1180,13 @@ def remove_doclink( """ Removes a 'symmetrical' link to `document` from the target document's existing custom field instance """ - target_doc_field_instance = CustomFieldInstance.objects.filter( - document_id=target_doc_id, - field=field, - ).first() + # select_related: a signal receiver (auditlog) touches .document/.field on + # the save() below, without this that is a per-call reload query + target_doc_field_instance = ( + CustomFieldInstance.objects.filter(document_id=target_doc_id, field=field) + .select_related("document", "field") + .first() + ) if ( target_doc_field_instance is not None and document.id in target_doc_field_instance.value From 2d646840432397436b7cdfbbd685aca5eb723636 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 9 Sep 2026 22:00:37 -0700 Subject: [PATCH 004/258] Enhancement: customize sidebar items (#14052) --- .../admin/settings/settings.component.html | 16 ++++ .../admin/settings/settings.component.spec.ts | 47 ++++++++++- .../admin/settings/settings.component.ts | 60 +++++++++++++- .../app-frame/app-frame.component.html | 35 ++++++--- .../app-frame/app-frame.component.spec.ts | 78 ++++++++++++++++++- .../app-frame/app-frame.component.ts | 15 +++- .../common/input/switch/switch.component.html | 10 +-- .../input/switch/switch.component.spec.ts | 10 +++ .../common/input/switch/switch.component.ts | 3 + src-ui/src/app/data/ui-settings.ts | 16 ++++ .../src/app/services/settings.service.spec.ts | 35 ++++++++- src-ui/src/app/services/settings.service.ts | 36 +++++++++ 12 files changed, 339 insertions(+), 22 deletions(-) diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html index 305bb8a96..b520e8218 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -112,6 +112,22 @@ +

Sidebar items to show:

+ @for (option of sidebarItemOptions; track option.id) { +
+ + +
+ } + diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts index 7b65281d0..71889e74b 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts @@ -24,7 +24,7 @@ import { SystemStatus, SystemStatusItemStatus, } from 'src/app/data/system-status' -import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { HideableSidebarItemID, SETTINGS_KEYS } from 'src/app/data/ui-settings' import { IfOwnerDirective } from 'src/app/directives/if-owner.directive' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionsGuard } from 'src/app/guards/permissions.guard' @@ -209,6 +209,45 @@ describe('SettingsComponent', () => { fixture.detectChanges() } + it('supports configuring sidebar items and canceling changes', () => { + completeSetup() + + component.toggleSidebarItem(HideableSidebarItemID.Workflows, false) + fixture.detectChanges() + + expect(component.settingsForm.value.sidebarHiddenItems).toContain( + HideableSidebarItemID.Workflows + ) + + settingsService.updateSidebarItemVisibility( + HideableSidebarItemID.Mail, + false + ) + + expect(component.settingsForm.value.sidebarHiddenItems).toContain( + HideableSidebarItemID.Mail + ) + + component.reset() + + expect(component.settingsForm.value.sidebarHiddenItems).not.toContain( + HideableSidebarItemID.Workflows + ) + expect(component.settingsForm.value.sidebarHiddenItems).not.toContain( + HideableSidebarItemID.Mail + ) + }) + + it('enables sidebar item controls on general settings until destroyed', () => { + completeSetup() + + expect(settingsService.organizingSidebarItems()).toBe(true) + + component.ngOnDestroy() + + expect(settingsService.organizingSidebarItems()).toBe(false) + }) + it('should support tabbed settings & change URL, prevent navigation if dirty confirmation rejected', async () => { completeSetup() const navigateSpy = jest.spyOn(router, 'navigate') @@ -249,6 +288,7 @@ describe('SettingsComponent', () => { it('should support save local settings updating appearance settings and calling API, show error', () => { completeSetup() + component.toggleSidebarItem(HideableSidebarItemID.Workflows, false) const toastErrorSpy = jest.spyOn(toastService, 'showError') const toastSpy = jest.spyOn(toastService, 'show') const storeSpy = jest.spyOn(settingsService, 'storeSettings') @@ -267,7 +307,10 @@ describe('SettingsComponent', () => { expect(toastErrorSpy).toHaveBeenCalled() expect(storeSpy).toHaveBeenCalled() expect(appearanceSettingsSpy).not.toHaveBeenCalled() - expect(setSpy).toHaveBeenCalledTimes(33) + expect(setSpy).toHaveBeenCalledTimes(34) + expect(setSpy).toHaveBeenCalledWith(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [ + HideableSidebarItemID.Workflows, + ]) // succeed storeSpy.mockReturnValueOnce(of(true)) diff --git a/src-ui/src/app/components/admin/settings/settings.component.ts b/src-ui/src/app/components/admin/settings/settings.component.ts index 218f6683c..9076d2a3e 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -39,7 +39,12 @@ import { SystemStatus, SystemStatusItemStatus, } from 'src/app/data/system-status' -import { GlobalSearchType, SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { + GlobalSearchType, + HIDEABLE_SIDEBAR_ITEM_IDS, + HideableSidebarItemID, + SETTINGS_KEYS, +} from 'src/app/data/ui-settings' import { User } from 'src/app/data/user' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' @@ -102,6 +107,14 @@ const documentDetailFieldOptions = [ { id: DocumentDetailFieldID.Tags, label: $localize`Tags` }, ] +const sidebarItemLabels: Record = { + [HideableSidebarItemID.Dashboard]: $localize`Dashboard`, + [HideableSidebarItemID.SavedViews]: $localize`Saved Views`, + [HideableSidebarItemID.Workflows]: $localize`Workflows`, + [HideableSidebarItemID.Mail]: $localize`Mail`, + [HideableSidebarItemID.Documentation]: $localize`Documentation`, +} + @Component({ selector: 'pngx-settings', templateUrl: './settings.component.html', @@ -149,6 +162,7 @@ export class SettingsComponent bulkEditApplyOnClose: new FormControl(null), documentListItemPerPage: new FormControl(null), slimSidebarEnabled: new FormControl(null), + sidebarHiddenItems: new FormControl([]), darkModeUseSystem: new FormControl(null), darkModeEnabled: new FormControl(null), darkModeInvertThumbs: new FormControl(null), @@ -186,6 +200,7 @@ export class SettingsComponent store: BehaviorSubject storeSub: Subscription + sidebarItemsSub: Subscription isDirty$: Observable isDirty: boolean = false unsubscribeNotifier: Subject = new Subject() @@ -203,6 +218,10 @@ export class SettingsComponent public readonly PdfEditorEditMode = PdfEditorEditMode public readonly documentDetailFieldOptions = documentDetailFieldOptions + public readonly sidebarItemOptions = HIDEABLE_SIDEBAR_ITEM_IDS.map((id) => ({ + id, + label: sidebarItemLabels[id], + })) get systemStatusHasErrors(): boolean { const status = this.systemStatus() @@ -230,6 +249,10 @@ export class SettingsComponent constructor() { super() + this.sidebarItemsSub = + this.settings.sidebarHiddenItemsEditingChanged.subscribe((hiddenItems) => + this.settingsForm.controls.sidebarHiddenItems.setValue(hiddenItems) + ) this.settings.settingsSaved.subscribe(() => { if (!this.savePending) this.initialize() this.savedViewsService.maybeRefreshDocumentCounts() @@ -279,14 +302,21 @@ export class SettingsComponent this.activatedRoute.paramMap.subscribe((paramMap) => { const section = paramMap.get('section') + let navID = SettingsNavIDs.General if (section) { const navIDKey: string = Object.keys(SettingsNavIDs).find( (navID) => navID.toLowerCase() == section ) if (navIDKey) { - this.activeNavID.set(SettingsNavIDs[navIDKey]) + navID = SettingsNavIDs[navIDKey] } } + this.activeNavID.set(navID) + this.settings.sidebarHiddenItemsEditing.set( + navID === SettingsNavIDs.General + ? [...this.settingsForm.controls.sidebarHiddenItems.value] + : null + ) }) } @@ -310,6 +340,7 @@ export class SettingsComponent SETTINGS_KEYS.DOCUMENT_LIST_SIZE ), slimSidebarEnabled: this.settings.get(SETTINGS_KEYS.SLIM_SIDEBAR), + sidebarHiddenItems: this.settings.get(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS), darkModeUseSystem: this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM), darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), darkModeInvertThumbs: this.settings.get( @@ -436,6 +467,12 @@ export class SettingsComponent this.settingsForm.patchValue(currentFormValue) } + if (this.settings.organizingSidebarItems()) { + this.settings.sidebarHiddenItemsEditing.set([ + ...this.settingsForm.controls.sidebarHiddenItems.value, + ]) + } + if (this.canViewSystemStatus) { this.systemStatusService.get().subscribe((status) => { this.systemStatus.set(status) @@ -444,8 +481,18 @@ export class SettingsComponent } ngOnDestroy() { + this.settings.sidebarHiddenItemsEditing.set(null) if (this.isDirty) this.settings.updateAppearanceSettings() // in case user changed appearance but didn't save this.storeSub && this.storeSub.unsubscribe() + this.sidebarItemsSub.unsubscribe() + } + + isSidebarItemShown(item: HideableSidebarItemID): boolean { + return !(this.settingsForm.value.sidebarHiddenItems || []).includes(item) + } + + toggleSidebarItem(item: HideableSidebarItemID, checked: boolean): void { + this.settings.updateSidebarItemVisibility(item, checked) } public saveSettings() { @@ -473,6 +520,10 @@ export class SettingsComponent SETTINGS_KEYS.SLIM_SIDEBAR, this.settingsForm.value.slimSidebarEnabled ) + this.settings.set( + SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, + this.settingsForm.value.sidebarHiddenItems + ) this.settings.set( SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, this.settingsForm.value.darkModeUseSystem @@ -632,6 +683,11 @@ export class SettingsComponent reset() { this.settingsForm.patchValue(this.store.getValue()) + if (this.settings.organizingSidebarItems()) { + this.settings.sidebarHiddenItemsEditing.set([ + ...this.settingsForm.controls.sidebarHiddenItems.value, + ]) + } } clearThemeColor() { diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 6faddbb8a..a8dd12d34 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -86,12 +86,15 @@ }
    -
  • - + Dashboard + @if (settingsService.organizingSidebarItems()) { + + }
    • } -
  • - + Saved Views + @if (settingsService.organizingSidebarItems()) { + + }
    • -
  • - Workflows + @if (settingsService.organizingSidebarItems()) { + + }
    • -
  • - Mail + @if (settingsService.organizingSidebarItems()) { + + }
    • } -
  • - + Documentation + @if (settingsService.organizingSidebarItems()) { + + }
  • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index d9b1acda4..4dd88c84d 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -15,7 +15,7 @@ import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' import { SavedView } from 'src/app/data/saved-view' -import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { HideableSidebarItemID, SETTINGS_KEYS } from 'src/app/data/ui-settings' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionsGuard } from 'src/app/guards/permissions.guard' import { @@ -287,6 +287,82 @@ describe('AppFrameComponent', () => { jest.useRealTimers() }) + it('should hide configured sidebar items', () => { + settingsService.set(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [ + HideableSidebarItemID.Dashboard, + HideableSidebarItemID.Workflows, + ]) + fixture.detectChanges() + + expect( + fixture.nativeElement.querySelector('[routerLink="dashboard"]') + .parentElement.classList + ).toContain('d-none') + expect( + fixture.nativeElement.querySelector('[routerLink="workflows"]') + .parentElement.classList + ).toContain('d-none') + expect( + fixture.nativeElement.querySelector('[routerLink="mail"]').parentElement + .classList + ).not.toContain('d-none') + }) + + it('should show hidden items and visibility switches while customizing', () => { + settingsService.set(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [ + HideableSidebarItemID.Dashboard, + ]) + settingsService.sidebarHiddenItemsEditing.set([ + HideableSidebarItemID.Dashboard, + ]) + fixture.detectChanges() + + expect( + fixture.nativeElement.querySelectorAll('pngx-input-switch').length + ).toBe(5) + expect( + fixture.nativeElement.querySelector('[routerLink="dashboard"]') + .parentElement.classList + ).not.toContain('d-none') + expect( + fixture.nativeElement.querySelector('[routerLink="dashboard"]').classList + ).toContain('opacity-50') + + settingsService.set(SETTINGS_KEYS.SLIM_SIDEBAR, true) + fixture.detectChanges() + + expect( + Array.from( + fixture.nativeElement.querySelectorAll('pngx-input-switch') + ).every((toggle: HTMLElement) => toggle.classList.contains('d-none')) + ).toBe(true) + expect( + fixture.nativeElement.querySelector('[routerLink="dashboard"]').classList + ).not.toContain('pe-5') + + settingsService.set(SETTINGS_KEYS.SLIM_SIDEBAR, false) + component.slimSidebarAnimating.set(true) + fixture.detectChanges() + + expect( + Array.from( + fixture.nativeElement.querySelectorAll('pngx-input-switch') + ).every((toggle: HTMLElement) => toggle.classList.contains('d-none')) + ).toBe(true) + + component.slimSidebarAnimating.set(false) + fixture.detectChanges() + + expect( + Array.from( + fixture.nativeElement.querySelectorAll('pngx-input-switch') + ).every((toggle: HTMLElement) => !toggle.classList.contains('d-none')) + ).toBe(true) + expect( + fixture.nativeElement.querySelector('[routerLink="dashboard"]').classList + ).toContain('pe-5') + }) + it('should show error on toggle slim sidebar if store settings fails', () => { jest.spyOn(console, 'warn').mockImplementation(() => {}) const toastSpy = jest.spyOn(toastService, 'showError') diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 59a2ba18b..7b4c29d2f 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -7,6 +7,7 @@ import { } from '@angular/cdk/drag-drop' import { NgClass } from '@angular/common' import { Component, HostListener, inject, OnInit, signal } from '@angular/core' +import { FormsModule } from '@angular/forms' import { ActivatedRoute, Router, RouterModule } from '@angular/router' import { NgbCollapseModule, @@ -21,7 +22,11 @@ import { Observable } from 'rxjs' import { first } from 'rxjs/operators' import { Document } from 'src/app/data/document' import { SavedView } from 'src/app/data/saved-view' -import { CollapsibleSection, SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { + CollapsibleSection, + HideableSidebarItemID, + SETTINGS_KEYS, +} from 'src/app/data/ui-settings' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard' import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe' @@ -48,6 +53,7 @@ import { ChatComponent } from '../chat/chat/chat.component' import { BrandMarkComponent } from '../common/logo/brand-mark/brand-mark.component' import { LogoComponent } from '../common/logo/logo.component' import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component' +import { SwitchComponent } from '../common/input/switch/switch.component' import { DocumentDetailComponent } from '../document-detail/document-detail.component' import { ComponentWithPermissions } from '../with-permissions/with-permissions.component' import { GlobalSearchComponent } from './global-search/global-search.component' @@ -76,6 +82,8 @@ const SCROLL_THRESHOLD = 16 NgxBootstrapIconsModule, DragDropModule, TourNgBootstrap, + FormsModule, + SwitchComponent, ], }) export class AppFrameComponent @@ -98,6 +106,7 @@ export class AppFrameComponent readonly isMenuCollapsed = signal(true) readonly slimSidebarAnimating = signal(false) readonly mobileSearchHidden = signal(false) + readonly HideableSidebarItemID = HideableSidebarItemID private readonly versionSetting = this.settingsService.getSignal( SETTINGS_KEYS.VERSION ) @@ -195,6 +204,10 @@ export class AppFrameComponent }, 200) // slightly longer than css animation for slim sidebar } + toggleSidebarItem(item: HideableSidebarItemID, visible: boolean): void { + this.settingsService.updateSidebarItemVisibility(item, visible) + } + toggleAttributesSections(event?: Event): void { event?.preventDefault() event?.stopPropagation() diff --git a/src-ui/src/app/components/common/input/switch/switch.component.html b/src-ui/src/app/components/common/input/switch/switch.component.html index edd831e5c..636356d64 100644 --- a/src-ui/src/app/components/common/input/switch/switch.component.html +++ b/src-ui/src/app/components/common/input/switch/switch.component.html @@ -1,6 +1,6 @@ -
    -
    - @if (!horizontal) { +
    +
    + @if (!horizontal && !compact) {
    • + @if (canManageShareLinks) { +
  • + + Share links + + @if (settingsService.organizingSidebarItems()) { + + } +
    • + }
  • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index 4dd88c84d..ad9304ca0 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -291,6 +291,7 @@ describe('AppFrameComponent', () => { settingsService.set(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [ HideableSidebarItemID.Dashboard, HideableSidebarItemID.Workflows, + HideableSidebarItemID.ShareLinks, ]) fixture.detectChanges() @@ -302,6 +303,10 @@ describe('AppFrameComponent', () => { fixture.nativeElement.querySelector('[routerLink="workflows"]') .parentElement.classList ).toContain('d-none') + expect( + fixture.nativeElement.querySelector('[routerLink="share-links"]') + .parentElement.classList + ).toContain('d-none') expect( fixture.nativeElement.querySelector('[routerLink="mail"]').parentElement .classList @@ -319,7 +324,7 @@ describe('AppFrameComponent', () => { expect( fixture.nativeElement.querySelectorAll('pngx-input-switch').length - ).toBe(5) + ).toBe(6) expect( fixture.nativeElement.querySelector('[routerLink="dashboard"]') .parentElement.classList diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 7b4c29d2f..4fa0f6fc3 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -234,6 +234,19 @@ export class AppFrameComponent return this.appTitleSetting() || environment.appTitle } + get canManageShareLinks(): boolean { + return ( + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.ShareLink + ) || + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.ShareLinkBundle + ) + ) + } + get customAppTitle(): string { return this.appTitleSetting() } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts index b8696a958..29212c955 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -7,6 +7,7 @@ import { import { EventEmitter, signal } from '@angular/core' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' +import { Router } from '@angular/router' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' @@ -46,7 +47,6 @@ import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component' import { FilterableDropdownComponent } from '../../common/filterable-dropdown/filterable-dropdown.component' import { ShareLinkBundleDialogComponent } from '../../common/share-link-bundle-dialog/share-link-bundle-dialog.component' -import { ShareLinkBundleManageDialogComponent } from '../../common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component' import { BulkEditorComponent } from './bulk-editor.component' const selectionData: SelectionData = { @@ -82,6 +82,7 @@ describe('BulkEditorComponent', () => { let customFieldsService: CustomFieldsService let httpTestingController: HttpTestingController let shareLinkBundleService: ShareLinkBundleService + let router: Router beforeEach(async () => { TestBed.configureTestingModule({ @@ -167,11 +168,14 @@ describe('BulkEditorComponent', () => { provide: ShareLinkBundleService, useValue: { createBundle: jest.fn(), - listAllBundles: jest.fn(), rebuildBundle: jest.fn(), delete: jest.fn(), }, }, + { + provide: Router, + useValue: { navigate: jest.fn().mockResolvedValue(true) }, + }, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), ], @@ -189,6 +193,7 @@ describe('BulkEditorComponent', () => { customFieldsService = TestBed.inject(CustomFieldsService) httpTestingController = TestBed.inject(HttpTestingController) shareLinkBundleService = TestBed.inject(ShareLinkBundleService) + router = TestBed.inject(Router) fixture = TestBed.createComponent(BulkEditorComponent) component = fixture.componentInstance @@ -1824,9 +1829,9 @@ describe('BulkEditorComponent', () => { }, } - const openSpy = jest.spyOn(modalService, 'open') - openSpy.mockReturnValueOnce(modalRef as NgbModalRef) - openSpy.mockReturnValueOnce({} as NgbModalRef) + const openSpy = jest + .spyOn(modalService, 'open') + .mockReturnValueOnce(modalRef as NgbModalRef) ;(shareLinkBundleService.createBundle as jest.Mock).mockReturnValueOnce( of({ id: 42 }) ) @@ -1860,11 +1865,9 @@ describe('BulkEditorComponent', () => { dialogInstance.onOpenManage() expect(modalRef.close).toHaveBeenCalled() - expect(openSpy).toHaveBeenNthCalledWith( - 2, - ShareLinkBundleManageDialogComponent, - expect.objectContaining({ backdrop: 'static', size: 'lg' }) - ) + expect(router.navigate).toHaveBeenCalledWith(['/share-links'], { + queryParams: { type: 'bundles' }, + }) openSpy.mockRestore() }) @@ -1917,13 +1920,10 @@ describe('BulkEditorComponent', () => { openSpy.mockRestore() }) - it('should open share link bundle management dialog', () => { - const openSpy = jest.spyOn(modalService, 'open') + it('should navigate to share link bundle management', () => { component.manageShareLinkBundles() - expect(openSpy).toHaveBeenCalledWith( - ShareLinkBundleManageDialogComponent, - expect.objectContaining({ backdrop: 'static', size: 'lg' }) - ) - openSpy.mockRestore() + expect(router.navigate).toHaveBeenCalledWith(['/share-links'], { + queryParams: { type: 'bundles' }, + }) }) }) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index fb7c20776..c8d23c1bb 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -12,6 +12,7 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms' +import { Router } from '@angular/router' import { NgbDropdownModule, NgbModal, @@ -69,7 +70,6 @@ import { import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component' import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component' import { ShareLinkBundleDialogComponent } from '../../common/share-link-bundle-dialog/share-link-bundle-dialog.component' -import { ShareLinkBundleManageDialogComponent } from '../../common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component' import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component' import { CustomFieldsBulkEditDialogComponent } from './custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component' @@ -104,6 +104,7 @@ export class BulkEditorComponent public readonly permissionService = inject(PermissionsService) private savedViewService = inject(SavedViewService) private readonly shareLinkBundleService = inject(ShareLinkBundleService) + private readonly router = inject(Router) tagSelectionModel = new FilterableDropdownSelectionModel(true) correspondentSelectionModel = new FilterableDropdownSelectionModel() @@ -1135,9 +1136,8 @@ export class BulkEditorComponent } manageShareLinkBundles() { - this.modalService.open(ShareLinkBundleManageDialogComponent, { - backdrop: 'static', - size: 'lg', + void this.router.navigate(['/share-links'], { + queryParams: { type: 'bundles' }, }) } diff --git a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html similarity index 52% rename from src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html rename to src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html index 15b5bc9de..2ac67b6d9 100644 --- a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html @@ -1,38 +1,22 @@ -
    -

    {{ title }}

    - -
    - -
    - @if (loading()) { -
    - - Loading share link bundles… -
    - } +
    @if (!loading() && error()) { } @if (!loading() && !error()) { -
    -

    - Status updates every few seconds while bundles are being prepared. -

    -
    @if (bundles().length === 0) {

    No share link bundles currently exist.

    } @if (bundles().length > 0) {
    - +
    - - + + - + @@ -96,6 +80,9 @@ @@ -147,10 +141,32 @@
    CreatedStatusCreatedStatus SizeExpiresExpires Documents File version Actions @if (bundle.expiration) { {{ bundle.expiration | date: 'short' }} + @if (isExpired(bundle.expiration)) { + Expired + } } @if (!bundle.expiration) { Never @@ -104,42 +91,49 @@ {{ bundle.document_count }} {{ fileVersionLabel(bundle.file_version) }} -
    - - @if (bundle.status === statuses.Failed) { +
    + Copied! +
    - } - - - + @if (bundle.status === statuses.Failed) { + + } + + + +
    +
    +
    +
    + + + per page +
    + @if (total() > pageSize) { + + } +
    +
    } }
    - -
    - -
    diff --git a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.scss b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.scss similarity index 100% rename from src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.scss rename to src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.scss diff --git a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts similarity index 63% rename from src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.spec.ts rename to src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts index 5c943b190..085ece5c8 100644 --- a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts @@ -1,6 +1,5 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { FileVersion } from 'src/app/data/share-link' @@ -8,13 +7,15 @@ import { ShareLinkBundleStatus, ShareLinkBundleSummary, } from 'src/app/data/share-link-bundle' +import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service' +import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { environment } from 'src/environments/environment' -import { ShareLinkBundleManageDialogComponent } from './share-link-bundle-manage-dialog.component' +import { ShareLinkBundleListComponent } from './share-link-bundle-list.component' class MockShareLinkBundleService { - listAllBundles = jest.fn() + list = jest.fn() delete = jest.fn() rebuildBundle = jest.fn() } @@ -24,13 +25,12 @@ class MockToastService { showError = jest.fn() } -describe('ShareLinkBundleManageDialogComponent', () => { - let component: ShareLinkBundleManageDialogComponent - let fixture: ComponentFixture +describe('ShareLinkBundleListComponent', () => { + let component: ShareLinkBundleListComponent + let fixture: ComponentFixture let service: MockShareLinkBundleService let toastService: MockToastService let clipboard: Clipboard - let activeModal: NgbActiveModal let originalApiBaseUrl: string beforeEach(() => { @@ -38,26 +38,24 @@ describe('ShareLinkBundleManageDialogComponent', () => { toastService = new MockToastService() originalApiBaseUrl = environment.apiBaseUrl - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) service.delete.mockReturnValue(of(true)) service.rebuildBundle.mockReturnValue(of(sampleBundle())) TestBed.configureTestingModule({ imports: [ - ShareLinkBundleManageDialogComponent, + ShareLinkBundleListComponent, NgxBootstrapIconsModule.pick(allIcons), ], providers: [ - NgbActiveModal, { provide: ShareLinkBundleService, useValue: service }, { provide: ToastService, useValue: toastService }, ], }) - fixture = TestBed.createComponent(ShareLinkBundleManageDialogComponent) + fixture = TestBed.createComponent(ShareLinkBundleListComponent) component = fixture.componentInstance clipboard = TestBed.inject(Clipboard) - activeModal = TestBed.inject(NgbActiveModal) }) afterEach(() => { @@ -84,28 +82,28 @@ describe('ShareLinkBundleManageDialogComponent', () => { it('loads bundles on init and polls periodically', () => { jest.useFakeTimers() const bundles = [sampleBundle({ status: ShareLinkBundleStatus.Ready })] - service.listAllBundles.mockReset() - service.listAllBundles - .mockReturnValueOnce(of(bundles)) - .mockReturnValue(of(bundles)) + service.list.mockReset() + service.list + .mockReturnValueOnce(of({ count: bundles.length, results: bundles })) + .mockReturnValue(of({ count: bundles.length, results: bundles })) fixture.detectChanges() - expect(service.listAllBundles).toHaveBeenCalledTimes(1) + expect(service.list).toHaveBeenCalledWith(1, 25, 'created', true) expect(component.bundles()).toEqual(bundles) expect(component.loading()).toBe(false) expect(component.error()).toBeNull() jest.advanceTimersByTime(5000) - expect(service.listAllBundles).toHaveBeenCalledTimes(2) + expect(service.list).toHaveBeenCalledTimes(2) }) it('handles errors when loading bundles', () => { jest.useFakeTimers() - service.listAllBundles.mockReset() - service.listAllBundles + service.list.mockReset() + service.list .mockReturnValueOnce(throwError(() => new Error('load fail'))) - .mockReturnValue(of([])) + .mockReturnValue(of({ count: 0, results: [] })) fixture.detectChanges() @@ -114,7 +112,57 @@ describe('ShareLinkBundleManageDialogComponent', () => { expect(component.loading()).toBe(false) jest.advanceTimersByTime(5000) - expect(service.listAllBundles).toHaveBeenCalledTimes(2) + expect(service.list).toHaveBeenCalledTimes(2) + }) + + it('loads another page', () => { + fixture.detectChanges() + + component.setPage(2) + + expect(service.list).toHaveBeenLastCalledWith(2, 25, 'created', true) + }) + + it('sorts bundles and returns to the first page', () => { + fixture.detectChanges() + component.page.set(2) + + component.onSort({ column: 'status', reverse: false }) + + expect(component.page()).toBe(1) + expect(service.list).toHaveBeenLastCalledWith(1, 25, 'status', false) + }) + + it('marks expired share link bundles', () => { + service.list.mockReturnValue( + of({ + count: 1, + results: [sampleBundle({ expiration: '2000-01-01T00:00:00.000Z' })], + }) + ) + + fixture.detectChanges() + + expect(fixture.nativeElement.textContent).toContain('Expired') + }) + + it('stores a changed page size and reloads from the first page', () => { + fixture.detectChanges() + const settingsService = TestBed.inject(SettingsService) + jest + .spyOn(settingsService, 'get') + .mockReturnValueOnce({ share_link_bundles: 25 }) + const setSpy = jest.spyOn(settingsService, 'set') + jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of({})) + component.page.set(2) + + component.pageSize = 100 + + expect(setSpy).toHaveBeenCalledWith(SETTINGS_KEYS.OBJECT_LIST_SIZES, { + share_link_bundles: 100, + }) + expect(component.page()).toBe(1) + expect(service.list).toHaveBeenLastCalledWith(1, 100, 'created', true) }) it('copies bundle links when ready', () => { @@ -126,16 +174,24 @@ describe('ShareLinkBundleManageDialogComponent', () => { slug: 'ready-slug', status: ShareLinkBundleStatus.Ready, }) + component.bundles.set([readyBundle]) + fixture.detectChanges() component.copy(readyBundle) expect(clipboard.copy).toHaveBeenCalledWith( component.getShareUrl(readyBundle) ) expect(component.copiedSlug()).toBe('ready-slug') - expect(toastService.showInfo).toHaveBeenCalled() + expect(toastService.showInfo).not.toHaveBeenCalled() + fixture.detectChanges() + expect( + fixture.nativeElement.querySelector('.badge.show').textContent + ).toContain('Copied!') jest.advanceTimersByTime(3000) expect(component.copiedSlug()).toBeNull() + fixture.detectChanges() + expect(fixture.nativeElement.querySelector('.badge.show')).toBeNull() }) it('ignores copy requests for non-ready bundles', () => { @@ -146,7 +202,7 @@ describe('ShareLinkBundleManageDialogComponent', () => { }) it('deletes bundles and refreshes list', () => { - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) service.delete.mockReturnValue(of(true)) fixture.detectChanges() @@ -157,12 +213,12 @@ describe('ShareLinkBundleManageDialogComponent', () => { expect(toastService.showInfo).toHaveBeenCalledWith( expect.stringContaining('deleted.') ) - expect(service.listAllBundles).toHaveBeenCalledTimes(2) + expect(service.list).toHaveBeenCalledTimes(2) expect(component.loading()).toBe(false) }) it('handles delete errors gracefully', () => { - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) service.delete.mockReturnValue(throwError(() => new Error('delete fail'))) fixture.detectChanges() @@ -174,7 +230,7 @@ describe('ShareLinkBundleManageDialogComponent', () => { }) it('retries bundle build and replaces existing entry', () => { - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) const updated = sampleBundle({ status: ShareLinkBundleStatus.Ready }) service.rebuildBundle.mockReturnValue(of(updated)) @@ -189,7 +245,7 @@ describe('ShareLinkBundleManageDialogComponent', () => { }) it('adds new bundle when retry returns unknown entry', () => { - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) service.rebuildBundle.mockReturnValue( of(sampleBundle({ id: 99, slug: 'new-slug' })) ) @@ -203,7 +259,7 @@ describe('ShareLinkBundleManageDialogComponent', () => { }) it('handles retry errors', () => { - service.listAllBundles.mockReturnValue(of([])) + service.list.mockReturnValue(of({ count: 0, results: [] })) service.rebuildBundle.mockReturnValue(throwError(() => new Error('fail'))) fixture.detectChanges() @@ -213,8 +269,8 @@ describe('ShareLinkBundleManageDialogComponent', () => { expect(toastService.showError).toHaveBeenCalled() }) - it('maps helpers and closes dialog', () => { - service.listAllBundles.mockReturnValue(of([])) + it('maps status and file version helpers', () => { + service.list.mockReturnValue(of({ count: 0, results: [] })) fixture.detectChanges() expect(component.statusLabel(ShareLinkBundleStatus.Processing)).toContain( @@ -227,9 +283,5 @@ describe('ShareLinkBundleManageDialogComponent', () => { environment.apiBaseUrl = 'https://example.com/api/' const url = component.getShareUrl(sampleBundle({ slug: 'sluggy' })) expect(url).toBe('https://example.com/share/sluggy') - - const closeSpy = jest.spyOn(activeModal, 'close') - component.close() - expect(closeSpy).toHaveBeenCalled() }) }) diff --git a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts similarity index 59% rename from src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts rename to src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts index 5da728e5a..00d04a77e 100644 --- a/src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts @@ -1,7 +1,11 @@ import { Clipboard } from '@angular/cdk/clipboard' import { CommonModule } from '@angular/common' import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core' -import { NgbActiveModal, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' +import { FormsModule } from '@angular/forms' +import { + NgbPaginationModule, + NgbPopoverModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, catchError, of, switchMap, takeUntil, timer } from 'rxjs' import { FileVersion } from 'src/app/data/share-link' @@ -11,42 +15,77 @@ import { ShareLinkBundleStatus, ShareLinkBundleSummary, } from 'src/app/data/share-link-bundle' +import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { + SortEvent, + SortableDirective, +} from 'src/app/directives/sortable.directive' import { FileSizePipe } from 'src/app/pipes/file-size.pipe' import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service' +import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { environment } from 'src/environments/environment' -import { LoadingComponentWithPermissions } from '../../loading-component/loading.component' -import { ConfirmButtonComponent } from '../confirm-button/confirm-button.component' +import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' +import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' @Component({ - selector: 'pngx-share-link-bundle-manage-dialog', - templateUrl: './share-link-bundle-manage-dialog.component.html', - styleUrls: ['./share-link-bundle-manage-dialog.component.scss'], + selector: 'pngx-share-link-bundle-list', + templateUrl: './share-link-bundle-list.component.html', + styleUrls: ['./share-link-bundle-list.component.scss'], imports: [ ConfirmButtonComponent, CommonModule, + FormsModule, + NgbPaginationModule, NgbPopoverModule, NgxBootstrapIconsModule, + SortableDirective, FileSizePipe, ], }) -export class ShareLinkBundleManageDialogComponent +export class ShareLinkBundleListComponent extends LoadingComponentWithPermissions implements OnInit, OnDestroy { - private readonly activeModal = inject(NgbActiveModal) private readonly shareLinkBundleService = inject(ShareLinkBundleService) + private readonly settingsService = inject(SettingsService) private readonly toastService = inject(ToastService) private readonly clipboard = inject(Clipboard) - title = $localize`Share link bundles` readonly bundles = signal([]) readonly error = signal(null) readonly copiedSlug = signal(null) + readonly total = signal(0) + readonly page = signal(1) + readonly sortField = signal('created') + readonly sortReverse = signal(true) readonly statuses = ShareLinkBundleStatus readonly fileVersions = FileVersion + get pageSize(): number { + return ( + this.settingsService.get(SETTINGS_KEYS.OBJECT_LIST_SIZES) + ?.share_link_bundles || 25 + ) + } + + set pageSize(pageSize: number) { + this.settingsService.set(SETTINGS_KEYS.OBJECT_LIST_SIZES, { + ...this.settingsService.get(SETTINGS_KEYS.OBJECT_LIST_SIZES), + share_link_bundles: pageSize, + }) + this.settingsService.storeSettings().subscribe({ + next: () => { + this.page.set(1) + this.triggerRefresh(false) + }, + error: (error) => { + this.toastService.showError($localize`Error saving settings`, error) + }, + }) + } + private readonly refresh$ = new Subject() ngOnInit(): void { @@ -57,25 +96,33 @@ export class ShareLinkBundleManageDialogComponent this.loading.set(true) } this.error.set(null) - return this.shareLinkBundleService.listAllBundles().pipe( - catchError((error) => { - if (!silent) { - this.loading.set(false) - } - this.error.set($localize`Failed to load share link bundles.`) - this.toastService.showError( - $localize`Error retrieving share link bundles.`, - error - ) - return of(null) - }) - ) + return this.shareLinkBundleService + .list( + this.page(), + this.pageSize, + this.sortField(), + this.sortReverse() + ) + .pipe( + catchError((error) => { + if (!silent) { + this.loading.set(false) + } + this.error.set($localize`Failed to load share link bundles.`) + this.toastService.showError( + $localize`Error retrieving share link bundles.`, + error + ) + return of(null) + }) + ) }), takeUntil(this.unsubscribeNotifier) ) .subscribe((results) => { if (results) { - this.bundles.set(results) + this.bundles.set(results.results) + this.total.set(results.count) this.copiedSlug.set(null) } this.loading.set(false) @@ -98,6 +145,18 @@ export class ShareLinkBundleManageDialogComponent }` } + setPage(page: number): void { + this.page.set(page) + this.triggerRefresh(false) + } + + onSort(event: SortEvent): void { + this.sortField.set(event.column || 'created') + this.sortReverse.set(event.column ? event.reverse : true) + this.page.set(1) + this.triggerRefresh(false) + } + copy(bundle: ShareLinkBundleSummary): void { if (bundle.status !== ShareLinkBundleStatus.Ready) { return @@ -108,7 +167,6 @@ export class ShareLinkBundleManageDialogComponent setTimeout(() => { this.copiedSlug.set(null) }, 3000) - this.toastService.showInfo($localize`Share link copied to clipboard.`) } } @@ -117,6 +175,9 @@ export class ShareLinkBundleManageDialogComponent this.loading.set(true) this.shareLinkBundleService.delete(bundle).subscribe({ next: () => { + if (this.bundles().length === 1 && this.page() > 1) { + this.page.update((page) => page - 1) + } this.toastService.showInfo($localize`Share link bundle deleted.`) this.triggerRefresh(false) }, @@ -153,8 +214,8 @@ export class ShareLinkBundleManageDialogComponent return SHARE_LINK_BUNDLE_FILE_VERSION_LABELS[version] ?? version } - close(): void { - this.activeModal.close() + isExpired(expiration?: string): boolean { + return !!expiration && Date.parse(expiration) <= Date.now() } private replaceBundle(updated: ShareLinkBundleSummary): void { diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html new file mode 100644 index 000000000..710db7dc3 --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html @@ -0,0 +1,110 @@ +
    + @if (!loading() && error()) { + + } + @if (!loading() && !error() && links().length === 0) { +

    + No document share links currently exist. +

    + } + @if (!loading() && !error() && links().length > 0) { +
    + + + + + + + + + + + + @for (link of links(); track link.id) { + + + + + + + + } + +
    DocumentCreatedExpiresFile versionActions
    + {{ link.document_title | documentTitle }} + + @if (copiedDocumentID() === link.document) { + Copied! + } @else { + ID: {{link.document}} + } + + {{ link.created | date: 'short' }} + @if (link.expiration) { + {{ link.expiration | date: 'short' }} + @if (isExpired(link.expiration)) { + Expired + } + } @else { + Never + } + {{ fileVersionLabel(link.file_version) }} +
    + Copied! +
    + + + + +
    +
    +
    +
    +
    +
    + + + per page +
    + @if (total() > pageSize) { + + } +
    + } +
    diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts new file mode 100644 index 000000000..1946b7e78 --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts @@ -0,0 +1,155 @@ +import { Clipboard } from '@angular/cdk/clipboard' +import { ComponentFixture, TestBed } from '@angular/core/testing' +import { RouterTestingModule } from '@angular/router/testing' +import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' +import { of, throwError } from 'rxjs' +import { FileVersion, ShareLink } from 'src/app/data/share-link' +import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { ShareLinkService } from 'src/app/services/rest/share-link.service' +import { SettingsService } from 'src/app/services/settings.service' +import { ToastService } from 'src/app/services/toast.service' +import { ShareLinkListComponent } from './share-link-list.component' + +describe('ShareLinkListComponent', () => { + let component: ShareLinkListComponent + let fixture: ComponentFixture + let service: jest.Mocked> + let clipboard: Clipboard + let toastService: jest.Mocked> + + const link = { + id: 1, + document: 42, + document_title: 'Test document', + slug: 'share-slug', + created: new Date().toISOString(), + expiration: null, + file_version: FileVersion.Archive, + } as ShareLink + + beforeEach(() => { + service = { + list: jest.fn().mockReturnValue(of({ count: 1, results: [link] })), + delete: jest.fn().mockReturnValue(of(true)), + } + toastService = { + showInfo: jest.fn(), + showError: jest.fn(), + } + + TestBed.configureTestingModule({ + imports: [ + ShareLinkListComponent, + NgxBootstrapIconsModule.pick(allIcons), + RouterTestingModule, + ], + providers: [ + { provide: ShareLinkService, useValue: service }, + { provide: ToastService, useValue: toastService }, + ], + }) + + fixture = TestBed.createComponent(ShareLinkListComponent) + component = fixture.componentInstance + clipboard = TestBed.inject(Clipboard) + }) + + afterEach(() => { + jest.clearAllTimers() + jest.useRealTimers() + }) + + it('loads and renders document share links', () => { + fixture.detectChanges() + + expect(service.list).toHaveBeenCalledWith(1, 25, 'created', true) + expect(component.links()).toEqual([link]) + expect(fixture.nativeElement.textContent).toContain('Test document') + expect(fixture.nativeElement.textContent).toContain('ID: 42') + }) + + it('loads another page', () => { + fixture.detectChanges() + component.setPage(2) + + expect(service.list).toHaveBeenLastCalledWith(2, 25, 'created', true) + }) + + it('sorts links and returns to the first page', () => { + fixture.detectChanges() + component.page.set(2) + + component.onSort({ column: 'expiration', reverse: false }) + + expect(component.page()).toBe(1) + expect(service.list).toHaveBeenLastCalledWith(1, 25, 'expiration', false) + }) + + it('marks expired share links', () => { + service.list.mockReturnValue( + of({ + count: 1, + results: [ + { + ...link, + expiration: '2000-01-01T00:00:00.000Z', + }, + ], + }) + ) + + fixture.detectChanges() + + expect(fixture.nativeElement.textContent).toContain('Expired') + }) + + it('stores a changed page size and reloads from the first page', () => { + const settingsService = TestBed.inject(SettingsService) + jest.spyOn(settingsService, 'get').mockReturnValueOnce({ share_links: 25 }) + const setSpy = jest.spyOn(settingsService, 'set') + jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of({})) + const reloadSpy = jest.spyOn(component, 'reload') + component.page.set(2) + + component.pageSize = 50 + + expect(setSpy).toHaveBeenCalledWith(SETTINGS_KEYS.OBJECT_LIST_SIZES, { + share_links: 50, + }) + expect(component.page()).toBe(1) + expect(reloadSpy).toHaveBeenCalled() + }) + + it('shows local copy feedback without a toast', () => { + jest.useFakeTimers() + jest.spyOn(clipboard, 'copy').mockReturnValue(true) + fixture.detectChanges() + + component.copy(link) + fixture.detectChanges() + + expect(component.copiedID()).toBe(link.id) + expect(fixture.nativeElement.querySelector('.badge.show')).not.toBeNull() + expect(toastService.showInfo).not.toHaveBeenCalled() + + jest.advanceTimersByTime(3000) + expect(component.copiedID()).toBeNull() + }) + + it('deletes a link and reloads the list', () => { + fixture.detectChanges() + component.delete(link) + + expect(service.delete).toHaveBeenCalledWith(link) + expect(service.list).toHaveBeenCalledTimes(2) + expect(toastService.showInfo).toHaveBeenCalled() + }) + + it('shows an error when loading fails', () => { + service.list.mockReturnValue(throwError(() => new Error('load failed'))) + fixture.detectChanges() + + expect(component.error()).toContain('Failed to load share links.') + expect(toastService.showError).toHaveBeenCalled() + }) +}) diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts new file mode 100644 index 000000000..6f30366f4 --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts @@ -0,0 +1,172 @@ +import { Clipboard } from '@angular/cdk/clipboard' +import { CommonModule } from '@angular/common' +import { Component, OnInit, inject, signal } from '@angular/core' +import { FormsModule } from '@angular/forms' +import { RouterModule } from '@angular/router' +import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { takeUntil } from 'rxjs' +import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' +import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' +import { FileVersion, ShareLink } from 'src/app/data/share-link' +import { SHARE_LINK_BUNDLE_FILE_VERSION_LABELS } from 'src/app/data/share-link-bundle' +import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' +import { + SortEvent, + SortableDirective, +} from 'src/app/directives/sortable.directive' +import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe' +import { + PermissionAction, + PermissionType, +} from 'src/app/services/permissions.service' +import { ShareLinkService } from 'src/app/services/rest/share-link.service' +import { SettingsService } from 'src/app/services/settings.service' +import { ToastService } from 'src/app/services/toast.service' +import { environment } from 'src/environments/environment' + +@Component({ + selector: 'pngx-share-link-list', + templateUrl: './share-link-list.component.html', + imports: [ + CommonModule, + ConfirmButtonComponent, + DocumentTitlePipe, + FormsModule, + IfPermissionsDirective, + NgbPaginationModule, + NgxBootstrapIconsModule, + RouterModule, + SortableDirective, + ], +}) +export class ShareLinkListComponent + extends LoadingComponentWithPermissions + implements OnInit +{ + private readonly clipboard = inject(Clipboard) + private readonly shareLinkService = inject(ShareLinkService) + private readonly settingsService = inject(SettingsService) + private readonly toastService = inject(ToastService) + + readonly links = signal([]) + readonly total = signal(0) + readonly page = signal(1) + readonly sortField = signal('created') + readonly sortReverse = signal(true) + readonly copiedID = signal(null) + readonly copiedDocumentID = signal(null) + readonly error = signal(null) + readonly PermissionAction = PermissionAction + readonly PermissionType = PermissionType + + get pageSize(): number { + return ( + this.settingsService.get(SETTINGS_KEYS.OBJECT_LIST_SIZES)?.share_links || + 25 + ) + } + + set pageSize(pageSize: number) { + this.settingsService.set(SETTINGS_KEYS.OBJECT_LIST_SIZES, { + ...this.settingsService.get(SETTINGS_KEYS.OBJECT_LIST_SIZES), + share_links: pageSize, + }) + this.settingsService.storeSettings().subscribe({ + next: () => { + this.page.set(1) + this.reload() + }, + error: (error) => { + this.toastService.showError($localize`Error saving settings`, error) + }, + }) + } + + ngOnInit(): void { + this.reload() + } + + reload(): void { + this.loading.set(true) + this.error.set(null) + this.shareLinkService + .list(this.page(), this.pageSize, this.sortField(), this.sortReverse()) + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe({ + next: (results) => { + this.links.set(results.results) + this.total.set(results.count) + this.loading.set(false) + }, + error: (error) => { + this.loading.set(false) + this.error.set($localize`Failed to load share links.`) + this.toastService.showError( + $localize`Error retrieving share links.`, + error + ) + }, + }) + } + + setPage(page: number): void { + this.page.set(page) + this.reload() + } + + onSort(event: SortEvent): void { + this.sortField.set(event.column || 'created') + this.sortReverse.set(event.column ? event.reverse : true) + this.page.set(1) + this.reload() + } + + getShareUrl(link: ShareLink): string { + const apiURL = new URL(environment.apiBaseUrl) + return `${apiURL.origin}${apiURL.pathname.replace(/\/api\/$/, '/share/')}${ + link.slug + }` + } + + fileVersionLabel(version: FileVersion): string { + return SHARE_LINK_BUNDLE_FILE_VERSION_LABELS[version] ?? version + } + + isExpired(expiration?: string): boolean { + return !!expiration && Date.parse(expiration) <= Date.now() + } + + copy(link: ShareLink): void { + if (this.clipboard.copy(this.getShareUrl(link))) { + this.copiedID.set(link.id) + setTimeout(() => this.copiedID.set(null), 3000) + } + } + + delete(link: ShareLink): void { + this.shareLinkService.delete(link).subscribe({ + next: () => { + if (this.links().length === 1 && this.page() > 1) { + this.page.update((page) => page - 1) + } + this.toastService.showInfo($localize`Share link deleted.`) + this.reload() + }, + error: (error) => { + this.toastService.showError( + $localize`Error deleting share link.`, + error + ) + }, + }) + } + + copyDocumentID(documentID: number): void { + if (this.clipboard.copy(documentID.toString())) { + this.copiedDocumentID.set(documentID) + setTimeout(() => this.copiedDocumentID.set(null), 3000) + } + } +} diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.html b/src-ui/src/app/components/manage/share-links/share-links.component.html new file mode 100644 index 000000000..0db06c62e --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-links.component.html @@ -0,0 +1,34 @@ + + +
      + @if (canViewDocumentLinks) { +
    • + + + + +
      • + } + @if (canViewBundles) { +
    • + + + + +
      • + } +
    + +
    diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts new file mode 100644 index 000000000..36c46dd2c --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts @@ -0,0 +1,102 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing' +import { ActivatedRoute, convertToParamMap, Router } from '@angular/router' +import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap' +import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' +import { of } from 'rxjs' +import { + PermissionAction, + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service' +import { ShareLinkService } from 'src/app/services/rest/share-link.service' +import { ToastService } from 'src/app/services/toast.service' +import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { ShareLinksComponent, ShareLinksNavIDs } from './share-links.component' + +describe('ShareLinksComponent', () => { + let fixture: ComponentFixture + let permissionsService: PermissionsService + let router: Router + + const configure = async (type: string = null) => { + await TestBed.configureTestingModule({ + imports: [ + ShareLinksComponent, + NgbNavModule, + NgxBootstrapIconsModule.pick(allIcons), + PageHeaderComponent, + ], + providers: [ + PermissionsService, + { + provide: ActivatedRoute, + useValue: { + snapshot: { queryParamMap: convertToParamMap({ type }) }, + }, + }, + { + provide: Router, + useValue: { navigate: jest.fn().mockResolvedValue(true) }, + }, + { + provide: ShareLinkBundleService, + useValue: { + list: jest.fn().mockReturnValue(of({ count: 0, results: [] })), + rebuildBundle: jest.fn(), + delete: jest.fn(), + }, + }, + { + provide: ShareLinkService, + useValue: { + list: jest.fn().mockReturnValue(of({ count: 0, results: [] })), + delete: jest.fn(), + }, + }, + { + provide: ToastService, + useValue: { showInfo: jest.fn(), showError: jest.fn() }, + }, + ], + }).compileComponents() + + permissionsService = TestBed.inject(PermissionsService) + router = TestBed.inject(Router) + } + + afterEach(() => TestBed.resetTestingModule()) + + it('uses the requested bundles tab when permitted', async () => { + await configure(ShareLinksNavIDs.Bundles) + jest + .spyOn(permissionsService, 'currentUserCan') + .mockImplementation( + (action, type) => + action === PermissionAction.View && + type === PermissionType.ShareLinkBundle + ) + + fixture = TestBed.createComponent(ShareLinksComponent) + fixture.detectChanges() + + expect(fixture.componentInstance.activeNavID()).toBe( + ShareLinksNavIDs.Bundles + ) + expect(fixture.nativeElement.textContent).not.toContain('Document links') + }) + + it('updates the URL when a tab is selected', async () => { + await configure() + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + + fixture = TestBed.createComponent(ShareLinksComponent) + fixture.componentInstance.selectTab(ShareLinksNavIDs.Bundles) + + expect(router.navigate).toHaveBeenCalledWith([], { + relativeTo: TestBed.inject(ActivatedRoute), + queryParams: { type: ShareLinksNavIDs.Bundles }, + queryParamsHandling: 'merge', + }) + }) +}) diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.ts b/src-ui/src/app/components/manage/share-links/share-links.component.ts new file mode 100644 index 000000000..bc7aa156f --- /dev/null +++ b/src-ui/src/app/components/manage/share-links/share-links.component.ts @@ -0,0 +1,78 @@ +import { Component, computed, inject, signal, viewChild } from '@angular/core' +import { ActivatedRoute, Router } from '@angular/router' +import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap' +import { + PermissionAction, + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { PageHeaderComponent } from '../../common/page-header/page-header.component' +import { ShareLinkBundleListComponent } from './share-link-bundle-list/share-link-bundle-list.component' +import { ShareLinkListComponent } from './share-link-list/share-link-list.component' + +export enum ShareLinksNavIDs { + DocumentLinks = 'documents', + Bundles = 'bundles', +} + +@Component({ + selector: 'pngx-share-links', + templateUrl: './share-links.component.html', + imports: [ + NgbNavModule, + PageHeaderComponent, + ShareLinkBundleListComponent, + ShareLinkListComponent, + ], +}) +export class ShareLinksComponent { + private readonly route = inject(ActivatedRoute) + private readonly router = inject(Router) + private readonly permissionsService = inject(PermissionsService) + + readonly ShareLinksNavIDs = ShareLinksNavIDs + readonly activeNavID = signal(this.getInitialNavID()) + private readonly documentLinks = viewChild(ShareLinkListComponent) + private readonly bundles = viewChild(ShareLinkBundleListComponent) + readonly loading = computed(() => { + const activeList = + this.activeNavID() === ShareLinksNavIDs.DocumentLinks + ? this.documentLinks() + : this.bundles() + return activeList?.loading() ?? true + }) + + get canViewDocumentLinks(): boolean { + return this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.ShareLink + ) + } + + get canViewBundles(): boolean { + return this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.ShareLinkBundle + ) + } + + selectTab(tab: ShareLinksNavIDs): void { + this.activeNavID.set(tab) + void this.router.navigate([], { + relativeTo: this.route, + queryParams: { type: tab }, + queryParamsHandling: 'merge', + }) + } + + private getInitialNavID(): ShareLinksNavIDs { + const requestedTab = this.route.snapshot.queryParamMap.get('type') + if (requestedTab === ShareLinksNavIDs.Bundles && this.canViewBundles) { + return ShareLinksNavIDs.Bundles + } + if (this.canViewDocumentLinks) { + return ShareLinksNavIDs.DocumentLinks + } + return ShareLinksNavIDs.Bundles + } +} diff --git a/src-ui/src/app/data/share-link.ts b/src-ui/src/app/data/share-link.ts index d9710bd47..f71002995 100644 --- a/src-ui/src/app/data/share-link.ts +++ b/src-ui/src/app/data/share-link.ts @@ -26,5 +26,7 @@ export interface ShareLink extends ObjectWithPermissions { document: number // Document + document_title?: string + file_version: string } diff --git a/src-ui/src/app/data/ui-settings.ts b/src-ui/src/app/data/ui-settings.ts index a36435e37..5bc500872 100644 --- a/src-ui/src/app/data/ui-settings.ts +++ b/src-ui/src/app/data/ui-settings.ts @@ -27,6 +27,7 @@ export enum CollapsibleSection { export enum HideableSidebarItemID { Dashboard = 'dashboard', SavedViews = 'saved_views', + ShareLinks = 'share_links', Workflows = 'workflows', Mail = 'mail', Documentation = 'documentation', @@ -246,6 +247,8 @@ export const SETTINGS: UiSetting[] = [ document_types: 25, tags: 25, storage_paths: 25, + share_links: 25, + share_link_bundles: 25, }, }, { diff --git a/src-ui/src/app/services/rest/share-link-bundle.service.spec.ts b/src-ui/src/app/services/rest/share-link-bundle.service.spec.ts index 6b87ddf04..726dfc4a3 100644 --- a/src-ui/src/app/services/rest/share-link-bundle.service.spec.ts +++ b/src-ui/src/app/services/rest/share-link-bundle.service.spec.ts @@ -48,13 +48,4 @@ describe('ShareLinkBundleService', () => { expect(req.request.body).toEqual({}) req.flush({}) }) - - it('lists bundles with expected parameters', () => { - subscription = service.listAllBundles().subscribe() - const req = httpTestingController.expectOne( - `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=1000&ordering=-created` - ) - expect(req.request.method).toBe('GET') - req.flush({ results: [] }) - }) }) diff --git a/src-ui/src/app/services/rest/share-link-bundle.service.ts b/src-ui/src/app/services/rest/share-link-bundle.service.ts index 2aa719974..4dd7d5791 100644 --- a/src-ui/src/app/services/rest/share-link-bundle.service.ts +++ b/src-ui/src/app/services/rest/share-link-bundle.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core' import { Observable } from 'rxjs' -import { map } from 'rxjs/operators' import { ShareLinkBundleCreatePayload, ShareLinkBundleSummary, @@ -32,10 +31,4 @@ export class ShareLinkBundleService extends AbstractNameFilterService { - return this.list(1, 1000, 'created', true).pipe( - map((response) => response.results) - ) - } } diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 55cbff7f9..8c0fec3e8 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -626,6 +626,10 @@ ul.pagination { table.table { --bs-table-color: var(--bs-body-color); --bs-table-bg: var(--bs-light-rgb); + + &.bg-body { + --bs-table-bg: var(--bs-body-bg); + } } .close { diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 10296a392..917c68ca4 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -2835,6 +2835,11 @@ class AcknowledgeTasksViewSerializer(serializers.Serializer[dict[str, Any]]): class ShareLinkSerializer(OwnedObjectSerializer): + document_title = serializers.CharField( + source="document.title", + read_only=True, + ) + class Meta: model = ShareLink fields = ( @@ -2843,6 +2848,7 @@ class ShareLinkSerializer(OwnedObjectSerializer): "expiration", "slug", "document", + "document_title", "file_version", ) diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py index 7e8b1a720..adee77b64 100644 --- a/src/documents/tests/test_api_documents.py +++ b/src/documents/tests/test_api_documents.py @@ -3906,6 +3906,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase): }, ) self.assertEqual(resp.status_code, status.HTTP_201_CREATED) + self.assertEqual(resp.data["document_title"], doc.title) resp = self.client.post( "/api/share_links/", @@ -3916,6 +3917,17 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase): }, ) self.assertEqual(resp.status_code, status.HTTP_201_CREATED) + self.assertEqual(resp.data["document_title"], doc.title) + + response = self.client.get("/api/share_links/", format="json") + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["count"], 2) + self.assertTrue( + all( + link["document_title"] == doc.title for link in response.data["results"] + ), + ) response = self.client.get( f"/api/documents/{doc.pk}/share_links/", @@ -3927,6 +3939,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase): resp_data = response.json() self.assertEqual(len(resp_data), 2) + self.assertTrue( + all(link["document_title"] == doc.title for link in resp_data), + ) self.assertGreater(len(resp_data[1]["slug"]), 0) self.assertIsNone(resp_data[1]["expiration"]) @@ -3952,6 +3967,23 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + def test_order_share_links_by_document_title(self) -> None: + document_zulu = Document.objects.create(title="Zulu") + document_alpha = Document.objects.create(title="Alpha") + ShareLink.objects.create(document=document_zulu, slug="zulu-link") + ShareLink.objects.create(document=document_alpha, slug="alpha-link") + + response = self.client.get( + "/api/share_links/?ordering=document__title", + format="json", + ) + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual( + [link["document_title"] for link in response.data["results"]], + ["Alpha", "Zulu"], + ) + def test_share_links_permissions_aware(self) -> None: """ GIVEN: diff --git a/src/documents/views.py b/src/documents/views.py index 7bee5b51f..6f647bf3f 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -1983,7 +1983,14 @@ class DocumentViewSet( now = timezone.now() links = ( ShareLink.objects.filter(document=doc) - .only("pk", "created", "expiration", "slug") + .select_related("document") + .only( + "pk", + "created", + "expiration", + "slug", + "document__title", + ) .exclude(expiration__lt=now) .order_by("-created") ) @@ -4665,7 +4672,7 @@ class ShareLinkViewSet( ): model = ShareLink - queryset = ShareLink.objects.all() + queryset = ShareLink.objects.select_related("document") serializer_class = ShareLinkSerializer pagination_class = StandardPagination @@ -4676,7 +4683,7 @@ class ShareLinkViewSet( PermittedObjectsFilter, ) filterset_class = ShareLinkFilterSet - ordering_fields = ("created", "expiration", "document") + ordering_fields = ("created", "expiration", "document__title") @extend_schema_view( From 0d14d809951613fa57850c89e23fc27f33a5bafc Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 15:47:19 +0000 Subject: [PATCH 056/258] Auto translate strings --- src-ui/messages.xlf | 662 +++++++++++++++---------- src/locale/en_US/LC_MESSAGES/django.po | 20 +- 2 files changed, 416 insertions(+), 266 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index fa4a45f75..21e4ba97c 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -341,10 +341,6 @@ src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html 87,88 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 36,37 - src/app/components/document-list/document-list.component.ts 214 @@ -369,6 +365,10 @@ src/app/components/manage/document-attributes/management-list/management-list.component.html 151 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 20,21 + Settings @@ -386,11 +386,11 @@ src/app/components/app-frame/app-frame.component.html - 294 + 306 src/app/components/app-frame/app-frame.component.html - 296 + 308 @@ -763,11 +763,11 @@ src/app/components/app-frame/app-frame.component.html - 331 + 343 src/app/components/app-frame/app-frame.component.html - 333 + 345 @@ -1827,23 +1827,42 @@ 84 - - Workflows + + Share Links src/app/components/admin/settings/settings.component.ts 113 src/app/components/app-frame/app-frame.component.html - 257 + 261 + + + src/app/components/common/share-links-dialog/share-links-dialog.component.ts + 30 + + + src/app/components/document-detail/document-detail.component.html + 99,100 + + + + Workflows + + src/app/components/admin/settings/settings.component.ts + 114 src/app/components/app-frame/app-frame.component.html - 259 + 269 src/app/components/app-frame/app-frame.component.html - 262 + 271 + + + src/app/components/app-frame/app-frame.component.html + 274 src/app/components/manage/workflows/workflows.component.html @@ -1854,26 +1873,26 @@ Mail src/app/components/admin/settings/settings.component.ts - 114 + 115 src/app/components/app-frame/app-frame.component.html - 268 + 280 src/app/components/app-frame/app-frame.component.html - 270 + 282 src/app/components/app-frame/app-frame.component.html - 273 + 285 Documentation src/app/components/admin/settings/settings.component.ts - 115 + 116 src/app/components/app-frame/app-frame.component.html @@ -1881,22 +1900,22 @@ src/app/components/app-frame/app-frame.component.html - 339,340 + 351,352 src/app/components/app-frame/app-frame.component.html - 342 + 354 src/app/components/app-frame/app-frame.component.html - 345 + 357 Error retrieving users src/app/components/admin/settings/settings.component.ts - 279 + 280 src/app/components/admin/users-groups/users-groups.component.ts @@ -1915,7 +1934,7 @@ Error retrieving groups src/app/components/admin/settings/settings.component.ts - 298 + 299 src/app/components/admin/users-groups/users-groups.component.ts @@ -1934,28 +1953,28 @@ Settings were saved successfully. src/app/components/admin/settings/settings.component.ts - 650 + 651 Settings were saved successfully. Reload is required to apply some changes. src/app/components/admin/settings/settings.component.ts - 654 + 655 Reload now src/app/components/admin/settings/settings.component.ts - 655 + 656 An error occurred while saving settings. src/app/components/admin/settings/settings.component.ts - 665 + 666 src/app/components/app-frame/app-frame.component.ts @@ -1963,11 +1982,11 @@ src/app/components/app-frame/app-frame.component.ts - 302 + 315 src/app/components/app-frame/app-frame.component.ts - 331 + 344 @@ -1978,11 +1997,11 @@ src/app/components/app-frame/app-frame.component.html - 317 + 329 src/app/components/app-frame/app-frame.component.html - 319 + 331 @@ -2247,14 +2266,18 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts 97 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 32,33 - src/app/components/document-list/document-list.component.html 266,267 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 16,17 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 16,17 + src/app/data/document.ts 34 @@ -2304,10 +2327,6 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html 67,68 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 38,39 - src/app/components/document-detail/document-detail.component.html 65 @@ -2384,6 +2403,14 @@ src/app/components/manage/saved-views/saved-views.component.html 40,41 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 22,23 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 19,20 + src/app/components/manage/workflows/workflows.component.html 21,22 @@ -2766,11 +2793,11 @@ src/app/components/app-frame/app-frame.component.html - 278 + 290 src/app/components/app-frame/app-frame.component.html - 280 + 292 @@ -3127,11 +3154,11 @@ src/app/components/app-frame/app-frame.component.html - 308 + 320 src/app/components/app-frame/app-frame.component.html - 310 + 322 @@ -3345,19 +3372,19 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 927 + 928 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 966 + 967 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 989 + 990 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1025 + 1026 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts @@ -3578,92 +3605,107 @@ 125 + + Share links + + src/app/components/app-frame/app-frame.component.html + 256 + + + src/app/components/app-frame/app-frame.component.html + 258 + + + src/app/components/manage/share-links/share-links.component.html + 2,3 + + Administration src/app/components/app-frame/app-frame.component.html - 288,289 + 300,301 Configuration src/app/components/app-frame/app-frame.component.html - 301 + 313 src/app/components/app-frame/app-frame.component.html - 303 + 315 GitHub src/app/components/app-frame/app-frame.component.html - 352 + 364 is available. src/app/components/app-frame/app-frame.component.html - 362 + 374 Click to view. src/app/components/app-frame/app-frame.component.html - 362 + 374 Paperless-ngx can automatically check for updates src/app/components/app-frame/app-frame.component.html - 366 + 378 How does this work? src/app/components/app-frame/app-frame.component.html - 374 + 386 Update available src/app/components/app-frame/app-frame.component.html - 386 + 398 Configure update checking src/app/components/app-frame/app-frame.component.html - 391 + 403 Sidebar views updated src/app/components/app-frame/app-frame.component.ts - 467 + 480 Error updating sidebar views src/app/components/app-frame/app-frame.component.ts - 470 + 483 An error occurred while saving update checking settings. src/app/components/app-frame/app-frame.component.ts - 491 + 504 @@ -3946,27 +3988,27 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 559 + 560 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 599 + 600 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 637 + 638 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 675 + 676 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 737 + 738 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 875 + 876 @@ -4284,10 +4326,6 @@ src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.ts 81 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 155,156 - src/app/components/document-detail/document-detail.component.html 118 @@ -6249,7 +6287,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 879 + 880 @@ -6855,6 +6893,18 @@ src/app/components/common/share-links-dialog/share-links-dialog.component.html 39,40 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 99,100 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 29 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 53,54 + Read more @@ -7401,14 +7451,18 @@ src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html 89,90 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 35,36 - src/app/components/common/share-links-dialog/share-links-dialog.component.html 52 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 19,20 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 17,18 + Share archive version (if available) @@ -7437,10 +7491,6 @@ src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html 60,61 - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 33,34 - src/app/components/common/system-status-dialog/system-status-dialog.component.html 58,59 @@ -7457,6 +7507,10 @@ src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html 35,36 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 17,18 + src/app/components/manage/workflows/workflows.component.html 19,20 @@ -7497,8 +7551,12 @@ 95,96 - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 101,102 + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 88,89 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 43,44 src/app/data/share-link.ts @@ -7512,8 +7570,12 @@ 98,99 - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 37,38 + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 21,22 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 18,19 @@ -7523,8 +7585,8 @@ 101,102 - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 34,35 + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 18,19 @@ -7559,122 +7621,6 @@ 60 - - Loading share link bundles… - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 10,11 - - - - Status updates every few seconds while bundles are being prepared. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 21 - - - - No share link bundles currently exist. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 25,27 - - - - Built: - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 48 - - - - View error details - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 62,63 - - - - Copy share link - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 113,114 - - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 122,123 - - - - Retry - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 132,133 - - - - Delete share link bundle - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html - 141,142 - - - - Share link bundles - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 42 - - - - Failed to load share link bundles. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 65 - - - - Error retrieving share link bundles. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 67 - - - - Share link copied to clipboard. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 111 - - - - Share link bundle deleted. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 120 - - - - Error deleting share link bundle. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 126 - - - - Share link bundle rebuild requested. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 138 - - - - Error requesting rebuild. - - src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts - 143 - - No existing links @@ -7696,17 +7642,6 @@ 48,49 - - Share Links - - src/app/components/common/share-links-dialog/share-links-dialog.component.ts - 30 - - - src/app/components/document-detail/document-detail.component.html - 99,100 - - Error retrieving links @@ -8287,7 +8222,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 504 + 505 this string is used to separate processing, failed and added on the file upload widget @@ -8869,7 +8804,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 877 + 878 @@ -8887,7 +8822,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 923 + 924 @@ -9273,7 +9208,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1023 + 1024 @@ -9308,25 +9243,25 @@ Error executing bulk operation src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 338 + 339 "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 496 + 497 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 502 + 503 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 498 + 499 This is for messages like 'modify "tag1" and "tag2"' @@ -9334,7 +9269,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 506,508 + 507,509 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -9342,14 +9277,14 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 523 + 524 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 529 + 530 @@ -9358,14 +9293,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 534,536 + 535,537 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 542 + 543 @@ -9374,7 +9309,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 547,549 + 548,550 @@ -9385,84 +9320,84 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 551,555 + 552,556 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 592 + 593 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 594 + 595 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 596 + 597 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 630 + 631 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 632 + 633 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 634 + 635 Confirm storage path assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 668 + 669 This operation will assign the storage path "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 670 + 671 This operation will remove the storage path from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 672 + 673 Confirm custom field assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 701 + 702 This operation will assign the custom field "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 707 + 708 @@ -9471,14 +9406,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 712,714 + 713,715 This operation will remove the custom field "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 720 + 721 @@ -9487,7 +9422,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 725,727 + 726,728 @@ -9498,105 +9433,105 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 729,733 + 730,734 Move selected document(s) to the trash? src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 876 + 877 This operation will permanently recreate the archive files for selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 924 + 925 The archive files will be re-generated with the current settings. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 925 + 926 Rotate confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 963 + 964 This operation will add rotated versions of the document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 964 + 965 Merge confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 987 + 988 This operation will merge selected documents into a new document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 988 + 989 Merged document will be queued for consumption. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1011 + 1012 The selected documents will become versions of the root document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1024 + 1025 Documents merged as versions. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1039 + 1040 Custom fields updated. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1065 + 1066 Error updating custom fields. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1074 + 1075 Share link bundle creation requested. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1122 + 1123 Share link bundle creation is not available yet. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1129 + 1130 @@ -10639,6 +10574,14 @@ src/app/components/manage/document-attributes/management-list/management-list.component.html 12,13 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 147,148 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 87,88 + per page @@ -10658,6 +10601,14 @@ src/app/components/manage/document-attributes/management-list/management-list.component.html 20,21 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 153,154 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 93,94 + Matching @@ -10775,6 +10726,14 @@ src/app/components/manage/document-attributes/management-list/management-list.component.ts 328 + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 84 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.ts + 82 + Permissions updated successfully @@ -11251,6 +11210,197 @@ 306 + + No share link bundles currently exist. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 9,11 + + + + Built: + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 32 + + + + View error details + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 46,47 + + + + Expired + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 84,85 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 40,41 + + + + Copy share link + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 106,107 + + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 115,116 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 59,60 + + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 67,68 + + + + Retry + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 125,126 + + + + Delete share link bundle + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 134,135 + + + + Share link bundles pagination + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html + 164,165 + + + + Failed to load share link bundles. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 111 + + + + Error retrieving share link bundles. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 113 + + + + Share link bundle deleted. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 181 + + + + Error deleting share link bundle. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 187 + + + + Share link bundle rebuild requested. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 199 + + + + Error requesting rebuild. + + src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts + 204 + + + + No document share links currently exist. + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 7,8 + + + + Document + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 15,16 + + + + Delete share link + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 75,76 + + + + Share links pagination + + src/app/components/manage/share-links/share-link-list/share-link-list.component.html + 104,105 + + + + Failed to load share links. + + src/app/components/manage/share-links/share-link-list/share-link-list.component.ts + 105 + + + + Error retrieving share links. + + src/app/components/manage/share-links/share-link-list/share-link-list.component.ts + 107 + + + + Share link deleted. + + src/app/components/manage/share-links/share-link-list/share-link-list.component.ts + 154 + + + + Error deleting share link. + + src/app/components/manage/share-links/share-link-list/share-link-list.component.ts + 159 + + + + Manage public links to individual documents and document bundles. + + src/app/components/manage/share-links/share-links.component.html + 4,5 + + + + Document links + + src/app/components/manage/share-links/share-links.component.html + 18,19 + + + + Bundles + + src/app/components/manage/share-links/share-links.component.html + 26,27 + + Use workflows to customize the behavior of Paperless-ngx when events 'trigger' a workflow. diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 16019a55a..5eee585a6 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 14:36+0000\n" +"POT-Creation-Date: 2026-09-16 15:46+0000\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -1632,7 +1632,7 @@ msgid "workflow runs" msgstr "" #: documents/serialisers.py:514 documents/serialisers.py:871 -#: documents/serialisers.py:2865 documents/views.py:343 documents/views.py:2719 +#: documents/serialisers.py:2871 documents/views.py:343 documents/views.py:2726 #: paperless_mail/serialisers.py:156 msgid "Insufficient permissions." msgstr "" @@ -1669,11 +1669,11 @@ msgstr "" msgid "Invalid variable detected." msgstr "" -#: documents/serialisers.py:2921 +#: documents/serialisers.py:2927 msgid "Duplicate document identifiers are not allowed." msgstr "" -#: documents/serialisers.py:2951 documents/views.py:4742 +#: documents/serialisers.py:2957 documents/views.py:4749 #, python-format msgid "Documents not found: %(ids)s" msgstr "" @@ -1941,7 +1941,7 @@ msgstr "" msgid "Unable to parse URI {value}" msgstr "" -#: documents/views.py:336 documents/views.py:2716 +#: documents/views.py:336 documents/views.py:2723 msgid "Invalid more_like_id" msgstr "" @@ -1957,24 +1957,24 @@ msgstr "" msgid "AI backend rejected the request. Check logs for details." msgstr "" -#: documents/views.py:2541 documents/views.py:2857 +#: documents/views.py:2548 documents/views.py:2864 msgid "Specify only one of text, title_search, query, or more_like_id." msgstr "" -#: documents/views.py:4755 +#: documents/views.py:4762 #, python-format msgid "Insufficient permissions to share document %(id)s." msgstr "" -#: documents/views.py:4801 +#: documents/views.py:4808 msgid "Bundle is already being processed." msgstr "" -#: documents/views.py:4865 +#: documents/views.py:4872 msgid "The share link bundle is still being prepared. Please try again later." msgstr "" -#: documents/views.py:4879 +#: documents/views.py:4886 msgid "The share link bundle is unavailable." msgstr "" From 6ad95b63b2a000f6f0b3aa61a84b2f60ed3e625d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 16:19:49 +0000 Subject: [PATCH 057/258] Chore(deps-dev): Bump the frontend-jest-dependencies group (#14142) Bumps the frontend-jest-dependencies group in /src-ui with 2 updates: [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom). Updates `jest` from 30.4.2 to 30.5.1 - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v30.5.1/packages/jest) Updates `jest-environment-jsdom` from 30.4.1 to 30.5.1 - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v30.5.1/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest dependency-version: 30.5.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-jest-dependencies - dependency-name: jest-environment-jsdom dependency-version: 30.5.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-jest-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src-ui/package.json | 4 +- src-ui/pnpm-lock.yaml | 965 ++++++++++++++++++++++++------------------ 2 files changed, 563 insertions(+), 406 deletions(-) diff --git a/src-ui/package.json b/src-ui/package.json index 07cff5d46..cc32098b5 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -62,8 +62,8 @@ "@typescript-eslint/parser": "^8.68.0", "@typescript-eslint/utils": "^8.68.0", "eslint": "^10.9.1", - "jest": "30.4.2", - "jest-environment-jsdom": "^30.4.1", + "jest": "30.5.1", + "jest-environment-jsdom": "^30.5.1", "jest-junit": "^17.0.0", "jest-preset-angular": "^17.0.0", "jest-websocket-mock": "^2.5.0", diff --git a/src-ui/pnpm-lock.yaml b/src-ui/pnpm-lock.yaml index 538f96418..d01aa431a 100644 --- a/src-ui/pnpm-lock.yaml +++ b/src-ui/pnpm-lock.yaml @@ -92,7 +92,7 @@ importers: devDependencies: '@angular-builders/jest': specifier: ^22.0.1 - version: 22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) + version: 22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) '@angular-devkit/core': specifier: ^22.1.6 version: 22.1.6(chokidar@5.0.0) @@ -145,17 +145,17 @@ importers: specifier: ^10.9.1 version: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) jest: - specifier: 30.4.2 - version: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + specifier: 30.5.1 + version: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) jest-environment-jsdom: - specifier: ^30.4.1 - version: 30.4.1(supports-color@8.1.1) + specifier: ^30.5.1 + version: 30.5.1(supports-color@8.1.1) jest-junit: specifier: ^17.0.0 version: 17.0.0 jest-preset-angular: specifier: ^17.0.0 - version: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + version: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) jest-websocket-mock: specifier: ^2.5.0 version: 2.5.0 @@ -1082,12 +1082,12 @@ packages: resolution: {integrity: sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==} engines: {node: '>=8'} - '@jest/console@30.4.1': - resolution: {integrity: sha512-v3bhyxUh9Hgmo5p6hAOXe14/R3ZxZDOsvHleh4B07z3m/x4/ngPUXEm9XwK4sF4u+f+P2ORb0Ge+MgpaqRMVDA==} + '@jest/console@30.5.1': + resolution: {integrity: sha512-u5Ncuc+gXVUwjNMFQOnphHo2Qx2DxyC8Dvpmf4HCx4y0kvSkRRNiQYRixrvOP4V7y52JcSuNxqochCt0PpdHVg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/core@30.4.2': - resolution: {integrity: sha512-TZJA6cPJUFxoWhxaLo8t0VX/MZX2wPWr0uIDvLSHIvN4gu9h02vSzqI2kBADG1ExqQlC+cY09xKMSreivvrChQ==} + '@jest/core@30.5.1': + resolution: {integrity: sha512-BL9g6CJUUhIbdoAflz/Va658erSSXUIvU8XUYiWNTbZljJjZ5yaC9EJ9/dQ19rpbYV3ZOK4sBACqhPaTyhoUIA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1099,6 +1099,10 @@ packages: resolution: {integrity: sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/diff-sequences@30.5.0': + resolution: {integrity: sha512-OsqBjHXCn8cadasoAZBP6nWYvMsRhpMzGXTpxJ5aO04NlbdhIz+FVe3q49l0AwVhsz/cEmIpBes6gAFl1/dWQg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/environment-jsdom-abstract@30.4.1': resolution: {integrity: sha512-dSlKrqug3siYNHVnjwIldShY12wAH3spwRltO/+8VOjg0X+xEq7vOs3DbBs4LRKsu7OH+NUb9kuZUNBF9Ho3TA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -1109,36 +1113,67 @@ packages: canvas: optional: true + '@jest/environment-jsdom-abstract@30.5.1': + resolution: {integrity: sha512-J395vmP3Fb2Te0JmF7pe4si4jpfbXef1YsY4UpHYL6OOxS2molu9Dsie1VmIiUalXdtmz1P5QRgc+5hBD+ssBg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + peerDependencies: + '@types/jsdom': '*' + canvas: ^3.0.0 + jsdom: '*' + peerDependenciesMeta: + canvas: + optional: true + '@jest/environment@30.4.1': resolution: {integrity: sha512-AK9yNRqgKxiabqMoe4oW+3/TSSeV8vkdC7BGaxZdU0AFXfOpofTLqdru2GXKZghP3sdgwE9XXpnVwfZ8JnFV4w==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/environment@30.5.1': + resolution: {integrity: sha512-eYJAkOsrpwDXPcoLNEG6lN9Zo3Cy35pxnVQD74vyIfsi/Q8wB/lZFsEjU4wrecOgT4ZviQDZaX/cFIJyMdMxTw==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/expect-utils@30.4.1': resolution: {integrity: sha512-ZBn5CglH8fBsQsvs4VWNzD4aWfUYks+IdOOQU3MEK71ol/BcVm+P+rtb1KpiFBpSWSCE27uOahyyf1vfqOVbcQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/expect@30.4.1': - resolution: {integrity: sha512-ginrj6TMgh2GshLUGCjO94Ptx9HhdZA/I6A9iUfyeLKFtdAjnKzHDgzgP9HYQgbxM1lbXScQ2eUBz2lGeVDPWA==} + '@jest/expect-utils@30.5.1': + resolution: {integrity: sha512-WcRWhHQdTMRDpyWKZ/6MINBmovI7zeD+bL8wFjCncRV3NQOwKy1X45IfyblfHR4k/XciIlNEdFL9QjFO+HNKOg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + '@jest/expect@30.5.1': + resolution: {integrity: sha512-uOGd40P/COyUp9xHf5jeGiGJC2/ANg+2+Tk9/xN5/LxmlY/r/gxsPrx3DTEtaRZsLAX4wgNSLEDELZ5bmVs2bA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/fake-timers@30.4.1': resolution: {integrity: sha512-iW5umdmfPeWzehrVhugFQZqCchSCud5S1l2YT0O9ZhjRR0ExclANDZkiSBwzqtnlOn0J1JXvO+HZ6rkuyOVOgQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/fake-timers@30.5.1': + resolution: {integrity: sha512-rEkV6YzpBXo/L9cnj2ibyuYZuyGiNWaPUsyCu3HYJbqCV4jnEiKmf7hId20z8eKjZ0JQ9jtIYKxRSmYB/OYSsA==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/get-type@30.1.0': resolution: {integrity: sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/globals@30.4.1': - resolution: {integrity: sha512-ZbuY4cmXC8DkxYjfvT2DbcHWL2T6vmsMhXCDcmTB2T0y0gaezBI77ufq5ZAIdcRkYZ7NEQEDg1xFeKbxUJ5v5Q==} + '@jest/get-type@30.5.0': + resolution: {integrity: sha512-9/2VUPitAjmBzbvDvqrxmvB7BzWsBW0WmkkojX1ODuxX1NLGxx9gfaZpHB0z8DtJ9uhGNmZG/VXBhf8uO0OV8Q==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + '@jest/globals@30.5.1': + resolution: {integrity: sha512-VhqvQ251XIC7pk46YymI3HCeBLOdvriDw9zibekodAHEwoVvbVVgpU5H13GvmyOAzxtZCfsm1uvzqkaqJf2I+g==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/pattern@30.4.0': resolution: {integrity: sha512-RAWn3+f9u8BsHijKJ71uHcFp6vmyEt6VvoWXkl6hKF3qVIuWNmudVjg12DlBPGup/frIl5UcUlH5HfEuvHpEXg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/reporters@30.4.1': - resolution: {integrity: sha512-/SnkPCzEQpUaBH81kjdEdDdo2WZl5hxw+BmLDGWjRkm8o7XlhjwsU36cqwe5PGBE5WYpBvDzRSdXx9rbGuJtNA==} + '@jest/pattern@30.5.0': + resolution: {integrity: sha512-HdNQYSdRTEBNrginaqzQtTjG0HRMfrra/z6Ok7uL3S87vSlarIVohEsJsSj5edu3MiHoHjAkvPROz5ZjoKai+w==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + '@jest/reporters@30.5.1': + resolution: {integrity: sha512-RbUXIfv85KxitJn4l3MpAoMilkvXe2QCO5lXxHWftywo/VdZ5vkEoHRDgphcxP6qmoIkUaN8/UZj6NhdkIFdJg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1154,30 +1189,38 @@ packages: resolution: {integrity: sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/snapshot-utils@30.4.1': - resolution: {integrity: sha512-ObY4ljvQ95mt6iwKtVLetR/4yXiAgl3H4nJxhztr0MTjrN97TwDYrnCp/kF60Ec9HdhkWTHSu+Hg05aXfngpOA==} + '@jest/schemas@30.5.0': + resolution: {integrity: sha512-/hunigyNpc4RCjC0VaW3f5RCUZVM2+WQ65qP7z083Gmvac7or2LI50XVNOtE4YPgBpV0yxYiAgorAPGniCoJmg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/source-map@30.0.1': - resolution: {integrity: sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==} + '@jest/snapshot-utils@30.5.1': + resolution: {integrity: sha512-V3wnxNtiVmw5PPVg433Cn3VdXnsOeu/ofLw3KC04Bn2y1wIlU5kozXQn48rhrgj/02LrCVtntTEF1yBha0XSUw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/test-result@30.4.1': - resolution: {integrity: sha512-/ZG7pgEiOmmWkN9TplKbOu4id2N5lh7FHwRwlkgBVAzGdRH+OkkQ8wX/kIxg4zmd3ZQvAL1RwL2yWsvNYYECTw==} + '@jest/source-map@30.5.0': + resolution: {integrity: sha512-xWpTJP9D0bDFGbPGT8XuWSwwha/iHADyyKzUnMx4UbdgnHugxrDaQFO4RZ8x4ZsFzRP6pNii8uvlgKCDxCIuDg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/test-sequencer@30.4.1': - resolution: {integrity: sha512-PeYE+4td5rKjoRPxztObrXU+H8hsjZfxKMXOcmrr34JerSyB/ROOxbbicz8B7A5j9R9VayDnVPvBmedqCsFCdw==} + '@jest/test-result@30.5.1': + resolution: {integrity: sha512-A/1S6ZBdpic50E0pxLgvaB9XNPL4k7AksmG69OO2oiotxciWZwHkbOec+qbIi+uUtIIByOVlXJUl97oZUsz+Jw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - '@jest/transform@30.4.1': - resolution: {integrity: sha512-Wz0LyktlTvRefoymh+n64hQ84KNXsRGcwdoZ8CSa0Ea+fgYcHZlnk+hDP7v2MS7il2bQ5uTEIxf4/NNfhMN4KQ==} + '@jest/test-sequencer@30.5.1': + resolution: {integrity: sha512-SHcPnrjdVRYJv6y6l4JUTy4Jccu7zmO6BmiOfOA34UiVBto22s19WiDC0A/2qfM7MWB/qdcoqfSIRMitpjTT4A==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + '@jest/transform@30.5.1': + resolution: {integrity: sha512-EDnDhn0jleU9ZhpVoA4gvqw+Ev0iw/r5upNT2b79RiwiaTiYAMMhvNJP3lmocjIe5J2ZkoNr0B3K/J6O5GIm4Q==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/types@30.4.1': resolution: {integrity: sha512-f1x/vJXIfjOlEmejYpbkbgw1gOqpPECwMvMEtBqe47j7H2Hg8h8w3o3ikhSXq3MI15kg+oQ0exWO0uCtTNJLoQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jest/types@30.5.1': + resolution: {integrity: sha512-LvVYn83nnXPl+Rg98nvcFgjx6nRMTArhSn6RAX/w3ELn54S8A42TYZvsCMdGUqTM8S0wyXbtlQdU6Hi6dykj9g==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + '@jridgewell/gen-mapping@0.3.13': resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} @@ -1466,13 +1509,6 @@ packages: resolution: {integrity: sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==} engines: {node: '>= 10'} - '@napi-rs/wasm-runtime@1.2.2': - resolution: {integrity: sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw==} - engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} - peerDependencies: - '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.3 - '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.3 - '@napi-rs/wasm-runtime@1.2.3': resolution: {integrity: sha512-UMduMbqO5s5zF2NkNacMT/yK5Y5QiKvWr2+50bzIIxFDwVJ2h49b+oyjaCGPhJxd2/gC2x39EHv/gHVuu36x2Q==} engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} @@ -2018,6 +2054,9 @@ packages: '@types/node@26.4.0': resolution: {integrity: sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==} + '@types/node@26.5.0': + resolution: {integrity: sha512-dVSGpriSoCgz8WnDNTuSSuSv1PC/ALXihO4ulRZt7Md8k9mlbdin3lGOcDE8SnWOgf513ByWlXd7BK4azmyg/A==} + '@types/stack-utils@2.0.3': resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==} @@ -2299,18 +2338,18 @@ packages: resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==} engines: {node: '>= 0.4'} - babel-jest@30.4.1: - resolution: {integrity: sha512-fATAbM8piYxkiXQp3RBXmZHxZVNJZAVXXfyeyCN2Tida3+qJ8ea9UxhiJ2y4fLO90ZImKt6k9FlcH2+rLkJGhw==} + babel-jest@30.5.1: + resolution: {integrity: sha512-ge1xUVZS91ml09YRMgRGgeKJ4YJpcOiuwteAxFBYLugQyp7cRw+hHej6Ho0vPjvLrjq60bb7JPHH9LAMA1/krA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: '@babel/core': ^7.11.0 || ^8.0.0-0 - babel-plugin-istanbul@7.0.1: - resolution: {integrity: sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==} - engines: {node: '>=12'} + babel-plugin-istanbul@8.0.0: + resolution: {integrity: sha512-18wCskrN3DgbuBmp1gr7LBGT8xdz5xhQQqFvFhVxbkl8VBCrMKQ2YtqBWtUal1Zrc1HTuX0011+Brjw78TCFkg==} + engines: {node: '>=18'} - babel-plugin-jest-hoist@30.4.0: - resolution: {integrity: sha512-9EdtWM/sSfXLOGLwSn+GS6pIXyBnL07/8gyJlwFXjWy4DxMOyItqyUT29d4lQiS380EZwYlX7/At4PgBS+m2aA==} + babel-plugin-jest-hoist@30.5.0: + resolution: {integrity: sha512-gtGo1B+u14jrZQv6TdSWIWkTqclboo7Qn+dFAGUOIuXLFuJKAdg3U5MIWzZnW4vfUb4dX9skmAMiby86e/SF4A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} babel-preset-current-node-syntax@1.2.0: @@ -2318,11 +2357,11 @@ packages: peerDependencies: '@babel/core': ^7.0.0 || ^8.0.0-0 - babel-preset-jest@30.4.0: - resolution: {integrity: sha512-lBY4jxsNmCnSiu7kquw8ZC9F4+XLMOKypT3RnNHPvU2Kpd4W0xaPuLr5ZkRyOsvLYAY4yaW1ZwTW4xB7NIiZzg==} + babel-preset-jest@30.5.0: + resolution: {integrity: sha512-ZGPn5ClP4lBDpuOK8W1yQIOy359HmbnZv3suucAlIe+SEE9yDsxV4S2PjSbH2Vc97U+WmzYD7vw3kr8NsQ/i6w==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: - '@babel/core': ^7.11.0 || ^8.0.0-beta.1 + '@babel/core': ^7.11.0 || ^8.0.0-beta.1 || ^8.0.0 balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -2352,9 +2391,6 @@ packages: peerDependencies: '@popperjs/core': ^2.11.8 - brace-expansion@1.1.18: - resolution: {integrity: sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==} - brace-expansion@2.1.4: resolution: {integrity: sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==} @@ -2427,8 +2463,8 @@ packages: resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==} engines: {node: '>=8'} - cjs-module-lexer@2.2.0: - resolution: {integrity: sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==} + cjs-module-lexer@2.2.1: + resolution: {integrity: sha512-Ca8swihM+/4yKecYHY52kgJd300hi2lADU/a1RxNTRe+RJ9jvqQlESpbz9DnG9mowez8qwXHB8qYdIUw9e+F5Q==} cli-cursor@5.0.0: resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} @@ -2468,9 +2504,6 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - content-disposition@1.1.0: resolution: {integrity: sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==} engines: {node: '>=18'} @@ -2648,6 +2681,9 @@ packages: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} + es-module-lexer@2.3.2: + resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==} + es-object-atoms@1.1.2: resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==} engines: {node: '>= 0.4'} @@ -2748,6 +2784,10 @@ packages: resolution: {integrity: sha512-PMARsyh/JtqC20HoGqlFcIlQAyqUtW4PlI1rup1uhYJtKuwAjbvWi3GQMAn+STdHum/dk8xrKfUM1+5SAwpolA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + expect@30.5.1: + resolution: {integrity: sha512-m8YrYgvKe9+9gEnWEuKz+qCGfHqkrff7PPfyDnOFkjsfYRKqiYyOxDFMFieCGAuhtk/VNm63tvNgKZVzVy+Hvg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + express-rate-limit@8.6.2: resolution: {integrity: sha512-YH4ru+eOJxQABscKFfRCy9R7x9QFGdezclVMwwgFFndzS2Xnm0uo6B0ABZsLhcpeptGv2qvuJVWlQr9gQZoC3A==} engines: {node: '>= 16'} @@ -2829,9 +2869,6 @@ packages: resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} engines: {node: '>= 0.8'} - fs.realpath@1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - fsevents@2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -2885,9 +2922,9 @@ packages: deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true - glob@7.2.3: - resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me + glob@13.0.6: + resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==} + engines: {node: 18 || 20 || >=22} gopd@1.2.0: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} @@ -2986,10 +3023,6 @@ packages: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} - inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. - inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} @@ -3068,16 +3101,16 @@ packages: jackspeak@3.4.3: resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} - jest-changed-files@30.4.1: - resolution: {integrity: sha512-IuctmYrxi21iOSOaIXpJWalHyPAsVv0GeBHKDn8C1CA4W5htHn7INL+wdnL4Bo0+olEndvAFkmb++tIQJG+vvg==} + jest-changed-files@30.5.1: + resolution: {integrity: sha512-0+bvMM/ENhDI29Z8q1r4HxiDIi4G5tnBmSw4esfPQoj9q8Nik7KIyuxHkTVnnniJQf05SxpGaKDQ+4h28ynGPg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-circus@30.4.2: - resolution: {integrity: sha512-rvHH7VlY6LgbJXJTQ87GW62g1FntOtbhh0zT+v04kC+pgL6aBKyYINXxWukCpj3dcIBMw5/XUbtDS9dU9JTXeQ==} + jest-circus@30.5.1: + resolution: {integrity: sha512-NgliezXQ6yznqR4W5Gqw++0cZSbBZlF0NknNIAE5VmSJKWOtmWJmWnBq3TSkUOVBTPrT7FGGhVdA8DLWnxo2Sw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-cli@30.4.2: - resolution: {integrity: sha512-jfA2ocvVHMXS2QijrJ0d31ektP+d/W0T5RpcTX2Pq+3sVqHlsXVCM2+FmwpL+bdY8OfHpIg9xMxLF17Zg0U49Q==} + jest-cli@30.5.1: + resolution: {integrity: sha512-uwNYepWgaNBCplm42fCIUZTf/tIEHIy5AYvx7eL1BrwIgyjPt+2poouR23UO2yopIP+kV8oZFHfv+l4pg/8prQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: @@ -3086,8 +3119,8 @@ packages: node-notifier: optional: true - jest-config@30.4.2: - resolution: {integrity: sha512-rNHAShJQqQwFNoL0hbf3BphSBOWnpOUAKvidLS/AjNVLPfoj5mSf4jQMfW3cYOs6hXeZC7nF7mDHaBnbxELOzg==} + jest-config@30.5.1: + resolution: {integrity: sha512-L8PKM2X/ngG8PxfLMqglKGZjylPgw84bVPUlMY9W/o76TnLqPWrmQgsaT0HrheGdRtpGE5FbmREA0Kvb+Qx5gQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: '@types/node': '*' @@ -3109,16 +3142,20 @@ packages: resolution: {integrity: sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-docblock@30.4.0: - resolution: {integrity: sha512-ZPMabUZCx5MpbZ2eBYSvZ0J8fvo3dR9oM+eeUpb3aKNQFuS2tu3Duw1TNlMoP8k3WQgKGJuhcMFvwcVuq6T7oA==} + jest-diff@30.5.1: + resolution: {integrity: sha512-e3cNNMpv8Kh20MjjphTXs+3Vz7DQyLM1nft7KJhnh46atFhjVJRa+0Hq0beywuwsACtMQUBihQkFl8zxb7gt1Q==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-each@30.4.1: - resolution: {integrity: sha512-/8MJbH6fuj48TstjrMf+u/pd06Qezz5xOXvZA6442heNOWr8bdeoGZX2d9fCn028CoMgYmroH9//zky5GfyYmA==} + jest-docblock@30.5.0: + resolution: {integrity: sha512-NwDqcxtoZi33RhuW+zJS/RVA3rmheQ8BnwpYZuc/Eruaz6seQb7+aoCeDZu/3X7W2XmD8DbSo9Pn72DbKsBFYw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-environment-jsdom@30.4.1: - resolution: {integrity: sha512-o3nfaN4zej7qgk2X0j8Jhq/S9nAVKs2xK3QeQxeHVvpkEPxaA1yxDGydR+iVI7zPy7Cp62Aq2h3Ja46QvfWHGA==} + jest-each@30.5.1: + resolution: {integrity: sha512-S1af0TU4v1EZ/AUlkFs/sxf/5KGsbAT9kRgdyoMX/x72y7C8ZEgETE5o1TPnbKRnrbprc5FR/moYLfdRmqEjsQ==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + jest-environment-jsdom@30.5.1: + resolution: {integrity: sha512-8lzKbC/SRbQE24wr1OOJV+aYtDAuVNKBryN6YcFiCcaZZ3I7grcZY7w91BwNvGET0ubKDmomEHZFHMaF+6pAlA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: canvas: ^3.0.0 @@ -3126,46 +3163,49 @@ packages: canvas: optional: true - jest-environment-node@30.4.1: - resolution: {integrity: sha512-4FZYVOk85hz2AyT6BbarKy9u37g6DbrDyCdFhsnDdXqyrueYQvB+0zO4f/kqLCRD0BsPRXPMNJeQwihKZV8naw==} + jest-environment-node@30.5.1: + resolution: {integrity: sha512-LrPj3sPMjsQoOB3jrb8p/sa+XkSFNKo60TTsyc+EB2kxQJHgbwElpXnx1yX25fdFn5958FIObRtcLSHyV8VIAw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-get-type@29.6.3: resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - jest-haste-map@30.4.1: - resolution: {integrity: sha512-rFrcONd8jeFsyw+Z9CrScJgglRf2+NFmNam8dKu7n+SoHqNYT47mn0DdEcVUZJpvh7Iz6/si7f7yUH7GJHVgnw==} + jest-haste-map@30.5.1: + resolution: {integrity: sha512-VIFgt67jW480YDxKfEv9IYQKrFpYt7bOCMn3VsnjK7AK9qo7p6acpnA1DHwsVOULE3dTaYew/6JaTD/d0VDHoQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-junit@17.0.0: resolution: {integrity: sha512-RYWCkq4j59gUXj5DsgbIE7xFBZzu1gtibPhyjSjMmGaOTLnqlXhg7x9zuGCwgbCuMAyoyvk0Mi8wSrRR5uOeLA==} engines: {node: '>=20.0.0'} - jest-leak-detector@30.4.1: - resolution: {integrity: sha512-IpmyiioeHxiWDhesHnUFmOxcTzwCwKpgACgWajtAP+nYQXiY7DakTxB6Bx9JFiRMljr0AX1PvnQdaU1KFoz6NQ==} + jest-leak-detector@30.5.1: + resolution: {integrity: sha512-gt4GT2aWgEoCNTcBe4rqS74xTIUJxi+UD9SNSu9aOk5LmTEd6fS5KSTmAKAfitCCktQHNN+upUuL6EkBfFbMDQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-matcher-utils@30.4.1: resolution: {integrity: sha512-zvYfX5CaeEkFrrLS9suWe9rvJrm9J1Iv3ua8kIBv9GEPzcnsfBf0bob37la7s67fs0nlBC3EuvkOLnXQKxtx4A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + jest-matcher-utils@30.5.1: + resolution: {integrity: sha512-aroZVqwOz/wC2y6pC+obgFWKV9viaQWQTTSB6W5H55+egtUczIfXR/rxExTv92xD/ADYwpqaYfVWx1aqwKg7FA==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + jest-message-util@30.4.1: resolution: {integrity: sha512-kwCKIvq0MCW1HzLoGola9Te6JUdzgV0loyKJ3Qghrkz9i5/RRIHsL95BMQc2HBBhlBKC4j22K9p11TGHH8RBpQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + jest-message-util@30.5.1: + resolution: {integrity: sha512-UdQlLdd9wL/Ys7xRErckqwD6wPlSZYueosSWuHc1r2ztGLwlgPvtSJq2+BPEgaEY13WLvfFbmhTj8pba0Sd1jg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + jest-mock@30.4.1: resolution: {integrity: sha512-/i8SVb8/NSB7RfNi8gfqu8gxLV23KaL5EpAttyb9iz8qWRIqXRLflycz/32wXsYkOnaUlx8NAKnJYtpsmXUmfw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-pnp-resolver@1.2.3: - resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} - engines: {node: '>=6'} - peerDependencies: - jest-resolve: '*' - peerDependenciesMeta: - jest-resolve: - optional: true + jest-mock@30.5.1: + resolution: {integrity: sha512-9fVjc3leUpGID2/by/LU4Dvdcp7PFh9LlxS3QRWK3ABm+KtvEVsG/AEGeLY3gKOZsjkBxyfwGltoAVlW7dygHg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-preset-angular@17.0.0: resolution: {integrity: sha512-2yAHkA1c5rSICGJVtLYYqPC5RDsvo4+i4CwWFHVXwv41cHNX7gCWeh074IuZ5mFw7Vwsr+i25EowCnGtKkxNWw==} @@ -3182,47 +3222,55 @@ packages: resolution: {integrity: sha512-mWlvLviKIgIQ8VCuM1xRdD0TWp3zlzionlmDBjuXVBs+VkmXq6FgW9T4Emr7oGz/Rk6feDCGyiugolcQEyp3mg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-resolve-dependencies@30.4.2: - resolution: {integrity: sha512-gDiVh1I+GxYzz9oXlyw+1wv6VOYX1WYxMOfjsA3iGKePV2oxmbHhwxfkALxNxYy1ciw6APWwkW2zZONwP97aEQ==} + jest-regex-util@30.5.0: + resolution: {integrity: sha512-Mg0WK7A6xRHLSA1udJ8y9f3lM0uUhFTBnLKzwPmqB9AylvpleJ6BLemR8K9dK27DY+cesDryoA7yLZCAHsPG1A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-resolve@30.4.1: - resolution: {integrity: sha512-Zry8Yq/yJcNAZ7dJ5F2heic8AheXvbFZ7XI5V+h28nrYZ7Qoyy4dItq8OodjnYD270mvX+ZudmrNV9cysqhW5Q==} + jest-resolve-dependencies@30.5.1: + resolution: {integrity: sha512-JKpXGONDcTaunrNVn8KCl6qAnwl06jIkvv70lhq0Ze47lsPx9sH5HoeEUiXX6iFGnliHN/qpIbQ0l38wrVmXaw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-runner@30.4.2: - resolution: {integrity: sha512-2dw0PslVYXxffXGpLo+Ejad+KcI1Qkjn7f4X4619gf21oCUmL+SPfjqIa/losUem3yEOvfNZe/F1HWUcNpODcg==} + jest-resolve@30.5.1: + resolution: {integrity: sha512-wprhLejRtwN6h8ZgaqC0eYjGJ1uMdGPT/+b3eFncbG4NWuuP9QL+vWwRinu9waw7hkOLcpMJGVJAMgBwsPssMQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-runtime@30.4.2: - resolution: {integrity: sha512-3/5e8iPz2k/VLqlr8DgTftYyLUv8Su3FkCAO2/Od81UsUTpSxOrS6O5x5KkoQwyUjmpYyDJKeyAvg2T2nvpNkQ==} + jest-runner@30.5.1: + resolution: {integrity: sha512-FPlQE4+mwnFxXmpPrSi836KV2ZzvK1g6/nPCT8o5BcoDUUNJQeHo1/Qdkoe/QeoL4M7OeJpbnGUhYKhC1VMdaQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-snapshot@30.4.1: - resolution: {integrity: sha512-tEOkkfOMppUyeiHwjZswOQ3lcnoTnws/q5FnGIaeIh/jmoU0ZlgMYRR8sTlTj+nNGCoJ0RDq6SfxGxCsyMTPmw==} + jest-runtime@30.5.1: + resolution: {integrity: sha512-UB88+NRkK2Tw/OqV7dofYcyiUGrVZtD41k/N0xQOs9fG//57XHK7JLWG52HD1UYpUAhjK4xm6DBvFX3yWudsMA==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + jest-snapshot@30.5.1: + resolution: {integrity: sha512-cNWFdSb5xuDGl8hKkAZJ3YtI/PzHpAPFV+HUXWIOG8rMhpDTLVbvAc2d2wRicoYw2wGsJGLaurJT6BLC97bLXQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-util@30.4.1: resolution: {integrity: sha512-vjQb1sACEiv13DKJMDToJpzVW0joCsIQrmbg0fi7CyOOt+g9jTuQl2A216pWRBYhOVt53XbL/2LbMKg1BECWOw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-validate@30.4.1: - resolution: {integrity: sha512-PDWi4SOwLnwqNDfHZjOcsEFyZ4fc/2W2gVL3DEoyqnB6jCQMLRtfBong8s6omIw3lI0HWOus12xfnFmQtjW3fw==} + jest-util@30.5.1: + resolution: {integrity: sha512-yKuxmNy2rSbTXw+3SIPanJo+nV4/BS1p26v44IYBFMsswSQySfMMcPHErnOncda7i9HEz0q605rIhSTBVgrZTg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest-watcher@30.4.1: - resolution: {integrity: sha512-/l9UonmvCwjHH7d2h3iAwIloLc1H0S8mJZ/LNK3i86hqwPAz8otUJjP9MfYtz9Tt77Su5FD2xGjZn8d31IZHlw==} + jest-validate@30.5.1: + resolution: {integrity: sha512-i/buJ56wTpxihE93hQYNMfdOThS87+HGvLZzZJmU4xggPcdTYQq051iwALLCHp3q+SkCGH+EFejQZz5EbBSkkg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + + jest-watcher@30.5.1: + resolution: {integrity: sha512-+FHJ7C+S7b3ySfhA1aFmoa6TztsnwZVv84ycPRn0tVN93np2EU4b8C/KadqA3l6igdjgLBTnUotab9ER0HLG8A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-websocket-mock@2.5.0: resolution: {integrity: sha512-a+UJGfowNIWvtIKIQBHoEWIUqRxxQHFx4CXT+R5KxxKBtEQ5rS3pPOV/5299sHzqbmeCzxxY5qE4+yfXePePig==} - jest-worker@30.4.1: - resolution: {integrity: sha512-SHynN/q/QD++iNyvMdy+WMmbCGk8jIsNcRxycXbWubSOhvo6T+j2afcfUSl+3hYsiBebOTo0cT7c2H7CXugu1g==} + jest-worker@30.5.1: + resolution: {integrity: sha512-Cbxh5v7AoLuFRmFJSM4/aHdQ68rjXvUWr716EE0Dh3I7T+T/3FgFKhOERGXHcU2Meftq9+9zxPM3TSNyI9D+HA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - jest@30.4.2: - resolution: {integrity: sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==} + jest@30.5.1: + resolution: {integrity: sha512-3qrR8+ZXFnn7y0H2yjWQNkGGBLBY4zTRoTMAq9zJcgwLLtlyonfsCLviIXK9xuE2KgIyM+M36AFcoK2DgFR36w==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: @@ -3429,9 +3477,6 @@ packages: make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} - makeerror@1.0.12: - resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} - material-colors@1.2.6: resolution: {integrity: sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==} @@ -3473,9 +3518,6 @@ packages: resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} engines: {node: 18 || 20 || >=22} - minimatch@3.1.5: - resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} - minimatch@9.0.9: resolution: {integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==} engines: {node: '>=16 || 14 >=14.17'} @@ -3705,10 +3747,6 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} - path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} @@ -3717,6 +3755,10 @@ packages: resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} engines: {node: '>=16 || 14 >=14.18'} + path-scurry@2.0.2: + resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==} + engines: {node: 18 || 20 || >=22} + path-to-regexp@8.4.2: resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==} @@ -3805,6 +3847,10 @@ packages: resolution: {integrity: sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + pretty-format@30.5.1: + resolution: {integrity: sha512-byhRAPguVKMQIj4kjJwJ5lAskVhfuiSdiYl/aLTWpgkGEmic2jYhJh1yE9ih8Ox44Xg9ccCT11/S6QrzSJuNrg==} + engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} + proc-log@7.0.0: resolution: {integrity: sha512-FYgfaA69XZ93zaXLoMNQ+ViDXGGBgR8aLh03txzcFhV+9xOXx7+8DLCULrKKpR9+GsH9ZfHm82aSUPpozX0Ztg==} engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} @@ -3972,9 +4018,6 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - source-map-support@0.5.13: - resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} - source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} @@ -4056,9 +4099,9 @@ packages: resolution: {integrity: sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==} engines: {node: ^14.18.0 || >=16.0.0} - test-exclude@6.0.0: - resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} - engines: {node: '>=8'} + test-exclude@7.0.2: + resolution: {integrity: sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==} + engines: {node: '>=18'} tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} @@ -4071,9 +4114,6 @@ packages: resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==} hasBin: true - tmpl@1.0.5: - resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} - toidentifier@1.0.1: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} @@ -4169,6 +4209,9 @@ packages: undici-types@8.3.0: resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} + undici-types@8.9.0: + resolution: {integrity: sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==} + unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} @@ -4254,9 +4297,6 @@ packages: resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==} engines: {node: '>=18'} - walker@1.0.8: - resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} - watchpack@2.5.2: resolution: {integrity: sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==} engines: {node: '>=10.13.0'} @@ -4398,7 +4438,7 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': + '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': dependencies: '@angular-builders/common': 6.0.1(chokidar@5.0.0) '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) @@ -4407,8 +4447,8 @@ snapshots: '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) '@schematics/angular': 22.1.3(chokidar@5.0.0) - jest: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) lodash: 4.18.1 rxjs: 7.8.2 transitivePeerDependencies: @@ -5333,44 +5373,44 @@ snapshots: '@istanbuljs/schema@0.1.6': {} - '@jest/console@30.4.1': + '@jest/console@30.5.1': dependencies: - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 chalk: 4.1.2 - jest-message-util: 30.4.1 - jest-util: 30.4.1 + jest-message-util: 30.5.1 + jest-util: 30.5.1 slash: 3.0.0 - '@jest/core@30.4.2(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3))': + '@jest/core@30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3))': dependencies: - '@jest/console': 30.4.1 - '@jest/pattern': 30.4.0 - '@jest/reporters': 30.4.1(supports-color@8.1.1) - '@jest/test-result': 30.4.1 - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/console': 30.5.1 + '@jest/pattern': 30.5.0 + '@jest/reporters': 30.5.1(supports-color@8.1.1) + '@jest/test-result': 30.5.1 + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 + '@types/node': 26.5.0 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 4.4.0 exit-x: 0.2.2 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.11 - jest-changed-files: 30.4.1 - jest-config: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - jest-haste-map: 30.4.1 - jest-message-util: 30.4.1 - jest-regex-util: 30.4.0 - jest-resolve: 30.4.1 - jest-resolve-dependencies: 30.4.2(supports-color@8.1.1) - jest-runner: 30.4.2(supports-color@8.1.1) - jest-runtime: 30.4.2(supports-color@8.1.1) - jest-snapshot: 30.4.1(supports-color@8.1.1) - jest-util: 30.4.1 - jest-validate: 30.4.1 - jest-watcher: 30.4.1 - pretty-format: 30.4.1 + jest-changed-files: 30.5.1 + jest-config: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-haste-map: 30.5.1 + jest-message-util: 30.5.1 + jest-regex-util: 30.5.0 + jest-resolve: 30.5.1 + jest-resolve-dependencies: 30.5.1(supports-color@8.1.1) + jest-runner: 30.5.1(supports-color@8.1.1) + jest-runtime: 30.5.1(supports-color@8.1.1) + jest-snapshot: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 + jest-validate: 30.5.1 + jest-watcher: 30.5.1 + pretty-format: 30.5.1 slash: 3.0.0 transitivePeerDependencies: - babel-plugin-macros @@ -5380,6 +5420,8 @@ snapshots: '@jest/diff-sequences@30.4.0': {} + '@jest/diff-sequences@30.5.0': {} + '@jest/environment-jsdom-abstract@30.4.1(jsdom@26.1.0(supports-color@8.1.1))': dependencies: '@jest/environment': 30.4.1 @@ -5391,6 +5433,17 @@ snapshots: jest-util: 30.4.1 jsdom: 26.1.0(supports-color@8.1.1) + '@jest/environment-jsdom-abstract@30.5.1(@types/jsdom@21.1.7)(jsdom@26.1.0(supports-color@8.1.1))': + dependencies: + '@jest/environment': 30.5.1 + '@jest/fake-timers': 30.5.1 + '@jest/types': 30.5.1 + '@types/jsdom': 21.1.7 + '@types/node': 26.5.0 + jest-mock: 30.5.1 + jest-util: 30.5.1 + jsdom: 26.1.0(supports-color@8.1.1) + '@jest/environment@30.4.1': dependencies: '@jest/fake-timers': 30.4.1 @@ -5398,14 +5451,25 @@ snapshots: '@types/node': 26.4.0 jest-mock: 30.4.1 + '@jest/environment@30.5.1': + dependencies: + '@jest/fake-timers': 30.5.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 + jest-mock: 30.5.1 + '@jest/expect-utils@30.4.1': dependencies: '@jest/get-type': 30.1.0 - '@jest/expect@30.4.1(supports-color@8.1.1)': + '@jest/expect-utils@30.5.1': dependencies: - expect: 30.4.1 - jest-snapshot: 30.4.1(supports-color@8.1.1) + '@jest/get-type': 30.5.0 + + '@jest/expect@30.5.1(supports-color@8.1.1)': + dependencies: + expect: 30.5.1 + jest-snapshot: 30.5.1(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -5418,44 +5482,60 @@ snapshots: jest-mock: 30.4.1 jest-util: 30.4.1 + '@jest/fake-timers@30.5.1': + dependencies: + '@jest/types': 30.5.1 + '@sinonjs/fake-timers': 15.4.0 + '@types/node': 26.5.0 + jest-message-util: 30.5.1 + jest-mock: 30.5.1 + jest-util: 30.5.1 + '@jest/get-type@30.1.0': {} - '@jest/globals@30.4.1(supports-color@8.1.1)': + '@jest/get-type@30.5.0': {} + + '@jest/globals@30.5.1(supports-color@8.1.1)': dependencies: - '@jest/environment': 30.4.1 - '@jest/expect': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 - jest-mock: 30.4.1 + '@jest/environment': 30.5.1 + '@jest/expect': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 + jest-mock: 30.5.1 transitivePeerDependencies: - supports-color '@jest/pattern@30.4.0': dependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 jest-regex-util: 30.4.0 - '@jest/reporters@30.4.1(supports-color@8.1.1)': + '@jest/pattern@30.5.0': + dependencies: + '@types/node': 26.5.0 + jest-regex-util: 30.5.0 + + '@jest/reporters@30.5.1(supports-color@8.1.1)': dependencies: '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 30.4.1 - '@jest/test-result': 30.4.1 - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 + '@jest/console': 30.5.1 + '@jest/test-result': 30.5.1 + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 '@jridgewell/trace-mapping': 0.3.31 - '@types/node': 26.4.0 + '@types/node': 26.5.0 chalk: 4.1.2 collect-v8-coverage: 1.0.3 exit-x: 0.2.2 - glob: 10.5.0 + glob: 13.0.6 graceful-fs: 4.2.11 istanbul-lib-coverage: 3.2.2 istanbul-lib-instrument: 6.0.3(supports-color@8.1.1) istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6(supports-color@8.1.1) istanbul-reports: 3.2.0 - jest-message-util: 30.4.1 - jest-util: 30.4.1 - jest-worker: 30.4.1 + jest-message-util: 30.5.1 + jest-util: 30.5.1 + jest-worker: 30.5.1 slash: 3.0.0 string-length: 4.0.2 v8-to-istanbul: 9.3.0 @@ -5470,46 +5550,51 @@ snapshots: dependencies: '@sinclair/typebox': 0.34.52 - '@jest/snapshot-utils@30.4.1': + '@jest/schemas@30.5.0': dependencies: - '@jest/types': 30.4.1 + '@sinclair/typebox': 0.34.52 + + '@jest/snapshot-utils@30.5.1': + dependencies: + '@jest/types': 30.5.1 chalk: 4.1.2 graceful-fs: 4.2.11 natural-compare: 1.4.0 - '@jest/source-map@30.0.1': + '@jest/source-map@30.5.0': dependencies: '@jridgewell/trace-mapping': 0.3.31 callsites: 3.1.0 + convert-source-map: 2.0.0 graceful-fs: 4.2.11 - '@jest/test-result@30.4.1': + '@jest/test-result@30.5.1': dependencies: - '@jest/console': 30.4.1 - '@jest/types': 30.4.1 + '@jest/console': 30.5.1 + '@jest/types': 30.5.1 '@types/istanbul-lib-coverage': 2.0.6 collect-v8-coverage: 1.0.3 - '@jest/test-sequencer@30.4.1': + '@jest/test-sequencer@30.5.1': dependencies: - '@jest/test-result': 30.4.1 + '@jest/test-result': 30.5.1 graceful-fs: 4.2.11 - jest-haste-map: 30.4.1 + jest-haste-map: 30.5.1 slash: 3.0.0 - '@jest/transform@30.4.1(supports-color@8.1.1)': + '@jest/transform@30.5.1(supports-color@8.1.1)': dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) - '@jest/types': 30.4.1 + '@jest/types': 30.5.1 '@jridgewell/trace-mapping': 0.3.31 - babel-plugin-istanbul: 7.0.1(supports-color@8.1.1) + babel-plugin-istanbul: 8.0.0(supports-color@8.1.1) chalk: 4.1.2 convert-source-map: 2.0.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.11 - jest-haste-map: 30.4.1 - jest-regex-util: 30.4.0 - jest-util: 30.4.1 + jest-haste-map: 30.5.1 + jest-regex-util: 30.5.0 + jest-util: 30.5.1 pirates: 4.0.7 slash: 3.0.0 write-file-atomic: 5.0.1 @@ -5526,6 +5611,16 @@ snapshots: '@types/yargs': 17.0.35 chalk: 4.1.2 + '@jest/types@30.5.1': + dependencies: + '@jest/pattern': 30.5.0 + '@jest/schemas': 30.5.0 + '@types/istanbul-lib-coverage': 2.0.6 + '@types/istanbul-reports': 3.0.4 + '@types/node': 26.5.0 + '@types/yargs': 17.0.35 + chalk: 4.1.2 + '@jridgewell/gen-mapping@0.3.13': dependencies: '@jridgewell/sourcemap-codec': 1.5.5 @@ -5739,7 +5834,7 @@ snapshots: '@napi-rs/nice-win32-x64-msvc': 1.1.1 optional: true - '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': + '@napi-rs/wasm-runtime@1.2.3(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: '@emnapi/core': 1.10.0 '@emnapi/runtime': 1.10.0 @@ -5912,7 +6007,6 @@ snapshots: '@parcel/watcher-linux-x64-musl': 2.6.0 '@parcel/watcher-win32-arm64': 2.6.0 '@parcel/watcher-win32-x64': 2.6.0 - optional: true '@pkgjs/parseargs@0.11.0': optional: true @@ -6114,7 +6208,7 @@ snapshots: '@types/jsdom@21.1.7': dependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 '@types/tough-cookie': 4.0.5 parse5: 7.3.0 @@ -6126,6 +6220,10 @@ snapshots: dependencies: undici-types: 8.3.0 + '@types/node@26.5.0': + dependencies: + undici-types: 8.9.0 + '@types/stack-utils@2.0.3': {} '@types/tough-cookie@4.0.5': {} @@ -6287,7 +6385,7 @@ snapshots: dependencies: '@emnapi/core': 1.10.0 '@emnapi/runtime': 1.10.0 - '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@napi-rs/wasm-runtime': 1.2.3(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) optional: true '@unrs/resolver-binding-win32-arm64-msvc@1.12.2': @@ -6375,30 +6473,30 @@ snapshots: axobject-query@4.1.0: {} - babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1): + babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1): dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) - '@jest/transform': 30.4.1(supports-color@8.1.1) + '@jest/transform': 30.5.1(supports-color@8.1.1) '@types/babel__core': 7.20.5 - babel-plugin-istanbul: 7.0.1(supports-color@8.1.1) - babel-preset-jest: 30.4.0(@babel/core@7.29.7(supports-color@8.1.1)) + babel-plugin-istanbul: 8.0.0(supports-color@8.1.1) + babel-preset-jest: 30.5.0(@babel/core@7.29.7(supports-color@8.1.1)) chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 transitivePeerDependencies: - supports-color - babel-plugin-istanbul@7.0.1(supports-color@8.1.1): + babel-plugin-istanbul@8.0.0(supports-color@8.1.1): dependencies: '@babel/helper-plugin-utils': 7.29.7 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.6 istanbul-lib-instrument: 6.0.3(supports-color@8.1.1) - test-exclude: 6.0.0 + test-exclude: 7.0.2 transitivePeerDependencies: - supports-color - babel-plugin-jest-hoist@30.4.0: + babel-plugin-jest-hoist@30.5.0: dependencies: '@types/babel__core': 7.20.5 @@ -6421,10 +6519,10 @@ snapshots: '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.7(supports-color@8.1.1)) '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.7(supports-color@8.1.1)) - babel-preset-jest@30.4.0(@babel/core@7.29.7(supports-color@8.1.1)): + babel-preset-jest@30.5.0(@babel/core@7.29.7(supports-color@8.1.1)): dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) - babel-plugin-jest-hoist: 30.4.0 + babel-plugin-jest-hoist: 30.5.0 babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7(supports-color@8.1.1)) balanced-match@1.0.2: {} @@ -6465,11 +6563,6 @@ snapshots: dependencies: '@popperjs/core': 2.11.8 - brace-expansion@1.1.18: - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - brace-expansion@2.1.4: dependencies: balanced-match: 1.0.2 @@ -6533,7 +6626,7 @@ snapshots: ci-info@4.4.0: {} - cjs-module-lexer@2.2.0: {} + cjs-module-lexer@2.2.1: {} cli-cursor@5.0.0: dependencies: @@ -6570,8 +6663,6 @@ snapshots: color-name@1.1.4: {} - concat-map@0.0.1: {} - content-disposition@1.1.0: {} content-type@1.0.5: {} @@ -6703,6 +6794,8 @@ snapshots: es-errors@1.3.0: {} + es-module-lexer@2.3.2: {} + es-object-atoms@1.1.2: dependencies: es-errors: 1.3.0 @@ -6845,6 +6938,15 @@ snapshots: jest-mock: 30.4.1 jest-util: 30.4.1 + expect@30.5.1: + dependencies: + '@jest/expect-utils': 30.5.1 + '@jest/get-type': 30.5.0 + jest-matcher-utils: 30.5.1 + jest-message-util: 30.5.1 + jest-mock: 30.5.1 + jest-util: 30.5.1 + express-rate-limit@8.6.2(express@5.2.1(supports-color@8.1.1))(supports-color@8.1.1): dependencies: debug: 4.4.3(supports-color@8.1.1) @@ -6955,8 +7057,6 @@ snapshots: fresh@2.0.0: {} - fs.realpath@1.0.0: {} - fsevents@2.3.2: optional: true @@ -7010,14 +7110,11 @@ snapshots: package-json-from-dist: 1.0.1 path-scurry: 1.11.1 - glob@7.2.3: + glob@13.0.6: dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.5 - once: 1.4.0 - path-is-absolute: 1.0.1 + minimatch: 10.2.6 + minipass: 7.1.3 + path-scurry: 2.0.2 gopd@1.2.0: {} @@ -7117,11 +7214,6 @@ snapshots: imurmurhash@0.1.4: {} - inflight@1.0.6: - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - inherits@2.0.4: {} ip-address@10.5.0: {} @@ -7193,31 +7285,31 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jest-changed-files@30.4.1: + jest-changed-files@30.5.1: dependencies: execa: 5.1.1 - jest-util: 30.4.1 + jest-util: 30.5.1 p-limit: 3.1.0 - jest-circus@30.4.2(supports-color@8.1.1): + jest-circus@30.5.1(supports-color@8.1.1): dependencies: - '@jest/environment': 30.4.1 - '@jest/expect': 30.4.1(supports-color@8.1.1) - '@jest/test-result': 30.4.1 - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/environment': 30.5.1 + '@jest/expect': 30.5.1(supports-color@8.1.1) + '@jest/test-result': 30.5.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 chalk: 4.1.2 co: 4.6.0 dedent: 1.7.2 is-generator-fn: 2.1.0 - jest-each: 30.4.1 - jest-matcher-utils: 30.4.1 - jest-message-util: 30.4.1 - jest-runtime: 30.4.2(supports-color@8.1.1) - jest-snapshot: 30.4.1(supports-color@8.1.1) - jest-util: 30.4.1 + jest-each: 30.5.1 + jest-matcher-utils: 30.5.1 + jest-message-util: 30.5.1 + jest-runtime: 30.5.1(supports-color@8.1.1) + jest-snapshot: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 p-limit: 3.1.0 - pretty-format: 30.4.1 + pretty-format: 30.5.1 pure-rand: 7.0.1 slash: 3.0.0 stack-utils: 2.0.6 @@ -7225,17 +7317,17 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest-cli@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): dependencies: - '@jest/core': 30.4.2(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - '@jest/test-result': 30.4.1 - '@jest/types': 30.4.1 + '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + '@jest/test-result': 30.5.1 + '@jest/types': 30.5.1 chalk: 4.1.2 exit-x: 0.2.2 import-local: 3.2.0 - jest-config: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - jest-util: 30.4.1 - jest-validate: 30.4.1 + jest-config: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-util: 30.5.1 + jest-validate: 30.5.1 yargs: 17.7.3 transitivePeerDependencies: - '@types/node' @@ -7244,29 +7336,29 @@ snapshots: - supports-color - ts-node - jest-config@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest-config@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) - '@jest/get-type': 30.1.0 - '@jest/pattern': 30.4.0 - '@jest/test-sequencer': 30.4.1 - '@jest/types': 30.4.1 - babel-jest: 30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + '@jest/get-type': 30.5.0 + '@jest/pattern': 30.5.0 + '@jest/test-sequencer': 30.5.1 + '@jest/types': 30.5.1 + babel-jest: 30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) chalk: 4.1.2 ci-info: 4.4.0 deepmerge: 4.3.1 - glob: 10.5.0 + glob: 13.0.6 graceful-fs: 4.2.11 - jest-circus: 30.4.2(supports-color@8.1.1) - jest-docblock: 30.4.0 - jest-environment-node: 30.4.1 - jest-regex-util: 30.4.0 - jest-resolve: 30.4.1 - jest-runner: 30.4.2(supports-color@8.1.1) - jest-util: 30.4.1 - jest-validate: 30.4.1 + jest-circus: 30.5.1(supports-color@8.1.1) + jest-docblock: 30.5.0 + jest-environment-node: 30.5.1 + jest-regex-util: 30.5.0 + jest-resolve: 30.5.1 + jest-runner: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 + jest-validate: 30.5.1 parse-json: 5.2.0 - pretty-format: 30.4.1 + pretty-format: 30.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: @@ -7276,6 +7368,38 @@ snapshots: - babel-plugin-macros - supports-color + jest-config@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + dependencies: + '@babel/core': 7.29.7(supports-color@8.1.1) + '@jest/get-type': 30.5.0 + '@jest/pattern': 30.5.0 + '@jest/test-sequencer': 30.5.1 + '@jest/types': 30.5.1 + babel-jest: 30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + chalk: 4.1.2 + ci-info: 4.4.0 + deepmerge: 4.3.1 + glob: 13.0.6 + graceful-fs: 4.2.11 + jest-circus: 30.5.1(supports-color@8.1.1) + jest-docblock: 30.5.0 + jest-environment-node: 30.5.1 + jest-regex-util: 30.5.0 + jest-resolve: 30.5.1 + jest-runner: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 + jest-validate: 30.5.1 + parse-json: 5.2.0 + pretty-format: 30.5.1 + slash: 3.0.0 + strip-json-comments: 3.1.1 + optionalDependencies: + '@types/node': 26.5.0 + ts-node: 10.9.2(@types/node@26.4.0)(typescript@6.0.3) + transitivePeerDependencies: + - babel-plugin-macros + - supports-color + jest-diff@29.7.0: dependencies: chalk: 4.1.2 @@ -7290,54 +7414,61 @@ snapshots: chalk: 4.1.2 pretty-format: 30.4.1 - jest-docblock@30.4.0: + jest-diff@30.5.1: + dependencies: + '@jest/diff-sequences': 30.5.0 + '@jest/get-type': 30.5.0 + chalk: 4.1.2 + pretty-format: 30.5.1 + + jest-docblock@30.5.0: dependencies: detect-newline: 3.1.0 - jest-each@30.4.1: + jest-each@30.5.1: dependencies: - '@jest/get-type': 30.1.0 - '@jest/types': 30.4.1 + '@jest/get-type': 30.5.0 + '@jest/types': 30.5.1 chalk: 4.1.2 - jest-util: 30.4.1 - pretty-format: 30.4.1 + jest-util: 30.5.1 + pretty-format: 30.5.1 - jest-environment-jsdom@30.4.1(supports-color@8.1.1): + jest-environment-jsdom@30.5.1(supports-color@8.1.1): dependencies: - '@jest/environment': 30.4.1 - '@jest/environment-jsdom-abstract': 30.4.1(jsdom@26.1.0(supports-color@8.1.1)) + '@jest/environment': 30.5.1 + '@jest/environment-jsdom-abstract': 30.5.1(@types/jsdom@21.1.7)(jsdom@26.1.0(supports-color@8.1.1)) + '@types/jsdom': 21.1.7 jsdom: 26.1.0(supports-color@8.1.1) transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate - jest-environment-node@30.4.1: + jest-environment-node@30.5.1: dependencies: - '@jest/environment': 30.4.1 - '@jest/fake-timers': 30.4.1 - '@jest/types': 30.4.1 - '@types/node': 26.4.0 - jest-mock: 30.4.1 - jest-util: 30.4.1 - jest-validate: 30.4.1 + '@jest/environment': 30.5.1 + '@jest/fake-timers': 30.5.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 + jest-mock: 30.5.1 + jest-util: 30.5.1 + jest-validate: 30.5.1 jest-get-type@29.6.3: {} - jest-haste-map@30.4.1: + jest-haste-map@30.5.1: dependencies: - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/types': 30.5.1 + '@parcel/watcher': 2.6.0 + '@types/node': 26.5.0 anymatch: 3.1.3 fb-watchman: 2.0.2 + fdir: 6.5.0(picomatch@4.0.7) graceful-fs: 4.2.11 - jest-regex-util: 30.4.0 - jest-util: 30.4.1 - jest-worker: 30.4.1 + jest-regex-util: 30.5.0 + jest-util: 30.5.1 + jest-worker: 30.5.1 picomatch: 4.0.7 - walker: 1.0.8 - optionalDependencies: - fsevents: 2.3.3 jest-junit@17.0.0: dependencies: @@ -7346,10 +7477,10 @@ snapshots: uuid: 14.0.2 xml: 1.0.1 - jest-leak-detector@30.4.1: + jest-leak-detector@30.5.1: dependencies: - '@jest/get-type': 30.1.0 - pretty-format: 30.4.1 + '@jest/get-type': 30.5.0 + pretty-format: 30.5.1 jest-matcher-utils@30.4.1: dependencies: @@ -7358,6 +7489,13 @@ snapshots: jest-diff: 30.4.1 pretty-format: 30.4.1 + jest-matcher-utils@30.5.1: + dependencies: + '@jest/get-type': 30.5.0 + chalk: 4.1.2 + jest-diff: 30.5.1 + pretty-format: 30.5.1 + jest-message-util@30.4.1: dependencies: '@babel/code-frame': 7.29.7 @@ -7371,17 +7509,33 @@ snapshots: slash: 3.0.0 stack-utils: 2.0.6 + jest-message-util@30.5.1: + dependencies: + '@babel/code-frame': 7.29.7 + '@jest/types': 30.5.1 + '@types/stack-utils': 2.0.3 + chalk: 4.1.2 + graceful-fs: 4.2.11 + jest-util: 30.5.1 + picomatch: 4.0.7 + pretty-format: 30.5.1 + slash: 3.0.0 + stack-utils: 2.0.6 + jest-mock@30.4.1: dependencies: '@jest/types': 30.4.1 '@types/node': 26.4.0 jest-util: 30.4.1 - jest-pnp-resolver@1.2.3(jest-resolve@30.4.1): - optionalDependencies: - jest-resolve: 30.4.1 + jest-mock@30.5.1: + dependencies: + '@jest/expect-utils': 30.5.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 + jest-util: 30.5.1 - jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): + jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): dependencies: '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) @@ -7389,11 +7543,11 @@ snapshots: '@jest/environment-jsdom-abstract': 30.4.1(jsdom@26.1.0(supports-color@8.1.1)) bs-logger: 0.2.6 esbuild-wasm: 0.28.2 - jest: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) jest-util: 30.4.1 jsdom: 26.1.0(supports-color@8.1.1) pretty-format: 30.4.1 - ts-jest: 29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3) + ts-jest: 29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3) typescript: 6.0.3 optionalDependencies: esbuild: 0.28.2 @@ -7406,99 +7560,101 @@ snapshots: jest-regex-util@30.4.0: {} - jest-resolve-dependencies@30.4.2(supports-color@8.1.1): + jest-regex-util@30.5.0: {} + + jest-resolve-dependencies@30.5.1(supports-color@8.1.1): dependencies: - jest-regex-util: 30.4.0 - jest-snapshot: 30.4.1(supports-color@8.1.1) + jest-regex-util: 30.5.0 + jest-snapshot: 30.5.1(supports-color@8.1.1) transitivePeerDependencies: - supports-color - jest-resolve@30.4.1: + jest-resolve@30.5.1: dependencies: chalk: 4.1.2 graceful-fs: 4.2.11 - jest-haste-map: 30.4.1 - jest-pnp-resolver: 1.2.3(jest-resolve@30.4.1) - jest-util: 30.4.1 - jest-validate: 30.4.1 + jest-haste-map: 30.5.1 + jest-util: 30.5.1 + jest-validate: 30.5.1 slash: 3.0.0 unrs-resolver: 1.12.2 - jest-runner@30.4.2(supports-color@8.1.1): + jest-runner@30.5.1(supports-color@8.1.1): dependencies: - '@jest/console': 30.4.1 - '@jest/environment': 30.4.1 - '@jest/test-result': 30.4.1 - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/console': 30.5.1 + '@jest/environment': 30.5.1 + '@jest/source-map': 30.5.0 + '@jest/test-result': 30.5.1 + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 + '@types/node': 26.5.0 chalk: 4.1.2 emittery: 0.13.1 exit-x: 0.2.2 graceful-fs: 4.2.11 - jest-docblock: 30.4.0 - jest-environment-node: 30.4.1 - jest-haste-map: 30.4.1 - jest-leak-detector: 30.4.1 - jest-message-util: 30.4.1 - jest-resolve: 30.4.1 - jest-runtime: 30.4.2(supports-color@8.1.1) - jest-util: 30.4.1 - jest-watcher: 30.4.1 - jest-worker: 30.4.1 + jest-docblock: 30.5.0 + jest-environment-node: 30.5.1 + jest-haste-map: 30.5.1 + jest-leak-detector: 30.5.1 + jest-message-util: 30.5.1 + jest-resolve: 30.5.1 + jest-runtime: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 + jest-watcher: 30.5.1 + jest-worker: 30.5.1 p-limit: 3.1.0 - source-map-support: 0.5.13 transitivePeerDependencies: - supports-color - jest-runtime@30.4.2(supports-color@8.1.1): + jest-runtime@30.5.1(supports-color@8.1.1): dependencies: - '@jest/environment': 30.4.1 - '@jest/fake-timers': 30.4.1 - '@jest/globals': 30.4.1(supports-color@8.1.1) - '@jest/source-map': 30.0.1 - '@jest/test-result': 30.4.1 - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/environment': 30.5.1 + '@jest/fake-timers': 30.5.1 + '@jest/globals': 30.5.1(supports-color@8.1.1) + '@jest/source-map': 30.5.0 + '@jest/test-result': 30.5.1 + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 + '@types/node': 26.5.0 chalk: 4.1.2 - cjs-module-lexer: 2.2.0 + cjs-module-lexer: 2.2.1 collect-v8-coverage: 1.0.3 - glob: 10.5.0 + es-module-lexer: 2.3.2 + glob: 13.0.6 graceful-fs: 4.2.11 - jest-haste-map: 30.4.1 - jest-message-util: 30.4.1 - jest-mock: 30.4.1 - jest-regex-util: 30.4.0 - jest-resolve: 30.4.1 - jest-snapshot: 30.4.1(supports-color@8.1.1) - jest-util: 30.4.1 + jest-haste-map: 30.5.1 + jest-message-util: 30.5.1 + jest-mock: 30.5.1 + jest-regex-util: 30.5.0 + jest-resolve: 30.5.1 + jest-snapshot: 30.5.1(supports-color@8.1.1) + jest-util: 30.5.1 slash: 3.0.0 strip-bom: 4.0.0 transitivePeerDependencies: - supports-color - jest-snapshot@30.4.1(supports-color@8.1.1): + jest-snapshot@30.5.1(supports-color@8.1.1): dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/generator': 7.29.8 '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) '@babel/types': 7.29.8 - '@jest/expect-utils': 30.4.1 - '@jest/get-type': 30.1.0 - '@jest/snapshot-utils': 30.4.1 - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 + '@jest/expect-utils': 30.5.1 + '@jest/get-type': 30.5.0 + '@jest/snapshot-utils': 30.5.1 + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7(supports-color@8.1.1)) chalk: 4.1.2 - expect: 30.4.1 + expect: 30.5.1 graceful-fs: 4.2.11 - jest-diff: 30.4.1 - jest-matcher-utils: 30.4.1 - jest-message-util: 30.4.1 - jest-util: 30.4.1 - pretty-format: 30.4.1 + jest-diff: 30.5.1 + jest-matcher-utils: 30.5.1 + jest-message-util: 30.5.1 + jest-util: 30.5.1 + pretty-format: 30.5.1 semver: 7.8.5 synckit: 0.11.13 transitivePeerDependencies: @@ -7513,24 +7669,33 @@ snapshots: graceful-fs: 4.2.11 picomatch: 4.0.7 - jest-validate@30.4.1: + jest-util@30.5.1: dependencies: - '@jest/get-type': 30.1.0 - '@jest/types': 30.4.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 + chalk: 4.1.2 + ci-info: 4.4.0 + graceful-fs: 4.2.11 + picomatch: 4.0.7 + + jest-validate@30.5.1: + dependencies: + '@jest/get-type': 30.5.0 + '@jest/types': 30.5.1 camelcase: 6.3.0 chalk: 4.1.2 leven: 3.1.0 - pretty-format: 30.4.1 + pretty-format: 30.5.1 - jest-watcher@30.4.1: + jest-watcher@30.5.1: dependencies: - '@jest/test-result': 30.4.1 - '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@jest/test-result': 30.5.1 + '@jest/types': 30.5.1 + '@types/node': 26.5.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 - jest-util: 30.4.1 + jest-util: 30.5.1 string-length: 4.0.2 jest-websocket-mock@2.5.0: @@ -7538,20 +7703,20 @@ snapshots: jest-diff: 29.7.0 mock-socket: 9.3.1 - jest-worker@30.4.1: + jest-worker@30.5.1: dependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 '@ungap/structured-clone': 1.3.3 - jest-util: 30.4.1 + jest-util: 30.5.1 merge-stream: 2.0.0 supports-color: 8.1.1 - jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): dependencies: - '@jest/core': 30.4.2(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - '@jest/types': 30.4.1 + '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + '@jest/types': 30.5.1 import-local: 3.2.0 - jest-cli: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-cli: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -7749,10 +7914,6 @@ snapshots: make-error@1.3.6: {} - makeerror@1.0.12: - dependencies: - tmpl: 1.0.5 - material-colors@1.2.6: {} math-intrinsics@1.1.0: {} @@ -7779,10 +7940,6 @@ snapshots: dependencies: brace-expansion: 5.0.9 - minimatch@3.1.5: - dependencies: - brace-expansion: 1.1.18 - minimatch@9.0.9: dependencies: brace-expansion: 2.1.4 @@ -7878,8 +8035,7 @@ snapshots: node-addon-api@6.1.0: optional: true - node-addon-api@7.1.1: - optional: true + node-addon-api@7.1.1: {} node-gyp-build-optional-packages@5.2.2: dependencies: @@ -8034,8 +8190,6 @@ snapshots: path-exists@4.0.0: {} - path-is-absolute@1.0.1: {} - path-key@3.1.1: {} path-scurry@1.11.1: @@ -8043,6 +8197,11 @@ snapshots: lru-cache: 10.4.3 minipass: 7.1.3 + path-scurry@2.0.2: + dependencies: + lru-cache: 11.5.2 + minipass: 7.1.3 + path-to-regexp@8.4.2: {} pdfjs-dist@6.2.108: @@ -8111,6 +8270,13 @@ snapshots: react-is-18: react-is@18.3.1 react-is-19: react-is@19.2.8 + pretty-format@30.5.1: + dependencies: + '@jest/react-is-18': react-is@18.3.1 + '@jest/react-is-19': react-is@19.2.8 + '@jest/schemas': 30.5.0 + ansi-styles: 5.2.0 + proc-log@7.0.0: {} proxy-addr@2.0.7: @@ -8313,11 +8479,6 @@ snapshots: source-map-js@1.2.1: {} - source-map-support@0.5.13: - dependencies: - buffer-from: 1.1.2 - source-map: 0.6.1 - source-map-support@0.5.21: dependencies: buffer-from: 1.1.2 @@ -8393,11 +8554,11 @@ snapshots: dependencies: '@pkgr/core': 0.3.6 - test-exclude@6.0.0: + test-exclude@7.0.2: dependencies: '@istanbuljs/schema': 0.1.6 - glob: 7.2.3 - minimatch: 3.1.5 + glob: 10.5.0 + minimatch: 10.2.6 tinyglobby@0.2.17: dependencies: @@ -8410,8 +8571,6 @@ snapshots: dependencies: tldts-core: 6.1.86 - tmpl@1.0.5: {} - toidentifier@1.0.1: {} tough-cookie@5.1.2: @@ -8426,12 +8585,12 @@ snapshots: dependencies: typescript: 6.0.3 - ts-jest@29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.4.1(supports-color@8.1.1))(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3): + ts-jest@29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 handlebars: 4.7.9 - jest: 30.4.2(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 @@ -8441,9 +8600,9 @@ snapshots: yargs-parser: 21.1.1 optionalDependencies: '@babel/core': 7.29.7(supports-color@8.1.1) - '@jest/transform': 30.4.1(supports-color@8.1.1) - '@jest/types': 30.4.1 - babel-jest: 30.4.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + '@jest/transform': 30.5.1(supports-color@8.1.1) + '@jest/types': 30.5.1 + babel-jest: 30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) esbuild: 0.28.2 jest-util: 30.4.1 @@ -8490,6 +8649,8 @@ snapshots: undici-types@8.3.0: {} + undici-types@8.9.0: {} + unpipe@1.0.0: {} unrs-resolver@1.12.2: @@ -8565,10 +8726,6 @@ snapshots: dependencies: xml-name-validator: 5.0.0 - walker@1.0.8: - dependencies: - makeerror: 1.0.12 - watchpack@2.5.2: dependencies: graceful-fs: 4.2.11 From 684b3c9885fd44ef05873a6c8225f9cb02318478 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 16:43:27 +0000 Subject: [PATCH 058/258] Chore(deps-dev): Bump @types/node from 26.4.0 to 26.5.0 in /src-ui (#14146) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 26.4.0 to 26.5.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 26.5.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src-ui/package.json | 2 +- src-ui/pnpm-lock.yaml | 286 ++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 166 deletions(-) diff --git a/src-ui/package.json b/src-ui/package.json index cc32098b5..6ace05683 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -57,7 +57,7 @@ "@angular/compiler-cli": "~22.1.3", "@playwright/test": "^1.62.1", "@types/jest": "^30.0.0", - "@types/node": "^26.4.0", + "@types/node": "^26.5.0", "@typescript-eslint/eslint-plugin": "^8.68.0", "@typescript-eslint/parser": "^8.68.0", "@typescript-eslint/utils": "^8.68.0", diff --git a/src-ui/pnpm-lock.yaml b/src-ui/pnpm-lock.yaml index d01aa431a..1169a099a 100644 --- a/src-ui/pnpm-lock.yaml +++ b/src-ui/pnpm-lock.yaml @@ -92,7 +92,7 @@ importers: devDependencies: '@angular-builders/jest': specifier: ^22.0.1 - version: 22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) + version: 22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) '@angular-devkit/core': specifier: ^22.1.6 version: 22.1.6(chokidar@5.0.0) @@ -101,7 +101,7 @@ importers: version: 22.1.6(chokidar@5.0.0) '@angular-eslint/builder': specifier: 22.1.0 - version: 22.1.0(@angular/cli@22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin': specifier: 22.1.0 version: 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) @@ -110,16 +110,16 @@ importers: version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/schematics': specifier: 22.1.0 - version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/template-parser': specifier: 22.1.0 version: 22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular/build': specifier: 22.1.6 - version: 22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.4.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3) + version: 22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3) '@angular/cli': specifier: 22.1.6 - version: 22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1) + version: 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) '@angular/compiler-cli': specifier: ~22.1.3 version: 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) @@ -130,8 +130,8 @@ importers: specifier: ^30.0.0 version: 30.0.0 '@types/node': - specifier: ^26.4.0 - version: 26.4.0 + specifier: ^26.5.0 + version: 26.5.0 '@typescript-eslint/eslint-plugin': specifier: ^8.68.0 version: 8.68.0(@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) @@ -146,7 +146,7 @@ importers: version: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) jest: specifier: 30.5.1 - version: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + version: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) jest-environment-jsdom: specifier: ^30.5.1 version: 30.5.1(supports-color@8.1.1) @@ -155,7 +155,7 @@ importers: version: 17.0.0 jest-preset-angular: specifier: ^17.0.0 - version: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + version: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) jest-websocket-mock: specifier: ^2.5.0 version: 2.5.0 @@ -167,7 +167,7 @@ importers: version: 4.3.0(prettier@3.9.6)(typescript@6.0.3) ts-node: specifier: ~10.9.2 - version: 10.9.2(@types/node@26.4.0)(typescript@6.0.3) + version: 10.9.2(@types/node@26.5.0)(typescript@6.0.3) typescript: specifier: ^6.0.3 version: 6.0.3 @@ -2051,9 +2051,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@26.4.0': - resolution: {integrity: sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==} - '@types/node@26.5.0': resolution: {integrity: sha512-dVSGpriSoCgz8WnDNTuSSuSv1PC/ALXihO4ulRZt7Md8k9mlbdin3lGOcDE8SnWOgf513ByWlXd7BK4azmyg/A==} @@ -4206,9 +4203,6 @@ packages: engines: {node: '>=0.8.0'} hasBin: true - undici-types@8.3.0: - resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} - undici-types@8.9.0: resolution: {integrity: sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==} @@ -4438,7 +4432,7 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': + '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': dependencies: '@angular-builders/common': 6.0.1(chokidar@5.0.0) '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) @@ -4447,8 +4441,8 @@ snapshots: '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) '@schematics/angular': 22.1.3(chokidar@5.0.0) - jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) - jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + jest: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) + jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) lodash: 4.18.1 rxjs: 7.8.2 transitivePeerDependencies: @@ -4518,11 +4512,11 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-eslint/builder@22.1.0(@angular/cli@22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/builder@22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular/cli': 22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1) + '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: @@ -4551,13 +4545,13 @@ snapshots: ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 - '@angular-eslint/schematics@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/schematics@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-devkit/core': 22.1.6(chokidar@5.0.0) '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) '@angular-eslint/eslint-plugin': 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin-template': 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular/cli': 22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1) + '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) ignore: 7.0.5 semver: 7.8.5 strip-json-comments: 3.1.1 @@ -4583,7 +4577,7 @@ snapshots: eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 - '@angular/build@22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.4.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3)': + '@angular/build@22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3)': dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.2201.6(chokidar@5.0.0) @@ -4592,8 +4586,8 @@ snapshots: '@babel/core': 8.0.1 '@babel/helper-annotate-as-pure': 8.0.0 '@babel/helper-split-export-declaration': 7.24.7 - '@inquirer/confirm': 6.1.1(@types/node@26.4.0) - '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.1.5(@types/node@26.4.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0)) + '@inquirer/confirm': 6.1.1(@types/node@26.5.0) + '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0)) beasties: 0.4.3 browserslist: 4.28.8 esbuild: 0.28.2 @@ -4613,7 +4607,7 @@ snapshots: tinyglobby: 0.2.17 tslib: 2.8.1 typescript: 6.0.3 - vite: 8.1.5(@types/node@26.4.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0) + vite: 8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0) watchpack: 2.5.2 optionalDependencies: '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) @@ -4645,13 +4639,13 @@ snapshots: rxjs: 7.8.2 tslib: 2.8.1 - '@angular/cli@22.1.6(@types/node@26.4.0)(chokidar@5.0.0)(supports-color@8.1.1)': + '@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1)': dependencies: '@angular-devkit/architect': 0.2201.6(chokidar@5.0.0) '@angular-devkit/core': 22.1.6(chokidar@5.0.0) '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) - '@inquirer/prompts': 8.5.2(@types/node@26.4.0) - '@listr2/prompt-adapter-inquirer': 4.2.5(@inquirer/prompts@8.5.2(@types/node@26.4.0))(@types/node@26.4.0)(listr2@11.0.0) + '@inquirer/prompts': 8.5.2(@types/node@26.5.0) + '@listr2/prompt-adapter-inquirer': 4.2.5(@inquirer/prompts@8.5.2(@types/node@26.5.0))(@types/node@26.5.0)(listr2@11.0.0) '@modelcontextprotocol/sdk': 1.30.0(supports-color@8.1.1) '@schematics/angular': 22.1.6(chokidar@5.0.0) jsonc-parser: 3.3.1 @@ -5218,141 +5212,141 @@ snapshots: '@inquirer/ansi@2.0.7': {} - '@inquirer/checkbox@5.2.2(@types/node@26.4.0)': + '@inquirer/checkbox@5.2.2(@types/node@26.5.0)': dependencies: '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/confirm@6.1.1(@types/node@26.4.0)': + '@inquirer/confirm@6.1.1(@types/node@26.5.0)': dependencies: - '@inquirer/core': 11.2.1(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 11.2.1(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/confirm@6.2.0(@types/node@26.4.0)': + '@inquirer/confirm@6.2.0(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/core@11.2.1(@types/node@26.4.0)': + '@inquirer/core@11.2.1(@types/node@26.5.0)': dependencies: '@inquirer/ansi': 2.0.7 '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 signal-exit: 4.1.0 optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/core@12.0.0(@types/node@26.4.0)': + '@inquirer/core@12.0.0(@types/node@26.5.0)': dependencies: '@inquirer/ansi': 2.0.7 '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 signal-exit: 4.1.0 optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/editor@5.3.0(@types/node@26.4.0)': + '@inquirer/editor@5.3.0(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/external-editor': 3.0.4(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/external-editor': 3.0.4(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/expand@5.1.2(@types/node@26.4.0)': + '@inquirer/expand@5.1.2(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/external-editor@3.0.4(@types/node@26.4.0)': + '@inquirer/external-editor@3.0.4(@types/node@26.5.0)': dependencies: chardet: 2.2.0 iconv-lite: 0.7.3 optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 '@inquirer/figures@2.0.8': {} - '@inquirer/input@5.1.3(@types/node@26.4.0)': + '@inquirer/input@5.1.3(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/number@4.2.0(@types/node@26.4.0)': + '@inquirer/number@4.2.0(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/password@5.1.2(@types/node@26.4.0)': + '@inquirer/password@5.1.2(@types/node@26.5.0)': dependencies: '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/prompts@8.5.2(@types/node@26.4.0)': + '@inquirer/prompts@8.5.2(@types/node@26.5.0)': dependencies: - '@inquirer/checkbox': 5.2.2(@types/node@26.4.0) - '@inquirer/confirm': 6.2.0(@types/node@26.4.0) - '@inquirer/editor': 5.3.0(@types/node@26.4.0) - '@inquirer/expand': 5.1.2(@types/node@26.4.0) - '@inquirer/input': 5.1.3(@types/node@26.4.0) - '@inquirer/number': 4.2.0(@types/node@26.4.0) - '@inquirer/password': 5.1.2(@types/node@26.4.0) - '@inquirer/rawlist': 5.3.2(@types/node@26.4.0) - '@inquirer/search': 4.3.0(@types/node@26.4.0) - '@inquirer/select': 5.2.2(@types/node@26.4.0) + '@inquirer/checkbox': 5.2.2(@types/node@26.5.0) + '@inquirer/confirm': 6.2.0(@types/node@26.5.0) + '@inquirer/editor': 5.3.0(@types/node@26.5.0) + '@inquirer/expand': 5.1.2(@types/node@26.5.0) + '@inquirer/input': 5.1.3(@types/node@26.5.0) + '@inquirer/number': 4.2.0(@types/node@26.5.0) + '@inquirer/password': 5.1.2(@types/node@26.5.0) + '@inquirer/rawlist': 5.3.2(@types/node@26.5.0) + '@inquirer/search': 4.3.0(@types/node@26.5.0) + '@inquirer/select': 5.2.2(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/rawlist@5.3.2(@types/node@26.4.0)': + '@inquirer/rawlist@5.3.2(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/search@4.3.0(@types/node@26.4.0)': + '@inquirer/search@4.3.0(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/select@5.2.2(@types/node@26.4.0)': + '@inquirer/select@5.2.2(@types/node@26.5.0)': dependencies: '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.4.0) + '@inquirer/core': 12.0.0(@types/node@26.5.0) '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 - '@inquirer/type@4.0.7(@types/node@26.4.0)': + '@inquirer/type@4.0.7(@types/node@26.5.0)': optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 '@isaacs/cliui@8.0.2': dependencies: @@ -5382,7 +5376,7 @@ snapshots: jest-util: 30.5.1 slash: 3.0.0 - '@jest/core@30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3))': + '@jest/core@30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3))': dependencies: '@jest/console': 30.5.1 '@jest/pattern': 30.5.0 @@ -5398,7 +5392,7 @@ snapshots: fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.11 jest-changed-files: 30.5.1 - jest-config: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-config: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) jest-haste-map: 30.5.1 jest-message-util: 30.5.1 jest-regex-util: 30.5.0 @@ -5428,7 +5422,7 @@ snapshots: '@jest/fake-timers': 30.4.1 '@jest/types': 30.4.1 '@types/jsdom': 21.1.7 - '@types/node': 26.4.0 + '@types/node': 26.5.0 jest-mock: 30.4.1 jest-util: 30.4.1 jsdom: 26.1.0(supports-color@8.1.1) @@ -5448,7 +5442,7 @@ snapshots: dependencies: '@jest/fake-timers': 30.4.1 '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@types/node': 26.5.0 jest-mock: 30.4.1 '@jest/environment@30.5.1': @@ -5477,7 +5471,7 @@ snapshots: dependencies: '@jest/types': 30.4.1 '@sinonjs/fake-timers': 15.4.0 - '@types/node': 26.4.0 + '@types/node': 26.5.0 jest-message-util: 30.4.1 jest-mock: 30.4.1 jest-util: 30.4.1 @@ -5607,7 +5601,7 @@ snapshots: '@jest/schemas': 30.4.1 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 26.4.0 + '@types/node': 26.5.0 '@types/yargs': 17.0.35 chalk: 4.1.2 @@ -5645,10 +5639,10 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@listr2/prompt-adapter-inquirer@4.2.5(@inquirer/prompts@8.5.2(@types/node@26.4.0))(@types/node@26.4.0)(listr2@11.0.0)': + '@listr2/prompt-adapter-inquirer@4.2.5(@inquirer/prompts@8.5.2(@types/node@26.5.0))(@types/node@26.5.0)(listr2@11.0.0)': dependencies: - '@inquirer/prompts': 8.5.2(@types/node@26.4.0) - '@inquirer/type': 4.0.7(@types/node@26.4.0) + '@inquirer/prompts': 8.5.2(@types/node@26.5.0) + '@inquirer/type': 4.0.7(@types/node@26.5.0) listr2: 11.0.0 transitivePeerDependencies: - '@types/node' @@ -6216,10 +6210,6 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/node@26.4.0': - dependencies: - undici-types: 8.3.0 - '@types/node@26.5.0': dependencies: undici-types: 8.9.0 @@ -6397,9 +6387,9 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.12.2': optional: true - '@vitejs/plugin-basic-ssl@2.3.0(vite@8.1.5(@types/node@26.4.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0))': + '@vitejs/plugin-basic-ssl@2.3.0(vite@8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0))': dependencies: - vite: 8.1.5(@types/node@26.4.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0) + vite: 8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0) accepts@2.0.0: dependencies: @@ -7317,15 +7307,15 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest-cli@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)): dependencies: - '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) '@jest/test-result': 30.5.1 '@jest/types': 30.5.1 chalk: 4.1.2 exit-x: 0.2.2 import-local: 3.2.0 - jest-config: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-config: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) jest-util: 30.5.1 jest-validate: 30.5.1 yargs: 17.7.3 @@ -7336,39 +7326,7 @@ snapshots: - supports-color - ts-node - jest-config@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): - dependencies: - '@babel/core': 7.29.7(supports-color@8.1.1) - '@jest/get-type': 30.5.0 - '@jest/pattern': 30.5.0 - '@jest/test-sequencer': 30.5.1 - '@jest/types': 30.5.1 - babel-jest: 30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) - chalk: 4.1.2 - ci-info: 4.4.0 - deepmerge: 4.3.1 - glob: 13.0.6 - graceful-fs: 4.2.11 - jest-circus: 30.5.1(supports-color@8.1.1) - jest-docblock: 30.5.0 - jest-environment-node: 30.5.1 - jest-regex-util: 30.5.0 - jest-resolve: 30.5.1 - jest-runner: 30.5.1(supports-color@8.1.1) - jest-util: 30.5.1 - jest-validate: 30.5.1 - parse-json: 5.2.0 - pretty-format: 30.5.1 - slash: 3.0.0 - strip-json-comments: 3.1.1 - optionalDependencies: - '@types/node': 26.4.0 - ts-node: 10.9.2(@types/node@26.4.0)(typescript@6.0.3) - transitivePeerDependencies: - - babel-plugin-macros - - supports-color - - jest-config@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest-config@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)): dependencies: '@babel/core': 7.29.7(supports-color@8.1.1) '@jest/get-type': 30.5.0 @@ -7395,7 +7353,7 @@ snapshots: strip-json-comments: 3.1.1 optionalDependencies: '@types/node': 26.5.0 - ts-node: 10.9.2(@types/node@26.4.0)(typescript@6.0.3) + ts-node: 10.9.2(@types/node@26.5.0)(typescript@6.0.3) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -7525,7 +7483,7 @@ snapshots: jest-mock@30.4.1: dependencies: '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@types/node': 26.5.0 jest-util: 30.4.1 jest-mock@30.5.1: @@ -7535,7 +7493,7 @@ snapshots: '@types/node': 26.5.0 jest-util: 30.5.1 - jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): + jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): dependencies: '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) @@ -7543,11 +7501,11 @@ snapshots: '@jest/environment-jsdom-abstract': 30.4.1(jsdom@26.1.0(supports-color@8.1.1)) bs-logger: 0.2.6 esbuild-wasm: 0.28.2 - jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) jest-util: 30.4.1 jsdom: 26.1.0(supports-color@8.1.1) pretty-format: 30.4.1 - ts-jest: 29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3) + ts-jest: 29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(typescript@6.0.3) typescript: 6.0.3 optionalDependencies: esbuild: 0.28.2 @@ -7663,7 +7621,7 @@ snapshots: jest-util@30.4.1: dependencies: '@jest/types': 30.4.1 - '@types/node': 26.4.0 + '@types/node': 26.5.0 chalk: 4.1.2 ci-info: 4.4.0 graceful-fs: 4.2.11 @@ -7711,12 +7669,12 @@ snapshots: merge-stream: 2.0.0 supports-color: 8.1.1 - jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)): + jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)): dependencies: - '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + '@jest/core': 30.5.1(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) '@jest/types': 30.5.1 import-local: 3.2.0 - jest-cli: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest-cli: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -8585,12 +8543,12 @@ snapshots: dependencies: typescript: 6.0.3 - ts-jest@29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)))(typescript@6.0.3): + ts-jest@29.4.12(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(esbuild@0.28.2)(jest-util@30.4.1)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(typescript@6.0.3): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 handlebars: 4.7.9 - jest: 30.5.1(@types/node@26.4.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3)) + jest: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 @@ -8606,14 +8564,14 @@ snapshots: esbuild: 0.28.2 jest-util: 30.4.1 - ts-node@10.9.2(@types/node@26.4.0)(typescript@6.0.3): + ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.12 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 26.4.0 + '@types/node': 26.5.0 acorn: 8.18.0 acorn-walk: 8.3.5 arg: 4.1.3 @@ -8647,8 +8605,6 @@ snapshots: uglify-js@3.19.3: optional: true - undici-types@8.3.0: {} - undici-types@8.9.0: {} unpipe@1.0.0: {} @@ -8708,7 +8664,7 @@ snapshots: vary@1.1.2: {} - vite@8.1.5(@types/node@26.4.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0): + vite@8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 @@ -8716,7 +8672,7 @@ snapshots: rolldown: 1.1.5 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 26.4.0 + '@types/node': 26.5.0 esbuild: 0.28.2 fsevents: 2.3.3 jiti: 2.7.0 From 3e38b246d420ae03f8500e3fcc05c64f185be73e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 17:02:02 +0000 Subject: [PATCH 059/258] Chore(deps-dev): Bump the frontend-eslint-dependencies group (#14143) Bumps the frontend-eslint-dependencies group in /src-ui with 4 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser), [@typescript-eslint/utils](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/utils) and [eslint](https://github.com/eslint/eslint). Updates `@typescript-eslint/eslint-plugin` from 8.68.0 to 8.70.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.70.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.68.0 to 8.70.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.70.0/packages/parser) Updates `@typescript-eslint/utils` from 8.68.0 to 8.70.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/utils/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.70.0/packages/utils) Updates `eslint` from 10.9.1 to 10.10.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v10.9.1...v10.10.0) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.70.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-eslint-dependencies - dependency-name: "@typescript-eslint/parser" dependency-version: 8.70.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-eslint-dependencies - dependency-name: "@typescript-eslint/utils" dependency-version: 8.70.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-eslint-dependencies - dependency-name: eslint dependency-version: 10.10.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-eslint-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src-ui/package.json | 8 +- src-ui/pnpm-lock.yaml | 320 +++++++++++++++++++++++++----------------- 2 files changed, 197 insertions(+), 131 deletions(-) diff --git a/src-ui/package.json b/src-ui/package.json index 6ace05683..5d8ea3c48 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -58,10 +58,10 @@ "@playwright/test": "^1.62.1", "@types/jest": "^30.0.0", "@types/node": "^26.5.0", - "@typescript-eslint/eslint-plugin": "^8.68.0", - "@typescript-eslint/parser": "^8.68.0", - "@typescript-eslint/utils": "^8.68.0", - "eslint": "^10.9.1", + "@typescript-eslint/eslint-plugin": "^8.70.0", + "@typescript-eslint/parser": "^8.70.0", + "@typescript-eslint/utils": "^8.70.0", + "eslint": "^10.10.0", "jest": "30.5.1", "jest-environment-jsdom": "^30.5.1", "jest-junit": "^17.0.0", diff --git a/src-ui/pnpm-lock.yaml b/src-ui/pnpm-lock.yaml index 1169a099a..8e21c07eb 100644 --- a/src-ui/pnpm-lock.yaml +++ b/src-ui/pnpm-lock.yaml @@ -101,19 +101,19 @@ importers: version: 22.1.6(chokidar@5.0.0) '@angular-eslint/builder': specifier: 22.1.0 - version: 22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin': specifier: 22.1.0 - version: 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin-template': specifier: 22.1.0 - version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/schematics': specifier: 22.1.0 - version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/template-parser': specifier: 22.1.0 - version: 22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + version: 22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular/build': specifier: 22.1.6 version: 22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3) @@ -133,17 +133,17 @@ importers: specifier: ^26.5.0 version: 26.5.0 '@typescript-eslint/eslint-plugin': - specifier: ^8.68.0 - version: 8.68.0(@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + specifier: ^8.70.0 + version: 8.70.0(@typescript-eslint/parser@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) '@typescript-eslint/parser': - specifier: ^8.68.0 - version: 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + specifier: ^8.70.0 + version: 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) '@typescript-eslint/utils': - specifier: ^8.68.0 - version: 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + specifier: ^8.70.0 + version: 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) eslint: - specifier: ^10.9.1 - version: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + specifier: ^10.10.0 + version: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) jest: specifier: 30.5.1 version: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) @@ -643,6 +643,12 @@ packages: '@bcoe/v8-coverage@0.2.3': resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} + '@cacheable/memory@2.2.0': + resolution: {integrity: sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==} + + '@cacheable/utils@2.5.0': + resolution: {integrity: sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==} + '@cspotcode/source-map-support@0.8.1': resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} @@ -885,8 +891,8 @@ packages: resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - '@eslint/plugin-kit@0.7.2': - resolution: {integrity: sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==} + '@eslint/plugin-kit@0.7.3': + resolution: {integrity: sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} '@harperfast/extended-iterable@1.0.3': @@ -1240,6 +1246,15 @@ packages: '@jridgewell/trace-mapping@0.3.9': resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + '@keyv/bigmap@1.3.1': + resolution: {integrity: sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==} + engines: {node: '>= 18'} + peerDependencies: + keyv: ^5.6.0 + + '@keyv/serialize@1.1.1': + resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==} + '@listr2/prompt-adapter-inquirer@4.2.5': resolution: {integrity: sha512-pYGy9dTdTwXdasPgyohkr0HoQ4FrkAzFnsUZl/gcnadDArbpZ8e+fgr+F9WBdNEl2y00mb9bCM4WgmoBkZJ27A==} engines: {node: '>=22.13.0'} @@ -2066,63 +2081,63 @@ packages: '@types/yargs@17.0.35': resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==} - '@typescript-eslint/eslint-plugin@8.68.0': - resolution: {integrity: sha512-WASHDpCm6qO5jj9g1a+8NiW5+GCkAyLReR56/4VruYmNgfUmqpxOfZ2Yfb8xGfJPWv5Qi6LSD8sXdces3vbp/Q==} + '@typescript-eslint/eslint-plugin@8.70.0': + resolution: {integrity: sha512-/v8HZt6RlyIZxB3ntehELOcUcfxKPVGWXnQdJuHRmzrqgF8nQypcC/oxGW+Ot4VGKDq81XugPKxx0n5PBtf9PA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.68.0 + '@typescript-eslint/parser': ^8.70.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.68.0': - resolution: {integrity: sha512-fHq2VC1kpyYfvEcbiMjOpySY4WS7voEp89yAThrHRX5sm9j2lzYppCb2umFMEed4fWcyeLjHxrz0mpjNBaBxMQ==} + '@typescript-eslint/parser@8.70.0': + resolution: {integrity: sha512-zYvrmj9Yxd63UGaXw+kdt6A0F0s0qveJyuatIM77bYC2DE4pgmg7a50u8LR7PRtXd0x+h+Tl3eXabGm06SWd3Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.68.0': - resolution: {integrity: sha512-5GQtWZCXFcFYux955pvoS02WLc49pXNlvIxocKjS0clvwo3in1RdlzVKyiqQH9vE5AKWFLTaUgeQkOrTS+0Qxw==} + '@typescript-eslint/project-service@8.70.0': + resolution: {integrity: sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.68.0': - resolution: {integrity: sha512-T5eXpcaJNg8bhjHJ8Rjp68Vq/QBteYtTKY8TZqVNPaUbuz0f6jI9t6aDkylwvalpAB9XTTFeFOjrjXAZ3YvmVA==} + '@typescript-eslint/scope-manager@8.70.0': + resolution: {integrity: sha512-8nP3Kwh5hlgZ4FicGvmznAmJe8UL4sdU8tLukrPaMuQmDuk4Y8xYfzu/aYZW4xT2JCgc7H/TpDI5cGlxcWJSqQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.68.0': - resolution: {integrity: sha512-F7zrGQfiJHojPwi8vhxZQC1tWtJzvL74cK/nqri2lk8YUXvYaYwl263xOJ69jDWPUk1hmcdoayFwk9lX09npVw==} + '@typescript-eslint/tsconfig-utils@8.70.0': + resolution: {integrity: sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.68.0': - resolution: {integrity: sha512-X77zqoY1EjeWGs/0JNxeaMfp5C5lIz4Tw8y66F1Ne8Faq6g424sBNYM6xBAqElfGZPLpWS+CZAp0DXyKDzWiHg==} + '@typescript-eslint/type-utils@8.70.0': + resolution: {integrity: sha512-NUMKIhYVaVIVLnRL9CRt+VVcuLgSHUCpXn4/+K8wql+vdInUzvx8BjUO1oJ7cG9shjFJKtF8F8Hh2kCh3/KBVw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/types@8.68.0': - resolution: {integrity: sha512-9RnpsGJjrAllCMefGVVsImJM24YurhC0Q1h4UbvivtvOqXmR/vEJge2OoE++z9m6hyg8T1Q8t5SNT6tHSbrxcg==} + '@typescript-eslint/types@8.70.0': + resolution: {integrity: sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.68.0': - resolution: {integrity: sha512-OKKsD0tYmoNiU5PW2zehO1yO56jYOm1ShYlxon/Z0SJNidAkdVg86eg9ruRuoXf8xfnuWZGbwDsStkoXbZtIIA==} + '@typescript-eslint/typescript-estree@8.70.0': + resolution: {integrity: sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.68.0': - resolution: {integrity: sha512-PB5gJMMOg0Q5P1tsgWtEAqQacJXq0qEqRHDX/YJ4FaTMLfZPpHB3gjl2EJuiZyPABxmj4ZQYiY9m1bdAJ5y7tQ==} + '@typescript-eslint/utils@8.70.0': + resolution: {integrity: sha512-oZmtKJz/4fufZ2p3+Cn3ijEojcdfR+1zYDH2xKYrEly0dR/Q/1xUPRCOlKGxod78nWlU2UnDe09GZ3TaknBFGA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/visitor-keys@8.68.0': - resolution: {integrity: sha512-YR65gGdGvTUAWLldC3xLOvOzamdGzB4A5/N8rehEaHs3Zvoe39BhgY+u0SPch1OvrVTfLcc55wsSgK2NcnTS/A==} + '@typescript-eslint/visitor-keys@8.70.0': + resolution: {integrity: sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@ungap/structured-clone@1.3.3': @@ -2414,6 +2429,9 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} + cacheable@2.5.0: + resolution: {integrity: sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==} + call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} engines: {node: '>= 0.4'} @@ -2722,8 +2740,8 @@ packages: resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} - eslint@10.9.1: - resolution: {integrity: sha512-9VaAkDURekixUQJy0oJYl2DcN6oKMfxay7XzaGYAWQwsb6qfKf+x76R2k1L8kb1boc+FyCAaTA9GmiKaaiaF+A==} + eslint@10.10.0: + resolution: {integrity: sha512-NPXn6r5zl4uET1DAVPaOwzX3rut4c0wcmw3dWJAfOsTM5+TogXo0DDjz8pwm/hL8cyVNpHqeK4JpN0NjnyFFNw==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} hasBin: true peerDependencies: @@ -2828,9 +2846,8 @@ packages: picomatch: optional: true - file-entry-cache@8.0.0: - resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} - engines: {node: '>=16.0.0'} + file-entry-cache@11.1.5: + resolution: {integrity: sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==} file-saver@2.0.5: resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==} @@ -2847,9 +2864,8 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - flat-cache@4.0.1: - resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} - engines: {node: '>=16'} + flat-cache@6.1.23: + resolution: {integrity: sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==} flatted@3.4.4: resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==} @@ -2943,6 +2959,10 @@ packages: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} + hashery@1.5.1: + resolution: {integrity: sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==} + engines: {node: '>=20'} + hasown@2.0.4: resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==} engines: {node: '>= 0.4'} @@ -2951,6 +2971,12 @@ packages: resolution: {integrity: sha512-O6+/eCYRkzzzy0rPWwKLiGBR1nFuUPZynnwjxN1MBA62NNqbT0wQEzQyK2gSO5yDIDB336sXQleAhOHrzlYyKw==} engines: {node: '>=16.9.0'} + hookified@1.15.1: + resolution: {integrity: sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==} + + hookified@2.2.0: + resolution: {integrity: sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==} + hosted-git-info@10.1.1: resolution: {integrity: sha512-DeOnSPAvOndYKfw075gt8yZzQ7S2hNztw34zBTfhIzLhmBTswIBg5/y+pqu/VD5cYWm5goAFTusDmUEmKZ0PEQ==} engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} @@ -3001,8 +3027,8 @@ packages: resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} engines: {node: '>= 4'} - ignore@7.0.6: - resolution: {integrity: sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==} + ignore@7.0.9: + resolution: {integrity: sha512-brTTsvFRt5C1gGHtPst/281UjPD5t9fBqbgoMPlVWy11ZLTPfu7HxK4ZYqO9H7o/yC9rSTCI85EaQ4OoY12qYw==} engines: {node: '>= 4'} immutable@5.1.9: @@ -3307,9 +3333,6 @@ packages: engines: {node: '>=6'} hasBin: true - json-buffer@3.0.1: - resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} @@ -3333,8 +3356,8 @@ packages: jsonc-parser@3.3.1: resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} - keyv@4.5.4: - resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + keyv@5.6.0: + resolution: {integrity: sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==} leven@3.1.0: resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} @@ -3872,6 +3895,10 @@ packages: pure-rand@7.0.1: resolution: {integrity: sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==} + qified@0.10.1: + resolution: {integrity: sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==} + engines: {node: '>=20'} + qs@6.15.3: resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==} engines: {node: '>=0.6'} @@ -4512,45 +4539,45 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-eslint/builder@22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/builder@22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) '@angular-devkit/core': 22.1.6(chokidar@5.0.0) '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: - chokidar '@angular-eslint/bundled-angular-compiler@22.1.0': {} - '@angular-eslint/eslint-plugin-template@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/eslint-plugin-template@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-eslint/bundled-angular-compiler': 22.1.0 - '@angular-eslint/template-parser': 22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + '@angular-eslint/template-parser': 22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) aria-query: 5.3.2 axobject-query: 4.1.0 - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 - '@angular-eslint/eslint-plugin@22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/eslint-plugin@22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-eslint/bundled-angular-compiler': 22.1.0 - '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@typescript-eslint/utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 - '@angular-eslint/schematics@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/schematics@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-devkit/core': 22.1.6(chokidar@5.0.0) '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) - '@angular-eslint/eslint-plugin': 22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular-eslint/eslint-plugin-template': 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.68.0)(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/eslint-plugin': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/eslint-plugin-template': 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) ignore: 7.0.5 semver: 7.8.5 @@ -4563,18 +4590,18 @@ snapshots: - eslint - typescript - '@angular-eslint/template-parser@22.1.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-eslint/bundled-angular-compiler': 22.1.0 - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) eslint-scope: 9.1.2 typescript: 6.0.3 - '@angular-eslint/utils@22.1.0(@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/utils@22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: '@angular-eslint/bundled-angular-compiler': 22.1.0 - '@typescript-eslint/utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 '@angular/build@22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3)': @@ -5010,6 +5037,18 @@ snapshots: '@bcoe/v8-coverage@0.2.3': {} + '@cacheable/memory@2.2.0': + dependencies: + '@cacheable/utils': 2.5.0 + '@keyv/bigmap': 1.3.1(keyv@5.6.0) + hookified: 1.15.1 + keyv: 5.6.0 + + '@cacheable/utils@2.5.0': + dependencies: + hashery: 1.5.1 + keyv: 5.6.0 + '@cspotcode/source-map-support@0.8.1': dependencies: '@jridgewell/trace-mapping': 0.3.9 @@ -5157,9 +5196,9 @@ snapshots: '@esbuild/win32-x64@0.28.2': optional: true - '@eslint-community/eslint-utils@4.10.1(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))': + '@eslint-community/eslint-utils@4.10.1(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))': dependencies: - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.2': {} @@ -5182,7 +5221,7 @@ snapshots: '@eslint/object-schema@3.0.5': {} - '@eslint/plugin-kit@0.7.2': + '@eslint/plugin-kit@0.7.3': dependencies: '@eslint/core': 1.2.1 levn: 0.4.1 @@ -5639,6 +5678,14 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 + '@keyv/bigmap@1.3.1(keyv@5.6.0)': + dependencies: + hashery: 1.5.1 + hookified: 1.15.1 + keyv: 5.6.0 + + '@keyv/serialize@1.1.1': {} + '@listr2/prompt-adapter-inquirer@4.2.5(@inquirer/prompts@8.5.2(@types/node@26.5.0))(@types/node@26.5.0)(listr2@11.0.0)': dependencies: '@inquirer/prompts': 8.5.2(@types/node@26.5.0) @@ -6224,72 +6271,72 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@8.68.0(@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/eslint-plugin@8.70.0(@typescript-eslint/parser@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/scope-manager': 8.68.0 - '@typescript-eslint/type-utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.68.0 - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) - ignore: 7.0.6 + '@typescript-eslint/parser': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.70.0 + '@typescript-eslint/type-utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.70.0 + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) + ignore: 7.0.9 natural-compare: 1.4.0 ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/parser@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': dependencies: - '@typescript-eslint/scope-manager': 8.68.0 - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/typescript-estree': 8.68.0(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.68.0 + '@typescript-eslint/scope-manager': 8.70.0 + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/typescript-estree': 8.70.0(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.70.0 debug: 4.4.3(supports-color@8.1.1) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.68.0(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/project-service@8.70.0(supports-color@8.1.1)(typescript@6.0.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.68.0(typescript@6.0.3) - '@typescript-eslint/types': 8.68.0 + '@typescript-eslint/tsconfig-utils': 8.70.0(typescript@6.0.3) + '@typescript-eslint/types': 8.70.0 debug: 4.4.3(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.68.0': + '@typescript-eslint/scope-manager@8.70.0': dependencies: - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/visitor-keys': 8.68.0 + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/visitor-keys': 8.70.0 - '@typescript-eslint/tsconfig-utils@8.68.0(typescript@6.0.3)': + '@typescript-eslint/tsconfig-utils@8.70.0(typescript@6.0.3)': dependencies: typescript: 6.0.3 - '@typescript-eslint/type-utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/type-utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': dependencies: - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/typescript-estree': 8.68.0(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/utils': 8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/typescript-estree': 8.70.0(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) debug: 4.4.3(supports-color@8.1.1) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.68.0': {} + '@typescript-eslint/types@8.70.0': {} - '@typescript-eslint/typescript-estree@8.68.0(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/typescript-estree@8.70.0(supports-color@8.1.1)(typescript@6.0.3)': dependencies: - '@typescript-eslint/project-service': 8.68.0(supports-color@8.1.1)(typescript@6.0.3) - '@typescript-eslint/tsconfig-utils': 8.68.0(typescript@6.0.3) - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/visitor-keys': 8.68.0 + '@typescript-eslint/project-service': 8.70.0(supports-color@8.1.1)(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.70.0(typescript@6.0.3) + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/visitor-keys': 8.70.0 debug: 4.4.3(supports-color@8.1.1) minimatch: 10.2.6 semver: 7.8.5 @@ -6299,20 +6346,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.68.0(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': + '@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3)': dependencies: - '@eslint-community/eslint-utils': 4.10.1(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1)) - '@typescript-eslint/scope-manager': 8.68.0 - '@typescript-eslint/types': 8.68.0 - '@typescript-eslint/typescript-estree': 8.68.0(supports-color@8.1.1)(typescript@6.0.3) - eslint: 10.9.1(jiti@2.7.0)(supports-color@8.1.1) + '@eslint-community/eslint-utils': 4.10.1(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1)) + '@typescript-eslint/scope-manager': 8.70.0 + '@typescript-eslint/types': 8.70.0 + '@typescript-eslint/typescript-estree': 8.70.0(supports-color@8.1.1)(typescript@6.0.3) + eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.68.0': + '@typescript-eslint/visitor-keys@8.70.0': dependencies: - '@typescript-eslint/types': 8.68.0 + '@typescript-eslint/types': 8.70.0 eslint-visitor-keys: 5.0.1 '@ungap/structured-clone@1.3.3': {} @@ -6581,6 +6628,14 @@ snapshots: bytes@3.1.2: {} + cacheable@2.5.0: + dependencies: + '@cacheable/memory': 2.2.0 + '@cacheable/utils': 2.5.0 + hookified: 1.15.1 + keyv: 5.6.0 + qified: 0.10.1 + call-bind-apply-helpers@1.0.2: dependencies: es-errors: 1.3.0 @@ -6840,14 +6895,14 @@ snapshots: eslint-visitor-keys@5.0.1: {} - eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1): + eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1): dependencies: - '@eslint-community/eslint-utils': 4.10.1(eslint@10.9.1(jiti@2.7.0)(supports-color@8.1.1)) + '@eslint-community/eslint-utils': 4.10.1(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1)) '@eslint-community/regexpp': 4.12.2 '@eslint/config-array': 0.23.5(supports-color@8.1.1) '@eslint/config-helpers': 0.7.0 '@eslint/core': 1.2.1 - '@eslint/plugin-kit': 0.7.2 + '@eslint/plugin-kit': 0.7.3 '@humanfs/node': 0.16.8 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 @@ -6862,7 +6917,7 @@ snapshots: esquery: 1.7.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 - file-entry-cache: 8.0.0 + file-entry-cache: 11.1.5 find-up: 5.0.0 glob-parent: 6.0.2 ignore: 5.3.2 @@ -7004,9 +7059,9 @@ snapshots: optionalDependencies: picomatch: 4.0.7 - file-entry-cache@8.0.0: + file-entry-cache@11.1.5: dependencies: - flat-cache: 4.0.1 + flat-cache: 6.1.23 file-saver@2.0.5: {} @@ -7031,10 +7086,11 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 - flat-cache@4.0.1: + flat-cache@6.1.23: dependencies: + cacheable: 2.5.0 flatted: 3.4.4 - keyv: 4.5.4 + hookified: 1.15.1 flatted@3.4.4: {} @@ -7123,12 +7179,20 @@ snapshots: has-symbols@1.1.0: {} + hashery@1.5.1: + dependencies: + hookified: 1.15.1 + hasown@2.0.4: dependencies: function-bind: 1.1.2 hono@4.13.5: {} + hookified@1.15.1: {} + + hookified@2.2.0: {} + hosted-git-info@10.1.1: dependencies: lru-cache: 11.5.2 @@ -7191,7 +7255,7 @@ snapshots: ignore@7.0.5: {} - ignore@7.0.6: {} + ignore@7.0.9: {} immutable@5.1.9: {} @@ -7724,8 +7788,6 @@ snapshots: jsesc@3.1.0: {} - json-buffer@3.0.1: {} - json-parse-even-better-errors@2.3.1: {} json-schema-traverse@0.4.1: {} @@ -7740,9 +7802,9 @@ snapshots: jsonc-parser@3.3.1: {} - keyv@4.5.4: + keyv@5.6.0: dependencies: - json-buffer: 3.0.1 + '@keyv/serialize': 1.1.1 leven@3.1.0: {} @@ -8248,6 +8310,10 @@ snapshots: pure-rand@7.0.1: {} + qified@0.10.1: + dependencies: + hookified: 2.2.0 + qs@6.15.3: dependencies: es-define-property: 1.0.1 From 420bf503e8fab29996140e32ba7ee78cb598eaed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2026 12:09:57 -0700 Subject: [PATCH 060/258] Chore(deps): Bump pdfjs-dist from 6.2.108 to 6.3.289 in /src-ui (#14144) Bumps [pdfjs-dist](https://github.com/mozilla/pdf.js) from 6.2.108 to 6.3.289. - [Release notes](https://github.com/mozilla/pdf.js/releases) - [Commits](https://github.com/mozilla/pdf.js/compare/v6.2.108...v6.3.289) --- updated-dependencies: - dependency-name: pdfjs-dist dependency-version: 6.3.289 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src-ui/package.json | 2 +- src-ui/pnpm-lock.yaml | 106 +++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src-ui/package.json b/src-ui/package.json index 5d8ea3c48..f4cf666a1 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -37,7 +37,7 @@ "ngx-device-detector": "^12.0.0", "ngx-ui-tour-ng-bootstrap": "^19.0.0", "normalize-diacritics": "^5.0.0", - "pdfjs-dist": "^6.2.108", + "pdfjs-dist": "^6.3.289", "rxjs": "^7.8.2", "tslib": "^2.8.1", "utif": "^3.1.0", diff --git a/src-ui/pnpm-lock.yaml b/src-ui/pnpm-lock.yaml index 8e21c07eb..12a0a8b94 100644 --- a/src-ui/pnpm-lock.yaml +++ b/src-ui/pnpm-lock.yaml @@ -75,8 +75,8 @@ importers: specifier: ^5.0.0 version: 5.0.0 pdfjs-dist: - specifier: ^6.2.108 - version: 6.2.108 + specifier: ^6.3.289 + version: 6.3.289 rxjs: specifier: ^7.8.2 version: 7.8.2 @@ -1336,79 +1336,79 @@ packages: cpu: [x64] os: [win32] - '@napi-rs/canvas-android-arm64@1.0.5': - resolution: {integrity: sha512-ZzDlpKQocwFfCwhMh17UWre6Qt5yZN3kNIJoUpGfRZqwDDZ164IKOsPOHsRd3d8Tuj5KM6bDjGuPmZxuPuG3NQ==} + '@napi-rs/canvas-android-arm64@1.0.9': + resolution: {integrity: sha512-4LGXk2/0HVzE29K8SzML5WubgCp++B1FH3qgl35XmSZE+lLdr6P9VRQEnZ0MCLZMTSuJP41yyhtoiVNEuvrTIA==} engines: {node: '>= 10'} cpu: [arm64] os: [android] - '@napi-rs/canvas-darwin-arm64@1.0.5': - resolution: {integrity: sha512-Hr8v6CA/TBe+OJOePdV3sXWxzQHQKfQsTKPbc8wG7iPqVeAx6MMdzKGXlYID6SVvpfwV/zqkvGcdImYWSlhrZg==} + '@napi-rs/canvas-darwin-arm64@1.0.9': + resolution: {integrity: sha512-YNdfLBzY0W/Pep9fo2L6RmoNlNksnn05LRnX66W63R3ij58S25QOTcjdtEt2v8+PnCESzqZsYzUo+QPeIR44NA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@napi-rs/canvas-darwin-x64@1.0.5': - resolution: {integrity: sha512-9BXlLHBXpYnK4jSae1MdFdyPq09Xi1I3PeCNpvRzqgmUUBhgJS7aC1z7SZEP8JUXDHtbfIrolCS3sFuT9IGP2A==} + '@napi-rs/canvas-darwin-x64@1.0.9': + resolution: {integrity: sha512-ceZQSknTEcy3dOXoekv59LTCkXjvnLsq+VW5PeNNDHEPQbRS5Ervkm1EaDa7WLAjiYWMLuSQTRTHao1dEX4prg==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@napi-rs/canvas-linux-arm-gnueabihf@1.0.5': - resolution: {integrity: sha512-zEW4fgvtYsOJ/N56Us4TQPfaFrUf0shGr9CgGSj3GACc+NHfUM3ci0YF9xFTjwJWGDmaEhYPL6KqCfFCxwm/qg==} + '@napi-rs/canvas-linux-arm-gnueabihf@1.0.9': + resolution: {integrity: sha512-XhfI0Wwv4llhd6nnWDtY3kQKjq0r+y1i91PlJlJI24ag2U9WrnwbG1qS3+fDLEyouwEVFchiKkTEHozK+5iUNA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@napi-rs/canvas-linux-arm64-gnu@1.0.5': - resolution: {integrity: sha512-HFprwLspelJxCEtZvdMcz95Mwvfs63GzFVedLFmC/wslHnaOXhjXxgYxPCM/VdM4Jhx3CV4Lk0vVmh6hJv2etQ==} + '@napi-rs/canvas-linux-arm64-gnu@1.0.9': + resolution: {integrity: sha512-012oiYtKaE7i9oxc8q7nraT7kDOpLcaCmFLzVe9Ty34RHDdoDzbWLrVh827CNxYh/EADX1eSikA3ymLjo/nNuw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] libc: [glibc] - '@napi-rs/canvas-linux-arm64-musl@1.0.5': - resolution: {integrity: sha512-FNMGFAx8DvtDwlLfWyBJ+oQjgPXoIAqCnNTJYqtJCFRwwzK3AyAe5B1Ll3NZ6hcOzqw7HylZsq4nQxVyPCQX1Q==} + '@napi-rs/canvas-linux-arm64-musl@1.0.9': + resolution: {integrity: sha512-Ls5UWYFFn63casTZEczbeyEg3vRDRkv9lscuGwfchtY5yLLQhgOB8SN4YGxmfJ5vTaBwZ2YUxBS3NtmjJmFXdA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] libc: [musl] - '@napi-rs/canvas-linux-riscv64-gnu@1.0.5': - resolution: {integrity: sha512-2vd5v8Lui+37Hh/spITKIvTT384ip4dnUc5XBn0E+sMNS4b7au7IswyT5YDG2udPTjSh/eLUs3sGuB5YHooFOA==} + '@napi-rs/canvas-linux-riscv64-gnu@1.0.9': + resolution: {integrity: sha512-hLKEGxV7ZiRHqndePTokgDMdBlo/rDfzg7P4p4QIv9pUhuYobnu3R2NIFLCRghG0nwfo+s2sw+c1xZFeCmEAsw==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] libc: [glibc] - '@napi-rs/canvas-linux-x64-gnu@1.0.5': - resolution: {integrity: sha512-iQIPy+Uey0expZTOszLri5n8rY7x4WUpMaY82mcXNIgbil30iHvc01OsiizhZC1KQHTK90RFMFWSpwFU+ON3aA==} + '@napi-rs/canvas-linux-x64-gnu@1.0.9': + resolution: {integrity: sha512-6kaz3w0QMy77PDWk6rJ1ksIihdad3qzEyX2o2oGT8GwCaypfT5mhjr8buOO5hstyLxcWXDScuz56RsINLtBPIQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] libc: [glibc] - '@napi-rs/canvas-linux-x64-musl@1.0.5': - resolution: {integrity: sha512-Npthji25t7FUqIAKsoEkFS0qY5CYVkHjvI3tuZjDTG92wX8g4dst+Lfb4hhubdqPazlDcIwalPzInsFCtf3FFg==} + '@napi-rs/canvas-linux-x64-musl@1.0.9': + resolution: {integrity: sha512-xrGvmS3v55hmZ86ls/kBLVNMUTYio3f6Ik0DireemG994VfPAwiA3ZXA0Uf1bByctkB3NQ1Sfb+H5bkdUnnzfQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] libc: [musl] - '@napi-rs/canvas-win32-arm64-msvc@1.0.5': - resolution: {integrity: sha512-bi+JsdCdbfVJDoAQybTYmkLKwh1xpYpptg5j/BNr2BB56u4/R26jrVvtjqff+CxYMXV6Kz1/jeDVhZCuj6bDng==} + '@napi-rs/canvas-win32-arm64-msvc@1.0.9': + resolution: {integrity: sha512-yjmVS3ArZeRVCP7jqbPq4rpZa/BhTeI7ELE2XqJg3snICQBDevLZyArxswHkiTnT34KRic33/4fLirrHI+SY8A==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@napi-rs/canvas-win32-x64-msvc@1.0.5': - resolution: {integrity: sha512-KQQwG9/sBmcGxqaLFIQf+k2OefREGoyEaIBmRuTM8bUuFKOEE9Xk5pel90hE6pmBwk/vo4RB0OdX+FxobJGMFw==} + '@napi-rs/canvas-win32-x64-msvc@1.0.9': + resolution: {integrity: sha512-QlSYQdMQslB81nlABo9wNfQ6npFhE7/O+saCZdqVGueGanyRk4jCogD5EwQenfP3kIq9e+mm6GreQBjX5MrA8g==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@napi-rs/canvas@1.0.5': - resolution: {integrity: sha512-GaPlicMtnvgPr5SowFRprkEJicDSrV3qCq17U4jiF5u0kNORZo3IbdN2Bk4SfcZJAMYFHbMVJ81O3w21CYxazg==} + '@napi-rs/canvas@1.0.9': + resolution: {integrity: sha512-QviPdJImDi/jMAvBfqaw+19BndMd/sizXVW3NnpMd3VJGz++QXkOHcP9kWR/smHG0hNjHeyuHFyrx/5lD0oNcQ==} engines: {node: '>= 10'} '@napi-rs/nice-android-arm-eabi@1.1.1': @@ -3782,8 +3782,8 @@ packages: path-to-regexp@8.4.2: resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==} - pdfjs-dist@6.2.108: - resolution: {integrity: sha512-YxFb+SQcodN2rnX9Tn3dHYlqfb7NjlzzfONPpJd+AKoKtUjEdevTfbC07d5TcczzOK6261auRkP/M8OBHs9vFQ==} + pdfjs-dist@6.3.289: + resolution: {integrity: sha512-ZHjSVpDa3D6izMq8/04lvkhkATUmL9px6ChPaXc1k6nU2Mrhlg1/7F0bdUqCwUjw3NsPTfPZsMDUU6ZIcRaeQw==} engines: {node: '>=22.13.0 || >=24'} picocolors@1.1.1: @@ -5755,52 +5755,52 @@ snapshots: '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4': optional: true - '@napi-rs/canvas-android-arm64@1.0.5': + '@napi-rs/canvas-android-arm64@1.0.9': optional: true - '@napi-rs/canvas-darwin-arm64@1.0.5': + '@napi-rs/canvas-darwin-arm64@1.0.9': optional: true - '@napi-rs/canvas-darwin-x64@1.0.5': + '@napi-rs/canvas-darwin-x64@1.0.9': optional: true - '@napi-rs/canvas-linux-arm-gnueabihf@1.0.5': + '@napi-rs/canvas-linux-arm-gnueabihf@1.0.9': optional: true - '@napi-rs/canvas-linux-arm64-gnu@1.0.5': + '@napi-rs/canvas-linux-arm64-gnu@1.0.9': optional: true - '@napi-rs/canvas-linux-arm64-musl@1.0.5': + '@napi-rs/canvas-linux-arm64-musl@1.0.9': optional: true - '@napi-rs/canvas-linux-riscv64-gnu@1.0.5': + '@napi-rs/canvas-linux-riscv64-gnu@1.0.9': optional: true - '@napi-rs/canvas-linux-x64-gnu@1.0.5': + '@napi-rs/canvas-linux-x64-gnu@1.0.9': optional: true - '@napi-rs/canvas-linux-x64-musl@1.0.5': + '@napi-rs/canvas-linux-x64-musl@1.0.9': optional: true - '@napi-rs/canvas-win32-arm64-msvc@1.0.5': + '@napi-rs/canvas-win32-arm64-msvc@1.0.9': optional: true - '@napi-rs/canvas-win32-x64-msvc@1.0.5': + '@napi-rs/canvas-win32-x64-msvc@1.0.9': optional: true - '@napi-rs/canvas@1.0.5': + '@napi-rs/canvas@1.0.9': optionalDependencies: - '@napi-rs/canvas-android-arm64': 1.0.5 - '@napi-rs/canvas-darwin-arm64': 1.0.5 - '@napi-rs/canvas-darwin-x64': 1.0.5 - '@napi-rs/canvas-linux-arm-gnueabihf': 1.0.5 - '@napi-rs/canvas-linux-arm64-gnu': 1.0.5 - '@napi-rs/canvas-linux-arm64-musl': 1.0.5 - '@napi-rs/canvas-linux-riscv64-gnu': 1.0.5 - '@napi-rs/canvas-linux-x64-gnu': 1.0.5 - '@napi-rs/canvas-linux-x64-musl': 1.0.5 - '@napi-rs/canvas-win32-arm64-msvc': 1.0.5 - '@napi-rs/canvas-win32-x64-msvc': 1.0.5 + '@napi-rs/canvas-android-arm64': 1.0.9 + '@napi-rs/canvas-darwin-arm64': 1.0.9 + '@napi-rs/canvas-darwin-x64': 1.0.9 + '@napi-rs/canvas-linux-arm-gnueabihf': 1.0.9 + '@napi-rs/canvas-linux-arm64-gnu': 1.0.9 + '@napi-rs/canvas-linux-arm64-musl': 1.0.9 + '@napi-rs/canvas-linux-riscv64-gnu': 1.0.9 + '@napi-rs/canvas-linux-x64-gnu': 1.0.9 + '@napi-rs/canvas-linux-x64-musl': 1.0.9 + '@napi-rs/canvas-win32-arm64-msvc': 1.0.9 + '@napi-rs/canvas-win32-x64-msvc': 1.0.9 optional: true '@napi-rs/nice-android-arm-eabi@1.1.1': @@ -8224,9 +8224,9 @@ snapshots: path-to-regexp@8.4.2: {} - pdfjs-dist@6.2.108: + pdfjs-dist@6.3.289: optionalDependencies: - '@napi-rs/canvas': 1.0.5 + '@napi-rs/canvas': 1.0.9 picocolors@1.1.1: {} From 762e8cf4d12a0bb4cec68b30ce49809acf6cb469 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:55:13 -0700 Subject: [PATCH 061/258] Feature: match CJK terms through their bigram fields in place (#14156) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QUERY-mode searches blended a separate bigram clause in at the top of the query, built from the parsed AST's free-text tokens. Because it sat beside the exact clause rather than inside the query, nothing around a CJK term constrained its bigram match: an exclusion that was one OR branch's own condition could never reach it, so "(東京 AND NOT secret) OR bill" still returned the secret document. Widen each CJK leaf where it sits instead, through emit()'s rewrite_leaf hook, so every AND, NOT, REQUIRE, boost and field restriction around the leaf applies to its bigram match too. Negated leaves are widened on purpose, so "NOT X" excludes exactly what "X" matches. --- pyproject.toml | 2 +- src/documents/search/_backend.py | 69 +- src/documents/search/_query.py | 287 +++++--- src/documents/tests/search/conftest.py | 41 ++ src/documents/tests/search/test_cjk_clause.py | 99 ++- .../tests/search/test_cjk_emit_registry.py | 122 ++++ .../tests/search/test_cjk_leaf_rewrite.py | 500 ++++++++++++++ .../tests/search/test_cjk_run_extraction.py | 200 ++++++ .../tests/search/test_cjk_widening.py | 625 ++++++++++++++++++ .../search/test_conjunctive_negations.py | 2 +- .../test_default_search_fields_guard.py | 6 +- .../tests/search/test_fuzzy_tokenization.py | 2 +- src/documents/tests/search/test_query.py | 4 +- .../tests/search/test_query_negation.py | 120 ++-- .../search/test_unicode_normalization.py | 184 ++++++ uv.lock | 8 +- 16 files changed, 2019 insertions(+), 252 deletions(-) create mode 100644 src/documents/tests/search/test_cjk_emit_registry.py create mode 100644 src/documents/tests/search/test_cjk_leaf_rewrite.py create mode 100644 src/documents/tests/search/test_cjk_run_extraction.py create mode 100644 src/documents/tests/search/test_cjk_widening.py create mode 100644 src/documents/tests/search/test_unicode_normalization.py diff --git a/pyproject.toml b/pyproject.toml index c7cac3082..6d6f9ada6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ dependencies = [ "torch~=2.13.0", "watchfiles>=1.2", "whitenoise~=6.11", - "whoosh-compat[tantivy]==0.2", + "whoosh-compat[tantivy]==0.3", "zxing-cpp~=3.1.0", ] [project.optional-dependencies] diff --git a/src/documents/search/_backend.py b/src/documents/search/_backend.py index 88c81523e..447bc6bbe 100644 --- a/src/documents/search/_backend.py +++ b/src/documents/search/_backend.py @@ -23,6 +23,7 @@ from django.conf import settings from django.utils.timezone import get_current_timezone from documents.search._query import extract_cjk_text +from documents.search._query import normalize_search_text from documents.search._query import parse_simple_text_highlight_query from documents.search._query import parse_simple_text_query from documents.search._query import parse_simple_title_query @@ -462,6 +463,7 @@ class TantivyBackend: ) -> tantivy.Query: """Parse a user query string into a Tantivy Query object.""" tz = get_current_timezone() + query = normalize_search_text(query) if search_mode is SearchMode.TEXT: return parse_simple_text_query(self._index, query) elif search_mode is SearchMode.TITLE: @@ -510,54 +512,67 @@ class TantivyBackend: from guardian.shortcuts import get_groups_with_perms from guardian.shortcuts import get_users_with_perms - content = document.get_effective_content() or "" + # Every searchable string is normalized on the way in, and every + # query string on the way out (_parse_query), so the two agree on + # how a composed character is spelled. See normalize_search_text. + content = normalize_search_text(document.get_effective_content() or "") + title = normalize_search_text(document.title) doc = tantivy.Document() # Basic fields doc.add_unsigned("id", document.pk) doc.add_text("checksum", document.checksum) - doc.add_text("title", document.title) - doc.add_text("title_sort", document.title) - doc.add_text("simple_title", document.title) + doc.add_text("title", title) + doc.add_text("title_sort", title) + doc.add_text("simple_title", title) doc.add_text("content", content) doc.add_text("simple_content", content) # Bigram (character-ngram) fields exist for CJK substring search, # no need to bloat the bigram index with latin characters. - if cjk_title := extract_cjk_text(document.title): + if cjk_title := extract_cjk_text(title): doc.add_text("bigram_title", cjk_title) if content and (cjk_content := extract_cjk_text(content)): doc.add_text("bigram_content", cjk_content) # Original filename - only add if not None/empty if document.original_filename: - doc.add_text("original_filename", document.original_filename) + doc.add_text( + "original_filename", + normalize_search_text(document.original_filename), + ) # Correspondent if document.correspondent: - doc.add_text("correspondent", document.correspondent.name) - doc.add_text("correspondent_sort", document.correspondent.name) - if cjk_corr := extract_cjk_text(document.correspondent.name): + correspondent = normalize_search_text(document.correspondent.name) + doc.add_text("correspondent", correspondent) + doc.add_text("correspondent_sort", correspondent) + if cjk_corr := extract_cjk_text(correspondent): doc.add_text("bigram_correspondent", cjk_corr) # Document type if document.document_type: - doc.add_text("document_type", document.document_type.name) - doc.add_text("type_sort", document.document_type.name) - if cjk_type := extract_cjk_text(document.document_type.name): + document_type = normalize_search_text(document.document_type.name) + doc.add_text("document_type", document_type) + doc.add_text("type_sort", document_type) + if cjk_type := extract_cjk_text(document_type): doc.add_text("bigram_document_type", cjk_type) # Storage path if document.storage_path: - doc.add_text("storage_path", document.storage_path.name) + doc.add_text( + "storage_path", + normalize_search_text(document.storage_path.name), + ) # Tags — collect names for autocomplete in the same pass tag_names: list[str] = [] for tag in document.tags.all(): - doc.add_text("tag", tag.name) - if cjk_tag := extract_cjk_text(tag.name): + tag_name = normalize_search_text(tag.name) + doc.add_text("tag", tag_name) + if cjk_tag := extract_cjk_text(tag_name): doc.add_text("bigram_tag", cjk_tag) - tag_names.append(tag.name) + tag_names.append(tag_name) # Notes — JSON for structured queries (notes.user:alice, notes.note:text). # notes_text is a plain-text companion for snippet/highlight generation; @@ -568,14 +583,17 @@ class TantivyBackend: note_texts: list[str] = [] for note in document.notes.all(): num_notes += 1 + note_text = normalize_search_text(note.note) doc.add_json( "notes", { - "note": note.note, - "user": note.user.username if note.user else None, + "note": note_text, + "user": ( + normalize_search_text(note.user.username) if note.user else None + ), }, ) - note_texts.append(note.note) + note_texts.append(note_text) if note_texts: doc.add_text("notes_text", " ".join(note_texts)) @@ -590,8 +608,8 @@ class TantivyBackend: doc.add_json( "custom_fields", { - "name": cfi.field.name, - "value": search_value, + "name": normalize_search_text(cfi.field.name), + "value": normalize_search_text(search_value), }, ) @@ -645,11 +663,11 @@ class TantivyBackend: doc.add_unsigned("viewer_group_id", viewer_group_id) # Autocomplete words - text_sources = [document.title, content] + text_sources = [title, content] if document.correspondent: - text_sources.append(document.correspondent.name) + text_sources.append(correspondent) if document.document_type: - text_sources.append(document.document_type.name) + text_sources.append(document_type) text_sources.extend(tag_names) for word in sorted(_extract_autocomplete_words(text_sources)): @@ -746,6 +764,9 @@ class TantivyBackend: self._ensure_open() user_query = self._parse_query(query, search_mode) + # _parse_query normalizes its own copy; the snippet queries below are + # built from the string directly, so normalize it here too. + query = normalize_search_text(query) highlight_query = user_query if search_mode is SearchMode.TEXT: try: diff --git a/src/documents/search/_query.py b/src/documents/search/_query.py index f28135e5f..87a7ff10b 100644 --- a/src/documents/search/_query.py +++ b/src/documents/search/_query.py @@ -1,6 +1,8 @@ from __future__ import annotations import logging +import unicodedata +from functools import cache from typing import TYPE_CHECKING from typing import Final @@ -19,6 +21,7 @@ from documents.search._errors import InvalidNumberQuery from documents.search._errors import MultipleSearchQueryErrors from documents.search._errors import SearchQueryError from documents.search._registry import get_field_registry +from documents.search._tokenizer import _bigram_analyzer from documents.search._tokenizer import simple_search_tokens if TYPE_CHECKING: @@ -34,7 +37,37 @@ _REGEX_TIMEOUT: Final[float] = 1.0 # Matches CJK/Hangul characters so queries can be routed to bigram fields. # Uses Unicode properties to cover all blocks including Extension B+ planes. -_CJK_RE: Final = regex.compile(r"[\p{Han}\p{Hiragana}\p{Katakana}\p{Hangul}]+") +# The marks that sit inside a Japanese word are listed explicitly, because +# their Unicode script is Common and the script classes therefore miss +# them: the katakana prolonged sound mark ー (U+30FC) and its halfwidth form +# ｰ (U+FF70), the closing mark 〆 (U+3006), and the halfwidth voiced and +# semi-voiced sound marks ﾞ (U+FF9E) and ﾟ (U+FF9F). Without them a word +# splits into one-character runs, which have no bigrams: コーヒー becomes +# コ + ヒ, and halfwidth ﾊﾟﾝ becomes ﾊ + ﾝ, leaving nothing to index or +# search at all. +# +# The combining marks U+3099/U+309A are deliberately absent: everything +# entering the index and every query string is put through +# normalize_search_text first, so decomposed kana is composed away before +# this pattern ever sees it. The halfwidth marks are not, and cannot be: +# unlike パ (U+30D1), halfwidth katakana has no precomposed voiced form, so +# NFC leaves ﾊ + ﾟ as two codepoints where it folds か + U+3099 into が. +_CJK_RE: Final = regex.compile( + r"[\p{Han}\p{Hiragana}\p{Katakana}\p{Hangul}ーｰ〆ﾞﾟ]+", +) + + +def normalize_search_text(text: str) -> str: + """Put text into the one Unicode normal form the index is built in. + + Both the indexed text and the query string go through this, because a + bigram is a pair of codepoints: NFD がっこう is four where NFC is three, + so an unnormalized document never matches a normalized query. + + NFC, not NFKC: folding ﾊﾟﾝ to パン would be a search-behavior decision + rather than an encoding one. + """ + return unicodedata.normalize("NFC", text) def _user_facing_emit_message(d: Diagnostic) -> str: @@ -113,8 +146,8 @@ def extract_cjk_text(text: str) -> str: """Join the CJK runs in ``text`` for indexing into bigram (char-ngram) fields. Mirrors the query side, which extracts the CJK runs of whatever it is - about to search for (the raw string in simple modes, the parsed query's - free-text tokens in query mode): only CJK runs are ever searched against + about to search for (the raw string in simple modes, each CJK term's + own text in query mode): only CJK runs are ever searched against the bigram fields, so only CJK runs are worth indexing there. Latin text fed to a character-bigram field is never matched and only bloats the index and slows indexing/merge. Returns "" when there is no CJK text. @@ -163,52 +196,6 @@ def _build_cjk_query( return _parse_cjk_text(index, cjk_text, fields) -def _build_ast_cjk_query( - index: tantivy.Index, - ast: wc.ast.Node, - registry: wc.FieldRegistry, -) -> tantivy.Query | None: - """Build the bigram clause of a QUERY-mode search from the parsed AST. - - Same discipline as the fuzzy clause (see _try_parse_fuzzy_query): the CJK - runs come from whoosh_compat's ``free_text_tokens`` over the parsed tree, - never from the raw query string, so a term the user negated or restricted - to a field outside the default search fields contributes nothing, instead - of resurfacing as a top-level clause matching every bigram field. - - ``free_text_tokens`` reports no field of its own, so the tokens are - collected one default field at a time: a bare term, which the parser has - already copied onto every default field, is therefore searched across - every bigram field, while ``title:東京`` reaches ``bigram_title`` alone. - Fields whose CJK text is identical (the bare-term case) share a single - parse over all of their bigram fields at once. - - Raw (``analyzed=False``) tokens are used because the bigram fields have - their own character-ngram analyzer: the default fields' word analyzers - have no useful say over a CJK run, and running them first would only - risk dropping it (remove_long) before the run is ever extracted. - Returns None when the query has no CJK free text. - """ - fields_by_text: dict[str, list[str]] = {} - for field, bigram_field in _CJK_BIGRAM_FIELDS.items(): - tokens = wc.free_text_tokens( - ast, - registry=registry, - fields=[field], - analyzed=False, - ) - cjk_text = extract_cjk_text(" ".join(tokens)) - if cjk_text: - fields_by_text.setdefault(cjk_text, []).append(bigram_field) - - clauses: list[tuple[tantivy.Occur, tantivy.Query]] = [ - (tantivy.Occur.Should, query) - for cjk_text, bigram_fields in fields_by_text.items() - if (query := _parse_cjk_text(index, cjk_text, bigram_fields)) is not None - ] - return _any_of(clauses) if clauses else None - - # A joined fuzzy word string must stay plain words: it goes back through # tantivy's own query parser, and the raw query text the clause collects # routinely carries characters that parser reads as grammar (a colon, a @@ -278,7 +265,7 @@ def _try_parse_fuzzy_query( The ValueError guard stays as insurance (the word string is plain tokens, so tantivy accepting it is expected, not assumed): on a parse - failure the fuzzy clause is skipped and the exact/CJK clauses stand, + failure the fuzzy clause is skipped and the exact clause stands, rather than the whole query failing. """ tokens = wc.free_text_tokens( @@ -332,6 +319,131 @@ _FIELD_BOOSTS = {"title": 2.0} _SIMPLE_FIELD_BOOSTS = {"simple_title": 2.0} +@cache +def _get_emit_field_registry(language: str | None) -> wc.FieldRegistry: + """The parse registry plus the CJK bigram fields, for analyzing and + emitting a query whose CJK leaves _widen_cjk_leaf has widened. Cached + per language, on the same trigger get_field_registry() rebuilds on. + + Never used to parse: the bigram fields are internal (absent from + PUBLIC_FIELDS), and queries are still parsed against + get_field_registry(), so ``bigram_content:...`` never becomes query + syntax. + + The bigram specs set ``multitoken=Multitoken.AND`` explicitly. A + widened leaf's bigram side always sits inside the widening Or, so under + Multitoken.DEFAULT a run's bigrams would inherit that Or, and 東京都 + would match a document containing only 京都. + """ + bigram_analyze = _bigram_analyzer().analyze + return wc.FieldRegistry( + [ + *get_field_registry(language), + *( + wc.FieldSpec( + bigram_field, + wc.FieldKind.TEXT, + analyzer=bigram_analyze, + multitoken=wc.Multitoken.AND, + ) + for bigram_field in _CJK_BIGRAM_FIELDS.values() + ), + ], + ) + + +# Splits text exactly where the content analyzer's simple tokenizer does, +# with none of its filters, so each piece is the raw text of one token the +# index could hold. No remove_long either: a long CJK run must still reach +# the bigram side. +_TOKEN_SPLITTER: Final = tantivy.TextAnalyzerBuilder(tantivy.Tokenizer.simple()).build() + + +def _collapse( + node_cls: type[wc.ast.Node], + children: list[wc.ast.Node], + span: dict[str, int | None], +) -> wc.ast.Node: + """Return the single child as it is, or wrap several in node_cls.""" + if len(children) == 1: + return children[0] + return node_cls(children=tuple(children), **span) + + +def _widen_cjk_leaf(leaf: wc.ast.Term | wc.ast.Phrase) -> wc.ast.Node: + """``rewrite_leaf`` hook for emit(): widen a CJK term or phrase on a + default search field to ``Or(leaf, alternative)`` where it sits, and + leave every other leaf as it is. + + The content analyzer keeps an unspaced CJK run as one token, so only + the bigram fields can find a CJK term inside running text. Widening in + place, rather than OR-ing a separate bigram clause in at the top, keeps + every AND, NOT, REQUIRE, boost and field restriction around the leaf + applying to its bigram match too. analyze() calls this for negated + leaves as well, and they are widened on purpose, so ``NOT X`` excludes + exactly what ``X`` matches. + + The alternative is built from the leaf's own text, split where the + content analyzer would split it. What each kind of piece contributes, + and how the pieces combine, is commented at the step that decides it. + + analyze() only offers Term and Phrase leaves, so Prefix and Wildcard + patterns are never widened. + """ + if leaf.field is None or leaf.field.name not in _CJK_BIGRAM_FIELDS: + return leaf + text = str(leaf.text) + if not _has_cjk(text): + return leaf + span = {"startchar": leaf.startchar, "endchar": leaf.endchar} + bigram_field = wc.FieldRef(_CJK_BIGRAM_FIELDS[leaf.field.name]) + cjk_terms: list[wc.ast.Node] = [] + latin_terms: list[wc.ast.Node] = [] + for token in _TOKEN_SPLITTER.analyze(text): + runs = _CJK_RE.findall(token) + if runs: + # One bigram Term per run, never a joined string, which would + # produce bigrams spanning the join. A run's own bigrams stay + # jointly required through multitoken=AND on the bigram + # FieldSpec (see _get_emit_field_registry), which no enclosing + # group can loosen. A one-character run has no bigram at all + # and analyzes away to nothing. + cjk_terms.extend( + wc.ast.Term(field=bigram_field, text=run, **span) for run in runs + ) + else: + # Latin the analyzer split off on its own. Latin glued to CJK + # inside one token (東京report) never reaches here, and must + # not: the index holds it only inside that whole unspaced + # token, so requiring it would lose documents the run finds. + latin_terms.append(wc.ast.Term(field=leaf.field, text=token, **span)) + # A Term's runs are alternatives to each other, the way the separate + # bigram clause treated them. A Phrase's are required together: quoting + # asks for more than the bare words, and the parser's default group is + # And, so an Or here would make "東京都 大阪府" match strictly more + # than 東京都 大阪府 does. And is also the tightest thing available, + # since the bigram analyzer puts every token at position 0 and no + # alternative built from it can enforce adjacency. + cjk_group = wc.ast.And if isinstance(leaf, wc.ast.Phrase) else wc.ast.Or + pieces: list[wc.ast.Node] = [] + if cjk_terms: + pieces.append(_collapse(cjk_group, cjk_terms, span)) + pieces.extend(latin_terms) + if not pieces: + # A few hundred codepoints match _CJK_RE but yield no token at all + # from the simple tokenizer (CJK radicals, circled and squared + # forms), leaving nothing to widen with. The leaf then analyzes to + # the same nothing it does today. + return leaf + # Separated latin is required alongside the CJK side, which is what + # stops "invoice NOT 東京-report" from excluding every 東京 document. + alternative = _collapse(wc.ast.And, pieces, span) + # The leaf itself, not a copy: analyze() then keeps it combined the way + # its enclosing group says rather than the way this Or would, and a long + # run its analyzer drops to nothing leaves just the alternative. + return wc.ast.Or(children=(leaf, alternative), **span) + + class _ConjunctiveNegations(wc.ast.Visitor[tuple["wc.ast.Node", ...]]): """Collect the subtrees an AST excludes from every document it matches. @@ -383,13 +495,17 @@ def _negation_clauses( tantivy accepts a bare one. The except branch has no reachable trigger under the current control - flow: this only runs after ``exact = tantivy_emit(result.ast, ...)`` - (parse_user_query) has already emitted the *whole* AST successfully, - and every subtree ``_ConjunctiveNegations`` collects here is a piece - of that same tree. Kept as insurance, not dead weight: re-emitting a - subtree in isolation is not proven identical to emitting it in - context, just believed to be, and this is the seam that finds out if - that belief is ever wrong. + flow: this only runs after parse_user_query has already emitted the + exact clause from the whole parsed AST (widened, when the query has CJK + text), and every subtree ``_ConjunctiveNegations`` collects here is a + piece of that same parsed tree. The re-emit here uses the public + registry, without the widening hook, while the exact clause was emitted + against ``_get_emit_field_registry()``; the two registries agree on + every public field, and the hook only adds nodes, so this does not + reopen the branch. Kept as insurance, not dead weight: re-emitting a + subtree in isolation is not proven identical to emitting it in context, + just believed to be, and this is the seam that finds out if that + belief is ever wrong. """ try: return [ @@ -451,7 +567,8 @@ def parse_user_query( tz: tzinfo, ) -> tantivy.Query: """ - Parse user query through whoosh-compat, then blend in fuzzy/CJK clauses. + Parse user query through whoosh-compat, widen CJK terms, then blend in + the optional fuzzy clause. 1. wc.parse() against the shared FieldRegistry (whoosh grammar -> AST). Bare notes:/custom_fields: prefixes resolve to their default subpath @@ -460,11 +577,18 @@ def parse_user_query( 2. Any diagnostics (bad dates/numbers) map to SearchQueryError subclasses and raise, the view returns HTTP 400 with every offending field listed, not just the first. - 3. emit() turns the AST into a tantivy.Query directly (no string + 3. When the query has CJK text, emit()'s rewrite_leaf hook + (_widen_cjk_leaf) rewrites each CJK term in the AST to also match + its bigram field, in place, so the rest of the query constrains the + bigram match too. The tree is analyzed and emitted against + _get_emit_field_registry(), which adds the bigram fields; the query + itself was parsed without them. + emit() turns the AST into a tantivy.Query directly (no string round-trip). A QueryError is routed by its Diagnostic's Cause (_map_emit_error): a construct that parses but can't execute against tantivy (e.g. a text-field range) is a 400, a registry/schema - mismatch is logged and a 400, and an INTERNAL defect is re-raised. + mismatch is logged and re-raised, and an INTERNAL defect is + re-raised. 4. Optional fuzzy blend (ADVANCED_FUZZY_SEARCH_THRESHOLD) builds a plain word string from the parsed AST's free-text tokens (whoosh_compat.free_text_tokens) and feeds THAT to @@ -472,13 +596,12 @@ def parse_user_query( keywords, bracket-class wildcards, etc.) tantivy's parser rejects, which used to silently knock the fuzzy clause out of any mixed query (see _try_parse_fuzzy_query). - 5. Optional CJK bigram clause, built from the same parsed AST for the - same reason (see _build_ast_cjk_query): a CJK term the query negated - or fielded must not resurface through it. - 6. When any optional clause was added, the query's conjunctive - exclusions are restated as MustNot above the blend - (_negation_clauses): a clause built from positive terms cannot - express them, and as a bare Should it would undo them. + 5. When the fuzzy clause was added, the query's conjunctive exclusions + are restated as MustNot above the blend (_negation_clauses): a + clause built from positive terms cannot express them, and as a bare + Should it would undo them. The restated exclusions come from the + unwidened AST, so they are content-only for CJK terms: a known gap + that goes away once fuzzy is also widened in the tree. """ registry = get_field_registry(settings.SEARCH_LANGUAGE) result = wc.parse( @@ -491,17 +614,20 @@ def parse_user_query( if result.diagnostics: raise _diagnostics_to_error(result.diagnostics) + emit_registry, rewrite_leaf = registry, None + if _has_cjk(raw_query): + emit_registry = _get_emit_field_registry(settings.SEARCH_LANGUAGE) + rewrite_leaf = _widen_cjk_leaf try: - exact = tantivy_emit(result.ast, index=index, registry=registry) + exact = tantivy_emit( + result.ast, + index=index, + registry=emit_registry, + rewrite_leaf=rewrite_leaf, + ) except QueryError as e: raise _map_emit_error(e) from e - cjk_query = ( - _build_ast_cjk_query(index, result.ast, registry) - if _has_cjk(raw_query) - else None - ) - clauses: list[tuple[tantivy.Occur, tantivy.Query]] = [ (tantivy.Occur.Should, exact), ] @@ -514,16 +640,13 @@ def parse_user_query( (tantivy.Occur.Should, tantivy.Query.boost_query(fuzzy, 0.1)), ) - if cjk_query is not None: - clauses.append((tantivy.Occur.Should, cjk_query)) - if len(clauses) == 1: return exact - # The fuzzy and CJK clauses are built from positive terms only, so as - # plain Shoulds beside the exact clause they re-admit exactly the - # documents the query excluded. Restate the exclusions once, above the - # whole blend. Redundant against the exact clause, which already - # carries them, but idempotently so. + # The fuzzy clause is built from positive terms only, so as a plain + # Should beside the exact clause it re-admits exactly the documents the + # query excluded. Restate the exclusions once, above the whole blend. + # Redundant against the exact clause, which already carries them, but + # idempotently so. negations = _negation_clauses(index, result.ast, registry) if not negations: return _any_of(clauses) diff --git a/src/documents/tests/search/conftest.py b/src/documents/tests/search/conftest.py index b65ce8899..7bb065cb0 100644 --- a/src/documents/tests/search/conftest.py +++ b/src/documents/tests/search/conftest.py @@ -6,13 +6,17 @@ import pytest from documents.search._backend import TantivyBackend from documents.search._backend import reset_backend +from documents.tests.factories import DocumentFactory if TYPE_CHECKING: + from collections.abc import Callable from collections.abc import Generator from pathlib import Path from pytest_django.fixtures import Settings + from documents.models import Document + @pytest.fixture def index_dir(tmp_path: Path, settings: Settings) -> Path: @@ -31,3 +35,40 @@ def backend() -> Generator[TantivyBackend, None, None]: finally: b.close() reset_backend() + + +@pytest.fixture +def long_cjk_run() -> str: + """A CJK run too long for the content analyzer to keep. + + 48 characters, 144 UTF-8 bytes: one token longer than remove_long's + 129-byte limit, so the content side analyzes to nothing and only the + bigram field can match it. + """ + return "東京都の公共文書について" * 4 + + +@pytest.fixture +def index_document(backend: TantivyBackend) -> Callable[..., Document]: + """Build a Document with DocumentFactory and add it to the index. + + The factory supplies a unique checksum, so a test only passes the + fields its assertion actually depends on. + """ + + def _index(**kwargs: object) -> Document: + doc = DocumentFactory(**kwargs) + backend.add_or_update(doc) + return doc + + return _index + + +@pytest.fixture +def matched_ids(backend: TantivyBackend) -> Callable[[str], set[int]]: + """Run a query as no particular user and return the matching pks.""" + + def _matched_ids(query: str) -> set[int]: + return set(backend.search_ids(query, user=None)) + + return _matched_ids diff --git a/src/documents/tests/search/test_cjk_clause.py b/src/documents/tests/search/test_cjk_clause.py index 9509b04fb..cf3bae5b8 100644 --- a/src/documents/tests/search/test_cjk_clause.py +++ b/src/documents/tests/search/test_cjk_clause.py @@ -1,9 +1,10 @@ -"""The CJK bigram clause blended into QUERY-mode searches. +"""CJK bigram matching in QUERY-mode searches. -The clause exists so CJK runs are matchable at all (the default analyzers -keep a whitespace-free CJK run as one indivisible token), but it must not -widen the query beyond what the user asked for: a CJK term the query -excludes, or restricts to one field, must not come back through it. +The bigram fields exist so CJK runs are matchable at all (the default +analyzers keep a whitespace-free CJK run as one indivisible token), but +matching them must not widen the query beyond what the user asked for: a +CJK term the query excludes, or restricts to one field, must not come back +through them. """ from __future__ import annotations @@ -12,26 +13,17 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: + from collections.abc import Callable + from pytest_django.fixtures import SettingsWrapper - from documents.search._backend import TantivyBackend + from documents.models import Document + pytestmark = [pytest.mark.search, pytest.mark.django_db] -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - class TestCjkParseFailureDegradesGracefully: def test_a_cjk_run_tantivy_cannot_parse_drops_the_clause_only(self) -> None: """ @@ -76,7 +68,11 @@ class TestCjkParseFailureDegradesGracefully: class TestCjkClauseFollowsTheParsedQuery: - def test_negated_cjk_term_is_excluded(self, backend: TantivyBackend) -> None: + def test_negated_cjk_term_is_excluded( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: """ GIVEN: - Two documents both matching "invoice", one whose content @@ -87,21 +83,17 @@ class TestCjkClauseFollowsTheParsedQuery: - Only the document without 漢字 matches; 'invoice NOT 漢字' must not return the document containing 漢字 """ - with_cjk = _index( - backend, + with_cjk = index_document( title="Invoice A", content="invoice total 漢字", - checksum="cjk-neg-1", ) - without_cjk = _index( - backend, + without_cjk = index_document( title="Invoice B", content="invoice total only", - checksum="cjk-neg-2", ) - assert _matched_ids(backend, "invoice") == {with_cjk.pk, without_cjk.pk} - assert _matched_ids(backend, "invoice NOT 漢字") == {without_cjk.pk} + assert matched_ids("invoice") == {with_cjk.pk, without_cjk.pk} + assert matched_ids("invoice NOT 漢字") == {without_cjk.pk} @pytest.mark.parametrize( ("threshold", "expected"), @@ -112,7 +104,8 @@ class TestCjkClauseFollowsTheParsedQuery: ) def test_fielded_cjk_term_searches_only_that_field( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], settings: SettingsWrapper, threshold: float | None, expected: set[str], @@ -135,26 +128,23 @@ class TestCjkClauseFollowsTheParsedQuery: it stays deliberate """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = threshold - content_only = _index( - backend, + content_only = index_document( title="Tokyo report", content="東京都の人口は約1400万人です", - checksum="cjk-field-1", ) - titled = _index( - backend, + titled = index_document( title="東京都の報告書", content="an english summary", - checksum="cjk-field-2", ) pks = {"titled": titled.pk, "content_only": content_only.pk} - assert _matched_ids(backend, "東京") == set(pks.values()) - assert _matched_ids(backend, "title:東京") == {pks[label] for label in expected} + assert matched_ids("東京") == set(pks.values()) + assert matched_ids("title:東京") == {pks[label] for label in expected} - def test_cjk_on_a_non_default_field_builds_no_clause( + def test_cjk_on_a_non_default_field_is_not_widened( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -164,22 +154,21 @@ class TestCjkClauseFollowsTheParsedQuery: search fields) THEN: - Nothing matches; a CJK term restricted to a field outside - the default search fields has nothing to contribute to the - bigram clause, so it must not fall back to matching 東京 in - the content + the default search fields has no bigram companion to widen + to, so it must not fall back to matching 東京 in the + content """ - _index( - backend, + index_document( title="Tokyo report", content="東京都の人口は約1400万人です", - checksum="cjk-notes-1", ) - assert _matched_ids(backend, "notes:東京") == set() + assert matched_ids("notes:東京") == set() def test_bare_cjk_term_still_matches_every_default_field( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -188,25 +177,21 @@ class TestCjkClauseFollowsTheParsedQuery: WHEN: - "重要" and "重要 OR report" are each searched unfielded THEN: - - Both documents match either way; the clause's reason for - existing is that an unfielded CJK run matches wherever it - is indexed, and does so alongside a latin term + - Both documents match either way; bigram matching exists + so that an unfielded CJK run matches wherever it is + indexed, and does so alongside a latin term """ - in_content = _index( - backend, + in_content = index_document( title="report", content="本文に重要な情報", - checksum="cjk-bare-1", ) - in_title = _index( - backend, + in_title = index_document( title="重要な報告書", content="english only", - checksum="cjk-bare-2", ) - assert _matched_ids(backend, "重要") == {in_content.pk, in_title.pk} - assert _matched_ids(backend, "重要 OR report") == { + assert matched_ids("重要") == {in_content.pk, in_title.pk} + assert matched_ids("重要 OR report") == { in_content.pk, in_title.pk, } diff --git a/src/documents/tests/search/test_cjk_emit_registry.py b/src/documents/tests/search/test_cjk_emit_registry.py new file mode 100644 index 000000000..78db2d11e --- /dev/null +++ b/src/documents/tests/search/test_cjk_emit_registry.py @@ -0,0 +1,122 @@ +"""The emit-only FieldRegistry a CJK-widened query tree is emitted against. + +It is the parse registry plus the internal bigram fields. These tests pin +what the bigram half has to get right on its own: combining a run's bigrams +with AND wherever the leaf sits, producing exactly the terms the index +holds, and naming only fields the index schema actually has. +""" + +from __future__ import annotations + +import pytest +import tantivy +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +from documents.search._query import _CJK_BIGRAM_FIELDS +from documents.search._query import _get_emit_field_registry +from documents.search._schema import field_descriptors +from documents.search._tokenizer import register_tokenizers + +pytestmark = pytest.mark.search + +_BIGRAM_CONTENT = wc.FieldRef("bigram_content") +_CONTENT = wc.FieldRef("content") + + +class TestEmitFieldRegistry: + def test_a_multi_bigram_run_requires_every_bigram_even_under_an_or( + self, + ) -> None: + """ + GIVEN: + - A three-character CJK run on bigram_content, sitting inside + an Or (where the CJK widener always places it) + WHEN: + - The tree is analyzed against the emit registry + THEN: + - The run's two bigrams are combined with And, not Or. Left + to Multitoken.DEFAULT they would inherit the enclosing Or, + so "東京都" would match a document containing only 京都 + """ + tree = wc_ast.Or( + children=( + wc_ast.Term(field=_BIGRAM_CONTENT, text="東京都"), + wc_ast.Term(field=_CONTENT, text="report"), + ), + ) + + analyzed = wc_ast.analyze(tree, _get_emit_field_registry(None)) + + assert analyzed == wc_ast.Or( + children=( + wc_ast.And( + children=( + wc_ast.Term(field=_BIGRAM_CONTENT, text="東京"), + wc_ast.Term(field=_BIGRAM_CONTENT, text="京都"), + ), + ), + wc_ast.Term(field=_CONTENT, text="report"), + ), + ) + + @pytest.mark.parametrize( + "text", + [ + pytest.param("東京都の公共文書", id="japanese"), + pytest.param("北京市人民政府", id="chinese"), + pytest.param("서울특별시", id="korean"), + ], + ) + def test_every_query_bigram_is_a_term_the_index_holds(self, text: str) -> None: + """ + GIVEN: + - A document whose bigram_content was indexed by the tokenizer + register_tokenizers() installs + WHEN: + - The emit registry's bigram analyzer tokenizes the same text + THEN: + - Every token it produces is found as an indexed term. The + query side and the index side each build their own bigram + analyzer, so this pins the two staying equivalent + """ + sb = tantivy.SchemaBuilder() + sb.add_text_field( + "bigram_content", + stored=False, + tokenizer_name="bigram_analyzer", + ) + index = tantivy.Index(sb.build(), path=None) + register_tokenizers(index, None) + writer = index.writer() + doc = tantivy.Document() + doc.add_text("bigram_content", text) + writer.add_document(doc) + writer.commit() + index.reload() + + resolved = _get_emit_field_registry(None).resolve(_BIGRAM_CONTENT) + assert resolved is not None + tokens = resolved.spec.analyzer(text) + + assert tokens + searcher = index.searcher() + for token in tokens: + query = tantivy.Query.term_query(index.schema, "bigram_content", token) + assert searcher.search(query, limit=1).count == 1, token + + def test_every_bigram_field_is_in_the_index_schema(self) -> None: + """ + GIVEN: + - The bigram fields the emit registry declares, and the index + schema's field descriptors + WHEN: + - Each bigram field name is looked up in the schema + THEN: + - Every one is present. Every index is built from these + descriptors, or rebuilt when its stored fingerprint of them + differs, so this is what guarantees each widened bigram leaf + names a field the index has + """ + schema_names = {descriptor.name for descriptor in field_descriptors()} + assert set(_CJK_BIGRAM_FIELDS.values()) <= schema_names diff --git a/src/documents/tests/search/test_cjk_leaf_rewrite.py b/src/documents/tests/search/test_cjk_leaf_rewrite.py new file mode 100644 index 000000000..52d231ff6 --- /dev/null +++ b/src/documents/tests/search/test_cjk_leaf_rewrite.py @@ -0,0 +1,500 @@ +"""_widen_cjk_leaf, the rewrite_leaf hook that makes CJK runs matchable in +QUERY mode. + +Unit tests against hand-built trees, no index needed: the hook on its own, +then the tree wc.analyze() builds around it. Result-level proof against a +real corpus lives in test_cjk_widening.py. +""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import pytest +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +from documents.search._query import _DEFAULT_SEARCH_FIELDS +from documents.search._query import _FIELD_BOOSTS +from documents.search._query import _get_emit_field_registry +from documents.search._query import _widen_cjk_leaf +from documents.search._registry import get_field_registry + +if TYPE_CHECKING: + from collections.abc import Callable + +pytestmark = pytest.mark.search + +_CONTENT = wc.FieldRef("content") +_TITLE = wc.FieldRef("title") +_NOTES = wc.FieldRef("notes", "note") +_BIGRAM_CONTENT = wc.FieldRef("bigram_content") +_BIGRAM_TITLE = wc.FieldRef("bigram_title") + + +def _content(text: str) -> wc_ast.Term: + return wc_ast.Term(field=_CONTENT, text=text) + + +def _bigram(text: str) -> wc_ast.Term: + return wc_ast.Term(field=_BIGRAM_CONTENT, text=text) + + +def _widened(original: wc_ast.Node, bigram_side: wc_ast.Node) -> wc_ast.Or: + return wc_ast.Or(children=(original, bigram_side)) + + +def _analyze(tree: wc_ast.Node) -> wc_ast.Node: + return wc.analyze( + tree, + _get_emit_field_registry(None), + rewrite_leaf=_widen_cjk_leaf, + ) + + +class TestTheHook: + @pytest.mark.parametrize( + "leaf", + [ + pytest.param(_content("invoice"), id="latin_term"), + pytest.param( + wc_ast.Term(field=_NOTES, text="東京"), + id="non_default_field", + ), + pytest.param(wc_ast.Term(field=None, text="東京"), id="unfielded"), + ], + ) + def test_leaf_is_returned_unchanged(self, leaf: wc_ast.Term) -> None: + """ + GIVEN: + - A leaf with no CJK text, a CJK term on a field outside the + default search fields, or an unfielded CJK term + WHEN: + - The hook is called with it + THEN: + - It returns the very same object, which tells analyze() to + keep the leaf's ordinary analysis + """ + assert _widen_cjk_leaf(leaf) is leaf + + def test_a_leaf_the_tokenizer_drops_entirely_is_returned_unchanged(self) -> None: + """ + GIVEN: + - A term whose text matches _CJK_RE (U+2E80, a CJK Radicals + Supplement codepoint, so _has_cjk is True) but which the + content analyzer's simple tokenizer yields no token for at + all: a few hundred codepoints across the CJK blocks share + this gap between the regex and the tokenizer + WHEN: + - The hook is called with it + THEN: + - Neither cjk_terms nor latin_terms gains a piece, and the + leaf is returned unchanged rather than becoming an empty Or + """ + leaf = _content("⺀") + + assert _widen_cjk_leaf(leaf) is leaf + + def test_the_original_leaf_object_is_the_first_alternative(self) -> None: + """ + GIVEN: + - A CJK term on content + WHEN: + - The hook widens it + THEN: + - The Or's first child is the leaf object itself, not an equal + copy: analyze() only keeps the leaf's own enclosing-group + analysis for that exact object + """ + leaf = _content("東京") + + widened = _widen_cjk_leaf(leaf) + + assert isinstance(widened, wc_ast.Or) + assert widened.children[0] is leaf + + def test_a_cjk_term_gains_a_bigram_alternative_on_its_own_field(self) -> None: + """ + GIVEN: + - A CJK term on title + WHEN: + - The hook widens it + THEN: + - The bigram side targets bigram_title, the leaf's own field's + companion, so a fielded term stays fielded + """ + leaf = wc_ast.Term(field=_TITLE, text="東京") + + assert _widen_cjk_leaf(leaf) == _widened( + leaf, + wc_ast.Term(field=_BIGRAM_TITLE, text="東京"), + ) + + def test_each_cjk_run_gets_its_own_bigram_leaf(self) -> None: + """ + GIVEN: + - One term whose text holds two CJK runs split by an + interpunct (東京・大阪) + WHEN: + - The hook widens it + THEN: + - The bigram side is Or(bigram 東京, bigram 大阪), one leaf + per run. Joining the runs with a space into one leaf would + produce bigrams spanning the space, which only exist when + the two runs sit side by side in a document. The runs are + alternatives, not requirements: a multi-run term matches on + any one of its runs, which is what the separate bigram + clause did before this change + """ + leaf = _content("東京・大阪") + + assert _widen_cjk_leaf(leaf) == _widened( + leaf, + wc_ast.Or(children=(_bigram("東京"), _bigram("大阪"))), + ) + + def test_each_run_keeps_its_own_bigrams_required(self) -> None: + """ + GIVEN: + - A term whose two runs each produce more than one bigram + (東京都・大阪府) + WHEN: + - The hook widens it and the tree is analyzed + THEN: + - Each run's bigrams stay And-combined inside the cross-run + Or. The Or is between runs only; multitoken=AND on the + bigram FieldSpec is what requires a run's own bigrams, and + it does not inherit from the enclosing group. Without this, + 東京都 would match a document holding only 京都 + """ + assert _analyze(_content("東京都・大阪府")) == wc_ast.Or( + children=( + wc_ast.And(children=(_content("東京都"), _content("大阪府"))), + wc_ast.And(children=(_bigram("東京"), _bigram("京都"))), + wc_ast.And(children=(_bigram("大阪"), _bigram("阪府"))), + ), + ) + + def test_a_phrase_widens_to_a_bigram_term_not_a_bigram_phrase(self) -> None: + """ + GIVEN: + - A quoted CJK phrase on content + WHEN: + - The hook widens it + THEN: + - The bigram side is a plain Term: the bigram analyzer puts + every token at position 0, so a positional Phrase against it + could never match + """ + leaf = wc_ast.Phrase(field=_CONTENT, text="東京都") + + assert _widen_cjk_leaf(leaf) == _widened(leaf, _bigram("東京都")) + + def test_a_multi_word_phrase_requires_every_run(self) -> None: + """ + GIVEN: + - A quoted CJK phrase holding two words + WHEN: + - The hook widens it + THEN: + - The runs are And-combined, where a Term's runs are + Or-combined (test_each_cjk_run_gets_its_own_bigram_leaf). + The parser's default group is And, so an Or here would let + the quoted phrase match strictly more than the same two + words unquoted, and quoting must not widen a search + """ + leaf = wc_ast.Phrase(field=_CONTENT, text="東京都 大阪府") + + assert _widen_cjk_leaf(leaf) == _widened( + leaf, + wc_ast.And(children=(_bigram("東京都"), _bigram("大阪府"))), + ) + + @pytest.mark.parametrize( + ("leaf", "alternative"), + [ + pytest.param( + _content("東京-report"), + wc_ast.And(children=(_bigram("東京"), _content("report"))), + id="separated_term", + ), + pytest.param( + wc_ast.Phrase(field=_CONTENT, text="東京 report"), + wc_ast.And(children=(_bigram("東京"), _content("report"))), + id="phrase", + ), + pytest.param(_content("東京report"), _bigram("東京"), id="glued"), + ], + ) + def test_latin_is_required_only_where_the_analyzer_splits_it_off( + self, + leaf: wc_ast.Term | wc_ast.Phrase, + alternative: wc_ast.Node, + ) -> None: + """ + GIVEN: + - A leaf mixing CJK and latin text, either split into separate + tokens by the content analyzer (東京-report, "東京 report") + or glued into one token (東京report) + WHEN: + - The hook widens it + THEN: + - A separate latin token is required on the leaf's own field + beside the CJK run's bigrams. Glued latin is not required: + the index only holds it inside the whole unspaced token, so + requiring it would lose documents the CJK run finds + """ + assert _widen_cjk_leaf(leaf) == _widened(leaf, alternative) + + def test_only_latin_pieces_after_a_tokenizer_drop_still_widens(self) -> None: + """ + GIVEN: + - A term combining a tokenizer-dropped CJK codepoint (U+2E80) + with a latin word (⺀report): _has_cjk matches on the + leading codepoint, but the tokenizer discards it and keeps + only the "report" token, so no run ever reaches cjk_terms + WHEN: + - The hook widens it + THEN: + - The alternative is the lone latin term itself, not wrapped + in And (a single piece collapses to itself), even though + the CJK side contributed nothing + """ + leaf = _content("⺀report") + + assert _widen_cjk_leaf(leaf) == _widened(leaf, _content("report")) + + def test_new_nodes_carry_the_leaf_span(self) -> None: + """ + GIVEN: + - A CJK term with a source span, split into two pieces + WHEN: + - The hook widens it + THEN: + - The Or, the alternative and each piece carry the leaf's + span, so an emit-time diagnostic still points into the + query text + """ + leaf = wc_ast.Term(field=_CONTENT, text="東京・大阪", startchar=3, endchar=8) + + widened = _widen_cjk_leaf(leaf) + + assert isinstance(widened, wc_ast.Or) + alternative = widened.children[1] + assert isinstance(alternative, wc_ast.Or) + spans = { + (node.startchar, node.endchar) + for node in (widened, alternative, *alternative.children) + } + assert spans == {(3, 8)} + + +class TestAnalyzedTree: + @pytest.mark.parametrize( + "node", + [ + pytest.param(wc_ast.Prefix(field=_CONTENT, text="東京"), id="cjk_prefix"), + pytest.param( + wc_ast.Wildcard(field=_CONTENT, pattern="東*"), + id="cjk_wildcard", + ), + ], + ) + def test_patterns_are_never_widened(self, node: wc_ast.Node) -> None: + """ + GIVEN: + - A CJK prefix or wildcard pattern on content + WHEN: + - The tree is analyzed with the hook + THEN: + - It comes back unchanged: analyze() only offers Term and + Phrase leaves to the hook + """ + assert _analyze(node) == node + + @pytest.mark.parametrize( + "build", + [ + pytest.param(lambda node: node, id="bare"), + pytest.param(lambda node: wc_ast.Not(child=node), id="negated"), + ], + ) + def test_a_run_past_the_length_limit_keeps_its_bigram_side( + self, + build: Callable[[wc_ast.Node], wc_ast.Node], + long_cjk_run: str, + ) -> None: + """ + GIVEN: + - A CJK run longer than the content analyzer's remove_long + limit, bare or under NOT + WHEN: + - The tree is analyzed with the hook + THEN: + - The content side drops out and the bigram side stands alone, + still negated under NOT. A NOT left holding nothing would + turn into "match everything" instead + """ + resolved = _get_emit_field_registry(None).resolve(_BIGRAM_CONTENT) + assert resolved is not None + bigrams = resolved.spec.analyzer(long_cjk_run) + + assert _analyze(build(_content(long_cjk_run))) == build( + wc_ast.And( + children=tuple(_bigram(token) for token in dict.fromkeys(bigrams)), + ), + ) + + def test_a_one_character_run_drops_out_of_the_alternative(self) -> None: + """ + GIVEN: + - A term whose runs are 東 (one character) and 大阪 + WHEN: + - The tree is analyzed with the hook + THEN: + - Only 大阪 is required on the bigram side: a one-character run + has no bigram. An accepted gap, the same on the positive and + the negated side + """ + analyzed = _analyze(_content("東・大阪")) + + assert analyzed == _widened( + wc_ast.And(children=(_content("東"), _content("大阪"))), + _bigram("大阪"), + ) + + def test_the_title_boost_wraps_the_widened_title_leaf(self) -> None: + """ + GIVEN: + - An unfielded CJK query parsed the way parse_user_query parses + it: copied onto every default field, title boosted + WHEN: + - The tree is analyzed with the hook + THEN: + - Each field copy is widened on its own bigram field, and the + title boost wraps the title copy's whole widened Or, so a + title bigram match scores like a title match + """ + parsed = wc.parse( + "東京", + registry=get_field_registry(None), + default_fields=_DEFAULT_SEARCH_FIELDS, + field_boosts=_FIELD_BOOSTS, + ).ast + + analyzed = _analyze(parsed) + + assert isinstance(analyzed, wc_ast.Or) + assert ( + wc_ast.Boosted( + child=_widened( + wc_ast.Term(field=_TITLE, text="東京"), + wc_ast.Term(field=_BIGRAM_TITLE, text="東京"), + ), + boost=_FIELD_BOOSTS["title"], + ) + in analyzed.children + ) + assert {_BIGRAM_CONTENT, wc.FieldRef("bigram_tag")} <= { + child.field for child in analyzed.children if isinstance(child, wc_ast.Term) + } + + def test_under_and_the_original_side_keeps_and(self) -> None: + """ + GIVEN: + - A term the content analyzer splits into two tokens + (東京・大阪), inside an And group + WHEN: + - The tree is analyzed with the hook + THEN: + - The original side still ANDs its two tokens. Wrapping the + leaf in the hook's Or must not turn that into an Or of them. + The cross-run Or flattens into the widening Or, so the + alternative is not a single child here and _widened() does + not fit; the tree is written out literally + """ + tree = wc_ast.And(children=(_content("東京・大阪"), _content("report"))) + + assert _analyze(tree) == wc_ast.And( + children=( + wc_ast.Or( + children=( + wc_ast.And(children=(_content("東京"), _content("大阪"))), + _bigram("東京"), + _bigram("大阪"), + ), + ), + _content("report"), + ), + ) + + def test_under_or_the_original_side_keeps_or(self) -> None: + """ + GIVEN: + - The same two-token term inside an Or group + WHEN: + - The tree is analyzed with the hook + THEN: + - The original side ORs its tokens, as the group says, and the + hook's Or flattens into the group + """ + tree = wc_ast.Or(children=(_content("東京・大阪"), _content("report"))) + + assert _analyze(tree) == wc_ast.Or( + children=( + _content("東京"), + _content("大阪"), + _bigram("東京"), + _bigram("大阪"), + _content("report"), + ), + ) + + @pytest.mark.parametrize( + "build", + [ + pytest.param(lambda leaf: wc_ast.Not(child=leaf), id="not"), + pytest.param( + lambda leaf: wc_ast.AndNot(positive=_content("invoice"), negative=leaf), + id="andnot", + ), + pytest.param( + lambda leaf: wc_ast.AndMaybe( + required=_content("invoice"), + optional=leaf, + ), + id="andmaybe", + ), + pytest.param( + lambda leaf: wc_ast.Require( + scored=leaf, + filter_only=_content("invoice"), + ), + id="require", + ), + pytest.param( + lambda leaf: wc_ast.Boosted(child=leaf, boost=2.0), + id="boosted", + ), + ], + ) + def test_the_widened_leaf_stays_where_it_was( + self, + build: Callable[[wc_ast.Node], wc_ast.Node], + long_cjk_run: str, + ) -> None: + """ + GIVEN: + - A CJK term under Not, AndNot, AndMaybe, Require or Boosted, + beside a latin term + WHEN: + - The tree is analyzed with the hook + THEN: + - The node keeps its type, its latin operand is untouched, and + only the CJK leaf is replaced by its widened Or, in the same + position. A negated CJK leaf is widened too, so a negation + excludes exactly what the positive search would match + """ + assert _analyze(build(_content("東京"))) == build( + _widened(_content("東京"), _bigram("東京")), + ) diff --git a/src/documents/tests/search/test_cjk_run_extraction.py b/src/documents/tests/search/test_cjk_run_extraction.py new file mode 100644 index 000000000..b1641823b --- /dev/null +++ b/src/documents/tests/search/test_cjk_run_extraction.py @@ -0,0 +1,200 @@ +"""Which characters count as part of a CJK run. + +_CJK_RE decides both what is indexed into the bigram fields +(extract_cjk_text) and how a query's CJK text is cut into runs +(_widen_cjk_leaf). A character it misses splits a word in two on both +sides. For the katakana prolonged sound mark that leaves one-character +runs, which have no bigrams, so the word could not be found through the +bigram fields at all. +""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import pytest + +from documents.search._query import extract_cjk_text + +if TYPE_CHECKING: + from collections.abc import Callable + + from documents.models import Document + + +pytestmark = pytest.mark.search + + +class TestRunExtraction: + @pytest.mark.parametrize( + ("text", "expected"), + [ + pytest.param("コーヒーを飲む", "コーヒーを飲む", id="prolonged_sound_mark"), + pytest.param("ｺｰﾋｰ", "ｺｰﾋｰ", id="halfwidth_prolonged_sound_mark"), + pytest.param("ｺﾞﾙﾌ", "ｺﾞﾙﾌ", id="halfwidth_voiced_mark"), + pytest.param("ﾊﾟﾝ", "ﾊﾟﾝ", id="halfwidth_semi_voiced_mark"), + pytest.param("締め切り〆日", "締め切り〆日", id="closing_mark"), + pytest.param("人々の生活", "人々の生活", id="iteration_mark"), + pytest.param("東京・大阪", "東京 大阪", id="interpunct_still_splits"), + pytest.param("東京、大阪", "東京 大阪", id="comma_still_splits"), + ], + ) + def test_japanese_word_marks_stay_inside_the_run( + self, + text: str, + expected: str, + ) -> None: + """ + GIVEN: + - Japanese text containing ー (U+30FC), its halfwidth form + (U+FF70), the halfwidth voiced and semi-voiced marks + (U+FF9E, U+FF9F), 〆 or 々, or a separator between two runs + WHEN: + - Its CJK runs are extracted for the bigram fields + THEN: + - The marks stay inside their word's run. Every one of them + has Unicode script Common, so the script classes alone miss + them. Punctuation such as ・ and 、 still separates runs + """ + assert extract_cjk_text(text) == expected + + +@pytest.mark.django_db +class TestProlongedSoundMarkSearch: + @pytest.mark.parametrize( + ("query", "content"), + [ + pytest.param("コーヒー", "コーヒーを飲む", id="fullwidth"), + pytest.param("サーバー", "サーバーの設定を変更", id="fullwidth_two_marks"), + pytest.param("ｺｰﾋｰ", "ｺｰﾋｰを飲む", id="halfwidth"), + ], + ) + def test_a_word_with_the_mark_is_found_inside_running_text( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + query: str, + content: str, + ) -> None: + """ + GIVEN: + - A document containing a katakana word with ー inside a + longer unspaced run, and an unrelated latin document + WHEN: + - The word is searched + THEN: + - The document matches through the bigram fields. Without the + mark in _CJK_RE, the word splits into one-character runs + with no bigrams, and only a standalone content token could + match + """ + match = index_document(title="A", content=content) + index_document(title="B", content="invoice only") + + assert matched_ids(query) == {match.pk} + + def test_not_excludes_a_word_with_the_mark( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - An "invoice" document containing コーヒー inside a longer + run, and a latin-only "invoice" document + WHEN: + - "invoice NOT コーヒー" is searched + THEN: + - Only the latin document matches: the negation excludes what + the positive search finds + """ + index_document( + title="A", + content="コーヒーを飲む invoice", + ) + latin = index_document(title="B", content="invoice only") + + assert matched_ids("invoice NOT コーヒー") == {latin.pk} + + def test_a_different_word_sharing_only_the_edges_does_not_match( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document with コード and ヒント, two separate words + WHEN: + - "コーヒー" is searched + THEN: + - Nothing matches. With ー outside _CJK_RE, both sides reduce + to runs like コ and ヒ joined by spaces, and the space + bigrams that produces could match unrelated words + """ + index_document(title="A", content="コード ヒント") + + assert matched_ids("コーヒー") == set() + + +@pytest.mark.django_db +class TestHalfwidthVoicedMarkSearch: + """Halfwidth katakana, as legacy systems and bank statements write it. + + Its voiced marks are separate codepoints with no precomposed form, so + NFC leaves them where they are and the character class has to cover + them. A word like ﾊﾟﾝ is three codepoints, and splitting it at the mark + leaves two one-character runs with no bigrams, so it is not merely + imprecise but unfindable. + """ + + @pytest.mark.parametrize( + ("query", "content"), + [ + pytest.param("ｺﾞﾙﾌ", "ｺﾞﾙﾌ場の利用料金", id="voiced_mark"), + pytest.param("ﾊﾟﾝ", "ﾊﾟﾝと牛乳の購入", id="semi_voiced_mark"), + ], + ) + def test_a_word_with_the_mark_is_found_inside_running_text( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + query: str, + content: str, + ) -> None: + """ + GIVEN: + - A document holding a halfwidth katakana word inside a longer + unspaced run, and an unrelated latin document + WHEN: + - The word is searched + THEN: + - The document matches. Without the mark in _CJK_RE the word + splits at it, and ﾊﾟﾝ in particular loses both halves to the + one-character rule and can never be found + """ + match = index_document(title="A", content=content) + index_document(title="B", content="invoice only") + + assert matched_ids(query) == {match.pk} + + def test_the_whole_word_is_searched_not_just_the_tail( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document holding ｺﾞﾙﾌ, and one holding ﾙﾌﾅﾞｰ , which + shares the ﾙﾌ pair that splitting ｺﾞﾙﾌ at its mark leaves + behind + WHEN: + - "ｺﾞﾙﾌ" is searched + THEN: + - Only the first matches. Splitting at the mark would search + the ﾙﾌ fragment alone, which silently degrades the query + into a two-character substring search + """ + golf = index_document(title="A", content="ｺﾞﾙﾌ場の利用料金") + index_document(title="B", content="ﾙﾌﾅﾞｰの修理") + + assert matched_ids("ｺﾞﾙﾌ") == {golf.pk} diff --git a/src/documents/tests/search/test_cjk_widening.py b/src/documents/tests/search/test_cjk_widening.py new file mode 100644 index 000000000..c063565ff --- /dev/null +++ b/src/documents/tests/search/test_cjk_widening.py @@ -0,0 +1,625 @@ +"""CJK terms in QUERY-mode searches, matched through their bigram fields +in place inside the parsed query. + +The content analyzer keeps an unspaced CJK run as one token, so a CJK +term is only findable through the bigram fields. Each CJK leaf is widened +where it sits, so everything around it (AND, NOT, REQUIRE, boosts, +fielding) constrains the bigram match exactly as it constrains the +original term. +""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import pytest + +from documents.models import Correspondent +from documents.models import Document + +if TYPE_CHECKING: + from collections.abc import Callable + + from pytest_django.fixtures import SettingsWrapper + + +pytestmark = [pytest.mark.search, pytest.mark.django_db] + + +class TestNegationSymmetry: + def test_not_excludes_what_the_positive_term_matches( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document whose 東京 sits inside a longer unspaced run + (indexed as one content token), and a latin-only document, + both matching "invoice" + WHEN: + - "東京" and "invoice NOT 東京" are searched + THEN: + - 東京 finds the CJK document, and NOT 東京 excludes that same + document. A content-only negation never fires here, since + the content field holds the whole run, not 東京 + """ + cjk = index_document( + title="A", + content="東京都の公共文書について invoice", + ) + latin = index_document(title="B", content="invoice only") + + assert matched_ids("東京") == {cjk.pk} + assert matched_ids("invoice NOT 東京") == {latin.pk} + + def test_bigram_approximation_is_the_same_on_both_sides( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document mentioning 東京 and 京都 separately, never 東京都 + WHEN: + - "東京都" and "invoice NOT 東京都" are searched + THEN: + - 東京都 matches it (both of its bigrams are present, and the + bigram match ignores position), and NOT 東京都 excludes it. + An accepted approximation: a query and its negation agree + """ + separate = index_document( + title="A", + content="東京 と 京都 invoice", + ) + latin = index_document(title="B", content="invoice only") + + assert matched_ids("東京都") == {separate.pk} + assert matched_ids("invoice NOT 東京都") == {latin.pk} + + @pytest.mark.parametrize( + "query", + [ + pytest.param("invoice NOT 東京都", id="term"), + pytest.param('invoice NOT "東京都"', id="phrase"), + ], + ) + def test_a_negated_multi_bigram_run_needs_every_bigram_to_exclude( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + query: str, + ) -> None: + """ + GIVEN: + - A document containing 東京都, and one containing only 京都 + (one of 東京都's two bigrams) + WHEN: + - 東京都 is excluded, as a bare term or a quoted phrase + THEN: + - Only the 東京都 document is excluded. Sharing one bigram + with the excluded run is not enough to be excluded + """ + full = index_document( + title="A", + content="東京都の公共文書について invoice", + ) + partial = index_document( + title="B", + content="京都の invoice", + ) + + assert matched_ids("invoice") == {full.pk, partial.pk} + assert matched_ids(query) == {partial.pk} + + def test_a_run_past_the_length_limit_is_matched_and_excluded( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + long_cjk_run: str, + ) -> None: + """ + GIVEN: + - A document holding a CJK run longer than the content + analyzer's remove_long limit, and a latin-only document + WHEN: + - The long run is searched bare, and excluded with NOT + THEN: + - Bare, it matches the document; negated, it excludes that + document and nothing else. The content side of the run + analyzes to nothing, which must not erase the NOT + """ + long = index_document( + title="A", + content=f"{long_cjk_run} invoice", + ) + latin = index_document(title="B", content="invoice only") + + assert matched_ids(long_cjk_run) == {long.pk} + assert matched_ids(f"invoice NOT {long_cjk_run}") == {latin.pk} + + +class TestTokenizerDroppedCodepoints: + @pytest.fixture + def invoice(self, index_document: Callable[..., Document]) -> Document: + """One latin "invoice" document, with no U+2E80 anywhere in it.""" + return index_document(title="A", content="invoice only") + + def test_a_regex_only_match_finds_nothing( + self, + invoice: Document, + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document whose content has nothing resembling U+2E80 (a + CJK Radicals Supplement codepoint that matches _CJK_RE but + that the content analyzer's simple tokenizer yields no + token for at all) + WHEN: + - "⺀" is searched + THEN: + - Nothing matches: _widen_cjk_leaf finds no pieces to widen + with and returns the leaf as it is, which analyzes to the + same nothing it always did + """ + assert matched_ids("⺀") == set() + + def test_not_a_regex_only_match_excludes_nothing( + self, + invoice: Document, + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - An "invoice" document with no U+2E80 in it + WHEN: + - "invoice NOT ⺀" is searched + THEN: + - The document still matches: the negated leaf widens to + nothing extra, exactly as an unwidened NOT of a term with + no matches would behave + """ + assert matched_ids("invoice NOT ⺀") == {invoice.pk} + + +class TestStructureConstrainsTheCjkMatch: + @pytest.fixture + def pks(self, index_document: Callable[..., Document]) -> dict[str, int]: + """One document with both 東京 and "invoice", one with only 東京.""" + return { + "both": index_document(title="A", content="東京都の請求書 invoice").pk, + "cjk_only": index_document(title="B", content="東京 report").pk, + } + + @pytest.mark.parametrize( + ("query", "expected"), + [ + pytest.param("東京 AND invoice", {"both"}, id="and"), + pytest.param("東京 REQUIRE invoice", {"both"}, id="require"), + pytest.param("東京^2 AND invoice", {"both"}, id="boosted"), + pytest.param("東京 ANDMAYBE invoice", {"both", "cjk_only"}, id="andmaybe"), + ], + ) + def test_a_latin_operand_still_constrains_the_cjk_term( + self, + matched_ids: Callable[[str], set[int]], + pks: dict[str, int], + query: str, + expected: set[str], + ) -> None: + """ + GIVEN: + - One document with both 東京 and "invoice", one with only 東京 + WHEN: + - 東京 is combined with "invoice" by AND, REQUIRE, a boosted + AND, or ANDMAYBE + THEN: + - AND and REQUIRE (boosted or not) need "invoice" too, so only + the document with both matches; ANDMAYBE leaves "invoice" + optional, so both match + """ + assert matched_ids(query) == {pks[label] for label in expected} + + +class TestFieldedTerms: + def test_a_fielded_multi_run_term_matches_through_either_run( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document with 東京 and 大阪, and one with only 東京, both + containing "report" + WHEN: + - "content:東京・大阪 AND report" is searched (the content + analyzer splits 東京・大阪 into two tokens) + THEN: + - Both match. The original side still ANDs its two content + tokens, pinned in test_cjk_leaf_rewrite.py, but the bigram + side accepts either run, so the 東京-only document comes + back through it. The AND still binds: "report" is required + of both. This is what the separate bigram clause returned + before this change + """ + both = index_document(title="A", content="東京 大阪 report") + one = index_document(title="B", content="東京 report") + + assert matched_ids("content:東京・大阪 AND report") == { + both.pk, + one.pk, + } + + def test_a_run_is_matched_wherever_it_appears_in_the_text( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document holding 大阪 and 東京 apart, inside one unspaced + run (大阪府と東京都), a document with only 東京, and one + with neither + WHEN: + - "content:東京・大阪" is searched + THEN: + - The first two match and the third does not. Each run is + searched on its own, so no bigram spanning the gap between + the runs is required, and either run on its own is enough + """ + apart = index_document(title="A", content="大阪府と東京都") + one = index_document(title="B", content="東京 report") + index_document(title="C", content="report only") + + assert matched_ids("content:東京・大阪") == {apart.pk, one.pk} + + def test_an_unfielded_multi_run_term_matches_on_either_run( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document with both CJK runs, one with only the first run, + and one with neither, all containing "invoice" + WHEN: + - The two runs are searched as one unfielded term (東京・大阪) + THEN: + - Both CJK documents match. An unfielded term is copied across + the default fields inside an Or, so the leaf's own semantics + are "either"; the bigram side matches that, and returns what + the separate bigram clause returned before this change + """ + both = index_document( + title="A", + content="大阪府と東京都の報告 invoice", + ) + one = index_document( + title="B", + content="東京都の報告書 invoice", + ) + index_document(title="C", content="invoice only") + + assert matched_ids("東京・大阪") == {both.pk, one.pk} + + def test_a_negated_multi_run_term_excludes_on_either_run( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Documents containing both runs of a glued mixed term, only + its first run, only its second run, and neither, all + containing "invoice" + WHEN: + - "invoice NOT 東京report資料" is searched + THEN: + - Only the document with neither run survives. The negation + excludes exactly what the positive term matches, and the + positive term matches on either run, so the exclusion is + wider than an "only documents holding both" reading. Today + this query excludes nothing at all + """ + index_document( + title="A", + content="東京都のreport資料です invoice", + ) + index_document(title="B", content="東京都の報告 invoice") + index_document(title="C", content="参考資料の一覧 invoice") + neither = index_document(title="D", content="invoice only") + + assert matched_ids("invoice NOT 東京report資料") == {neither.pk} + + def test_a_bigram_field_name_is_not_query_syntax( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document holding 東京 in its content + WHEN: + - A query naming an internal bigram field as a field prefix is + searched end to end (bigram_content:東京) + THEN: + - Nothing matches. The prefix is not query syntax, so the + whole thing is plain text: the literal token + "bigram_content" is required on the leaf's own field, and no + document holds it. Asserted through the real search path, so + that parsing with the emit registry instead of the public + one would fail this test. A unit-level wc.parse() assertion + would not: it pins whoosh-compat's handling of an unknown + prefix rather than our choice of parse registry + """ + index_document(title="A", content="東京都の報告書") + + assert matched_ids("bigram_content:東京") == set() + + +class TestMixedScript: + def test_separated_latin_is_required( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document with 東京 and "report" as separate words, and one + with 東京 but no "report" + WHEN: + - "東京-report" is searched (the content analyzer splits it into + 東京 and report) + THEN: + - Only the document with both matches: the latin piece is + required beside the CJK run's bigrams + """ + both = index_document(title="A", content="東京都の report") + index_document(title="B", content="東京都の invoice") + + assert matched_ids("東京-report") == {both.pk} + + def test_glued_latin_is_not_required( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document where the latin text is glued to other CJK text + (東京都のreport資料, one content token), and one with 東京 + but no "report" at all + WHEN: + - "東京report" is searched (one token: latin glued to CJK) + THEN: + - Both match through 東京's bigrams. Glued latin is only ever + indexed inside a whole unspaced token, so requiring it would + have lost the first document + """ + glued = index_document( + title="A", + content="東京都のreport資料", + ) + other = index_document( + title="B", + content="東京都の invoice", + ) + + assert matched_ids("東京report") == {glued.pk, other.pk} + + def test_not_a_separated_mixed_term_excludes_only_documents_with_both( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Three "invoice" documents: with 東京 and "report", with 東京 + only, and latin only + WHEN: + - "invoice NOT 東京-report" is searched + THEN: + - Only the document with both is excluded, not every document + mentioning 東京 + """ + index_document( + title="A", + content="東京都の report invoice", + ) + cjk_only = index_document( + title="B", + content="東京都の invoice", + ) + latin = index_document(title="C", content="invoice only") + + assert matched_ids("invoice NOT 東京-report") == { + cjk_only.pk, + latin.pk, + } + + def test_a_one_character_run_is_not_required( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document containing 大阪 but not 東 + WHEN: + - "content:東・大阪" is searched + THEN: + - It matches: a one-character run has no bigram, so only 大阪 + is required. An accepted gap, the same under NOT + """ + osaka = index_document(title="A", content="大阪府の報告書") + + assert matched_ids("content:東・大阪") == {osaka.pk} + + +class TestQuotedPhrase: + """A quoted CJK phrase must not match more than the same words unquoted. + + The bigram fields put every token at position 0, so no alternative + built from them can enforce adjacency. Requiring both runs is the + tightest thing available, and the floor: the parser's default group is + And, so anything looser would make quoting widen the search. + """ + + @pytest.fixture + def pks(self, index_document: Callable[..., Document]) -> dict[str, int]: + return { + "tokyo": index_document( + title="A", + content="東京都の報告書 invoice", + ).pk, + "osaka": index_document( + title="B", + content="大阪府の報告書 invoice", + ).pk, + "both": index_document( + title="C", + content="東京都と大阪府の報告書 invoice", + ).pk, + } + + @pytest.mark.parametrize( + "query", + [ + pytest.param("東京都 大阪府", id="unquoted"), + pytest.param('"東京都 大阪府"', id="quoted"), + ], + ) + def test_both_words_are_required_either_way( + self, + matched_ids: Callable[[str], set[int]], + pks: dict[str, int], + query: str, + ) -> None: + """ + GIVEN: + - Three documents, holding only the first word, only the + second, and both + WHEN: + - The two words are searched unquoted and as a quoted phrase + THEN: + - Only the document holding both matches, either way. Quoting + asks for more than the bare words, never less + """ + assert matched_ids(query) == {pks["both"]} + + @pytest.mark.parametrize( + "query", + [ + pytest.param("invoice NOT (東京都 大阪府)", id="unquoted"), + pytest.param('invoice NOT "東京都 大阪府"', id="quoted"), + ], + ) + def test_the_negation_excludes_only_what_the_phrase_matches( + self, + matched_ids: Callable[[str], set[int]], + pks: dict[str, int], + query: str, + ) -> None: + """ + GIVEN: + - The same three documents, all matching "invoice" + WHEN: + - The two words are excluded, grouped and as a quoted phrase + THEN: + - Only the document holding both words is excluded. The + negation is the mirror of the positive side, so a phrase + that required either word would take the two single-word + documents out with it + """ + assert matched_ids(query) == {pks["tokyo"], pks["osaka"]} + + +class TestOtherDefaultFields: + @pytest.mark.parametrize("where", ["title", "correspondent"]) + def test_not_excludes_a_cjk_match_outside_content( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + where: str, + ) -> None: + """ + GIVEN: + - An "invoice" document whose only 東京 is inside a longer run + in its title or its correspondent, and a latin-only one + WHEN: + - "invoice NOT 東京" is searched + THEN: + - The CJK document is excluded: every default field's bigram + companion is widened, not only content's + """ + kwargs: dict[str, object] = { + "title": "A", + "content": "invoice", + } + if where == "title": + kwargs["title"] = "東京都の報告書" + else: + kwargs["correspondent"] = Correspondent.objects.create(name="東京電力") + index_document(**kwargs) + latin = index_document( + title="B", + content="invoice only", + ) + + assert matched_ids("invoice NOT 東京") == {latin.pk} + + +class TestFuzzyOnGap: + @pytest.mark.parametrize( + ("query", "threshold", "expected"), + [ + pytest.param("invoice NOT 東京", None, {"latin"}, id="not_fuzzy_off"), + pytest.param("invoice NOT 東京", 0.0, {"latin", "cjk"}, id="not_fuzzy_on"), + pytest.param("東京 AND invoice", None, {"cjk"}, id="and_fuzzy_off"), + pytest.param( + "東京 AND invoice", + 0.0, + {"cjk", "cjk_only", "latin"}, + id="and_fuzzy_on", + ), + ], + ) + def test_fuzzy_on_readmits_what_the_structure_excludes( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + settings: SettingsWrapper, + query: str, + threshold: float | None, + expected: set[str], + ) -> None: + """ + GIVEN: + - An "invoice" document whose 東京 is inside a longer unspaced + run, a 東京-only document and a latin-only "invoice" + document, with fuzzy search off or on + WHEN: + - "invoice NOT 東京" or "東京 AND invoice" is searched + THEN: + - With fuzzy off, the query's structure decides. With fuzzy on, + the separate fuzzy clause matches any one of the query's + words on its own, and the exclusion restated above it is + content-only, so it re-admits what NOT and AND excluded. A + known interim gap, not a regression (both settings returned + these before), removed when fuzzy moves into the query tree + too; pinned so that change flips it deliberately + """ + settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = threshold + cjk = index_document( + title="A", + content="東京都の公共文書について invoice", + ) + cjk_only = index_document( + title="B", + content="東京都の報告書", + ) + latin = index_document(title="C", content="invoice only") + pks = {"cjk": cjk.pk, "cjk_only": cjk_only.pk, "latin": latin.pk} + + assert matched_ids(query) == {pks[label] for label in expected} diff --git a/src/documents/tests/search/test_conjunctive_negations.py b/src/documents/tests/search/test_conjunctive_negations.py index 4f4275651..8feb5f394 100644 --- a/src/documents/tests/search/test_conjunctive_negations.py +++ b/src/documents/tests/search/test_conjunctive_negations.py @@ -3,7 +3,7 @@ query excludes from every document it matches, and _any_of, the clause-list collapsing helper it feeds into. Result-level proof that a negation reached through NOT/AND survives the -fuzzy/CJK blend lives in test_query_negation.py. These are direct unit +fuzzy blend lives in test_query_negation.py. These are direct unit tests of the visitor's dispatch for the rarer grammar shapes (AndNot/Boosted/AndMaybe/Require) that file's real-corpus queries don't happen to exercise, plus the empty-clause-list case of _any_of. diff --git a/src/documents/tests/search/test_default_search_fields_guard.py b/src/documents/tests/search/test_default_search_fields_guard.py index e53c7cec7..26ff2f9d7 100644 --- a/src/documents/tests/search/test_default_search_fields_guard.py +++ b/src/documents/tests/search/test_default_search_fields_guard.py @@ -3,9 +3,9 @@ field names. Nothing enforced this before: a rename in PUBLIC_FIELDS not mirrored in ``_DEFAULT_SEARCH_FIELDS`` (documents/search/_query.py) would 400 every -unfielded search at request time, since ``index.parse_query`` and the -fuzzy/CJK clause builders are handed a field name the schema no longer -has. +unfielded search at request time, since ``index.parse_query``, the +fuzzy clause builder and the CJK bigram widening are handed a field name +the schema no longer has. """ from __future__ import annotations diff --git a/src/documents/tests/search/test_fuzzy_tokenization.py b/src/documents/tests/search/test_fuzzy_tokenization.py index 30980ef6c..7337fb63e 100644 --- a/src/documents/tests/search/test_fuzzy_tokenization.py +++ b/src/documents/tests/search/test_fuzzy_tokenization.py @@ -51,7 +51,7 @@ class TestFuzzyClauseParseFailureDegradesGracefully: THEN: - It returns None instead of propagating, so a fuzzy word string tantivy's own parser rejects only drops the fuzzy - clause: the exact/CJK clauses still stand rather than the + clause: the exact clause still stands rather than the whole query failing. The ValueError guard is insurance (the word string is plain tokens, so tantivy accepting it is expected, not assumed) diff --git a/src/documents/tests/search/test_query.py b/src/documents/tests/search/test_query.py index 74e662589..6cf9cb31f 100644 --- a/src/documents/tests/search/test_query.py +++ b/src/documents/tests/search/test_query.py @@ -522,8 +522,8 @@ class TestEmitErrorContract: THEN: - The emit failure is caught and mapped to a SearchQueryError (400) rather than propagating as a raw QueryError. This - fails at the whole-tree "exact" clause emission - (`exact = tantivy_emit(result.ast, ...)`), the same path + fails at the whole-tree "exact" clause emission (the + `tantivy_emit` call in parse_user_query), the same path TestRealQueriesRouteCorrectly::test_text_range_is_a_400_naming_the_field already covers without the NOT wrapper: `_negation_clauses` never runs here, since the whole-tree emit already raises diff --git a/src/documents/tests/search/test_query_negation.py b/src/documents/tests/search/test_query_negation.py index a12095ca2..b967da2aa 100644 --- a/src/documents/tests/search/test_query_negation.py +++ b/src/documents/tests/search/test_query_negation.py @@ -1,9 +1,10 @@ """Negation must survive the blended query. -parse_user_query ORs an exact clause with optional fuzzy and CJK clauses. -Each of those is built from positive terms only, so unless the query's -exclusions are applied to the blend as a whole, a document the exact -clause excluded is re-admitted by whichever other clause is enabled. +parse_user_query ORs an exact clause with an optional fuzzy clause. That +clause is built from positive terms only, so unless the query's exclusions +are applied to the blend as a whole, a document the exact clause excluded +is re-admitted by it. CJK terms are widened inside the exact clause itself, +so the query's own structure constrains them. """ from __future__ import annotations @@ -12,26 +13,17 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: + from collections.abc import Callable + from pytest_django.fixtures import SettingsWrapper - from documents.search._backend import TantivyBackend + from documents.models import Document + pytestmark = [pytest.mark.search, pytest.mark.django_db] -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - @pytest.fixture def fuzzy_enabled(settings: SettingsWrapper) -> None: """Enable the fuzzy blend clause. The threshold doubles as a minimum @@ -44,7 +36,8 @@ class TestNegationConstrainsEveryClause: @pytest.mark.usefixtures("fuzzy_enabled") def test_fuzzy_clause_does_not_readmit_an_excluded_document( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -59,25 +52,22 @@ class TestNegationConstrainsEveryClause: the fuzzy clause (built from positive terms only) does not readmit the document the exact clause excluded """ - secret = _index( - backend, + secret = index_document( title="Invoice A", content="invoice total secret", - checksum="neg-fuzzy-1", ) - public = _index( - backend, + public = index_document( title="Invoice B", content="invoice total public", - checksum="neg-fuzzy-2", ) - assert _matched_ids(backend, "invoice") == {secret.pk, public.pk} - assert _matched_ids(backend, "invoice NOT secret") == {public.pk} + assert matched_ids("invoice") == {secret.pk, public.pk} + assert matched_ids("invoice NOT secret") == {public.pk} - def test_cjk_clause_does_not_readmit_an_excluded_document( + def test_an_excluded_document_stays_out_of_a_cjk_match( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -87,31 +77,26 @@ class TestNegationConstrainsEveryClause: - A query combining the CJK term with a NOT exclusion is run THEN: - Only the document without the excluded word is returned; - the CJK clause legitimately carries the CJK run, so - rebuilding it from the AST cannot help here, only applying - the exclusion above the blend keeps the excluded document - out + the CJK term's bigram match sits beside the NOT inside the + same query, so the exclusion applies to it """ - secret = _index( - backend, + secret = index_document( title="Tokyo A", content="東京都の秘密です secret", - checksum="neg-cjk-1", ) - public = _index( - backend, + public = index_document( title="Tokyo B", content="東京都の報告書です public", - checksum="neg-cjk-2", ) - assert _matched_ids(backend, "東京") == {secret.pk, public.pk} - assert _matched_ids(backend, "東京 NOT secret") == {public.pk} + assert matched_ids("東京") == {secret.pk, public.pk} + assert matched_ids("東京 NOT secret") == {public.pk} @pytest.mark.usefixtures("fuzzy_enabled") def test_disjunctive_negation_still_admits_the_other_branch( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -126,73 +111,54 @@ class TestNegationConstrainsEveryClause: left branch stays in even though it contains the excluded word """ - secret_invoice = _index( - backend, + secret_invoice = index_document( title="Invoice A", content="invoice total secret", - checksum="neg-or-1", ) - unrelated = _index( - backend, + unrelated = index_document( title="Recipe", content="flour and water", - checksum="neg-or-2", ) - assert _matched_ids(backend, "invoice OR NOT secret") == { + assert matched_ids("invoice OR NOT secret") == { secret_invoice.pk, unrelated.pk, } - def test_a_negation_under_or_does_not_constrain_the_cjk_clause( + def test_a_negation_under_or_constrains_its_own_cjk_term( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: - Two CJK documents, one of which also contains a word an OR branch's own NOT excludes, plus an unrelated latin document WHEN: - - The exclusion is under a disjunctive OR branch, versus in + - The exclusion is under a disjunctive OR branch, and in conjunctive position THEN: - - Under OR, the excluded document still matches through the - CJK clause (an exclusion that is one branch's own condition - cannot be restated above the blend without dropping - documents the other branch matches, so it is left where it - is and the CJK clause stays unconstrained by it -- this - shows through here in a way it does not for latin text, - since the exact clause cannot match a CJK run at all, so - the CJK clause is the only thing matching the CJK - documents, and the excluded one comes with it) - - Under conjunctive "AND NOT", the same exclusion is hoisted - and does constrain the CJK clause, pinning the deliberate - limit of the hoist + - Either way the excluded document is left out. The CJK + term's bigram match is widened in place inside its own OR + branch, so that branch's NOT applies to it; the other + branch still admits the latin document """ - secret = _index( - backend, + secret = index_document( title="Tokyo A", content="東京都の秘密です secret", - checksum="neg-or-cjk-1", ) - public = _index( - backend, + public = index_document( title="Tokyo B", content="東京都の報告書です public", - checksum="neg-or-cjk-2", ) - bill = _index( - backend, + bill = index_document( title="Bill", content="bill payment received", - checksum="neg-or-cjk-3", ) - assert _matched_ids(backend, "(東京 AND NOT secret) OR bill") == { + assert matched_ids("(東京 AND NOT secret) OR bill") == { bill.pk, public.pk, - secret.pk, } - # The same exclusion in conjunctive position is hoisted, and does - # constrain the CJK clause. - assert _matched_ids(backend, "東京 AND NOT secret") == {public.pk} + assert matched_ids("東京 AND NOT secret") == {public.pk} + assert secret.pk in matched_ids("東京") diff --git a/src/documents/tests/search/test_unicode_normalization.py b/src/documents/tests/search/test_unicode_normalization.py new file mode 100644 index 000000000..0b12b5c94 --- /dev/null +++ b/src/documents/tests/search/test_unicode_normalization.py @@ -0,0 +1,184 @@ +"""Search text is held in one Unicode normal form on both sides. + +A bigram is a pair of codepoints, so decomposed and composed spellings of +the same Japanese word produce different bigrams. Unless the indexed text +and the query string are normalized the same way, a document written one +way is invisible to a query written the other. +""" + +from __future__ import annotations + +import unicodedata +from typing import TYPE_CHECKING + +import pytest + +from documents.models import Correspondent +from documents.models import CustomField +from documents.models import CustomFieldInstance +from documents.models import DocumentType +from documents.models import StoragePath +from documents.models import Tag +from documents.search._query import normalize_search_text + +if TYPE_CHECKING: + from collections.abc import Callable + + from documents.models import Document + from documents.search._backend import TantivyBackend + +pytestmark = [pytest.mark.search, pytest.mark.django_db] + +# がっこうの書類 ("school documents"). The が is precomposed in NFC and +# か + U+3099 in NFD, so the two spellings differ by one codepoint. +_NFC = "がっこうの書類" +_NFD = unicodedata.normalize("NFD", _NFC) +# The bare word, for fielded queries against a name or filename. +_NFC_WORD = "がっこう" +_NFD_WORD = unicodedata.normalize("NFD", _NFC_WORD) + + +class TestTheNormalizer: + def test_it_composes_decomposed_kana(self) -> None: + """ + GIVEN: + - The same word spelled decomposed and composed + WHEN: + - Each is normalized + THEN: + - Both become the composed spelling. The inputs really do + differ, so the fixture is not vacuous + """ + assert _NFD != _NFC + assert normalize_search_text(_NFD) == _NFC + assert normalize_search_text(_NFC) == _NFC + + def test_it_leaves_halfwidth_katakana_alone(self) -> None: + """ + GIVEN: + - A halfwidth katakana word carrying a voiced sound mark + WHEN: + - It is normalized + THEN: + - It is unchanged. Halfwidth katakana has no precomposed + voiced form, which is why _CJK_RE still has to list the + marks rather than rely on this + """ + assert normalize_search_text("ﾊﾟﾝ") == "ﾊﾟﾝ" + + +class TestEitherSpellingFindsEither: + @pytest.mark.parametrize( + "content", + [ + pytest.param(_NFC, id="composed_document"), + pytest.param(_NFD, id="decomposed_document"), + ], + ) + @pytest.mark.parametrize( + "query", + [ + pytest.param("がっこう", id="composed_query"), + pytest.param( + unicodedata.normalize("NFD", "がっこう"), + id="decomposed_query", + ), + ], + ) + def test_a_document_is_found_whichever_way_each_side_is_spelled( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + content: str, + query: str, + ) -> None: + """ + GIVEN: + - A document holding the word inside a longer unspaced run, + spelled composed or decomposed, and an unrelated document + WHEN: + - The word is searched, spelled composed or decomposed + THEN: + - It matches in all four combinations. Without normalizing + both sides, the decomposed run splits at the combining mark + and the two spellings produce different bigrams + """ + match = index_document(title="A", content=content) + index_document(title="B", content="invoice only") + + assert matched_ids(query) == {match.pk} + + +class TestEverySearchableFieldIsNormalized: + """The query side is normalized in _parse_query, so every searchable + field has to be normalized on the way in as well. + + A field left out is worse than normalizing nothing: both sides used to + be decomposed and matched each other, so normalizing only the query + turns a working search into no results. original_filename is the one + most likely to hold NFD in practice, since macOS stores filenames + decomposed. + """ + + @pytest.mark.parametrize( + "field", + [ + pytest.param("title", id="title"), + pytest.param("content", id="content"), + pytest.param("original_filename", id="original_filename"), + pytest.param("correspondent", id="correspondent"), + pytest.param("document_type", id="document_type"), + pytest.param("storage_path", id="storage_path"), + pytest.param("tag", id="tag"), + pytest.param("custom_fields.value", id="custom_field"), + ], + ) + def test_a_composed_query_finds_a_decomposed_value( + self, + backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + field: str, + ) -> None: + """ + GIVEN: + - A document carrying a decomposed Japanese word in one + searchable field, and an unrelated document + WHEN: + - The composed spelling is searched, fielded to that field + THEN: + - The document matches. The query is normalized either way, so + a field left unnormalized on the way in can never be found + """ + kwargs: dict[str, object] = {"title": "A", "content": "invoice"} + if field == "correspondent": + kwargs["correspondent"] = Correspondent.objects.create(name=_NFD_WORD) + elif field == "document_type": + kwargs["document_type"] = DocumentType.objects.create(name=_NFD_WORD) + elif field == "storage_path": + kwargs["storage_path"] = StoragePath.objects.create( + name=_NFD_WORD, + path="archive/", + ) + elif field in {"title", "content", "original_filename"}: + kwargs[field] = _NFD_WORD + + doc = index_document(**kwargs) + + if field == "tag": + doc.tags.add(Tag.objects.create(name=_NFD_WORD)) + elif field == "custom_fields.value": + CustomFieldInstance.objects.create( + document=doc, + field=CustomField.objects.create( + name="Note", + data_type=CustomField.FieldDataType.STRING, + ), + value_text=_NFD_WORD, + ) + # The relations above are attached after the factory built the + # document, so the index needs the newer state. + backend.add_or_update(doc) + index_document(title="B", content="invoice only") + + assert matched_ids(f"{field}:{_NFC_WORD}") == {doc.pk} diff --git a/uv.lock b/uv.lock index fdaaf276a..0424c276a 100644 --- a/uv.lock +++ b/uv.lock @@ -3089,7 +3089,7 @@ requires-dist = [ { name = "torch", specifier = "~=2.13.0", index = "https://download.pytorch.org/whl/cpu" }, { name = "watchfiles", specifier = ">=1.2" }, { name = "whitenoise", specifier = "~=6.11" }, - { name = "whoosh-compat", extras = ["tantivy"], specifier = "==0.2" }, + { name = "whoosh-compat", extras = ["tantivy"], specifier = "==0.3" }, { name = "zxing-cpp", specifier = "~=3.1.0" }, ] provides-extras = ["mariadb", "postgres", "webserver"] @@ -5640,14 +5640,14 @@ wheels = [ [[package]] name = "whoosh-compat" -version = "0.2.0" +version = "0.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "python-dateutil" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/d7/b2/ef410aa5297d61e9e98448f88ea9385c92840d811e0878de2f9ed2710620/whoosh_compat-0.2.0.tar.gz", hash = "sha256:f5d1b8bf2956a304c9b9c147ec840f2487d976cb7fa872bea767dcdeed7c3e45", size = 605669, upload-time = "2026-08-27T20:30:08.154Z" } +sdist = { url = "https://files.pythonhosted.org/packages/23/6b/945311159351411dd5a1de82f2948fe1ef6bf36308ee65ed76f568b94a7a/whoosh_compat-0.3.0.tar.gz", hash = "sha256:a7590ea0f178c60ca83774752d0d511c5d72b20357bbf361223aaab12e3d1813", size = 665922, upload-time = "2026-09-16T15:46:29.852Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/3f/78e37cd794ae26ee9b94d81d608906a8aefa31a08897ef3aaeafcbb3a55a/whoosh_compat-0.2.0-py3-none-any.whl", hash = "sha256:891e98508042673862516d3811e010a62205998a31ae6e09b80a221eb8d544d3", size = 158514, upload-time = "2026-08-27T20:30:06.764Z" }, + { url = "https://files.pythonhosted.org/packages/53/b0/538c7bdcd294ae32f1f6a13ab6486887e208567355820e4a24a56c4558c2/whoosh_compat-0.3.0-py3-none-any.whl", hash = "sha256:91e22de08fc22be50fc90f836c72d45de9c7a552f61465ffd1ebee98a6b28cfb", size = 170602, upload-time = "2026-09-16T15:46:28.227Z" }, ] [package.optional-dependencies] From 20d309a413b79324f29c13faf26cba0799d9deff Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:55:13 -0700 Subject: [PATCH 062/258] Enhancement: Match fuzzy terms in place inside the parsed query (#14157) * Feature: match fuzzy terms in place inside the parsed query Fuzzy matching was a separate clause OR'd in above the query: a flat bag of the query's words, re-parsed through tantivy's own parser, blended beside the exact clause. Nothing around a term reached it, so a fielded term fuzzed across every default field, a filter did not constrain it, and an exclusion had to be hoisted back over the whole blend to stop the clause re-admitting what the query had just excluded. Widen each leaf where it sits instead, through emit()'s rewrite_leaf hook, so fielding, negation, AND, REQUIRE and positive filters constrain the fuzzy match exactly as they constrain the exact one. Each of a leaf's words becomes a Fuzzy leaf on the leaf's own field, boosted to 0.1, beside the leaf and any CJK alternative it already had. * Hello? --- docs/configuration.md | 2 + pyproject.toml | 2 +- src/documents/search/_query.py | 465 ++++++++--------- src/documents/tests/search/test_acceptance.py | 15 +- src/documents/tests/search/test_any_of.py | 43 ++ src/documents/tests/search/test_cjk_clause.py | 14 +- .../tests/search/test_cjk_leaf_rewrite.py | 7 +- .../tests/search/test_cjk_run_extraction.py | 2 +- .../tests/search/test_cjk_widening.py | 21 +- .../search/test_conjunctive_negations.py | 149 ------ .../tests/search/test_fuzzy_alternative.py | 226 +++++++++ .../tests/search/test_fuzzy_scoring.py | 134 +++++ .../tests/search/test_fuzzy_tokenization.py | 127 +++-- .../tests/search/test_fuzzy_widening.py | 467 ++++++++++++++++++ .../tests/search/test_negated_leaf_ids.py | 208 ++++++++ src/documents/tests/search/test_query.py | 21 +- src/documents/tests/search/test_widen_leaf.py | 133 +++++ 17 files changed, 1522 insertions(+), 514 deletions(-) create mode 100644 src/documents/tests/search/test_any_of.py delete mode 100644 src/documents/tests/search/test_conjunctive_negations.py create mode 100644 src/documents/tests/search/test_fuzzy_alternative.py create mode 100644 src/documents/tests/search/test_fuzzy_scoring.py create mode 100644 src/documents/tests/search/test_fuzzy_widening.py create mode 100644 src/documents/tests/search/test_negated_leaf_ids.py create mode 100644 src/documents/tests/search/test_widen_leaf.py diff --git a/docs/configuration.md b/docs/configuration.md index 315188520..c7cf69366 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1279,6 +1279,8 @@ Tantivy stemmer equivalent, stemming is disabled. matching. Fuzzy results rank below exact matches. A value of `0.5` is a reasonable starting point. Leave unset to disable fuzzy matching entirely. + Words of a single character are not fuzzy-matched, since a single-character approximate match would match nearly every term in the index. + Defaults to unset (disabled). #### [`PAPERLESS_SANITY_TASK_CRON=`](#PAPERLESS_SANITY_TASK_CRON) {#PAPERLESS_SANITY_TASK_CRON} diff --git a/pyproject.toml b/pyproject.toml index 6d6f9ada6..2027e5f8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -247,7 +247,7 @@ per-file-ignores."src/documents/models.py" = [ isort.force-single-line = true [tool.codespell] -ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober,commitish,NIN,nin" +ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober,commitish,NIN,nin,reprot" skip = """\ src-ui/src/locale/*,src-ui/pnpm-lock.yaml,src-ui/e2e/*,src/paperless_mail/tests/samples/*,src/paperless/tests/samples\ /mail/*,src/documents/tests/samples/*,*.po,*.json\ diff --git a/src/documents/search/_query.py b/src/documents/search/_query.py index 87a7ff10b..b2c21879e 100644 --- a/src/documents/search/_query.py +++ b/src/documents/search/_query.py @@ -1,5 +1,6 @@ from __future__ import annotations +import functools import logging import unicodedata from functools import cache @@ -22,6 +23,7 @@ from documents.search._errors import MultipleSearchQueryErrors from documents.search._errors import SearchQueryError from documents.search._registry import get_field_registry from documents.search._tokenizer import _bigram_analyzer +from documents.search._tokenizer import paperless_text_analyzer from documents.search._tokenizer import simple_search_tokens if TYPE_CHECKING: @@ -164,10 +166,9 @@ def _parse_cjk_text( try: return index.parse_query(cjk_text, fields) except Exception: - # Broad on purpose, unlike _try_parse_fuzzy_query's narrower - # ValueError: cjk_text isn't filtered to a guaranteed-safe token - # set the way the fuzzy blend's word string is, so the exact - # failure mode tantivy could raise here isn't pinned down. + # Broad on purpose: cjk_text isn't filtered to a guaranteed-safe + # token set, so the exact failure mode tantivy could raise here + # isn't pinned down. logger.debug( "Skipping CJK search clause: could not parse CJK text: %r", cjk_text, @@ -196,110 +197,6 @@ def _build_cjk_query( return _parse_cjk_text(index, cjk_text, fields) -# A joined fuzzy word string must stay plain words: it goes back through -# tantivy's own query parser, and the raw query text the clause collects -# routinely carries characters that parser reads as grammar (a colon, a -# bracket, a quote, a leading -). Each token is cut into its word runs and -# only those are kept, so no field syntax, pattern, range or grouping can -# reach the parser. Cutting rather than dropping the whole token is what -# keeps ordinary hyphenated, dotted and quoted input ("COVID-19", -# "hello@example.com", "tax reports") contributing to the clause at all. -_WORD_RUN_RE = regex.compile(r"\w+") - -# The one piece of tantivy grammar that survives the cut: its boolean -# keywords are themselves word runs. Only these exact spellings are -# grammar there ("And"/"and" are ordinary terms), so lowercasing exactly -# these turns them back into the ordinary terms the field analyzer used to -# make of them, before the clause switched to raw text. Left alone, a -# quoted phrase would silently restructure the clause ("tax AND reports" -# becoming a conjunction) or fail to parse and drop it entirely -# ("tax AND", or "IN" anywhere). -# -# Only these words are touched: tantivy lowercases query terms with the -# field's own analyzer, and doing it ourselves first is not always the -# same operation (Python folds a final sigma to a different letter than -# tantivy does, and turns Turkish 'İ' into a sequence tantivy then splits -# in two), which would search for terms the index does not contain. -_TANTIVY_KEYWORDS: Final[frozenset[str]] = frozenset({"AND", "OR", "NOT", "IN"}) - - -def _try_parse_fuzzy_query( - index: tantivy.Index, - ast: wc.ast.Node, - registry: wc.FieldRegistry, -) -> tantivy.Query | None: - """Build the fuzzy blend clause from the parsed query's free-text - words, or None if it has none. - - The clause is built by handing tantivy's own query parser a plain - word string (there's no clean AST-level fuzzy equivalent to - whoosh-compat's parse tree, and fuzzy matching was always an - approximate, secondary, 0.1-boosted clause). The words come from - whoosh_compat's ``free_text_tokens`` over the already-parsed AST, - never from the raw query string: raw whoosh grammar (date keywords, - ``[2005 to 2009]`` ranges, bracket-class wildcards) is not tantivy - syntax, and feeding it here used to knock the fuzzy clause out for - the whole query the moment any such construct appeared alongside a - typo'd word. The helper also keeps excluded terms out: a ``NOT``'d - word must not resurface through the fuzzy clause. - - Chosen trade-off: a term explicitly fielded on one of the default - search fields (``correspondent:acme``) contributes its text to the - word string UNFIELDED, so the fuzzy clause searches it across all - default fields rather than just the one the user named. That is - recall-only widening on a secondary 0.1-boosted clause the score - threshold already disciplines, accepted in exchange for never feeding - field syntax to tantivy's parser. What the word string guarantees is - exactly that: no field prefix, pattern, range, grouping or quoting - survives, and the boolean keywords that do survive (they are word - runs) are lowercased into ordinary terms; see _TANTIVY_KEYWORDS. - - The words are the query's RAW text, not the analyzer's output - (``analyzed=False``), because ``index.parse_query`` analyzes whatever - it is given and analysis is not idempotent: ``universities`` stems to - ``univers``, and handing that back stems it again to ``univ``, a term - the index does not contain. ``prefix=True`` hid this as over-broad - matching (``univ`` also prefixes ``unicycle``) rather than as no - matches at all. Raw text is untokenized, which is why it is cut into - word runs above rather than taken whole. - - The ValueError guard stays as insurance (the word string is plain - tokens, so tantivy accepting it is expected, not assumed): on a parse - failure the fuzzy clause is skipped and the exact clause stands, - rather than the whole query failing. - """ - tokens = wc.free_text_tokens( - ast, - registry=registry, - fields=_DEFAULT_SEARCH_FIELDS, - analyzed=False, - ) - words = list( - dict.fromkeys( - word.lower() if word in _TANTIVY_KEYWORDS else word - for token in tokens - for word in _WORD_RUN_RE.findall(token) - ), - ) - if not words: - return None - fuzzy_text = " ".join(words) - try: - return index.parse_query( - fuzzy_text, - _DEFAULT_SEARCH_FIELDS, - field_boosts=_FIELD_BOOSTS, - fuzzy_fields={f: (True, 1, True) for f in _DEFAULT_SEARCH_FIELDS}, - ) - except ValueError: - logger.debug( - "Skipping fuzzy search clause: token string is not valid " - "tantivy query syntax: %r", - fuzzy_text, - ) - return None - - _DEFAULT_SEARCH_FIELDS: Final[list[str]] = [ "title", "content", @@ -322,8 +219,8 @@ _SIMPLE_FIELD_BOOSTS = {"simple_title": 2.0} @cache def _get_emit_field_registry(language: str | None) -> wc.FieldRegistry: """The parse registry plus the CJK bigram fields, for analyzing and - emitting a query whose CJK leaves _widen_cjk_leaf has widened. Cached - per language, on the same trigger get_field_registry() rebuilds on. + emitting a query whose leaves _widen_leaf has widened. Cached per + language, on the same trigger get_field_registry() rebuilds on. Never used to parse: the bigram fields are internal (absent from PUBLIC_FIELDS), and queries are still parsed against @@ -370,32 +267,30 @@ def _collapse( return node_cls(children=tuple(children), **span) -def _widen_cjk_leaf(leaf: wc.ast.Term | wc.ast.Phrase) -> wc.ast.Node: - """``rewrite_leaf`` hook for emit(): widen a CJK term or phrase on a - default search field to ``Or(leaf, alternative)`` where it sits, and - leave every other leaf as it is. +def _leaf_span(leaf: wc.ast.Term | wc.ast.Phrase) -> dict[str, int | None]: + """The startchar/endchar kwargs a leaf's alternatives are built with, + so a rewritten leaf still points at the same span of the original + query text.""" + return {"startchar": leaf.startchar, "endchar": leaf.endchar} + + +def _cjk_alternative(leaf: wc.ast.Term | wc.ast.Phrase) -> wc.ast.Node | None: + """Build the bigram alternative for a CJK leaf, or None if it gets none. The content analyzer keeps an unspaced CJK run as one token, so only - the bigram fields can find a CJK term inside running text. Widening in - place, rather than OR-ing a separate bigram clause in at the top, keeps - every AND, NOT, REQUIRE, boost and field restriction around the leaf - applying to its bigram match too. analyze() calls this for negated - leaves as well, and they are widened on purpose, so ``NOT X`` excludes - exactly what ``X`` matches. + the bigram fields can find a CJK term inside running text. The alternative is built from the leaf's own text, split where the content analyzer would split it. What each kind of piece contributes, and how the pieces combine, is commented at the step that decides it. - - analyze() only offers Term and Phrase leaves, so Prefix and Wildcard - patterns are never widened. + None means there was nothing to build one from. """ if leaf.field is None or leaf.field.name not in _CJK_BIGRAM_FIELDS: - return leaf + return None text = str(leaf.text) if not _has_cjk(text): - return leaf - span = {"startchar": leaf.startchar, "endchar": leaf.endchar} + return None + span = _leaf_span(leaf) bigram_field = wc.FieldRef(_CJK_BIGRAM_FIELDS[leaf.field.name]) cjk_terms: list[wc.ast.Node] = [] latin_terms: list[wc.ast.Node] = [] @@ -432,91 +327,160 @@ def _widen_cjk_leaf(leaf: wc.ast.Term | wc.ast.Phrase) -> wc.ast.Node: if not pieces: # A few hundred codepoints match _CJK_RE but yield no token at all # from the simple tokenizer (CJK radicals, circled and squared - # forms), leaving nothing to widen with. The leaf then analyzes to - # the same nothing it does today. - return leaf + # forms), leaving nothing to widen with. The caller then leaves the + # leaf as it is, and it analyzes to the same nothing it does today. + return None # Separated latin is required alongside the CJK side, which is what # stops "invoice NOT 東京-report" from excluding every 東京 document. - alternative = _collapse(wc.ast.And, pieces, span) + return _collapse(wc.ast.And, pieces, span) + + +# The index analyzer minus stemming: the same word boundaries and the same +# drops (remove_long, characters the simple tokenizer discards). The field's +# pattern_normalizer does the one stemming step. +_FUZZY_WORD_SPLITTER: Final = paperless_text_analyzer(None) + + +def _fuzzy_alternative(leaf: wc.ast.Term | wc.ast.Phrase) -> wc.ast.Node | None: + """Build the near-match alternative for a leaf, or None if it gets none. + + Each of the leaf's words becomes a Fuzzy leaf on the leaf's own field. + A Term's words are OR'd, which is the per-word recall the old clause + had and what lets ``COVID-19`` match on one half. A Phrase's are + AND-ed: quoting asks for more than the bare words, so an Or there + would make a quoted phrase match strictly more than the same words + unquoted. Adjacency is out of reach either way, so requiring every + word is the floor. + + Words come from the index analyzer minus its stemmer, so a leaf gets a + fuzzy side exactly when its exact side has tokens. A regex split would + keep words the index never holds (``__``, or a word past remove_long), + whose exact side analyzes to nothing, leaving a required fuzzy clause + that can never match. + + Words of one character are skipped: with prefix matching, a + one-character fuzzy term matches every term in the field. + + CJK words are skipped entirely. The content analyzer keeps an unspaced + CJK run as one token, so a prefix Fuzzy over it matches any run within + one edit of its start: ``東京`` would match a document holding only + ``京都の観光案内``, the very thing the bigram fields' multitoken=AND + exists to prevent (see _get_emit_field_registry). A two-character CJK + word is as broad here as the one-character word the length guard + already rejects, and _cjk_alternative supplies the in-run recall + anyway, so there is nothing to gain and precision to lose. + + Fuzzy text goes through the field's pattern_normalizer rather than its + analyzer, and the splitter's output is already lowercased and folded, + so the word is stemmed exactly once. + """ + words = [ + word + for word in _FUZZY_WORD_SPLITTER.analyze(str(leaf.text)) + if len(word) > 1 and not _has_cjk(word) + ] + if not words: + return None + span = _leaf_span(leaf) + group = wc.ast.And if isinstance(leaf, wc.ast.Phrase) else wc.ast.Or + leaves: list[wc.ast.Node] = [ + wc.ast.Fuzzy(field=leaf.field, text=word, distance=1, prefix=True, **span) + for word in words + ] + return _collapse(group, leaves, span) + + +def _widen_leaf( + leaf: wc.ast.Term | wc.ast.Phrase, + *, + fuzzy: bool, + negated: frozenset[int], +) -> wc.ast.Node: + """``rewrite_leaf`` hook for emit(): widen a leaf on a default search + field to ``Or(leaf, alternatives...)`` where it sits, and leave every + other leaf as it is. + + Widening in place, rather than OR-ing a separate clause in at the top, + keeps every AND, NOT, REQUIRE, boost, field restriction and positive + filter around the leaf applying to its widened match too. + + A leaf can gain a CJK alternative, a fuzzy one, or both. A negated + leaf keeps its CJK alternative, because NOT X should exclude exactly + what X matches, but gets no fuzzy one: with prefix matching, NOT tax + would otherwise exclude "taxi" and "taxonomy". Negated leaves are + identified by identity through the pre-scan, since the hook cannot see + a leaf's context. + + analyze() only offers Term and Phrase leaves, so Prefix and Wildcard + patterns are never widened. + """ + if leaf.field is None or leaf.field.name not in _DEFAULT_SEARCH_FIELDS: + return leaf + span = _leaf_span(leaf) + alternatives: list[wc.ast.Node] = [] + cjk = _cjk_alternative(leaf) + if cjk is not None: + alternatives.append(cjk) + if fuzzy and id(leaf) not in negated: + near = _fuzzy_alternative(leaf) + if near is not None: + alternatives.append(wc.ast.Boosted(child=near, boost=0.1, **span)) + if not alternatives: + return leaf # The leaf itself, not a copy: analyze() then keeps it combined the way # its enclosing group says rather than the way this Or would, and a long # run its analyzer drops to nothing leaves just the alternative. - return wc.ast.Or(children=(leaf, alternative), **span) + return wc.ast.Or(children=(leaf, *alternatives), **span) -class _ConjunctiveNegations(wc.ast.Visitor[tuple["wc.ast.Node", ...]]): - """Collect the subtrees an AST excludes from every document it matches. +def _negated_leaf_ids(node: wc.ast.Node) -> frozenset[int]: + """Return the id() of every Term and Phrase under a negation. - A negation reached through ``And``/``AndNot``/``Require`` (and through - the required half of an ``AndMaybe``) constrains the whole query, so it - can be re-stated above the blend. ``Or`` is deliberately not descended - into: in ``invoice OR NOT secret`` the negation is one branch's own - condition, and hoisting it would throw away documents the other branch - matches. Nor is a collected subtree descended into, since a negation - inside a negation is not an exclusion. + A negated leaf keeps its CJK alternative but gets no fuzzy one, and + the hook cannot see a leaf's context, so the tree is walked once here + and the hook compares by identity. analyze() guarantees it is handed + the input tree's own leaf objects, which is what makes identity work. - Node types with no negation to contribute (every leaf, ``Or``) fall - through to ``generic_visit``. + Negative positions are Not.child and AndNot.negative, and nothing + else in the node set. Leaves are collected at any depth and under any + number of negations: over-collecting costs a widening, while missing + a negated leaf would let NOT tax exclude "taxi". + + Iterative, and total over node types: this runs outside emit()'s + error conversion, so an exception here would reach the generic 500 + handler. """ - - def generic_visit(self, node: wc.ast.Node) -> tuple[wc.ast.Node, ...]: - return () - - def visit_not(self, node: wc.ast.Not) -> tuple[wc.ast.Node, ...]: - return (node.child,) - - def visit_andnot(self, node: wc.ast.AndNot) -> tuple[wc.ast.Node, ...]: - return (*self.visit(node.positive), node.negative) - - def visit_and(self, node: wc.ast.And) -> tuple[wc.ast.Node, ...]: - return tuple( - negation for child in node.children for negation in self.visit(child) - ) - - def visit_boosted(self, node: wc.ast.Boosted) -> tuple[wc.ast.Node, ...]: - return self.visit(node.child) - - def visit_andmaybe(self, node: wc.ast.AndMaybe) -> tuple[wc.ast.Node, ...]: - return self.visit(node.required) - - def visit_require(self, node: wc.ast.Require) -> tuple[wc.ast.Node, ...]: - return (*self.visit(node.scored), *self.visit(node.filter_only)) + negated: set[int] = set() + stack: list[tuple[wc.ast.Node, bool]] = [(node, False)] + while stack: + current, under_negation = stack.pop() + if isinstance(current, (wc.ast.Term, wc.ast.Phrase)): + if under_negation: + negated.add(id(current)) + elif isinstance(current, wc.ast.Not): + stack.append((current.child, True)) + elif isinstance(current, wc.ast.AndNot): + stack.append((current.positive, under_negation)) + stack.append((current.negative, True)) + elif isinstance(current, wc.ast.AndMaybe): + stack.append((current.required, under_negation)) + stack.append((current.optional, under_negation)) + elif isinstance(current, wc.ast.Require): + stack.append((current.scored, under_negation)) + stack.append((current.filter_only, under_negation)) + elif isinstance(current, wc.ast.Boosted): + stack.append((current.child, under_negation)) + elif isinstance(current, (wc.ast.And, wc.ast.Or)): + stack.extend((child, under_negation) for child in current.children) + return frozenset(negated) -def _negation_clauses( - index: tantivy.Index, - ast: wc.ast.Node, - registry: wc.FieldRegistry, -) -> list[tuple[tantivy.Occur, tantivy.Query]]: - """MustNot clauses for everything ``ast`` excludes conjunctively. - - Each excluded subtree is emitted as its own positive query and attached - with ``MustNot``, rather than emitting a negative query and hoping - tantivy accepts a bare one. - - The except branch has no reachable trigger under the current control - flow: this only runs after parse_user_query has already emitted the - exact clause from the whole parsed AST (widened, when the query has CJK - text), and every subtree ``_ConjunctiveNegations`` collects here is a - piece of that same parsed tree. The re-emit here uses the public - registry, without the widening hook, while the exact clause was emitted - against ``_get_emit_field_registry()``; the two registries agree on - every public field, and the hook only adds nodes, so this does not - reopen the branch. Kept as insurance, not dead weight: re-emitting a - subtree in isolation is not proven identical to emitting it in context, - just believed to be, and this is the seam that finds out if that - belief is ever wrong. - """ - try: - return [ - ( - tantivy.Occur.MustNot, - tantivy_emit(negation, index=index, registry=registry), - ) - for negation in _ConjunctiveNegations().visit(ast) - ] - except QueryError as e: # pragma: no cover - raise _map_emit_error(e) from e +# Weight of the tiebreak clause that restores relevance ordering among +# near-miss results. The widened tree is const-scored so the threshold +# cannot cut a near-miss by the BM25 spread of the query's correctly +# spelled words; this small share of its real score orders them again. +# A BM25 spread above 0.1/_FUZZY_TIEBREAK can still cut one. +_FUZZY_TIEBREAK: Final[float] = 0.01 def _any_of(clauses: list[tuple[tantivy.Occur, tantivy.Query]]) -> tantivy.Query: @@ -567,8 +531,8 @@ def parse_user_query( tz: tzinfo, ) -> tantivy.Query: """ - Parse user query through whoosh-compat, widen CJK terms, then blend in - the optional fuzzy clause. + Parse user query through whoosh-compat, then widen its leaves and emit, + once or twice depending on whether fuzzy matching is on. 1. wc.parse() against the shared FieldRegistry (whoosh grammar -> AST). Bare notes:/custom_fields: prefixes resolve to their default subpath @@ -577,31 +541,23 @@ def parse_user_query( 2. Any diagnostics (bad dates/numbers) map to SearchQueryError subclasses and raise, the view returns HTTP 400 with every offending field listed, not just the first. - 3. When the query has CJK text, emit()'s rewrite_leaf hook - (_widen_cjk_leaf) rewrites each CJK term in the AST to also match - its bigram field, in place, so the rest of the query constrains the - bigram match too. The tree is analyzed and emitted against - _get_emit_field_registry(), which adds the bigram fields; the query - itself was parsed without them. + 3. With fuzzy off, the AST is emitted once. If the query has CJK text, + emit()'s rewrite_leaf hook (_widen_leaf) rewrites each CJK term in + the AST to also match its bigram field, in place, so the rest of + the query constrains the bigram match too. With fuzzy on, the AST + is emitted twice through the same hook: once with fuzzy=True for + the widened tree used as a filter, and once with fuzzy=False for a + normally scored tree, and the two are blended into a boolean query + (see the comment above the blend for why). Either way the tree is + analyzed and emitted against _get_emit_field_registry() whenever + CJK or fuzzy widening applies, which adds the bigram fields; the + query itself was parsed without them. emit() turns the AST into a tantivy.Query directly (no string round-trip). A QueryError is routed by its Diagnostic's Cause (_map_emit_error): a construct that parses but can't execute against tantivy (e.g. a text-field range) is a 400, a registry/schema mismatch is logged and re-raised, and an INTERNAL defect is re-raised. - 4. Optional fuzzy blend (ADVANCED_FUZZY_SEARCH_THRESHOLD) builds a - plain word string from the parsed AST's free-text tokens - (whoosh_compat.free_text_tokens) and feeds THAT to - index.parse_query, never raw_query, whose whoosh grammar (date - keywords, bracket-class wildcards, etc.) tantivy's parser rejects, - which used to silently knock the fuzzy clause out of any mixed - query (see _try_parse_fuzzy_query). - 5. When the fuzzy clause was added, the query's conjunctive exclusions - are restated as MustNot above the blend (_negation_clauses): a - clause built from positive terms cannot express them, and as a bare - Should it would undo them. The restated exclusions come from the - unwidened AST, so they are content-only for CJK terms: a known gap - that goes away once fuzzy is also widened in the tree. """ registry = get_field_registry(settings.SEARCH_LANGUAGE) result = wc.parse( @@ -614,44 +570,53 @@ def parse_user_query( if result.diagnostics: raise _diagnostics_to_error(result.diagnostics) - emit_registry, rewrite_leaf = registry, None - if _has_cjk(raw_query): - emit_registry = _get_emit_field_registry(settings.SEARCH_LANGUAGE) - rewrite_leaf = _widen_cjk_leaf - try: - exact = tantivy_emit( + fuzzy_on = settings.ADVANCED_FUZZY_SEARCH_THRESHOLD is not None + cjk = _has_cjk(raw_query) + emit_registry = ( + _get_emit_field_registry(settings.SEARCH_LANGUAGE) + if cjk or fuzzy_on + else registry + ) + negated = _negated_leaf_ids(result.ast) if fuzzy_on else frozenset() + + def emit_widened(*, fuzzy: bool) -> tantivy.Query: + hook = ( + functools.partial(_widen_leaf, fuzzy=fuzzy, negated=negated) + if cjk or fuzzy + else None + ) + return tantivy_emit( result.ast, index=index, registry=emit_registry, - rewrite_leaf=rewrite_leaf, + rewrite_leaf=hook, ) + + try: + if not fuzzy_on: + return emit_widened(fuzzy=False) + widened = emit_widened(fuzzy=True) + scored = emit_widened(fuzzy=False) except QueryError as e: raise _map_emit_error(e) from e - clauses: list[tuple[tantivy.Occur, tantivy.Query]] = [ - (tantivy.Occur.Should, exact), - ] - - threshold = settings.ADVANCED_FUZZY_SEARCH_THRESHOLD - if threshold is not None: - fuzzy = _try_parse_fuzzy_query(index, result.ast, registry) - if fuzzy is not None: - clauses.append( - (tantivy.Occur.Should, tantivy.Query.boost_query(fuzzy, 0.1)), - ) - - if len(clauses) == 1: - return exact - # The fuzzy clause is built from positive terms only, so as a plain - # Should beside the exact clause it re-admits exactly the documents the - # query excluded. Restate the exclusions once, above the whole blend. - # Redundant against the exact clause, which already carries them, but - # idempotently so. - negations = _negation_clauses(index, result.ast, registry) - if not negations: - return _any_of(clauses) + # The widened tree supplies the matched set at a flat score, so a + # near-miss is not ranked by how well the query's correctly spelled + # words matched. The CJK-only tree adds real scoring back for what + # matched exactly, and the last clause reintroduces the widened tree's + # own scoring at a small weight so near-misses still rank among + # themselves. const_score_query discards every boost inside it, the + # title field's 2.0 included, so a title match earns its boost through + # the second and third clauses rather than the first. return tantivy.Query.boolean_query( - [(tantivy.Occur.Must, _any_of(clauses)), *negations], + [ + (tantivy.Occur.Must, tantivy.Query.const_score_query(widened, 0.1)), + (tantivy.Occur.Should, scored), + ( + tantivy.Occur.Should, + tantivy.Query.boost_query(widened, _FUZZY_TIEBREAK), + ), + ], ) diff --git a/src/documents/tests/search/test_acceptance.py b/src/documents/tests/search/test_acceptance.py index 4372d943b..10fd41fc8 100644 --- a/src/documents/tests/search/test_acceptance.py +++ b/src/documents/tests/search/test_acceptance.py @@ -261,10 +261,10 @@ class TestUnregisteredIdFieldFoldsToLiteralText: class TestFuzzyBlendSurvivesWhooshGrammar: """A query mixing whoosh-only grammar (a date keyword) with a typo'd free-text word must still fuzzy-match the intended document when - ADVANCED_FUZZY_SEARCH_THRESHOLD is enabled. The fuzzy clause is built - from the parsed query's free-text tokens (whoosh_compat's - free_text_tokens), never from the raw query string, so whoosh grammar - that tantivy's own parser rejects cannot knock the fuzzy clause out.""" + ADVANCED_FUZZY_SEARCH_THRESHOLD is enabled. Fuzzy widening happens + inside the already-parsed AST (_widen_leaf, via emit()), never by + re-parsing the raw query string, so whoosh grammar that tantivy's own + parser rejects cannot knock the fuzzy side out.""" def test_typo_fuzzy_matches_alongside_date_keyword( self, @@ -280,11 +280,10 @@ class TestFuzzyBlendSurvivesWhooshGrammar: rejects ("added:today") with a one-transposition misspelling of a word in the indexed content THEN: - - The document still matches, because the fuzzy clause is - built from the parsed query's free-text tokens - (whoosh_compat's free_text_tokens), never from the raw + - The document still matches, because fuzzy widening happens + inside the already-parsed AST, never by re-parsing the raw query string, so grammar tantivy's parser cannot handle - cannot knock the fuzzy clause out + cannot knock the fuzzy side out """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 with time_machine.travel(FROZEN_NOW, tick=False): diff --git a/src/documents/tests/search/test_any_of.py b/src/documents/tests/search/test_any_of.py new file mode 100644 index 000000000..47361a258 --- /dev/null +++ b/src/documents/tests/search/test_any_of.py @@ -0,0 +1,43 @@ +"""_any_of, the clause-list helper. + +One test, for the empty-list case its callers never produce but which the +helper still has to answer for. +""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import pytest + +from documents.search._query import _any_of + +if TYPE_CHECKING: + from collections.abc import Callable + + from documents.models import Document + from documents.search._backend import TantivyBackend + +pytestmark = [pytest.mark.search, pytest.mark.django_db] + + +class TestAnyOf: + def test_an_empty_clause_list_matches_nothing( + self, + backend: TantivyBackend, + index_document: Callable[..., Document], + ) -> None: + """ + GIVEN: + - An indexed document, and no clauses at all + WHEN: + - _any_of is called with an empty list and the result is run + THEN: + - It matches no documents, rather than raising or matching + everything + """ + index_document(title="x", content="x") + + results = backend._index.searcher().search(_any_of([]), limit=10) + + assert len(results.hits) == 0 diff --git a/src/documents/tests/search/test_cjk_clause.py b/src/documents/tests/search/test_cjk_clause.py index cf3bae5b8..19e827e56 100644 --- a/src/documents/tests/search/test_cjk_clause.py +++ b/src/documents/tests/search/test_cjk_clause.py @@ -99,7 +99,7 @@ class TestCjkClauseFollowsTheParsedQuery: ("threshold", "expected"), [ pytest.param(None, {"titled"}, id="fuzzy_off"), - pytest.param(0.0, {"titled", "content_only"}, id="fuzzy_on"), + pytest.param(0.0, {"titled"}, id="fuzzy_on"), ], ) def test_fielded_cjk_term_searches_only_that_field( @@ -118,14 +118,10 @@ class TestCjkClauseFollowsTheParsedQuery: WHEN: - "title:東京" is searched THEN: - - With fuzzy off, only the titled document matches: the CJK - clause honours the field, so 'title:東京' must not match a - document whose 東京 is only in the content. With fuzzy on, - the content-only document is also readmitted, because the - fuzzy clause contributes every free-text term UNFIELDED by - design (see _try_parse_fuzzy_query) on its own - 0.1-boosted terms -- a documented trade-off, pinned here so - it stays deliberate + - Only the titled document matches, whether fuzzy is on or + off: both the CJK alternative and the fuzzy alternative are + widened in place on the fielded leaf, so 'title:東京' still + must not match a document whose 東京 is only in the content """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = threshold content_only = index_document( diff --git a/src/documents/tests/search/test_cjk_leaf_rewrite.py b/src/documents/tests/search/test_cjk_leaf_rewrite.py index 52d231ff6..815ec5d22 100644 --- a/src/documents/tests/search/test_cjk_leaf_rewrite.py +++ b/src/documents/tests/search/test_cjk_leaf_rewrite.py @@ -17,7 +17,7 @@ import whoosh_compat.ast as wc_ast from documents.search._query import _DEFAULT_SEARCH_FIELDS from documents.search._query import _FIELD_BOOSTS from documents.search._query import _get_emit_field_registry -from documents.search._query import _widen_cjk_leaf +from documents.search._query import _widen_leaf from documents.search._registry import get_field_registry if TYPE_CHECKING: @@ -44,6 +44,11 @@ def _widened(original: wc_ast.Node, bigram_side: wc_ast.Node) -> wc_ast.Or: return wc_ast.Or(children=(original, bigram_side)) +def _widen_cjk_leaf(leaf: wc_ast.Term | wc_ast.Phrase) -> wc_ast.Node: + """The hook as the CJK work used it: no fuzzy side, nothing negated.""" + return _widen_leaf(leaf, fuzzy=False, negated=frozenset()) + + def _analyze(tree: wc_ast.Node) -> wc_ast.Node: return wc.analyze( tree, diff --git a/src/documents/tests/search/test_cjk_run_extraction.py b/src/documents/tests/search/test_cjk_run_extraction.py index b1641823b..8ed3ef21d 100644 --- a/src/documents/tests/search/test_cjk_run_extraction.py +++ b/src/documents/tests/search/test_cjk_run_extraction.py @@ -2,7 +2,7 @@ _CJK_RE decides both what is indexed into the bigram fields (extract_cjk_text) and how a query's CJK text is cut into runs -(_widen_cjk_leaf). A character it misses splits a word in two on both +(_widen_leaf). A character it misses splits a word in two on both sides. For the katakana prolonged sound mark that leaves one-character runs, which have no bigrams, so the word could not be found through the bigram fields at all. diff --git a/src/documents/tests/search/test_cjk_widening.py b/src/documents/tests/search/test_cjk_widening.py index c063565ff..26aea8108 100644 --- a/src/documents/tests/search/test_cjk_widening.py +++ b/src/documents/tests/search/test_cjk_widening.py @@ -159,7 +159,7 @@ class TestTokenizerDroppedCodepoints: WHEN: - "⺀" is searched THEN: - - Nothing matches: _widen_cjk_leaf finds no pieces to widen + - Nothing matches: _widen_leaf finds no CJK pieces to widen with and returns the leaf as it is, which analyzes to the same nothing it always did """ @@ -570,22 +570,22 @@ class TestOtherDefaultFields: assert matched_ids("invoice NOT 東京") == {latin.pk} -class TestFuzzyOnGap: +class TestFuzzyDoesNotReadmit: @pytest.mark.parametrize( ("query", "threshold", "expected"), [ pytest.param("invoice NOT 東京", None, {"latin"}, id="not_fuzzy_off"), - pytest.param("invoice NOT 東京", 0.0, {"latin", "cjk"}, id="not_fuzzy_on"), + pytest.param("invoice NOT 東京", 0.0, {"latin"}, id="not_fuzzy_on"), pytest.param("東京 AND invoice", None, {"cjk"}, id="and_fuzzy_off"), pytest.param( "東京 AND invoice", 0.0, - {"cjk", "cjk_only", "latin"}, + {"cjk"}, id="and_fuzzy_on", ), ], ) - def test_fuzzy_on_readmits_what_the_structure_excludes( + def test_fuzzy_on_matches_fuzzy_off_for_structure( self, index_document: Callable[..., Document], matched_ids: Callable[[str], set[int]], @@ -602,13 +602,10 @@ class TestFuzzyOnGap: WHEN: - "invoice NOT 東京" or "東京 AND invoice" is searched THEN: - - With fuzzy off, the query's structure decides. With fuzzy on, - the separate fuzzy clause matches any one of the query's - words on its own, and the exclusion restated above it is - content-only, so it re-admits what NOT and AND excluded. A - known interim gap, not a regression (both settings returned - these before), removed when fuzzy moves into the query tree - too; pinned so that change flips it deliberately + - The result is the same whether fuzzy is on or off: fuzzy + widening happens inside the tree now, so a CJK NOT or AND + still constrains both the exact and the fuzzy side, and + neither re-admits what the structure excludes """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = threshold cjk = index_document( diff --git a/src/documents/tests/search/test_conjunctive_negations.py b/src/documents/tests/search/test_conjunctive_negations.py deleted file mode 100644 index 8feb5f394..000000000 --- a/src/documents/tests/search/test_conjunctive_negations.py +++ /dev/null @@ -1,149 +0,0 @@ -"""_ConjunctiveNegations, the AST visitor that collects the subtrees a -query excludes from every document it matches, and _any_of, the clause-list -collapsing helper it feeds into. - -Result-level proof that a negation reached through NOT/AND survives the -fuzzy blend lives in test_query_negation.py. These are direct unit -tests of the visitor's dispatch for the rarer grammar shapes -(AndNot/Boosted/AndMaybe/Require) that file's real-corpus queries don't -happen to exercise, plus the empty-clause-list case of _any_of. -""" - -from __future__ import annotations - -from typing import TYPE_CHECKING - -import pytest -import whoosh_compat.ast as wc_ast - -from documents.models import Document -from documents.search._query import _any_of -from documents.search._query import _ConjunctiveNegations - -if TYPE_CHECKING: - from documents.search._backend import TantivyBackend - -pytestmark = [pytest.mark.search, pytest.mark.django_db] - - -def _term(text: str) -> wc_ast.Term: - return wc_ast.Term(field=None, text=text) - - -class TestConjunctiveNegationsVisitor: - def test_visit_andnot_hoists_the_negative_branch(self) -> None: - """ - GIVEN: - - An AndNot(positive=a, negative=b) node - WHEN: - - _ConjunctiveNegations visits it - THEN: - - The negative branch is collected as an exclusion, since - AndNot requires positive and excludes negative - """ - negative = _term("b") - node = wc_ast.AndNot(positive=_term("a"), negative=negative) - assert _ConjunctiveNegations().visit(node) == (negative,) - - def test_visit_andnot_also_collects_negations_already_in_the_positive_branch( - self, - ) -> None: - """ - GIVEN: - - An AndNot node whose positive branch already contains a NOT - WHEN: - - _ConjunctiveNegations visits it - THEN: - - Both the positive branch's own negation and the AndNot's - negative branch are collected - """ - excluded_in_positive = _term("excluded") - negative = _term("negative") - node = wc_ast.AndNot( - positive=wc_ast.Not(child=excluded_in_positive), - negative=negative, - ) - assert _ConjunctiveNegations().visit(node) == (excluded_in_positive, negative) - - def test_visit_boosted_passes_through_to_the_child(self) -> None: - """ - GIVEN: - - A Boosted node (e.g. "(invoice NOT secret)^2") wrapping a - NOT - WHEN: - - _ConjunctiveNegations visits it - THEN: - - The negation inside the boosted child is still collected: a - boost must not shield an exclusion from being hoisted - """ - excluded = _term("secret") - node = wc_ast.Boosted(child=wc_ast.Not(child=excluded), boost=2.0) - assert _ConjunctiveNegations().visit(node) == (excluded,) - - def test_visit_andmaybe_only_descends_into_required(self) -> None: - """ - GIVEN: - - An AndMaybe(required=a, optional=b) node where both required - and optional contain their own NOT - WHEN: - - _ConjunctiveNegations visits it - THEN: - - Only the negation in the required branch is collected. The - optional branch is not a conjunctive constraint on the whole - query (documents that fail it still match), so hoisting a - negation from it would exclude documents the query does not - actually exclude - """ - excluded_in_required = _term("excluded_in_required") - excluded_in_optional = _term("excluded_in_optional") - node = wc_ast.AndMaybe( - required=wc_ast.Not(child=excluded_in_required), - optional=wc_ast.Not(child=excluded_in_optional), - ) - assert _ConjunctiveNegations().visit(node) == (excluded_in_required,) - - def test_visit_require_descends_into_both_branches(self) -> None: - """ - GIVEN: - - A Require(scored=a, filter_only=b) node where both scored - and filter_only contain their own NOT - WHEN: - - _ConjunctiveNegations visits it - THEN: - - Both negations are collected: Require constrains the whole - query with both branches, one merely scored and the other - filter-only, so both are conjunctive - """ - excluded_in_scored = _term("excluded_in_scored") - excluded_in_filter = _term("excluded_in_filter") - node = wc_ast.Require( - scored=wc_ast.Not(child=excluded_in_scored), - filter_only=wc_ast.Not(child=excluded_in_filter), - ) - assert _ConjunctiveNegations().visit(node) == ( - excluded_in_scored, - excluded_in_filter, - ) - - -class TestAnyOfEmptyClauseList: - def test_no_clauses_returns_a_query_that_matches_nothing( - self, - backend: TantivyBackend, - ) -> None: - """ - GIVEN: - - No clauses at all - WHEN: - - _any_of is called with an empty list - THEN: - - It returns tantivy's empty_query() rather than raising or - wrapping zero clauses in a boolean_query, and running it - against a real index matches no documents - """ - doc = Document.objects.create(title="x", content="x", checksum="any-of-empty") - backend.add_or_update(doc) - - query = _any_of([]) - results = backend._index.searcher().search(query, limit=10) - assert len(results.hits) == 0 diff --git a/src/documents/tests/search/test_fuzzy_alternative.py b/src/documents/tests/search/test_fuzzy_alternative.py new file mode 100644 index 000000000..b788bc7c4 --- /dev/null +++ b/src/documents/tests/search/test_fuzzy_alternative.py @@ -0,0 +1,226 @@ +"""_fuzzy_alternative, the near-match side of the widening hook. + +A leaf's words each become a Fuzzy leaf on the leaf's own field, so a +typo in one word of a term still finds the document while everything +around the term keeps constraining it. A Term's words are OR'd for +per-word recall; a Phrase's are AND-ed, because quoting must not widen a +search. CJK words get no fuzzy side at all. +""" + +from __future__ import annotations + +import pytest +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +from documents.search._query import _fuzzy_alternative + +pytestmark = pytest.mark.search + +_CONTENT = wc.FieldRef("content") +_TITLE = wc.FieldRef("title") + +# 130 characters, past the analyzer's 129-byte remove_long limit (128 is +# kept, 129 is dropped), so the index never holds it and neither side +# should search for it. +_TOO_LONG = "x" * 130 + + +def _content(text: str) -> wc_ast.Term: + return wc_ast.Term(field=_CONTENT, text=text) + + +def _fuzzy(field: wc.FieldRef, text: str) -> wc_ast.Fuzzy: + return wc_ast.Fuzzy(field=field, text=text, distance=1, prefix=True) + + +class TestTheAlternative: + def test_a_single_word_becomes_one_fuzzy_leaf(self) -> None: + """ + GIVEN: + - A one-word term + WHEN: + - The fuzzy alternative is built + THEN: + - It is a single Fuzzy leaf on the same field, distance 1 and + prefix matching, which is what the old clause used + """ + assert _fuzzy_alternative(_content("invoice")) == _fuzzy(_CONTENT, "invoice") + + def test_the_leafs_own_field_is_used(self) -> None: + """ + GIVEN: + - A term fielded on title + WHEN: + - The fuzzy alternative is built + THEN: + - The Fuzzy leaf is on title, not spread across the default + fields. This is the fielding fix: today's clause searches a + fielded word everywhere + """ + assert _fuzzy_alternative(wc_ast.Term(field=_TITLE, text="invoice")) == _fuzzy( + _TITLE, + "invoice", + ) + + def test_several_words_are_ored(self) -> None: + """ + GIVEN: + - A hyphenated term the analyzer splits into two words + WHEN: + - The fuzzy alternative is built + THEN: + - The words are OR'd. AND would be stricter than the exact + side, which is OR'd for an unfielded term, and would lose + today's per-word recall inside a term + """ + assert _fuzzy_alternative(_content("COVID-19")) == wc_ast.Or( + children=(_fuzzy(_CONTENT, "covid"), _fuzzy(_CONTENT, "19")), + ) + + def test_words_are_split_where_the_index_splits_them(self) -> None: + """ + GIVEN: + - A term the analyzer lowercases and folds + WHEN: + - The fuzzy alternative is built + THEN: + - The Fuzzy text is the analyzer's output, not the raw text, + so it is in the same shape as the index terms + """ + assert _fuzzy_alternative(_content("Éclair")) == _fuzzy(_CONTENT, "eclair") + + def test_the_splitter_does_not_stem(self) -> None: + """ + GIVEN: + - A word the stemmer would change + WHEN: + - The fuzzy alternative is built + THEN: + - The word is unstemmed. Fuzzy text goes through the field's + pattern_normalizer, which stems it once; stemming here too + would search for a term the index does not hold + """ + assert _fuzzy_alternative(_content("universities")) == _fuzzy( + _CONTENT, + "universities", + ) + + @pytest.mark.parametrize( + "text", + [ + pytest.param("x", id="one_character"), + pytest.param("__", id="only_dropped_characters"), + pytest.param(_TOO_LONG, id="past_remove_long"), + pytest.param("", id="empty"), + pytest.param(" ", id="whitespace"), + ], + ) + def test_text_with_no_usable_word_gets_no_alternative(self, text: str) -> None: + """ + GIVEN: + - Text with no word the index could hold: a single character, + characters the tokenizer drops, a word past remove_long, or + nothing at all + WHEN: + - The fuzzy alternative is built + THEN: + - None, so the leaf is left alone. Returning an alternative + here would collapse Or(leaf, fuzzy) to a required clause + that can never match, making a query return LESS with fuzzy + on than off + """ + assert _fuzzy_alternative(_content(text)) is None + + def test_a_one_character_word_is_dropped_from_a_longer_term(self) -> None: + """ + GIVEN: + - A term mixing a one-character word with a real one + WHEN: + - The fuzzy alternative is built + THEN: + - Only the real word survives. A one-character prefix fuzzy + term matches every term in the field + """ + assert _fuzzy_alternative(_content("h52.1")) == _fuzzy(_CONTENT, "h52") + + def test_the_leaf_span_is_copied(self) -> None: + """ + GIVEN: + - A leaf with a source span, whose words both survive the + one-character filter so there is an Or to inspect + WHEN: + - The fuzzy alternative is built + THEN: + - Every node it builds carries that span, so an emit-time + diagnostic still points into the query text + """ + leaf = wc_ast.Term(field=_CONTENT, text="ab-cd", startchar=4, endchar=9) + + alternative = _fuzzy_alternative(leaf) + + assert isinstance(alternative, wc_ast.Or) + spans = { + (node.startchar, node.endchar) + for node in (alternative, *alternative.children) + } + assert spans == {(4, 9)} + + +class TestPhrasesAreNotWidened: + def test_a_multi_word_phrase_requires_every_word(self) -> None: + """ + GIVEN: + - A quoted two-word phrase + WHEN: + - Its fuzzy alternative is built + THEN: + - The words are And-combined, where a Term's are Or-combined + (test_a_hyphenated_term_matches_on_one_word pins that). The + parser's default group is And, so an Or here would let the + quoted phrase match strictly more than the same two words + unquoted + """ + leaf = wc_ast.Phrase(field=_CONTENT, text="tax report") + + assert _fuzzy_alternative(leaf) == wc_ast.And( + children=(_fuzzy(_CONTENT, "tax"), _fuzzy(_CONTENT, "report")), + ) + + +class TestCjkGetsNoFuzzySide: + @pytest.mark.parametrize( + "text", + [ + pytest.param("東京", id="cjk_only"), + pytest.param("東京都の報告書", id="longer_run"), + pytest.param("서울", id="hangul"), + ], + ) + def test_a_cjk_word_is_skipped(self, text: str) -> None: + """ + GIVEN: + - A CJK term + WHEN: + - Its fuzzy alternative is built + THEN: + - There is none. The content analyzer keeps the run as one + token, so a prefix Fuzzy over it would match any run within + one edit of its start, which is the "東京都 matches 京都" + failure the bigram fields exist to avoid + """ + assert _fuzzy_alternative(_content(text)) is None + + def test_latin_beside_cjk_still_gets_its_fuzzy_side(self) -> None: + """ + GIVEN: + - A term mixing a CJK run and a latin word + WHEN: + - Its fuzzy alternative is built + THEN: + - Only the latin word is fuzzed. Skipping CJK words must not + cost the latin half its near-match + """ + leaf = _content("東京 report") + + assert _fuzzy_alternative(leaf) == _fuzzy(_CONTENT, "report") diff --git a/src/documents/tests/search/test_fuzzy_scoring.py b/src/documents/tests/search/test_fuzzy_scoring.py new file mode 100644 index 000000000..17b7d3cf8 --- /dev/null +++ b/src/documents/tests/search/test_fuzzy_scoring.py @@ -0,0 +1,134 @@ +"""What survives ADVANCED_FUZZY_SEARCH_THRESHOLD. + +The rest of the fuzzy tests run at threshold 0.0 so they see matching +behavior rather than the filter. These run at 0.5, the value the docs +recommend, because the filter has properties of its own that nothing else +covers: a near-miss must not be cut according to how well the query's +correctly spelled words matched, and an exact match must outrank one that +is only partly exact. +""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import pytest + +if TYPE_CHECKING: + from collections.abc import Callable + + from pytest_django.fixtures import SettingsWrapper + + from documents.models import Document + from documents.search._backend import TantivyBackend + +pytestmark = [pytest.mark.search, pytest.mark.django_db] + +# Long enough that BM25 scores it well below a short document holding the +# same word, which is what makes the spread these tests are about. +_PADDING = "lorem ipsum dolor sit amet " * 40 + + +@pytest.fixture(autouse=True) +def _threshold(settings: SettingsWrapper) -> None: + settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 + + +class TestNearMissesAreNotCutByTheSpread: + def test_two_equal_near_misses_both_survive( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Two documents that both contain a rare correctly spelled + word and both near-match a misspelled one. One has the rare + word in its title, the other buried in a long body, so BM25 + scores them very differently + WHEN: + - Both words are searched at threshold 0.5 + THEN: + - Both survive. Neither is a better answer than the other: + they differ only in where the correctly spelled word sits. + If the widened tree were scored normally, the fuzzy side + would inherit the BM25 spread of the correct word and the + weaker document would be cut + """ + titled = index_document( + title="Zarquon", + content=f"invoices {_PADDING}", + ) + buried = index_document( + title="Nothing", + content=f"{_PADDING} zarquon invoicing", + ) + + assert matched_ids("zarquon invoce") == {titled.pk, buried.pk} + + def test_near_misses_still_rank_among_themselves( + self, + backend: TantivyBackend, + index_document: Callable[..., Document], + ) -> None: + """ + GIVEN: + - A document near-matching the query in several fields and one + near-matching it in a single field + WHEN: + - The misspelled word is searched + THEN: + - Both survive, and the multi-field one ranks first. Flat + scoring alone would tie every near-miss and lose relevance + ordering entirely, which is what the tiebreak clause exists + to prevent + """ + strong = index_document( + title="Invoices", + content="invoices for invoicing", + ) + weak = index_document(title="Nothing", content="invoices") + + hits = backend.search_ids("invoce", user=None) + + assert set(hits) == {strong.pk, weak.pk} + assert hits[0] == strong.pk + + +class TestExactOutranksNearMiss: + def test_a_fully_exact_document_outranks_a_partly_exact_one( + self, + backend: TantivyBackend, + index_document: Callable[..., Document], + ) -> None: + """ + GIVEN: + - A document matching both query words exactly but buried in a + long body, and one matching the first word exactly several + times while only near-matching the second + WHEN: + - Both words are searched, spelled correctly + THEN: + - The fully exact document ranks first. docs/configuration.md + promises fuzzy results rank below exact matches, and the + widened tree alone would break it: a partly exact document + collects real BM25 for what it did match plus a constant for + what it only near-matched + + Only the ordering is asserted, not that the partly exact document + survives the threshold. Spec 4.2a accepts that a large enough BM25 + spread still cuts a near-miss, so whether it survives depends on + the corpus and is not a property to pin. + """ + index_document( + title="Invoice Invoice Invoice", + content="reportage weekly", + ) + fully = index_document( + title="Nothing", + content=f"{_PADDING} invoice report", + ) + + hits = backend.search_ids("invoice report", user=None) + + assert hits[0] == fully.pk diff --git a/src/documents/tests/search/test_fuzzy_tokenization.py b/src/documents/tests/search/test_fuzzy_tokenization.py index 7337fb63e..8eaff30bb 100644 --- a/src/documents/tests/search/test_fuzzy_tokenization.py +++ b/src/documents/tests/search/test_fuzzy_tokenization.py @@ -1,9 +1,10 @@ -"""The words the fuzzy blend clause hands back to tantivy's parser. +"""The words a leaf contributes to its fuzzy alternative. -The clause re-parses a word string through tantivy, which analyzes it -again, so the words must be the query's raw text rather than the analyzed -text (analysis is not idempotent), and must still be split into plain -words so that hyphenated, dotted and quoted terms keep contributing. +Each leaf is widened in the tree now, so nothing is re-parsed as a string +and a boolean keyword can no longer be read as grammar. What still has to +hold is that a word is stemmed exactly once (analysis is not idempotent) +and that hyphenated, dotted and quoted terms keep contributing their +words. """ from __future__ import annotations @@ -40,42 +41,6 @@ def fuzzy_enabled(settings: SettingsWrapper) -> None: settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.0 -class TestFuzzyClauseParseFailureDegradesGracefully: - def test_a_word_string_tantivy_rejects_drops_the_clause_only(self) -> None: - """ - GIVEN: - - A parsed query with free-text words, and an index-like - object whose parse_query is forced to raise ValueError - WHEN: - - _try_parse_fuzzy_query is called - THEN: - - It returns None instead of propagating, so a fuzzy word - string tantivy's own parser rejects only drops the fuzzy - clause: the exact clause still stands rather than the - whole query failing. The ValueError guard is insurance (the - word string is plain tokens, so tantivy accepting it is - expected, not assumed) - """ - import whoosh_compat as wc - - from documents.search._query import _DEFAULT_SEARCH_FIELDS - from documents.search._query import _try_parse_fuzzy_query - from documents.search._registry import get_field_registry - - registry = get_field_registry(None) - result = wc.parse( - "invoice", - registry=registry, - default_fields=_DEFAULT_SEARCH_FIELDS, - ) - - class _RaisingIndex: - def parse_query(self, *args: object, **kwargs: object) -> object: - raise ValueError("synthetic parse failure") - - assert _try_parse_fuzzy_query(_RaisingIndex(), result.ast, registry) is None - - class TestFuzzyClauseWords: def test_a_stemmed_word_is_not_stemmed_a_second_time( self, @@ -175,10 +140,10 @@ class TestFuzzyClauseWords: class TestBooleanKeywordsInRawText: - """Tantivy's boolean keywords are word runs, so they survive the cut - into words and its own parser reads them as grammar. Raw query text - reaches that parser with its case intact, so a quoted phrase can carry - them in.""" + """Tantivy's boolean keywords used to reach its parser with their case + intact, through the word string the old clause was re-parsed from, so a + quoted phrase could smuggle grammar in. Leaves are built as AST nodes + now, which closes that off structurally; these pin it shut.""" @pytest.fixture def corpus(self, backend: TantivyBackend) -> dict[str, int]: @@ -207,38 +172,41 @@ class TestBooleanKeywordsInRawText: } @pytest.mark.parametrize( - "query", + ("keyword_spelling", "ordinary_spelling"), [ - pytest.param('"tax AND reports"', id="and"), - pytest.param('"tax OR reports"', id="or"), - pytest.param('"tax NOT reports"', id="not"), - pytest.param('"tax IN reports"', id="in"), + pytest.param('"tax AND reports"', '"tax and reports"', id="and"), + pytest.param('"tax OR reports"', '"tax or reports"', id="or"), + pytest.param('"tax NOT reports"', '"tax not reports"', id="not"), + pytest.param('"tax IN reports"', '"tax in reports"', id="in"), ], ) def test_a_keyword_inside_a_phrase_stays_an_ordinary_word( self, backend: TantivyBackend, corpus: dict[str, int], - query: str, + keyword_spelling: str, + ordinary_spelling: str, ) -> None: """ GIVEN: - Three documents: one with both "taxation" and "reportage", one with only "taxation", one with only "reportage" WHEN: - - Searching for a quoted phrase carrying a tantivy boolean - keyword as one of its words (e.g. '"tax AND reports"') + - A quoted phrase carries a tantivy boolean keyword as one of + its words, spelled in upper case and in lower case THEN: - - The keyword stays an ordinary word inside the phrase, and - the fuzzy clause matches all three documents, the same - disjunction as the plain '"tax reports"' phrase: AND must - not turn it into a conjunction, NOT must not give it its own - exclusion, IN must not fail the parse + - Both spellings match the same documents, so the keyword is + an ordinary word of the phrase rather than grammar: AND does + not make it a conjunction, NOT does not give it its own + exclusion, IN does not fail the parse. Only the upper-case + spelling was ever grammar """ - assert _matched_ids(backend, '"tax reports"') == set(corpus.values()) - assert _matched_ids(backend, query) == set(corpus.values()) + assert _matched_ids(backend, keyword_spelling) == _matched_ids( + backend, + ordinary_spelling, + ) - def test_a_trailing_keyword_does_not_drop_the_clause( + def test_a_phrase_needs_a_near_match_for_every_word( self, backend: TantivyBackend, corpus: dict[str, int], @@ -248,14 +216,33 @@ class TestBooleanKeywordsInRawText: - Three documents: one with both "taxation" and "reportage", one with only "taxation", one with only "reportage" WHEN: - - Searching for '"tax AND"', a phrase ending in a tantivy - syntax error + - '"tax reports"' is searched, both words misspelled THEN: - - The fuzzy clause still matches on "tax"; 'tax AND' alone is - a syntax error to tantivy's parser, which would otherwise - cost the whole query its fuzzy clause + - Only the document near-matching both words comes back. A + quoted phrase asks for more than the bare words, so its + fuzzy side requires every one of them """ - assert _matched_ids(backend, '"tax AND"') == { - corpus["both"], - corpus["tax_only"], - } + assert _matched_ids(backend, '"tax reports"') == {corpus["both"]} + + def test_a_trailing_keyword_is_just_a_word( + self, + backend: TantivyBackend, + corpus: dict[str, int], + ) -> None: + """ + GIVEN: + - Three documents: one with both "taxation" and "reportage", + one with only "taxation", one with only "reportage" + WHEN: + - '"tax AND"' is searched, a phrase that used to be a tantivy + syntax error once the clause was re-parsed as a string + - The same phrase is searched with the keyword in lower case + THEN: + - Both match the same documents, and neither raises. Nothing + is re-parsed any more, so a trailing keyword cannot cost the + query its fuzzy side + """ + assert _matched_ids(backend, '"tax AND"') == _matched_ids( + backend, + '"tax and"', + ) diff --git a/src/documents/tests/search/test_fuzzy_widening.py b/src/documents/tests/search/test_fuzzy_widening.py new file mode 100644 index 000000000..95de0a634 --- /dev/null +++ b/src/documents/tests/search/test_fuzzy_widening.py @@ -0,0 +1,467 @@ +"""Fuzzy matching applied inside the parsed query rather than beside it. + +With a threshold set, every leaf gains a near-match alternative where it +sits, so fielding, negation, AND and positive filters all constrain the +fuzzy match exactly as they constrain the exact one. The old clause was a +flat bag of words OR'd in at the top level, which none of them reached. + +Threshold is 0.0 here so these tests see the matching behavior, not the +score filter. The filter has its own file, test_fuzzy_scoring.py. +""" + +from __future__ import annotations + +import datetime +from typing import TYPE_CHECKING + +import pytest + +from documents.models import Document +from documents.models import StoragePath + +if TYPE_CHECKING: + from collections.abc import Callable + + from pytest_django.fixtures import SettingsWrapper + + +pytestmark = [pytest.mark.search, pytest.mark.django_db] + + +@pytest.fixture(autouse=True) +def _fuzzy_on(settings: SettingsWrapper) -> None: + settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.0 + + +class TestStructureIsHonoured: + @pytest.fixture + def near_matches_both( + self, + index_document: Callable[..., Document], + ) -> Document: + """One document near-matching both query words, one only the first.""" + both = index_document(title="A", content="invoices report") + index_document(title="B", content="invoices only") + return both + + def test_a_fielded_term_fuzzes_only_that_field( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - One document with a near-miss of the word in its title, one + with a near-miss in its content only + WHEN: + - "title:invoce" is searched + THEN: + - Only the title document matches. The old clause searched a + fielded word across every default field + """ + titled = index_document(title="Invoces", content="nothing") + index_document(title="Nothing", content="invoces here") + + assert matched_ids("title:invoce") == {titled.pk} + + def test_every_word_needs_a_near_match( + self, + near_matches_both: Document, + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document near-matching both words, and one near-matching + only the first + WHEN: + - "invoce reprot" is searched (both words misspelled) + THEN: + - Only the document near-matching both survives. The old + clause OR'd the words, so anything near one of them matched + """ + assert matched_ids("invoce reprot") == {near_matches_both.pk} + + def test_a_negated_word_is_not_fuzzed( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document containing "taxi" and one containing "tax" + WHEN: + - "invoice NOT tax" is searched + THEN: + - The "taxi" document survives and the "tax" one does not. A + negated leaf keeps its exact side only: fuzzing it with + prefix matching would exclude every word starting near it + """ + taxi = index_document(title="A", content="invoice taxi fare") + index_document(title="B", content="invoice tax return") + + assert matched_ids("invoice NOT tax") == {taxi.pk} + + def test_a_negation_inside_a_branch_still_binds( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - An "invoice" document containing "secret", one without, and + a "bill" document + WHEN: + - "(invoce AND NOT secret) OR bill" is searched + THEN: + - The secret document stays out. The old clause restated only + top-level conjunctive exclusions, so an Or branch's NOT was + never applied to the fuzzy side + """ + index_document(title="A", content="invoices secret") + clean = index_document(title="B", content="invoices only") + bill = index_document(title="C", content="bill") + + assert matched_ids("(invoce AND NOT secret) OR bill") == { + clean.pk, + bill.pk, + } + + def test_a_structured_filter_constrains_the_fuzzy_match( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Two near-miss documents created in different years + WHEN: + - "created:2024 invoce" is searched + THEN: + - Only the 2024 one matches. The old blend restated negations + above the fuzzy clause but never positive constraints, so a + filter did not reach the fuzzy side at all. + + created is the right field to test with: it is a DATE field, + so it has no fuzzy side of its own and cannot be widened. + type: would not test this, because it is an alias for + document_type, which is one of the five default search + fields and so gets widened like any other leaf + """ + matching = index_document( + title="A", + content="invoices", + created=datetime.date(2024, 6, 1), + ) + index_document( + title="B", + content="invoices", + created=datetime.date(2023, 6, 1), + ) + + assert matched_ids("created:2024 invoce") == {matching.pk} + + def test_a_filter_on_a_non_default_field_constrains_the_fuzzy_match( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Two near-miss documents with different storage paths + WHEN: + - "path:archive invoce" is searched + THEN: + - Only the matching one comes back. storage_path is a TEXT + field that is NOT one of the default search fields, so it + gets no fuzzy side; the release note promises this case and + the date test above does not cover it + """ + archive = StoragePath.objects.create(name="archive", path="archive/{title}") + other = StoragePath.objects.create(name="misc", path="misc/{title}") + matching = index_document( + title="A", + content="invoices", + storage_path=archive, + ) + index_document( + title="B", + content="invoices", + storage_path=other, + ) + + assert matched_ids("path:archive invoce") == {matching.pk} + + def test_a_require_filters_on_the_widened_side_too( + self, + near_matches_both: Document, + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document near-matching both words and one near-matching + only the scored side + WHEN: + - "invoce REQUIRE reprot" is searched + THEN: + - Only the document near-matching both comes back. The + filter-only side is unscored but still filters, and it is + widened like any other leaf, so a near miss satisfies it + """ + assert matched_ids("invoce REQUIRE reprot") == {near_matches_both.pk} + + +class TestRecallIsKept: + def test_a_typo_still_finds_its_document( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A correctly spelled document + WHEN: + - A one-edit misspelling is searched + THEN: + - It matches. This is what the whole feature is for + """ + doc = index_document(title="A", content="invoice total") + + assert matched_ids("invoce") == {doc.pk} + + def test_a_hyphenated_term_matches_on_one_word( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document holding a near-miss of one half of a hyphenated + term + WHEN: + - "COVID-19" is searched + THEN: + - It matches. The words inside a term are OR'd on the fuzzy + side, which is the per-word recall the old clause had + """ + doc = index_document(title="A", content="covidx cases") + + assert matched_ids("COVID-19") == {doc.pk} + + def test_a_word_the_index_cannot_hold_does_not_narrow_the_query( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - An "invoice" document + WHEN: + - "invoice __" is searched, where __ is characters the + tokenizer discards entirely + THEN: + - It still matches. If such a word got a fuzzy alternative, + the leaf would collapse to a required clause that can never + match and the query would return less with fuzzy on than off + """ + doc = index_document(title="A", content="invoice total") + + assert matched_ids("invoice __") == {doc.pk} + + def test_a_one_character_word_no_longer_matches_everything( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - Two unrelated documents + WHEN: + - "x invoice" is searched, where x is a one-character word no + document holds + THEN: + - Nothing matches. One-character words get no fuzzy side, and + the exact side requires a term no document has. Today this + query matches the whole corpus, because a one-character + prefix fuzzy term matches every term in the field + """ + index_document(title="A", content="invoice total") + index_document(title="B", content="unrelated") + + assert matched_ids("x invoice") == set() + + +class TestCjkAndFuzzyTogether: + def test_a_cjk_term_keeps_its_bigram_side_with_fuzzy_on( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document with a CJK term inside an unspaced run + WHEN: + - That term is searched with fuzzy on + THEN: + - It matches through the bigram side, which sits in the same + Or as the fuzzy side and is unaffected by it + """ + doc = index_document( + title="A", + content="東京都の公共文書について", + ) + + assert matched_ids("東京") == {doc.pk} + + def test_a_negated_cjk_term_keeps_its_bigram_side( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - An "invoice" document whose only 東京 is inside a run, and + one with no 東京 at all + WHEN: + - "invoice NOT 東京" is searched with fuzzy on + THEN: + - The 東京 document is excluded. A negated leaf loses its + fuzzy side but keeps its CJK one, so the exclusion still + reaches inside the run + """ + index_document(title="A", content="invoice 東京都の報告書") + clean = index_document(title="B", content="invoice only") + + assert matched_ids("invoice NOT 東京") == {clean.pk} + + +class TestTheHookIsSkipped: + def test_a_plain_query_passes_no_hook( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + settings: SettingsWrapper, + monkeypatch: pytest.MonkeyPatch, + ) -> None: + """ + GIVEN: + - Fuzzy off and a query with no CJK in it + WHEN: + - It is parsed + THEN: + - emit() is called once, with rewrite_leaf=None. Nothing is + widened, so the query is exactly what it was before any of + this work + """ + settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = None + from documents.search import _query + + calls: list[object] = [] + real = _query.tantivy_emit + + def spy(*args: object, **kwargs: object) -> object: + calls.append(kwargs.get("rewrite_leaf")) + return real(*args, **kwargs) + + monkeypatch.setattr(_query, "tantivy_emit", spy) + index_document(title="A", content="invoice") + + matched_ids("invoice") + + assert calls == [None] + + +class TestTheEmitRegistryIsInvisible: + def test_a_non_cjk_query_gives_the_same_result_under_either_registry( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + monkeypatch: pytest.MonkeyPatch, + ) -> None: + """ + GIVEN: + - A plain latin document and a non-CJK query with fuzzy on, + which now selects the registry carrying the internal bigram + fields even though nothing in the query is CJK + WHEN: + - The same query runs with that selection forced back to the + public registry + THEN: + - The same documents come back. The bigram fields are absent + from PUBLIC_FIELDS and the two registries agree on every + field a query can name, so adding them changes nothing for + a query that never reaches them + """ + from documents.search import _query + from documents.search._registry import get_field_registry + + index_document(title="A", content="invoice total") + index_document(title="B", content="unrelated") + + with_bigram_fields = matched_ids("invoce") + + monkeypatch.setattr( + _query, + "_get_emit_field_registry", + lambda language: get_field_registry(language), + ) + + assert matched_ids("invoce") == with_bigram_fields + + +class TestQuotingDoesNotWiden: + @pytest.fixture + def pks(self, index_document: Callable[..., Document]) -> dict[str, int]: + """One document per word, and one holding both.""" + return { + "tax": index_document(title="A", content="tax invoice").pk, + "report": index_document(title="B", content="report invoice").pk, + "both": index_document(title="C", content="tax report").pk, + } + + @pytest.mark.parametrize( + "query", + [ + pytest.param("tax report", id="unquoted"), + pytest.param('"tax report"', id="quoted"), + ], + ) + def test_a_quoted_phrase_needs_every_word_like_the_bare_words( + self, + matched_ids: Callable[[str], set[int]], + pks: dict[str, int], + query: str, + ) -> None: + """ + GIVEN: + - A document per word, and one holding both + WHEN: + - The words are searched unquoted and as a quoted phrase + THEN: + - Only the document holding both matches, either way. With + the phrase's words Or'd on the fuzzy side, the quoted form + matched every document, including near-misses of one word + """ + assert matched_ids(query) == {pks["both"]} + + +class TestCjkIsNotFuzzed: + def test_a_cjk_term_does_not_match_a_run_sharing_its_start( + self, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], + ) -> None: + """ + GIVEN: + - A document holding 東京都 and one holding only 京都, each + inside a longer unspaced run + WHEN: + - "東京" is searched with fuzzy on + THEN: + - Only the 東京都 document matches. A prefix Fuzzy over the + whole run would match the 京都 document too, undoing what + the bigram fields' multitoken=AND guarantees with fuzzy off + """ + tokyo = index_document(title="A", content="東京都の報告書") + index_document(title="B", content="京都の観光案内について") + + assert matched_ids("東京") == {tokyo.pk} diff --git a/src/documents/tests/search/test_negated_leaf_ids.py b/src/documents/tests/search/test_negated_leaf_ids.py new file mode 100644 index 000000000..bea7069ec --- /dev/null +++ b/src/documents/tests/search/test_negated_leaf_ids.py @@ -0,0 +1,208 @@ +"""_negated_leaf_ids, the pre-scan that tells the widening hook which +leaves sit under a negation. + +A negated leaf keeps its CJK alternative but gets no fuzzy one: with +prefix matching, NOT tax would otherwise exclude "taxi" and "taxonomy", +which is not what excluding a word means. The hook cannot see a leaf's +context, so the tree is walked once up front and the hook compares by +identity. +""" + +from __future__ import annotations + +import pytest +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +from documents.search._query import _negated_leaf_ids + +pytestmark = pytest.mark.search + +_CONTENT = wc.FieldRef("content") + + +def _term(text: str) -> wc_ast.Term: + return wc_ast.Term(field=_CONTENT, text=text) + + +class TestCollection: + def test_a_bare_tree_has_no_negated_leaves(self) -> None: + """ + GIVEN: + - A tree with no negation in it + WHEN: + - It is pre-scanned + THEN: + - The set is empty + """ + tree = wc_ast.And(children=(_term("invoice"), _term("report"))) + + assert _negated_leaf_ids(tree) == frozenset() + + def test_a_leaf_under_not_is_collected(self) -> None: + """ + GIVEN: + - A term under a Not + WHEN: + - The tree is pre-scanned + THEN: + - That leaf's id is collected, and the positive one is not + """ + positive = _term("invoice") + negated = _term("secret") + tree = wc_ast.And(children=(positive, wc_ast.Not(child=negated))) + + ids = _negated_leaf_ids(tree) + + assert id(negated) in ids + assert id(positive) not in ids + + def test_the_negative_side_of_andnot_is_collected(self) -> None: + """ + GIVEN: + - An AndNot, whose positive and negative sides are both terms + WHEN: + - The tree is pre-scanned + THEN: + - Only the negative side is collected + """ + positive = _term("invoice") + negated = _term("secret") + tree = wc_ast.AndNot(positive=positive, negative=negated) + + ids = _negated_leaf_ids(tree) + + assert id(negated) in ids + assert id(positive) not in ids + + def test_every_leaf_beneath_a_negation_is_collected(self) -> None: + """ + GIVEN: + - A Not whose child is a group of several leaves, one of them + a Phrase + WHEN: + - The tree is pre-scanned + THEN: + - All of them are collected, at any depth and whatever the + leaf type + """ + a = _term("alpha") + b = _term("beta") + phrase = wc_ast.Phrase(field=_CONTENT, text="gamma delta") + tree = wc_ast.Not( + child=wc_ast.Or( + children=(a, wc_ast.And(children=(b, phrase))), + ), + ) + + assert _negated_leaf_ids(tree) == frozenset({id(a), id(b), id(phrase)}) + + def test_a_double_negation_stays_collected(self) -> None: + """ + GIVEN: + - A term under two nested Nots + WHEN: + - The tree is pre-scanned + THEN: + - It is still collected. The rule is parity-blind on purpose: + the cost of over-collecting is a lost widening, while + under-collecting would make a negation exclude far more than + the user asked + """ + leaf = _term("tax") + tree = wc_ast.Not(child=wc_ast.Not(child=leaf)) + + assert _negated_leaf_ids(tree) == frozenset({id(leaf)}) + + @pytest.mark.parametrize( + "build", + [ + pytest.param( + lambda leaf: wc_ast.Boosted(child=leaf, boost=2.0), + id="boosted", + ), + pytest.param( + lambda leaf: wc_ast.Require(scored=leaf, filter_only=leaf), + id="require", + ), + pytest.param( + lambda leaf: wc_ast.AndMaybe(required=leaf, optional=leaf), + id="andmaybe", + ), + ], + ) + def test_containers_that_are_not_negations_collect_nothing( + self, + build, + ) -> None: + """ + GIVEN: + - A leaf inside a container that is not a negation + WHEN: + - The tree is pre-scanned + THEN: + - Nothing is collected. Only Not.child and AndNot.negative are + negative positions + """ + leaf = _term("invoice") + + assert _negated_leaf_ids(build(leaf)) == frozenset() + + def test_a_bare_leaf_is_accepted(self) -> None: + """ + GIVEN: + - A tree that is a single leaf, with no container at all + WHEN: + - It is pre-scanned + THEN: + - The set is empty and nothing raises + """ + assert _negated_leaf_ids(_term("invoice")) == frozenset() + + +class TestTotality: + @pytest.mark.parametrize( + "node", + [ + pytest.param(wc_ast.Every(), id="every"), + pytest.param(wc_ast.Nothing(), id="nothing"), + pytest.param( + wc_ast.Wildcard(field=_CONTENT, pattern="inv*"), + id="wildcard", + ), + pytest.param( + wc_ast.Fuzzy(field=_CONTENT, text="invoce", distance=1, prefix=True), + id="fuzzy", + ), + ], + ) + def test_an_unrecognised_node_does_not_raise(self, node: wc_ast.Node) -> None: + """ + GIVEN: + - A node type the walk does not collect from, including one + (Fuzzy) that this code will later build itself + WHEN: + - It is pre-scanned, bare and under a Not + THEN: + - Nothing raises. This function runs outside emit()'s error + conversion, so an exception here is an unconverted 500 + """ + assert _negated_leaf_ids(node) == frozenset() + assert _negated_leaf_ids(wc_ast.Not(child=node)) == frozenset() + + def test_a_deep_tree_does_not_exhaust_the_stack(self) -> None: + """ + GIVEN: + - A tree nested far deeper than the parser's 200-group cap + WHEN: + - It is pre-scanned + THEN: + - It completes. The walk is iterative, so depth costs heap + rather than Python stack frames + """ + leaf = _term("invoice") + node: wc_ast.Node = leaf + for _ in range(5000): + node = wc_ast.Not(child=node) + + assert _negated_leaf_ids(node) == frozenset({id(leaf)}) diff --git a/src/documents/tests/search/test_query.py b/src/documents/tests/search/test_query.py index 6cf9cb31f..aae802b85 100644 --- a/src/documents/tests/search/test_query.py +++ b/src/documents/tests/search/test_query.py @@ -87,15 +87,15 @@ class TestParseUserQuery: ) -> None: """ GIVEN: - - The fuzzy blend clause enabled (ADVANCED_FUZZY_SEARCH_THRESHOLD - set), and a query that is valid whoosh grammar tantivy's own - query parser (used only by the fuzzy blend clause) cannot parse + - Fuzzy matching enabled (ADVANCED_FUZZY_SEARCH_THRESHOLD set), + and a query using whoosh grammar the widened emit still has + to handle correctly WHEN: - parse_user_query() parses it THEN: - It returns a tantivy.Query rather than raising: the fuzzy - clause (_try_parse_fuzzy_query) must degrade gracefully - instead of failing the whole query + side must degrade gracefully instead of failing the whole + query """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 assert isinstance(parse_user_query(query_index, raw_query, UTC), tantivy.Query) @@ -522,15 +522,10 @@ class TestEmitErrorContract: THEN: - The emit failure is caught and mapped to a SearchQueryError (400) rather than propagating as a raw QueryError. This - fails at the whole-tree "exact" clause emission (the - `tantivy_emit` call in parse_user_query), the same path + fails at the first widened emit (the `tantivy_emit` call + inside `emit_widened` in parse_user_query), the same path TestRealQueriesRouteCorrectly::test_text_range_is_a_400_naming_the_field - already covers without the NOT wrapper: `_negation_clauses` - never runs here, since the whole-tree emit already raises - before negations are ever computed. `_negation_clauses`'s - own except QueryError branch re-emits an already-successful - tree's own subtree in isolation, so it has no reachable - trigger under the current control flow + already covers without the NOT wrapper """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 with pytest.raises(SearchQueryError): diff --git a/src/documents/tests/search/test_widen_leaf.py b/src/documents/tests/search/test_widen_leaf.py new file mode 100644 index 000000000..258960c4d --- /dev/null +++ b/src/documents/tests/search/test_widen_leaf.py @@ -0,0 +1,133 @@ +"""_widen_leaf, the hook that adds a CJK alternative, a fuzzy one, or both. + +The alternatives are independent: a leaf can qualify for either, and a +negated leaf keeps its CJK side while losing its fuzzy one. +""" + +from __future__ import annotations + +import pytest +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +from documents.search._query import _cjk_alternative +from documents.search._query import _fuzzy_alternative +from documents.search._query import _widen_leaf + +pytestmark = pytest.mark.search + +_CONTENT = wc.FieldRef("content") +_NOTES = wc.FieldRef("notes", "note") + + +def _content(text: str) -> wc_ast.Term: + return wc_ast.Term(field=_CONTENT, text=text) + + +def _widen( + leaf: wc_ast.Term, + *, + fuzzy: bool = True, + negated: frozenset[int] = frozenset(), +) -> wc_ast.Node: + return _widen_leaf(leaf, fuzzy=fuzzy, negated=negated) + + +class TestWhichAlternativesAreAdded: + def test_a_latin_leaf_gains_only_the_fuzzy_side(self) -> None: + """ + GIVEN: + - A latin term, which has no CJK in it + WHEN: + - The hook runs with fuzzy on + THEN: + - The Or holds the leaf and the boosted fuzzy alternative, + and nothing else + """ + leaf = _content("invoice") + + assert _widen(leaf) == wc_ast.Or( + children=( + leaf, + wc_ast.Boosted(child=_fuzzy_alternative(leaf), boost=0.1), + ), + ) + + def test_a_cjk_leaf_gains_only_the_cjk_side_when_fuzzy_is_off(self) -> None: + """ + GIVEN: + - A CJK term + WHEN: + - The hook runs with fuzzy off + THEN: + - Only the bigram alternative is added, which is exactly what + the CJK work shipped + """ + leaf = _content("東京") + + assert _widen(leaf, fuzzy=False) == wc_ast.Or( + children=(leaf, _cjk_alternative(leaf)), + ) + + def test_a_cjk_leaf_gains_only_its_bigram_side(self) -> None: + """ + GIVEN: + - A CJK term + WHEN: + - The hook runs with fuzzy on + THEN: + - The Or holds the leaf and the bigram alternative, and no + fuzzy one. A prefix Fuzzy over a whole unspaced run matches + any run within one edit of its start, and _cjk_alternative + already supplies the in-run recall + """ + leaf = _content("東京") + + assert _fuzzy_alternative(leaf) is None + assert _widen(leaf) == wc_ast.Or(children=(leaf, _cjk_alternative(leaf))) + + def test_a_negated_leaf_keeps_cjk_and_loses_fuzzy(self) -> None: + """ + GIVEN: + - A CJK term whose id is in the negated set + WHEN: + - The hook runs with fuzzy on + THEN: + - The bigram alternative survives and the fuzzy one does not. + NOT X should exclude what X matches, which needs the bigram + side, but prefix fuzzy matching would exclude far more + """ + leaf = _content("東京") + + assert _widen(leaf, negated=frozenset({id(leaf)})) == wc_ast.Or( + children=(leaf, _cjk_alternative(leaf)), + ) + + def test_a_negated_latin_leaf_is_returned_unchanged(self) -> None: + """ + GIVEN: + - A latin term whose id is in the negated set + WHEN: + - The hook runs with fuzzy on + THEN: + - The leaf itself comes back. It qualifies for no alternative + at all, so there is no Or to build + """ + leaf = _content("tax") + + assert _widen(leaf, negated=frozenset({id(leaf)})) is leaf + + def test_a_leaf_outside_the_default_fields_is_returned_unchanged(self) -> None: + """ + GIVEN: + - A term on a JSON subpath field, which is not one of the five + default search fields + WHEN: + - The hook runs with fuzzy on + THEN: + - The leaf comes back untouched. Widening is scoped to the + default search fields, as it was for CJK + """ + leaf = wc_ast.Term(field=_NOTES, text="invoice") + + assert _widen(leaf) is leaf From fdd32b73bbccc845b89dc927afa714844670db13 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:55:13 -0700 Subject: [PATCH 063/258] Chore: Move the search tests onto the shared indexing fixtures (#14159) --- src/documents/tests/conftest.py | 12 ++ src/documents/tests/search/_ast_helpers.py | 30 ++++ src/documents/tests/search/conftest.py | 23 +++ src/documents/tests/search/test_acceptance.py | 152 +++++++----------- .../tests/search/test_cjk_emit_registry.py | 18 +-- .../tests/search/test_cjk_leaf_rewrite.py | 123 +++++++------- .../tests/search/test_compact_date_forms.py | 70 ++++---- .../test_date_keyword_phrase_removal.py | 31 ++-- .../search/test_date_keyword_timezone.py | 29 +--- .../tests/search/test_documented_syntax.py | 100 +++++------- .../tests/search/test_error_routing.py | 16 +- .../search/test_exists_on_json_fields.py | 15 +- .../tests/search/test_fuzzy_alternative.py | 41 +++-- .../tests/search/test_fuzzy_tokenization.py | 101 ++++-------- .../search/test_highlight_query_guard.py | 11 -- .../tests/search/test_json_field_prefixes.py | 78 +++------ .../tests/search/test_negated_leaf_ids.py | 37 ++--- .../tests/search/test_pattern_stemming.py | 56 +++---- src/documents/tests/search/test_query.py | 10 -- .../tests/search/test_query_negation.py | 10 -- src/documents/tests/search/test_widen_leaf.py | 22 +-- src/documents/tests/test_api_search_errors.py | 10 -- .../tests/test_api_search_query_length.py | 10 -- ...test_api_search_unterminated_date_range.py | 11 -- 24 files changed, 410 insertions(+), 606 deletions(-) create mode 100644 src/documents/tests/search/_ast_helpers.py diff --git a/src/documents/tests/conftest.py b/src/documents/tests/conftest.py index 99f53d614..626760d31 100644 --- a/src/documents/tests/conftest.py +++ b/src/documents/tests/conftest.py @@ -182,3 +182,15 @@ def faker_session_locale(): @pytest.fixture(scope="session", autouse=True) def faker_seed(): return 12345 + + +@pytest.fixture +def indexed_document(_search_index: None) -> "Document": + """One searchable document, for tests about what the search endpoint + returns rather than about what it finds. + """ + from documents.search import get_backend + + doc = DocumentFactory.create(title="quarterly invoice", content="acme corp") + get_backend().add_or_update(doc) + return doc diff --git a/src/documents/tests/search/_ast_helpers.py b/src/documents/tests/search/_ast_helpers.py new file mode 100644 index 000000000..aa38c25af --- /dev/null +++ b/src/documents/tests/search/_ast_helpers.py @@ -0,0 +1,30 @@ +"""Field references and leaf constructors shared by the unit-level tests. + +These are pure whoosh-compat AST values with no state and no database +behind them, so they stay plain module-level functions rather than +fixtures. ``NOTES`` is the reason this module exists at all: notes is a +JSON field, so addressing its text means naming a subpath, and spelling +``wc.FieldRef("notes", "note")`` out once per test file invites two of +them to disagree. +""" + +from __future__ import annotations + +import whoosh_compat as wc +import whoosh_compat.ast as wc_ast + +CONTENT = wc.FieldRef("content") +TITLE = wc.FieldRef("title") +NOTES = wc.FieldRef("notes", "note") +BIGRAM_CONTENT = wc.FieldRef("bigram_content") +BIGRAM_TITLE = wc.FieldRef("bigram_title") + + +def content(text: str) -> wc_ast.Term: + """A Term on the content field, the default leaf these tests widen.""" + return wc_ast.Term(field=CONTENT, text=text) + + +def bigram(text: str) -> wc_ast.Term: + """A Term on the bigram side of content.""" + return wc_ast.Term(field=BIGRAM_CONTENT, text=text) diff --git a/src/documents/tests/search/conftest.py b/src/documents/tests/search/conftest.py index 7bb065cb0..64dfcfe0c 100644 --- a/src/documents/tests/search/conftest.py +++ b/src/documents/tests/search/conftest.py @@ -3,9 +3,12 @@ from __future__ import annotations from typing import TYPE_CHECKING import pytest +import tantivy from documents.search._backend import TantivyBackend from documents.search._backend import reset_backend +from documents.search._schema import build_schema +from documents.search._tokenizer import register_tokenizers from documents.tests.factories import DocumentFactory if TYPE_CHECKING: @@ -72,3 +75,23 @@ def matched_ids(backend: TantivyBackend) -> Callable[[str], set[int]]: return set(backend.search_ids(query, user=None)) return _matched_ids + + +@pytest.fixture(scope="module") +def query_index() -> tantivy.Index: + """An in-memory, unstemmed index for the parse-only tests. + + These never index a document, so one index per module is shared + read-only across that module's tests. + """ + idx = tantivy.Index(build_schema(), path=None) + register_tokenizers(idx, "") + return idx + + +@pytest.fixture +def fuzzy_enabled(settings: Settings) -> None: + """Enable the fuzzy blend clause. The threshold doubles as a minimum + score filter, so it is set to 0.0: every hit passes and the test sees + the clause's matching behaviour, not the filter's.""" + settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.0 diff --git a/src/documents/tests/search/test_acceptance.py b/src/documents/tests/search/test_acceptance.py index 10fd41fc8..097fc28de 100644 --- a/src/documents/tests/search/test_acceptance.py +++ b/src/documents/tests/search/test_acceptance.py @@ -18,13 +18,16 @@ from django.contrib.auth.models import User from documents.models import CustomField from documents.models import CustomFieldInstance -from documents.models import Document from documents.models import DocumentType from documents.models import Note from documents.models import StoragePath from documents.search._query import parse_user_query +from documents.tests.factories import DocumentFactory if TYPE_CHECKING: + from collections.abc import Callable + + from documents.models import Document from documents.search._backend import TantivyBackend pytestmark = [pytest.mark.search, pytest.mark.django_db] @@ -32,49 +35,28 @@ pytestmark = [pytest.mark.search, pytest.mark.django_db] FROZEN_NOW = datetime(2026, 6, 15, 12, 0, tzinfo=UTC) -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - """Create a Document and index it in one step, for the common case - where nothing needs to happen between the two (no related Note/ - CustomFieldInstance to attach first).""" - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - @pytest.fixture -def indexed_documents(backend: TantivyBackend) -> dict[str, int]: +def indexed_documents(index_document: Callable[..., Document]) -> dict[str, int]: """Index a small fixture set, return {label: doc_id} for corpus queries.""" docs = { - "invoice_2020": _index( - backend, + "invoice_2020": index_document( title="Invoice 2020", content="invoice total due", - checksum="acc-invoice-2020", archive_serial_number=100, ), - "invoice_2021": _index( - backend, + "invoice_2021": index_document( title="Invoice 2021", content="invoice total due", - checksum="acc-invoice-2021", archive_serial_number=101, ), - "invoice_2023": _index( - backend, + "invoice_2023": index_document( title="Invoice 2023", content="invoice total due", - checksum="acc-invoice-2023", archive_serial_number=102, ), - "receipt_2022": _index( - backend, + "receipt_2022": index_document( title="Receipt 2022", content="receipt total due", - checksum="acc-receipt-2022", archive_serial_number=103, ), } @@ -87,7 +69,7 @@ class TestIssue13568BracketWildcard: def test_bracket_class_wildcard_matches_only_in_range_years( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_documents: dict[str, int], ) -> None: """ @@ -105,7 +87,7 @@ class TestIssue13568BracketWildcard: - Only the 2020 and 2021 documents match, proving the bracket character class survived (issue #13568's original bug) """ - matched = _matched_ids(backend, "title:202[0-1]*") + matched = matched_ids("title:202[0-1]*") expected = { indexed_documents["invoice_2020"], indexed_documents["invoice_2021"], @@ -121,6 +103,7 @@ class TestFieldBoosts: def test_title_boost_ranks_title_match_above_content_only_match( self, backend: TantivyBackend, + index_document: Callable[..., Document], ) -> None: """ GIVEN: @@ -132,17 +115,13 @@ class TestFieldBoosts: - The title match ranks first, proving our title field boost actually affects ranking """ - title_match = _index( - backend, + title_match = index_document( title="urgent", content="nothing else relevant", - checksum="acc-boost-title", ) - _index( - backend, + index_document( title="nothing", content="urgent matter here", - checksum="acc-boost-content", ) query = parse_user_query(backend._index, "urgent", UTC) searcher = backend._index.searcher() @@ -157,6 +136,8 @@ class TestJsonSubpaths: def test_notes_user_matches_document_with_that_note_author( self, backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -168,20 +149,20 @@ class TestJsonSubpaths: - Only the document with alice's note matches """ alice = User.objects.create_user(username="alice") - doc_with_note = Document.objects.create( + doc_with_note = DocumentFactory( title="Has note", content="x", - checksum="acc-note-with", ) Note.objects.create(document=doc_with_note, user=alice, note="reminder") backend.add_or_update(doc_with_note) - _index(backend, title="No note", content="x", checksum="acc-note-without") - matched = _matched_ids(backend, "notes.user:alice") + index_document(title="No note", content="x") + matched = matched_ids("notes.user:alice") assert matched == {doc_with_note.pk} def test_custom_fields_name_and_value_combine( self, backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -203,10 +184,9 @@ class TestJsonSubpaths: name="Other Field", data_type=CustomField.FieldDataType.STRING, ) - matching = Document.objects.create( + matching = DocumentFactory( title="Matching", content="x", - checksum="acc-cf-matching", ) CustomFieldInstance.objects.create( document=matching, @@ -214,10 +194,9 @@ class TestJsonSubpaths: value_text="policy", ) backend.add_or_update(matching) - non_matching = Document.objects.create( + non_matching = DocumentFactory( title="Non-matching", content="x", - checksum="acc-cf-nonmatching", ) CustomFieldInstance.objects.create( document=non_matching, @@ -225,8 +204,7 @@ class TestJsonSubpaths: value_text="policy", ) backend.add_or_update(non_matching) - matched = _matched_ids( - backend, + matched = matched_ids( 'custom_fields.name:"Contract Number" custom_fields.value:policy', ) assert matched == {matching.pk} @@ -240,7 +218,7 @@ class TestUnregisteredIdFieldFoldsToLiteralText: def test_tag_id_query_matches_nothing( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_documents: dict[str, int], ) -> None: """ @@ -254,7 +232,7 @@ class TestUnregisteredIdFieldFoldsToLiteralText: - It folds to a literal text search and matches nothing, rather than erroring """ - matched = _matched_ids(backend, "tag_id:5") + matched = matched_ids("tag_id:5") assert matched == set() @@ -268,7 +246,8 @@ class TestFuzzyBlendSurvivesWhooshGrammar: def test_typo_fuzzy_matches_alongside_date_keyword( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], settings, ) -> None: """ @@ -287,26 +266,25 @@ class TestFuzzyBlendSurvivesWhooshGrammar: """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 with time_machine.travel(FROZEN_NOW, tick=False): - doc = _index( - backend, + doc = index_document( title="Receipt March", content="receipt total due", - checksum="fuzzy-blend-1", archive_serial_number=900, ) # Sanity: the exact spelling matches through the exact clause. - assert doc.pk in _matched_ids(backend, "added:today receipt") + assert doc.pk in matched_ids("added:today receipt") # The regression: the misspelling (one transposition) only # matches via the fuzzy clause, and "added:today" is # whoosh-only grammar tantivy's parser rejects, so raw-string # fuzzy parsing skips the clause entirely and this returns # nothing. The typo is deliberate; keep codespell away from it. typo_query = "added:today reciept" # codespell:ignore reciept - assert doc.pk in _matched_ids(backend, typo_query) + assert doc.pk in matched_ids(typo_query) def test_negated_words_do_not_fuzzy_match( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], settings, ) -> None: """ @@ -329,14 +307,12 @@ class TestFuzzyBlendSurvivesWhooshGrammar: """ settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.5 with time_machine.travel(FROZEN_NOW, tick=False): - _index( - backend, + index_document( title="Receipt Archive", content="receipt archived stack", - checksum="fuzzy-blend-2", archive_serial_number=901, ) - assert _matched_ids(backend, "added:today total NOT receipt") == set() + assert matched_ids("added:today total NOT receipt") == set() class TestUnquotedDateKeywordPhrases: @@ -346,21 +322,20 @@ class TestUnquotedDateKeywordPhrases: spelling keeps working now that paperless no longer pre-quotes it.""" @pytest.fixture - def period_documents(self, backend: TantivyBackend) -> dict[str, int]: + def period_documents( + self, + index_document: Callable[..., Document], + ) -> dict[str, int]: with time_machine.travel(FROZEN_NOW, tick=False): - in_may = _index( - backend, + in_may = index_document( title="May Doc", content="statement", - checksum="kw-may", archive_serial_number=910, added=datetime(2026, 5, 20, 12, 0, tzinfo=UTC), ) - in_june = _index( - backend, + in_june = index_document( title="June Doc", content="statement", - checksum="kw-june", archive_serial_number=911, added=datetime(2026, 6, 10, 12, 0, tzinfo=UTC), ) @@ -376,7 +351,7 @@ class TestUnquotedDateKeywordPhrases: ) def test_unquoted_matches_the_same_documents_as_quoted( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], period_documents: dict[str, int], query: str, ) -> None: @@ -393,7 +368,7 @@ class TestUnquotedDateKeywordPhrases: whoosh-compat's own grammar to accept it unquoted natively """ with time_machine.travel(FROZEN_NOW, tick=False): - assert _matched_ids(backend, query) == {period_documents["in_may"]} + assert matched_ids(query) == {period_documents["in_may"]} @pytest.mark.parametrize( "query", @@ -409,7 +384,7 @@ class TestUnquotedDateKeywordPhrases: ) def test_every_phrase_and_date_field_parses_without_error( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], period_documents: dict[str, int], query: str, ) -> None: @@ -426,11 +401,12 @@ class TestUnquotedDateKeywordPhrases: are whoosh-compat's own and are pinned in its own suite """ with time_machine.travel(FROZEN_NOW, tick=False): - _matched_ids(backend, query) + matched_ids(query) def test_text_field_keyword_words_are_ordinary_text( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], period_documents: dict[str, int], ) -> None: """ @@ -447,14 +423,12 @@ class TestUnquotedDateKeywordPhrases: documents do not match """ with time_machine.travel(FROZEN_NOW, tick=False): - wordy = _index( - backend, + wordy = index_document( title="Notes from the previous month", content="meeting notes", - checksum="kw-text", archive_serial_number=912, ) - assert _matched_ids(backend, "title:previous month") == {wordy.pk} + assert matched_ids("title:previous month") == {wordy.pk} class TestFieldAliases: @@ -464,7 +438,8 @@ class TestFieldAliases: def test_type_alias_and_canonical_name_match_the_same_document( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -487,25 +462,22 @@ class TestFieldAliases: real index """ invoice_type = DocumentType.objects.create(name="invoice") - typed = _index( - backend, + typed = index_document( title="First", content="quarterly statement", - checksum="alias-type-1", document_type=invoice_type, ) - _index( - backend, + index_document( title="Second", content="invoice mentioned in body", - checksum="alias-type-2", ) - assert _matched_ids(backend, "type:invoice") == {typed.pk} - assert _matched_ids(backend, "document_type:invoice") == {typed.pk} + assert matched_ids("type:invoice") == {typed.pk} + assert matched_ids("document_type:invoice") == {typed.pk} def test_path_alias_and_canonical_name_match_the_same_document( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -523,18 +495,14 @@ class TestFieldAliases: real index """ archive = StoragePath.objects.create(name="archive", path="archive/{title}") - stored = _index( - backend, + stored = index_document( title="Stored", content="quarterly statement", - checksum="alias-path-1", storage_path=archive, ) - _index( - backend, + index_document( title="Loose", content="archive mentioned in body", - checksum="alias-path-2", ) - assert _matched_ids(backend, "path:archive") == {stored.pk} - assert _matched_ids(backend, "storage_path:archive") == {stored.pk} + assert matched_ids("path:archive") == {stored.pk} + assert matched_ids("storage_path:archive") == {stored.pk} diff --git a/src/documents/tests/search/test_cjk_emit_registry.py b/src/documents/tests/search/test_cjk_emit_registry.py index 78db2d11e..da35bf1a7 100644 --- a/src/documents/tests/search/test_cjk_emit_registry.py +++ b/src/documents/tests/search/test_cjk_emit_registry.py @@ -10,19 +10,17 @@ from __future__ import annotations import pytest import tantivy -import whoosh_compat as wc import whoosh_compat.ast as wc_ast from documents.search._query import _CJK_BIGRAM_FIELDS from documents.search._query import _get_emit_field_registry from documents.search._schema import field_descriptors from documents.search._tokenizer import register_tokenizers +from documents.tests.search._ast_helpers import BIGRAM_CONTENT +from documents.tests.search._ast_helpers import CONTENT pytestmark = pytest.mark.search -_BIGRAM_CONTENT = wc.FieldRef("bigram_content") -_CONTENT = wc.FieldRef("content") - class TestEmitFieldRegistry: def test_a_multi_bigram_run_requires_every_bigram_even_under_an_or( @@ -41,8 +39,8 @@ class TestEmitFieldRegistry: """ tree = wc_ast.Or( children=( - wc_ast.Term(field=_BIGRAM_CONTENT, text="東京都"), - wc_ast.Term(field=_CONTENT, text="report"), + wc_ast.Term(field=BIGRAM_CONTENT, text="東京都"), + wc_ast.Term(field=CONTENT, text="report"), ), ) @@ -52,11 +50,11 @@ class TestEmitFieldRegistry: children=( wc_ast.And( children=( - wc_ast.Term(field=_BIGRAM_CONTENT, text="東京"), - wc_ast.Term(field=_BIGRAM_CONTENT, text="京都"), + wc_ast.Term(field=BIGRAM_CONTENT, text="東京"), + wc_ast.Term(field=BIGRAM_CONTENT, text="京都"), ), ), - wc_ast.Term(field=_CONTENT, text="report"), + wc_ast.Term(field=CONTENT, text="report"), ), ) @@ -95,7 +93,7 @@ class TestEmitFieldRegistry: writer.commit() index.reload() - resolved = _get_emit_field_registry(None).resolve(_BIGRAM_CONTENT) + resolved = _get_emit_field_registry(None).resolve(BIGRAM_CONTENT) assert resolved is not None tokens = resolved.spec.analyzer(text) diff --git a/src/documents/tests/search/test_cjk_leaf_rewrite.py b/src/documents/tests/search/test_cjk_leaf_rewrite.py index 815ec5d22..c98a774ac 100644 --- a/src/documents/tests/search/test_cjk_leaf_rewrite.py +++ b/src/documents/tests/search/test_cjk_leaf_rewrite.py @@ -19,26 +19,19 @@ from documents.search._query import _FIELD_BOOSTS from documents.search._query import _get_emit_field_registry from documents.search._query import _widen_leaf from documents.search._registry import get_field_registry +from documents.tests.search._ast_helpers import BIGRAM_CONTENT +from documents.tests.search._ast_helpers import BIGRAM_TITLE +from documents.tests.search._ast_helpers import CONTENT +from documents.tests.search._ast_helpers import NOTES +from documents.tests.search._ast_helpers import TITLE +from documents.tests.search._ast_helpers import bigram +from documents.tests.search._ast_helpers import content if TYPE_CHECKING: from collections.abc import Callable pytestmark = pytest.mark.search -_CONTENT = wc.FieldRef("content") -_TITLE = wc.FieldRef("title") -_NOTES = wc.FieldRef("notes", "note") -_BIGRAM_CONTENT = wc.FieldRef("bigram_content") -_BIGRAM_TITLE = wc.FieldRef("bigram_title") - - -def _content(text: str) -> wc_ast.Term: - return wc_ast.Term(field=_CONTENT, text=text) - - -def _bigram(text: str) -> wc_ast.Term: - return wc_ast.Term(field=_BIGRAM_CONTENT, text=text) - def _widened(original: wc_ast.Node, bigram_side: wc_ast.Node) -> wc_ast.Or: return wc_ast.Or(children=(original, bigram_side)) @@ -61,9 +54,9 @@ class TestTheHook: @pytest.mark.parametrize( "leaf", [ - pytest.param(_content("invoice"), id="latin_term"), + pytest.param(content("invoice"), id="latin_term"), pytest.param( - wc_ast.Term(field=_NOTES, text="東京"), + wc_ast.Term(field=NOTES, text="東京"), id="non_default_field", ), pytest.param(wc_ast.Term(field=None, text="東京"), id="unfielded"), @@ -96,7 +89,7 @@ class TestTheHook: - Neither cjk_terms nor latin_terms gains a piece, and the leaf is returned unchanged rather than becoming an empty Or """ - leaf = _content("⺀") + leaf = content("⺀") assert _widen_cjk_leaf(leaf) is leaf @@ -111,7 +104,7 @@ class TestTheHook: copy: analyze() only keeps the leaf's own enclosing-group analysis for that exact object """ - leaf = _content("東京") + leaf = content("東京") widened = _widen_cjk_leaf(leaf) @@ -128,11 +121,11 @@ class TestTheHook: - The bigram side targets bigram_title, the leaf's own field's companion, so a fielded term stays fielded """ - leaf = wc_ast.Term(field=_TITLE, text="東京") + leaf = wc_ast.Term(field=TITLE, text="東京") assert _widen_cjk_leaf(leaf) == _widened( leaf, - wc_ast.Term(field=_BIGRAM_TITLE, text="東京"), + wc_ast.Term(field=BIGRAM_TITLE, text="東京"), ) def test_each_cjk_run_gets_its_own_bigram_leaf(self) -> None: @@ -151,11 +144,11 @@ class TestTheHook: any one of its runs, which is what the separate bigram clause did before this change """ - leaf = _content("東京・大阪") + leaf = content("東京・大阪") assert _widen_cjk_leaf(leaf) == _widened( leaf, - wc_ast.Or(children=(_bigram("東京"), _bigram("大阪"))), + wc_ast.Or(children=(bigram("東京"), bigram("大阪"))), ) def test_each_run_keeps_its_own_bigrams_required(self) -> None: @@ -172,11 +165,11 @@ class TestTheHook: it does not inherit from the enclosing group. Without this, 東京都 would match a document holding only 京都 """ - assert _analyze(_content("東京都・大阪府")) == wc_ast.Or( + assert _analyze(content("東京都・大阪府")) == wc_ast.Or( children=( - wc_ast.And(children=(_content("東京都"), _content("大阪府"))), - wc_ast.And(children=(_bigram("東京"), _bigram("京都"))), - wc_ast.And(children=(_bigram("大阪"), _bigram("阪府"))), + wc_ast.And(children=(content("東京都"), content("大阪府"))), + wc_ast.And(children=(bigram("東京"), bigram("京都"))), + wc_ast.And(children=(bigram("大阪"), bigram("阪府"))), ), ) @@ -191,9 +184,9 @@ class TestTheHook: every token at position 0, so a positional Phrase against it could never match """ - leaf = wc_ast.Phrase(field=_CONTENT, text="東京都") + leaf = wc_ast.Phrase(field=CONTENT, text="東京都") - assert _widen_cjk_leaf(leaf) == _widened(leaf, _bigram("東京都")) + assert _widen_cjk_leaf(leaf) == _widened(leaf, bigram("東京都")) def test_a_multi_word_phrase_requires_every_run(self) -> None: """ @@ -208,27 +201,27 @@ class TestTheHook: the quoted phrase match strictly more than the same two words unquoted, and quoting must not widen a search """ - leaf = wc_ast.Phrase(field=_CONTENT, text="東京都 大阪府") + leaf = wc_ast.Phrase(field=CONTENT, text="東京都 大阪府") assert _widen_cjk_leaf(leaf) == _widened( leaf, - wc_ast.And(children=(_bigram("東京都"), _bigram("大阪府"))), + wc_ast.And(children=(bigram("東京都"), bigram("大阪府"))), ) @pytest.mark.parametrize( ("leaf", "alternative"), [ pytest.param( - _content("東京-report"), - wc_ast.And(children=(_bigram("東京"), _content("report"))), + content("東京-report"), + wc_ast.And(children=(bigram("東京"), content("report"))), id="separated_term", ), pytest.param( - wc_ast.Phrase(field=_CONTENT, text="東京 report"), - wc_ast.And(children=(_bigram("東京"), _content("report"))), + wc_ast.Phrase(field=CONTENT, text="東京 report"), + wc_ast.And(children=(bigram("東京"), content("report"))), id="phrase", ), - pytest.param(_content("東京report"), _bigram("東京"), id="glued"), + pytest.param(content("東京report"), bigram("東京"), id="glued"), ], ) def test_latin_is_required_only_where_the_analyzer_splits_it_off( @@ -265,9 +258,9 @@ class TestTheHook: in And (a single piece collapses to itself), even though the CJK side contributed nothing """ - leaf = _content("⺀report") + leaf = content("⺀report") - assert _widen_cjk_leaf(leaf) == _widened(leaf, _content("report")) + assert _widen_cjk_leaf(leaf) == _widened(leaf, content("report")) def test_new_nodes_carry_the_leaf_span(self) -> None: """ @@ -280,7 +273,7 @@ class TestTheHook: span, so an emit-time diagnostic still points into the query text """ - leaf = wc_ast.Term(field=_CONTENT, text="東京・大阪", startchar=3, endchar=8) + leaf = wc_ast.Term(field=CONTENT, text="東京・大阪", startchar=3, endchar=8) widened = _widen_cjk_leaf(leaf) @@ -298,9 +291,9 @@ class TestAnalyzedTree: @pytest.mark.parametrize( "node", [ - pytest.param(wc_ast.Prefix(field=_CONTENT, text="東京"), id="cjk_prefix"), + pytest.param(wc_ast.Prefix(field=CONTENT, text="東京"), id="cjk_prefix"), pytest.param( - wc_ast.Wildcard(field=_CONTENT, pattern="東*"), + wc_ast.Wildcard(field=CONTENT, pattern="東*"), id="cjk_wildcard", ), ], @@ -340,13 +333,13 @@ class TestAnalyzedTree: still negated under NOT. A NOT left holding nothing would turn into "match everything" instead """ - resolved = _get_emit_field_registry(None).resolve(_BIGRAM_CONTENT) + resolved = _get_emit_field_registry(None).resolve(BIGRAM_CONTENT) assert resolved is not None bigrams = resolved.spec.analyzer(long_cjk_run) - assert _analyze(build(_content(long_cjk_run))) == build( + assert _analyze(build(content(long_cjk_run))) == build( wc_ast.And( - children=tuple(_bigram(token) for token in dict.fromkeys(bigrams)), + children=tuple(bigram(token) for token in dict.fromkeys(bigrams)), ), ) @@ -361,11 +354,11 @@ class TestAnalyzedTree: has no bigram. An accepted gap, the same on the positive and the negated side """ - analyzed = _analyze(_content("東・大阪")) + analyzed = _analyze(content("東・大阪")) assert analyzed == _widened( - wc_ast.And(children=(_content("東"), _content("大阪"))), - _bigram("大阪"), + wc_ast.And(children=(content("東"), content("大阪"))), + bigram("大阪"), ) def test_the_title_boost_wraps_the_widened_title_leaf(self) -> None: @@ -393,14 +386,14 @@ class TestAnalyzedTree: assert ( wc_ast.Boosted( child=_widened( - wc_ast.Term(field=_TITLE, text="東京"), - wc_ast.Term(field=_BIGRAM_TITLE, text="東京"), + wc_ast.Term(field=TITLE, text="東京"), + wc_ast.Term(field=BIGRAM_TITLE, text="東京"), ), boost=_FIELD_BOOSTS["title"], ) in analyzed.children ) - assert {_BIGRAM_CONTENT, wc.FieldRef("bigram_tag")} <= { + assert {BIGRAM_CONTENT, wc.FieldRef("bigram_tag")} <= { child.field for child in analyzed.children if isinstance(child, wc_ast.Term) } @@ -418,18 +411,18 @@ class TestAnalyzedTree: alternative is not a single child here and _widened() does not fit; the tree is written out literally """ - tree = wc_ast.And(children=(_content("東京・大阪"), _content("report"))) + tree = wc_ast.And(children=(content("東京・大阪"), content("report"))) assert _analyze(tree) == wc_ast.And( children=( wc_ast.Or( children=( - wc_ast.And(children=(_content("東京"), _content("大阪"))), - _bigram("東京"), - _bigram("大阪"), + wc_ast.And(children=(content("東京"), content("大阪"))), + bigram("東京"), + bigram("大阪"), ), ), - _content("report"), + content("report"), ), ) @@ -443,15 +436,15 @@ class TestAnalyzedTree: - The original side ORs its tokens, as the group says, and the hook's Or flattens into the group """ - tree = wc_ast.Or(children=(_content("東京・大阪"), _content("report"))) + tree = wc_ast.Or(children=(content("東京・大阪"), content("report"))) assert _analyze(tree) == wc_ast.Or( children=( - _content("東京"), - _content("大阪"), - _bigram("東京"), - _bigram("大阪"), - _content("report"), + content("東京"), + content("大阪"), + bigram("東京"), + bigram("大阪"), + content("report"), ), ) @@ -460,12 +453,12 @@ class TestAnalyzedTree: [ pytest.param(lambda leaf: wc_ast.Not(child=leaf), id="not"), pytest.param( - lambda leaf: wc_ast.AndNot(positive=_content("invoice"), negative=leaf), + lambda leaf: wc_ast.AndNot(positive=content("invoice"), negative=leaf), id="andnot", ), pytest.param( lambda leaf: wc_ast.AndMaybe( - required=_content("invoice"), + required=content("invoice"), optional=leaf, ), id="andmaybe", @@ -473,7 +466,7 @@ class TestAnalyzedTree: pytest.param( lambda leaf: wc_ast.Require( scored=leaf, - filter_only=_content("invoice"), + filter_only=content("invoice"), ), id="require", ), @@ -500,6 +493,6 @@ class TestAnalyzedTree: position. A negated CJK leaf is widened too, so a negation excludes exactly what the positive search would match """ - assert _analyze(build(_content("東京"))) == build( - _widened(_content("東京"), _bigram("東京")), + assert _analyze(build(content("東京"))) == build( + _widened(content("東京"), bigram("東京")), ) diff --git a/src/documents/tests/search/test_compact_date_forms.py b/src/documents/tests/search/test_compact_date_forms.py index 48e0f2fd2..8ad4a54f5 100644 --- a/src/documents/tests/search/test_compact_date_forms.py +++ b/src/documents/tests/search/test_compact_date_forms.py @@ -20,67 +20,53 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: - from documents.search._backend import TantivyBackend + from collections.abc import Callable + + from documents.models import Document pytestmark = [pytest.mark.search, pytest.mark.django_db] -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - @pytest.fixture -def docs(backend: TantivyBackend) -> dict[str, int]: +def docs(index_document: Callable[..., Document]) -> dict[str, int]: return { - "instant": _index( - backend, + "instant": index_document( title="On the instant", content="x", - checksum="compact-date-instant", added=datetime(2005, 3, 4, 15, 30, tzinfo=UTC), ).pk, - "same_day": _index( - backend, + "same_day": index_document( title="Same day, other hour", content="x", - checksum="compact-date-same-day", added=datetime(2005, 3, 4, 9, 0, tzinfo=UTC), ).pk, - "next_day": _index( - backend, + "next_day": index_document( title="Next day, same hour", content="x", - checksum="compact-date-next-day", added=datetime(2005, 3, 5, 15, 30, tzinfo=UTC), ).pk, } -def test_fourteen_digits_is_a_single_instant( - backend: TantivyBackend, - docs: dict[str, int], -) -> None: - """ - GIVEN: - - Three documents indexed on the ``added`` DATETIME fast field: - one at 2005-03-04T15:30:00, one on the same calendar day at a - different hour, and one on the next day at the same hour - WHEN: - - Searching with the 14-digit compact date form - ``added:20050304153000`` - THEN: - - Only the document at that exact instant matches; the same-day - document is what tells this apart from the 8-digit day-window - form, and the next-day document from a form that ignored the - time of day altogether - """ - assert _matched_ids(backend, "added:20050304153000") == {docs["instant"]} +class TestCompactDateForms: + def test_fourteen_digits_is_a_single_instant( + self, + matched_ids: Callable[[str], set[int]], + docs: dict[str, int], + ) -> None: + """ + GIVEN: + - Three documents indexed on the ``added`` DATETIME fast field: + one at 2005-03-04T15:30:00, one on the same calendar day at a + different hour, and one on the next day at the same hour + WHEN: + - Searching with the 14-digit compact date form + ``added:20050304153000`` + THEN: + - Only the document at that exact instant matches; the same-day + document is what tells this apart from the 8-digit day-window + form, and the next-day document from a form that ignored the + time of day altogether + """ + assert matched_ids("added:20050304153000") == {docs["instant"]} diff --git a/src/documents/tests/search/test_date_keyword_phrase_removal.py b/src/documents/tests/search/test_date_keyword_phrase_removal.py index 97b814351..7dbd7998b 100644 --- a/src/documents/tests/search/test_date_keyword_phrase_removal.py +++ b/src/documents/tests/search/test_date_keyword_phrase_removal.py @@ -19,24 +19,14 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: - from documents.search._backend import TantivyBackend + from collections.abc import Callable + + from documents.models import Document pytestmark = [pytest.mark.search, pytest.mark.django_db] -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - class TestQuotedStringContainingDateKeywordText: """A quoted title phrase containing the literal text "added:previous month" as running words must match on that literal @@ -46,7 +36,8 @@ class TestQuotedStringContainingDateKeywordText: def test_matches_only_the_literal_phrase( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -67,11 +58,9 @@ class TestQuotedStringContainingDateKeywordText: never spill into an unfielded search for "previous" and "month" across the default search fields """ - literal = _index( - backend, + literal = index_document( title="see added:previous month notes", content="quarterly filing", - checksum="dkp-literal", archive_serial_number=920, ) # Under the deleted rewrite, this decoy would incorrectly match: @@ -79,13 +68,11 @@ class TestQuotedStringContainingDateKeywordText: # corrupted parse required as title phrases, and its content # supplies "previous" and "month" as the decomposed word-match # clauses the rewrite turned the middle of the phrase into. - decoy = _index( - backend, + decoy = index_document( title="see added: quarterly report notes", content="we reviewed the previous statement about month end", - checksum="dkp-decoy", archive_serial_number=921, ) query = 'title:"see added:previous month notes"' - assert _matched_ids(backend, query) == {literal.pk} - assert decoy.pk not in _matched_ids(backend, query) + assert matched_ids(query) == {literal.pk} + assert decoy.pk not in matched_ids(query) diff --git a/src/documents/tests/search/test_date_keyword_timezone.py b/src/documents/tests/search/test_date_keyword_timezone.py index 73eca2bbe..1071ccaec 100644 --- a/src/documents/tests/search/test_date_keyword_timezone.py +++ b/src/documents/tests/search/test_date_keyword_timezone.py @@ -32,32 +32,23 @@ from typing import TYPE_CHECKING import pytest import time_machine -from documents.models import Document - if TYPE_CHECKING: + from collections.abc import Callable + from pytest_django.fixtures import SettingsWrapper - from documents.search._backend import TantivyBackend + from documents.models import Document pytestmark = [pytest.mark.search, pytest.mark.django_db] FROZEN_NOW = datetime(2026, 6, 15, 2, 0, tzinfo=UTC) -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - class TestDateKeywordUsesTheActiveTimezone: def test_today_matches_the_new_york_calendar_day_not_the_utc_one( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], settings: SettingsWrapper, ) -> None: """ @@ -79,22 +70,18 @@ class TestDateKeywordUsesTheActiveTimezone: """ settings.TIME_ZONE = "America/New_York" with time_machine.travel(FROZEN_NOW, tick=False): - in_ny_today = _index( - backend, + in_ny_today = index_document( title="NY today", content="x", - checksum="tz-keyword-ny-today", added=datetime(2026, 6, 14, 20, 0, tzinfo=UTC), ) # Not captured: the exact-set assertion below already proves # this document (inside a naive UTC-calendar-day window, but # outside New York's actual "today") does not match. - _index( - backend, + index_document( title="UTC calendar day only", content="x", - checksum="tz-keyword-utc-calendar-day-only", added=datetime(2026, 6, 15, 10, 0, tzinfo=UTC), ) - assert _matched_ids(backend, "added:today") == {in_ny_today.pk} + assert matched_ids("added:today") == {in_ny_today.pk} diff --git a/src/documents/tests/search/test_documented_syntax.py b/src/documents/tests/search/test_documented_syntax.py index fa69f3f68..d00551c25 100644 --- a/src/documents/tests/search/test_documented_syntax.py +++ b/src/documents/tests/search/test_documented_syntax.py @@ -24,16 +24,18 @@ from typing import TYPE_CHECKING import pytest import time_machine -from documents.models import Document from documents.models import Note from documents.models import Tag from documents.search._errors import InvalidDateQuery +from documents.tests.factories import DocumentFactory if TYPE_CHECKING: + from collections.abc import Callable from collections.abc import Generator from django.contrib.auth.models import User + from documents.models import Document from documents.search._backend import TantivyBackend pytestmark = [pytest.mark.search, pytest.mark.django_db] @@ -45,37 +47,23 @@ FROZEN_NOW = datetime(2026, 6, 15, 12, 0, tzinfo=UTC) DOC_CHECKSUM = "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08" -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - class TestLogicalExpressions: @pytest.fixture - def docs(self, backend: TantivyBackend) -> dict[str, int]: + def docs(self, index_document: Callable[..., Document]) -> dict[str, int]: return { - "secret": _index( - backend, + "secret": index_document( title="Invoice one", content="invoice secret contents", - checksum="doc-syntax-secret", ).pk, - "plain": _index( - backend, + "plain": index_document( title="Invoice two", content="invoice ordinary contents", - checksum="doc-syntax-plain", ).pk, } def test_not_excludes_a_term( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], docs: dict[str, int], ) -> None: """ @@ -86,11 +74,11 @@ class TestLogicalExpressions: THEN: - Only the document without "secret" matches """ - assert _matched_ids(backend, "invoice NOT secret") == {docs["plain"]} + assert matched_ids("invoice NOT secret") == {docs["plain"]} def test_leading_hyphen_requires_the_term_instead_of_excluding_it( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], docs: dict[str, int], ) -> None: """ @@ -104,11 +92,11 @@ class TestLogicalExpressions: indexed as the plain term "secret" and the query becomes an AND rather than an exclusion, exactly as the docs warn """ - assert _matched_ids(backend, "invoice -secret") == {docs["secret"]} + assert matched_ids("invoice -secret") == {docs["secret"]} def test_or_inside_parentheses_matches_either_branch( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], docs: dict[str, int], ) -> None: """ @@ -120,14 +108,15 @@ class TestLogicalExpressions: THEN: - Both documents match """ - matched = _matched_ids(backend, "invoice AND (secret OR ordinary)") + matched = matched_ids("invoice AND (secret OR ordinary)") assert matched == {docs["secret"], docs["plain"]} class TestPhraseSearch: def test_quoted_phrase_requires_the_words_in_order( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -138,14 +127,12 @@ class TestPhraseSearch: - The in-order phrase matches, and the same words reordered do not """ - doc = _index( - backend, + doc = index_document( title="Phrase", content="the quick brown fox jumps", - checksum="doc-syntax-phrase", ) - assert _matched_ids(backend, '"quick brown fox"') == {doc.pk} - assert _matched_ids(backend, '"brown quick fox"') == set() + assert matched_ids('"quick brown fox"') == {doc.pk} + assert matched_ids('"brown quick fox"') == set() class TestTagCommaList: @@ -166,6 +153,7 @@ class TestTagCommaList: def test_comma_list_requires_every_listed_tag( self, backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -181,30 +169,22 @@ class TestTagCommaList: unpaid = Tag.objects.create(name="unpaid") archived = Tag.objects.create(name="archived") - both = Document.objects.create( - title="Both tags", - content="body", - checksum="doc-syntax-tag-both", - ) + both = DocumentFactory(title="Both tags", content="body") both.tags.add(bills, unpaid) backend.add_or_update(both) - one = Document.objects.create( - title="One tag", - content="body", - checksum="doc-syntax-tag-one", - ) + one = DocumentFactory(title="One tag", content="body") one.tags.add(bills, archived) backend.add_or_update(one) - assert _matched_ids(backend, "tag:bills,unpaid") == {both.pk} - assert _matched_ids(backend, "tag:bills") == {both.pk, one.pk} + assert matched_ids("tag:bills,unpaid") == {both.pk} + assert matched_ids("tag:bills") == {both.pk, one.pk} class TestArchiveMetadataFields: @pytest.fixture def doc(self, backend: TantivyBackend, admin_user: User) -> Document: - doc = Document.objects.create( + doc = DocumentFactory( title="Metadata", content="body", checksum=DOC_CHECKSUM, @@ -237,7 +217,7 @@ class TestArchiveMetadataFields: ) def test_documented_metadata_query_matches( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], doc: Document, query: str, ) -> None: @@ -253,7 +233,7 @@ class TestArchiveMetadataFields: THEN: - Each one matches the document """ - assert _matched_ids(backend, query) == {doc.pk} + assert matched_ids(query) == {doc.pk} @pytest.mark.parametrize( "query", @@ -265,7 +245,7 @@ class TestArchiveMetadataFields: ) def test_partial_or_uppercase_checksum_matches_nothing( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], doc: Document, query: str, ) -> None: @@ -279,7 +259,7 @@ class TestArchiveMetadataFields: - Nothing matches, as the docs say only a complete, lowercase checksum matches as an exact value """ - assert _matched_ids(backend, query) == set() + assert matched_ids(query) == set() class TestDocumentedDateForms: @@ -289,7 +269,7 @@ class TestDocumentedDateForms: yield @pytest.fixture - def dated(self, backend: TantivyBackend) -> dict[str, int]: + def dated(self, index_document: Callable[..., Document]) -> dict[str, int]: stamps = { "today": datetime(2026, 6, 15, 9, 0, tzinfo=UTC), "yesterday": datetime(2026, 6, 14, 9, 0, tzinfo=UTC), @@ -300,11 +280,9 @@ class TestDocumentedDateForms: "old": datetime(2005, 3, 4, 15, 30, tzinfo=UTC), } return { - label: _index( - backend, + label: index_document( title=label, content="dated body", - checksum=f"doc-syntax-date-{label}", added=stamp, ).pk for label, stamp in stamps.items() @@ -335,7 +313,7 @@ class TestDocumentedDateForms: ) def test_documented_date_form_matches_its_day_or_month( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], dated: dict[str, int], query: str, label: str, @@ -355,7 +333,7 @@ class TestDocumentedDateForms: - Each form matches exactly the document dated on its day or within its month """ - assert _matched_ids(backend, query) == {dated[label]} + assert matched_ids(query) == {dated[label]} @pytest.mark.parametrize( "query", @@ -381,7 +359,7 @@ class TestDocumentedDateForms: ) def test_forms_the_docs_warn_about_match_nothing( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], dated: dict[str, int], query: str, ) -> None: @@ -400,11 +378,11 @@ class TestDocumentedDateForms: - Nothing matches, exactly as the docs warn, rather than presenting these as usable spellings """ - assert _matched_ids(backend, query) == set() + assert matched_ids(query) == set() def test_bare_timestamp_is_rejected_rather_than_matching_nothing( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], dated: dict[str, int], ) -> None: """ @@ -423,13 +401,13 @@ class TestDocumentedDateForms: prefix the date grammar's tokenizer first split on """ with pytest.raises(InvalidDateQuery) as exc_info: - _matched_ids(backend, "added:2005-03-04T15:30:00Z") + matched_ids("added:2005-03-04T15:30:00Z") assert exc_info.value.field == "added" assert exc_info.value.value == "2005-03-04T15:30:00Z" def test_relative_offset_as_a_range_bound_is_a_real_window( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], dated: dict[str, int], ) -> None: """ @@ -447,14 +425,14 @@ class TestDocumentedDateForms: the offset itself and not a whole-day rounding of it, as the docs say next to the warning about the standalone form """ - assert _matched_ids(backend, "added:['-1 week' to now]") == { + assert matched_ids("added:['-1 week' to now]") == { dated["today"], dated["yesterday"], } def test_double_quoted_range_bound_is_rejected( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], dated: dict[str, int], ) -> None: """ @@ -471,5 +449,5 @@ class TestDocumentedDateForms: attached and is not a recognizable date """ with pytest.raises(InvalidDateQuery) as exc_info: - _matched_ids(backend, 'added:["2005-03-04" to 2005-03-05]') + matched_ids('added:["2005-03-04" to 2005-03-05]') assert exc_info.value.value == '"2005-03-04"' diff --git a/src/documents/tests/search/test_error_routing.py b/src/documents/tests/search/test_error_routing.py index cd8822560..3382a395e 100644 --- a/src/documents/tests/search/test_error_routing.py +++ b/src/documents/tests/search/test_error_routing.py @@ -8,9 +8,9 @@ from __future__ import annotations import logging from datetime import UTC +from typing import TYPE_CHECKING import pytest -import tantivy from whoosh_compat.errors import Diagnostic from whoosh_compat.errors import DiagnosticKind from whoosh_compat.errors import QueryError @@ -22,22 +22,16 @@ from documents.search._errors import SearchQueryError from documents.search._query import _map_emit_error from documents.search._query import _single_diagnostic_to_error from documents.search._query import parse_user_query -from documents.search._schema import build_schema -from documents.search._tokenizer import register_tokenizers + +if TYPE_CHECKING: + import tantivy + pytestmark = pytest.mark.search _LIBRARY_PROSE = "INTERNAL LIBRARY WORDING WITH raw tantivy detail" -@pytest.fixture(scope="module") -def query_index() -> tantivy.Index: - """An in-memory, unstemmed index; these tests only parse, never index.""" - idx = tantivy.Index(build_schema(), path=None) - register_tokenizers(idx, "") - return idx - - def _diagnostic( kind: DiagnosticKind, *, diff --git a/src/documents/tests/search/test_exists_on_json_fields.py b/src/documents/tests/search/test_exists_on_json_fields.py index 875087439..945668f86 100644 --- a/src/documents/tests/search/test_exists_on_json_fields.py +++ b/src/documents/tests/search/test_exists_on_json_fields.py @@ -19,9 +19,9 @@ from __future__ import annotations import logging from datetime import UTC +from typing import TYPE_CHECKING import pytest -import tantivy from whoosh_compat.errors import Diagnostic from whoosh_compat.errors import DiagnosticKind from whoosh_compat.errors import QueryError @@ -32,8 +32,10 @@ from whoosh_compat.fields import FieldRef from documents.search._errors import SearchQueryError from documents.search._query import _map_emit_error from documents.search._query import parse_user_query -from documents.search._schema import build_schema -from documents.search._tokenizer import register_tokenizers + +if TYPE_CHECKING: + import tantivy + pytestmark = pytest.mark.search @@ -48,13 +50,6 @@ EXISTS_QUERIES = [ ] -@pytest.fixture(scope="module") -def query_index() -> tantivy.Index: - idx = tantivy.Index(build_schema(), path=None) - register_tokenizers(idx, "") - return idx - - class TestJsonExistsIsUserError: @pytest.mark.parametrize("query", EXISTS_QUERIES) def test_query_is_a_400_that_emits_no_error_log( diff --git a/src/documents/tests/search/test_fuzzy_alternative.py b/src/documents/tests/search/test_fuzzy_alternative.py index b788bc7c4..0e81893e9 100644 --- a/src/documents/tests/search/test_fuzzy_alternative.py +++ b/src/documents/tests/search/test_fuzzy_alternative.py @@ -14,11 +14,12 @@ import whoosh_compat as wc import whoosh_compat.ast as wc_ast from documents.search._query import _fuzzy_alternative +from documents.tests.search._ast_helpers import CONTENT +from documents.tests.search._ast_helpers import TITLE +from documents.tests.search._ast_helpers import content pytestmark = pytest.mark.search -_CONTENT = wc.FieldRef("content") -_TITLE = wc.FieldRef("title") # 130 characters, past the analyzer's 129-byte remove_long limit (128 is # kept, 129 is dropped), so the index never holds it and neither side @@ -26,10 +27,6 @@ _TITLE = wc.FieldRef("title") _TOO_LONG = "x" * 130 -def _content(text: str) -> wc_ast.Term: - return wc_ast.Term(field=_CONTENT, text=text) - - def _fuzzy(field: wc.FieldRef, text: str) -> wc_ast.Fuzzy: return wc_ast.Fuzzy(field=field, text=text, distance=1, prefix=True) @@ -45,7 +42,7 @@ class TestTheAlternative: - It is a single Fuzzy leaf on the same field, distance 1 and prefix matching, which is what the old clause used """ - assert _fuzzy_alternative(_content("invoice")) == _fuzzy(_CONTENT, "invoice") + assert _fuzzy_alternative(content("invoice")) == _fuzzy(CONTENT, "invoice") def test_the_leafs_own_field_is_used(self) -> None: """ @@ -58,8 +55,8 @@ class TestTheAlternative: fields. This is the fielding fix: today's clause searches a fielded word everywhere """ - assert _fuzzy_alternative(wc_ast.Term(field=_TITLE, text="invoice")) == _fuzzy( - _TITLE, + assert _fuzzy_alternative(wc_ast.Term(field=TITLE, text="invoice")) == _fuzzy( + TITLE, "invoice", ) @@ -74,8 +71,8 @@ class TestTheAlternative: side, which is OR'd for an unfielded term, and would lose today's per-word recall inside a term """ - assert _fuzzy_alternative(_content("COVID-19")) == wc_ast.Or( - children=(_fuzzy(_CONTENT, "covid"), _fuzzy(_CONTENT, "19")), + assert _fuzzy_alternative(content("COVID-19")) == wc_ast.Or( + children=(_fuzzy(CONTENT, "covid"), _fuzzy(CONTENT, "19")), ) def test_words_are_split_where_the_index_splits_them(self) -> None: @@ -88,7 +85,7 @@ class TestTheAlternative: - The Fuzzy text is the analyzer's output, not the raw text, so it is in the same shape as the index terms """ - assert _fuzzy_alternative(_content("Éclair")) == _fuzzy(_CONTENT, "eclair") + assert _fuzzy_alternative(content("Éclair")) == _fuzzy(CONTENT, "eclair") def test_the_splitter_does_not_stem(self) -> None: """ @@ -101,8 +98,8 @@ class TestTheAlternative: pattern_normalizer, which stems it once; stemming here too would search for a term the index does not hold """ - assert _fuzzy_alternative(_content("universities")) == _fuzzy( - _CONTENT, + assert _fuzzy_alternative(content("universities")) == _fuzzy( + CONTENT, "universities", ) @@ -130,7 +127,7 @@ class TestTheAlternative: that can never match, making a query return LESS with fuzzy on than off """ - assert _fuzzy_alternative(_content(text)) is None + assert _fuzzy_alternative(content(text)) is None def test_a_one_character_word_is_dropped_from_a_longer_term(self) -> None: """ @@ -142,7 +139,7 @@ class TestTheAlternative: - Only the real word survives. A one-character prefix fuzzy term matches every term in the field """ - assert _fuzzy_alternative(_content("h52.1")) == _fuzzy(_CONTENT, "h52") + assert _fuzzy_alternative(content("h52.1")) == _fuzzy(CONTENT, "h52") def test_the_leaf_span_is_copied(self) -> None: """ @@ -155,7 +152,7 @@ class TestTheAlternative: - Every node it builds carries that span, so an emit-time diagnostic still points into the query text """ - leaf = wc_ast.Term(field=_CONTENT, text="ab-cd", startchar=4, endchar=9) + leaf = wc_ast.Term(field=CONTENT, text="ab-cd", startchar=4, endchar=9) alternative = _fuzzy_alternative(leaf) @@ -181,10 +178,10 @@ class TestPhrasesAreNotWidened: quoted phrase match strictly more than the same two words unquoted """ - leaf = wc_ast.Phrase(field=_CONTENT, text="tax report") + leaf = wc_ast.Phrase(field=CONTENT, text="tax report") assert _fuzzy_alternative(leaf) == wc_ast.And( - children=(_fuzzy(_CONTENT, "tax"), _fuzzy(_CONTENT, "report")), + children=(_fuzzy(CONTENT, "tax"), _fuzzy(CONTENT, "report")), ) @@ -209,7 +206,7 @@ class TestCjkGetsNoFuzzySide: one edit of its start, which is the "東京都 matches 京都" failure the bigram fields exist to avoid """ - assert _fuzzy_alternative(_content(text)) is None + assert _fuzzy_alternative(content(text)) is None def test_latin_beside_cjk_still_gets_its_fuzzy_side(self) -> None: """ @@ -221,6 +218,6 @@ class TestCjkGetsNoFuzzySide: - Only the latin word is fuzzed. Skipping CJK words must not cost the latin half its near-match """ - leaf = _content("東京 report") + leaf = content("東京 report") - assert _fuzzy_alternative(leaf) == _fuzzy(_CONTENT, "report") + assert _fuzzy_alternative(leaf) == _fuzzy(CONTENT, "report") diff --git a/src/documents/tests/search/test_fuzzy_tokenization.py b/src/documents/tests/search/test_fuzzy_tokenization.py index 8eaff30bb..e95b12df0 100644 --- a/src/documents/tests/search/test_fuzzy_tokenization.py +++ b/src/documents/tests/search/test_fuzzy_tokenization.py @@ -13,38 +13,23 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: - from pytest_django.fixtures import SettingsWrapper + from collections.abc import Callable - from documents.search._backend import TantivyBackend + from documents.models import Document -pytestmark = [pytest.mark.search, pytest.mark.django_db] - - -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - -@pytest.fixture(autouse=True) -def fuzzy_enabled(settings: SettingsWrapper) -> None: - """Enable the fuzzy blend clause. The threshold doubles as a minimum - score filter, so it is set to 0.0: every hit passes and the test sees - the clause's matching behaviour, not the filter's.""" - settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.0 +pytestmark = [ + pytest.mark.search, + pytest.mark.django_db, + pytest.mark.usefixtures("fuzzy_enabled"), +] class TestFuzzyClauseWords: def test_a_stemmed_word_is_not_stemmed_a_second_time( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -62,36 +47,29 @@ class TestFuzzyClauseWords: reaches unrelated words - the clause must stay wide enough for a typo and no wider """ - wanted = _index( - backend, + wanted = index_document( title="A", content="universities of europe", - checksum="fuzz-stem-1", ) - typo = _index( - backend, + typo = index_document( title="B", content="universties of europe", - checksum="fuzz-stem-2", ) - _index( - backend, + index_document( title="C", content="univalent chemical bonds", - checksum="fuzz-stem-3", ) - _index( - backend, + index_document( title="D", content="unicycle repair manual", - checksum="fuzz-stem-4", ) - assert _matched_ids(backend, "universities") == {wanted.pk, typo.pk} + assert matched_ids("universities") == {wanted.pk, typo.pk} def test_a_hyphenated_term_still_reaches_the_clause( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -105,18 +83,17 @@ class TestFuzzyClauseWords: would read as grammar, is dropped, and the whole query loses its fuzzy clause """ - misspelled = _index( - backend, + misspelled = index_document( title="A", content="covidx testing results", - checksum="fuzz-hyphen-1", ) - assert _matched_ids(backend, "COVID-19") == {misspelled.pk} + assert matched_ids("COVID-19") == {misspelled.pk} def test_a_phrase_still_reaches_the_clause( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -129,14 +106,12 @@ class TestFuzzyClauseWords: space, and is the whole query's only free text here, so it must still reach the clause """ - near_miss = _index( - backend, + near_miss = index_document( title="A", content="taxation reportage weekly", - checksum="fuzz-phrase-1", ) - assert _matched_ids(backend, '"tax reports"') == {near_miss.pk} + assert matched_ids('"tax reports"') == {near_miss.pk} class TestBooleanKeywordsInRawText: @@ -146,24 +121,18 @@ class TestBooleanKeywordsInRawText: now, which closes that off structurally; these pin it shut.""" @pytest.fixture - def corpus(self, backend: TantivyBackend) -> dict[str, int]: - both = _index( - backend, + def corpus(self, index_document: Callable[..., Document]) -> dict[str, int]: + both = index_document( title="A", content="taxation reportage weekly", - checksum="fuzz-kw-1", ) - tax_only = _index( - backend, + tax_only = index_document( title="B", content="taxation only here", - checksum="fuzz-kw-2", ) - report_only = _index( - backend, + report_only = index_document( title="C", content="reportage only here", - checksum="fuzz-kw-3", ) return { "both": both.pk, @@ -182,7 +151,7 @@ class TestBooleanKeywordsInRawText: ) def test_a_keyword_inside_a_phrase_stays_an_ordinary_word( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], corpus: dict[str, int], keyword_spelling: str, ordinary_spelling: str, @@ -201,14 +170,11 @@ class TestBooleanKeywordsInRawText: exclusion, IN does not fail the parse. Only the upper-case spelling was ever grammar """ - assert _matched_ids(backend, keyword_spelling) == _matched_ids( - backend, - ordinary_spelling, - ) + assert matched_ids(keyword_spelling) == matched_ids(ordinary_spelling) def test_a_phrase_needs_a_near_match_for_every_word( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], corpus: dict[str, int], ) -> None: """ @@ -222,11 +188,11 @@ class TestBooleanKeywordsInRawText: quoted phrase asks for more than the bare words, so its fuzzy side requires every one of them """ - assert _matched_ids(backend, '"tax reports"') == {corpus["both"]} + assert matched_ids('"tax reports"') == {corpus["both"]} def test_a_trailing_keyword_is_just_a_word( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], corpus: dict[str, int], ) -> None: """ @@ -242,7 +208,4 @@ class TestBooleanKeywordsInRawText: is re-parsed any more, so a trailing keyword cannot cost the query its fuzzy side """ - assert _matched_ids(backend, '"tax AND"') == _matched_ids( - backend, - '"tax and"', - ) + assert matched_ids('"tax AND"') == matched_ids('"tax and"') diff --git a/src/documents/tests/search/test_highlight_query_guard.py b/src/documents/tests/search/test_highlight_query_guard.py index 48bf83502..cf9e96378 100644 --- a/src/documents/tests/search/test_highlight_query_guard.py +++ b/src/documents/tests/search/test_highlight_query_guard.py @@ -29,8 +29,6 @@ from rest_framework import status from documents.search._backend import SearchMode from documents.search._query import parse_simple_text_highlight_query -from documents.search._schema import build_schema -from documents.search._tokenizer import register_tokenizers from documents.tests.factories import DocumentFactory if TYPE_CHECKING: @@ -55,15 +53,6 @@ _MALFORMED_QUERIES = [ ] -@pytest.fixture(scope="module") -def query_index() -> tantivy.Index: - """An in-memory, unstemmed index for parse-only tests.""" - schema = build_schema() - idx = tantivy.Index(schema, path=None) - register_tokenizers(idx, "") - return idx - - class TestParseSimpleTextHighlightQueryDoesNotRaise: """The query builder itself must tolerate Tantivy syntax in its tokens.""" diff --git a/src/documents/tests/search/test_json_field_prefixes.py b/src/documents/tests/search/test_json_field_prefixes.py index 8d0ccedd4..df737f39d 100644 --- a/src/documents/tests/search/test_json_field_prefixes.py +++ b/src/documents/tests/search/test_json_field_prefixes.py @@ -21,29 +21,24 @@ from django.contrib.auth.models import User from documents.models import CustomField from documents.models import CustomFieldInstance -from documents.models import Document from documents.models import Note +from documents.tests.factories import DocumentFactory if TYPE_CHECKING: + from collections.abc import Callable + + from documents.models import Document from documents.search._backend import TantivyBackend pytestmark = [pytest.mark.search, pytest.mark.django_db] -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - -def _index(backend: TantivyBackend, **kwargs: object) -> Document: - doc = Document.objects.create(**kwargs) - backend.add_or_update(doc) - return doc - - class TestBareJsonFieldPrefixes: def test_bare_notes_prefix_searches_note_text( self, backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -59,26 +54,22 @@ class TestBareJsonFieldPrefixes: text search """ alice = User.objects.create_user(username="alice") - with_note = Document.objects.create( - title="Has note", - content="x", - checksum="bare-notes-with", - ) + with_note = DocumentFactory(title="Has note", content="x") Note.objects.create(document=with_note, user=alice, note="crocodile") backend.add_or_update(with_note) # This document's CONTENT contains the words a demoted text search # would match; it must NOT match once the prefix addresses notes. - _index( - backend, + index_document( title="Notes about things", content="notes crocodile mention", - checksum="bare-notes-decoy", ) - assert _matched_ids(backend, "notes:crocodile") == {with_note.pk} + assert matched_ids("notes:crocodile") == {with_note.pk} def test_bare_custom_fields_prefix_searches_values( self, backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -96,28 +87,23 @@ class TestBareJsonFieldPrefixes: name="Policy Number", data_type=CustomField.FieldDataType.STRING, ) - with_value = Document.objects.create( - title="Has field", - content="x", - checksum="bare-cf-with", - ) + with_value = DocumentFactory(title="Has field", content="x") CustomFieldInstance.objects.create( document=with_value, field=field, value_text="crocodile", ) backend.add_or_update(with_value) - _index( - backend, + index_document( title="Custom things", content="custom fields crocodile", - checksum="bare-cf-decoy", ) - assert _matched_ids(backend, "custom_fields:crocodile") == {with_value.pk} + assert matched_ids("custom_fields:crocodile") == {with_value.pk} def test_subpath_spellings_are_untouched( self, backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -131,15 +117,11 @@ class TestBareJsonFieldPrefixes: prefix does not interfere with explicit subpath addressing """ bob = User.objects.create_user(username="bob") - doc = Document.objects.create( - title="Bob note", - content="x", - checksum="bare-subpath", - ) + doc = DocumentFactory(title="Bob note", content="x") Note.objects.create(document=doc, user=bob, note="remark") backend.add_or_update(doc) - assert _matched_ids(backend, "notes.user:bob") == {doc.pk} - assert _matched_ids(backend, "notes.note:remark") == {doc.pk} + assert matched_ids("notes.user:bob") == {doc.pk} + assert matched_ids("notes.note:remark") == {doc.pk} class TestQuotedPhraseContainingNotesColonIsNotCorrupted: @@ -152,7 +134,8 @@ class TestQuotedPhraseContainingNotesColonIsNotCorrupted: def test_quoted_phrase_with_notes_colon_matches_by_content( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -167,20 +150,16 @@ class TestQuotedPhraseContainingNotesColonIsNotCorrupted: that matches nothing (the bug the deleted regex rewrite caused, since it was blind to quoting) """ - target = _index( - backend, + target = index_document( title="Statement", content="payment notes: none", - checksum="quoted-phrase-notes-colon", ) - assert _matched_ids( - backend, - 'content:"payment notes: none"', - ) == {target.pk} + assert matched_ids('content:"payment notes: none"') == {target.pk} def test_quoted_phrase_matches_the_same_document_unquoted( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], ) -> None: """ GIVEN: @@ -194,13 +173,8 @@ class TestQuotedPhraseContainingNotesColonIsNotCorrupted: quote-awareness specifically, not about the words themselves being unsearchable """ - target = _index( - backend, + target = index_document( title="Statement", content="payment notes none", - checksum="quoted-phrase-no-colon", ) - assert _matched_ids( - backend, - 'content:"payment notes none"', - ) == {target.pk} + assert matched_ids('content:"payment notes none"') == {target.pk} diff --git a/src/documents/tests/search/test_negated_leaf_ids.py b/src/documents/tests/search/test_negated_leaf_ids.py index bea7069ec..9df5daec0 100644 --- a/src/documents/tests/search/test_negated_leaf_ids.py +++ b/src/documents/tests/search/test_negated_leaf_ids.py @@ -11,19 +11,14 @@ identity. from __future__ import annotations import pytest -import whoosh_compat as wc import whoosh_compat.ast as wc_ast from documents.search._query import _negated_leaf_ids +from documents.tests.search._ast_helpers import CONTENT +from documents.tests.search._ast_helpers import content pytestmark = pytest.mark.search -_CONTENT = wc.FieldRef("content") - - -def _term(text: str) -> wc_ast.Term: - return wc_ast.Term(field=_CONTENT, text=text) - class TestCollection: def test_a_bare_tree_has_no_negated_leaves(self) -> None: @@ -35,7 +30,7 @@ class TestCollection: THEN: - The set is empty """ - tree = wc_ast.And(children=(_term("invoice"), _term("report"))) + tree = wc_ast.And(children=(content("invoice"), content("report"))) assert _negated_leaf_ids(tree) == frozenset() @@ -48,8 +43,8 @@ class TestCollection: THEN: - That leaf's id is collected, and the positive one is not """ - positive = _term("invoice") - negated = _term("secret") + positive = content("invoice") + negated = content("secret") tree = wc_ast.And(children=(positive, wc_ast.Not(child=negated))) ids = _negated_leaf_ids(tree) @@ -66,8 +61,8 @@ class TestCollection: THEN: - Only the negative side is collected """ - positive = _term("invoice") - negated = _term("secret") + positive = content("invoice") + negated = content("secret") tree = wc_ast.AndNot(positive=positive, negative=negated) ids = _negated_leaf_ids(tree) @@ -86,9 +81,9 @@ class TestCollection: - All of them are collected, at any depth and whatever the leaf type """ - a = _term("alpha") - b = _term("beta") - phrase = wc_ast.Phrase(field=_CONTENT, text="gamma delta") + a = content("alpha") + b = content("beta") + phrase = wc_ast.Phrase(field=CONTENT, text="gamma delta") tree = wc_ast.Not( child=wc_ast.Or( children=(a, wc_ast.And(children=(b, phrase))), @@ -109,7 +104,7 @@ class TestCollection: under-collecting would make a negation exclude far more than the user asked """ - leaf = _term("tax") + leaf = content("tax") tree = wc_ast.Not(child=wc_ast.Not(child=leaf)) assert _negated_leaf_ids(tree) == frozenset({id(leaf)}) @@ -144,7 +139,7 @@ class TestCollection: - Nothing is collected. Only Not.child and AndNot.negative are negative positions """ - leaf = _term("invoice") + leaf = content("invoice") assert _negated_leaf_ids(build(leaf)) == frozenset() @@ -157,7 +152,7 @@ class TestCollection: THEN: - The set is empty and nothing raises """ - assert _negated_leaf_ids(_term("invoice")) == frozenset() + assert _negated_leaf_ids(content("invoice")) == frozenset() class TestTotality: @@ -167,11 +162,11 @@ class TestTotality: pytest.param(wc_ast.Every(), id="every"), pytest.param(wc_ast.Nothing(), id="nothing"), pytest.param( - wc_ast.Wildcard(field=_CONTENT, pattern="inv*"), + wc_ast.Wildcard(field=CONTENT, pattern="inv*"), id="wildcard", ), pytest.param( - wc_ast.Fuzzy(field=_CONTENT, text="invoce", distance=1, prefix=True), + wc_ast.Fuzzy(field=CONTENT, text="invoce", distance=1, prefix=True), id="fuzzy", ), ], @@ -200,7 +195,7 @@ class TestTotality: - It completes. The walk is iterative, so depth costs heap rather than Python stack frames """ - leaf = _term("invoice") + leaf = content("invoice") node: wc_ast.Node = leaf for _ in range(5000): node = wc_ast.Not(child=node) diff --git a/src/documents/tests/search/test_pattern_stemming.py b/src/documents/tests/search/test_pattern_stemming.py index 79bc4ff46..6fe4d8629 100644 --- a/src/documents/tests/search/test_pattern_stemming.py +++ b/src/documents/tests/search/test_pattern_stemming.py @@ -18,10 +18,10 @@ from typing import TYPE_CHECKING import pytest -from documents.models import Document - if TYPE_CHECKING: - from documents.search._backend import TantivyBackend + from collections.abc import Callable + + from documents.models import Document pytestmark = [pytest.mark.search, pytest.mark.django_db] @@ -31,20 +31,13 @@ CONTENT = ( ) -def _matched_ids(backend: TantivyBackend, query: str) -> set[int]: - return set(backend.search_ids(query, user=None)) - - @pytest.fixture -def indexed_doc(backend: TantivyBackend) -> Document: - doc = Document.objects.create( +def indexed_doc(index_document: Callable[..., Document]) -> Document: + return index_document( title="Invoice 2020 productname", content=CONTENT, - checksum="pattern-stemming-1", archive_serial_number=900, ) - backend.add_or_update(doc) - return doc class TestPrefixStemming: @@ -61,7 +54,7 @@ class TestPrefixStemming: ) def test_full_word_prefix_matches_its_stem( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, query: str, ) -> None: @@ -78,12 +71,12 @@ class TestPrefixStemming: the word's stem as an alternative alongside the typed run, reaching the stemmed index term """ - assert _matched_ids(backend, query) == {indexed_doc.id} + assert matched_ids(query) == {indexed_doc.id} @pytest.mark.parametrize("query", ["invoic*", "electr*", "payment*"]) def test_already_stemmed_prefix_still_matches( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, query: str, ) -> None: @@ -97,12 +90,12 @@ class TestPrefixStemming: - The document still matches, since the typed-run alternative is itself a prefix of the stored stemmed term """ - assert _matched_ids(backend, query) == {indexed_doc.id} + assert matched_ids(query) == {indexed_doc.id} @pytest.mark.parametrize("query", ["univers*", "librar*"]) def test_partial_prefix_reaches_the_stemmed_term( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, query: str, ) -> None: @@ -123,11 +116,11 @@ class TestPrefixStemming: genuinely diverge, and only one of them matches, is test_stem_substitution_reaches_both_the_inflection_and_the_compound """ - assert _matched_ids(backend, query) == {indexed_doc.id} + assert matched_ids(query) == {indexed_doc.id} def test_full_word_reaches_the_stem_but_a_fragment_of_it_does_not( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, ) -> None: """ @@ -144,13 +137,13 @@ class TestPrefixStemming: usage.md tells a reader whose `universit*` finds nothing to shorten it to `univers*`, which matches """ - assert _matched_ids(backend, "universities*") == {indexed_doc.id} - assert _matched_ids(backend, "universit*") == set() - assert _matched_ids(backend, "univers*") == {indexed_doc.id} + assert matched_ids("universities*") == {indexed_doc.id} + assert matched_ids("universit*") == set() + assert matched_ids("univers*") == {indexed_doc.id} def test_pattern_past_the_stem_boundary_is_documented_not_fixed( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, ) -> None: """ @@ -165,11 +158,12 @@ class TestPrefixStemming: index, and usage.md must not advertise it. Pinned so the limitation is deliberate, not accidental """ - assert _matched_ids(backend, "produ*name") == set() + assert matched_ids("produ*name") == set() def test_stem_substitution_reaches_both_the_inflection_and_the_compound( self, - backend: TantivyBackend, + index_document: Callable[..., Document], + matched_ids: Callable[[str], set[int]], indexed_doc: Document, ) -> None: """ @@ -189,22 +183,20 @@ class TestPrefixStemming: folded and stemmed forms, and "copy*" reaches the base word, its inflections and the compound alike """ - compound = Document.objects.create( + compound = index_document( title="Copyright notice", content="copyright notice for the work", - checksum="pattern-stemming-2", archive_serial_number=901, ) - backend.add_or_update(compound) - assert _matched_ids(backend, "copy*") == {indexed_doc.id, compound.id} - assert _matched_ids(backend, "copyright*") == {compound.id} + assert matched_ids("copy*") == {indexed_doc.id, compound.id} + assert matched_ids("copyright*") == {compound.id} class TestBracketClassStillFolds: def test_class_body_matches_case_insensitively( self, - backend: TantivyBackend, + matched_ids: Callable[[str], set[int]], indexed_doc: Document, ) -> None: """ @@ -218,4 +210,4 @@ class TestBracketClassStillFolds: the alternatives contract preserves only because a lone character stems to itself """ - assert _matched_ids(backend, "title:[IP]nvoice*") == {indexed_doc.id} + assert matched_ids("title:[IP]nvoice*") == {indexed_doc.id} diff --git a/src/documents/tests/search/test_query.py b/src/documents/tests/search/test_query.py index aae802b85..4271df291 100644 --- a/src/documents/tests/search/test_query.py +++ b/src/documents/tests/search/test_query.py @@ -24,16 +24,6 @@ if TYPE_CHECKING: pytestmark = pytest.mark.search -@pytest.fixture(scope="module") -def query_index() -> tantivy.Index: - """An in-memory, unstemmed index shared read-only across this module's - parse-only tests (none of them index documents).""" - schema = build_schema() - idx = tantivy.Index(schema, path=None) - register_tokenizers(idx, "") - return idx - - @pytest.fixture(scope="module") def populated_index() -> tantivy.Index: """An index holding one document, so a query matching nothing is diff --git a/src/documents/tests/search/test_query_negation.py b/src/documents/tests/search/test_query_negation.py index b967da2aa..d7090894b 100644 --- a/src/documents/tests/search/test_query_negation.py +++ b/src/documents/tests/search/test_query_negation.py @@ -16,22 +16,12 @@ import pytest if TYPE_CHECKING: from collections.abc import Callable - from pytest_django.fixtures import SettingsWrapper - from documents.models import Document pytestmark = [pytest.mark.search, pytest.mark.django_db] -@pytest.fixture -def fuzzy_enabled(settings: SettingsWrapper) -> None: - """Enable the fuzzy blend clause. The threshold doubles as a minimum - score filter, so it is set to 0.0: every hit passes and the test sees - the clause's matching behaviour, not the filter's.""" - settings.ADVANCED_FUZZY_SEARCH_THRESHOLD = 0.0 - - class TestNegationConstrainsEveryClause: @pytest.mark.usefixtures("fuzzy_enabled") def test_fuzzy_clause_does_not_readmit_an_excluded_document( diff --git a/src/documents/tests/search/test_widen_leaf.py b/src/documents/tests/search/test_widen_leaf.py index 258960c4d..c12a89ca4 100644 --- a/src/documents/tests/search/test_widen_leaf.py +++ b/src/documents/tests/search/test_widen_leaf.py @@ -7,22 +7,16 @@ negated leaf keeps its CJK side while losing its fuzzy one. from __future__ import annotations import pytest -import whoosh_compat as wc import whoosh_compat.ast as wc_ast from documents.search._query import _cjk_alternative from documents.search._query import _fuzzy_alternative from documents.search._query import _widen_leaf +from documents.tests.search._ast_helpers import NOTES +from documents.tests.search._ast_helpers import content pytestmark = pytest.mark.search -_CONTENT = wc.FieldRef("content") -_NOTES = wc.FieldRef("notes", "note") - - -def _content(text: str) -> wc_ast.Term: - return wc_ast.Term(field=_CONTENT, text=text) - def _widen( leaf: wc_ast.Term, @@ -44,7 +38,7 @@ class TestWhichAlternativesAreAdded: - The Or holds the leaf and the boosted fuzzy alternative, and nothing else """ - leaf = _content("invoice") + leaf = content("invoice") assert _widen(leaf) == wc_ast.Or( children=( @@ -63,7 +57,7 @@ class TestWhichAlternativesAreAdded: - Only the bigram alternative is added, which is exactly what the CJK work shipped """ - leaf = _content("東京") + leaf = content("東京") assert _widen(leaf, fuzzy=False) == wc_ast.Or( children=(leaf, _cjk_alternative(leaf)), @@ -81,7 +75,7 @@ class TestWhichAlternativesAreAdded: any run within one edit of its start, and _cjk_alternative already supplies the in-run recall """ - leaf = _content("東京") + leaf = content("東京") assert _fuzzy_alternative(leaf) is None assert _widen(leaf) == wc_ast.Or(children=(leaf, _cjk_alternative(leaf))) @@ -97,7 +91,7 @@ class TestWhichAlternativesAreAdded: NOT X should exclude what X matches, which needs the bigram side, but prefix fuzzy matching would exclude far more """ - leaf = _content("東京") + leaf = content("東京") assert _widen(leaf, negated=frozenset({id(leaf)})) == wc_ast.Or( children=(leaf, _cjk_alternative(leaf)), @@ -113,7 +107,7 @@ class TestWhichAlternativesAreAdded: - The leaf itself comes back. It qualifies for no alternative at all, so there is no Or to build """ - leaf = _content("tax") + leaf = content("tax") assert _widen(leaf, negated=frozenset({id(leaf)})) is leaf @@ -128,6 +122,6 @@ class TestWhichAlternativesAreAdded: - The leaf comes back untouched. Widening is scoped to the default search fields, as it was for CJK """ - leaf = wc_ast.Term(field=_NOTES, text="invoice") + leaf = wc_ast.Term(field=NOTES, text="invoice") assert _widen(leaf) is leaf diff --git a/src/documents/tests/test_api_search_errors.py b/src/documents/tests/test_api_search_errors.py index cd89d7355..c8a2849b9 100644 --- a/src/documents/tests/test_api_search_errors.py +++ b/src/documents/tests/test_api_search_errors.py @@ -19,7 +19,6 @@ from whoosh_compat.errors import DiagnosticKind from whoosh_compat.errors import QueryError from documents.search import SearchQueryError -from documents.tests.factories import DocumentFactory if TYPE_CHECKING: from rest_framework.test import APIClient @@ -29,15 +28,6 @@ if TYPE_CHECKING: pytestmark = [pytest.mark.django_db, pytest.mark.usefixtures("_search_index")] -@pytest.fixture -def indexed_document() -> Document: - from documents.search import get_backend - - doc = DocumentFactory.create(title="quarterly invoice", content="acme corp") - get_backend().add_or_update(doc) - return doc - - class TestSearchQueryErrorStillBecomesA400: def test_search_query_error_becomes_a_400_naming_the_field( self, diff --git a/src/documents/tests/test_api_search_query_length.py b/src/documents/tests/test_api_search_query_length.py index 9ebc34aeb..2d52bc9ff 100644 --- a/src/documents/tests/test_api_search_query_length.py +++ b/src/documents/tests/test_api_search_query_length.py @@ -22,7 +22,6 @@ import pytest from rest_framework import status import documents.search._backend -from documents.tests.factories import DocumentFactory from documents.views import _MAX_QUERY_LENGTH if TYPE_CHECKING: @@ -33,15 +32,6 @@ if TYPE_CHECKING: pytestmark = [pytest.mark.django_db, pytest.mark.usefixtures("_search_index")] -@pytest.fixture -def indexed_document() -> Document: - from documents.search import get_backend - - doc = DocumentFactory.create(title="quarterly invoice", content="acme corp") - get_backend().add_or_update(doc) - return doc - - class TestGetSearchEndpointEnforcesTheCap: def test_query_one_over_the_cap_is_a_400( self, diff --git a/src/documents/tests/test_api_search_unterminated_date_range.py b/src/documents/tests/test_api_search_unterminated_date_range.py index 0019de1b6..f8c26d743 100644 --- a/src/documents/tests/test_api_search_unterminated_date_range.py +++ b/src/documents/tests/test_api_search_unterminated_date_range.py @@ -19,8 +19,6 @@ from typing import TYPE_CHECKING import pytest from rest_framework import status -from documents.tests.factories import DocumentFactory - if TYPE_CHECKING: from rest_framework.test import APIClient @@ -29,15 +27,6 @@ if TYPE_CHECKING: pytestmark = [pytest.mark.django_db, pytest.mark.usefixtures("_search_index")] -@pytest.fixture -def indexed_document() -> Document: - from documents.search import get_backend - - doc = DocumentFactory.create(title="quarterly invoice", content="acme corp") - get_backend().add_or_update(doc) - return doc - - class TestUnterminatedBracketReturnsA400: @pytest.mark.parametrize( "query", From 51f326601483328938129c6fe6dbbcef04afca9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 22:32:40 +0000 Subject: [PATCH 064/258] docker-compose(deps): Bump nginx in /docker/compose (#14138) Bumps nginx from 1.31.5-alpine to 1.31.6-alpine. --- updated-dependencies: - dependency-name: nginx dependency-version: 1.31.6-alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker/compose/docker-compose.ci-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compose/docker-compose.ci-test.yml b/docker/compose/docker-compose.ci-test.yml index 5f9b55e06..c5447e899 100644 --- a/docker/compose/docker-compose.ci-test.yml +++ b/docker/compose/docker-compose.ci-test.yml @@ -35,7 +35,7 @@ services: - "3143:3143" # IMAP restart: unless-stopped nginx: - image: docker.io/nginx:1.31.5-alpine + image: docker.io/nginx:1.31.6-alpine hostname: nginx container_name: nginx ports: From 24b157622d8b3bf30025cfa8d88539e361dbf04f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 15:52:45 -0700 Subject: [PATCH 065/258] docker-compose(deps): bump gotenberg/gotenberg in /docker/compose (#14137) Bumps gotenberg/gotenberg from 8.36 to 8.37. --- updated-dependencies: - dependency-name: gotenberg/gotenberg dependency-version: '8.37' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docker/compose/docker-compose.ci-test.yml | 2 +- docker/compose/docker-compose.mariadb-tika.yml | 2 +- docker/compose/docker-compose.postgres-tika.yml | 2 +- docker/compose/docker-compose.sqlite-tika.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/compose/docker-compose.ci-test.yml b/docker/compose/docker-compose.ci-test.yml index c5447e899..be318f73c 100644 --- a/docker/compose/docker-compose.ci-test.yml +++ b/docker/compose/docker-compose.ci-test.yml @@ -4,7 +4,7 @@ # correct networking for the tests services: gotenberg: - image: docker.io/gotenberg/gotenberg:8.36 + image: docker.io/gotenberg/gotenberg:8.37 hostname: gotenberg container_name: gotenberg network_mode: host diff --git a/docker/compose/docker-compose.mariadb-tika.yml b/docker/compose/docker-compose.mariadb-tika.yml index 1384e2b1c..1265164d7 100644 --- a/docker/compose/docker-compose.mariadb-tika.yml +++ b/docker/compose/docker-compose.mariadb-tika.yml @@ -72,7 +72,7 @@ services: PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 gotenberg: - image: docker.io/gotenberg/gotenberg:8.36 + image: docker.io/gotenberg/gotenberg:8.37 restart: unless-stopped # The gotenberg chromium route is used to convert .eml files. We do not # want to allow external content like tracking pixels or even javascript. diff --git a/docker/compose/docker-compose.postgres-tika.yml b/docker/compose/docker-compose.postgres-tika.yml index 136fdc5e4..d2547b67c 100644 --- a/docker/compose/docker-compose.postgres-tika.yml +++ b/docker/compose/docker-compose.postgres-tika.yml @@ -67,7 +67,7 @@ services: PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 gotenberg: - image: docker.io/gotenberg/gotenberg:8.36 + image: docker.io/gotenberg/gotenberg:8.37 restart: unless-stopped # The gotenberg chromium route is used to convert .eml files. We do not # want to allow external content like tracking pixels or even javascript. diff --git a/docker/compose/docker-compose.sqlite-tika.yml b/docker/compose/docker-compose.sqlite-tika.yml index b401e7e1c..cb619d267 100644 --- a/docker/compose/docker-compose.sqlite-tika.yml +++ b/docker/compose/docker-compose.sqlite-tika.yml @@ -56,7 +56,7 @@ services: PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 gotenberg: - image: docker.io/gotenberg/gotenberg:8.36 + image: docker.io/gotenberg/gotenberg:8.37 restart: unless-stopped # The gotenberg chromium route is used to convert .eml files. We do not # want to allow external content like tracking pixels or even javascript. From d9ebbe14865342f46ff46f8be963a2ddbc555280 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 23:20:30 +0000 Subject: [PATCH 066/258] Chore(deps): Bump the frontend-angular-dependencies group across 1 directory with 19 updates (#14141) Bumps the frontend-angular-dependencies group with 19 updates in the /src-ui directory: | Package | From | To | | --- | --- | --- | | [@angular/cdk](https://github.com/angular/components) | `22.1.4` | `22.1.6` | | [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) | `22.1.3` | `22.1.5` | | [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) | `22.1.3` | `22.1.5` | | [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) | `22.1.3` | `22.1.5` | | [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) | `22.1.3` | `22.1.5` | | [@angular/localize](https://github.com/angular/angular) | `22.1.3` | `22.1.5` | | [@angular/platform-browser](https://github.com/angular/angular/tree/HEAD/packages/platform-browser) | `22.1.3` | `22.1.5` | | [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) | `22.1.3` | `22.1.5` | | [@ng-select/ng-select](https://github.com/ng-select/ng-select) | `24.0.2` | `24.1.1` | | [@angular-devkit/core](https://github.com/angular/angular-cli) | `22.1.6` | `22.1.7` | | [@angular-devkit/schematics](https://github.com/angular/angular-cli) | `22.1.6` | `22.1.7` | | [@angular-eslint/builder](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/builder) | `22.1.0` | `22.5.0` | | [@angular-eslint/eslint-plugin](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin) | `22.1.0` | `22.5.0` | | [@angular-eslint/eslint-plugin-template](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin-template) | `22.1.0` | `22.5.0` | | [@angular-eslint/schematics](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/schematics) | `22.1.0` | `22.5.0` | | [@angular-eslint/template-parser](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/template-parser) | `22.1.0` | `22.5.0` | | [@angular/build](https://github.com/angular/angular-cli) | `22.1.6` | `22.1.7` | | [@angular/cli](https://github.com/angular/angular-cli) | `22.1.6` | `22.1.7` | | [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) | `22.1.3` | `22.1.5` | Updates `@angular/cdk` from 22.1.4 to 22.1.6 - [Release notes](https://github.com/angular/components/releases) - [Changelog](https://github.com/angular/components/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/components/compare/v22.1.4...v22.1.6) Updates `@angular/common` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/common) Updates `@angular/compiler` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/compiler) Updates `@angular/core` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/core) Updates `@angular/forms` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/forms) Updates `@angular/localize` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/compare/v22.1.3...v22.1.5) Updates `@angular/platform-browser` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/platform-browser) Updates `@angular/router` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/router) Updates `@ng-select/ng-select` from 24.0.2 to 24.1.1 - [Release notes](https://github.com/ng-select/ng-select/releases) - [Commits](https://github.com/ng-select/ng-select/compare/v24.0.2...v24.1.1) Updates `@angular-devkit/core` from 22.1.6 to 22.1.7 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/v22.1.6...v22.1.7) Updates `@angular-devkit/schematics` from 22.1.6 to 22.1.7 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/v22.1.6...v22.1.7) Updates `@angular-eslint/builder` from 22.1.0 to 22.5.0 - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/builder/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v22.5.0/packages/builder) Updates `@angular-eslint/eslint-plugin` from 22.1.0 to 22.5.0 - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v22.5.0/packages/eslint-plugin) Updates `@angular-eslint/eslint-plugin-template` from 22.1.0 to 22.5.0 - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v22.5.0/packages/eslint-plugin-template) Updates `@angular-eslint/schematics` from 22.1.0 to 22.5.0 - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/schematics/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v22.5.0/packages/schematics) Updates `@angular-eslint/template-parser` from 22.1.0 to 22.5.0 - [Release notes](https://github.com/angular-eslint/angular-eslint/releases) - [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/template-parser/CHANGELOG.md) - [Commits](https://github.com/angular-eslint/angular-eslint/commits/v22.5.0/packages/template-parser) Updates `@angular/build` from 22.1.6 to 22.1.7 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/v22.1.6...v22.1.7) Updates `@angular/cli` from 22.1.6 to 22.1.7 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/v22.1.6...v22.1.7) Updates `@angular/compiler-cli` from 22.1.3 to 22.1.5 - [Release notes](https://github.com/angular/angular/releases) - [Commits](https://github.com/angular/angular/commits/v22.1.5/packages/compiler-cli) --- updated-dependencies: - dependency-name: "@angular-devkit/core" dependency-version: 22.1.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular-devkit/schematics" dependency-version: 22.1.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular-eslint/builder" dependency-version: 22.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies - dependency-name: "@angular-eslint/eslint-plugin" dependency-version: 22.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies - dependency-name: "@angular-eslint/eslint-plugin-template" dependency-version: 22.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies - dependency-name: "@angular-eslint/schematics" dependency-version: 22.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies - dependency-name: "@angular-eslint/template-parser" dependency-version: 22.5.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies - dependency-name: "@angular/build" dependency-version: 22.1.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/cdk" dependency-version: 22.1.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/cli" dependency-version: 22.1.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/common" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/compiler" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/compiler-cli" dependency-version: 22.1.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/core" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/forms" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/localize" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/platform-browser" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@angular/router" dependency-version: 22.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: frontend-angular-dependencies - dependency-name: "@ng-select/ng-select" dependency-version: 24.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: frontend-angular-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src-ui/package.json | 38 +- src-ui/pnpm-lock.yaml | 950 +++++++++++++++++++++++------------------- 2 files changed, 529 insertions(+), 459 deletions(-) diff --git a/src-ui/package.json b/src-ui/package.json index f4cf666a1..4e1629466 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -15,16 +15,16 @@ }, "private": true, "dependencies": { - "@angular/cdk": "^22.1.4", - "@angular/common": "~22.1.3", - "@angular/compiler": "~22.1.3", - "@angular/core": "~22.1.3", - "@angular/forms": "~22.1.3", - "@angular/localize": "~22.1.3", - "@angular/platform-browser": "~22.1.3", - "@angular/router": "~22.1.3", + "@angular/cdk": "^22.1.6", + "@angular/common": "~22.1.6", + "@angular/compiler": "~22.1.6", + "@angular/core": "~22.1.6", + "@angular/forms": "~22.1.6", + "@angular/localize": "~22.1.6", + "@angular/platform-browser": "~22.1.6", + "@angular/router": "~22.1.6", "@ng-bootstrap/ng-bootstrap": "^21.0.0", - "@ng-select/ng-select": "~24.0.2", + "@ng-select/ng-select": "~24.1.1", "@ngneat/dirty-check-forms": "^3.0.3", "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.8", @@ -45,16 +45,16 @@ }, "devDependencies": { "@angular-builders/jest": "^22.0.1", - "@angular-devkit/core": "^22.1.6", - "@angular-devkit/schematics": "^22.1.6", - "@angular-eslint/builder": "22.1.0", - "@angular-eslint/eslint-plugin": "22.1.0", - "@angular-eslint/eslint-plugin-template": "22.1.0", - "@angular-eslint/schematics": "22.1.0", - "@angular-eslint/template-parser": "22.1.0", - "@angular/build": "22.1.6", - "@angular/cli": "22.1.6", - "@angular/compiler-cli": "~22.1.3", + "@angular-devkit/core": "^22.1.8", + "@angular-devkit/schematics": "^22.1.8", + "@angular-eslint/builder": "22.5.0", + "@angular-eslint/eslint-plugin": "22.5.0", + "@angular-eslint/eslint-plugin-template": "22.5.0", + "@angular-eslint/schematics": "22.5.0", + "@angular-eslint/template-parser": "22.5.0", + "@angular/build": "22.1.8", + "@angular/cli": "22.1.8", + "@angular/compiler-cli": "~22.1.6", "@playwright/test": "^1.62.1", "@types/jest": "^30.0.0", "@types/node": "^26.5.0", diff --git a/src-ui/pnpm-lock.yaml b/src-ui/pnpm-lock.yaml index 12a0a8b94..834b9f67a 100644 --- a/src-ui/pnpm-lock.yaml +++ b/src-ui/pnpm-lock.yaml @@ -9,38 +9,38 @@ importers: .: dependencies: '@angular/cdk': - specifier: ^22.1.4 - version: 22.1.4(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + specifier: ^22.1.6 + version: 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) '@angular/common': - specifier: ~22.1.3 - version: 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) + specifier: ~22.1.6 + version: 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) '@angular/compiler': - specifier: ~22.1.3 - version: 22.1.3 + specifier: ~22.1.6 + version: 22.1.6 '@angular/core': - specifier: ~22.1.3 - version: 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + specifier: ~22.1.6 + version: 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) '@angular/forms': - specifier: ~22.1.3 - version: 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + specifier: ~22.1.6 + version: 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) '@angular/localize': - specifier: ~22.1.3 - version: 22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3) + specifier: ~22.1.6 + version: 22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6) '@angular/platform-browser': - specifier: ~22.1.3 - version: 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + specifier: ~22.1.6 + version: 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) '@angular/router': - specifier: ~22.1.3 - version: 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + specifier: ~22.1.6 + version: 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) '@ng-bootstrap/ng-bootstrap': specifier: ^21.0.0 - version: 21.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@popperjs/core@2.11.8)(rxjs@7.8.2) + version: 21.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6))(@popperjs/core@2.11.8)(rxjs@7.8.2) '@ng-select/ng-select': - specifier: ~24.0.2 - version: 24.0.2(@angular/cdk@22.1.4(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2)) + specifier: ~24.1.1 + version: 24.1.1(9fe845424e0b7fed075564002b1b329d) '@ngneat/dirty-check-forms': specifier: ^3.0.3 - version: 3.0.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/router@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(lodash-es@4.18.1)(rxjs@7.8.2) + version: 3.0.3(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/router@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(lodash-es@4.18.1)(rxjs@7.8.2) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -58,19 +58,19 @@ importers: version: 1.0.0 ngx-bootstrap-icons: specifier: ^1.9.3 - version: 1.9.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + version: 1.9.3(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) ngx-color: specifier: ^10.1.0 - version: 10.1.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + version: 10.1.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) ngx-cookie-service: specifier: ^22.0.0 - version: 22.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + version: 22.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) ngx-device-detector: specifier: ^12.0.0 - version: 12.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + version: 12.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) ngx-ui-tour-ng-bootstrap: specifier: ^19.0.0 - version: 19.0.0(55dd56417d8b845704494a1b92156fbd) + version: 19.0.0(62aff516824eb66443798196c0536bf9) normalize-diacritics: specifier: ^5.0.0 version: 5.0.0 @@ -92,37 +92,37 @@ importers: devDependencies: '@angular-builders/jest': specifier: ^22.0.1 - version: 22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) + version: 22.0.1(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3) '@angular-devkit/core': - specifier: ^22.1.6 - version: 22.1.6(chokidar@5.0.0) + specifier: ^22.1.8 + version: 22.1.8(chokidar@5.0.0) '@angular-devkit/schematics': - specifier: ^22.1.6 - version: 22.1.6(chokidar@5.0.0) + specifier: ^22.1.8 + version: 22.1.8(chokidar@5.0.0) '@angular-eslint/builder': - specifier: 22.1.0 - version: 22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + specifier: 22.5.0 + version: 22.5.0(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin': - specifier: 22.1.0 - version: 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + specifier: 22.5.0 + version: 22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/eslint-plugin-template': - specifier: 22.1.0 - version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + specifier: 22.5.0 + version: 22.5.0(@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/schematics': - specifier: 22.1.0 - version: 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + specifier: 22.5.0 + version: 22.5.0(@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular-eslint/template-parser': - specifier: 22.1.0 - version: 22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + specifier: 22.5.0 + version: 22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@angular/build': - specifier: 22.1.6 - version: 22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3) + specifier: 22.1.8 + version: 22.1.8(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6)(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.28)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3) '@angular/cli': - specifier: 22.1.6 - version: 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) + specifier: 22.1.8 + version: 22.1.8(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) '@angular/compiler-cli': - specifier: ~22.1.3 - version: 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) + specifier: ~22.1.6 + version: 22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3) '@playwright/test': specifier: ^1.62.1 version: 1.62.1 @@ -155,7 +155,7 @@ importers: version: 17.0.0 jest-preset-angular: specifier: ^17.0.0 - version: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + version: 17.0.0(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) jest-websocket-mock: specifier: ^2.5.0 version: 2.5.0 @@ -198,8 +198,8 @@ packages: engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true - '@angular-devkit/architect@0.2201.6': - resolution: {integrity: sha512-oGQEdof2/1bZk58PN9dvpGi8pvtbgE5vkP1xRtCqN8dSVxwre1l0pKynOj/Uge1KxjCvs4c1QrQu0vsAnY0vpg==} + '@angular-devkit/architect@0.2201.8': + resolution: {integrity: sha512-EUQo8RDS1my2Bo5FRS+gBYgz1/klfIp9XESfMpTBO04nBkjF6DkPCeOxeAf1CYjWy9nCXcWn968eSdEhV5jXiA==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true @@ -221,6 +221,15 @@ packages: chokidar: optional: true + '@angular-devkit/core@22.1.8': + resolution: {integrity: sha512-34lsgg2FwMVBX7nR/ZqzRUcdvdYPvSB8XAEr2GudXAyZwLI9ehzfQlagAWR/gEb8p4uCFZW0r7uU0toxydq4Rw==} + engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + peerDependencies: + chokidar: ^5.0.0 + peerDependenciesMeta: + chokidar: + optional: true + '@angular-devkit/schematics@22.1.3': resolution: {integrity: sha512-ebY5bwZVB0onxxyTbJch//VidVVV8jo/F13n+TV5s/3ZywsC3/XZsfMHaxlFmpvP/G17+/C9JVoEXT+uwjT+/Q==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} @@ -229,52 +238,53 @@ packages: resolution: {integrity: sha512-IbDO9KbQyQm20uinsfT8d9ZtQw41/WVutI/65mAw39WZfN8Ky+MOgOUJCGLiSccMprvZ9YdodBTnN9bLH149Ag==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular-eslint/builder@22.1.0': - resolution: {integrity: sha512-gmdk06PK0whNJlapIQjRnhud2/n+oIIDBIoLUHWFFxhHRs+ZstVc6+81gf+sYDOm1Ehmb0V3nZAg3YpT1Mk0Eg==} + '@angular-devkit/schematics@22.1.8': + resolution: {integrity: sha512-Pv3cPa/44kvEwYcqwx4Ns5dhIDmcFNSHhbpheqiEG1Z/u4e2t4zHKDtE3eHZB+8o+IcC7xJj+d+AqGR44RoZDA==} + engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + + '@angular-eslint/builder@22.5.0': + resolution: {integrity: sha512-bChGIHOApVk3eXaAfCOxxb54tToIttSzADEUpuBN6cs7Jp7OO96lNpMktv9IPvxfyVrhbriocwNy33jhpRSt0Q==} peerDependencies: - '@angular/cli': '>= 22.0.0 < 23.0.0' eslint: ^9.0.0 || ^10.0.0 typescript: '*' - '@angular-eslint/bundled-angular-compiler@22.1.0': - resolution: {integrity: sha512-iOtOQ2jtrtko1rIQo6i+g3ezxGL0lyYv80j4GccFTK1JGh4K+AqYkmaBvfUfNtqoE/7VcKsOoyxaFt6iIpKhaQ==} + '@angular-eslint/bundled-angular-compiler@22.5.0': + resolution: {integrity: sha512-AdvtopHjjenM02LqsgqQbpTWTbE2DqFS4ZJT8YxEIzUKUdLNwkGUgZn9WpKHBHGBvaiA3hj2BLWRCJs/vJmV3g==} - '@angular-eslint/eslint-plugin-template@22.1.0': - resolution: {integrity: sha512-GK/Mwhwvj+MX6DefD29/IfuYjcai5CsCbYJ6Qb9P6IAzZaQqw+EN+CiXxIwzMnzm2edLcJzAsX8iBk4X7sVi2Q==} + '@angular-eslint/eslint-plugin-template@22.5.0': + resolution: {integrity: sha512-qHi292XBe5TIFpPjEKY+NtiFGEZLrYzD8GPVzBuIruaKQz1Y//eqPp3Ve/MYYBbwdj0gD8rPZRjDIXAcsRUMVg==} peerDependencies: - '@angular-eslint/template-parser': 22.1.0 + '@angular-eslint/template-parser': 22.5.0 '@typescript-eslint/types': ^8.0.0 '@typescript-eslint/utils': ^8.0.0 eslint: ^9.0.0 || ^10.0.0 typescript: '*' - '@angular-eslint/eslint-plugin@22.1.0': - resolution: {integrity: sha512-nRwdbUiW7vF0gbwtxw2hRGPZYZCNWOTLZKw4HM+I37o5YFIA0CFLtbyRKgZWs6JZCIqzTYSwCyKNsW41Qw0FwQ==} + '@angular-eslint/eslint-plugin@22.5.0': + resolution: {integrity: sha512-3MooyC+F156Aa0XmNLwNMeQFVmSPhJYqPdX8FditvzSYuo5qANZTSbBABMU8XepvmxXcpPmEsj5sQUpbTdRl9Q==} peerDependencies: '@typescript-eslint/utils': ^8.0.0 eslint: ^9.0.0 || ^10.0.0 typescript: '*' - '@angular-eslint/schematics@22.1.0': - resolution: {integrity: sha512-/Z7MEO9ys9P5w5itM2mpNW4R/QNAVxtDdcU5LVFulSx/lo7zCDx1rZ/tLDuzbN5k5RGQy5ZkdRIs0MoscsGXQQ==} - peerDependencies: - '@angular/cli': '>= 22.0.0 < 23.0.0' + '@angular-eslint/schematics@22.5.0': + resolution: {integrity: sha512-4B7Bpph/H6vNI0Wfi3p4w4AKw6VJrTG9IGNbSx6NKbPzcwBSaFSuJUpIUxiuzlsaFy6csbRWU2E3UPyXjEfFew==} - '@angular-eslint/template-parser@22.1.0': - resolution: {integrity: sha512-gcufZLI/Rl2fOWtBk2MgMRkH1t+OrbJGxIsfT0w3pVjKm0zwi7njM/dtPbVjCHzsGhx7szQMvY0i0UwTBVYkSw==} + '@angular-eslint/template-parser@22.5.0': + resolution: {integrity: sha512-p0C48htmzd1/Qum3TIQz3FZMWivbkm7x8z3Q6GY3CzNOIzVRKQU2MwZtpocXPkctJGjYnC5wJ58d8Ow4E5LVbA==} peerDependencies: eslint: ^9.0.0 || ^10.0.0 typescript: '*' - '@angular-eslint/utils@22.1.0': - resolution: {integrity: sha512-zDPJqgOxlkG20UJWsVDSvnEtC2MfIP0+yKMaQUBL+2nrEknV/fVLrz7ApnerWiDrGTcAms5si49KV10MarMpRA==} + '@angular-eslint/utils@22.5.0': + resolution: {integrity: sha512-i106BkmVnXM3ub5nsaXmAZNk1bnajzVOwrGrEVt9U0mX22zcVlunLMWC49z2dqGjl91Ppw0Xr5ed+QrKWm9Ldg==} peerDependencies: '@typescript-eslint/utils': ^8.0.0 eslint: ^9.0.0 || ^10.0.0 typescript: '*' - '@angular/build@22.1.6': - resolution: {integrity: sha512-J7JBd3hDAV4dlGNMavDC0KjtvbDd4KOddaom1inwkq92tYnD1ljmhDDigAsUBnRvQhJ82cvagD8zi0s9Ki4rTQ==} + '@angular/build@22.1.8': + resolution: {integrity: sha512-tw+Evk0EITb8p8dTu743ONoFztCEiyDkdRbtZsh7C0vBS7Q9ElsOcFeg2Z9OAAwrmtZMIBuW3jrdPRQp7OCSdw==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler': ^22.0.0 @@ -284,7 +294,7 @@ packages: '@angular/platform-browser': ^22.0.0 '@angular/platform-server': ^22.0.0 '@angular/service-worker': ^22.0.0 - '@angular/ssr': ^22.1.6 + '@angular/ssr': ^22.1.8 istanbul-lib-instrument: ^6.0.0 karma: ^6.4.0 less: ^4.2.0 @@ -325,46 +335,47 @@ packages: vitest: optional: true - '@angular/cdk@22.1.4': - resolution: {integrity: sha512-//KICh/rxeLbYLgNj8HawaliVAPNlSV0aRmki45Tf/YhoXVhzon9DfFqCs5u1cLvmMkMTHdFm5ghGTB8SUv3DA==} + '@angular/cdk@22.1.6': + resolution: {integrity: sha512-4eHSs/sIIp1mesNKFDkDTYDhfB/3/Bpfjzv/PbybsKVd642FTa3IAbjWf3uqHS/V7mpucF3Q5gSpirZHDgxwrg==} peerDependencies: '@angular/common': ^22.0.0 || ^23.0.0 '@angular/core': ^22.0.0 || ^23.0.0 + '@angular/forms': ^22.0.0 || ^23.0.0 '@angular/platform-browser': ^22.0.0 || ^23.0.0 rxjs: ^6.5.3 || ^7.4.0 - '@angular/cli@22.1.6': - resolution: {integrity: sha512-HT3OzYkSpCyXMTgD5G1tsS7vkrY8cYJ/JgSjRjrpwOAooSMtKF1hv7BgBcn79sKg4eaiPLrDpQLXP93vHxgSFg==} + '@angular/cli@22.1.8': + resolution: {integrity: sha512-MFN/FydqDndai8vF12hDxG5RlBt1HUUheeJgJNmuHYIne4bOAfOT+xuMpIK8+gLSRwCemdqR3OMM38pnsFJ/nA==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true - '@angular/common@22.1.3': - resolution: {integrity: sha512-QtMkjhiRd0EnmKR50bw3WbCWYTi6CmA72nnSz1BLQPpaLSi2goloCrPPniHz8fP+w2ESrmmlOWxs1Da3COgnQg==} + '@angular/common@22.1.6': + resolution: {integrity: sha512-giuH+jJvo6YbBxbKofJCXvq6k8g1Z/xCAvh4piNFSSS6/toXTLCeZ+snr6Stw5b2wRbArM5Q5nDeuto3NqVPnQ==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} peerDependencies: - '@angular/core': 22.1.3 + '@angular/core': 22.1.6 rxjs: ^6.5.3 || ^7.4.0 - '@angular/compiler-cli@22.1.3': - resolution: {integrity: sha512-37lLaDp0RHWZ/lmJqCmIEr0HOM2D5ulHy61gqTBm7KRj3Y6ZaxR8B/JqZmeIpPzKFILVsga+NQ4A8apBUkmezw==} + '@angular/compiler-cli@22.1.6': + resolution: {integrity: sha512-C1fQuaSLnibhfbb7Im/vurdBEcfQk+/GqPkY4+dgEKd4EPleO0xWlD+k5DwyNFX8a9w7HebWfo0Zl66HuaEwOQ==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} hasBin: true peerDependencies: - '@angular/compiler': 22.1.3 + '@angular/compiler': 22.1.6 typescript: '>=6.0 <6.1' peerDependenciesMeta: typescript: optional: true - '@angular/compiler@22.1.3': - resolution: {integrity: sha512-L8Mw2r7bGG/obqgQC+RU3mdFJ3NtLgO5gWhEC1ylcHpLCMPIAXYsMKJIL8dnS78S1wXo/omXwmJ4FiIlCwWahg==} + '@angular/compiler@22.1.6': + resolution: {integrity: sha512-JjOUm/qD338+fGfZvxSNn/vTUiVqNwOiPzacInVUq1eVp7Jev+cnvEwXA2cFJkYZoy3Imz6wHoMvTUZNN8cbKQ==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} - '@angular/core@22.1.3': - resolution: {integrity: sha512-313+Xkf970AmStJE0E/zNJW/9xvDExQG+6TNltBBl+KJsW0q5dffK2w2PQfV4mtTquBqYoeHSRsms4WgjBKL8g==} + '@angular/core@22.1.6': + resolution: {integrity: sha512-3Ln9YYOhsaU2vPufnpcu6C4dlmX4e/nJTlggVcKMT7bGZH5KlEtw3h0uh9YfANv8YhQCEk1AcuRI7KpBnh5ing==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} peerDependencies: - '@angular/compiler': 22.1.3 + '@angular/compiler': 22.1.6 rxjs: ^6.5.3 || ^7.4.0 zone.js: ~0.15.0 || ~0.16.0 peerDependenciesMeta: @@ -373,41 +384,41 @@ packages: zone.js: optional: true - '@angular/forms@22.1.3': - resolution: {integrity: sha512-b4ual9pgfNqcnEHord50w960DDFIytG3Qb3bu2aCgzmagvRlg9wrtwQNqY+oqY2FVq7c9McNUN7MZRcWl9HNdQ==} + '@angular/forms@22.1.6': + resolution: {integrity: sha512-rfV4G4UB4l69yXSRvhaHPzTMIruvBlRO+ak9NtTcYMnsoj8O5ZCyPv0ledGIrLTBwGSI3X1j4nr9aoV+Rj/n+Q==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} peerDependencies: - '@angular/common': 22.1.3 - '@angular/core': 22.1.3 - '@angular/platform-browser': 22.1.3 + '@angular/common': 22.1.6 + '@angular/core': 22.1.6 + '@angular/platform-browser': 22.1.6 rxjs: ^6.5.3 || ^7.4.0 - '@angular/localize@22.1.3': - resolution: {integrity: sha512-/u0nCz2AY+RXB4HUdw3Y7C/ZiierPPmUuWR/nDPCylHwllVdMKpi6PPtKvfzgM5ZvaISzDghTVykOVjU7obMhg==} + '@angular/localize@22.1.6': + resolution: {integrity: sha512-lxj8t1FtwzQq9ogZLWa7hkKl2jWAeWDsBE7pw9mg28XPAPHrwAKIRGz1TG4XUck0wyMn8LovlSeo/7A4gmY+0Q==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} hasBin: true peerDependencies: - '@angular/compiler': 22.1.3 - '@angular/compiler-cli': 22.1.3 + '@angular/compiler': 22.1.6 + '@angular/compiler-cli': 22.1.6 - '@angular/platform-browser@22.1.3': - resolution: {integrity: sha512-A8McE6AclwZa2ese4jMfZZu+qZfBFQ4Hl6CaMpzJ1C6Vv6+sXkLu9pouTosJEsUE+etVdepDsqau90lhzgw3Eg==} + '@angular/platform-browser@22.1.6': + resolution: {integrity: sha512-jrRi6zpdz+jOle5l0OW7QL0a8xPgdnxWT5FrJabbiNKfYzQfqKcaAu02l8uJoJxtGb8fLQ8pbjkPpZEvKO2z+w==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} peerDependencies: - '@angular/animations': 22.1.3 - '@angular/common': 22.1.3 - '@angular/core': 22.1.3 + '@angular/animations': 22.1.6 + '@angular/common': 22.1.6 + '@angular/core': 22.1.6 peerDependenciesMeta: '@angular/animations': optional: true - '@angular/router@22.1.3': - resolution: {integrity: sha512-23owvZKCpdL7Yh3EzBj4OLf3x0z+jT9b57Qk96wdwI8Lsyf9L78/RJPYCutJ5r+zq3pFM/BHVKyd+2hkfH7N6Q==} + '@angular/router@22.1.6': + resolution: {integrity: sha512-ex0vrkcVyJJdn7NzZXun+5ctaPPLTZJ/gE7A3g1dun7BM3g4Z6zT738mODFeJgtPtJNf4bTs2gpgvyegvzWH7w==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0} peerDependencies: - '@angular/common': 22.1.3 - '@angular/core': 22.1.3 - '@angular/platform-browser': 22.1.3 + '@angular/common': 22.1.6 + '@angular/core': 22.1.6 + '@angular/platform-browser': 22.1.6 rxjs: ^6.5.3 || ^7.4.0 '@asamuzakjp/css-color@3.2.0': @@ -425,8 +436,8 @@ packages: resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==} engines: {node: '>=6.9.0'} - '@babel/compat-data@8.0.0': - resolution: {integrity: sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw==} + '@babel/compat-data@8.0.5': + resolution: {integrity: sha512-YLsYoQMvL8l8WrGpN3Zj7O1wK5LEBN+cQtux7BcuHyxIXve724XG+zuJ1n3U1cUweRtTzQOA4IHbuQw3N34SZw==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/core@7.29.7': @@ -441,8 +452,8 @@ packages: resolution: {integrity: sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==} engines: {node: '>=6.9.0'} - '@babel/generator@8.0.0': - resolution: {integrity: sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==} + '@babel/generator@8.0.5': + resolution: {integrity: sha512-f/TuhuMAxJqhwxEGNsJrswuG9VHmh0oNFoQoo6TbpgtFAz9wYZXcTAcWZMHfp7ljesr0RG04bp3Aos9GI59L7w==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/helper-annotate-as-pure@8.0.0': @@ -453,8 +464,8 @@ packages: resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==} engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@8.0.0': - resolution: {integrity: sha512-JwculLABZvyPvyLBpwU/E/IbH2uM3mnxNtIJpxnIfb24y1PrdVxK5Dqjle4DpgqpGRnwgC7G8IkzPdSXZrO1Ew==} + '@babel/helper-compilation-targets@8.0.5': + resolution: {integrity: sha512-Qk8ahMGooH5mz6uuhoDvfZGkUf/Mf3RTBucVVl4MKx4LKMTv872TeW8O92h15iVtlN8wAROBIpI1aV6x1z0LCQ==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/helper-globals@7.29.7': @@ -511,8 +522,8 @@ packages: resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==} engines: {node: '>=6.9.0'} - '@babel/helpers@8.0.0': - resolution: {integrity: sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==} + '@babel/helpers@8.0.5': + resolution: {integrity: sha512-fQtPOXjYOYv85PIdwotp2TJGVYOycX0PQq+l844fFAxOULtBy8BVF35GyeueX0r4KvDthqPH5xAI1clQPk/2uA==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/parser@7.29.8': @@ -520,8 +531,8 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - '@babel/parser@8.0.4': - resolution: {integrity: sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==} + '@babel/parser@8.0.5': + resolution: {integrity: sha512-51RXvQNFakaS0bTpYiGkxNbUVwkPO4kONv6EVLorZABxsx+KZ6Z7uSYvi/wmKS/+X+rfj9RvOw0/ZNh+cmI0Rw==} engines: {node: ^22.18.0 || >=24.11.0} hasBin: true @@ -628,16 +639,16 @@ packages: resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==} engines: {node: '>=6.9.0'} - '@babel/traverse@8.0.4': - resolution: {integrity: sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==} + '@babel/traverse@8.0.5': + resolution: {integrity: sha512-XFfnuvapSc/vJOcUO7kwORSvpBIvraofKEZ2dhT0PjiF21BRCD7YbAFC8UEeDJNeLoQz82/gVqzgX5hCzkCbdg==} engines: {node: ^22.18.0 || >=24.11.0} '@babel/types@7.29.8': resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} engines: {node: '>=6.9.0'} - '@babel/types@8.0.4': - resolution: {integrity: sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==} + '@babel/types@8.0.5': + resolution: {integrity: sha512-eVdMqi3ej5aHhyQ2Si6yD2cAWeV8FJK9UrhK5aL0Sd8hu5GhT+YswhVNbVheOGVYMg8kuGuMaUpkB3stjj4z8A==} engines: {node: ^22.18.0 || >=24.11.0} '@bcoe/v8-coverage@0.2.3': @@ -924,12 +935,12 @@ packages: resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} engines: {node: '>=18.18'} - '@inquirer/ansi@2.0.7': - resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==} + '@inquirer/ansi@2.0.8': + resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/checkbox@5.2.2': - resolution: {integrity: sha512-Y5/bAScMy5Y+9isCx0SKbyJebMCaXXX5em0kxkj115eZNscgV9srOHrgyfS0e5xAVymIfOh9piYBKDILktsMMg==} + '@inquirer/checkbox@5.2.5': + resolution: {integrity: sha512-bRt8J8m+Fot9CXv+zNQGXUq2ET0MggR1fPz7v6edN6MFYmsbfGnMmkmWZJEegMKqrAC8ej/o1sqisHZXZJMAfQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -946,8 +957,8 @@ packages: '@types/node': optional: true - '@inquirer/confirm@6.2.0': - resolution: {integrity: sha512-SKXarWrYhtpqOEctf9XGCGy29QjsvJAM0Aq9ZR9z4Ns94OmpqudOly+aSEfNqUf9SwsQaUgY9+Z8hyzG0xX8fw==} + '@inquirer/confirm@6.3.2': + resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -964,8 +975,8 @@ packages: '@types/node': optional: true - '@inquirer/core@12.0.0': - resolution: {integrity: sha512-+nnvFEXIB08CZNVXpvW3B+zHW96QXvGUjNKJ8NJIPqAZi5Kd4WhYt2S3C234ReepG1qw2HOlEUbjYVHBowXObA==} + '@inquirer/core@12.0.3': + resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -973,8 +984,8 @@ packages: '@types/node': optional: true - '@inquirer/editor@5.3.0': - resolution: {integrity: sha512-nnsP/IdJ8s83q7ZuObmgn12QM+uLCkab9E0Oordojbn62WUg1c+v9Ou/F/057pgh0ppX0W+Hj5bO/Dp5hsxQtA==} + '@inquirer/editor@5.3.3': + resolution: {integrity: sha512-YsKkS2q63IiLtaDK/9nqzdComN97SDQrmKiyNggN+ceP4ty+Z6VwyTz3FpjeUWeW1Efss2xHFKCC9sx7hnrsxg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -982,8 +993,8 @@ packages: '@types/node': optional: true - '@inquirer/expand@5.1.2': - resolution: {integrity: sha512-OWIH1IyyWqEKIyqC9Xy+Bnga7NkGMovFdo4atYZMUOTRqf6rO2WCv9E/1MyzvOErDBCxs+9UFliRUDc50xs/jw==} + '@inquirer/expand@5.1.5': + resolution: {integrity: sha512-uHuXLmXW+TtIfT/9vSBotypAkqn1n34Ul+CLGPos/xANyO4Ff5xZzkYhbKR4NEcfVK4a9mHQOpwVZzluSHFRGw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -991,8 +1002,8 @@ packages: '@types/node': optional: true - '@inquirer/external-editor@3.0.4': - resolution: {integrity: sha512-tZbbaK2ovq6vlrRBNQvjrypmrED/p5x2ncIHQ79cD55tei3dD96v5glMMA+6tiq7K104i/25DVYKWVPJuV6ptA==} + '@inquirer/external-editor@3.0.5': + resolution: {integrity: sha512-f3QQJRIX5ZEneBHNUIuPjmbdzHnmRFJA8r2dkcb8q+OM5Uv5KtnuAttQumnrjcBVBM3mcTX1CkmtAkU58VRZxg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1000,12 +1011,12 @@ packages: '@types/node': optional: true - '@inquirer/figures@2.0.8': - resolution: {integrity: sha512-tApbon79GM9ry56ja/Ud3SY2CL4TQsao9fIwDQbgTeNY55025GdMzQ2+UdegV/lx51VNGUB59M0v0nMpybYY4Q==} + '@inquirer/figures@2.0.9': + resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/input@5.1.3': - resolution: {integrity: sha512-F/BZHtyEzP+HO+IGVd4AjBRgvX/ywm42bx8S0+dENk2YclzE9tJ3X/15THwtT6ehApmKvdYDMsVTuyyDod0gOQ==} + '@inquirer/input@5.1.6': + resolution: {integrity: sha512-HtcJhB2QFVXbLuJ5S3syhNbTUVxYvwqV4VRBDkQceBloC9bmTViUoRFP5PbSaDZb3HzfPmpuU/gG4ybVBz4FHA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1013,8 +1024,8 @@ packages: '@types/node': optional: true - '@inquirer/number@4.2.0': - resolution: {integrity: sha512-ew+fSDijsQ/WhD4TV3XLb+if400cDuzTzHfGR8sTNBXkK9CYDWoGE8fhaO8GbT312pNv1AJEOsDxy/z/HVettA==} + '@inquirer/number@4.2.3': + resolution: {integrity: sha512-6Yuwh1NGSbu1Lo4N1EWjXs1jKRntLg/ZCwhmeorEHde90v1XxAozdbd4Iu30eOQLW+6h1hp2O9ujNfLSbTPJnA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1022,8 +1033,8 @@ packages: '@types/node': optional: true - '@inquirer/password@5.1.2': - resolution: {integrity: sha512-nSdufycW8xynEVssFkNQEYIzTySilog0UlfOVRwh3pXzPSk4frXUT2jZWjHnKae6RU9PaoF9wfy1pGwewQuqGw==} + '@inquirer/password@5.2.2': + resolution: {integrity: sha512-W9zYdyzogK+6110mqwaSJWCBu2yA5Q/OfnGSjjZB1bNpHlmUozXxTl0+QOZBNeVd6Qo81/qT75gW05gLAtITxw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1040,8 +1051,8 @@ packages: '@types/node': optional: true - '@inquirer/rawlist@5.3.2': - resolution: {integrity: sha512-oPSKrYK1X1bMkjXDzIKHUkJp195LFSfgbnVtXnjSKGFjrCbS6I+wyvfAZTwKE9BSt3HwWgfD7JfsXALBgCogzQ==} + '@inquirer/rawlist@5.3.5': + resolution: {integrity: sha512-1oHky1ONfCOwNrnkQGDE1oaSij/3fI6HFMSf2H/WsGO2lEyDX9My82iggITSy9ddSZ8yk8j9v41OI0fVoSIoaA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1049,8 +1060,8 @@ packages: '@types/node': optional: true - '@inquirer/search@4.3.0': - resolution: {integrity: sha512-HFxXE5w727ctSUcAwrDquftJGjMgu36OeV5SHEXMlr2j/ahzmRX9xSEeVolV8tzYnTf45cg6vGkdMMRdm3RPhQ==} + '@inquirer/search@4.3.3': + resolution: {integrity: sha512-fyuIU1Nbpvwlikjg3gXwJFDI11+EFjqQ7P+iByfmivIKQ1vmaykNrD/vy5unHuUqUpsOsnvJ25//tPF7E/RBRA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1058,8 +1069,8 @@ packages: '@types/node': optional: true - '@inquirer/select@5.2.2': - resolution: {integrity: sha512-RkI8dRHWt+bh04oLixvF1kFzKC7e5rqJoHKkzcqSHATebBXFC6GmrT8ddbVkgSzLV0HnHs2cPFuBINr8otij8Q==} + '@inquirer/select@5.2.5': + resolution: {integrity: sha512-9kc15hr8r/kI+3DO/xLog5nOzTz1jqsHXa6JBFzmQKhkoJ8Slda1I1L/uD8ZSZ9tF1yp79wwXe7mclvX1rqR2Q==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1067,8 +1078,8 @@ packages: '@types/node': optional: true - '@inquirer/type@4.0.7': - resolution: {integrity: sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==} + '@inquirer/type@4.1.1': + resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} peerDependencies: '@types/node': '>=18' @@ -1230,6 +1241,9 @@ packages: '@jridgewell/gen-mapping@0.3.13': resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} + '@jridgewell/gen-mapping@0.4.0-beta.0': + resolution: {integrity: sha512-JdGNkbE4GlNPYQhM0L95fBQr7ctLZJ276QXQLTad4t1oSdnnCI3fDq9DW3BqYAWv8Wc3+HS+4Gsii1oPMCfz1w==} + '@jridgewell/remapping@2.3.5': resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==} @@ -1237,8 +1251,8 @@ packages: resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.5.5': - resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/sourcemap-codec@1.6.0': + resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==} '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -1531,6 +1545,13 @@ packages: '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.4 '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.4 + '@napi-rs/wasm-runtime@1.2.4': + resolution: {integrity: sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + peerDependencies: + '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.4 + '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.4 + '@ng-bootstrap/ng-bootstrap@21.0.0': resolution: {integrity: sha512-H7lGYGQGERoX5PeU1nf99U8tvPBJwQod6G99NoaJYwhBtKDoA/W0auUJqcbPMOGnO3gHtjtnOCji49tRbUIbPw==} peerDependencies: @@ -1541,8 +1562,8 @@ packages: '@popperjs/core': ^2.11.8 rxjs: ^6.5.3 || ^7.4.0 - '@ng-select/ng-select@24.0.2': - resolution: {integrity: sha512-EcOQanLp5dNxkDOxK75z7+B3gZW8LvQofzwL5AgWUn04EkJOXRI7Wi6Ylp7+jIAi9yPsTwjznrRd+wSl9EZGAQ==} + '@ng-select/ng-select@24.1.1': + resolution: {integrity: sha512-wPUupPK5TUiSnf7FNrw2FgqKY7B/BcOp+Dkp5dygbJ5zJhB0MSSdeN2TnIi5y0klelLU4KICBTpOZuH4ZbqQRw==} engines: {node: ^22.12.0 || ^24.0.0 || ^26.0.0} peerDependencies: '@angular/cdk': ^22.0.0 @@ -1994,6 +2015,10 @@ packages: resolution: {integrity: sha512-RiD4OZJ4yuaM1aXb3pt1gjDSWwkP0jrgiCuoaBls1eabcrDmlsNuQv0ekxbcGgCRPdSJvmHRZIHHmFPzei8w3Q==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + '@schematics/angular@22.1.8': + resolution: {integrity: sha512-V37T9uHOQVHyxxOqwcJ9xjSIW/mW9UuSfjOc7WJE4V8+3zj0abDJLHuoxDZKe0icYGapgOcvHyYjtNOjSeSivw==} + engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + '@sinclair/typebox@0.27.12': resolution: {integrity: sha512-hhyNJ+nbR6ZR7pToHvllEFun9TL0sbL+tk/ON75lo+Xas054uez98qRbsuNt7MBCyZKK4+8Yli/OAGZhmfBZ/g==} @@ -2382,8 +2407,8 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} - baseline-browser-mapping@2.11.19: - resolution: {integrity: sha512-Grytf1xOxOEMTGRwx6rLGKkTabd4vMg3VrKdj/7joCmV0qgh4QwMMO6xh34YEXQqirAuUdgQGa5orJQQ+69RBw==} + baseline-browser-mapping@2.11.22: + resolution: {integrity: sha512-pWc4w51fBFd7mav43/zKRC+RI6f4yfzQoVlfvE8dECePyfkn1bzLp01Fj0QACcyCZyFhiEMyD2qScfKRWgWibA==} engines: {node: '>=6.0.0'} hasBin: true @@ -2410,8 +2435,8 @@ packages: resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==} engines: {node: 20 || >=22} - browserslist@4.28.8: - resolution: {integrity: sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==} + browserslist@4.28.9: + resolution: {integrity: sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -2641,8 +2666,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.415: - resolution: {integrity: sha512-958V+Kbhtgz+SxXeEVKBjrlKRBIDAYvUJfwhjxMZ5S6ut9jAl7l9ZKBkBrvjyjZE36PabLUo2L8kEeV5O4vgJg==} + electron-to-chromium@1.5.427: + resolution: {integrity: sha512-n14zb3FdsChZ2BNobqNHAJMcP3ifFv4paox2LvCrfVAQcqGiSURgbJl+PfMpHVCNFkStnNc+RRVtPBTVW5PDgw==} emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -2677,8 +2702,8 @@ packages: resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==} engines: {node: '>=0.12'} - entities@8.0.0: - resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==} + entities@8.1.0: + resolution: {integrity: sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==} engines: {node: '>=20.19.0'} environment@1.1.0: @@ -2803,8 +2828,8 @@ packages: resolution: {integrity: sha512-m8YrYgvKe9+9gEnWEuKz+qCGfHqkrff7PPfyDnOFkjsfYRKqiYyOxDFMFieCGAuhtk/VNm63tvNgKZVzVy+Hvg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - express-rate-limit@8.6.2: - resolution: {integrity: sha512-YH4ru+eOJxQABscKFfRCy9R7x9QFGdezclVMwwgFFndzS2Xnm0uo6B0ABZsLhcpeptGv2qvuJVWlQr9gQZoC3A==} + express-rate-limit@8.7.0: + resolution: {integrity: sha512-hOwV7WOxXfjRpAM1DSJWZDXx3GhplwD8IfwuwvogD8i1Qnkgosw/H45s4ZnFAUHDAhPjlY9hLBvJhKmGMyY26g==} engines: {node: '>= 16'} peerDependencies: express: '>= 4.11' @@ -2828,8 +2853,8 @@ packages: fast-string-width@3.0.2: resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==} - fast-uri@3.1.6: - resolution: {integrity: sha512-7Ical1vFEMr0onbVzEDIreM22I4khW+fzyQPwvAFWBp1iwdshSZRsL4jjRvPG9JP1uiqMHRto+YU6R2/CzDz5Q==} + fast-uri@3.1.7: + resolution: {integrity: sha512-dOvZVzjdZdz7phd9v6jCbwxrBW3fK6n8Rc0CtdmM4bumzMnxywBYhuph6J819RRw/ku+rLbelwfMunktuzVVHg==} fast-wrap-ansi@0.2.2: resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==} @@ -2967,8 +2992,8 @@ packages: resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==} engines: {node: '>= 0.4'} - hono@4.13.5: - resolution: {integrity: sha512-O6+/eCYRkzzzy0rPWwKLiGBR1nFuUPZynnwjxN1MBA62NNqbT0wQEzQyK2gSO5yDIDB336sXQleAhOHrzlYyKw==} + hono@4.13.7: + resolution: {integrity: sha512-c8/gF9ac8Y78/agExVocyLevgR+JlpNB444Py0FSX8pJoPdYUfUzRcXtYEYGwt6l19qIlVZPN5Mfsw9jFShmQQ==} engines: {node: '>=16.9.0'} hookified@1.15.1: @@ -3023,8 +3048,8 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - ignore@7.0.5: - resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} + ignore@7.0.8: + resolution: {integrity: sha512-YYNsSlXBjMk92SKnkwvB5LOVSa6OznlFUGcsvrFgNJbJCd0M1XKeFVRc8ZByeCqz32FivYNHJVooLmdqrmvp/Q==} engines: {node: '>= 4'} ignore@7.0.9: @@ -3049,8 +3074,8 @@ packages: inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - ip-address@10.5.0: - resolution: {integrity: sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==} + ip-address@10.7.0: + resolution: {integrity: sha512-BGFsyJd5mpXp3rK6jIdADLNgpJUK1jnjzvYF8lK+VyDab9JAmqN0YOKDdP17HlgKb2+ehPgDc8EtnRLbGCAMhA==} engines: {node: '>= 12'} ipaddr.js@1.9.1: @@ -3306,8 +3331,8 @@ packages: resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==} hasBin: true - jose@6.2.10: - resolution: {integrity: sha512-iiW7J9qRFlGxvCOIBDBDxFePQSn7ZMAnrYGhrrOo6siO/MIqwfyilLR27pkfDgUk+raLuzADS8A3S/KLBisc0g==} + jose@6.2.12: + resolution: {integrity: sha512-9NiFmJEex0sy2Dk58j2UGBSHgUs2ypF9eZSu4L6vjOX3Dp96Sw1F3uL+H+D1sx02jZZdzUT0HgvCy59CuvXcWw==} js-tokens@10.0.0: resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==} @@ -3649,8 +3674,8 @@ packages: node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} - node-releases@2.0.53: - resolution: {integrity: sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==} + node-releases@2.0.55: + resolution: {integrity: sha512-mIrE/Cw9y+9Au6dS5vDKDhQza9YvG6w+ZrS6X+ZzA7yFW/soAeaups4Qzn1bL6g5FVy8WtP79+0j82oPIbqRjQ==} engines: {node: '>=18'} normalize-diacritics@5.0.0: @@ -3683,8 +3708,8 @@ packages: resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} engines: {node: '>= 0.4'} - obug@2.1.4: - resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==} + obug@2.2.1: + resolution: {integrity: sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==} engines: {node: '>=12.20.0'} on-finished@2.4.1: @@ -3830,14 +3855,14 @@ packages: postcss-media-query-parser@0.2.3: resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==} - postcss-safe-parser@7.0.1: - resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==} + postcss-safe-parser@7.1.0: + resolution: {integrity: sha512-1WzZxRLaAFwEh6Do+zyGpjWV3nGJNxxhuh7Ubu/q1ICImMgZJnLwhoaEpRbG4pJppp2Y1ncL9ffA2f+LhrefQg==} engines: {node: '>=18.0'} peerDependencies: postcss: ^8.4.31 - postcss@8.5.26: - resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==} + postcss@8.5.28: + resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -3899,8 +3924,8 @@ packages: resolution: {integrity: sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==} engines: {node: '>=20'} - qs@6.15.3: - resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==} + qs@6.16.0: + resolution: {integrity: sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==} engines: {node: '>=0.6'} range-parser@1.3.0: @@ -4240,8 +4265,8 @@ packages: unrs-resolver@1.12.2: resolution: {integrity: sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==} - update-browserslist-db@1.3.1: - resolution: {integrity: sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==} + update-browserslist-db@1.3.3: + resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -4271,6 +4296,10 @@ packages: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} + verkit@0.3.2: + resolution: {integrity: sha512-zj/ob3UsvJGN0whEAKFp53REA5X66hvffVqoCtVQAakJKnKlH+/PcOfMoFwIG/o4rElqLv/ycAFlx8ZlXUorCg==} + engines: {node: '>=18.12.0'} + vite@8.1.5: resolution: {integrity: sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4442,6 +4471,9 @@ packages: zod@4.4.3: resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==} + zod@4.6.2: + resolution: {integrity: sha512-lh5RCAGFa1Cm2hjtNwLQhSs/AsqdWnTQaBER9fEwN/88pSh7KOtJavtBx/0VlkN/uFd61SwYmljLMDAsHlvzBQ==} + snapshots: '@ampproject/remapping@2.3.0': @@ -4451,25 +4483,25 @@ snapshots: '@angular-builders/common@6.0.1(chokidar@5.0.0)': dependencies: - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) - '@schematics/angular': 22.1.3(chokidar@5.0.0) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) + '@schematics/angular': 22.1.6(chokidar@5.0.0) get-tsconfig: 4.14.1 jiti: 2.7.0 transitivePeerDependencies: - chokidar - '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': + '@angular-builders/jest@22.0.1(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(chokidar@5.0.0)(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(rxjs@7.8.2)(typescript@6.0.3)': dependencies: '@angular-builders/common': 6.0.1(chokidar@5.0.0) '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) - '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) + '@angular/compiler-cli': 22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) '@schematics/angular': 22.1.3(chokidar@5.0.0) jest: 30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)) - jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) + jest-preset-angular: 17.0.0(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3) lodash: 4.18.1 rxjs: 7.8.2 transitivePeerDependencies: @@ -4490,9 +4522,9 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-devkit/architect@0.2201.6(chokidar@5.0.0)': + '@angular-devkit/architect@0.2201.8(chokidar@5.0.0)': dependencies: - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) rxjs: 7.8.2 transitivePeerDependencies: - chokidar @@ -4519,6 +4551,17 @@ snapshots: optionalDependencies: chokidar: 5.0.0 + '@angular-devkit/core@22.1.8(chokidar@5.0.0)': + dependencies: + ajv: 8.20.0 + ajv-formats: 3.0.1 + jsonc-parser: 3.3.1 + picomatch: 4.0.5 + rxjs: 7.8.2 + source-map: 0.7.6 + optionalDependencies: + chokidar: 5.0.0 + '@angular-devkit/schematics@22.1.3(chokidar@5.0.0)': dependencies: '@angular-devkit/core': 22.1.3(chokidar@5.0.0) @@ -4539,23 +4582,32 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-eslint/builder@22.1.0(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-devkit/schematics@22.1.8(chokidar@5.0.0)': dependencies: - '@angular-devkit/architect': 0.2201.3(chokidar@5.0.0) - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + jsonc-parser: 3.3.1 + magic-string: 1.0.0 + ora: 9.4.1 + rxjs: 7.8.2 + transitivePeerDependencies: + - chokidar + + '@angular-eslint/builder@22.5.0(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + dependencies: + '@angular-devkit/architect': 0.2201.8(chokidar@5.0.0) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 transitivePeerDependencies: - chokidar - '@angular-eslint/bundled-angular-compiler@22.1.0': {} + '@angular-eslint/bundled-angular-compiler@22.5.0': {} - '@angular-eslint/eslint-plugin-template@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/eslint-plugin-template@22.5.0(@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: - '@angular-eslint/bundled-angular-compiler': 22.1.0 - '@angular-eslint/template-parser': 22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/bundled-angular-compiler': 22.5.0 + '@angular-eslint/template-parser': 22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/utils': 22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@typescript-eslint/types': 8.70.0 '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) aria-query: 5.3.2 @@ -4563,23 +4615,22 @@ snapshots: eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 - '@angular-eslint/eslint-plugin@22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/eslint-plugin@22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: - '@angular-eslint/bundled-angular-compiler': 22.1.0 - '@angular-eslint/utils': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/bundled-angular-compiler': 22.5.0 + '@angular-eslint/utils': 22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) ts-api-utils: 2.5.0(typescript@6.0.3) typescript: 6.0.3 - '@angular-eslint/schematics@22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/schematics@22.5.0(@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(chokidar@5.0.0)(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) - '@angular-eslint/eslint-plugin': 22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular-eslint/eslint-plugin-template': 22.1.0(@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) - '@angular/cli': 22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1) - ignore: 7.0.5 + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) + '@angular-eslint/eslint-plugin': 22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + '@angular-eslint/eslint-plugin-template': 22.5.0(@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3))(@typescript-eslint/types@8.70.0)(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3) + ignore: 7.0.8 semver: 7.8.5 strip-json-comments: 3.1.1 transitivePeerDependencies: @@ -4590,33 +4641,33 @@ snapshots: - eslint - typescript - '@angular-eslint/template-parser@22.1.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/template-parser@22.5.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: - '@angular-eslint/bundled-angular-compiler': 22.1.0 + '@angular-eslint/bundled-angular-compiler': 22.5.0 eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) eslint-scope: 9.1.2 typescript: 6.0.3 - '@angular-eslint/utils@22.1.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': + '@angular-eslint/utils@22.5.0(@typescript-eslint/utils@8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3))(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(typescript@6.0.3)': dependencies: - '@angular-eslint/bundled-angular-compiler': 22.1.0 + '@angular-eslint/bundled-angular-compiler': 22.5.0 '@typescript-eslint/utils': 8.70.0(eslint@10.10.0(jiti@2.7.0)(supports-color@8.1.1))(supports-color@8.1.1)(typescript@6.0.3) eslint: 10.10.0(jiti@2.7.0)(supports-color@8.1.1) typescript: 6.0.3 - '@angular/build@22.1.6(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.26)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3)': + '@angular/build@22.1.8(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6)(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@types/node@26.5.0)(chokidar@5.0.0)(istanbul-lib-instrument@6.0.3(supports-color@8.1.1))(jiti@2.7.0)(postcss@8.5.28)(supports-color@8.1.1)(tslib@2.8.1)(typescript@6.0.3)': dependencies: '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.2201.6(chokidar@5.0.0) - '@angular/compiler': 22.1.3 - '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) + '@angular-devkit/architect': 0.2201.8(chokidar@5.0.0) + '@angular/compiler': 22.1.6 + '@angular/compiler-cli': 22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3) '@babel/core': 8.0.1 '@babel/helper-annotate-as-pure': 8.0.0 '@babel/helper-split-export-declaration': 7.24.7 '@inquirer/confirm': 6.1.1(@types/node@26.5.0) '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0)) beasties: 0.4.3 - browserslist: 4.28.8 + browserslist: 4.28.9 esbuild: 0.28.2 https-proxy-agent: 9.1.0(supports-color@8.1.1) jsonc-parser: 3.3.1 @@ -4637,12 +4688,12 @@ snapshots: vite: 8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0) watchpack: 2.5.2 optionalDependencies: - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/localize': 22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3) - '@angular/platform-browser': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/localize': 22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6) + '@angular/platform-browser': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) istanbul-lib-instrument: 6.0.3(supports-color@8.1.1) lmdb: 3.5.6 - postcss: 8.5.26 + postcss: 8.5.28 transitivePeerDependencies: - '@types/node' - '@vitejs/devtools' @@ -4657,24 +4708,25 @@ snapshots: - tsx - yaml - '@angular/cdk@22.1.4(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2)': + '@angular/cdk@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2)': dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/platform-browser': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/forms': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/platform-browser': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) parse5: 8.0.1 rxjs: 7.8.2 tslib: 2.8.1 - '@angular/cli@22.1.6(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1)': + '@angular/cli@22.1.8(@types/node@26.5.0)(chokidar@5.0.0)(supports-color@8.1.1)': dependencies: - '@angular-devkit/architect': 0.2201.6(chokidar@5.0.0) - '@angular-devkit/core': 22.1.6(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.6(chokidar@5.0.0) + '@angular-devkit/architect': 0.2201.8(chokidar@5.0.0) + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) '@inquirer/prompts': 8.5.2(@types/node@26.5.0) '@listr2/prompt-adapter-inquirer': 4.2.5(@inquirer/prompts@8.5.2(@types/node@26.5.0))(@types/node@26.5.0)(listr2@11.0.0) '@modelcontextprotocol/sdk': 1.30.0(supports-color@8.1.1) - '@schematics/angular': 22.1.6(chokidar@5.0.0) + '@schematics/angular': 22.1.8(chokidar@5.0.0) jsonc-parser: 3.3.1 listr2: 11.0.0 npm-package-arg: 14.0.0 @@ -4688,17 +4740,17 @@ snapshots: - chokidar - supports-color - '@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2)': + '@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2)': dependencies: - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) rxjs: 7.8.2 tslib: 2.8.1 - '@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3)': + '@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3)': dependencies: - '@angular/compiler': 22.1.3 + '@angular/compiler': 22.1.6 '@babel/core': 8.0.1 - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 chokidar: 5.0.0 convert-source-map: 1.9.0 reflect-metadata: 0.2.2 @@ -4708,46 +4760,46 @@ snapshots: optionalDependencies: typescript: 6.0.3 - '@angular/compiler@22.1.3': + '@angular/compiler@22.1.6': dependencies: tslib: 2.8.1 - '@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)': + '@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)': dependencies: rxjs: 7.8.2 tslib: 2.8.1 optionalDependencies: - '@angular/compiler': 22.1.3 + '@angular/compiler': 22.1.6 - '@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2)': + '@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2)': dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/platform-browser': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/platform-browser': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) '@standard-schema/spec': 1.1.0 rxjs: 7.8.2 tslib: 2.8.1 - zod: 4.4.3 + zod: 4.6.2 - '@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3)': + '@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6)': dependencies: - '@angular/compiler': 22.1.3 - '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) + '@angular/compiler': 22.1.6 + '@angular/compiler-cli': 22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3) '@babel/core': 8.0.1 tinyglobby: 0.2.17 yargs: 18.1.0 - '@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))': + '@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))': dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) tslib: 2.8.1 - '@angular/router@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2)': + '@angular/router@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2)': dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/platform-browser': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/platform-browser': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) rxjs: 7.8.2 tslib: 2.8.1 @@ -4772,7 +4824,7 @@ snapshots: '@babel/compat-data@7.29.7': {} - '@babel/compat-data@8.0.0': {} + '@babel/compat-data@8.0.5': {} '@babel/core@7.29.7(supports-color@8.1.1)': dependencies: @@ -4797,20 +4849,20 @@ snapshots: '@babel/core@8.0.1': dependencies: '@babel/code-frame': 8.0.0 - '@babel/generator': 8.0.0 - '@babel/helper-compilation-targets': 8.0.0 - '@babel/helpers': 8.0.0 - '@babel/parser': 8.0.4 + '@babel/generator': 8.0.5 + '@babel/helper-compilation-targets': 8.0.5 + '@babel/helpers': 8.0.5 + '@babel/parser': 8.0.5 '@babel/template': 8.0.0 - '@babel/traverse': 8.0.4 - '@babel/types': 8.0.4 + '@babel/traverse': 8.0.5 + '@babel/types': 8.0.5 '@types/gensync': 1.0.5 convert-source-map: 2.0.0 empathic: 2.0.1 gensync: 1.0.0-beta.2 import-meta-resolve: 4.2.0 json5: 2.2.3 - obug: 2.1.4 + obug: 2.2.1 semver: 7.8.5 '@babel/generator@7.29.8': @@ -4821,34 +4873,34 @@ snapshots: '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 - '@babel/generator@8.0.0': + '@babel/generator@8.0.5': dependencies: - '@babel/parser': 8.0.4 - '@babel/types': 8.0.4 - '@jridgewell/gen-mapping': 0.3.13 + '@babel/parser': 8.0.5 + '@babel/types': 8.0.5 + '@jridgewell/gen-mapping': 0.4.0-beta.0 '@jridgewell/trace-mapping': 0.3.31 '@types/jsesc': 2.5.1 jsesc: 3.1.0 '@babel/helper-annotate-as-pure@8.0.0': dependencies: - '@babel/types': 8.0.4 + '@babel/types': 8.0.5 '@babel/helper-compilation-targets@7.29.7': dependencies: '@babel/compat-data': 7.29.7 '@babel/helper-validator-option': 7.29.7 - browserslist: 4.28.8 + browserslist: 4.28.9 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-compilation-targets@8.0.0': + '@babel/helper-compilation-targets@8.0.5': dependencies: - '@babel/compat-data': 8.0.0 + '@babel/compat-data': 8.0.5 '@babel/helper-validator-option': 8.0.0 - browserslist: 4.28.8 + browserslist: 4.28.9 lru-cache: 11.5.2 - semver: 7.8.5 + verkit: 0.3.2 '@babel/helper-globals@7.29.7': {} @@ -4893,18 +4945,18 @@ snapshots: '@babel/template': 7.29.7 '@babel/types': 7.29.8 - '@babel/helpers@8.0.0': + '@babel/helpers@8.0.5': dependencies: '@babel/template': 8.0.0 - '@babel/types': 8.0.4 + '@babel/types': 8.0.5 '@babel/parser@7.29.8': dependencies: '@babel/types': 7.29.8 - '@babel/parser@8.0.4': + '@babel/parser@8.0.5': dependencies: - '@babel/types': 8.0.4 + '@babel/types': 8.0.5 '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.7(supports-color@8.1.1))': dependencies: @@ -5000,8 +5052,8 @@ snapshots: '@babel/template@8.0.0': dependencies: '@babel/code-frame': 8.0.0 - '@babel/parser': 8.0.4 - '@babel/types': 8.0.4 + '@babel/parser': 8.0.5 + '@babel/types': 8.0.5 '@babel/traverse@7.29.8(supports-color@8.1.1)': dependencies: @@ -5015,22 +5067,22 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/traverse@8.0.4': + '@babel/traverse@8.0.5': dependencies: '@babel/code-frame': 8.0.0 - '@babel/generator': 8.0.0 + '@babel/generator': 8.0.5 '@babel/helper-globals': 8.0.0 - '@babel/parser': 8.0.4 + '@babel/parser': 8.0.5 '@babel/template': 8.0.0 - '@babel/types': 8.0.4 - obug: 2.1.4 + '@babel/types': 8.0.5 + obug: 2.2.1 '@babel/types@7.29.8': dependencies: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@babel/types@8.0.4': + '@babel/types@8.0.5': dependencies: '@babel/helper-string-parser': 8.0.0 '@babel/helper-validator-identifier': 8.0.4 @@ -5229,9 +5281,9 @@ snapshots: '@harperfast/extended-iterable@1.0.3': optional: true - '@hono/node-server@2.1.1(hono@4.13.5)': + '@hono/node-server@2.1.1(hono@4.13.7)': dependencies: - hono: 4.13.5 + hono: 4.13.7 '@humanfs/core@0.19.2': dependencies: @@ -5249,36 +5301,36 @@ snapshots: '@humanwhocodes/retry@0.4.3': {} - '@inquirer/ansi@2.0.7': {} + '@inquirer/ansi@2.0.8': {} - '@inquirer/checkbox@5.2.2(@types/node@26.5.0)': + '@inquirer/checkbox@5.2.5(@types/node@26.5.0)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/ansi': 2.0.8 + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 '@inquirer/confirm@6.1.1(@types/node@26.5.0)': dependencies: '@inquirer/core': 11.2.1(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/confirm@6.2.0(@types/node@26.5.0)': + '@inquirer/confirm@6.3.2(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 '@inquirer/core@11.2.1(@types/node@26.5.0)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/ansi': 2.0.8 + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.5.0) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 @@ -5286,11 +5338,11 @@ snapshots: optionalDependencies: '@types/node': 26.5.0 - '@inquirer/core@12.0.0(@types/node@26.5.0)': + '@inquirer/core@12.0.3(@types/node@26.5.0)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/ansi': 2.0.8 + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.5.0) cli-width: 4.1.0 fast-wrap-ansi: 0.2.2 mute-stream: 3.0.0 @@ -5298,92 +5350,92 @@ snapshots: optionalDependencies: '@types/node': 26.5.0 - '@inquirer/editor@5.3.0(@types/node@26.5.0)': + '@inquirer/editor@5.3.3(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/external-editor': 3.0.4(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/external-editor': 3.0.5(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/expand@5.1.2(@types/node@26.5.0)': + '@inquirer/expand@5.1.5(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/external-editor@3.0.4(@types/node@26.5.0)': + '@inquirer/external-editor@3.0.5(@types/node@26.5.0)': dependencies: chardet: 2.2.0 iconv-lite: 0.7.3 optionalDependencies: '@types/node': 26.5.0 - '@inquirer/figures@2.0.8': {} + '@inquirer/figures@2.0.9': {} - '@inquirer/input@5.1.3(@types/node@26.5.0)': + '@inquirer/input@5.1.6(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/number@4.2.0(@types/node@26.5.0)': + '@inquirer/number@4.2.3(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/password@5.1.2(@types/node@26.5.0)': + '@inquirer/password@5.2.2(@types/node@26.5.0)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/ansi': 2.0.8 + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 '@inquirer/prompts@8.5.2(@types/node@26.5.0)': dependencies: - '@inquirer/checkbox': 5.2.2(@types/node@26.5.0) - '@inquirer/confirm': 6.2.0(@types/node@26.5.0) - '@inquirer/editor': 5.3.0(@types/node@26.5.0) - '@inquirer/expand': 5.1.2(@types/node@26.5.0) - '@inquirer/input': 5.1.3(@types/node@26.5.0) - '@inquirer/number': 4.2.0(@types/node@26.5.0) - '@inquirer/password': 5.1.2(@types/node@26.5.0) - '@inquirer/rawlist': 5.3.2(@types/node@26.5.0) - '@inquirer/search': 4.3.0(@types/node@26.5.0) - '@inquirer/select': 5.2.2(@types/node@26.5.0) + '@inquirer/checkbox': 5.2.5(@types/node@26.5.0) + '@inquirer/confirm': 6.3.2(@types/node@26.5.0) + '@inquirer/editor': 5.3.3(@types/node@26.5.0) + '@inquirer/expand': 5.1.5(@types/node@26.5.0) + '@inquirer/input': 5.1.6(@types/node@26.5.0) + '@inquirer/number': 4.2.3(@types/node@26.5.0) + '@inquirer/password': 5.2.2(@types/node@26.5.0) + '@inquirer/rawlist': 5.3.5(@types/node@26.5.0) + '@inquirer/search': 4.3.3(@types/node@26.5.0) + '@inquirer/select': 5.2.5(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/rawlist@5.3.2(@types/node@26.5.0)': + '@inquirer/rawlist@5.3.5(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/search@4.3.0(@types/node@26.5.0)': + '@inquirer/search@4.3.3(@types/node@26.5.0)': dependencies: - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/select@5.2.2(@types/node@26.5.0)': + '@inquirer/select@5.2.5(@types/node@26.5.0)': dependencies: - '@inquirer/ansi': 2.0.7 - '@inquirer/core': 12.0.0(@types/node@26.5.0) - '@inquirer/figures': 2.0.8 - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/ansi': 2.0.8 + '@inquirer/core': 12.0.3(@types/node@26.5.0) + '@inquirer/figures': 2.0.9 + '@inquirer/type': 4.1.1(@types/node@26.5.0) optionalDependencies: '@types/node': 26.5.0 - '@inquirer/type@4.0.7(@types/node@26.5.0)': + '@inquirer/type@4.1.1(@types/node@26.5.0)': optionalDependencies: '@types/node': 26.5.0 @@ -5656,7 +5708,12 @@ snapshots: '@jridgewell/gen-mapping@0.3.13': dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 + '@jridgewell/trace-mapping': 0.3.31 + + '@jridgewell/gen-mapping@0.4.0-beta.0': + dependencies: + '@jridgewell/sourcemap-codec': 1.6.0 '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/remapping@2.3.5': @@ -5666,17 +5723,17 @@ snapshots: '@jridgewell/resolve-uri@3.1.2': {} - '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/sourcemap-codec@1.6.0': {} '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 '@jridgewell/trace-mapping@0.3.9': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 '@keyv/bigmap@1.3.1(keyv@5.6.0)': dependencies: @@ -5689,7 +5746,7 @@ snapshots: '@listr2/prompt-adapter-inquirer@4.2.5(@inquirer/prompts@8.5.2(@types/node@26.5.0))(@types/node@26.5.0)(listr2@11.0.0)': dependencies: '@inquirer/prompts': 8.5.2(@types/node@26.5.0) - '@inquirer/type': 4.0.7(@types/node@26.5.0) + '@inquirer/type': 4.1.1(@types/node@26.5.0) listr2: 11.0.0 transitivePeerDependencies: - '@types/node' @@ -5717,7 +5774,7 @@ snapshots: '@modelcontextprotocol/sdk@1.30.0(supports-color@8.1.1)': dependencies: - '@hono/node-server': 2.1.1(hono@4.13.5) + '@hono/node-server': 2.1.1(hono@4.13.7) ajv: 8.20.0 ajv-formats: 3.0.1 content-type: 1.0.5 @@ -5726,14 +5783,14 @@ snapshots: eventsource: 3.0.7 eventsource-parser: 3.1.1 express: 5.2.1(supports-color@8.1.1) - express-rate-limit: 8.6.2(express@5.2.1(supports-color@8.1.1))(supports-color@8.1.1) - hono: 4.13.5 - jose: 6.2.10 + express-rate-limit: 8.7.0(express@5.2.1(supports-color@8.1.1))(supports-color@8.1.1) + hono: 4.13.7 + jose: 6.2.12 json-schema-typed: 8.0.2 pkce-challenge: 5.0.1 raw-body: 3.0.2 - zod: 4.4.3 - zod-to-json-schema: 3.25.2(zod@4.4.3) + zod: 4.6.2 + zod-to-json-schema: 3.25.2(zod@4.6.2) transitivePeerDependencies: - supports-color @@ -5882,43 +5939,43 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true - '@napi-rs/wasm-runtime@1.2.3(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': + '@napi-rs/wasm-runtime@1.2.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': dependencies: '@emnapi/core': 1.11.1 '@emnapi/runtime': 1.11.1 '@tybys/wasm-util': 0.10.3 optional: true - '@napi-rs/wasm-runtime@1.2.3(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)': + '@napi-rs/wasm-runtime@1.2.4(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2)': dependencies: '@emnapi/core': 1.11.2 '@emnapi/runtime': 1.11.2 '@tybys/wasm-util': 0.10.3 optional: true - '@ng-bootstrap/ng-bootstrap@21.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@popperjs/core@2.11.8)(rxjs@7.8.2)': + '@ng-bootstrap/ng-bootstrap@21.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6))(@popperjs/core@2.11.8)(rxjs@7.8.2)': dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/forms': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) - '@angular/localize': 22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/forms': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/localize': 22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6) '@popperjs/core': 2.11.8 rxjs: 7.8.2 tslib: 2.8.1 - '@ng-select/ng-select@24.0.2(@angular/cdk@22.1.4(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))': + '@ng-select/ng-select@24.1.1(9fe845424e0b7fed075564002b1b329d)': dependencies: - '@angular/cdk': 22.1.4(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/forms': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/cdk': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/forms': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) tslib: 2.8.1 - '@ngneat/dirty-check-forms@3.0.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/router@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(lodash-es@4.18.1)(rxjs@7.8.2)': + '@ngneat/dirty-check-forms@3.0.3(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/router@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(lodash-es@4.18.1)(rxjs@7.8.2)': dependencies: - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/forms': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) - '@angular/router': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/forms': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/router': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) lodash-es: 4.18.1 rxjs: 7.8.2 tslib: 2.8.1 @@ -5975,7 +6032,7 @@ snapshots: dependencies: '@emnapi/core': 1.11.2 '@emnapi/runtime': 1.11.2 - '@napi-rs/wasm-runtime': 1.2.3(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2) + '@napi-rs/wasm-runtime': 1.2.4(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2) optional: true '@oxc-parser/binding-win32-arm64-msvc@0.142.0': @@ -6136,14 +6193,14 @@ snapshots: dependencies: '@emnapi/core': 1.11.1 '@emnapi/runtime': 1.11.1 - '@napi-rs/wasm-runtime': 1.2.3(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + '@napi-rs/wasm-runtime': 1.2.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) optional: true '@rolldown/binding-wasm32-wasi@1.2.0': dependencies: '@emnapi/core': 1.11.2 '@emnapi/runtime': 1.11.2 - '@napi-rs/wasm-runtime': 1.2.3(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2) + '@napi-rs/wasm-runtime': 1.2.4(@emnapi/core@1.11.2)(@emnapi/runtime@1.11.2) optional: true '@rolldown/binding-win32-arm64-msvc@1.1.5': @@ -6178,6 +6235,15 @@ snapshots: transitivePeerDependencies: - chokidar + '@schematics/angular@22.1.8(chokidar@5.0.0)': + dependencies: + '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) + jsonc-parser: 3.3.1 + typescript: 6.0.3 + transitivePeerDependencies: + - chokidar + '@sinclair/typebox@0.27.12': {} '@sinclair/typebox@0.34.52': {} @@ -6471,7 +6537,7 @@ snapshots: ajv@8.20.0: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.1.6 + fast-uri: 3.1.7 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -6566,7 +6632,7 @@ snapshots: balanced-match@4.0.4: {} - baseline-browser-mapping@2.11.19: {} + baseline-browser-mapping@2.11.22: {} beasties@0.4.3: dependencies: @@ -6576,9 +6642,9 @@ snapshots: domhandler: 5.0.3 htmlparser2: 10.1.0 picocolors: 1.1.1 - postcss: 8.5.26 + postcss: 8.5.28 postcss-media-query-parser: 0.2.3 - postcss-safe-parser: 7.0.1(postcss@8.5.26) + postcss-safe-parser: 7.1.0(postcss@8.5.28) body-parser@2.3.0(supports-color@8.1.1): dependencies: @@ -6588,7 +6654,7 @@ snapshots: http-errors: 2.0.1 iconv-lite: 0.7.3 on-finished: 2.4.1 - qs: 6.15.3 + qs: 6.16.0 raw-body: 3.0.2 type-is: 2.1.0 transitivePeerDependencies: @@ -6608,13 +6674,13 @@ snapshots: dependencies: balanced-match: 4.0.4 - browserslist@4.28.8: + browserslist@4.28.9: dependencies: - baseline-browser-mapping: 2.11.19 + baseline-browser-mapping: 2.11.22 caniuse-lite: 1.0.30001810 - electron-to-chromium: 1.5.415 - node-releases: 2.0.53 - update-browserslist-db: 1.3.1(browserslist@4.28.8) + electron-to-chromium: 1.5.427 + node-releases: 2.0.55 + update-browserslist-db: 1.3.3(browserslist@4.28.9) bs-logger@0.2.6: dependencies: @@ -6807,7 +6873,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.415: {} + electron-to-chromium@1.5.427: {} emittery@0.13.1: {} @@ -6827,7 +6893,7 @@ snapshots: entities@7.0.1: {} - entities@8.0.0: {} + entities@8.1.0: {} environment@1.1.0: {} @@ -6992,11 +7058,11 @@ snapshots: jest-mock: 30.5.1 jest-util: 30.5.1 - express-rate-limit@8.6.2(express@5.2.1(supports-color@8.1.1))(supports-color@8.1.1): + express-rate-limit@8.7.0(express@5.2.1(supports-color@8.1.1))(supports-color@8.1.1): dependencies: debug: 4.4.3(supports-color@8.1.1) express: 5.2.1(supports-color@8.1.1) - ip-address: 10.5.0 + ip-address: 10.7.0 transitivePeerDependencies: - supports-color @@ -7022,7 +7088,7 @@ snapshots: once: 1.4.0 parseurl: 1.3.3 proxy-addr: 2.0.7 - qs: 6.15.3 + qs: 6.16.0 range-parser: 1.3.0 router: 2.2.0(supports-color@8.1.1) send: 1.2.1(supports-color@8.1.1) @@ -7045,7 +7111,7 @@ snapshots: dependencies: fast-string-truncated-width: 3.0.3 - fast-uri@3.1.6: {} + fast-uri@3.1.7: {} fast-wrap-ansi@0.2.2: dependencies: @@ -7187,7 +7253,7 @@ snapshots: dependencies: function-bind: 1.1.2 - hono@4.13.5: {} + hono@4.13.7: {} hookified@1.15.1: {} @@ -7253,7 +7319,7 @@ snapshots: ignore@5.3.2: {} - ignore@7.0.5: {} + ignore@7.0.8: {} ignore@7.0.9: {} @@ -7270,7 +7336,7 @@ snapshots: inherits@2.0.4: {} - ip-address@10.5.0: {} + ip-address@10.7.0: {} ipaddr.js@1.9.1: {} @@ -7526,7 +7592,7 @@ snapshots: chalk: 4.1.2 graceful-fs: 4.2.11 jest-util: 30.4.1 - picomatch: 4.0.5 + picomatch: 4.0.7 pretty-format: 30.4.1 slash: 3.0.0 stack-utils: 2.0.6 @@ -7557,11 +7623,11 @@ snapshots: '@types/node': 26.5.0 jest-util: 30.5.1 - jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): + jest-preset-angular@17.0.0(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(@babel/core@7.29.7(supports-color@8.1.1))(@jest/transform@30.5.1(supports-color@8.1.1))(@jest/types@30.5.1)(babel-jest@30.5.1(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(jest@30.5.1(@types/node@26.5.0)(supports-color@8.1.1)(ts-node@10.9.2(@types/node@26.5.0)(typescript@6.0.3)))(jsdom@26.1.0(supports-color@8.1.1))(typescript@6.0.3): dependencies: - '@angular/compiler-cli': 22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/platform-browser': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)) + '@angular/compiler-cli': 22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/platform-browser': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)) '@jest/environment-jsdom-abstract': 30.4.1(jsdom@26.1.0(supports-color@8.1.1)) bs-logger: 0.2.6 esbuild-wasm: 0.28.2 @@ -7748,7 +7814,7 @@ snapshots: jiti@2.7.0: {} - jose@6.2.10: {} + jose@6.2.12: {} js-tokens@10.0.0: {} @@ -7926,7 +7992,7 @@ snapshots: magic-string@1.0.0: dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/sourcemap-codec': 1.6.0 make-dir@4.0.0: dependencies: @@ -8007,46 +8073,46 @@ snapshots: neo-async@2.6.2: {} - ngx-bootstrap-icons@1.9.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)): + ngx-bootstrap-icons@1.9.3(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) tslib: 2.8.1 - ngx-color@10.1.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)): + ngx-color@10.1.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) '@ctrl/tinycolor': 4.2.0 material-colors: 1.2.6 tslib: 2.8.1 - ngx-cookie-service@22.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)): + ngx-cookie-service@22.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) tslib: 2.8.1 - ngx-device-detector@12.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)): + ngx-device-detector@12.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) tslib: 2.8.1 - ngx-ui-tour-core@17.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/router@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(rxjs@7.8.2): + ngx-ui-tour-core@17.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/router@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(rxjs@7.8.2): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@angular/router': 22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@angular/router': 22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2) rxjs: 7.8.2 tslib: 2.8.1 - ngx-ui-tour-ng-bootstrap@19.0.0(55dd56417d8b845704494a1b92156fbd): + ngx-ui-tour-ng-bootstrap@19.0.0(62aff516824eb66443798196c0536bf9): dependencies: - '@angular/common': 22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2) - '@angular/core': 22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2) - '@ng-bootstrap/ng-bootstrap': 21.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/forms@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.3(@angular/compiler-cli@22.1.3(@angular/compiler@22.1.3)(typescript@6.0.3))(@angular/compiler@22.1.3))(@popperjs/core@2.11.8)(rxjs@7.8.2) - ngx-ui-tour-core: 17.0.0(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/router@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(@angular/platform-browser@22.1.3(@angular/common@22.1.3(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.3(@angular/compiler@22.1.3)(rxjs@7.8.2)))(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/common': 22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2) + '@angular/core': 22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2) + '@ng-bootstrap/ng-bootstrap': 21.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/forms@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(@angular/localize@22.1.6(@angular/compiler-cli@22.1.6(@angular/compiler@22.1.6)(typescript@6.0.3))(@angular/compiler@22.1.6))(@popperjs/core@2.11.8)(rxjs@7.8.2) + ngx-ui-tour-core: 17.0.0(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/router@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(@angular/platform-browser@22.1.6(@angular/common@22.1.6(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.1.6(@angular/compiler@22.1.6)(rxjs@7.8.2)))(rxjs@7.8.2))(rxjs@7.8.2) tslib: 2.8.1 transitivePeerDependencies: - '@angular/router' @@ -8064,7 +8130,7 @@ snapshots: node-int64@0.4.0: {} - node-releases@2.0.53: {} + node-releases@2.0.55: {} normalize-diacritics@5.0.0: dependencies: @@ -8093,7 +8159,7 @@ snapshots: object-inspect@1.13.4: {} - obug@2.1.4: {} + obug@2.2.1: {} on-finished@2.4.1: dependencies: @@ -8190,7 +8256,7 @@ snapshots: parse5-html-rewriting-stream@8.0.1: dependencies: - entities: 8.0.0 + entities: 8.1.0 parse5: 8.0.1 parse5-sax-parser: 8.0.0 @@ -8204,7 +8270,7 @@ snapshots: parse5@8.0.1: dependencies: - entities: 8.0.0 + entities: 8.1.0 parseurl@1.3.3: {} @@ -8258,11 +8324,11 @@ snapshots: postcss-media-query-parser@0.2.3: {} - postcss-safe-parser@7.0.1(postcss@8.5.26): + postcss-safe-parser@7.1.0(postcss@8.5.28): dependencies: - postcss: 8.5.26 + postcss: 8.5.28 - postcss@8.5.26: + postcss@8.5.28: dependencies: nanoid: 3.3.18 picocolors: 1.1.1 @@ -8314,7 +8380,7 @@ snapshots: dependencies: hookified: 2.2.0 - qs@6.15.3: + qs@6.16.0: dependencies: es-define-property: 1.0.1 side-channel: 1.1.1 @@ -8702,9 +8768,9 @@ snapshots: '@unrs/resolver-binding-win32-ia32-msvc': 1.12.2 '@unrs/resolver-binding-win32-x64-msvc': 1.12.2 - update-browserslist-db@1.3.1(browserslist@4.28.8): + update-browserslist-db@1.3.3(browserslist@4.28.9): dependencies: - browserslist: 4.28.8 + browserslist: 4.28.9 escalade: 3.2.0 picocolors: 1.1.1 @@ -8730,11 +8796,13 @@ snapshots: vary@1.1.2: {} + verkit@0.3.2: {} + vite@8.1.5(@types/node@26.5.0)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.101.0): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 - postcss: 8.5.26 + postcss: 8.5.28 rolldown: 1.1.5 tinyglobby: 0.2.17 optionalDependencies: @@ -8847,8 +8915,10 @@ snapshots: yoctocolors@2.2.0: {} - zod-to-json-schema@3.25.2(zod@4.4.3): + zod-to-json-schema@3.25.2(zod@4.6.2): dependencies: - zod: 4.4.3 + zod: 4.6.2 zod@4.4.3: {} + + zod@4.6.2: {} From c0000d37c7cc9a8d93f7d37581b42c6ce61a3a01 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 23:22:03 +0000 Subject: [PATCH 067/258] Auto translate strings --- src-ui/messages.xlf | 70 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 21e4ba97c..ce3fb2822 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -5,14 +5,14 @@ Close - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/alert/alert.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/alert/alert.ts 39 Slide of - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/carousel/carousel.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts 129 Currently selected slide number read by screen reader @@ -20,219 +20,219 @@ Previous - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/carousel/carousel.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts 147,148 Next - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/carousel/carousel.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts 187 Select month - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation-select.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts 89 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation-select.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts 89 Select year - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation-select.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts 89 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation-select.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts 89 Previous month - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts 74,76 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts 103 Next month - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts 103 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/datepicker/datepicker-navigation.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts 103 «« - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 297 « - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 322 » - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 358 »» - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 396 First - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 414,415 Previous - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 444,445 Next - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 479,480 Last - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/pagination/pagination.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts 506 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/progressbar/progressbar.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/progressbar/progressbar.ts 40 HH - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 256,259 Hours - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 293,295 MM - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 322 Minutes - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 360 Increment hours - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 397,399 Decrement hours - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 435,438 Increment minutes - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 Decrement minutes - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 SS - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 Seconds - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 Increment seconds - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 Decrement seconds - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/timepicker/timepicker.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts 442 Close - node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.3_@angular+core@22.1.3_@angular+_6e980a1a1b6a042b5112673ade17a76b/node_modules/src/toast/toast.ts + node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/toast/toast.ts 110,112 From d80997a0707e3d20757493ac62f16e2d4a8be54c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 17:15:48 -0700 Subject: [PATCH 068/258] Chore(deps): Bump the actions group across 1 directory with 8 updates (#14162) Bumps the actions group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) | `10.0.1` | `10.1.0` | | [actions/deploy-pages](https://github.com/actions/deploy-pages) | `5.0.0` | `5.0.1` | | [pnpm/action-setup](https://github.com/pnpm/action-setup) | `6.0.10` | `6.1.0` | | [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) | `0.6.2` | `0.6.4` | | [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) | `4.37.9` | `4.38.0` | | [github/codeql-action/init](https://github.com/github/codeql-action) | `4.37.9` | `4.38.0` | | [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.37.9` | `4.38.0` | | [crowdin/github-action](https://github.com/crowdin/github-action) | `3.0.0` | `3.0.2` | Updates `astral-sh/setup-uv` from 10.0.1 to 10.1.0 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](https://github.com/astral-sh/setup-uv/compare/20cfd1bf945f4377ade1205e4dbc17946fc9a30d...bec219d24cd3e171d82865faccec33120bb574f4) Updates `actions/deploy-pages` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/actions/deploy-pages/releases) - [Commits](https://github.com/actions/deploy-pages/compare/cd2ce8fcbc39b97be8ca5fce6e763baed58fa128...368f82528645a54fb793d4d04e342629a3f51346) Updates `pnpm/action-setup` from 6.0.10 to 6.1.0 - [Release notes](https://github.com/pnpm/action-setup/releases) - [Commits](https://github.com/pnpm/action-setup/compare/0977fd99725f1db4007ccb2928dbb4e90d06cc86...ea17c68df8912ef543352723c149a84f56e3d413) Updates `zizmorcore/zizmor-action` from 0.6.2 to 0.6.4 - [Release notes](https://github.com/zizmorcore/zizmor-action/releases) - [Commits](https://github.com/zizmorcore/zizmor-action/compare/3dc1ecc9bcb9e94e9b2c709687979e1298497054...cc914d7f3750a2d13d75c7f184a1060aa0e9d482) Updates `github/codeql-action/upload-sarif` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `github/codeql-action/init` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `github/codeql-action/analyze` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `crowdin/github-action` from 3.0.0 to 3.0.2 - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](https://github.com/crowdin/github-action/compare/e4a6c1338b4063c77d46a81875265f9e8bd76f95...0d5670f539973aea2f01abce61a8989934df0025) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-version: 10.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: actions/deploy-pages dependency-version: 5.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: pnpm/action-setup dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: zizmorcore/zizmor-action dependency-version: 0.6.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action/init dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action/analyze dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: crowdin/github-action dependency-version: 3.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-backend.yml | 4 ++-- .github/workflows/ci-docs.yml | 4 ++-- .github/workflows/ci-frontend.yml | 12 ++++++------ .github/workflows/ci-release.yml | 6 +++--- .github/workflows/ci-static-analysis.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/crowdin.yml | 2 +- .github/workflows/translate-strings.yml | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml index 65b943dfc..3dfb743a4 100644 --- a/.github/workflows/ci-backend.yml +++ b/.github/workflows/ci-backend.yml @@ -102,7 +102,7 @@ jobs: with: python-version: "${{ matrix.python-version }}" - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: true @@ -176,7 +176,7 @@ jobs: with: python-version: "${{ env.DEFAULT_PYTHON }}" - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: true diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index f919f1929..19321666e 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -78,7 +78,7 @@ jobs: with: python-version: ${{ env.DEFAULT_PYTHON_VERSION }} - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: true @@ -111,7 +111,7 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} steps: - name: Deploy GitHub Pages - uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0 + uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1 id: deployment with: artifact_name: github-pages-${{ github.run_id }}-${{ github.run_attempt }} diff --git a/.github/workflows/ci-frontend.yml b/.github/workflows/ci-frontend.yml index 8678bf487..3f45c3f7b 100644 --- a/.github/workflows/ci-frontend.yml +++ b/.github/workflows/ci-frontend.yml @@ -81,7 +81,7 @@ jobs: with: persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 @@ -113,7 +113,7 @@ jobs: with: persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 @@ -152,7 +152,7 @@ jobs: with: persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 @@ -201,7 +201,7 @@ jobs: with: persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 @@ -216,7 +216,7 @@ jobs: with: python-version: '3.12' - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: '0.12.x' enable-cache: false @@ -255,7 +255,7 @@ jobs: fetch-depth: 2 persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index f4d24d9a6..43cd9df0f 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -40,7 +40,7 @@ jobs: persist-credentials: false # ---- Frontend Build ---- - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 @@ -59,7 +59,7 @@ jobs: with: python-version: ${{ env.DEFAULT_PYTHON_VERSION }} - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: false @@ -212,7 +212,7 @@ jobs: with: python-version: ${{ env.DEFAULT_PYTHON_VERSION }} - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: false diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index b3a0d3d18..1e59e60f8 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -26,7 +26,7 @@ jobs: with: persist-credentials: false - name: Run zizmor - uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2 + uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4 semgrep: name: Semgrep CE runs-on: ubuntu-24.04 @@ -44,7 +44,7 @@ jobs: - name: Run Semgrep run: semgrep scan --config auto --sarif-output results.sarif - name: Upload results to GitHub code scanning - uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/upload-sarif@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 if: always() with: sarif_file: results.sarif diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 05924921a..282f6ba85 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: persist-credentials: false # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -47,4 +47,4 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 367769d03..603f1e6ee 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -22,7 +22,7 @@ jobs: token: ${{ secrets.PNGX_BOT_PAT }} persist-credentials: false - name: crowdin action - uses: crowdin/github-action@e4a6c1338b4063c77d46a81875265f9e8bd76f95 # v3.0.0 + uses: crowdin/github-action@0d5670f539973aea2f01abce61a8989934df0025 # v3.0.2 with: upload_translations: false download_translations: true diff --git a/.github/workflows/translate-strings.yml b/.github/workflows/translate-strings.yml index 0dfe77d39..122a9dce8 100644 --- a/.github/workflows/translate-strings.yml +++ b/.github/workflows/translate-strings.yml @@ -29,7 +29,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -qq --no-install-recommends gettext - name: Install uv - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1 + uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 with: version: ${{ env.DEFAULT_UV_VERSION }} enable-cache: true @@ -43,7 +43,7 @@ jobs: PAPERLESS_SECRET_KEY: "ci-translate-not-a-real-secret" run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*" - name: Install pnpm - uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 + uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 with: package_json_file: src-ui/package.json - name: Use Node.js 24 From f4ff87e69b0bda468561a2ec8aa8f687727bb624 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 17 Sep 2026 18:28:55 -0700 Subject: [PATCH 069/258] Enhancement (QoL): support deselecting single items from "select all" (#14117) --- .../bulk-editor/bulk-editor.component.spec.ts | 87 ++++++++++++++++- .../bulk-editor/bulk-editor.component.ts | 22 +++-- .../document-list-view.service.spec.ts | 69 +++++++++++++- .../services/document-list-view.service.ts | 48 ++++++++-- .../services/rest/document.service.spec.ts | 20 +++- .../src/app/services/rest/document.service.ts | 7 +- src/documents/serialisers.py | 12 +++ src/documents/tests/test_api_bulk_edit.py | 94 +++++++++++++++++++ src/documents/views.py | 24 ++++- 9 files changed, 350 insertions(+), 33 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts index 29212c955..e8d38c11b 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -9,7 +9,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { Router } from '@angular/router' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' +import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { Correspondent } from 'src/app/data/correspondent' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' @@ -392,6 +392,42 @@ describe('BulkEditorComponent', () => { expect(component.tagSelectionModel.selectionSize()).toEqual(1) }) + it('should request selection data for tags when documents are excluded from an all-filtered selection', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + fixture.detectChanges() + jest + .spyOn(documentListViewService, 'allSelected', 'get') + .mockReturnValue(true) + jest + .spyOn(documentListViewService, 'excluded', 'get') + .mockReturnValue(new Set([4])) + jest + .spyOn(documentListViewService, 'filterRules', 'get') + .mockReturnValue([{ rule_type: FILTER_TITLE, value: 'apple' }]) + jest + .spyOn(documentListViewService, 'selectedCount', 'get') + .mockReturnValue(2) + const adjustedSelectionData: SelectionData = { + ...selectionData, + selected_tags: [{ id: 12, document_count: 2 }], + } + const getSelectionDataSpy = jest + .spyOn(documentService, 'getSelectionData') + .mockReturnValue(of(adjustedSelectionData)) + + component.openTagsDropdown() + + expect(getSelectionDataSpy).toHaveBeenCalledWith({ + all: true, + filters: { title_search: 'apple' }, + excluded_documents: [4], + }) + expect(component.tagDocumentCounts()).toEqual( + adjustedSelectionData.selected_tags + ) + expect(component.tagSelectionModel.selectionSize()).toEqual(1) + }) + it('should apply list selection data to document types menu when all filtered documents are selected', () => { jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) fixture.detectChanges() @@ -460,6 +496,47 @@ describe('BulkEditorComponent', () => { ) }) + it('should request selection data for the other metadata menus when documents are excluded', () => { + jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + fixture.detectChanges() + jest + .spyOn(documentListViewService, 'allSelected', 'get') + .mockReturnValue(true) + jest + .spyOn(documentListViewService, 'excluded', 'get') + .mockReturnValue(new Set([4])) + jest + .spyOn(documentListViewService, 'filterRules', 'get') + .mockReturnValue([{ rule_type: FILTER_TITLE, value: 'apple' }]) + const getSelectionDataSpy = jest + .spyOn(documentService, 'getSelectionData') + .mockReturnValue(of(selectionData)) + + component.openDocumentTypeDropdown() + component.openCorrespondentDropdown() + component.openStoragePathDropdown() + component.openCustomFieldsDropdown() + + expect(getSelectionDataSpy).toHaveBeenCalledTimes(4) + expect(getSelectionDataSpy).toHaveBeenCalledWith({ + all: true, + filters: { title_search: 'apple' }, + excluded_documents: [4], + }) + expect(component.documentTypeDocumentCounts()).toEqual( + selectionData.selected_document_types + ) + expect(component.correspondentDocumentCounts()).toEqual( + selectionData.selected_correspondents + ) + expect(component.storagePathDocumentCounts()).toEqual( + selectionData.selected_storage_paths + ) + expect(component.customFieldDocumentCounts()).toEqual( + selectionData.selected_custom_fields + ) + }) + it('should execute modify tags bulk operation', () => { jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) jest @@ -501,16 +578,19 @@ describe('BulkEditorComponent', () => { .mockReturnValue([{ id: 3 }, { id: 4 }]) jest .spyOn(documentListViewService, 'selected', 'get') - .mockReturnValue(new Set([3, 4])) + .mockReturnValue(new Set([3])) jest .spyOn(documentListViewService, 'allSelected', 'get') .mockReturnValue(true) + jest + .spyOn(documentListViewService, 'excluded', 'get') + .mockReturnValue(new Set([4])) jest .spyOn(documentListViewService, 'filterRules', 'get') .mockReturnValue([{ rule_type: FILTER_TITLE, value: 'apple' }]) jest .spyOn(documentListViewService, 'selectedCount', 'get') - .mockReturnValue(25) + .mockReturnValue(24) jest .spyOn(permissionsService, 'currentUserHasObjectPermissions') .mockReturnValue(true) @@ -529,6 +609,7 @@ describe('BulkEditorComponent', () => { expect(req.request.body).toEqual({ all: true, filters: { title_search: 'apple' }, + excluded_documents: [4], method: 'modify_tags', parameters: { add_tags: [101], remove_tags: [] }, }) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index c8d23c1bb..33181a227 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -361,6 +361,7 @@ export class BulkEditorComponent return { all: true, filters: queryParamsFromFilterRules(this.list.filterRules), + excluded_documents: Array.from(this.list.excluded), } } @@ -374,7 +375,8 @@ export class BulkEditorComponent } openTagsDropdown() { - if (this.list.allSelected) { + // If none excluded, use the selection data already available in the list view, otherwise fetch + if (this.list.allSelected && this.list.excluded.size === 0) { const selectionData = this.list.selectionData this.tagDocumentCounts.set(selectionData?.selected_tags ?? []) this.applySelectionData(this.tagDocumentCounts(), this.tagSelectionModel) @@ -382,7 +384,7 @@ export class BulkEditorComponent } this.documentService - .getSelectionData(Array.from(this.list.selected)) + .getSelectionData(this.getSelectionQuery()) .pipe(first()) .subscribe((s) => { this.tagDocumentCounts.set(s.selected_tags) @@ -391,7 +393,7 @@ export class BulkEditorComponent } openDocumentTypeDropdown() { - if (this.list.allSelected) { + if (this.list.allSelected && this.list.excluded.size === 0) { const selectionData = this.list.selectionData this.documentTypeDocumentCounts.set( selectionData?.selected_document_types ?? [] @@ -404,7 +406,7 @@ export class BulkEditorComponent } this.documentService - .getSelectionData(Array.from(this.list.selected)) + .getSelectionData(this.getSelectionQuery()) .pipe(first()) .subscribe((s) => { this.documentTypeDocumentCounts.set(s.selected_document_types) @@ -416,7 +418,7 @@ export class BulkEditorComponent } openCorrespondentDropdown() { - if (this.list.allSelected) { + if (this.list.allSelected && this.list.excluded.size === 0) { const selectionData = this.list.selectionData this.correspondentDocumentCounts.set( selectionData?.selected_correspondents ?? [] @@ -429,7 +431,7 @@ export class BulkEditorComponent } this.documentService - .getSelectionData(Array.from(this.list.selected)) + .getSelectionData(this.getSelectionQuery()) .pipe(first()) .subscribe((s) => { this.correspondentDocumentCounts.set(s.selected_correspondents) @@ -441,7 +443,7 @@ export class BulkEditorComponent } openStoragePathDropdown() { - if (this.list.allSelected) { + if (this.list.allSelected && this.list.excluded.size === 0) { const selectionData = this.list.selectionData this.storagePathDocumentCounts.set( selectionData?.selected_storage_paths ?? [] @@ -454,7 +456,7 @@ export class BulkEditorComponent } this.documentService - .getSelectionData(Array.from(this.list.selected)) + .getSelectionData(this.getSelectionQuery()) .pipe(first()) .subscribe((s) => { this.storagePathDocumentCounts.set(s.selected_storage_paths) @@ -466,7 +468,7 @@ export class BulkEditorComponent } openCustomFieldsDropdown() { - if (this.list.allSelected) { + if (this.list.allSelected && this.list.excluded.size === 0) { const selectionData = this.list.selectionData this.customFieldDocumentCounts.set( selectionData?.selected_custom_fields ?? [] @@ -479,7 +481,7 @@ export class BulkEditorComponent } this.documentService - .getSelectionData(Array.from(this.list.selected)) + .getSelectionData(this.getSelectionQuery()) .pipe(first()) .subscribe((s) => { this.customFieldDocumentCounts.set(s.selected_custom_fields) diff --git a/src-ui/src/app/services/document-list-view.service.spec.ts b/src-ui/src/app/services/document-list-view.service.spec.ts index 9447101ad..772c851e0 100644 --- a/src-ui/src/app/services/document-list-view.service.spec.ts +++ b/src-ui/src/app/services/document-list-view.service.spec.ts @@ -580,7 +580,7 @@ describe('DocumentListViewService', () => { expect(documentListViewService.isSelected(documents[3])).toBeTruthy() }) - it('should clear all-selected mode when toggling a single document', () => { + it('should exclude a toggled document while keeping all-selected mode', () => { documentListViewService.reload() const req = httpTestingController.expectOne( `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true` @@ -592,8 +592,73 @@ describe('DocumentListViewService', () => { documentListViewService.toggleSelected(documents[0]) - expect(documentListViewService.allSelected).toBeFalsy() + expect(documentListViewService.allSelected).toBeTruthy() + expect(documentListViewService.excluded).toEqual(new Set([documents[0].id])) + expect(documentListViewService.selectedCount).toEqual(documents.length - 1) expect(documentListViewService.isSelected(documents[0])).toBeFalsy() + + documentListViewService.toggleSelected(documents[0]) + + expect(documentListViewService.excluded.size).toEqual(0) + expect(documentListViewService.selectedCount).toEqual(documents.length) + expect(documentListViewService.isSelected(documents[0])).toBeTruthy() + }) + + it('should preserve exclusions across pages', () => { + documentListViewService.pageSize = 3 + let req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true` + ) + req.flush({ count: documents.length, results: documents.slice(0, 3) }) + + documentListViewService.selectAll() + documentListViewService.toggleSelected(documents[0]) + documentListViewService.currentPage = 2 + req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=2&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true` + ) + req.flush({ count: documents.length, results: documents.slice(3, 6) }) + + expect(documentListViewService.excluded).toEqual(new Set([documents[0].id])) + expect(documentListViewService.selectedCount).toEqual(documents.length - 1) + expect(documentListViewService.selected).toEqual( + new Set(documents.slice(3, 6).map((document) => document.id)) + ) + + documentListViewService.currentPage = 1 + req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=1&page_size=3&ordering=-created&truncate_content=true&include_selection_data=true` + ) + req.flush({ count: documents.length, results: documents.slice(0, 3) }) + + expect(documentListViewService.isSelected(documents[0])).toBeFalsy() + expect(documentListViewService.isSelected(documents[1])).toBeTruthy() + }) + + it('should clear exclusions when filters change', () => { + documentListViewService.reload() + let req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true` + ) + req.flush(full_results) + documentListViewService.selectAll() + documentListViewService.toggleSelected(documents[0]) + + documentListViewService.setFilterRules(filterRules) + req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=9` + ) + req.flush({ count: 3, results: documents.slice(0, 3) }) + + expect(documentListViewService.allSelected).toBeTruthy() + expect(documentListViewService.excluded.size).toEqual(0) + expect(documentListViewService.selectedCount).toEqual(3) + + documentListViewService.setFilterRules([]) + req = httpTestingController.expectOne( + `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true` + ) + req.flush(full_results) }) it('should clear all-selected mode when selecting a range', () => { diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index de1db2be6..429cde2c0 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -85,6 +85,11 @@ export interface ListViewState { */ allSelected?: boolean + /** + * Document IDs excluded from the full filtered result set. + */ + excluded?: Set + /** * The page size of the list view. */ @@ -215,6 +220,7 @@ export class DocumentListViewService { filterRules: [], selected: new Set(), allSelected: false, + excluded: new Set(), } } @@ -224,7 +230,9 @@ export class DocumentListViewService { } this.selected.clear() - this.documents?.forEach((doc) => this.selected.add(doc.id)) + this.documents + ?.filter((doc) => !this.excluded.has(doc.id)) + .forEach((doc) => this.selected.add(doc.id)) if (!this.collectionSize) { this.selectNone() @@ -491,14 +499,23 @@ export class DocumentListViewService { return this.activeListViewState.allSelected ?? false } + get excluded(): Set { + this.trackState() + if (!this.activeListViewState.excluded) { + this.activeListViewState.excluded = new Set() + } + return this.activeListViewState.excluded + } + get selectedCount(): number { - return this.allSelected - ? (this.collectionSize ?? this.selected.size) - : this.selected.size + if (!this.allSelected || this.collectionSize == null) { + return this.selected.size + } + return Math.max(0, this.collectionSize - this.excluded.size) } get hasSelection(): boolean { - return this.allSelected || this.selected.size > 0 + return this.selectedCount > 0 } setSort(field: string, reverse: boolean) { @@ -663,12 +680,14 @@ export class DocumentListViewService { selectNone() { this.activeListViewState.allSelected = false this.selected.clear() + this.excluded.clear() this.rangeSelectionAnchorIndex = this.lastRangeSelectionToIndex = null this.markChanged() } reduceSelectionToFilter() { if (this.allSelected) { + this.excluded.clear() return } @@ -688,6 +707,7 @@ export class DocumentListViewService { selectAll() { this.activeListViewState.allSelected = true + this.excluded.clear() this.syncSelectedToCurrentPage() this.markChanged() } @@ -695,6 +715,7 @@ export class DocumentListViewService { selectPage() { this.activeListViewState.allSelected = false this.selected.clear() + this.excluded.clear() this.documents.forEach((doc) => { this.selected.add(doc.id) }) @@ -702,15 +723,23 @@ export class DocumentListViewService { } isSelected(d: Document) { - return this.allSelected || this.selected.has(d.id) + return this.allSelected ? !this.excluded.has(d.id) : this.selected.has(d.id) } toggleSelected(d: Document): void { if (this.allSelected) { - this.activeListViewState.allSelected = false + if (this.excluded.has(d.id)) { + this.excluded.delete(d.id) + this.selected.add(d.id) + } else { + this.excluded.add(d.id) + this.selected.delete(d.id) + } + } else if (this.selected.has(d.id)) { + this.selected.delete(d.id) + } else { + this.selected.add(d.id) } - if (this.selected.has(d.id)) this.selected.delete(d.id) - else this.selected.add(d.id) this.rangeSelectionAnchorIndex = this.documentIndexInCurrentView(d.id) this.lastRangeSelectionToIndex = null this.markChanged() @@ -719,6 +748,7 @@ export class DocumentListViewService { selectRangeTo(d: Document) { if (this.allSelected) { this.activeListViewState.allSelected = false + this.excluded.clear() } if (this.rangeSelectionAnchorIndex !== null) { diff --git a/src-ui/src/app/services/rest/document.service.spec.ts b/src-ui/src/app/services/rest/document.service.spec.ts index fbb763c46..4250d8e84 100644 --- a/src-ui/src/app/services/rest/document.service.spec.ts +++ b/src-ui/src/app/services/rest/document.service.spec.ts @@ -175,7 +175,7 @@ describe(`DocumentService`, () => { it('should call appropriate api endpoint for getting selection data', () => { const ids = [documents[0].id] - subscription = service.getSelectionData(ids).subscribe() + subscription = service.getSelectionData({ documents: ids }).subscribe() const req = httpTestingController.expectOne( `${environment.apiBaseUrl}${endpoint}/selection_data/` ) @@ -185,6 +185,20 @@ describe(`DocumentService`, () => { }) }) + it('should get selection data with all, filters, and exclusions', () => { + const selection = { + all: true, + filters: { title__icontains: 'apple' }, + excluded_documents: [2, 3], + } + subscription = service.getSelectionData(selection).subscribe() + const req = httpTestingController.expectOne( + `${environment.apiBaseUrl}${endpoint}/selection_data/` + ) + expect(req.request.method).toEqual('POST') + expect(req.request.body).toEqual(selection) + }) + it('should call appropriate api endpoint for getting suggestions', () => { subscription = service.getSuggestions(documents[0].id).subscribe() const req = httpTestingController.expectOne( @@ -240,7 +254,7 @@ describe(`DocumentService`, () => { }) }) - it('should call appropriate api endpoint for bulk edit with all and filters', () => { + it('should call appropriate api endpoint for bulk edit with all, filters, and exclusions', () => { const method = 'modify_tags' const parameters = { add_tags: [15], @@ -249,6 +263,7 @@ describe(`DocumentService`, () => { const selection = { all: true, filters: { title__icontains: 'apple' }, + excluded_documents: [2, 3], } subscription = service.bulkEdit(selection, method, parameters).subscribe() const req = httpTestingController.expectOne( @@ -258,6 +273,7 @@ describe(`DocumentService`, () => { expect(req.request.body).toEqual({ all: true, filters: { title__icontains: 'apple' }, + excluded_documents: [2, 3], method, parameters, }) diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 92ba21d33..3272d9695 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -72,6 +72,7 @@ export interface DocumentSelectionQuery { documents?: number[] all?: boolean filters?: { [key: string]: any } + excluded_documents?: number[] } @Injectable({ @@ -407,10 +408,12 @@ export class DocumentService extends AbstractPaperlessService { }) } - getSelectionData(ids: number[]): Observable { + getSelectionData( + selection: DocumentSelectionQuery + ): Observable { return this.http.post( this.getResourceUrl(null, 'selection_data'), - { documents: ids } + selection ) } diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 917c68ca4..c063a72fa 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1647,11 +1647,23 @@ class DocumentSelectionSerializer(DocumentListSerializer): write_only=True, ) + excluded_documents = serializers.ListField( + required=False, + default=list, + write_only=True, + child=serializers.IntegerField(), + ) + def validate(self, attrs): if attrs.get("all", False): attrs.setdefault("documents", []) return attrs + if attrs["excluded_documents"]: + raise serializers.ValidationError( + "excluded_documents is only supported when all is true.", + ) + if "documents" not in attrs: raise serializers.ValidationError( "documents is required unless all is true.", diff --git a/src/documents/tests/test_api_bulk_edit.py b/src/documents/tests/test_api_bulk_edit.py index 0c13cce40..0657a98cc 100644 --- a/src/documents/tests/test_api_bulk_edit.py +++ b/src/documents/tests/test_api_bulk_edit.py @@ -520,6 +520,30 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(args[0], [self.doc1.id]) self.assertEqual(len(kwargs), 0) + @mock.patch("documents.views.bulk_edit.delete") + def test_delete_documents_endpoint_with_excluded_documents(self, m) -> None: + self.setup_mock(m, "delete") + response = self.client.post( + "/api/documents/delete/", + json.dumps( + { + "all": True, + "excluded_documents": [ + self.doc2.id, + self.doc3.id, + self.doc4.id, + self.doc5.id, + ], + }, + ), + content_type="application/json", + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + m.assert_called_once() + args, kwargs = m.call_args + self.assertEqual(args[0], [self.doc1.id]) + self.assertEqual(len(kwargs), 0) + @mock.patch("documents.views.bulk_edit.reprocess") def test_reprocess_documents_endpoint(self, m) -> None: self.setup_mock(m, "reprocess") @@ -691,6 +715,26 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertIn(b"documents is required unless all is true", response.content) + def test_api_rejects_excluded_documents_unless_all_is_true(self) -> None: + response = self.client.post( + "/api/documents/bulk_edit/", + json.dumps( + { + "documents": [self.doc1.id], + "excluded_documents": [self.doc2.id], + "method": "set_storage_path", + "parameters": {"storage_path": self.sp1.id}, + }, + ), + content_type="application/json", + ) + + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertIn( + b"excluded_documents is only supported when all is true", + response.content, + ) + @mock.patch("documents.serialisers.bulk_edit.set_storage_path") def test_api_bulk_edit_with_all_true_resolves_documents_from_filters( self, @@ -717,6 +761,29 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(args[0], [self.doc2.id]) self.assertEqual(kwargs["storage_path"], self.sp1.id) + @mock.patch("documents.serialisers.bulk_edit.set_storage_path") + def test_api_bulk_edit_with_all_true_excludes_documents(self, m) -> None: + self.setup_mock(m, "set_storage_path") + + response = self.client.post( + "/api/documents/bulk_edit/", + json.dumps( + { + "all": True, + "excluded_documents": [self.doc2.id, self.doc4.id], + "method": "set_storage_path", + "parameters": {"storage_path": self.sp1.id}, + }, + ), + content_type="application/json", + ) + + self.assertEqual(response.status_code, status.HTTP_200_OK) + m.assert_called_once() + args, kwargs = m.call_args + self.assertCountEqual(args[0], [self.doc1.id, self.doc3.id, self.doc5.id]) + self.assertEqual(kwargs["storage_path"], self.sp1.id) + @mock.patch("documents.serialisers.bulk_edit.set_storage_path") def test_api_bulk_edit_with_all_true_resolves_owned_duplicates(self, m) -> None: self.setup_mock(m, "set_storage_path") @@ -1077,6 +1144,33 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): ], ) + def test_api_selection_data_with_excluded_documents(self) -> None: + response = self.client.post( + "/api/documents/selection_data/", + json.dumps( + { + "all": True, + "excluded_documents": [self.doc2.id], + }, + ), + content_type="application/json", + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertCountEqual( + response.data["selected_correspondents"], + [ + {"id": self.c1.id, "document_count": 0}, + {"id": self.c2.id, "document_count": 1}, + ], + ) + self.assertCountEqual( + response.data["selected_tags"], + [ + {"id": self.t1.id, "document_count": 1}, + {"id": self.t2.id, "document_count": 2}, + ], + ) + def test_api_selection_data_requires_view_permission(self) -> None: self.doc2.owner = self.user self.doc2.save() diff --git a/src/documents/views.py b/src/documents/views.py index 6f647bf3f..cc09709a4 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -194,7 +194,7 @@ from documents.serialisers import BulkEditSerializer from documents.serialisers import CorrespondentSerializer from documents.serialisers import CustomFieldSerializer from documents.serialisers import DeleteDocumentsSerializer -from documents.serialisers import DocumentListSerializer +from documents.serialisers import DocumentSelectionSerializer from documents.serialisers import DocumentSerializer from documents.serialisers import DocumentTypeSerializer from documents.serialisers import DocumentVersionLabelSerializer @@ -2933,6 +2933,10 @@ class DocumentSelectionMixin: ) if search_filtered_ids is not None: filtered_documents = filtered_documents.filter(pk__in=search_filtered_ids) + if validated_data.get("excluded_documents"): + filtered_documents = filtered_documents.exclude( + pk__in=validated_data["excluded_documents"], + ) return list(filtered_documents.values_list("pk", flat=True)) @@ -3056,7 +3060,14 @@ class DocumentOperationPermissionMixin(PassUserMixin, DocumentSelectionMixin): parameters = { k: v for k, v in validated_data.items() - if k not in {"documents", "all", "filters", "from_webui"} + if k + not in { + "documents", + "all", + "filters", + "excluded_documents", + "from_webui", + } } user = self.request.user from_webui = validated_data.get("from_webui", False) @@ -3557,16 +3568,19 @@ class PostDocumentView(GenericAPIView[Any]): }, ), ) -class SelectionDataView(GenericAPIView[Any]): +class SelectionDataView(DocumentSelectionMixin, GenericAPIView[Any]): permission_classes = (IsAuthenticated, ViewDocumentsPermissions) - serializer_class = DocumentListSerializer + serializer_class = DocumentSelectionSerializer parser_classes = (parsers.MultiPartParser, parsers.JSONParser) def post(self, request, format=None): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - ids = serializer.validated_data.get("documents") + ids = self._resolve_document_ids( + user=request.user, + validated_data=serializer.validated_data, + ) permitted_documents = Document.objects.filter( id__in=permitted_document_ids(request.user), ) From cf2f913a0600139bad1141397b71f9d1a683d4a1 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2026 01:30:10 +0000 Subject: [PATCH 070/258] Auto translate strings --- src-ui/messages.xlf | 108 ++++++++++++------------- src/locale/en_US/LC_MESSAGES/django.po | 28 +++---- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index ce3fb2822..4781cd5e5 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -3372,19 +3372,19 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 928 + 930 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 967 + 969 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 990 + 992 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1026 + 1028 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts @@ -3988,27 +3988,27 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 560 + 562 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 600 + 602 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 638 + 640 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 676 + 678 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 738 + 740 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 876 + 878 @@ -6287,7 +6287,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 880 + 882 @@ -8222,7 +8222,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 505 + 507 this string is used to separate processing, failed and added on the file upload widget @@ -8804,7 +8804,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 878 + 880 @@ -8822,7 +8822,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 924 + 926 @@ -9208,7 +9208,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1024 + 1026 @@ -9250,18 +9250,18 @@ "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 497 + 499 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 503 + 505 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 499 + 501 This is for messages like 'modify "tag1" and "tag2"' @@ -9269,7 +9269,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 507,509 + 509,511 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -9277,14 +9277,14 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 524 + 526 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 530 + 532 @@ -9293,14 +9293,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 535,537 + 537,539 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 543 + 545 @@ -9309,7 +9309,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 548,550 + 550,552 @@ -9320,84 +9320,84 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 552,556 + 554,558 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 593 + 595 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 595 + 597 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 597 + 599 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 631 + 633 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 633 + 635 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 635 + 637 Confirm storage path assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 669 + 671 This operation will assign the storage path "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 671 + 673 This operation will remove the storage path from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 673 + 675 Confirm custom field assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 702 + 704 This operation will assign the custom field "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 708 + 710 @@ -9406,14 +9406,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 713,715 + 715,717 This operation will remove the custom field "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 721 + 723 @@ -9422,7 +9422,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 726,728 + 728,730 @@ -9433,105 +9433,105 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 730,734 + 732,736 Move selected document(s) to the trash? src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 877 + 879 This operation will permanently recreate the archive files for selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 925 + 927 The archive files will be re-generated with the current settings. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 926 + 928 Rotate confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 964 + 966 This operation will add rotated versions of the document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 965 + 967 Merge confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 988 + 990 This operation will merge selected documents into a new document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 989 + 991 Merged document will be queued for consumption. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1012 + 1014 The selected documents will become versions of the root document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1025 + 1027 Documents merged as versions. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1040 + 1042 Custom fields updated. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1066 + 1068 Error updating custom fields. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1075 + 1077 Share link bundle creation requested. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1123 + 1125 Share link bundle creation is not available yet. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1130 + 1132 diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 5eee585a6..2cdd6c566 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 15:46+0000\n" +"POT-Creation-Date: 2026-09-18 01:29+0000\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -1632,7 +1632,7 @@ msgid "workflow runs" msgstr "" #: documents/serialisers.py:514 documents/serialisers.py:871 -#: documents/serialisers.py:2871 documents/views.py:343 documents/views.py:2726 +#: documents/serialisers.py:2883 documents/views.py:343 documents/views.py:2726 #: paperless_mail/serialisers.py:156 msgid "Insufficient permissions." msgstr "" @@ -1641,39 +1641,39 @@ msgstr "" msgid "Invalid color." msgstr "" -#: documents/serialisers.py:2338 +#: documents/serialisers.py:2350 #, python-format msgid "File type %(type)s not supported" msgstr "" -#: documents/serialisers.py:2382 +#: documents/serialisers.py:2394 #, python-format msgid "Custom field id must be an integer: %(id)s" msgstr "" -#: documents/serialisers.py:2389 +#: documents/serialisers.py:2401 #, python-format msgid "Custom field with id %(id)s does not exist" msgstr "" -#: documents/serialisers.py:2406 documents/serialisers.py:2416 +#: documents/serialisers.py:2418 documents/serialisers.py:2428 msgid "" "Custom fields must be a list of integers or an object mapping ids to values." msgstr "" -#: documents/serialisers.py:2411 +#: documents/serialisers.py:2423 msgid "Some custom fields don't exist or were specified twice." msgstr "" -#: documents/serialisers.py:2558 +#: documents/serialisers.py:2570 msgid "Invalid variable detected." msgstr "" -#: documents/serialisers.py:2927 +#: documents/serialisers.py:2939 msgid "Duplicate document identifiers are not allowed." msgstr "" -#: documents/serialisers.py:2957 documents/views.py:4749 +#: documents/serialisers.py:2969 documents/views.py:4763 #, python-format msgid "Documents not found: %(ids)s" msgstr "" @@ -1961,20 +1961,20 @@ msgstr "" msgid "Specify only one of text, title_search, query, or more_like_id." msgstr "" -#: documents/views.py:4762 +#: documents/views.py:4776 #, python-format msgid "Insufficient permissions to share document %(id)s." msgstr "" -#: documents/views.py:4808 +#: documents/views.py:4822 msgid "Bundle is already being processed." msgstr "" -#: documents/views.py:4872 +#: documents/views.py:4886 msgid "The share link bundle is still being prepared. Please try again later." msgstr "" -#: documents/views.py:4886 +#: documents/views.py:4900 msgid "The share link bundle is unavailable." msgstr "" From 31d6e984f2d3edb3e6cfad6253bfee514ff73854 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2026 03:55:07 +0000 Subject: [PATCH 071/258] Chore(deps): Bump the utilities-minor group across 1 directory with 10 updates (#14149) Bumps the utilities-minor group with 10 updates in the / directory: | Package | From | To | | --- | --- | --- | | [drf-spectacular-sidecar](https://github.com/tfranzel/drf-spectacular-sidecar) | `2026.8.1` | `2026.9.1` | | llama-index-embeddings-huggingface | `0.7.0` | `0.8.0` | | llama-index-embeddings-ollama | `0.9.0` | `0.10.0` | | llama-index-embeddings-openai-like | `0.3.1` | `0.4.0` | | llama-index-llms-ollama | `0.10.1` | `0.11.0` | | llama-index-llms-openai-like | `0.7.2` | `0.8.0` | | [regex](https://github.com/mrabarnett/mrab-regex) | `2026.7.19` | `2026.9.10` | | [torch](https://github.com/pytorch/pytorch) | `2.13.0` | `2.14.0` | | [faker](https://github.com/joke2k/faker) | `40.37.0` | `40.38.0` | | [types-regex](https://github.com/python/typeshed) | `2026.7.19.20260720` | `2026.9.3.20260903` | Updates `drf-spectacular-sidecar` from 2026.8.1 to 2026.9.1 - [Commits](https://github.com/tfranzel/drf-spectacular-sidecar/compare/2026.8.1...2026.9.1) Updates `llama-index-embeddings-huggingface` from 0.7.0 to 0.8.0 Updates `llama-index-embeddings-ollama` from 0.9.0 to 0.10.0 Updates `llama-index-embeddings-openai-like` from 0.3.1 to 0.4.0 Updates `llama-index-llms-ollama` from 0.10.1 to 0.11.0 Updates `llama-index-llms-openai-like` from 0.7.2 to 0.8.0 Updates `regex` from 2026.7.19 to 2026.9.10 - [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt) - [Commits](https://github.com/mrabarnett/mrab-regex/compare/2026.7.19...2026.9.10) Updates `torch` from 2.13.0 to 2.14.0 - [Release notes](https://github.com/pytorch/pytorch/releases) - [Changelog](https://github.com/pytorch/pytorch/blob/main/RELEASE.md) - [Commits](https://github.com/pytorch/pytorch/compare/v2.13.0...v2.14.0) Updates `faker` from 40.37.0 to 40.38.0 - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v40.37.0...v40.38.0) Updates `types-regex` from 2026.7.19.20260720 to 2026.9.3.20260903 - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: drf-spectacular-sidecar dependency-version: 2026.9.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: faker dependency-version: 40.38.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: llama-index-embeddings-huggingface dependency-version: 0.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: llama-index-embeddings-ollama dependency-version: 0.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: llama-index-embeddings-openai-like dependency-version: 0.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: llama-index-llms-ollama dependency-version: 0.11.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: llama-index-llms-openai-like dependency-version: 0.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: regex dependency-version: 2026.9.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: torch dependency-version: 2.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: utilities-minor - dependency-name: types-regex dependency-version: 2026.9.3.20260903 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: utilities-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 6 +- uv.lock | 291 ++++++++++++++++++++++++++----------------------- 2 files changed, 156 insertions(+), 141 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2027e5f8c..aab433774 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ dependencies = [ "django-treenode>=0.24", "djangorestframework~=3.16", "drf-spectacular~=0.30", - "drf-spectacular-sidecar>=2026.7.1,<2026.9", + "drf-spectacular-sidecar>=2026.7.1,<2026.10", "drf-writable-nested~=0.7.1", "filelock~=3.32.0", "flower>=2.0.1,<2.2", @@ -73,7 +73,7 @@ dependencies = [ "sqlite-vec==0.1.9", "tantivy~=0.26.0", "tika-client[httpx]~=1.0", - "torch~=2.13.0", + "torch>=2.13,<2.15", "watchfiles>=1.2", "whitenoise~=6.11", "whoosh-compat[tantivy]==0.3", @@ -109,7 +109,7 @@ lint = [ testing = [ "daphne", "factory-boy~=3.3.1", - "faker>=40.36,<40.38", + "faker>=40.36,<40.39", "imagehash", "pytest~=9.1.1", "pytest-cov~=7.1.0", diff --git a/uv.lock b/uv.lock index 0424c276a..670a0721e 100644 --- a/uv.lock +++ b/uv.lock @@ -1153,14 +1153,14 @@ wheels = [ [[package]] name = "drf-spectacular-sidecar" -version = "2026.8.1" +version = "2026.9.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "django" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/28/82/eb18e2108b8ceaa50a01d2cdb35ab5ce198c18f062448b2d29d6e89aabeb/drf_spectacular_sidecar-2026.8.1.tar.gz", hash = "sha256:9d9ee678e5ec70cdda2c7ed95cafcdb6141664dc3e11def8a8599c8ad36cf6f5", size = 2603635, upload-time = "2026-08-01T12:09:03.088Z" } +sdist = { url = "https://files.pythonhosted.org/packages/67/87/ef9f1693499ac2c1bf3c33ce57e72c423aed51ab51f7ebd5d3a38f20c606/drf_spectacular_sidecar-2026.9.1.tar.gz", hash = "sha256:99c2b845d0a52b01a7a8e96736a48ef2099dc3dedea103012dfea41a9e4e9ecc", size = 2605997, upload-time = "2026-09-01T15:27:00.127Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/3e/5b/5ea443b8c24b4a4815a6467a158c4511dfe8bed83f8861a27bdb29c4fc47/drf_spectacular_sidecar-2026.8.1-py3-none-any.whl", hash = "sha256:6b8784d3e8c6bd9aa740b14e874640697ab1bc67f5232d74fdd9ef84eaea6bc3", size = 2626283, upload-time = "2026-08-01T12:09:01.705Z" }, + { url = "https://files.pythonhosted.org/packages/19/3b/c4866e6304d09d8813883774dadc5ff70a355279fc2527af3a4004fdb5f0/drf_spectacular_sidecar-2026.9.1-py3-none-any.whl", hash = "sha256:1e521d0ff78c7ab1a873423fc6e6b82ef6bae863f170762e7410ac63b2c7b72f", size = 2628532, upload-time = "2026-09-01T15:26:58.472Z" }, ] [[package]] @@ -1194,11 +1194,11 @@ wheels = [ [[package]] name = "faker" -version = "40.37.0" +version = "40.38.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f6/fb/35acc76128d5ee8983d940da871cc8eba876e7b0e9e6bd402ecd7104dcdc/faker-40.37.0.tar.gz", hash = "sha256:a92dff7f310e61fb544c61720e15edb2e7448bc33d15a321a99e9ab7b94abf54", size = 2025920, upload-time = "2026-08-21T16:33:16.261Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f2/55/baeae0ecb04ef56c92d6ac1ef7b3b965af0502ac9863fc85db7afc0884fd/faker-40.38.0.tar.gz", hash = "sha256:72e421098664edf38478f4269a5d5a539337de5da18883ce67cb1e6bb96b0b3a", size = 2029190, upload-time = "2026-09-01T19:19:46.958Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/3e/22/bf589b6b2c7527047f55450358fbe5961aeaadf168d6b51a1a1c67da497f/faker-40.37.0-py3-none-any.whl", hash = "sha256:ddbafa55c94d5b69c08ced3a7f202614204a02e07ba6548c729b8d18acc0b490", size = 2062853, upload-time = "2026-08-21T16:33:14.516Z" }, + { url = "https://files.pythonhosted.org/packages/f1/b8/48cb8733de8448023983f64e81d7f731ce1459c21e93b9b29657e5c48cab/faker-40.38.0-py3-none-any.whl", hash = "sha256:69927515d61759c8a257540b8a91891cd622ba1c24a386b62a0a777e44ba46a9", size = 2065931, upload-time = "2026-09-01T19:19:45.234Z" }, ] [[package]] @@ -2153,30 +2153,30 @@ wheels = [ [[package]] name = "llama-index-embeddings-huggingface" -version = "0.7.0" +version = "0.8.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "huggingface-hub" }, { name = "llama-index-core" }, { name = "sentence-transformers" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/a1/b3/faa44f7c9edaaefb6f7e1d8a306433c4ccc5ea5bde92302bec149e62b838/llama_index_embeddings_huggingface-0.7.0.tar.gz", hash = "sha256:da8a2a65df9404112c4430dfada09d4f846ba165197a25dbe77f734014c56a87", size = 8692, upload-time = "2026-03-12T20:20:31.588Z" } +sdist = { url = "https://files.pythonhosted.org/packages/53/ab/a027dbe85998649526b06439fe9ce0591928a1f9593de3f59ea835a06f2e/llama_index_embeddings_huggingface-0.8.0.tar.gz", hash = "sha256:02f34df13e3b83e9169fcfdf624b6fbe906fce75b7448cdf69800babc281a9a6", size = 8792, upload-time = "2026-08-31T15:52:21.699Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/25/86/dc43deab70f19db4fcdd82337e18b7f5b828478c486d6308cea10def87c5/llama_index_embeddings_huggingface-0.7.0-py3-none-any.whl", hash = "sha256:cae7e4ffddc1fecb34b83425a00679f338ce03ad0a7f3aca6b927136d6af7131", size = 8904, upload-time = "2026-03-12T20:20:32.449Z" }, + { url = "https://files.pythonhosted.org/packages/94/78/8c7ae872f7935b1264655134b8e434c1e54b561479824a1f6897c0c97e0d/llama_index_embeddings_huggingface-0.8.0-py3-none-any.whl", hash = "sha256:aca52e036371a86b0135f239d15916fbe2a5d66aa4267242bee1f2bef2da74c1", size = 8904, upload-time = "2026-08-31T15:52:20.876Z" }, ] [[package]] name = "llama-index-embeddings-ollama" -version = "0.9.0" +version = "0.10.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "llama-index-core" }, { name = "ollama" }, { name = "pytest-asyncio" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/8b/cd/2cff1feac66368a4c60ea7afbdbb3f3fdd49ee8c279fc105457e726a3ad2/llama_index_embeddings_ollama-0.9.0.tar.gz", hash = "sha256:19d2d2a0e3f0934480eae31243ac5f1ce171319578b9c0adad25cf1b6c35659e", size = 6575, upload-time = "2026-03-12T20:21:18.81Z" } +sdist = { url = "https://files.pythonhosted.org/packages/37/be/aa06215b51538a9e95da63bb3855591a547eae16c15f45f3905f98e03dbe/llama_index_embeddings_ollama-0.10.0.tar.gz", hash = "sha256:fc26cfe8d9d015f76b61558d4c9a1c854535ea0140dd87f169de760b40af3cea", size = 6565, upload-time = "2026-08-31T15:53:04.207Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/9a/36/53674403380483510a7f657c5d6f0bdac5b7f9ec5a1a8d06cdfdd6dc47f2/llama_index_embeddings_ollama-0.9.0-py3-none-any.whl", hash = "sha256:92e0ce481e60a9bcbddbe2c369d2f72c6fdd7158d03a34ab9b35d80869b673c3", size = 6250, upload-time = "2026-03-12T20:21:19.441Z" }, + { url = "https://files.pythonhosted.org/packages/6a/ea/96700781ef48998629f3161bf15cbbe8f8a671c52101c9109b0ddc83a764/llama_index_embeddings_ollama-0.10.0-py3-none-any.whl", hash = "sha256:164f35dc6b1966380533316567c58df7afaeaf598aa2c9a510c061c896d8ebbc", size = 6254, upload-time = "2026-08-31T15:53:03.439Z" }, ] [[package]] @@ -2194,14 +2194,14 @@ wheels = [ [[package]] name = "llama-index-embeddings-openai-like" -version = "0.3.1" +version = "0.4.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "llama-index-embeddings-openai" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/b2/df/79e4748196213b55931d5f8377141fff41135f5988d5501860824cc95390/llama_index_embeddings_openai_like-0.3.1.tar.gz", hash = "sha256:cef7af4bce284e8e6730532dbd0aa325e77398a5d5524edb2d2e3acb122fb5b6", size = 3854, upload-time = "2026-03-13T16:15:20.647Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ca/09/671814fa7f52a462702e526689afc07a36e7d7242830ddf910faba480ded/llama_index_embeddings_openai_like-0.4.0.tar.gz", hash = "sha256:ec151f73eacf17476eda96481eb95815de0ec7c559eb7fe745d3589cfa3846f2", size = 3850, upload-time = "2026-08-31T15:53:08.791Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/01/8e/b9ea889f88318f2faa20b615989e12a15a133c9273630f9266fcf69f35a6/llama_index_embeddings_openai_like-0.3.1-py3-none-any.whl", hash = "sha256:167c7e462cde7d53ea907ceaffbbf10a750676c7c9f7bcc9bc9686a41921387a", size = 3631, upload-time = "2026-03-13T16:15:19.58Z" }, + { url = "https://files.pythonhosted.org/packages/6a/00/e6025cc9661a4f5ac8149a6ac12c8d1308621a83b19fd0d10cf9e622d9d9/llama_index_embeddings_openai_like-0.4.0-py3-none-any.whl", hash = "sha256:b847b4c58388e1faf197a037c63917082d40a05cb3b551641d61e8567fa66828", size = 3632, upload-time = "2026-08-31T15:53:08.086Z" }, ] [[package]] @@ -2219,15 +2219,15 @@ wheels = [ [[package]] name = "llama-index-llms-ollama" -version = "0.10.1" +version = "0.11.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "llama-index-core" }, { name = "ollama" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/17/8c/dcda55d685d1094bcffa3f4f2b30bb45ade5aa93694617272bf6c81d5822/llama_index_llms_ollama-0.10.1.tar.gz", hash = "sha256:470ed836dee43bc0171dc05c68c2daa3618a7c38166b8044d7f8360cd8cd8fa6", size = 9145, upload-time = "2026-03-20T18:14:39.603Z" } +sdist = { url = "https://files.pythonhosted.org/packages/11/99/b82667831e75aca2f49488b2904520180c19cba3c24fc55ee4b177d77888/llama_index_llms_ollama-0.11.0.tar.gz", hash = "sha256:e6b8cac200a9ff67caea531fece0a6272a89e3506b2b9648ec709acffe4a7980", size = 9131, upload-time = "2026-08-31T15:57:16.454Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c0/87/ecb53ae8f4a79e9e8b2e2f9ef649840ab985c5a095438b2f53b72674b66f/llama_index_llms_ollama-0.10.1-py3-none-any.whl", hash = "sha256:8badbebba5a8b7b36912aa1399319652e2110c36ce58485b9965a1b8238b4bdb", size = 8801, upload-time = "2026-03-20T18:14:38.831Z" }, + { url = "https://files.pythonhosted.org/packages/64/9c/bf68e265e52ce76df8511b8052f97975d320ec4703ae0f4e2c19c0e99a25/llama_index_llms_ollama-0.11.0-py3-none-any.whl", hash = "sha256:835d552625082a79a4dc17e4a2c5e9bf70de26c7f679db7b3bf427dd593e5247", size = 8801, upload-time = "2026-08-31T15:57:15.664Z" }, ] [[package]] @@ -2245,15 +2245,15 @@ wheels = [ [[package]] name = "llama-index-llms-openai-like" -version = "0.7.2" +version = "0.8.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "llama-index-core" }, { name = "llama-index-llms-openai" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/3b/a3/16410b28d131aa113ada79f856b78cb68a8e92a1e27255ea9c36c27a5dec/llama_index_llms_openai_like-0.7.2.tar.gz", hash = "sha256:ed9ff73f975dce470f98ac61c982151ba78eedfa3fb9b03894bc1d1312b213ff", size = 5389, upload-time = "2026-04-23T23:05:32.525Z" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/83/9695e5414b458e82b8baafdfec8f94dc1566cac712a171bcab4a03ca3a30/llama_index_llms_openai_like-0.8.0.tar.gz", hash = "sha256:459f115ca343c96252b9d123986056193a7d088f64f73c5336ce381e02c9d6d2", size = 5380, upload-time = "2026-08-31T15:57:21.75Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/f4/0c/fdddaee5391d915d3d568d2d8dbdb7c95647e65bb94d4ddb31d47cef5daf/llama_index_llms_openai_like-0.7.2-py3-none-any.whl", hash = "sha256:1f45a7b1cec8fb3f5997684327ffe6c19f93e789c2fff35dc5522465850faf0b", size = 6602, upload-time = "2026-04-23T23:05:31.708Z" }, + { url = "https://files.pythonhosted.org/packages/56/59/21eb418402edef9f5d1b6e8632b26fd6ec35eae9705b70537a4b3ea341ef/llama_index_llms_openai_like-0.8.0-py3-none-any.whl", hash = "sha256:c629179cd5984439111337be1dd705b045d0e5f6cb3b7ea44a4b68a6c596c53a", size = 6603, upload-time = "2026-08-31T15:57:20.979Z" }, ] [[package]] @@ -2927,8 +2927,8 @@ dependencies = [ { name = "sqlite-vec" }, { name = "tantivy" }, { name = "tika-client", extra = ["httpx"] }, - { name = "torch", version = "2.13.0", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform != 'linux'" }, - { name = "torch", version = "2.13.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform == 'linux'" }, + { name = "torch", version = "2.14.0", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform != 'linux'" }, + { name = "torch", version = "2.14.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform == 'linux'" }, { name = "watchfiles" }, { name = "whitenoise" }, { name = "whoosh-compat", extra = ["tantivy"] }, @@ -3043,7 +3043,7 @@ requires-dist = [ { name = "django-treenode", specifier = ">=0.24" }, { name = "djangorestframework", specifier = "~=3.16" }, { name = "drf-spectacular", specifier = "~=0.30" }, - { name = "drf-spectacular-sidecar", specifier = ">=2026.7.1,<2026.9" }, + { name = "drf-spectacular-sidecar", specifier = ">=2026.7.1,<2026.10" }, { name = "drf-writable-nested", specifier = "~=0.7.1" }, { name = "filelock", specifier = "~=3.32.0" }, { name = "flower", specifier = ">=2.0.1,<2.2" }, @@ -3086,7 +3086,7 @@ requires-dist = [ { name = "sqlite-vec", specifier = "==0.1.9" }, { name = "tantivy", specifier = "~=0.26.0" }, { name = "tika-client", extras = ["httpx"], specifier = "~=1.0" }, - { name = "torch", specifier = "~=2.13.0", index = "https://download.pytorch.org/whl/cpu" }, + { name = "torch", specifier = ">=2.13,<2.15", index = "https://download.pytorch.org/whl/cpu" }, { name = "watchfiles", specifier = ">=1.2" }, { name = "whitenoise", specifier = "~=6.11" }, { name = "whoosh-compat", extras = ["tantivy"], specifier = "==0.3" }, @@ -3098,7 +3098,7 @@ provides-extras = ["mariadb", "postgres", "webserver"] dev = [ { name = "daphne" }, { name = "factory-boy", specifier = "~=3.3.1" }, - { name = "faker", specifier = ">=40.36,<40.38" }, + { name = "faker", specifier = ">=40.36,<40.39" }, { name = "imagehash" }, { name = "prek", specifier = ">=0.4.11,<0.6" }, { name = "pytest", specifier = "~=9.1.1" }, @@ -3122,7 +3122,7 @@ lint = [ testing = [ { name = "daphne" }, { name = "factory-boy", specifier = "~=3.3.1" }, - { name = "faker", specifier = ">=40.36,<40.38" }, + { name = "faker", specifier = ">=40.36,<40.39" }, { name = "imagehash" }, { name = "pytest", specifier = "~=9.1.1" }, { name = "pytest-cov", specifier = "~=7.1.0" }, @@ -4190,88 +4190,101 @@ wheels = [ [[package]] name = "regex" -version = "2026.7.19" +version = "2026.9.10" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/20/98/04b13f1ddfb63158025291c02e03eb42fbb7acb51d091d541050eb4e35e8/regex-2026.7.19.tar.gz", hash = "sha256:7e77b324909c1617cbb4c668677e2c6ae13f44d7c1de0d4f15f2e3c10f3315b5", size = 416440, upload-time = "2026-07-19T00:19:48.923Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b9/5c/f403115361de25809e8f785686ec7096e30fef73be9ae35aa51da4e80abb/regex-2026.9.10.tar.gz", hash = "sha256:1e321e2c84f0e52c457f5ea5944f796d6e8e09cb99738ea98dcc1bfe402a128d", size = 417072, upload-time = "2026-09-09T21:00:21.521Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/05/e5/cef4de2bac939280b68d32adc659478845238a8274f2f79c465063f590ad/regex-2026.7.19-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ac777001cdfc28b72477d93c8564bb7583081ea8fb45cdca3d568e0a4f87183c", size = 494012, upload-time = "2026-07-19T00:16:39.927Z" }, - { url = "https://files.pythonhosted.org/packages/ff/87/e86f51eb117457bb7803132ffe5cb6e2841e2b5bea4cc85d397f3c6e257d/regex-2026.7.19-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:59787bd5f8c70aa339084e961d2996b53fbdeab4d5393bba5c1fe1fc32e02bae", size = 295281, upload-time = "2026-07-19T00:16:41.433Z" }, - { url = "https://files.pythonhosted.org/packages/41/2e/2360c41d8080a3d9ec7e5c90fad6eab3b50192869d10e9a5609e48c8177b/regex-2026.7.19-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:90c633e7e8d6bf4e992b8b36ce69e018f834b641dd6de8cea6d78c06ffa119c5", size = 290615, upload-time = "2026-07-19T00:16:43.058Z" }, - { url = "https://files.pythonhosted.org/packages/cf/69/b65ba4344efbc771b28fe5dde84cbbb6c8f9551165952fe78def5b9dde6a/regex-2026.7.19-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:87ccab0db8d5f4fbb0272642113c1adb2ffc698c16d3a0944580222331fa7a20", size = 791804, upload-time = "2026-07-19T00:16:44.662Z" }, - { url = "https://files.pythonhosted.org/packages/81/b6/a40dfa0dc6224b36f620c00296eacc830489cbf8c2837b6750dfe6170375/regex-2026.7.19-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e50d748a32da622f256e8d505867f5d3c43a837c6a9f0efb149655fadd1042a", size = 861723, upload-time = "2026-07-19T00:16:46.412Z" }, - { url = "https://files.pythonhosted.org/packages/e3/02/735991dee71abd83196a7962f7ed8bf5aa05720ff06e2d3ff896a85e2bbb/regex-2026.7.19-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bf1516fe58fc104f39b2d1dbe2d5e27d0cd45c4be2e42ba6ee0cc763701ec3c7", size = 905932, upload-time = "2026-07-19T00:16:47.956Z" }, - { url = "https://files.pythonhosted.org/packages/45/6c/e7098d8b846ccdbf431d8c081b61e496526a27a28094ed09e0dce21b3f54/regex-2026.7.19-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:09f3e5287f94f17b709dc9a9e70865855feee835c861613be144218ce4ca82cc", size = 801407, upload-time = "2026-07-19T00:16:49.43Z" }, - { url = "https://files.pythonhosted.org/packages/8a/18/34b69274e2649bcc7d9b089c2b2983fb2632d8ecf667e359593be9072e79/regex-2026.7.19-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6383cd2ed53a646c659ba1fe65727db76437fdaa069e697a0b44a51d5843d864", size = 774448, upload-time = "2026-07-19T00:16:51.352Z" }, - { url = "https://files.pythonhosted.org/packages/bb/e6/0a72247d025585fd3800b98e040b84d562a88af6303347100484849f4f01/regex-2026.7.19-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:09d3007fc76249a83cdd33de160d50e6cb77f54e09d8fa9e7148e10607ce24af", size = 783297, upload-time = "2026-07-19T00:16:53.071Z" }, - { url = "https://files.pythonhosted.org/packages/b1/aa/c4f65ae7dd02a36b323a70c4cff326e1f3442361aaebc9311100a130d54f/regex-2026.7.19-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:6f8c6e7a1cfa3dc9d0ee2de0e65e834537fa29992cc3976ffec914afc35c5dd5", size = 854736, upload-time = "2026-07-19T00:16:54.607Z" }, - { url = "https://files.pythonhosted.org/packages/62/c3/668082bcc817b9e694189b84997aeba7385b7779faa6711788679c482e35/regex-2026.7.19-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:b2ea4a3e8357be8849e833beeae757ac3c7a6b3fc055c03c808a53c91ad30d82", size = 763298, upload-time = "2026-07-19T00:16:56.289Z" }, - { url = "https://files.pythonhosted.org/packages/4b/fb/2d07ad555e7af88aa5f867fdafa47a8d945ee237c20af3ebceb46a820835/regex-2026.7.19-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:80115dd39481fd3a4b4080220799dbcacb921a844de4b827264ececacbe17c78", size = 844430, upload-time = "2026-07-19T00:16:57.933Z" }, - { url = "https://files.pythonhosted.org/packages/51/15/c82a471fe3dce56f03745635b43aa456c40dc0db089e07ef148b331507d1/regex-2026.7.19-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d6ce43a0269d68cee79a7d1ade7def53c20f8f2a047b92d7b5d5bcc73ae88327", size = 789683, upload-time = "2026-07-19T00:16:59.583Z" }, - { url = "https://files.pythonhosted.org/packages/3b/b9/d11d7e501ac8fd7d617684423ebb9561e0b998481c1e4cbc0cb212c5d74a/regex-2026.7.19-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2cc3460cedf7579948486eab03bc9ad7089df4d7281c0f47f4afe03e8d13f02d", size = 496778, upload-time = "2026-07-19T00:17:05.677Z" }, - { url = "https://files.pythonhosted.org/packages/3f/a9/a5ab6f312f24318019170dc485d5421fe4f89e43a98640da50d95a8a7041/regex-2026.7.19-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0e9554c8785eac5cffe6300f69a91f58ba72bc88a5f8d661235ad7c6aa5b8ccd", size = 297122, upload-time = "2026-07-19T00:17:07.59Z" }, - { url = "https://files.pythonhosted.org/packages/b3/63/4cab4d7f2d384a144d420b763d97674cb70619c878ea6fcd7640d0e62143/regex-2026.7.19-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d7da47a0f248977f08e2cb659ff3c17ddc13a4d39b3a7baa0a81bf5b415430f6", size = 292009, upload-time = "2026-07-19T00:17:09.648Z" }, - { url = "https://files.pythonhosted.org/packages/22/85/102a81b218298957d4ea7d2f084fae537a71add9d6ff93c8e67284c5f45e/regex-2026.7.19-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:93db40c8de0815baab96a06e08a984bac71f989d13bab789e382158c5d426797", size = 796708, upload-time = "2026-07-19T00:17:11.542Z" }, - { url = "https://files.pythonhosted.org/packages/78/b5/dc136af5629938a037cd2b304c12240e132ec92f38be8ff9cc89af2a1f2d/regex-2026.7.19-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:66bd62c59a5427746e8c44becae1d9b99d22fb13f30f492083dfb9ad7c45cc18", size = 865651, upload-time = "2026-07-19T00:17:13.312Z" }, - { url = "https://files.pythonhosted.org/packages/e0/75/67402ae3cd9c8c988a4c805d15ee3eef015e7ca4cb112cf3e640fc1f4153/regex-2026.7.19-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:1649eb39fcc9ea80c4d2f110fde2b8ab2aef3877b98f02ab9b14e961f418c511", size = 911756, upload-time = "2026-07-19T00:17:15.015Z" }, - { url = "https://files.pythonhosted.org/packages/2a/8e/096d00c7c480ef2ff4265349b14e2261d4ab787ba1f74e2e80d1c58079c3/regex-2026.7.19-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9dce8ec9695f531a1b8a6f314fd4b393adcccf2ea861db480cdf97a301d01a68", size = 801798, upload-time = "2026-07-19T00:17:17.208Z" }, - { url = "https://files.pythonhosted.org/packages/f0/41/e7ecac6edb5722417f85cc67eaf386322fbe8acf6918ec2fdc37c20dd9d0/regex-2026.7.19-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3080a7fd38ef049bd489e01c970c97dd84ff446a885b0f1f6b26d9b1ad13ce11", size = 776933, upload-time = "2026-07-19T00:17:19.347Z" }, - { url = "https://files.pythonhosted.org/packages/6f/69/03c9b3f058d66403e0ca2c938696e81d51cd4c6d47ec5265f02f96948d9a/regex-2026.7.19-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1d793a7988e04fcb1e2e135567443d82173225d657419ec09414a9b5a145b986", size = 784338, upload-time = "2026-07-19T00:17:21.057Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f7/b38ab3d43f284afbb618fcd15d0e77eb786ae461ce1f6bc7494619ddc0f2/regex-2026.7.19-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:e8b0abe7d870f53ca5143895fef7d1041a0c831a140d3dc2c760dd7ba25d4a8b", size = 860452, upload-time = "2026-07-19T00:17:23.119Z" }, - { url = "https://files.pythonhosted.org/packages/15/5c/ff60ef0571121714f3cf9920bc183071e384a10b556d042e0fdb06cc07a5/regex-2026.7.19-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:4e5413bd5f13d3a4e3539ca98f70f75e7fca92518dd7f117f030ebedd10b60cb", size = 765958, upload-time = "2026-07-19T00:17:24.81Z" }, - { url = "https://files.pythonhosted.org/packages/aa/0f/bd34021162c0ab47f9a315bd56cd5642e920c8e5668a75ef6c6a6fca590d/regex-2026.7.19-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:73b133a9e6fb512858e7f065e96f1180aa46646bc74a83aea62f1d314f3dd035", size = 851765, upload-time = "2026-07-19T00:17:26.993Z" }, - { url = "https://files.pythonhosted.org/packages/2a/20/a2ca43edade0595cccfdc98636739f536d9e26898e7dbddc2b9e98898953/regex-2026.7.19-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dbe6493fbd27321b1d1f2dd4f5c7e5bd4d8b1d7cab7f32fd67db3d0b2ed8248a", size = 789714, upload-time = "2026-07-19T00:17:28.699Z" }, - { url = "https://files.pythonhosted.org/packages/5d/3d/84165e4299ff76f3a40fe1f2abf939e976f693383a08d2beea6af62bd2c1/regex-2026.7.19-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f035d9dc1d25eff9d361456572231c7d27b5ccd473ca7dc0adfce732bd006d40", size = 496552, upload-time = "2026-07-19T00:17:36.808Z" }, - { url = "https://files.pythonhosted.org/packages/02/a2/a65293e6e4cf28eb7ee1be5335a5386c40d6742e9f47fafc8fec785e16c7/regex-2026.7.19-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c42572142ed0b9d5d261ba727157c426510da78e20828b66bbb855098b8a4e38", size = 296983, upload-time = "2026-07-19T00:17:38.816Z" }, - { url = "https://files.pythonhosted.org/packages/95/47/2d0564e93d87bc48618360ddca232a2ca612bbdf53ce8465d45ca5ce14ee/regex-2026.7.19-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:40b34dd88658e4fedd2fddbf0275ac970d00614b731357f425722a3ed1983d11", size = 291832, upload-time = "2026-07-19T00:17:40.726Z" }, - { url = "https://files.pythonhosted.org/packages/07/cd/42dfbabff3dfc9603c501c0e2e2c5adbb09d127b267bf5348de0af338c15/regex-2026.7.19-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c41c63992bf1874cebb6e7f56fd7d3c007924659a604ae3d90e427d40d4fd13", size = 796775, upload-time = "2026-07-19T00:17:42.382Z" }, - { url = "https://files.pythonhosted.org/packages/df/5d/f6a4839f2b934e3eed5973fd07f5929ee97d4c98939fb275ea23c274ee16/regex-2026.7.19-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1d3372064506b94dd2c67c845f2db8062e9e9ba84d04e33cb96d7d33c11fe1ae", size = 865687, upload-time = "2026-07-19T00:17:44.185Z" }, - { url = "https://files.pythonhosted.org/packages/14/b0/b47d6c36049bc59806a50bd4c86ced70bbe058d787f80281b1d7a9b0e024/regex-2026.7.19-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:fce7760bf283405b2c7999cab3da4e72f7deca6396013115e3f7a955db9760da", size = 911962, upload-time = "2026-07-19T00:17:46.442Z" }, - { url = "https://files.pythonhosted.org/packages/2a/be/ff61f28f9273658cfe23acbbac5217221f6519960ed401e61dfdab12bc35/regex-2026.7.19-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c0d702548d89d572b2929879bc883bb7a4c4709efafe4512cadee56c55c9bd15", size = 801817, upload-time = "2026-07-19T00:17:48.25Z" }, - { url = "https://files.pythonhosted.org/packages/c3/bb/8b4f7f26b333f9f79e1b453613c39bb4776f51d38ae66dd0ba31d6b354ca/regex-2026.7.19-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d446c6ac40bb6e05025ccee55b84d80fe9bf8e93010ffc4bb9484f13d498835f", size = 776908, upload-time = "2026-07-19T00:17:50.183Z" }, - { url = "https://files.pythonhosted.org/packages/09/13/610110fc5921d380516d03c26b652555f08aa0d23ea78a771231873c3638/regex-2026.7.19-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4c3501bfa814ab07b5580741f9bf78dfdfe146a04057f82df9e2402d2a975939", size = 784426, upload-time = "2026-07-19T00:17:52.454Z" }, - { url = "https://files.pythonhosted.org/packages/ca/f5/1ef9e2a83a5947c57ebff0b377cb5727c3d5ec1992317a320d035cd0dbb6/regex-2026.7.19-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:c4585c3e64b4f9e583b4d2683f18f5d5d872b3d71dcf24594b74ecc23602fa96", size = 860600, upload-time = "2026-07-19T00:17:54.229Z" }, - { url = "https://files.pythonhosted.org/packages/a0/02/073af33a3ec149241d11c80acea91e722aa0adbf05addd50f251c4fe89c3/regex-2026.7.19-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:571fde9741eb0ccde23dd4e0c1d50fbae910e901fa7e629faf39b2dda740d220", size = 765950, upload-time = "2026-07-19T00:17:56.041Z" }, - { url = "https://files.pythonhosted.org/packages/81/a9/d1e9f819dc394a568ef370cd56cf25394e957a2235f8370f23b576e5a475/regex-2026.7.19-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:15b364b9b98d6d2fe1a85034c23a3180ff913f46caddc3895f6fd65186255ccc", size = 851794, upload-time = "2026-07-19T00:17:57.897Z" }, - { url = "https://files.pythonhosted.org/packages/03/3a/8ae83eda7579feacdf984e71fb9e70635fb6f832eeddca58427ec4fca926/regex-2026.7.19-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ffd8893ccc1c2fce6e0d6ca402d716fe1b29db70c7132609a05955e31b2aa8f2", size = 789845, upload-time = "2026-07-19T00:17:59.97Z" }, - { url = "https://files.pythonhosted.org/packages/dc/4c/44b74742052cedda40f9ae469532a037112f7311a36669a891fba8984bb0/regex-2026.7.19-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:db47b561c9afd884baa1f96f797c9ca369872c4b65912bc691cfa99e68340af2", size = 501134, upload-time = "2026-07-19T00:18:07.567Z" }, - { url = "https://files.pythonhosted.org/packages/f0/45/bbd038b5e39ee5613a5a689290145b40058cc152c41de9cc23639d2b9734/regex-2026.7.19-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:65dcd28d3eba2ab7c2fd906485cc301392b47cc2234790d27d4e4814e02cdfda", size = 299418, upload-time = "2026-07-19T00:18:09.38Z" }, - { url = "https://files.pythonhosted.org/packages/65/38/c5bde94b4cedfd5850d64c3f08222d8e1600e84f6ee71d9b44b4b8163f74/regex-2026.7.19-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:f2e7f8e2ab6c2922be02c7ec45185aa5bd771e2e57b95455ee343a44d8130dff", size = 294486, upload-time = "2026-07-19T00:18:11.188Z" }, - { url = "https://files.pythonhosted.org/packages/d7/6a/2f5e107cb26c960b781967178899daf2787a7ab151844ed3c01d6fc95474/regex-2026.7.19-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fe31f28c94402043161876a258a9c6f757cb485905c7614ce8d6cd40e6b7bdc1", size = 811643, upload-time = "2026-07-19T00:18:12.975Z" }, - { url = "https://files.pythonhosted.org/packages/37/d4/a2f963406d7d73a62eed84ba05a258afb6cad1b21aa4517443ce40506b78/regex-2026.7.19-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f8f6fa298bb4f7f58a33334406218ba74716e68feddf5e4e54cd5d8082705abf", size = 871081, upload-time = "2026-07-19T00:18:14.733Z" }, - { url = "https://files.pythonhosted.org/packages/45/a3/44be546340bedb15f13063f5e7fe16793ea4d9ea2e805d09bd174ac27724/regex-2026.7.19-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:cc1b2440423a851fad781309dd87843868f4f66a6bcd1ddb9225cf4ec2c84732", size = 917372, upload-time = "2026-07-19T00:18:16.724Z" }, - { url = "https://files.pythonhosted.org/packages/f8/f6/e0870b0fd2a40dba0074e4b76e514b21313d37946c9248453e34ec43923e/regex-2026.7.19-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8ac59a0900474a52b7c04af8196affc22bd9842acb0950df12f7b813e983609a", size = 816089, upload-time = "2026-07-19T00:18:18.617Z" }, - { url = "https://files.pythonhosted.org/packages/ae/27/957e8e22690ad6634572b39b71f130a6105f4d0718bb16849eac00fff147/regex-2026.7.19-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:4896db1f4ce0576765b8272aa922df324e0f5b9bb2c3d03044ff32a7234a9aba", size = 785206, upload-time = "2026-07-19T00:18:20.464Z" }, - { url = "https://files.pythonhosted.org/packages/76/a4/186e410941e731037c01166069ab86da9f65e8f8110c18009ccf4bd623ee/regex-2026.7.19-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4e6883a021db30511d9fb8cfb0f222ce1f2c369f7d4d8b0448f449a93ba0bdfc", size = 800431, upload-time = "2026-07-19T00:18:22.716Z" }, - { url = "https://files.pythonhosted.org/packages/73/9f/e4e10e023d291d64a33e246610b724493bf1ce98e0e59c9b7c837e5acfb7/regex-2026.7.19-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:09523a592938aa9f587fb74467c63ff0cf88fc3df14c82ab0f0517dcf76aaa62", size = 864906, upload-time = "2026-07-19T00:18:24.772Z" }, - { url = "https://files.pythonhosted.org/packages/24/57/ccb20b6be5f1f52a053d1ba2a8f7a077edb9d918248b8490d7506c6832b3/regex-2026.7.19-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:1ebac3474b8589fce2f9b225b650afd61448f7c73a5d0255a10cc6366471aed1", size = 773559, upload-time = "2026-07-19T00:18:27.008Z" }, - { url = "https://files.pythonhosted.org/packages/a3/82/f3b263cf8fad927dc102891da8502e718b7ff9d19af7a2a07c03865d7188/regex-2026.7.19-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:4a0530bb1b8c1c985e7e2122e2b4d3aedd8a3c21c6bfddae6767c4405668b56e", size = 857739, upload-time = "2026-07-19T00:18:29.107Z" }, - { url = "https://files.pythonhosted.org/packages/47/2e/1687bd1b6c2aed5e672ccf845fc11557821fe7366d921b50889ea5ce57bf/regex-2026.7.19-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2ef7eeb108c47ce7bcc9513e51bcb1bf57e8f483d52fce68a8642e3527141ae0", size = 804522, upload-time = "2026-07-19T00:18:31.362Z" }, - { url = "https://files.pythonhosted.org/packages/d2/25/0c4c452f8ef3efe456745b2f33195f5904b573fb4c2ff3f0cb9ec188461e/regex-2026.7.19-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:a81758ed242b861b72e778ba34d41366441a2e10b16b472784c88da2dea7e2dd", size = 496750, upload-time = "2026-07-19T00:18:39.633Z" }, - { url = "https://files.pythonhosted.org/packages/24/9e/b70ca6c1704f6c7cd32a9e143c86cc5968d10981eca284bad670c245ea7d/regex-2026.7.19-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:4aa5435cdb3eb6f55fe98a171b05e3fbcd95fadaa4aa32acf62afd9b0cfdbcac", size = 297093, upload-time = "2026-07-19T00:18:41.583Z" }, - { url = "https://files.pythonhosted.org/packages/87/74/0b692da2520d51fbff19c88b83d97e4c702909dd02386c585998b7e2dbed/regex-2026.7.19-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:60be8693a1dadc210bbcbc0db3e26da5f7d01d1d5a3da594e99b4fa42df404f5", size = 292043, upload-time = "2026-07-19T00:18:43.347Z" }, - { url = "https://files.pythonhosted.org/packages/e3/a7/1d478e614016045a33feae57446215f9fd65b665a5ceb2f891fb3183bc52/regex-2026.7.19-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d19662dbedbe783d323196312d38f5ba53cf56296378252171985da6899887d3", size = 797214, upload-time = "2026-07-19T00:18:45.362Z" }, - { url = "https://files.pythonhosted.org/packages/aa/ae/11b9c9411d92c30e3d2db32df5a31133e4a99a8fc397a604fd08f6c4bffb/regex-2026.7.19-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d15df07081d91b76ff20d43f94592ee110330152d617b730fdbe5ef9fb680053", size = 866433, upload-time = "2026-07-19T00:18:47.315Z" }, - { url = "https://files.pythonhosted.org/packages/b1/62/2b2efc4992f91d6d204b24c647c9f9412e85379d92b7c0ab9fdae622327e/regex-2026.7.19-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:56ad4d9f77df871a99e25c37091052a02528ec0eb059de928ee33956b854b45b", size = 911360, upload-time = "2026-07-19T00:18:49.588Z" }, - { url = "https://files.pythonhosted.org/packages/14/71/986ceea9aa3da548bf1357cad89b63915ec6d21ec957c8113b29ece567df/regex-2026.7.19-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7322ec6cc9fba9d49ab888bb82d67ac5625627aa168f0165139b17018df3fb8a", size = 801275, upload-time = "2026-07-19T00:18:51.767Z" }, - { url = "https://files.pythonhosted.org/packages/15/be/ce9d9534b2cda96eab32c548261224b9b4e220a4126f098f60f42ae7b4cd/regex-2026.7.19-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9c7472192ebfad53a6be7c4a8bfb2d64b81c0e93a1fc8c57e1dd0b638297b5d1", size = 777131, upload-time = "2026-07-19T00:18:54.053Z" }, - { url = "https://files.pythonhosted.org/packages/61/2b/58b5c710f2c3929515a25f3a1ca0dad0dcd4518d4fff3cf23bc7adb8dcd2/regex-2026.7.19-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c10b82c2634df08dfb13b1f04e38fe310d086ee092f4f69c0c8da234251e556e", size = 785020, upload-time = "2026-07-19T00:18:56.579Z" }, - { url = "https://files.pythonhosted.org/packages/84/03/5fe091935b74f15fe0f97998c215cae418d1c0413f6258c7d4d2e83aa37f/regex-2026.7.19-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:17ed5692f6acc4183e98331101a5f9e4f64d72fe58b753da4d444a2c77d05b12", size = 861263, upload-time = "2026-07-19T00:18:58.64Z" }, - { url = "https://files.pythonhosted.org/packages/d8/fa/d60bf82e10841eef62a9e32aac401468f05fddfbcb2942e342b1ba3d2433/regex-2026.7.19-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:22a992de9a0d91bda927bf02b94351d737a0302905432c88a53de7c4b9ce62e2", size = 766199, upload-time = "2026-07-19T00:19:00.705Z" }, - { url = "https://files.pythonhosted.org/packages/bf/5d/11e64d151b0662b81d6bf644c74dc118d461df85bdf2577fadbbf751788a/regex-2026.7.19-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:618a0aed532be87294c4477b0481f3aa0f1520f4014a4374dd4cf789b4cd2c97", size = 851317, upload-time = "2026-07-19T00:19:03.015Z" }, - { url = "https://files.pythonhosted.org/packages/7c/34/532efb87488d90807bae6a443d357ee5e2728a478c597619c8aaa17cc0bd/regex-2026.7.19-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2ce9e679f776649746729b6c86382da519ef649c8e34cc41df0d2e5e0f6c36d4", size = 789557, upload-time = "2026-07-19T00:19:05.338Z" }, - { url = "https://files.pythonhosted.org/packages/92/b7/9a01aa16461a18cde9d7b9c3ab21e501db2ce33725f53014342b91df2b0a/regex-2026.7.19-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:5a2721c8720e2cb3c209925dfb9200199b4b07361c9e01d321719404b21458b3", size = 501121, upload-time = "2026-07-19T00:19:13.425Z" }, - { url = "https://files.pythonhosted.org/packages/f3/5e/bbaeca815dc9191c424c94a4fdc5c87c75748a64a6271821212ebdd4e1a3/regex-2026.7.19-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:199535629f25caf89698039af3d1ad5fcae7f933e2112c73f1cdf49165c99518", size = 299415, upload-time = "2026-07-19T00:19:15.43Z" }, - { url = "https://files.pythonhosted.org/packages/cd/d6/0dd1a321afaab95eb7ff44aa0f637301786f1dc71c6b797b9ed236ed8890/regex-2026.7.19-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:9b60d7814174f059e5de4ab98271cc5ba9259cfea55273a81544dceea32dc8d9", size = 294483, upload-time = "2026-07-19T00:19:17.879Z" }, - { url = "https://files.pythonhosted.org/packages/92/5f/40bacf91d0904f812e13bbbab3864604c463eced8afdc54aeaa50492ea95/regex-2026.7.19-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dbece16025afda5e3031af0c4059207e61dcf73ef13af844964f57f387d1c435", size = 811833, upload-time = "2026-07-19T00:19:20.102Z" }, - { url = "https://files.pythonhosted.org/packages/94/7c/4902744261f775aeede8b5627314b38482da29cf49a57b66a6fb753246c5/regex-2026.7.19-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d24ecb4f5e009ea0bd275ee37ad9953b32005e2e5e60f8bbae16da0dbbf0d3a0", size = 871270, upload-time = "2026-07-19T00:19:22.365Z" }, - { url = "https://files.pythonhosted.org/packages/16/70/6980c9be6bf21c0a60ed3e0aea39cf419ecf3b08d1d9947bc56e196ef186/regex-2026.7.19-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8cae6fd77a5b72dae505084b1a2ee0360139faf72fedbab667cd7cc65aae7a6a", size = 917534, upload-time = "2026-07-19T00:19:24.529Z" }, - { url = "https://files.pythonhosted.org/packages/52/92/8b2bd872782ce8c42691e39acb38eb8efe014e5ddb78ad7d943d6f197ce9/regex-2026.7.19-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9724e6cb5e478cd7d8cabf027826178739cb18cf0e117d0e32814d479fa02276", size = 816135, upload-time = "2026-07-19T00:19:26.919Z" }, - { url = "https://files.pythonhosted.org/packages/de/2d/33a602f657bdc4041f17d79f92ab18261d255d91a06117a6e29df023e5e2/regex-2026.7.19-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:572fc57b0009c735ee56c175ea021b637a15551a312f56734277f923d6fd0f6c", size = 785492, upload-time = "2026-07-19T00:19:29.192Z" }, - { url = "https://files.pythonhosted.org/packages/9e/36/0987cf4cb271680064a70d24a475873775a151d0b7058698a006cb0cae4a/regex-2026.7.19-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:20568e182eb82d39a6bf7cff3fd58566f14c75c6f74b2c8c96537eecf9010e3a", size = 800658, upload-time = "2026-07-19T00:19:31.392Z" }, - { url = "https://files.pythonhosted.org/packages/a8/24/c14f31c135e1ba55fa4f9a58ca98d0842512bf6188230763c31c8f449e3b/regex-2026.7.19-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:1d58561843f0ff7dc78b4c28b5e2dc388f3eff94ebc8a232a3adba961fc00009", size = 865073, upload-time = "2026-07-19T00:19:33.485Z" }, - { url = "https://files.pythonhosted.org/packages/14/85/181a12211f22469f24d2de1ebddfe397d2396e2c29013b9a58134a91069a/regex-2026.7.19-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:61bb1bd45520aacd56dd80943bd34991fb5350afdd1f36f2282230fd5154a218", size = 773684, upload-time = "2026-07-19T00:19:35.599Z" }, - { url = "https://files.pythonhosted.org/packages/23/58/bd1a0c1a62251366f8d21f41b1ea3c76994962071b8b6ea42f72d505c0f0/regex-2026.7.19-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:cd3584591ea4429026cdb931b054342c2bcf189b44ff367f8d5c15bc092a2966", size = 857769, upload-time = "2026-07-19T00:19:37.738Z" }, - { url = "https://files.pythonhosted.org/packages/e4/4f/f7e2dad6756b2fe1fe75dd90a628c3b45f249d39f948dd90cd2476325417/regex-2026.7.19-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5cc26a66e212fa5d6c6170c3a40d99d888db3020c6fdab1523250d4341382e44", size = 804546, upload-time = "2026-07-19T00:19:40.229Z" }, + { url = "https://files.pythonhosted.org/packages/65/82/36fdcd669c7c47e11bea67e3495011ec365be0942aae3ba74f82f92ed6a2/regex-2026.9.10-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:debc629e98b95abaea1cf3057ca296151f348c697c9b8a59d18013adb302c0dd", size = 493891, upload-time = "2026-09-09T20:56:45.767Z" }, + { url = "https://files.pythonhosted.org/packages/c8/57/bb6a8273bcb53077a1855fea0ff416fe4d4bcb1d9f350a9fe3b909853983/regex-2026.9.10-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9d772586951d7d6a5d162d48f414065e483b1c81ab38fd8ed97c78b05883421a", size = 295107, upload-time = "2026-09-09T20:56:47.359Z" }, + { url = "https://files.pythonhosted.org/packages/38/71/9d96d04c36556f057398a08dfc21aecc5409b5fef83fd7653a310227df7e/regex-2026.9.10-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b43456de605c8ee77eb75f07bc1ee44ba27f9cee22207deb77d495e954b7d953", size = 290649, upload-time = "2026-09-09T20:56:48.731Z" }, + { url = "https://files.pythonhosted.org/packages/af/cb/4dd3b7190b5a169c81a4d63b487d65e9fb23689b771f5aceb91d9e7f65bb/regex-2026.9.10-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1f0a8b4928823bc8b217a1ab7bf3d90598909dec9a70fbbfe9a52cc4eca55990", size = 796358, upload-time = "2026-09-09T20:56:50.021Z" }, + { url = "https://files.pythonhosted.org/packages/3e/bb/aceb2329a2d54a3bbd95e54f08689692414674c213e8fc958cf253206e5e/regex-2026.9.10-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b91c37551bf39d75116c02b146956f65b9aa0337a4a652f4ae186983789d4001", size = 866258, upload-time = "2026-09-09T20:56:51.363Z" }, + { url = "https://files.pythonhosted.org/packages/ba/fc/f8deac9c4c475b6bc35f25565a2253df4d27d49dcb6b189d9432ae69294e/regex-2026.9.10-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0b9ba3b2765cdfe18f0f561a69f78a69701f2896654a81c711108d35d14e5099", size = 912779, upload-time = "2026-09-09T20:56:52.811Z" }, + { url = "https://files.pythonhosted.org/packages/74/dc/2dd4d56932f55ea412c9808f27a8661f93568bfee596ed04bc57a74e591f/regex-2026.9.10-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0acee94b480dd853e39434aa9a575f95385b1b4b8fa3feae56db363ca5cad782", size = 802962, upload-time = "2026-09-09T20:56:54.241Z" }, + { url = "https://files.pythonhosted.org/packages/46/a8/43edbb94e6c9caffd08bffca5b5c486d18845569fcad3953565b85dd71f1/regex-2026.9.10-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a41693eb3fc4b92e6127d113813c6c395237f7edd3224abf67609af48c690d11", size = 777136, upload-time = "2026-09-09T20:56:55.749Z" }, + { url = "https://files.pythonhosted.org/packages/78/2a/6de302fe3dfa94b75a414bffe5180c146967f96fc52fd0b3527a05ad7c40/regex-2026.9.10-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6888065672b341e5246f391ec16dc258a29218ac784172fd67c30d941544755b", size = 786593, upload-time = "2026-09-09T20:56:57.211Z" }, + { url = "https://files.pythonhosted.org/packages/ce/22/66bad9464b4b9122180d2fec86209d7f1bcaf4388d34f644139799f94a20/regex-2026.9.10-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:8c07021a4faa3f092869adbd1f35cdc7a592276c807aeebc3ceb8ff1a638f0b4", size = 861247, upload-time = "2026-09-09T20:56:59.194Z" }, + { url = "https://files.pythonhosted.org/packages/3a/90/a862d6fd9ee3bc0c1f3a2fecffb325097608a4c9b57f0e35030f68c878f7/regex-2026.9.10-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:58c01f7b81079cf0817ba831ff4d9eff5d28be4a3ac76c353e6f09bd63f4c386", size = 767925, upload-time = "2026-09-09T20:57:01.031Z" }, + { url = "https://files.pythonhosted.org/packages/98/4a/aea909c0699aec3c5ee6eff93e4dabc0d310cfb0a5618094e1c5228b234d/regex-2026.9.10-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f0e2e5d23448b660d60a6ed85c46cc03b4b48bd276b8f4041d4a5fe2a4a0626b", size = 850772, upload-time = "2026-09-09T20:57:02.774Z" }, + { url = "https://files.pythonhosted.org/packages/8a/a9/a55f1257d95871b0e042b42bf52f931b3a92b4d530def5201c5b9d597e20/regex-2026.9.10-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:94d096369b7cd96d15343fef5257fe39eff9d0e8758b92a0e15e358b92cdb2fc", size = 791475, upload-time = "2026-09-09T20:57:04.216Z" }, + { url = "https://files.pythonhosted.org/packages/32/c8/bfbe893e90ee0148bd2860dd086f09b5d2080ca2b125f740c2e118c16982/regex-2026.9.10-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:880ac684c27176464c00c3fdc456116364f5ebc70da07aad0c2d4a7ba45e98db", size = 496609, upload-time = "2026-09-09T20:57:09.987Z" }, + { url = "https://files.pythonhosted.org/packages/8c/ac/56d5ae6efb759255c3b3db650a4be25f96a844ea3613b91e1e189a3b7294/regex-2026.9.10-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b9d36b03dc362aa40ffaaec9d9bd75e87763529563ec008c43b0e07782f5be7a", size = 297024, upload-time = "2026-09-09T20:57:11.35Z" }, + { url = "https://files.pythonhosted.org/packages/60/4b/0f2d5f6bbb791cc10f22f0ed16c487e630dde8fa8fa0bd92a2bfe21a4b20/regex-2026.9.10-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:866de9f98df0611d7b62b3a8729d3284a64c0cc6edd90bb95a533e443a4939cb", size = 291905, upload-time = "2026-09-09T20:57:13.127Z" }, + { url = "https://files.pythonhosted.org/packages/89/51/3fb5fe0d32f4cf0bc982286722c729a8d6f522d2fa2d5d14a702d9fc87f8/regex-2026.9.10-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4c66d54042a14a503907d81861b8a5235e6d1f03d4fbc1d8767f652eaf957ac1", size = 800055, upload-time = "2026-09-09T20:57:14.68Z" }, + { url = "https://files.pythonhosted.org/packages/89/46/ee507bd2f9d4420f26a594b35c551d7194b66f5d7897f63730fae6ec05c1/regex-2026.9.10-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:032da15431c890d376f53547f0a6219f4f4cd19f3e4f11bdc321453b5bd207e4", size = 871133, upload-time = "2026-09-09T20:57:16.674Z" }, + { url = "https://files.pythonhosted.org/packages/d1/75/cbaa90689684f91b1bc017e7f8c6d9425c6bd299108db02482dc51376d8a/regex-2026.9.10-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:23ac9a28180f274d7dd7651fa131ad5b02d343b75df4b040737f0356223895dd", size = 919627, upload-time = "2026-09-09T20:57:18.402Z" }, + { url = "https://files.pythonhosted.org/packages/cb/f5/dcdf5e0d898024005cfcce631e3e934d111dfbe177ca0b7f253ae8a735a2/regex-2026.9.10-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2e67f8843f0e4b931f1fa860bf3bbe4134b714c0155cc5c7c0d7ea450230aae0", size = 804587, upload-time = "2026-09-09T20:57:19.859Z" }, + { url = "https://files.pythonhosted.org/packages/73/70/eedfe81c29bae266a06ab4250978361a9bccd474704d88d4f4ef4506dff8/regex-2026.9.10-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bb7774924f8cd69f49cba0b3c2d679a6326f777e0e67d130ad5203e4df53f0d3", size = 777320, upload-time = "2026-09-09T20:57:21.62Z" }, + { url = "https://files.pythonhosted.org/packages/ca/e5/86b207077efbcd91305700488f170b7eb1e1c54721cea74175273aa3b9a4/regex-2026.9.10-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0c32480f3371b75068decaf9e5da72c224e953830dd71e36e06cf80e30ea39d8", size = 790572, upload-time = "2026-09-09T20:57:23.048Z" }, + { url = "https://files.pythonhosted.org/packages/b2/92/f622c3b2323f4c035b98e80221740a442127ad7993135b814f52057430db/regex-2026.9.10-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:d2d377fd1cad611b806cdd732d86b65f536c768209890cb442556548daa65a23", size = 865485, upload-time = "2026-09-09T20:57:24.658Z" }, + { url = "https://files.pythonhosted.org/packages/4a/be/34bd621d3d6ac906ad67e57ed56c40cd45f7d51b9c0328335e97a7cb8ecb/regex-2026.9.10-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:c014641157e9049b0603b8daa5343bd408d9b757b709aaa0f373cd3fab2d7944", size = 767925, upload-time = "2026-09-09T20:57:26.268Z" }, + { url = "https://files.pythonhosted.org/packages/0d/28/ddbf7cba86f2adf5038c6c16aa829636ffc6e437f81bb0cbf302899cea5e/regex-2026.9.10-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:1562aabd9d4eb09bd88a62ad97ed06800094b529ac43419e43020b9cefec79b0", size = 858800, upload-time = "2026-09-09T20:57:27.901Z" }, + { url = "https://files.pythonhosted.org/packages/d0/f1/e8d7656ff3d3bd32e881d32f540b4981c79dee61908d6b790a45966e6895/regex-2026.9.10-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2479171edccced52ef02b899558f88ab2c235fe05b93180fdcae1670aacd89e1", size = 791648, upload-time = "2026-09-09T20:57:29.786Z" }, + { url = "https://files.pythonhosted.org/packages/20/90/d4452bf1ef7dbe406980e8b921a257024482203c1dafac535eae207611bc/regex-2026.9.10-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ef5a059ea1c6ee5d1c7e99a2484e628608d010921efe876c6f0e2029d2f35eca", size = 496408, upload-time = "2026-09-09T20:57:36.757Z" }, + { url = "https://files.pythonhosted.org/packages/6a/35/c763c6424a0f99d021d46dc1f9065147bb5a40c2b2cdf28d2ebdbcd96508/regex-2026.9.10-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:dce932f8e3ba936475ea3d0d8b59f7b050a9e206e994f53f8fd80299871e87da", size = 296931, upload-time = "2026-09-09T20:57:38.811Z" }, + { url = "https://files.pythonhosted.org/packages/fa/68/241f88458b17c46ed2f80147a60a03b2ada7fb815c23b6bc76c298abb0a5/regex-2026.9.10-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d8c668af8f7bdb1d18739c27d30cd9f4b371495a883f75a002fb7a39d740fecd", size = 291741, upload-time = "2026-09-09T20:57:40.482Z" }, + { url = "https://files.pythonhosted.org/packages/90/9e/974d6de404c63e2d09525f4ddb99874c7ab8e1f781ccbe0dd3e26fa6f6e5/regex-2026.9.10-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6aebdd9a946de328b3f6f61dbf48dd064a36eb6dddf96e34ae6651d37f6e9383", size = 800088, upload-time = "2026-09-09T20:57:42.098Z" }, + { url = "https://files.pythonhosted.org/packages/9e/fd/3875b73f9e7ba3321dcaa02c19f650c05c61345328acf84599ac6f45ceed/regex-2026.9.10-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f2374c27deb189b282ec7e16106752c22ad39b056bbd8018960b1e4cc95d67a1", size = 871212, upload-time = "2026-09-09T20:57:44.03Z" }, + { url = "https://files.pythonhosted.org/packages/c5/f5/2358e791c0e171194dd6a8b97b520579098a21397fb79dbe6b7edc9e3fa7/regex-2026.9.10-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:e0dc78251154b66dc60211563fc115345da332eaa881e4e2523fb1edae3772f4", size = 919752, upload-time = "2026-09-09T20:57:45.691Z" }, + { url = "https://files.pythonhosted.org/packages/20/3b/000c79c3f9c06b7542225a5d3a7f9a85405da7224b3b9af94a491d07abea/regex-2026.9.10-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bafa41b0dd63669e5c0f8adf3d24819efeb73c847f492eb011212eb352e69041", size = 804578, upload-time = "2026-09-09T20:57:47.548Z" }, + { url = "https://files.pythonhosted.org/packages/30/6d/195eedb1de87f26639191e7487e41eb81e2ce255bc7563a64f3f5a95eb08/regex-2026.9.10-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ebb2ba68e4641a994061f70bf44ed448fba0b9b1d18c94ffb9efc1cca805b39b", size = 777345, upload-time = "2026-09-09T20:57:49.63Z" }, + { url = "https://files.pythonhosted.org/packages/79/11/11fe2b313fcd92cb75c583648f2746031b9f4da9e9ed4241204a5e8b3721/regex-2026.9.10-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:048a89ee797db10160bd2bd519286577a6b43a100279bd4b7d8456a3d69c80a0", size = 790556, upload-time = "2026-09-09T20:57:51.27Z" }, + { url = "https://files.pythonhosted.org/packages/7a/c0/07ec9b4c43b0e16d62454971a5ab3886eccb0bfa161300a02d801ab28620/regex-2026.9.10-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:79e9432995e14c749d34209413de5e621ec8e67789bf4f46dbfabea9d06a2406", size = 865572, upload-time = "2026-09-09T20:57:53.163Z" }, + { url = "https://files.pythonhosted.org/packages/19/07/43bc9a9cf9fc8e37d2ba47980dfe4a6e151d2cf3ab969e0031e2a9b21484/regex-2026.9.10-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:5847e22bbf959764d776937d791d034cc2d19b787e361c88d97e859e8dc68502", size = 767971, upload-time = "2026-09-09T20:57:54.805Z" }, + { url = "https://files.pythonhosted.org/packages/9c/49/3b9286a3a94f3c89ed4ddbe74e72bdde21c1a5eadd520d5f4ed4a61936cb/regex-2026.9.10-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:c103b3b14e011774af4fb7e4617ad4d72b9171905cd3b231a70a4efd76e477d7", size = 858835, upload-time = "2026-09-09T20:57:56.627Z" }, + { url = "https://files.pythonhosted.org/packages/4a/9e/e5d27ce9fee8e3ef95f886c7b6ecec211efa4cfc18bd73bd5cf26cca4741/regex-2026.9.10-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6b34a778c695d24e77c140e3b4c95da69282e34f2f6b02b55656aa4a0379f643", size = 791793, upload-time = "2026-09-09T20:57:58.313Z" }, + { url = "https://files.pythonhosted.org/packages/5c/ed/98e9b07d8bb9c765d07774f0b2c19b301b96d51f44630fea48951051c94e/regex-2026.9.10-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:fd6bd89b9fc06018d35851cab0240adb7dd84d51941b19f6574ac90cd54e3ae5", size = 496662, upload-time = "2026-09-09T20:58:05.118Z" }, + { url = "https://files.pythonhosted.org/packages/ee/a8/9dfe9be48378b47c5a8f04b0f200ea225f9ee0f8e93f010433f661a37878/regex-2026.9.10-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:ef4c0a9dfdc90581b90b1b95a8c3d1557f8ff8f5a2a53536d26314de699d1468", size = 297115, upload-time = "2026-09-09T20:58:06.822Z" }, + { url = "https://files.pythonhosted.org/packages/2b/e4/5d1f005a3825ec49842ad349061c1c26e6d42f47ccf105e6e5aa6aeed392/regex-2026.9.10-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:14caa05ce39ec70437af5aac8814c50ee6628f4a90353871c059692f448a164f", size = 291896, upload-time = "2026-09-09T20:58:08.675Z" }, + { url = "https://files.pythonhosted.org/packages/be/15/44ce83fca50c6058f42b62fa8300a8030eea7e4e5a973a2dd33db0f557fb/regex-2026.9.10-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3264132d576847ab5f88bb83e7debe67854bf165b3ea613bd467312b6099536a", size = 800534, upload-time = "2026-09-09T20:58:10.339Z" }, + { url = "https://files.pythonhosted.org/packages/af/6e/a62e070a5a033643b287489576f02ae6a9c584c337d62349e340a2b4d001/regex-2026.9.10-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:5cef9f3d14796500ea834c41dbe688f1f6b23c7024dc23e8a794d7ebaf5d71d0", size = 872038, upload-time = "2026-09-09T20:58:12.186Z" }, + { url = "https://files.pythonhosted.org/packages/f3/06/8b8e2483949b1329df10c5b615e85d332066deb426b11332b799629b9201/regex-2026.9.10-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d278ad30ec83b6b9202685b0f80b741a51ea3ca7f0595ebda96e7628b6398876", size = 918927, upload-time = "2026-09-09T20:58:13.903Z" }, + { url = "https://files.pythonhosted.org/packages/bb/64/9b56f69100d3afdbc9c4fa6e302764f9cb717fbc06a9d50558d98ca89cd2/regex-2026.9.10-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:05fb018cfe7144585fc83882405906ff84994a2d154afc2509ecc7752c51f864", size = 803694, upload-time = "2026-09-09T20:58:15.949Z" }, + { url = "https://files.pythonhosted.org/packages/07/43/d00d59a7c8fd0e070ae8457a8743597f45ad9682b100f57b9c9c405fbdfd/regex-2026.9.10-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6fd555fc9abef50c530869690b2daca054c8811a7aff632d11f9a7b2590b2742", size = 777770, upload-time = "2026-09-09T20:58:17.628Z" }, + { url = "https://files.pythonhosted.org/packages/46/6b/a11d0446484efbc9eb67abec133f254c6d66a1568b8f3fb36d39a73a1129/regex-2026.9.10-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8d5c4518235a2ec1611e57af85fa488d529c1106aacff12adadcedf8687012cd", size = 791234, upload-time = "2026-09-09T20:58:19.476Z" }, + { url = "https://files.pythonhosted.org/packages/12/09/bcd24e78b373fd4f98090caa43eade439223f6703b909be79b9efd9ab0ab/regex-2026.9.10-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:175cf49ce7a994c88b8f15e3cb17cdb66a48ebb2d36de736b8205033db950f89", size = 866259, upload-time = "2026-09-09T20:58:21.683Z" }, + { url = "https://files.pythonhosted.org/packages/8b/c6/c57ba5e94222a813260af4c17ced92d40cdb44737eb6b50979688310b6a3/regex-2026.9.10-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b71649169a9fcf30b395ee01047fa7ad6654a4c900ca75b23c04dedcce6a1f8c", size = 768219, upload-time = "2026-09-09T20:58:23.842Z" }, + { url = "https://files.pythonhosted.org/packages/7b/a2/3820037587d00901ace96c5864335c2cd1b899d5263ea0dd2261359e0bee/regex-2026.9.10-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:8ba1f78bd4fef2d8f84b894ec28ac3481afe6cc07aaa253ad4717ef7b3fe6bcb", size = 858582, upload-time = "2026-09-09T20:58:25.607Z" }, + { url = "https://files.pythonhosted.org/packages/47/f0/f9a838ca6219ae4821de0175e4548db73ef56de5ec08d032fb427732fa07/regex-2026.9.10-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:217e98ba5fc8908ed8ffd4ebac04753a0c831067cbfb495b9821b94cc61eaa76", size = 791405, upload-time = "2026-09-09T20:58:27.406Z" }, + { url = "https://files.pythonhosted.org/packages/39/e5/a4b12262edc488a8a7a95b672db317dd8aa9bf2fab98297f9c91bb11ad4d/regex-2026.9.10-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:2dd9286093c71afc8f55ef035c5b9d2776641fd72c6535f1febc92d0b0be9666", size = 501128, upload-time = "2026-09-09T20:58:34.306Z" }, + { url = "https://files.pythonhosted.org/packages/55/c8/9ca31c0fa5197ded8614c8ae0e105bcff2d979025ffa3c75580baa334e2f/regex-2026.9.10-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:71879292c9c7ac67b1680345b16daba1be937cb027362cfa04e68f65db2dcfdd", size = 299428, upload-time = "2026-09-09T20:58:36.296Z" }, + { url = "https://files.pythonhosted.org/packages/2b/d1/ee7662561735f90475443c3ca1977e5cecaeaa8f29620dec75580aebc839/regex-2026.9.10-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5ccd139b2061132e7b265cfb4b4721baeb9f8928b81415304abf1ec7e3181c26", size = 294494, upload-time = "2026-09-09T20:58:37.964Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b1/333168e45ed6cfe71f6d17e21e5f54725f44d171f84edd12469a2f739227/regex-2026.9.10-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7327795089ddb44912dce1434e1d7244be2e9fb48fcc2d6782936af7a3062db", size = 814925, upload-time = "2026-09-09T20:58:40.438Z" }, + { url = "https://files.pythonhosted.org/packages/bc/a5/df1b38536d0a3b24a030eb4130ce98b403cc925220ff530f5313a7c436eb/regex-2026.9.10-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ff4d7b14ea19e50c8d9d6d83f45bd9b45cbb624c07ac1fa54db0a019049abed7", size = 873323, upload-time = "2026-09-09T20:58:42.349Z" }, + { url = "https://files.pythonhosted.org/packages/93/ea/aa71fe62dd63a8336bbdec1ff002a6c53b40ccfca95961c18ee4f09bf03c/regex-2026.9.10-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:4f0407474ffac8e5e89d93ca41d60891e29f0ab8423eb66ff292d850a86a0843", size = 923080, upload-time = "2026-09-09T20:58:44.488Z" }, + { url = "https://files.pythonhosted.org/packages/86/38/49f8d6fd34fc1a9c75b5b96364ebdde702a8144e5ed63d2213c58d454c27/regex-2026.9.10-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1ad10a135fa0b4e4a462a61d07c6654d7518cfdb5cb8da08f9ff7d61384af1fe", size = 821284, upload-time = "2026-09-09T20:58:46.56Z" }, + { url = "https://files.pythonhosted.org/packages/32/45/91a977c96d4be13d1ade8208c260c26841c836d4c91745e1828a30589070/regex-2026.9.10-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9fbd2e5d8002dc49a6129fb321ec51c57a025e752ed525ddce0ba9223c4350a7", size = 789256, upload-time = "2026-09-09T20:58:48.473Z" }, + { url = "https://files.pythonhosted.org/packages/2d/79/4d110bf01bf9651bf9b3f88a6d9fa7e643e0586921a18432b25a478edbfa/regex-2026.9.10-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:4a761ea45f2ad74c575ef5850ea514cef97302a552d3c7c9d1a1a870d4661d6c", size = 803722, upload-time = "2026-09-09T20:58:50.286Z" }, + { url = "https://files.pythonhosted.org/packages/e7/67/b587a0d3bbac2635309ed9c40c197120c39e1ec0afb8813cbed1338fdd75/regex-2026.9.10-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:75aa39d3f4f1650eea84e46b0d8cefe77dd5478c10e3d0aaf0b0f00493475a7a", size = 870085, upload-time = "2026-09-09T20:58:52.224Z" }, + { url = "https://files.pythonhosted.org/packages/07/fc/0827bca20ddba1d70fa5111a2a64e6b6b38bfdab43fc435022b54172a111/regex-2026.9.10-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f5c629df03adec31ee505dda3c8988f106c9390e4cbd343600036eb8b3d6724f", size = 776970, upload-time = "2026-09-09T20:58:54.478Z" }, + { url = "https://files.pythonhosted.org/packages/9b/03/ab9d08d30568ca868791bfb99551db60b947f05e2e65dcd1261e87083c21/regex-2026.9.10-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:3a66e40a1a20de96a2fee00ed67e11012b62d85b277688258677fd19997addb7", size = 863611, upload-time = "2026-09-09T20:58:56.432Z" }, + { url = "https://files.pythonhosted.org/packages/5e/6d/8063ae86b543ae878a7d6e7ba21ebf0af4af06161230e0012e2d652320c6/regex-2026.9.10-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:968c1e33edd9a104d1bf24c8d476c72de7e3839ae7f894b37e9e4f4739fdeeca", size = 804064, upload-time = "2026-09-09T20:58:59.066Z" }, + { url = "https://files.pythonhosted.org/packages/67/ca/1d1f83bc2f8fff4f186266ac82d73254e686565530cec9ab5228fb5c63dc/regex-2026.9.10-cp315-cp315-macosx_10_15_universal2.whl", hash = "sha256:6afcad14310f1311d077553ed374b42a5e538f85a8c884b4e38e52de091c8077", size = 496869, upload-time = "2026-09-09T20:59:07.051Z" }, + { url = "https://files.pythonhosted.org/packages/33/42/4217510286501a2ebcd372b781b4754ac961e043fa13ef8dce803c44d89c/regex-2026.9.10-cp315-cp315-macosx_10_15_x86_64.whl", hash = "sha256:3fb4ae8cf83ef4e9addd43b2da31a9f45be816a8036fae8af59c8998b72718e2", size = 297121, upload-time = "2026-09-09T20:59:09.007Z" }, + { url = "https://files.pythonhosted.org/packages/55/a7/595468ed0bbccd94be92c6b5d67736ba128b204d942429a8485c2693914d/regex-2026.9.10-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:f7d4656e17ab736e9415a6442a345bfc97bb8b7dcce47884bb74a37f70f08d0c", size = 292139, upload-time = "2026-09-09T20:59:10.859Z" }, + { url = "https://files.pythonhosted.org/packages/29/1c/ac92c123e0ab9bea75a904272171b356940bd6139e4a35de44f2254dca8f/regex-2026.9.10-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:35ba3bab0c45079735f55ac61526774de1d84bc4a0333cc554e1a4ab74913924", size = 802375, upload-time = "2026-09-09T20:59:12.823Z" }, + { url = "https://files.pythonhosted.org/packages/8d/16/d349f6fa9f908162359004e4f067353a0146e8074d24989490778244be44/regex-2026.9.10-cp315-cp315-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ff6b3267318661dfddf6b3628663e00e5946bd0a5c8fa678537a1401f0388f91", size = 872328, upload-time = "2026-09-09T20:59:15.352Z" }, + { url = "https://files.pythonhosted.org/packages/df/81/251b5aef23147057e926346fdb7c8c352d0568f65a492e4e9eb6120f6446/regex-2026.9.10-cp315-cp315-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:030fa9e23624e39b3b94e46b90a5abd1a1678eb2f58fcdd3fd6c27526bf91c7e", size = 919594, upload-time = "2026-09-09T20:59:17.31Z" }, + { url = "https://files.pythonhosted.org/packages/d0/6e/1f25319dc1b9cf4b7ffa303f3d16ca53260fe92aff45e81aa1b3c6c7cba2/regex-2026.9.10-cp315-cp315-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fbc8314436353e097c050e11b01a6c11433579437ed0579730157676ef59e2f", size = 807394, upload-time = "2026-09-09T20:59:19.328Z" }, + { url = "https://files.pythonhosted.org/packages/cc/fc/3da6b3dffddf12d5e96cbbe6f5e65ebcd64f92e3388a6690a53e0878232d/regex-2026.9.10-cp315-cp315-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7e6c0b5ec6ddee4032247585dc491b0fa58627745b66a705728703a3f0331231", size = 786018, upload-time = "2026-09-09T20:59:21.592Z" }, + { url = "https://files.pythonhosted.org/packages/bb/6f/1cc86dafddc912ef44c5ccd4f729060be8c6735600932664eb6d0e25469b/regex-2026.9.10-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:bf29611e5376fec8f795879bb5c6153a76c3a292573d173c26784042b01eb840", size = 793504, upload-time = "2026-09-09T20:59:23.734Z" }, + { url = "https://files.pythonhosted.org/packages/b1/cb/11692e29388d006211163627fcefa0c79917ab9f94d46a1b2254fe5efc81/regex-2026.9.10-cp315-cp315-musllinux_1_2_ppc64le.whl", hash = "sha256:ec8855f08c17895a26fbf5f19ed829722e19b34a96629e49a43c92974924026b", size = 866766, upload-time = "2026-09-09T20:59:25.798Z" }, + { url = "https://files.pythonhosted.org/packages/5d/78/3631df969830f94d83fcfc5fc71a7b39caad905e18f7b17350a94135d625/regex-2026.9.10-cp315-cp315-musllinux_1_2_riscv64.whl", hash = "sha256:94c5ce3bc41d226b4eb89ca3f842b2e28c031487fb1f34eb2153d98235831325", size = 775825, upload-time = "2026-09-09T20:59:28.51Z" }, + { url = "https://files.pythonhosted.org/packages/4e/8a/762892a8e3e21d119eacaffde848aa247e6cf4e1d90c46011671e86b1b9e/regex-2026.9.10-cp315-cp315-musllinux_1_2_s390x.whl", hash = "sha256:9ce239acb15843ab03976626af810a4424b0409689ec2bbc52088ab5479ab487", size = 858901, upload-time = "2026-09-09T20:59:30.656Z" }, + { url = "https://files.pythonhosted.org/packages/3f/f0/78048fada5c2f61d795efb26ea24f820a5564c4aa26574920284d45cd656/regex-2026.9.10-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:c22df8dd6373bbe3898e77429ffc85594300e39d752fd0e68a31e59d37899376", size = 796208, upload-time = "2026-09-09T20:59:32.852Z" }, + { url = "https://files.pythonhosted.org/packages/f7/38/a3caebcd5105be90708071db20bd261b0961b8ea4fe5e8be45c2632519b5/regex-2026.9.10-cp315-cp315t-macosx_10_15_universal2.whl", hash = "sha256:1270cdec69248592bbe38a0b263ed58d907b891bd2b93703e225c317e421bda1", size = 501336, upload-time = "2026-09-09T20:59:40.987Z" }, + { url = "https://files.pythonhosted.org/packages/ee/b5/ec8887b2658bf0a5df143c7c1fcd562b0abd2fa208c04ebf15c6607c9bb2/regex-2026.9.10-cp315-cp315t-macosx_10_15_x86_64.whl", hash = "sha256:681ed38664b64c6617d3c3c332018d1948c77e139c5ea667c1886efa671e426f", size = 299318, upload-time = "2026-09-09T20:59:43.039Z" }, + { url = "https://files.pythonhosted.org/packages/d5/58/84724a9eccf6e8cd46f7e4534576093e2476a5eeb55e2453aa6606e86059/regex-2026.9.10-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:8e127d9a80cbf1c3276bb465c6d047e8705e97b58c2b8f2f0c0a69c336b44b37", size = 294847, upload-time = "2026-09-09T20:59:44.954Z" }, + { url = "https://files.pythonhosted.org/packages/50/03/70ccc5e53905984abf8eab63eebd3ce740522ef8c8d392622b64d79ef290/regex-2026.9.10-cp315-cp315t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:990797e765d89a423880052c68b61c31afe701de94a8c060f61c40605ca6c727", size = 814359, upload-time = "2026-09-09T20:59:47.194Z" }, + { url = "https://files.pythonhosted.org/packages/29/53/40f7a11ec547e4a947883c9d5e8a075f6d4f59af2b8dbcaa8bf5b504aca0/regex-2026.9.10-cp315-cp315t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e5e4a6e0734a685d13b9685622bb503bdbb2927f8b0df025a5085f0ea067475b", size = 875586, upload-time = "2026-09-09T20:59:49.537Z" }, + { url = "https://files.pythonhosted.org/packages/0b/9d/83f3e022d99ce601727c4ef5f7b527753901ce4509ed89a1bb6a2263380a/regex-2026.9.10-cp315-cp315t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:63bb62cf62217dc38c8a6b2b61b165b0e4eb8fa93b0aba12139251c0986a8fa3", size = 920990, upload-time = "2026-09-09T20:59:51.776Z" }, + { url = "https://files.pythonhosted.org/packages/b2/64/dfdb367d8f4f5c9b8ccb4b59789c2ce996f2c69c3b8192aa986fe7d92ec4/regex-2026.9.10-cp315-cp315t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cb76a9c4e07a6a47849726af0ed14c41741a182f097f134a8cf29c1bc0f4dde8", size = 818660, upload-time = "2026-09-09T20:59:54.428Z" }, + { url = "https://files.pythonhosted.org/packages/88/a6/fb7d0b64487913845834f319aa84f8377d55305958a5db7e19c128798366/regex-2026.9.10-cp315-cp315t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:31e4df2b11d48f61d511019bc1ee9b477055f17c352b68fe72db7a98b14d603c", size = 794976, upload-time = "2026-09-09T20:59:56.799Z" }, + { url = "https://files.pythonhosted.org/packages/3e/1c/23484edaae387ea0d31f4d414463211e3516c8aa210ce8d0640f5aff3502/regex-2026.9.10-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:cf377960d2ac37d987394a9dbaa75e91338c41a46d41e1d25e90125e7b3ee2dc", size = 804081, upload-time = "2026-09-09T20:59:59.39Z" }, + { url = "https://files.pythonhosted.org/packages/d5/e1/e30d138f13aecec99ea9aecef7e31563de6ec6a2f5ce1d65fc506aee33fe/regex-2026.9.10-cp315-cp315t-musllinux_1_2_ppc64le.whl", hash = "sha256:c8fbd9cb30c68c1686b94029b9ef845d5870d3d65baf66cb126b676849b9d72b", size = 870430, upload-time = "2026-09-09T21:00:03.304Z" }, + { url = "https://files.pythonhosted.org/packages/53/dc/81f9ce86f7ae4f57901543597c95751fa01c41a672ec1636dd913f8a000a/regex-2026.9.10-cp315-cp315t-musllinux_1_2_riscv64.whl", hash = "sha256:53e182b6b04d0011909b47d51a2d72d908de07c7b1c7f16b3adda2204d723bc1", size = 783327, upload-time = "2026-09-09T21:00:05.68Z" }, + { url = "https://files.pythonhosted.org/packages/a9/1b/d7bf8f91534740f6a8ca17e5ac9c5337903baf527c8de240fbac1bbedfd0/regex-2026.9.10-cp315-cp315t-musllinux_1_2_s390x.whl", hash = "sha256:0aa7589394230e0f0a422ab6b90841ff12c87e855e7aaf75d192a54a5f124548", size = 860874, upload-time = "2026-09-09T21:00:08.41Z" }, + { url = "https://files.pythonhosted.org/packages/9a/1d/52cc88364aca7c9013dfe9abe0fea67f8d394efe384d07798300a6e2f27d/regex-2026.9.10-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:1b891f77554bff991804cee24b78b40789f7d5993a24c7907bc7025fd2a70c8d", size = 806705, upload-time = "2026-09-09T21:00:10.768Z" }, ] [[package]] @@ -4541,8 +4554,8 @@ dependencies = [ { name = "scikit-learn" }, { name = "scipy" }, { name = "tokenizers" }, - { name = "torch", version = "2.13.0", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform != 'linux'" }, - { name = "torch", version = "2.13.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform == 'linux'" }, + { name = "torch", version = "2.14.0", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform != 'linux'" }, + { name = "torch", version = "2.14.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform == 'linux'" }, { name = "tqdm" }, { name = "transformers" }, { name = "typing-extensions" }, @@ -4982,7 +4995,7 @@ wheels = [ [[package]] name = "torch" -version = "2.13.0" +version = "2.14.0" source = { registry = "https://download.pytorch.org/whl/cpu" } resolution-markers = [ "python_full_version >= '3.15' and sys_platform == 'darwin'", @@ -4999,16 +5012,18 @@ dependencies = [ { name = "typing-extensions" }, ] wheels = [ - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:e76f9bcecc52b8ff711239a2f7547d5353df95878ab232f0773c1d95928b92f8", upload-time = "2026-07-08T12:26:13Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:2fe228aba290d14b9f31b049be550dbd469c3fd3013d7a19705b30454da97027", upload-time = "2026-07-08T12:26:18Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:33449899ce5496c1b84b4853179d94fd102028ae1407314d9fb956bb79e70d09", upload-time = "2026-07-08T12:26:23Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d849b390e07d8d333ce8ecaf91b273c656c598379a19c9acf1318a883f6b391c", upload-time = "2026-07-08T12:26:28Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:c28def70706c2f9ecc752574766e8ae4da9b810ab6676b611166761a78a9f1e1", upload-time = "2026-07-08T12:26:33Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:1040f689e560ba6e02a0a147dfb9ec8dfdd3e4486ebec4b24dc8fdaa258fa9ba", upload-time = "2026-09-02T00:26:07Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:ab7e226c18d3cbc134dfa952d18ab1df202055dd33446837c8fd050ad449e6f5", upload-time = "2026-09-02T00:26:12Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:caf6359d64c0074bcb9f8641a169239118c8165a0a0fef79110c72bfd6474bec", upload-time = "2026-09-02T00:26:15Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:d0f78744000a7863cc3f1eafaf511d4b9944f079f08277de6fefe4b01f4d41b9", upload-time = "2026-09-02T00:26:19Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:dd4c297f1af83ad44368ffdaa9ed0318984567ff952bbda3d90cc300afe1e8a0", upload-time = "2026-09-02T00:26:23Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp315-cp315-macosx_14_0_arm64.whl", hash = "sha256:c65f7d7783e76272bbd53e4220aa029ac14e2dc346c6641691e041202a03b0e0", upload-time = "2026-09-02T00:26:27Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0-cp315-cp315t-macosx_14_0_arm64.whl", hash = "sha256:879140333148a3a5b1a14ab29a35b58c3c8db4d85c7130018a79178eb239008b", upload-time = "2026-09-02T00:26:30Z" }, ] [[package]] name = "torch" -version = "2.13.0+cpu" +version = "2.14.0+cpu" source = { registry = "https://download.pytorch.org/whl/cpu" } resolution-markers = [ "python_full_version >= '3.15' and sys_platform == 'linux'", @@ -5029,25 +5044,25 @@ dependencies = [ { name = "typing-extensions" }, ] wheels = [ - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp311-cp311-linux_s390x.whl", hash = "sha256:6e9817dbdf5ea76789babd46e457eac5bf14ff566cf85f8addbfdff2d56601ce", upload-time = "2026-07-08T19:27:52Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:84453b69508ec79902f899c5ed9495acb9e2bbe9fda5f1d5d6f19e3c3842e1a7", upload-time = "2026-07-08T19:28:03Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:6746dbcbeb526eb61330b76b41ff1b4eb848951103a892eeb080dfa2b264667b", upload-time = "2026-07-08T19:28:16Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp312-cp312-linux_s390x.whl", hash = "sha256:ffadde149901c8afa138daa38d898264003cfcf1a3336ca5cd964b5af227d867", upload-time = "2026-07-08T19:28:41Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:6f307c2c32d764ffc6ff6893b801fad6d4752f3e67966cb8abf1843427c02604", upload-time = "2026-07-08T19:28:51Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:4ca4a9394b0c771238a4f73590fdbbc4debad85ed0fa63d026ae1b085da7d6e2", upload-time = "2026-07-08T19:29:03Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp313-cp313-linux_s390x.whl", hash = "sha256:966d020354f465672dc7dd10d3a5c6cd17d7eb48620aa1d265b48a1f78f06898", upload-time = "2026-07-08T19:29:30Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:0b8f7d0423027ae8b90c7977c627f3379f325363a08224dffad9b4b2d684a83d", upload-time = "2026-07-08T19:29:40Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:3fbf9c9d1f3c10c2d59d04aca426dee9ccc6ceb32d255c61e93acc3b4f75fae6", upload-time = "2026-07-08T19:29:54Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-linux_s390x.whl", hash = "sha256:dec241fef3984c0d1edadd1f58708e218d4eae881ceef7bc10cf9964d41b68b9", upload-time = "2026-07-08T19:30:20Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:ca021f9eb2f8345c83fa03e3a04587308afb8df71bd472670b3ece00df58621c", upload-time = "2026-07-08T19:30:32Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:d20fa53ee744502fa4c69818a720b05ca0d37abd055d4f6e66cae155114bc691", upload-time = "2026-07-08T19:30:45Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314t-linux_s390x.whl", hash = "sha256:991cc14b39e751122c01f017be6448533989868731cb5eecd1006893d26787c2", upload-time = "2026-07-08T19:31:09Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:7b8d26e29bceafbdaa8d63bfe7612f23875b5af2cc07e13f809c3ed890bbe1d8", upload-time = "2026-07-08T19:31:21Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:b222c15a0fc2ce207d1c1a59700b46c8fa6748df1f447ad11e5c870dde0933d9", upload-time = "2026-07-08T19:31:35Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:8eb5002ca81af00ae69b57540f615b58b8ae922b6d4848176b366a52bd2196e6", upload-time = "2026-07-08T19:32:00Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:1a3a35229fdc13446b4eab50e7fcf9399ff941e89a3b761497786297a5d8dde5", upload-time = "2026-07-08T19:32:16Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp315-cp315t-manylinux_2_28_aarch64.whl", hash = "sha256:8e109528e6bab044815daebaf71770fbaace3a66ef1c816cb55c875350f78a60", upload-time = "2026-07-08T19:32:30Z" }, - { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.13.0%2Bcpu-cp315-cp315t-manylinux_2_28_x86_64.whl", hash = "sha256:222a6681467cc7f6f05cd3068dfbc603def3a1e46d1d4620c1c8cdf6178bd563", upload-time = "2026-07-08T19:32:44Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp311-cp311-linux_s390x.whl", hash = "sha256:3fa39713d13f23563ad11636bfff76b677ab4addbc240c54e6b7e47622e8973d", upload-time = "2026-09-02T18:31:08Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:08894195f84541edcbd09072e6c53b791d4cdd09f650b05473f35718a848fd7b", upload-time = "2026-09-02T18:31:13Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:673dbf5c9bbadfffab7a386b6dd7a0c219f1408a328b7b4e86d0ae551cdafa42", upload-time = "2026-09-02T18:31:19Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp312-cp312-linux_s390x.whl", hash = "sha256:07aefe1a437b6f1b41b0cba15e16583e2f43549ec9d062fcea8e7981a78e014a", upload-time = "2026-09-02T18:31:32Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:da8140c3d4a41500d29710e35bf8e66a4295ec31026487c69f54a3f583310f8d", upload-time = "2026-09-02T18:31:37Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:a09987c95ec4cffdb6df798d3d641558110a334cfccce22f2f046d83142bc260", upload-time = "2026-09-02T18:31:42Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp313-cp313-linux_s390x.whl", hash = "sha256:d87cfff3af33c937b88c9bc6c0dfa17f2156e2599f63447c696f2345928b518a", upload-time = "2026-09-02T18:31:55Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:092d5c12938850dfbd90a654b3c8dac34c33e300f88eb19ee6f4ef93992c6347", upload-time = "2026-09-02T18:31:59Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:160e1bc46aeded3111d2801f8ae10dc9a1b946843a7e126b4dbf5e19c5706e95", upload-time = "2026-09-02T18:32:05Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314-linux_s390x.whl", hash = "sha256:266a253980047f3c037191f45d7e7ecfa838d13102141ca57b86fcc892663004", upload-time = "2026-09-02T18:32:17Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:27b34640fea7268862961b734c723873e15b1c2657b1eb84bcfac053e5841527", upload-time = "2026-09-02T18:32:23Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:f152f41dc5dc462afe0de780e451ebb47ea8b4451f8f919f9537aa8e2cbe1d7e", upload-time = "2026-09-02T18:32:29Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314t-linux_s390x.whl", hash = "sha256:c1d81be03f715eca5b065fc767f73b2a26668a16d614e163a4378a3f38a5e471", upload-time = "2026-09-02T18:32:39Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:a6ff46c0c0c4f5b9b399dff5e4856a98ce18e61ca14ad74b21790174c7cbde08", upload-time = "2026-09-02T18:32:43Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:2baf9cbaef964d821465df0c53a91cc01b2d0ea29ebd199e2f9c7d27a7fc70a4", upload-time = "2026-09-02T18:32:48Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp315-cp315-manylinux_2_28_aarch64.whl", hash = "sha256:07d50e40232d2757be323693e38f531e04ee654d40537bc0b04e787c1e73a27a", upload-time = "2026-09-02T18:32:57Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp315-cp315-manylinux_2_28_x86_64.whl", hash = "sha256:a8b2fa9a03d81bc083f279737fce1cd8d1ed2e267da92215260cd644dcfdd3fe", upload-time = "2026-09-02T18:33:02Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp315-cp315t-manylinux_2_28_aarch64.whl", hash = "sha256:e22ddf8a9fff9934fe2dd2440d45c437bb0539f2d6d24b57b26981d6dca4157c", upload-time = "2026-09-02T18:33:11Z" }, + { url = "https://download-r2.pytorch.org/whl/cpu/torch-2.14.0%2Bcpu-cp315-cp315t-manylinux_2_28_x86_64.whl", hash = "sha256:18b417c953e9b4d8b79294ca5184586790f0a609b3929e39258cea854b945870", upload-time = "2026-09-02T18:33:16Z" }, ] [[package]] @@ -5281,11 +5296,11 @@ wheels = [ [[package]] name = "types-regex" -version = "2026.7.19.20260720" +version = "2026.9.3.20260903" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/00/bc/825471e08455b037c40d2c80fe9f93a574fcfef0b2e6c6fc2e248ada4adb/types_regex-2026.7.19.20260720.tar.gz", hash = "sha256:49ab8261bd46fa215245b9cb0d2fed1c1056fbdc763303714f6132208909afcf", size = 13473, upload-time = "2026-07-20T05:27:00.203Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ac/65/7a39af8705ba0685429e8306ce7cbc6d40be0658c36bb2330aefcca13815/types_regex-2026.9.3.20260903.tar.gz", hash = "sha256:eef82a0ae08806f32609fc4829fee845f98672dd6378834c34dec33bf8c60cf0", size = 13858, upload-time = "2026-09-03T06:36:49.602Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b0/1a/9bbd3eace00c2562556570d2464afe843ef5f8118df17aee5f36fed5948f/types_regex-2026.7.19.20260720-py3-none-any.whl", hash = "sha256:70e76f05d8ef60f00227e50351f1cb81552d1cdf3fdf77350f7063c911ee26da", size = 11147, upload-time = "2026-07-20T05:26:59.245Z" }, + { url = "https://files.pythonhosted.org/packages/8e/c7/571fb5dbfee06a57651d8af664dbda43409277b6f7ccff5df8fbeee526e3/types_regex-2026.9.3.20260903-py3-none-any.whl", hash = "sha256:d12a58823ba330497c4369fc47f9de028f5fd74036d3cfabb7732c69e88a5fd0", size = 11181, upload-time = "2026-09-03T06:36:48.605Z" }, ] [[package]] From 4c4ef5617cf8c27fc01747c977aa9fb70da0bf45 Mon Sep 17 00:00:00 2001 From: Boris Rybalkin Date: Fri, 18 Sep 2026 11:14:03 +0300 Subject: [PATCH 072/258] Fix: don't redirect to signup on first install when regular login is disabled (#14165) --- src/documents/templates/account/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/templates/account/login.html b/src/documents/templates/account/login.html index c66fa6e44..5996c6cbb 100644 --- a/src/documents/templates/account/login.html +++ b/src/documents/templates/account/login.html @@ -15,7 +15,7 @@ {% endblock form_top_content %} {% block form_content %} - {% if FIRST_INSTALL %} + {% if FIRST_INSTALL and not DISABLE_REGULAR_LOGIN %} ' }, + ]) + fixture.detectChanges() + const el: HTMLElement = fixture.nativeElement + expect(el.querySelector('.chat-markdown strong')?.textContent).toBe( + 'assistant' + ) + expect(el.querySelector('.chat-markdown script')).toBeNull() + expect(el.textContent).toContain('**user**') + }) + + it('should keep the destination hostname visible after sanitizing chat links', () => { + component.messages.set([ + { + role: 'assistant', + content: + '[View original document](https://otherdomain.example/?data=secret)', + }, + ]) + fixture.detectChanges() + const el: HTMLElement = fixture.nativeElement + const link = el.querySelector('.chat-markdown a') + expect(link?.textContent).toBe('View original document') + expect(link?.nextElementSibling?.textContent).toBe('(otherdomain.example)') + }) }) diff --git a/src-ui/src/app/components/chat/chat/chat.component.ts b/src-ui/src/app/components/chat/chat/chat.component.ts index 4525808a4..3b74a04bc 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.ts +++ b/src-ui/src/app/components/chat/chat/chat.component.ts @@ -10,6 +10,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NavigationEnd, Router, RouterModule } from '@angular/router' import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { MarkdownPipe } from 'src/app/pipes/markdown.pipe' import { filter, map } from 'rxjs' import { ChatMessage, @@ -25,6 +26,7 @@ import { RouterModule, NgxBootstrapIconsModule, NgbDropdownModule, + MarkdownPipe, ], templateUrl: './chat.component.html', styleUrl: './chat.component.scss', diff --git a/src-ui/src/app/pipes/markdown.pipe.spec.ts b/src-ui/src/app/pipes/markdown.pipe.spec.ts new file mode 100644 index 000000000..a0655486e --- /dev/null +++ b/src-ui/src/app/pipes/markdown.pipe.spec.ts @@ -0,0 +1,90 @@ +import { MarkdownPipe } from './markdown.pipe' + +describe('MarkdownPipe', () => { + const pipe = new MarkdownPipe() + + it('should return empty string for empty input', () => { + expect(pipe.transform(null)).toEqual('') + expect(pipe.transform(undefined)).toEqual('') + expect(pipe.transform('')).toEqual('') + }) + + it('should render basic markdown', () => { + const html = pipe.transform( + '**bold** _em_ `code`\n\n- one\n- two\n\n| a | b |\n|---|---|\n| 1 | 2 |' + ) + expect(html).toContain('bold') + expect(html).toContain('em') + expect(html).toContain('code') + expect(html).toContain('
  • one
    • ') + expect(html).toContain('') + }) + + it('should escape raw html', () => { + const html = pipe.transform( + 'hi x\n\n' + ) + expect(html).not.toContain('') + expect(html).toContain('<script>') + }) + + it('should not render images', () => { + const html = pipe.transform( + '![secret](https://otherdomain.example/x.png?d=1)' + ) + expect(html).not.toContain(' { + const html = pipe.transform('[docs](https://docs.paperless-ngx.com "Docs")') + expect(html).toContain( + 'docs' + ) + expect(pipe.transform('[mail](mailto:a@b.c)')).toContain( + 'href="mailto:a@b.c"' + ) + }) + + it('should drop unsafe or relative links but keep their text', () => { + for (const href of [ + 'javascript:alert(1)', + 'JaVaScRiPt:alert(1)', + 'data:text/html,', + 'vbscript:msgbox', + '/api/documents/', + ]) { + const html = pipe.transform(`[click](${href})`) + expect(html).not.toContain(' { + for (const protocol of ['http', 'https']) { + const html = pipe.transform( + `[docs.paperless-ngx.com](${protocol}://docs.paperless-ngx.com@otherdomain.example/path?secret=1)` + ) + expect(html).toContain( + ' (otherdomain.example)' + ) + expect(html).not.toContain('(docs.paperless-ngx.com)') + } + }) + + it('should omit the hostname label for mailto links', () => { + expect(pipe.transform('[mail](mailto:a@b.c)')).toBe( + '

    mail

    \n' + ) + }) + + it('should escape link titles', () => { + const html = pipe.transform( + '[x](https://a.example "a\\" onmouseover=\\"1")' + ) + expect(html).not.toMatch(/"\s*onmouseover=/) + }) +}) diff --git a/src-ui/src/app/pipes/markdown.pipe.ts b/src-ui/src/app/pipes/markdown.pipe.ts new file mode 100644 index 000000000..992714c14 --- /dev/null +++ b/src-ui/src/app/pipes/markdown.pipe.ts @@ -0,0 +1,52 @@ +import { Pipe, PipeTransform } from '@angular/core' +import { Marked, Renderer, Tokens } from 'marked' + +const ALLOWED_LINK_PROTOCOLS = new Set(['http:', 'https:', 'mailto:']) + +function allowedUrl(href: string): URL | null { + try { + const url = new URL(href) + return ALLOWED_LINK_PROTOCOLS.has(url.protocol) ? url : null + } catch { + return null + } +} + +// Treat chat content as untrusted: no raw HTML, no images, and only +// absolute links. All escaping is done by marked's default renderer, and +// Angular's sanitizer runs on top of this as well. +const renderer: Partial = { + html(this: Renderer, { raw, text }: Tokens.HTML | Tokens.Tag): string { + return this.text({ type: 'text', raw, text }) + }, + image(this: Renderer, { raw, text }: Tokens.Image): string { + return this.text({ type: 'text', raw, text }) + }, + link(this: Renderer, token: Tokens.Link): string { + const url = allowedUrl(token.href) + if (!url) return this.parser.parseInline(token.tokens) + const anchor = Renderer.prototype.link + .call(this, token) + .replace('(${hostname})` + }, +} + +const markdown = new Marked({ + async: false, + gfm: true, + breaks: true, + renderer, +}) + +@Pipe({ + name: 'markdown', +}) +export class MarkdownPipe implements PipeTransform { + transform(value: string | null | undefined): string { + if (!value) return '' + return markdown.parse(value) as string + } +} From 9e83864f8372edfcd872dd72762df225c12f2b2f Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 01:53:57 +0000 Subject: [PATCH 247/258] Auto translate strings --- src-ui/messages.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 3e3b099a5..93ecd78a2 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -3957,7 +3957,7 @@ Message src/app/components/chat/chat/chat.component.html - 32,33 + 34,35 src/app/components/common/email-document-dialog/email-document-dialog.component.html @@ -3968,14 +3968,14 @@ Ask a question about this document... src/app/components/chat/chat/chat.component.ts - 49 + 51 Ask a question about a document... src/app/components/chat/chat/chat.component.ts - 50 + 52 From 4c124caee13a58d15b7a3c3122fbfab529dcc424 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:04:50 -0700 Subject: [PATCH 248/258] Enhancement: AI chat UX tweaks (#14415) --- .../components/chat/chat/chat.component.html | 110 +++++++++------ .../components/chat/chat/chat.component.scss | 31 +++-- .../chat/chat/chat.component.spec.ts | 101 +++++++++++++- .../components/chat/chat/chat.component.ts | 125 +++++++++++++----- src-ui/src/main.ts | 2 + 5 files changed, 284 insertions(+), 85 deletions(-) diff --git a/src-ui/src/app/components/chat/chat/chat.component.html b/src-ui/src/app/components/chat/chat/chat.component.html index e8c5f4022..eb4f8cb01 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.html +++ b/src-ui/src/app/components/chat/chat/chat.component.html @@ -1,51 +1,85 @@ -
  • +
  • -
    -
    -
    - @for (message of messages(); track message) { -
    -
    - @if (message.role === 'assistant') { -
    - @if (message.isStreaming) { | } - } @else { - {{ message.content }} - } - @if (message.role === 'assistant' && message.references?.length) { -
    - @for (reference of message.references; track reference.id) { - - {{ reference.title }} - - } -
    - } -
    -
    +
    +
    + + + @if (documentId()) { + Ask about this document + } @else { + Ask about your documents } -
    -
    + + @if (messages().length) { + + } +
    -
    - -
    - + @if (!messages().length) { +

    Answers come from your documents, with links to their sources.

    + } + @for (message of messages(); track message) { +
    +
    + @if (message.isStreaming && !message.content) { +
    + + @if (slowResponse()) { + Still thinking... + } @else { + Thinking... + } +
    + } @else if (message.role === 'assistant') { +
    + } @else { + {{ message.content }} + } + @if (message.role === 'assistant' && !message.isStreaming && message.references?.length) { +
    +
    Sources
    + @for (reference of message.references; track reference.id) { + + {{ reference.title }} + + } +
    + } +
    +
    + } +
    +
    + + + +
    + - -
    - -
    + /> + @if (loading()) { + + } @else { + + } +
    +
    • diff --git a/src-ui/src/app/components/chat/chat/chat.component.scss b/src-ui/src/app/components/chat/chat/chat.component.scss index 4b85363bb..64c373734 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.scss +++ b/src-ui/src/app/components/chat/chat/chat.component.scss @@ -1,9 +1,9 @@ .dropdown-menu { - width: var(--pngx-toast-max-width); + width: min(36rem, calc(100vw - 20px)); } .chat-messages { - max-height: 350px; + max-height: min(60dvh, 36rem); overflow-y: auto; white-space: pre-wrap; } @@ -16,24 +16,29 @@ white-space: initial; } -@media screen and (max-width: 400px) { - :host ::ng-deep .dropdown-menu-end { - right: -3rem; +@media screen and (max-width: 575.98px) { + .chat-messages { + max-height: calc(100dvh - 12rem); } } -.blinking-cursor { - font-weight: bold; - font-size: 1.2em; - animation: blink 1s step-end infinite; +.chat-markdown.streaming ::ng-deep { + > :last-child:not(ul, ol, table)::after, + > :is(ul, ol):last-child > li:last-child::after { + content: ''; + display: inline-block; + width: 2px; + height: 1.05em; + margin-left: 2px; + background-color: currentColor; + vertical-align: -0.15em; + animation: blink 1s step-end infinite; + } } @keyframes blink { - from, to { - opacity: 0; - } 50% { - opacity: 1; + opacity: 0; } } diff --git a/src-ui/src/app/components/chat/chat/chat.component.spec.ts b/src-ui/src/app/components/chat/chat/chat.component.spec.ts index 04948f3e9..7bf4129a9 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.spec.ts +++ b/src-ui/src/app/components/chat/chat/chat.component.spec.ts @@ -80,8 +80,16 @@ describe('ChatComponent', () => { expect(component.messages()[0].content).toBe('Hello') expect(component.loading()).toBe(true) + fixture.detectChanges() + const messagesEl = fixture.nativeElement.querySelector('.chat-messages') + expect(messagesEl.querySelector('.spinner-border')).not.toBeNull() + expect(messagesEl.textContent).toContain('Thinking...') + mockStream$.next('Hi') expect(component.messages()[1].content).toBe('H') + fixture.detectChanges() + expect(messagesEl.querySelector('.spinner-border')).toBeNull() + expect(messagesEl.querySelector('.chat-markdown.streaming')).not.toBeNull() mockStream$.next('Hi there') // advance time to process the typewriter effect await jest.runAllTimersAsync() @@ -96,6 +104,8 @@ describe('ChatComponent', () => { await fixture.whenStable() expect(component.loading()).toBe(false) expect(component.messages()[1].isStreaming).toBe(false) + fixture.detectChanges() + expect(messagesEl.querySelector('.chat-markdown.streaming')).toBeNull() expect(fixture.nativeElement.querySelector('#chatInput').disabled).toBe( false ) @@ -123,6 +133,10 @@ describe('ChatComponent', () => { mockStream$.next( `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}` ) + fixture.detectChanges() + expect(fixture.nativeElement.querySelector('.chat-references')).toBeNull() + + mockStream$.complete() jest.advanceTimersByTime(1000) fixture.detectChanges() @@ -156,13 +170,96 @@ describe('ChatComponent', () => { component.input.set('Hello') component.sendMessage() + mockStream$.next('Partial') mockStream$.error('Error') - expect(component.messages()[1].content).toContain( - '⚠️ Error receiving response.' + expect(component.messages()[1].content).toBe( + 'Partial\n\n⚠️ Error receiving response.' ) expect(component.loading()).toBe(false) }) + it('should keep streaming until the typewriter catches up', () => { + component.input.set('Hello') + component.sendMessage() + + mockStream$.next('Hi there') + mockStream$.complete() + expect(component.messages()[1].isStreaming).toBe(true) + expect(component.loading()).toBe(true) + + jest.advanceTimersByTime(1000) + expect(component.messages()[1].content).toBe('Hi there') + expect(component.messages()[1].isStreaming).toBe(false) + expect(component.loading()).toBe(false) + }) + + it('should show a slow response message while waiting', () => { + component.input.set('Hello') + component.sendMessage() + fixture.detectChanges() + const messagesEl = fixture.nativeElement.querySelector('.chat-messages') + expect(messagesEl.textContent).not.toContain('Still thinking...') + + jest.advanceTimersByTime(8000) + fixture.detectChanges() + expect(messagesEl.textContent).toContain('Still thinking...') + + mockStream$.next('Hi') + expect(component.slowResponse()).toBe(false) + }) + + it('should stop streaming and keep the partial response', () => { + component.input.set('Hello') + component.sendMessage() + fixture.detectChanges() + const stopButton = fixture.nativeElement.querySelector('.chat-input button') + expect(stopButton.getAttribute('aria-label')).toBe('Stop') + + mockStream$.next('Hi there') + jest.advanceTimersByTime(20) + stopButton.click() + + expect(mockStream$.observed).toBe(false) + expect(component.messages()[1].content).toBe('Hi there') + expect(component.messages()[1].isStreaming).toBe(false) + expect(component.loading()).toBe(false) + + jest.advanceTimersByTime(1000) + expect(component.messages()[1].content).toBe('Hi there') + }) + + it('should drop the empty response when stopped before any content', () => { + component.input.set('Hello') + component.sendMessage() + component.stopStreaming() + + expect(component.messages()).toHaveLength(1) + expect(component.loading()).toBe(false) + component.stopStreaming() // no-op once stopped + expect(component.messages()).toHaveLength(1) + }) + + it('should clear the conversation', () => { + component.input.set('Hello') + component.sendMessage() + mockStream$.next('Hi there') + fixture.detectChanges() + + fixture.nativeElement.querySelector('button[title="Clear chat"]').click() + expect(component.messages()).toHaveLength(0) + expect(component.loading()).toBe(false) + expect(mockStream$.observed).toBe(false) + + fixture.detectChanges() + jest.advanceTimersByTime(10) + expect(document.activeElement).toBe( + fixture.nativeElement.querySelector('#chatInput') + ) + expect(fixture.nativeElement.textContent).toContain( + 'Answers come from your documents' + ) + }) + it('should enqueue typewriter chunks correctly', () => { const message = { content: '', role: 'assistant', isStreaming: true } component.enqueueTypewriter(null, message as any) // coverage for null diff --git a/src-ui/src/app/components/chat/chat/chat.component.ts b/src-ui/src/app/components/chat/chat/chat.component.ts index 3b74a04bc..a69a735c4 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.ts +++ b/src-ui/src/app/components/chat/chat/chat.component.ts @@ -10,13 +10,16 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NavigationEnd, Router, RouterModule } from '@angular/router' import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { filter, map, Subscription } from 'rxjs' import { MarkdownPipe } from 'src/app/pipes/markdown.pipe' -import { filter, map } from 'rxjs' import { ChatMessage, ChatService, parseChatResponse, } from 'src/app/services/chat.service' +import { pngxPopperOptions } from 'src/app/utils/popper-options' + +const SLOW_RESPONSE_DELAY_MS = 8000 @Component({ selector: 'pngx-chat', @@ -36,6 +39,8 @@ export class ChatComponent implements OnInit { readonly loading = signal(false) readonly input = signal('') readonly documentId = signal(undefined) + readonly slowResponse = signal(false) + public popperOptions = pngxPopperOptions private chatService: ChatService = inject(ChatService) private router: Router = inject(Router) @@ -45,6 +50,11 @@ export class ChatComponent implements OnInit { private typewriterBuffer: string[] = [] private typewriterActive = false + private typewriterTimeout: ReturnType + private streamSubscription: Subscription + private streamingMessage: ChatMessage + private streamFinished = false + private slowResponseTimeout: ReturnType public get placeholder(): string { return this.documentId() @@ -83,47 +93,96 @@ export class ChatComponent implements OnInit { } this.messages.update((messages) => [...messages, assistantMessage]) this.loading.set(true) + this.streamingMessage = assistantMessage + this.streamFinished = false + this.slowResponseTimeout = setTimeout( + () => this.slowResponse.set(true), + SLOW_RESPONSE_DELAY_MS + ) let lastVisibleContent = '' - this.chatService.streamChat(this.documentId(), this.input()).subscribe({ - next: (chunk) => { - const nextResponse = parseChatResponse(chunk) + this.streamSubscription = this.chatService + .streamChat(this.documentId(), this.input()) + .subscribe({ + next: (chunk) => { + this.clearSlowResponse() + const nextResponse = parseChatResponse(chunk) - if (nextResponse.content.length < lastVisibleContent.length) { - this.resetTypewriter(assistantMessage, nextResponse.content) - lastVisibleContent = nextResponse.content - } else { - const visibleDelta = nextResponse.content.substring( - lastVisibleContent.length - ) - lastVisibleContent = nextResponse.content - this.enqueueTypewriter(visibleDelta, assistantMessage) - } + if (nextResponse.content.length < lastVisibleContent.length) { + this.resetTypewriter(assistantMessage, nextResponse.content) + lastVisibleContent = nextResponse.content + } else { + const visibleDelta = nextResponse.content.substring( + lastVisibleContent.length + ) + lastVisibleContent = nextResponse.content + this.enqueueTypewriter(visibleDelta, assistantMessage) + } - assistantMessage.references = nextResponse.references - this.notifyMessagesChanged() - }, - error: () => { - assistantMessage.content += '\n\n⚠️ Error receiving response.' - assistantMessage.isStreaming = false - this.notifyMessagesChanged() - this.loading.set(false) - }, - complete: () => { - assistantMessage.isStreaming = false - this.notifyMessagesChanged() - this.loading.set(false) - this.scrollToBottom() - }, - }) + assistantMessage.references = nextResponse.references + this.notifyMessagesChanged() + }, + error: () => { + this.flushTypewriter(assistantMessage) + assistantMessage.content += '\n\n⚠️ Error receiving response.' + this.finishStreaming(assistantMessage) + }, + complete: () => { + // let the typewriter catch up before hiding the cursor + this.streamFinished = true + if (!this.typewriterActive) this.finishStreaming(assistantMessage) + }, + }) this.input.set('') } - private resetTypewriter(message: ChatMessage, content: string): void { + stopStreaming(): void { + const message = this.streamingMessage + if (!message?.isStreaming) return + + this.streamSubscription?.unsubscribe() + this.flushTypewriter(message) + if (!message.content) { + this.messages.update((messages) => messages.filter((m) => m !== message)) + } + this.finishStreaming(message) + } + + clearChat(): void { + this.stopStreaming() + this.messages.set([]) + setTimeout(() => this.chatInput?.nativeElement.focus()) + } + + private finishStreaming(message: ChatMessage): void { + this.clearSlowResponse() + this.streamFinished = false + message.isStreaming = false + this.notifyMessagesChanged() + this.loading.set(false) + this.scrollToBottom() + } + + private clearSlowResponse(): void { + clearTimeout(this.slowResponseTimeout) + this.slowResponse.set(false) + } + + private flushTypewriter(message: ChatMessage): void { + message.content += this.typewriterBuffer.join('') + this.cancelTypewriter() + } + + private cancelTypewriter(): void { + clearTimeout(this.typewriterTimeout) this.typewriterBuffer = [] this.typewriterActive = false + } + + private resetTypewriter(message: ChatMessage, content: string): void { + this.cancelTypewriter() message.content = content this.notifyMessagesChanged() this.scrollToBottom() @@ -143,6 +202,7 @@ export class ChatComponent implements OnInit { playTypewriter(message: ChatMessage): void { if (this.typewriterBuffer.length === 0) { this.typewriterActive = false + if (this.streamFinished) this.finishStreaming(message) return } @@ -151,7 +211,8 @@ export class ChatComponent implements OnInit { this.notifyMessagesChanged() this.scrollToBottom() - setTimeout(() => this.playTypewriter(message), 10) // 10ms per character + // 10ms per character + this.typewriterTimeout = setTimeout(() => this.playTypewriter(message), 10) } private notifyMessagesChanged(): void { diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts index cbe970710..23d44694d 100644 --- a/src-ui/src/main.ts +++ b/src-ui/src/main.ts @@ -32,6 +32,7 @@ import { arrowDownUp, arrowLeft, arrowRepeat, + arrowReturnLeft, arrowRight, arrowRightShort, arrowUpRight, @@ -284,6 +285,7 @@ const icons = { arrowDownUp, arrowLeft, arrowRepeat, + arrowReturnLeft, arrowRight, arrowRightShort, arrowUpRight, From 8ea31cb3cefab151c52ce830603390a81be3858a Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 02:05:59 +0000 Subject: [PATCH 249/258] Auto translate strings --- src-ui/messages.xlf | 126 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 29 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 93ecd78a2..386cbaad7 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -3953,29 +3953,120 @@ 21 + + Ask about this document + + src/app/components/chat/chat/chat.component.html + 11 + + + + Ask about your documents + + src/app/components/chat/chat/chat.component.html + 13 + + + + Clear chat + + src/app/components/chat/chat/chat.component.html + 17 + + + + Answers come from your documents, with links to their sources. + + src/app/components/chat/chat/chat.component.html + 25,26 + + + + Still thinking... + + src/app/components/chat/chat/chat.component.html + 34 + + + + Thinking... + + src/app/components/chat/chat/chat.component.html + 36 + + + + Sources + + src/app/components/chat/chat/chat.component.html + 46,47 + + Message src/app/components/chat/chat/chat.component.html - 34,35 + 61,62 src/app/components/common/email-document-dialog/email-document-dialog.component.html 19,20 + + Stop + + src/app/components/chat/chat/chat.component.html + 74 + + + src/app/components/chat/chat/chat.component.html + 74 + + + + Send + + src/app/components/chat/chat/chat.component.html + 78 + + + src/app/components/chat/chat/chat.component.html + 78 + + + src/app/components/document-detail/document-detail.component.html + 94 + + + src/app/components/document-detail/document-detail.component.html + 95 + + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 111 + + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 113 + + + src/app/data/saved-view-icons.ts + 79 + + Ask a question about this document... src/app/components/chat/chat/chat.component.ts - 51 + 61 Ask a question about a document... src/app/components/chat/chat/chat.component.ts - 52 + 62 @@ -8473,29 +8564,6 @@ 87 - - Send - - src/app/components/document-detail/document-detail.component.html - 94 - - - src/app/components/document-detail/document-detail.component.html - 95 - - - src/app/components/document-list/bulk-editor/bulk-editor.component.html - 111 - - - src/app/components/document-list/bulk-editor/bulk-editor.component.html - 113 - - - src/app/data/saved-view-icons.ts - 79 - - Previous @@ -8511,7 +8579,7 @@ src/main.ts - 475 + 477 @@ -13230,14 +13298,14 @@ Prev src/main.ts - 474 + 476 End src/main.ts - 476 + 478 From c105486b6a25a9dead473019d9ba2d7ef907a5e8 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:07:55 -0700 Subject: [PATCH 250/258] Enhancement: navbar upload button (#14442) --- .../app-frame/app-frame.component.html | 12 ++++++++-- .../app-frame/app-frame.component.scss | 22 ++++++++++++++++- .../app-frame/app-frame.component.spec.ts | 24 +++++++++++++++++++ .../app-frame/app-frame.component.ts | 13 +++++++++- .../upload-file-widget.component.spec.ts | 12 ++++------ .../upload-file-widget.component.ts | 8 +++---- .../file-drop/file-drop.component.ts | 4 ++-- .../services/upload-documents.service.spec.ts | 12 ++++++++++ .../app/services/upload-documents.service.ts | 6 +++++ src-ui/src/main.ts | 2 ++ 10 files changed, 96 insertions(+), 19 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 942c6a195..78d96ffa6 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -29,8 +29,13 @@
    -
    - +
    + +
      @@ -70,6 +75,9 @@
    + + +
    - + - + @@ -341,9 +319,9 @@ @if (metadata()?.has_archive_version) { - + - + } @if (metadata()?.has_archive_version) { @@ -408,7 +386,7 @@ Permissions
    - +
    @@ -499,6 +477,29 @@ (loadError)="onError($event)" (afterLoadComplete)="pdfPreviewLoaded($event)"> +
    + @if (previewNumPages()) { +
    + +
    of {{previewNumPages()}}
    +
    + } +
    + + + +
    +
    } @else { From c657fceea59579638ecb4de2c2dd35cf2e507480 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 02:09:30 +0000 Subject: [PATCH 254/258] Auto translate strings --- src-ui/messages.xlf | 543 +++++++++++++++++++++++--------------------- 1 file changed, 288 insertions(+), 255 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 386cbaad7..cae6bf712 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -300,15 +300,15 @@ src/app/components/app-frame/app-frame.component.html - 91 + 99 src/app/components/app-frame/app-frame.component.html - 93 + 101 src/app/components/app-frame/app-frame.component.html - 96 + 104 src/app/components/dashboard/dashboard.component.html @@ -331,11 +331,11 @@ src/app/components/app-frame/app-frame.component.html - 103 + 111 src/app/components/app-frame/app-frame.component.html - 105 + 113 src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html @@ -382,15 +382,15 @@ src/app/components/app-frame/app-frame.component.html - 58 + 63 src/app/components/app-frame/app-frame.component.html - 306 + 314 src/app/components/app-frame/app-frame.component.html - 308 + 316 @@ -698,7 +698,7 @@ src/app/components/document-detail/document-detail.component.html - 463,464 + 441,442 src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.html @@ -763,11 +763,11 @@ src/app/components/app-frame/app-frame.component.html - 343 + 351 src/app/components/app-frame/app-frame.component.html - 345 + 353 @@ -870,7 +870,7 @@ src/app/components/document-detail/document-detail.component.html - 482 + 460 src/app/components/document-list/document-list.component.html @@ -1185,15 +1185,15 @@ src/app/components/app-frame/app-frame.component.html - 245 + 253 src/app/components/app-frame/app-frame.component.html - 247 + 255 src/app/components/app-frame/app-frame.component.html - 250 + 258 src/app/components/manage/saved-views/saved-views.component.html @@ -1369,7 +1369,7 @@ src/app/components/document-detail/document-detail.component.html - 82 + 61 src/app/components/document-detail/document-detail.component.ts @@ -1446,12 +1446,12 @@ 51 - src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 2,3 + src/app/components/common/input/permissions/permissions-form/permissions-form.component.ts + 63 src/app/components/document-detail/document-detail.component.html - 408,409 + 386,387 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1515,7 +1515,7 @@ src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 32,33 + 34,35 @@ -1537,27 +1537,27 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 278,279 + 279,280 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 297,298 + 298,299 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 364,365 + 365,366 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 383,384 + 384,385 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 38,39 + 40,41 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 57,58 + 59,60 @@ -1572,27 +1572,27 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 286,287 + 287,288 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 305,306 + 306,307 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 372,373 + 373,374 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 391,392 + 392,393 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 46,47 + 48,49 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 65,66 + 67,68 @@ -1610,15 +1610,15 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 311,312 + 312,313 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 397,398 + 398,399 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 71,72 + 73,74 @@ -1700,7 +1700,7 @@ src/app/components/document-detail/document-detail.component.html - 179 + 145 @@ -1715,7 +1715,7 @@ src/app/components/document-detail/document-detail.component.html - 184 + 150 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1750,7 +1750,7 @@ src/app/components/document-detail/document-detail.component.html - 188 + 154 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1785,7 +1785,7 @@ src/app/components/document-detail/document-detail.component.html - 192 + 158 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -1812,7 +1812,7 @@ src/app/components/app-frame/app-frame.component.html - 216 + 224 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts @@ -1863,7 +1863,7 @@ src/app/components/app-frame/app-frame.component.html - 261 + 269 src/app/components/common/share-links-dialog/share-links-dialog.component.ts @@ -1871,7 +1871,7 @@ src/app/components/document-detail/document-detail.component.html - 99,100 + 78,79 @@ -1882,15 +1882,15 @@ src/app/components/app-frame/app-frame.component.html - 269 + 277 src/app/components/app-frame/app-frame.component.html - 271 + 279 src/app/components/app-frame/app-frame.component.html - 274 + 282 src/app/components/manage/workflows/workflows.component.html @@ -1905,15 +1905,15 @@ src/app/components/app-frame/app-frame.component.html - 280 + 288 src/app/components/app-frame/app-frame.component.html - 282 + 290 src/app/components/app-frame/app-frame.component.html - 285 + 293 @@ -1924,19 +1924,19 @@ src/app/components/app-frame/app-frame.component.html - 66 + 71 src/app/components/app-frame/app-frame.component.html - 351,352 + 359,360 src/app/components/app-frame/app-frame.component.html - 354 + 362 src/app/components/app-frame/app-frame.component.html - 357 + 365 @@ -2006,15 +2006,15 @@ src/app/components/app-frame/app-frame.component.ts - 197 + 199 src/app/components/app-frame/app-frame.component.ts - 315 + 317 src/app/components/app-frame/app-frame.component.ts - 344 + 346 @@ -2025,11 +2025,11 @@ src/app/components/app-frame/app-frame.component.html - 329 + 337 src/app/components/app-frame/app-frame.component.html - 331 + 339 @@ -2375,11 +2375,11 @@ src/app/components/document-detail/document-detail.component.html - 65 + 44 src/app/components/document-detail/document-detail.component.html - 66 + 45 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -2839,11 +2839,11 @@ src/app/components/app-frame/app-frame.component.html - 290 + 298 src/app/components/app-frame/app-frame.component.html - 292 + 300 @@ -2951,7 +2951,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 242,243 + 243,244 src/app/components/common/permissions-select/permissions-select.component.html @@ -2963,11 +2963,11 @@ src/app/components/document-detail/document-detail.component.html - 23 + 2 src/app/components/document-detail/document-detail.component.html - 24,25 + 3,4 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -3200,11 +3200,11 @@ src/app/components/app-frame/app-frame.component.html - 320 + 328 src/app/components/app-frame/app-frame.component.html - 322 + 330 @@ -3278,7 +3278,7 @@ src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 53,54 + 55,56 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html @@ -3516,86 +3516,119 @@ 24,25 + + Upload documents + + src/app/components/app-frame/app-frame.component.html + 36 + + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 6,7 + + + + Upload + + src/app/components/app-frame/app-frame.component.html + 37,38 + + + src/app/components/common/input/file/file.component.html + 15,16 + + + src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.html + 38,39 + + User menu src/app/components/app-frame/app-frame.component.html - 42 + 47 Logged in as src/app/components/app-frame/app-frame.component.html - 50,51 + 55,56 My Profile src/app/components/app-frame/app-frame.component.html - 54 + 59 Logout src/app/components/app-frame/app-frame.component.html - 61 + 66 + + + + Upload Files + + src/app/components/app-frame/app-frame.component.html + 79,81 Saved views src/app/components/app-frame/app-frame.component.html - 113,114 + 121,122 src/app/components/app-frame/app-frame.component.html - 143,144 + 151,152 Open documents src/app/components/app-frame/app-frame.component.html - 152,153 + 160,161 Close all src/app/components/app-frame/app-frame.component.html - 174 + 182 src/app/components/app-frame/app-frame.component.html - 176 + 184 Manage src/app/components/app-frame/app-frame.component.html - 185,186 + 193,194 Attributes src/app/components/app-frame/app-frame.component.html - 193 + 201 src/app/components/app-frame/app-frame.component.html - 195 + 203 Correspondents src/app/components/app-frame/app-frame.component.html - 221 + 229 src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.html @@ -3614,7 +3647,7 @@ Document types src/app/components/app-frame/app-frame.component.html - 226 + 234 src/app/components/manage/document-attributes/document-attributes.component.ts @@ -3625,7 +3658,7 @@ Storage paths src/app/components/app-frame/app-frame.component.html - 231 + 239 src/app/components/manage/document-attributes/document-attributes.component.ts @@ -3636,7 +3669,7 @@ Custom fields src/app/components/app-frame/app-frame.component.html - 236 + 244 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -3655,11 +3688,11 @@ Share links src/app/components/app-frame/app-frame.component.html - 256 + 264 src/app/components/app-frame/app-frame.component.html - 258 + 266 src/app/components/manage/share-links/share-links.component.html @@ -3670,88 +3703,103 @@ Administration src/app/components/app-frame/app-frame.component.html - 300,301 + 308,309 Configuration src/app/components/app-frame/app-frame.component.html - 313 + 321 src/app/components/app-frame/app-frame.component.html - 315 + 323 GitHub src/app/components/app-frame/app-frame.component.html - 364 + 372 is available. src/app/components/app-frame/app-frame.component.html - 374 + 382 Click to view. src/app/components/app-frame/app-frame.component.html - 374 + 382 Paperless-ngx can automatically check for updates src/app/components/app-frame/app-frame.component.html - 378 + 386 How does this work? src/app/components/app-frame/app-frame.component.html - 386 + 394 Update available src/app/components/app-frame/app-frame.component.html - 398 + 406 Configure update checking src/app/components/app-frame/app-frame.component.html - 403 + 411 Sidebar views updated src/app/components/app-frame/app-frame.component.ts - 480 + 482 Error updating sidebar views src/app/components/app-frame/app-frame.component.ts - 483 + 485 An error occurred while saving update checking settings. src/app/components/app-frame/app-frame.component.ts - 504 + 506 + + + + Initiating upload... + + src/app/components/app-frame/app-frame.component.ts + 521 + + + src/app/components/file-drop/file-drop.component.ts + 137 + + + src/app/components/file-drop/file-drop.component.ts + 146 @@ -3788,11 +3836,11 @@ src/app/components/document-detail/document-detail.component.html - 38 + 17 src/app/components/document-detail/document-detail.component.html - 44,45 + 23,24 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -4036,11 +4084,11 @@ src/app/components/document-detail/document-detail.component.html - 94 + 73 src/app/components/document-detail/document-detail.component.html - 95 + 74 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -4333,7 +4381,7 @@ src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 34,35 + 36,37 src/app/components/common/permissions-select/permissions-select.component.html @@ -4465,7 +4513,7 @@ src/app/components/document-detail/document-detail.component.html - 118 + 97 src/app/guards/dirty-saved-view.guard.ts @@ -5270,7 +5318,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 265 + 266 @@ -5288,7 +5336,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 266 + 267 @@ -5539,7 +5587,7 @@ src/app/components/document-detail/document-detail.component.html - 374,375 + 352,353 @@ -5658,7 +5706,7 @@ src/app/components/document-detail/document-detail.component.html - 103,104 + 82,83 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -6010,332 +6058,332 @@ Complete the custom field query configuration. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 225 + 226 Action type src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 258 + 259 Assign title src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 263 + 264 Can include some placeholders, see <a target='_blank' href='https://docs.paperless-ngx.com/usage/#workflows'>documentation</a>. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 263 + 264 Assign tags src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 264 + 265 Assign storage path src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 267 + 268 Assign custom fields src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 268 + 269 Assign owner src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 272 + 273 Assign view permissions src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 274,275 + 275,276 Assign edit permissions src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 293,294 + 294,295 Remove tags src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 320,321 + 321,322 Remove all src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 321 + 322 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 327 + 328 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 333 + 334 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 339 + 340 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 345 + 346 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 352 + 353 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 358 + 359 Remove correspondents src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 326,327 + 327,328 Remove document types src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 332,333 + 333,334 Remove storage paths src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 338,339 + 339,340 Remove custom fields src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 344,345 + 345,346 Remove owners src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 351,352 + 352,353 Remove permissions src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 357,358 + 358,359 View permissions src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 360,361 + 361,362 Edit permissions src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 379,380 + 380,381 Email subject src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 407 + 408 Email body src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 408 + 409 Email recipients src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 409 + 410 Attach document src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 410 + 411 Webhook url src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 418 + 419 Use parameters for webhook body src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 420 + 421 Send webhook payload as JSON src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 421 + 422 Webhook params src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 424 + 425 Webhook body src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 426 + 427 Webhook headers src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 428 + 429 Include document src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 429 + 430 One password per line. The workflow will try them in order until one succeeds. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 437 + 438 Passwords src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 441,442 + 442,443 Passwords are stored in plain text. Use with caution. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 445,446 + 446,447 The document will be moved to the trash at the end of the workflow run. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 454,455 + 455,456 The document will be sent to the configured remote OCR service. May incur costs. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 461,462 + 462,463 The document will be sent to the configured AI service for suggestions. Consider costs and privacy. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 468,469 + 469,470 This action runs in the background, so the suggestions may be applied after the other actions of this workflow have finished. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 469,470 + 470,471 Apply suggestions for src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 472,473 + 473,474 Suggestions for fields that are not selected are discarded. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 477,478 + 478,479 Create missing items src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 487,488 + 488,489 Create suggested tags, correspondents and document types that do not exist yet. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 489,490 + 490,491 Overwrite existing values src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 497,498 + 498,499 Apply suggestions even if the document already has a value. Tags are always added, never replaced. src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html - 499,500 + 500,501 @@ -6453,7 +6501,7 @@ src/app/components/document-detail/document-detail.component.html - 177 + 143 src/app/components/document-list/document-list.component.html @@ -6896,17 +6944,6 @@ 16 - - Upload - - src/app/components/common/input/file/file.component.html - 15,16 - - - src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.html - 38,39 - - Show password @@ -6918,14 +6955,14 @@ Edit Permissions src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 9,10 + 11,12 Owner: src/app/components/common/input/permissions/permissions-form/permissions-form.component.html - 26,27 + 28,29 @@ -7008,6 +7045,13 @@ 20 + + Copy ID + + src/app/components/common/page-header/page-header.component.html + 6 + + Copied! @@ -8340,13 +8384,6 @@ 78 - - Upload documents - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html - 6,7 - - or drop files anywhere @@ -8445,7 +8482,7 @@ src/app/components/document-detail/document-detail.component.html - 5,6 + 483 src/app/components/document-list/document-list.component.html @@ -8464,7 +8501,7 @@ src/app/components/document-detail/document-detail.component.html - 300,301 + 278,279 @@ -8478,32 +8515,11 @@ 40,41 - - of - - src/app/components/document-detail/document-detail.component.html - 7,8 - - - - - - - src/app/components/document-detail/document-detail.component.html - 11,12 - - - - + - - src/app/components/document-detail/document-detail.component.html - 19,20 - - Download options src/app/components/document-detail/document-detail.component.html - 48 + 27 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -8514,14 +8530,14 @@ Download original src/app/components/document-detail/document-detail.component.html - 51,52 + 30,31 Use formatted filename src/app/components/document-detail/document-detail.component.html - 57,58 + 36,37 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -8532,7 +8548,7 @@ Reprocess src/app/components/document-detail/document-detail.component.html - 70,71 + 49,50 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -8543,14 +8559,14 @@ Print src/app/components/document-detail/document-detail.component.html - 74,75 + 53,54 More like this src/app/components/document-detail/document-detail.component.html - 78,79 + 57,58 src/app/components/document-list/document-card-large/document-card-large.component.html @@ -8561,46 +8577,46 @@ Remove Password src/app/components/document-detail/document-detail.component.html - 87 + 66 Previous src/app/components/document-detail/document-detail.component.html - 121 + 100 Next src/app/components/document-detail/document-detail.component.html - 124 + 103 src/main.ts - 477 + 479 Details src/app/components/document-detail/document-detail.component.html - 174,175 + 140,141 Date created src/app/components/document-detail/document-detail.component.html - 181 + 147 Default src/app/components/document-detail/document-detail.component.html - 193 + 159 src/app/components/manage/saved-views/saved-views.component.html @@ -8611,7 +8627,7 @@ Metadata src/app/components/document-detail/document-detail.component.html - 309,310 + 287,288 src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts @@ -8622,154 +8638,182 @@ Date modified src/app/components/document-detail/document-detail.component.html - 316,317 + 294,295 Date added src/app/components/document-detail/document-detail.component.html - 320,321 + 298,299 Media filename src/app/components/document-detail/document-detail.component.html - 324,325 + 302,303 Original filename src/app/components/document-detail/document-detail.component.html - 328,329 + 306,307 Original SHA256 checksum src/app/components/document-detail/document-detail.component.html - 332,333 + 310,311 Original file size src/app/components/document-detail/document-detail.component.html - 336,337 + 314,315 Original mime type src/app/components/document-detail/document-detail.component.html - 340,341 + 318,319 Archive SHA256 checksum src/app/components/document-detail/document-detail.component.html - 345,346 + 323,324 Archive file size src/app/components/document-detail/document-detail.component.html - 351,352 + 329,330 Barcodes src/app/components/document-detail/document-detail.component.html - 360,361 + 338,339 Original document metadata src/app/components/document-detail/document-detail.component.html - 364 + 342 Archived document metadata src/app/components/document-detail/document-detail.component.html - 367 + 345 Notes src/app/components/document-detail/document-detail.component.html - 386,389 + 364,367 History src/app/components/document-detail/document-detail.component.html - 397,398 + 375,376 Duplicates src/app/components/document-detail/document-detail.component.html - 420,423 + 398,401 Duplicate documents detected: src/app/components/document-detail/document-detail.component.html - 425,426 + 403,404 In trash src/app/components/document-detail/document-detail.component.html - 436,437 + 414,415 Save & next src/app/components/document-detail/document-detail.component.html - 465 + 443 Save & close src/app/components/document-detail/document-detail.component.html - 467 + 445 Discard src/app/components/document-detail/document-detail.component.html - 469,470 + 447,448 Document loading... src/app/components/document-detail/document-detail.component.html - 477 + 455 + + + + of + + src/app/components/document-detail/document-detail.component.html + 484,485 + + + + Zoom out + + src/app/components/document-detail/document-detail.component.html + 488 + + + + Zoom + + src/app/components/document-detail/document-detail.component.html + 491 + + + + Zoom in + + src/app/components/document-detail/document-detail.component.html + 498 Enter Password src/app/components/document-detail/document-detail.component.html - 531 + 532 @@ -10563,17 +10607,6 @@ 6,7 - - Initiating upload... - - src/app/components/file-drop/file-drop.component.ts - 137 - - - src/app/components/file-drop/file-drop.component.ts - 146 - - Failed to read dropped items: @@ -13154,28 +13187,28 @@ Connecting... src/app/services/upload-documents.service.ts - 25 + 31 Uploading... src/app/services/upload-documents.service.ts - 38 + 44 Upload complete, waiting... src/app/services/upload-documents.service.ts - 42 + 48 HTTP error: src/app/services/upload-documents.service.ts - 56 + 62 @@ -13298,14 +13331,14 @@ Prev src/main.ts - 476 + 478 End src/main.ts - 478 + 480 From 98fb7c3b63c55d611a7b16a9911ec51a8302673a Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:18:39 -0700 Subject: [PATCH 255/258] Enhancement: notifications improvements (#14500) --- src-ui/src/app/app.component.spec.ts | 24 ++- src-ui/src/app/app.component.ts | 69 ++----- .../admin/config/config.component.ts | 4 +- .../admin/settings/settings.component.html | 4 +- .../admin/settings/settings.component.spec.ts | 2 +- .../admin/settings/settings.component.ts | 21 +- .../admin/trash/trash.component.spec.ts | 5 + .../components/admin/trash/trash.component.ts | 23 ++- .../users-groups.component.spec.ts | 8 +- .../users-groups/users-groups.component.ts | 14 +- .../app-frame/app-frame.component.html | 1 + .../app-frame/app-frame.component.spec.ts | 6 +- .../app-frame/app-frame.component.ts | 6 +- .../global-search.component.spec.ts | 4 +- .../global-search/global-search.component.ts | 4 +- .../toasts-dropdown.component.html | 37 ++-- .../toasts-dropdown.component.scss | 4 + .../toasts-dropdown.component.spec.ts | 71 ++++++- .../toasts-dropdown.component.ts | 47 ++++- .../custom-fields-dropdown.component.spec.ts | 2 +- .../custom-fields-dropdown.component.ts | 4 +- .../user-edit-dialog.component.spec.ts | 2 +- .../user-edit-dialog.component.ts | 2 +- .../email-document-dialog.component.spec.ts | 4 +- .../email-document-dialog.component.ts | 2 +- .../profile-edit-dialog.component.spec.ts | 6 +- .../profile-edit-dialog.component.ts | 10 +- .../common/toast/toast.component.html | 40 ++-- .../common/toast/toast.component.scss | 106 +++++++++- .../common/toast/toast.component.spec.ts | 185 ++++++++++++++++- .../common/toast/toast.component.ts | 75 +++++-- .../common/toasts/toasts.component.html | 2 +- .../common/toasts/toasts.component.spec.ts | 60 +++++- .../common/toasts/toasts.component.ts | 45 +++-- .../upload-status-tray.component.html | 52 +++++ .../upload-status-tray.component.scss | 36 ++++ .../upload-status-tray.component.spec.ts | 186 ++++++++++++++++++ .../upload-status-tray.component.ts | 154 +++++++++++++++ .../dashboard/dashboard.component.spec.ts | 2 +- .../dashboard/dashboard.component.ts | 2 +- .../upload-file-widget.component.html | 54 ----- .../upload-file-widget.component.scss | 42 ---- .../upload-file-widget.component.spec.ts | 104 ---------- .../upload-file-widget.component.ts | 115 +---------- .../document-detail.component.spec.ts | 13 +- .../document-detail.component.ts | 10 +- ...ocument-version-dropdown.component.spec.ts | 7 +- .../document-version-dropdown.component.ts | 2 +- .../bulk-editor/bulk-editor.component.spec.ts | 28 ++- .../bulk-editor/bulk-editor.component.ts | 46 +++-- .../document-list.component.spec.ts | 4 +- .../document-list/document-list.component.ts | 4 +- .../custom-fields.component.spec.ts | 4 +- .../custom-fields/custom-fields.component.ts | 8 +- .../management-list.component.spec.ts | 8 +- .../management-list.component.ts | 10 +- .../manage/mail/mail.component.spec.ts | 14 +- .../components/manage/mail/mail.component.ts | 18 +- .../processed-mail-dialog.component.spec.ts | 2 +- .../processed-mail-dialog.component.ts | 2 +- .../saved-views/saved-views.component.spec.ts | 2 +- .../saved-views/saved-views.component.ts | 6 +- .../share-link-bundle-list.component.spec.ts | 3 +- .../share-link-bundle-list.component.ts | 2 +- .../share-link-list.component.spec.ts | 8 +- .../share-link-list.component.ts | 2 +- .../workflows/workflows.component.spec.ts | 6 +- .../manage/workflows/workflows.component.ts | 6 +- src-ui/src/app/data/ui-settings.ts | 14 -- .../src/app/services/settings.service.spec.ts | 9 +- src-ui/src/app/services/settings.service.ts | 9 +- src-ui/src/app/services/toast.service.spec.ts | 91 ++++++++- src-ui/src/app/services/toast.service.ts | 61 +++++- src-ui/src/app/services/trash.service.spec.ts | 49 +++++ src-ui/src/app/services/trash.service.ts | 34 ++++ src-ui/src/main.ts | 4 + src-ui/src/theme.scss | 30 +-- 77 files changed, 1535 insertions(+), 627 deletions(-) create mode 100644 src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.html create mode 100644 src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.scss create mode 100644 src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts create mode 100644 src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts diff --git a/src-ui/src/app/app.component.spec.ts b/src-ui/src/app/app.component.spec.ts index 721aa37b3..d93534d80 100644 --- a/src-ui/src/app/app.component.spec.ts +++ b/src-ui/src/app/app.component.spec.ts @@ -19,6 +19,7 @@ import { PermissionsGuard } from './guards/permissions.guard' import { HotKeyService } from './services/hot-key.service' import { PermissionsService } from './services/permissions.service' import { SettingsService } from './services/settings.service' +import { TasksService } from './services/tasks.service' import { Toast, ToastService } from './services/toast.service' import { FileStatus, @@ -34,6 +35,7 @@ describe('AppComponent', () => { let toastService: ToastService let router: Router let settingsService: SettingsService + let tasksService: TasksService let hotKeyService: HotKeyService beforeEach(async () => { @@ -60,6 +62,7 @@ describe('AppComponent', () => { websocketStatusService = TestBed.inject(WebsocketStatusService) permissionsService = TestBed.inject(PermissionsService) settingsService = TestBed.inject(SettingsService) + tasksService = TestBed.inject(TasksService) toastService = TestBed.inject(ToastService) router = TestBed.inject(Router) hotKeyService = TestBed.inject(HotKeyService) @@ -117,30 +120,33 @@ describe('AppComponent', () => { expect(toast.action).toBeUndefined() }) - it('should display toast on document added', () => { - jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) + it('should only reload tasks when a document is detected', () => { const toastSpy = jest.spyOn(toastService, 'show') + const reloadSpy = jest.spyOn(tasksService, 'reload') const fileStatusSubject = new Subject() jest .spyOn(websocketStatusService, 'onDocumentDetected') .mockReturnValue(fileStatusSubject) component.ngOnInit() fileStatusSubject.next(new FileStatus()) - expect(toastSpy).toHaveBeenCalled() + expect(reloadSpy).toHaveBeenCalled() + expect(toastSpy).not.toHaveBeenCalled() }) - it('should suppress dashboard notifications if set', () => { + it('should add consumed documents to the bell without a popup', () => { jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) - jest.spyOn(settingsService, 'get').mockReturnValue(true) - jest.spyOn(router, 'url', 'get').mockReturnValue('/dashboard') - const toastSpy = jest.spyOn(toastService, 'show') + const popupSpy = jest.fn() + toastService.showToast.subscribe(popupSpy) + let toasts: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) const fileStatusSubject = new Subject() jest - .spyOn(websocketStatusService, 'onDocumentDetected') + .spyOn(websocketStatusService, 'onDocumentConsumptionFinished') .mockReturnValue(fileStatusSubject) component.ngOnInit() fileStatusSubject.next(new FileStatus()) - expect(toastSpy).not.toHaveBeenCalled() + expect(toasts).toHaveLength(1) + expect(popupSpy).not.toHaveBeenCalled() }) it('should display toast on document failed', () => { diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 6af7edf85..b3a004f28 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -14,7 +14,7 @@ import { } from './services/permissions.service' import { SettingsService } from './services/settings.service' import { TasksService } from './services/tasks.service' -import { ToastService } from './services/toast.service' +import { ToastLevel, ToastService } from './services/toast.service' import { WebsocketStatusService } from './services/websocket-status.service' @Component({ @@ -61,18 +61,6 @@ export class AppComponent implements OnInit, OnDestroy { } } - private showNotification(key) { - if ( - this.router.url == '/dashboard' && - this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD - ) - ) { - return false - } - return this.settings.get(key) - } - ngOnInit(): void { this.websocketStatusService.connect() @@ -80,29 +68,22 @@ export class AppComponent implements OnInit, OnDestroy { .onDocumentConsumptionFinished() .subscribe((status) => { this.tasksService.reload() - if ( - this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS) - ) { - if ( - this.permissionsService.currentUserCan( - PermissionAction.View, - PermissionType.Document - ) - ) { - this.toastService.show({ - content: $localize`Document ${status.filename} was added to Paperless-ngx.`, - delay: 10000, - actionName: $localize`Open document`, - action: () => { - this.router.navigate(['documents', status.documentId]) - }, - }) - } else { - this.toastService.show({ - content: $localize`Document ${status.filename} was added to Paperless-ngx.`, - delay: 10000, - }) - } + if (this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS)) { + const canView = this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.Document + ) + // the upload status tray already shows this, so only keep a record + this.toastService.show({ + content: $localize`Document ${status.filename} was added to Paperless-ngx.`, + delay: 10000, + level: ToastLevel.Success, + silent: true, + actionName: canView ? $localize`Open document` : undefined, + action: canView + ? () => this.router.navigate(['documents', status.documentId]) + : undefined, + }) } }) @@ -110,9 +91,7 @@ export class AppComponent implements OnInit, OnDestroy { .onDocumentConsumptionFailed() .subscribe((status) => { this.tasksService.reload() - if ( - this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED) - ) { + if (this.settings.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED)) { this.toastService.showError( $localize`Could not add ${status.filename}\: ${status.message}` ) @@ -121,18 +100,8 @@ export class AppComponent implements OnInit, OnDestroy { this.newDocumentSubscription = this.websocketStatusService .onDocumentDetected() - .subscribe((status) => { + .subscribe(() => { this.tasksService.reload() - if ( - this.showNotification( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT - ) - ) { - this.toastService.show({ - content: $localize`Document ${status.filename} is being processed by Paperless-ngx.`, - delay: 5000, - }) - } }) this.hotKeyService diff --git a/src-ui/src/app/components/admin/config/config.component.ts b/src-ui/src/app/components/admin/config/config.component.ts index 570eb7d55..6894a50be 100644 --- a/src-ui/src/app/components/admin/config/config.component.ts +++ b/src-ui/src/app/components/admin/config/config.component.ts @@ -190,7 +190,7 @@ export class ConfigComponent this.initialize(config) this.store.next(config) this.settingsService.initializeSettings().subscribe() - this.toastService.showInfo($localize`Configuration updated`) + this.toastService.showSuccess($localize`Configuration updated`) }, error: (e) => { this.loading.set(false) @@ -217,7 +217,7 @@ export class ConfigComponent this.initialize(config) this.store.next(config) this.settingsService.initializeSettings().subscribe() - this.toastService.showInfo($localize`File successfully updated`) + this.toastService.showSuccess($localize`File successfully updated`) }, error: (e) => { this.loading.set(false) diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html index 4ff3e671d..89ea62c3e 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -425,10 +425,8 @@
    - - + -
    diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts index 1389a290d..d64ea2a9b 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts @@ -307,7 +307,7 @@ describe('SettingsComponent', () => { expect(toastErrorSpy).toHaveBeenCalled() expect(storeSpy).toHaveBeenCalled() expect(appearanceSettingsSpy).not.toHaveBeenCalled() - expect(setSpy).toHaveBeenCalledTimes(35) + expect(setSpy).toHaveBeenCalledTimes(33) expect(setSpy).toHaveBeenCalledWith(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [ HideableSidebarItemID.Workflows, ]) diff --git a/src-ui/src/app/components/admin/settings/settings.component.ts b/src-ui/src/app/components/admin/settings/settings.component.ts index 2fe40e540..886e47ad6 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -63,7 +63,7 @@ import { SettingsService, } from 'src/app/services/settings.service' import { SystemStatusService } from 'src/app/services/system-status.service' -import { Toast, ToastService } from 'src/app/services/toast.service' +import { Toast, ToastLevel, ToastService } from 'src/app/services/toast.service' import { locationReload } from 'src/app/utils/navigation' import { CheckComponent } from '../../common/input/check/check.component' import { ColorComponent } from '../../common/input/color/color.component' @@ -190,10 +190,8 @@ export class SettingsComponent searchDbOnly: new FormControl(null), searchLink: new FormControl(null), - notificationsConsumerNewDocument: new FormControl(null), notificationsConsumerSuccess: new FormControl(null), notificationsConsumerFailed: new FormControl(null), - notificationsConsumerSuppressOnDashboard: new FormControl(null), savedViewsWarnOnUnsavedChange: new FormControl(null), sidebarViewsShowCount: new FormControl(null), @@ -371,18 +369,12 @@ export class SettingsComponent updateCheckingEnabled: this.settings.get( SETTINGS_KEYS.UPDATE_CHECKING_ENABLED ), - notificationsConsumerNewDocument: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT - ), notificationsConsumerSuccess: this.settings.get( SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS ), notificationsConsumerFailed: this.settings.get( SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED ), - notificationsConsumerSuppressOnDashboard: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD - ), savedViewsWarnOnUnsavedChange: this.settings.get( SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE ), @@ -571,10 +563,6 @@ export class SettingsComponent SETTINGS_KEYS.DATE_FORMAT, this.settingsForm.value.dateFormat ) - this.settings.set( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, - this.settingsForm.value.notificationsConsumerNewDocument - ) this.settings.set( SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, this.settingsForm.value.notificationsConsumerSuccess @@ -583,10 +571,6 @@ export class SettingsComponent SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED, this.settingsForm.value.notificationsConsumerFailed ) - this.settings.set( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, - this.settingsForm.value.notificationsConsumerSuppressOnDashboard - ) this.settings.set( SETTINGS_KEYS.NOTES_ENABLED, this.settingsForm.value.notesEnabled @@ -664,8 +648,11 @@ export class SettingsComponent let savedToast: Toast = { content: $localize`Settings were saved successfully.`, delay: 5000, + level: ToastLevel.Success, + persistent: false, } if (reloadRequired) { + savedToast.persistent = true savedToast.content = $localize`Settings were saved successfully. Reload is required to apply some changes.` savedToast.actionName = $localize`Reload now` savedToast.action = () => { diff --git a/src-ui/src/app/components/admin/trash/trash.component.spec.ts b/src-ui/src/app/components/admin/trash/trash.component.spec.ts index 7edb7121e..4ad48dd43 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.spec.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.spec.ts @@ -99,11 +99,16 @@ describe('TrashComponent', () => { modal.componentInstance.confirmClicked.next() expect(toastErrorSpy).toHaveBeenCalled() + let toasts + toastService.getToasts().subscribe((allToasts) => { + toasts = [...allToasts] + }) trashSpy.mockReturnValue(of('OK')) component.delete(documentsInTrash[0]) expect(modal).toBeDefined() modal.componentInstance.confirmClicked.next() expect(trashSpy).toHaveBeenCalled() + expect(toasts[0].content).toContain('deleted') }) it('should support empty trash, show error if needed', () => { diff --git a/src-ui/src/app/components/admin/trash/trash.component.ts b/src-ui/src/app/components/admin/trash/trash.component.ts index 2f8fbe841..800a7c084 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.ts @@ -11,7 +11,7 @@ import { takeUntil, tap } from 'rxjs' import { Document } from 'src/app/data/document' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { SettingsService } from 'src/app/services/settings.service' -import { ToastService } from 'src/app/services/toast.service' +import { ToastLevel, ToastService } from 'src/app/services/toast.service' import { TrashService } from 'src/app/services/trash.service' import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' import { PageHeaderComponent } from '../../common/page-header/page-header.component' @@ -87,9 +87,11 @@ export class TrashComponent modal.componentInstance.buttonsEnabled.set(false) this.trashService.emptyTrash([document.id]).subscribe({ next: () => { - this.toastService.showInfo( - $localize`Document "${document.title}" deleted` - ) + this.toastService.show({ + content: $localize`Document "${document.title}" deleted`, + delay: 5000, + level: ToastLevel.Success, + }) modal.close() this.reload() }, @@ -122,7 +124,11 @@ export class TrashComponent .emptyTrash(documents ? Array.from(documents) : null) .subscribe({ next: () => { - this.toastService.showInfo($localize`Document(s) deleted`) + this.toastService.show({ + content: $localize`Document(s) deleted`, + delay: 5000, + level: ToastLevel.Success, + }) this.allToggled.set(false) modal.close() this.reload() @@ -144,6 +150,7 @@ export class TrashComponent this.toastService.show({ content: $localize`Document "${document.title}" restored`, delay: 5000, + level: ToastLevel.Success, actionName: $localize`Open document`, action: () => { this.router.navigate(['documents', document.id]) @@ -165,7 +172,11 @@ export class TrashComponent .restoreDocuments(documents ? Array.from(documents) : null) .subscribe({ next: () => { - this.toastService.showInfo($localize`Document(s) restored`) + this.toastService.show({ + content: $localize`Document(s) restored`, + delay: 5000, + level: ToastLevel.Success, + }) this.allToggled.set(false) this.reload() }, diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts index 0c6dea611..8e2551f15 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts @@ -101,7 +101,7 @@ describe('UsersAndGroupsComponent', () => { component.editUser(users[0]) const editDialog = modal.componentInstance as UserEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') editDialog.failed.emit() expect(toastErrorSpy).toHaveBeenCalled() settingsService.currentUser.set(users[1]) // simulate logged in as different user @@ -120,7 +120,7 @@ describe('UsersAndGroupsComponent', () => { const deleteDialog = modal.componentInstance as ConfirmDialogComponent const deleteSpy = jest.spyOn(userService, 'delete') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const listAllSpy = jest.spyOn(userService, 'listAll') deleteSpy.mockReturnValueOnce( throwError(() => new Error('error deleting user')) @@ -186,7 +186,7 @@ describe('UsersAndGroupsComponent', () => { component.editGroup(groups[0]) const editDialog = modal.componentInstance as GroupEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') editDialog.failed.emit() expect(toastErrorSpy).toHaveBeenCalled() editDialog.succeeded.emit(groups[0]) @@ -204,7 +204,7 @@ describe('UsersAndGroupsComponent', () => { const deleteDialog = modal.componentInstance as ConfirmDialogComponent const deleteSpy = jest.spyOn(groupService, 'delete') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const listAllSpy = jest.spyOn(groupService, 'listAll') deleteSpy.mockReturnValueOnce( throwError(() => new Error('error deleting group')) diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts index 5430b9e2a..406e17398 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts @@ -122,7 +122,7 @@ export class UsersAndGroupsComponent ) }, 2500) } else { - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Saved user "${newUser.username}".` ) this.usersService.listAll().subscribe((r) => { @@ -151,7 +151,9 @@ export class UsersAndGroupsComponent this.usersService.delete(user).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted user "${user.username}"`) + this.toastService.showSuccess( + $localize`Deleted user "${user.username}"` + ) this.usersService.listAll().subscribe((r) => { this.users.set(r.results) }) @@ -178,7 +180,9 @@ export class UsersAndGroupsComponent modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newGroup) => { - this.toastService.showInfo($localize`Saved group "${newGroup.name}".`) + this.toastService.showSuccess( + $localize`Saved group "${newGroup.name}".` + ) this.groupsService.listAll().subscribe((r) => { this.groups.set(r.results) }) @@ -204,7 +208,9 @@ export class UsersAndGroupsComponent this.groupsService.delete(group).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted group "${group.name}"`) + this.toastService.showSuccess( + $localize`Deleted group "${group.name}"` + ) this.groupsService.listAll().subscribe((r) => { this.groups.set(r.results) }) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 78d96ffa6..91fe83222 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -427,5 +427,6 @@ [ngClass]="slimSidebarEnabled ? 'col-slim' : 'col-sidebar-expanded'"> + diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index 404ca6620..60fc6b18f 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -507,7 +507,7 @@ describe('AppFrameComponent', () => { it('should update saved view sorting on drag + drop, show info', () => { const settingsSpy = jest.spyOn(settingsService, 'updateSidebarViewsSort') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true)) component.onDrop({ previousIndex: 0, currentIndex: 1 } as CdkDragDrop< SavedView[] @@ -549,6 +549,7 @@ describe('AppFrameComponent', () => { it('should show toasts for django messages', () => { const toastErrorSpy = jest.spyOn(toastService, 'showError') + const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess') const toastInfoSpy = jest.spyOn(toastService, 'showInfo') jest.spyOn(messagesService, 'get').mockReturnValue([ { level: DjangoMessageLevel.WARNING, message: 'Test warning' }, @@ -559,7 +560,8 @@ describe('AppFrameComponent', () => { ]) component.ngOnInit() expect(toastErrorSpy).toHaveBeenCalledTimes(2) - expect(toastInfoSpy).toHaveBeenCalledTimes(3) + expect(toastSuccessSpy).toHaveBeenCalledTimes(1) + expect(toastInfoSpy).toHaveBeenCalledTimes(2) }) it('should call maybeRefreshDocumentCounts after saved views reload', () => { diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index c18495001..f7fcc37f0 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -55,6 +55,7 @@ import { SwitchComponent } from '../common/input/switch/switch.component' import { BrandMarkComponent } from '../common/logo/brand-mark/brand-mark.component' import { LogoComponent } from '../common/logo/logo.component' import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component' +import { UploadStatusTrayComponent } from '../common/upload-status-tray/upload-status-tray.component' import { DocumentDetailComponent } from '../document-detail/document-detail.component' import { ComponentWithPermissions } from '../with-permissions/with-permissions.component' import { GlobalSearchComponent } from './global-search/global-search.component' @@ -85,6 +86,7 @@ const SCROLL_THRESHOLD = 16 TourNgBootstrap, FormsModule, SwitchComponent, + UploadStatusTrayComponent, ], }) export class AppFrameComponent @@ -173,6 +175,8 @@ export class AppFrameComponent this.toastService.showError(message.message) break case DjangoMessageLevel.SUCCESS: + this.toastService.showSuccess(message.message) + break case DjangoMessageLevel.INFO: case DjangoMessageLevel.DEBUG: this.toastService.showInfo(message.message) @@ -479,7 +483,7 @@ export class AppFrameComponent this.settingsService.updateSidebarViewsSort(sidebarViews).subscribe({ next: () => { - this.toastService.showInfo($localize`Sidebar views updated`) + this.toastService.showSuccess($localize`Sidebar views updated`) }, error: (e) => { this.toastService.showError($localize`Error updating sidebar views`, e) diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts index 9d0655ca4..015984b40 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts @@ -409,7 +409,7 @@ describe('GlobalSearchComponent', () => { const editDialog = modal.componentInstance as CustomFieldEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') // fail first editDialog.failed.emit({ error: 'error creating item' }) @@ -460,7 +460,7 @@ describe('GlobalSearchComponent', () => { const editDialog = modal.componentInstance as CustomFieldEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') // fail first editDialog.failed.emit({ error: 'error creating item' }) diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.ts index 9a70189a6..80f9ce8c2 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.ts +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.ts @@ -216,7 +216,7 @@ export class GlobalSearchComponent implements OnInit { modalRef.componentInstance.dialogMode.set(EditDialogMode.EDIT) modalRef.componentInstance.object = object modalRef.componentInstance.succeeded.subscribe(() => { - this.toastService.showInfo($localize`Successfully updated object.`) + this.toastService.showSuccess($localize`Successfully updated object.`) }) modalRef.componentInstance.failed.subscribe((e) => { this.toastService.showError($localize`Error occurred saving object.`, e) @@ -254,7 +254,7 @@ export class GlobalSearchComponent implements OnInit { modalRef.componentInstance.dialogMode.set(EditDialogMode.EDIT) modalRef.componentInstance.object = object modalRef.componentInstance.succeeded.subscribe(() => { - this.toastService.showInfo($localize`Successfully updated object.`) + this.toastService.showSuccess($localize`Successfully updated object.`) }) modalRef.componentInstance.failed.subscribe((e) => { this.toastService.showError($localize`Error occurred saving object.`, e) diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html index 1840d6453..53b28e15d 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html @@ -1,28 +1,31 @@
  • - @if (toasts().length) { - {{ toasts().length }} + @if (unread().length) { + {{ unread().length }} } -
    -
    • diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss index 71bd9a6ff..132d3f21b 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.scss @@ -30,3 +30,7 @@ right: -3rem; } } + +.clear-all:hover { + color: var(--bs-body-color) !important; +} diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts index 42a891642..bad2fdb6b 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts @@ -3,7 +3,7 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' -import { Toast, ToastService } from 'src/app/services/toast.service' +import { Toast, ToastLevel, ToastService } from 'src/app/services/toast.service' import { ToastsDropdownComponent } from './toasts-dropdown.component' const toasts = [ @@ -90,4 +90,73 @@ describe('ToastsDropdownComponent', () => { component.onOpenChange(true) expect(spy).toHaveBeenCalledWith(true) }) + + it('should badge unread toasts, red when one is an error', () => { + toastsSubject.next([ + { id: 'a', content: 'Read', delay: 5000, read: true }, + { id: 'b', content: 'Unread', delay: 5000, read: false }, + ]) + fixture.detectChanges() + let badge: HTMLElement = fixture.nativeElement.querySelector( + '.notification-count' + ) + expect(badge.textContent.trim()).toEqual('1') + expect(badge.classList).toContain('bg-secondary') + + toastsSubject.next([ + { id: 'c', content: 'Failed', delay: 5000, level: ToastLevel.Error }, + ]) + fixture.detectChanges() + badge = fixture.nativeElement.querySelector('.notification-count') + expect(badge.classList).toContain('bg-danger') + + toastsSubject.next([{ id: 'd', content: 'Seen', delay: 5000, read: true }]) + fixture.detectChanges() + expect( + fixture.nativeElement.querySelector('.notification-count') + ).toBeNull() + }) + + it('should mark all toasts read when opened', () => { + const markSpy = jest.spyOn(toastService, 'markAllRead') + component.onOpenChange(false) + expect(markSpy).not.toHaveBeenCalled() + component.onOpenChange(true) + expect(markSpy).toHaveBeenCalled() + }) + + it('should tick the clock only while open', () => { + jest.useFakeTimers() + component.onOpenChange(true) + const opened = component.now() + jest.advanceTimersByTime(30000) + const ticked = component.now() + expect(ticked).not.toBe(opened) + + component.onOpenChange(false) + jest.advanceTimersByTime(60000) + expect(component.now()).toBe(ticked) + jest.useRealTimers() + }) + + it('should mark toasts that were unread when opened as new', () => { + toastsSubject.next([ + { id: 'a', content: 'Seen', delay: 5000, read: true }, + { id: 'b', content: 'Unseen', delay: 5000, read: false }, + ]) + fixture.detectChanges() + component.onOpenChange(true) + expect([...component.newIds()]).toEqual(['b']) + component.onOpenChange(false) + expect(component.newIds().size).toEqual(0) + }) + + it('should clear the toast and close the menu when an action is used', () => { + const toast = { id: 'a', content: 'Moved', delay: 5000 } + const closeToastSpy = jest.spyOn(toastService, 'closeToast') + const closeSpy = jest.spyOn(component.dropdown, 'close') + component.onActioned(toast) + expect(closeToastSpy).toHaveBeenCalledWith(toast) + expect(closeSpy).toHaveBeenCalled() + }) }) diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts index b0bcafd68..c2b758af4 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts @@ -1,12 +1,20 @@ -import { Component, inject } from '@angular/core' -import { toSignal } from '@angular/core/rxjs-interop' import { + Component, + DestroyRef, + ViewChild, + computed, + inject, + signal, +} from '@angular/core' +import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop' +import { + NgbDropdown, NgbDropdownModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' -import { map } from 'rxjs' -import { Toast, ToastService } from 'src/app/services/toast.service' +import { Subscription, interval, map } from 'rxjs' +import { Toast, ToastLevel, ToastService } from 'src/app/services/toast.service' import { ToastComponent } from '../../common/toast/toast.component' @Component({ @@ -22,13 +30,44 @@ import { ToastComponent } from '../../common/toast/toast.component' }) export class ToastsDropdownComponent { toastService = inject(ToastService) + private destroyRef = inject(DestroyRef) + private clock: Subscription + + @ViewChild(NgbDropdown) dropdown: NgbDropdown + + /** Drives the relative timestamps, ticks only while the dropdown is open */ + readonly now = signal(new Date()) + + /** Notifications that were unread when the dropdown was opened */ + readonly newIds = signal(new Set()) readonly toasts = toSignal( this.toastService.getToasts().pipe(map((toasts) => [...toasts])), { initialValue: [] as Toast[] } ) + readonly unread = computed(() => this.toasts().filter((t) => !t.read)) + + readonly hasUnreadError = computed(() => + this.unread().some((t) => t.level === ToastLevel.Error) + ) + onOpenChange(open: boolean): void { this.toastService.suppressPopupToasts = open + this.clock?.unsubscribe() + this.newIds.set(new Set(open ? this.unread().map((t) => t.id) : [])) + if (open) { + this.toastService.markAllRead() + this.now.set(new Date()) + this.clock = interval(30000) + .pipe(takeUntilDestroyed(this.destroyRef)) + .subscribe(() => this.now.set(new Date())) + } + } + + /** Using an action (Undo, Open document...) clears it and closes the menu */ + onActioned(toast: Toast): void { + this.toastService.closeToast(toast) + this.dropdown?.close() } } diff --git a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts index 3de750ce2..e00a6e0d1 100644 --- a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts @@ -110,7 +110,7 @@ describe('CustomFieldsDropdownComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const getFieldsSpy = jest.spyOn( CustomFieldsDropdownComponent.prototype as any, 'getFields' diff --git a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts index ea68fa4b9..6d920742a 100644 --- a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts +++ b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts @@ -129,7 +129,9 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newField) => { - this.toastService.showInfo($localize`Saved field "${newField.name}".`) + this.toastService.showSuccess( + $localize`Saved field "${newField.name}".` + ) this.customFieldsService.clearCache() this.getFields() this.created.emit(newField) diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts index f63a30657..0769eaaf4 100644 --- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts @@ -151,7 +151,7 @@ describe('UserEditDialogComponent', () => { 'deactivateTotp' ) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') deactivateSpy.mockReturnValueOnce(throwError(() => new Error('error'))) component.deactivateTotp() expect(deactivateSpy).toHaveBeenCalled() diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts index cd9577545..c860d0180 100644 --- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts @@ -132,7 +132,7 @@ export class UserEditDialogComponent next: (result) => { this.totpLoading.set(false) if (result) { - this.toastService.showInfo($localize`Totp deactivated`) + this.toastService.showSuccess($localize`Totp deactivated`) this.object.is_mfa_enabled = false } else { this.toastService.showError($localize`Totp deactivation failed`) diff --git a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts index a9b885e1a..ca078bab6 100644 --- a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts @@ -52,7 +52,7 @@ describe('EmailDocumentDialogComponent', () => { it('should support sending single document via email, showing error if needed', () => { const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastSuccessSpy = jest.spyOn(toastService, 'showInfo') + const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess') component.documentIds.set([1]) component.emailAddress = 'hello@paperless-ngx.com' component.emailSubject = 'Hello' @@ -73,7 +73,7 @@ describe('EmailDocumentDialogComponent', () => { it('should support sending multiple documents via email, showing appropriate messages', () => { const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastSuccessSpy = jest.spyOn(toastService, 'showInfo') + const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess') component.documentIds.set([1, 2, 3]) component.emailAddress = 'hello@paperless-ngx.com' component.emailSubject = 'Hello' diff --git a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts index 704a495d8..c97d8be0f 100644 --- a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts +++ b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts @@ -50,7 +50,7 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission this.emailSubject = '' this.emailMessage = '' this.close() - this.toastService.showInfo($localize`Email sent`) + this.toastService.showSuccess($localize`Email sent`) }, error: (e) => { this.loading.set(false) diff --git a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts index be704527b..aaf70737c 100644 --- a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts @@ -100,7 +100,7 @@ describe('ProfileEditDialogComponent', () => { expect(errorSpy).toHaveBeenCalled() updateSpy.mockClear() - const infoSpy = jest.spyOn(toastService, 'showInfo') + const infoSpy = jest.spyOn(toastService, 'showSuccess') component.form.patchValue(newProfile) updateSpy.mockReturnValueOnce(of(newProfile)) component.save() @@ -373,7 +373,7 @@ describe('ProfileEditDialogComponent', () => { it('should activate totp', () => { const activateSpy = jest.spyOn(profileService, 'activateTotp') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const error = new Error('failed to activate totp') activateSpy.mockReturnValueOnce(throwError(() => error)) component.totpSettings.set({ @@ -405,7 +405,7 @@ describe('ProfileEditDialogComponent', () => { it('should deactivate totp', () => { const deactivateSpy = jest.spyOn(profileService, 'deactivateTotp') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const error = new Error('failed to deactivate totp') deactivateSpy.mockReturnValueOnce(throwError(() => error)) component.deactivateTotp() diff --git a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts index 6c9ce6c72..1b1489d28 100644 --- a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts @@ -204,7 +204,7 @@ export class ProfileEditDialogComponent .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe({ next: () => { - this.toastService.showInfo($localize`Profile updated successfully`) + this.toastService.showSuccess($localize`Profile updated successfully`) if (passwordChanged) { this.toastService.showInfo( $localize`Password has been changed, you will be logged out momentarily.` @@ -307,7 +307,9 @@ export class ProfileEditDialogComponent this.recoveryCodes.set(activationResponse.recovery_codes) this.form.get('totp_code').enable() if (activationResponse.success) { - this.toastService.showInfo($localize`TOTP activated successfully`) + this.toastService.showSuccess( + $localize`TOTP activated successfully` + ) } else { this.toastService.showError($localize`Error activating TOTP`) } @@ -331,7 +333,9 @@ export class ProfileEditDialogComponent this.isTotpEnabled.set(!success) this.recoveryCodes.set(null) if (success) { - this.toastService.showInfo($localize`TOTP deactivated successfully`) + this.toastService.showSuccess( + $localize`TOTP deactivated successfully` + ) } else { this.toastService.showError($localize`Error deactivating TOTP`) } diff --git a/src-ui/src/app/components/common/toast/toast.component.html b/src-ui/src/app/components/common/toast/toast.component.html index f241d3cea..a05e64214 100644 --- a/src-ui/src/app/components/common/toast/toast.component.html +++ b/src-ui/src/app/components/common/toast/toast.component.html @@ -1,22 +1,33 @@ @if (autohide) { - - + + }
    - @if (!toast.error) { - + @switch (toast.level) { + @case (ToastLevel.Success) { + + } + @case (ToastLevel.Error) { + + } + @default { + + } } - @if (toast.error) { - - } -
    +

    {{toast.content}}

    @if (toast.error) {
    @@ -48,9 +59,12 @@
    } @if (toast.action) { -

    + }
    + @if (!autohide && toast.timestamp) { + {{relativeTimestamp}} + }
    diff --git a/src-ui/src/app/components/common/toast/toast.component.scss b/src-ui/src/app/components/common/toast/toast.component.scss index 3783445de..47df1a158 100644 --- a/src-ui/src/app/components/common/toast/toast.component.scss +++ b/src-ui/src/app/components/common/toast/toast.component.scss @@ -2,19 +2,105 @@ position: relative; } -::ng-deep .toast.error { - border-color: hsla(350, 79%, 40%, 0.4); // bg-danger +.toast { + --pngx-toast-accent: var(--pngx-toast-info); + background-color: var(--pngx-toast-bg); + color: var(--bs-body-color); + overflow: hidden; + + &.toast-success { + --pngx-toast-accent: var(--pngx-toast-success); + background-color: var(--pngx-toast-success-bg); + border-color: color-mix(in srgb, var(--pngx-toast-success) 30%, transparent); + } + + &.toast-error { + --pngx-toast-accent: var(--pngx-toast-error); + background-color: var(--pngx-toast-error-bg); + border-color: color-mix(in srgb, var(--pngx-toast-error) 35%, transparent); + } } -::ng-deep .toast.error .toast-body { - background-color: hsla(350, 79%, 40%, 0.8); // bg-danger - border-top-left-radius: inherit; - border-top-right-radius: inherit; - border-bottom-left-radius: inherit; - border-bottom-right-radius: inherit; +.toast-icon { + color: var(--pngx-toast-accent); } +.toast-content { + flex: 1 1 auto; + min-width: 0; +} + +.toast .btn-close { + font-size: .6rem; + margin-top: .3rem; + margin-left: .75rem !important; + opacity: .45; +} + +.toast:hover .btn-close { + opacity: .85; +} + +// compact rows in the notifications dropdown +.toast.toast-list-item { + width: 100%; + max-width: none; + background-color: var(--pngx-toast-row-bg); + border: 0; + box-shadow: none; + + &:hover { + background-color: var(--pngx-toast-row-hover-bg); + } + + &.toast-error { + background-color: var(--pngx-toast-error-bg); + } + + ::ng-deep .toast-body { + padding: .625rem .75rem; + } + + .toast-time { + margin-top: .1rem; + } + + // marks notifications that arrived since the dropdown was last opened + &.toast-new .toast-time::before { + content: ''; + display: inline-block; + width: .45rem; + height: .45rem; + margin-right: .4rem; + vertical-align: .05rem; + border-radius: 50%; + background-color: var(--pngx-toast-info); + } +} + +.toast-action { + --bs-btn-padding-y: .1rem; + --bs-btn-padding-x: .6rem; + --bs-btn-font-size: .8rem; + --bs-btn-font-weight: 600; + --bs-btn-color: var(--pngx-toast-accent); + --bs-btn-bg: color-mix(in srgb, var(--pngx-toast-accent) 14%, transparent); + --bs-btn-border-color: transparent; + --bs-btn-hover-color: var(--pngx-toast-accent); + --bs-btn-hover-bg: color-mix(in srgb, var(--pngx-toast-accent) 24%, transparent); + --bs-btn-hover-border-color: transparent; + --bs-btn-active-color: var(--pngx-toast-accent); + --bs-btn-active-bg: color-mix(in srgb, var(--pngx-toast-accent) 30%, transparent); + --bs-btn-active-border-color: transparent; +} + +// countdown thin line .progress { - background-color: var(--pngx-primary); - opacity: .07; + height: 2px; + background-color: transparent; + + ::ng-deep .progress-bar { + background-color: var(--bs-secondary-color); + opacity: .5; + } } diff --git a/src-ui/src/app/components/common/toast/toast.component.spec.ts b/src-ui/src/app/components/common/toast/toast.component.spec.ts index 2d0eb8341..ff73f3038 100644 --- a/src-ui/src/app/components/common/toast/toast.component.spec.ts +++ b/src-ui/src/app/components/common/toast/toast.component.spec.ts @@ -1,7 +1,11 @@ +import { DatePipe } from '@angular/common' +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' +import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { Clipboard } from '@angular/cdk/clipboard' import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { ToastLevel } from 'src/app/services/toast.service' import { ToastComponent } from './toast.component' const toast1 = { @@ -30,6 +34,11 @@ describe('ToastComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ToastComponent, NgxBootstrapIconsModule.pick(allIcons)], + providers: [ + DatePipe, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ], }).compileComponents() fixture = TestBed.createComponent(ToastComponent) @@ -46,11 +55,117 @@ describe('ToastComponent', () => { component.toast = toast2 fixture.detectChanges() component.onShown(toast2) - jest.advanceTimersByTime(5000) - expect(component.toast.delayRemaining).toEqual(0) + jest.advanceTimersByTime(5000 + 150) // ticks every 150ms + expect(component.delayRemaining()).toEqual(0) jest.useRealTimers() }) + it('should start the progress bar full before the countdown begins', () => { + component.toast = { content: 'Info', delay: 3000 } + fixture.detectChanges() + expect(component.delayRemaining()).toEqual(3000) + }) + + it('should hide the toast when the countdown ends', () => { + jest.useFakeTimers() + const toast = { content: 'Info', delay: 3000 } + component.toast = toast + fixture.detectChanges() + const hideSpy = jest.spyOn(component.ngbToast, 'hide') + component.onShown(toast) + jest.advanceTimersByTime(2850) + expect(hideSpy).not.toHaveBeenCalled() + jest.advanceTimersByTime(300) + expect(hideSpy).toHaveBeenCalled() + jest.useRealTimers() + }) + + it('should pause the countdown while hovered', () => { + jest.useFakeTimers() + const toast = { content: 'Info', delay: 3000 } + component.toast = toast + fixture.detectChanges() + const hideSpy = jest.spyOn(component.ngbToast, 'hide') + const el: HTMLElement = fixture.nativeElement.querySelector('ngb-toast') + component.onShown(toast) + jest.advanceTimersByTime(1500) + el.dispatchEvent(new MouseEvent('mouseenter')) + const remaining = component.delayRemaining() + jest.advanceTimersByTime(10000) + expect(component.delayRemaining()).toEqual(remaining) + expect(hideSpy).not.toHaveBeenCalled() + + el.dispatchEvent(new MouseEvent('mouseleave')) + jest.advanceTimersByTime(remaining + 150) + expect(hideSpy).toHaveBeenCalled() + jest.useRealTimers() + }) + + it('should pause the countdown while focus is inside', () => { + jest.useFakeTimers() + const toast = { content: 'Info', delay: 3000 } + component.toast = toast + fixture.detectChanges() + const el: HTMLElement = fixture.nativeElement.querySelector('ngb-toast') + component.onShown(toast) + el.dispatchEvent(new FocusEvent('focusin')) + // mouse leaving doesn't resume while focus is still inside + el.dispatchEvent(new MouseEvent('mouseenter')) + el.dispatchEvent(new MouseEvent('mouseleave')) + jest.advanceTimersByTime(5000) + expect(component.delayRemaining()).toEqual(3000) + el.dispatchEvent(new FocusEvent('focusout')) + jest.advanceTimersByTime(3000) + expect(component.delayRemaining()).toEqual(0) + jest.useRealTimers() + }) + + it('should not count down without autohide', () => { + jest.useFakeTimers() + const toast = { content: 'Info', delay: 3000 } + component.toast = toast + component.autohide = false + fixture.detectChanges() + component.onShown(toast) + jest.advanceTimersByTime(5000) + expect(component.delayRemaining()).toBeNull() + jest.useRealTimers() + }) + + it('should show an icon and colors for each level', () => { + component.toast = { + content: 'Saved', + delay: 5000, + level: ToastLevel.Success, + } + fixture.detectChanges() + const el: HTMLElement = fixture.nativeElement + expect(el.querySelector('i-bs[name="check-circle"]')).not.toBeNull() + expect(el.querySelector('ngb-toast').classList).not.toContain('toast-error') + + fixture = TestBed.createComponent(ToastComponent) + fixture.componentInstance.toast = { + content: 'Failed', + delay: 5000, + level: ToastLevel.Error, + } + fixture.detectChanges() + const errorEl: HTMLElement = fixture.nativeElement + expect( + errorEl.querySelector('i-bs[name="exclamation-triangle"]') + ).not.toBeNull() + expect(errorEl.querySelector('ngb-toast').classList).toContain( + 'toast-error' + ) + + fixture = TestBed.createComponent(ToastComponent) + fixture.componentInstance.toast = { content: 'Started', delay: 5000 } + fixture.detectChanges() + expect( + fixture.nativeElement.querySelector('i-bs[name="info-circle"]') + ).not.toBeNull() + }) + it('should show an error if given with toast', () => { component.toast = toast1 fixture.detectChanges() @@ -88,4 +203,70 @@ describe('ToastComponent', () => { component.getErrorText({ error: new Array(205).join('a') }) ).toContain('...') }) + + it('should emit actioned, not closed, when the action is clicked', () => { + const action = jest.fn() + component.toast = { + content: 'Moved', + delay: 5000, + action, + actionName: 'Undo', + } + fixture.detectChanges() + const closedSpy = jest.spyOn(component.closed, 'emit') + const actionedSpy = jest.spyOn(component.actioned, 'emit') + const button: HTMLButtonElement = [ + ...fixture.nativeElement.querySelectorAll('button'), + ].find((b) => b.textContent.includes('Undo')) + button.click() + expect(actionedSpy).toHaveBeenCalled() + expect(closedSpy).not.toHaveBeenCalled() + expect(action).toHaveBeenCalled() + }) + + it('should show a relative timestamp in the notifications list', () => { + component.toast = { content: 'Saved', delay: 5000, timestamp: new Date() } + component.autohide = false + fixture.detectChanges() + expect(fixture.nativeElement.textContent).toContain('Just now') + }) + + it('should update the relative timestamp as time passes', () => { + jest.useFakeTimers() + jest.setSystemTime(new Date('2026-10-19T12:00:00Z')) + component.toast = { content: 'Saved', delay: 5000, timestamp: new Date() } + component.autohide = false + fixture.componentRef.setInput('now', new Date()) + fixture.detectChanges() + expect(fixture.nativeElement.textContent).toContain('Just now') + + jest.setSystemTime(new Date('2026-10-19T12:03:00Z')) + fixture.componentRef.setInput('now', new Date()) + fixture.detectChanges() + expect(fixture.nativeElement.textContent).toContain('3 minutes ago') + jest.useRealTimers() + }) + + it('should show a compact action link in the notifications list', () => { + const action = jest.fn() + component.toast = { + content: 'Moved', + delay: 5000, + action, + actionName: 'Undo', + timestamp: new Date(), + } + component.autohide = false + fixture.detectChanges() + const link: HTMLButtonElement = + fixture.nativeElement.querySelector('.toast-action') + expect(link.textContent).toContain('Undo') + expect( + fixture.nativeElement.querySelector('.btn-outline-secondary') + ).toBeNull() + const actionedSpy = jest.spyOn(component.actioned, 'emit') + link.click() + expect(actionedSpy).toHaveBeenCalled() + expect(action).toHaveBeenCalled() + }) }) diff --git a/src-ui/src/app/components/common/toast/toast.component.ts b/src-ui/src/app/components/common/toast/toast.component.ts index 7ab75d1ad..61e5eb88c 100644 --- a/src-ui/src/app/components/common/toast/toast.component.ts +++ b/src-ui/src/app/components/common/toast/toast.component.ts @@ -1,20 +1,26 @@ import { Clipboard } from '@angular/cdk/clipboard' -import { DecimalPipe } from '@angular/common' +import { DatePipe, DecimalPipe } from '@angular/common' import { Component, + DestroyRef, EventEmitter, Input, + OnInit, Output, + ViewChild, inject, signal, } from '@angular/core' +import { takeUntilDestroyed } from '@angular/core/rxjs-interop' import { NgbProgressbarModule, + NgbToast, NgbToastModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' -import { interval, take } from 'rxjs' -import { Toast } from 'src/app/services/toast.service' +import { Subscription, interval, takeWhile } from 'rxjs' +import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' +import { Toast, ToastLevel } from 'src/app/services/toast.service' @Component({ selector: 'pngx-toast', @@ -26,32 +32,79 @@ import { Toast } from 'src/app/services/toast.service' ], templateUrl: './toast.component.html', styleUrl: './toast.component.scss', + providers: [DatePipe, CustomDatePipe], }) -export class ToastComponent { +export class ToastComponent implements OnInit { private clipboard = inject(Clipboard) + private customDatePipe = inject(CustomDatePipe) + private destroyRef = inject(DestroyRef) readonly copied = signal(false) + readonly ToastLevel = ToastLevel + readonly delayRemaining = signal(null) + + @ViewChild(NgbToast) ngbToast: NgbToast + + private hovered = false + private focused = false + private countdown: Subscription @Input() toast: Toast @Input() autohide: boolean = true + /** Each new value re-renders the relative timestamp */ + @Input() now: Date + + /** Marks a notification that arrived since the dropdown was last opened */ + @Input() isNew: boolean = false + @Output() hidden: EventEmitter = new EventEmitter() @Output() closed: EventEmitter = new EventEmitter() + /** The toast's action button was clicked */ + @Output() actioned: EventEmitter = new EventEmitter() + + ngOnInit(): void { + if (this.autohide) this.delayRemaining.set(this.toast.delay) + } + + get relativeTimestamp(): string { + return this.customDatePipe.transform(this.toast.timestamp, 'relative') + } + + get paused(): boolean { + return this.hovered || this.focused + } + + setHovered(hovered: boolean) { + this.hovered = hovered + } + + setFocused(focused: boolean) { + this.focused = focused + } + onShown(toast: Toast) { if (!this.autohide) return const refreshInterval = 150 - const delay = toast.delay - 500 // for fade animation + this.delayRemaining.set(toast.delay) - interval(refreshInterval) - .pipe(take(Math.round(delay / refreshInterval))) - .subscribe((count) => { - toast.delayRemaining = Math.max( - 0, - delay - refreshInterval * (count + 1) + this.countdown?.unsubscribe() + this.countdown = interval(refreshInterval) + .pipe( + takeWhile(() => this.delayRemaining() > 0), + takeUntilDestroyed(this.destroyRef) + ) + .subscribe(() => { + if (this.paused) return + this.delayRemaining.update((remaining) => + Math.max(0, remaining - refreshInterval) ) + if (this.delayRemaining() === 0) { + this.ngbToast?.hide() + } }) } diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html index d04c4dc7b..97363aafc 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.html +++ b/src-ui/src/app/components/common/toasts/toasts.component.html @@ -1,3 +1,3 @@ @for (toast of toasts(); track toast.id) { - + } diff --git a/src-ui/src/app/components/common/toasts/toasts.component.spec.ts b/src-ui/src/app/components/common/toasts/toasts.component.spec.ts index 1e7c686dc..be9ca1024 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.spec.ts +++ b/src-ui/src/app/components/common/toasts/toasts.component.spec.ts @@ -1,10 +1,11 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' +import { By } from '@angular/platform-browser' import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' import { Toast, ToastService } from 'src/app/services/toast.service' -import { ToastsComponent } from './toasts.component' +import { MAX_VISIBLE_TOASTS, ToastsComponent } from './toasts.component' const toast = { content: 'Error 2 content', @@ -50,7 +51,7 @@ describe('ToastsComponent', () => { it('should close toast', () => { toastSubject.next(toast) const closeToastSpy = jest.spyOn(toastService, 'closeToast') - component.closeToast() + component.closeToast(toast) expect(component.toasts()).toEqual([]) expect(closeToastSpy).toHaveBeenCalledWith(toast) }) @@ -59,4 +60,59 @@ describe('ToastsComponent', () => { toastSubject.next(toast) expect(component.toasts()).toEqual([toast]) }) + + it('should stack popups newest first, up to the maximum', () => { + const toasts: Toast[] = Array.from( + { length: MAX_VISIBLE_TOASTS + 1 }, + (_, i) => ({ id: `${i}`, content: `Toast ${i}`, delay: 5000 }) + ) + toasts.forEach((t) => toastSubject.next(t)) + expect(component.toasts().map((t) => t.id)).toEqual(['3', '2', '1']) + + // showing a visible toast again moves it to the top without duplicating + toastSubject.next(toasts[1]) + expect(component.toasts().map((t) => t.id)).toEqual(['1', '3', '2']) + }) + + it('should remove a popup when it hides without closing it', () => { + const closeToastSpy = jest.spyOn(toastService, 'closeToast') + const first = { id: 'a', content: 'A', delay: 5000 } + const second = { id: 'b', content: 'B', delay: 5000 } + toastSubject.next(first) + toastSubject.next(second) + component.removePopup(first) + expect(component.toasts()).toEqual([second]) + expect(closeToastSpy).not.toHaveBeenCalled() + }) + + it('should clear popups when toastService emits null', () => { + toastSubject.next(toast) + toastSubject.next(null) + expect(component.toasts()).toEqual([]) + }) + + it('should render one toast component per popup', () => { + toastSubject.next({ id: 'a', content: 'A', delay: 5000 }) + toastSubject.next({ id: 'b', content: 'B', delay: 5000 }) + fixture.detectChanges() + expect(fixture.nativeElement.querySelectorAll('pngx-toast')).toHaveLength(2) + }) + + it('should only hide the popup on close, but clear it on action', () => { + const closeToastSpy = jest.spyOn(toastService, 'closeToast') + const first = { id: 'a', content: 'A', delay: 5000 } + const second = { id: 'b', content: 'B', delay: 5000 } + toastSubject.next(first) + toastSubject.next(second) + fixture.detectChanges() + const popups = fixture.debugElement.queryAll(By.css('pngx-toast')) + + popups[1].triggerEventHandler('closed', first) + expect(closeToastSpy).not.toHaveBeenCalled() + expect(component.toasts()).toEqual([second]) + + popups[0].triggerEventHandler('actioned', second) + expect(closeToastSpy).toHaveBeenCalledWith(second) + expect(component.toasts()).toEqual([]) + }) }) diff --git a/src-ui/src/app/components/common/toasts/toasts.component.ts b/src-ui/src/app/components/common/toasts/toasts.component.ts index ab1f71154..d37b2f681 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.ts +++ b/src-ui/src/app/components/common/toasts/toasts.component.ts @@ -1,14 +1,18 @@ -import { Component, inject } from '@angular/core' -import { toSignal } from '@angular/core/rxjs-interop' +import { Component, inject, signal } from '@angular/core' +import { takeUntilDestroyed } from '@angular/core/rxjs-interop' import { NgbAccordionModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' -import { map, merge, Subject } from 'rxjs' import { Toast, ToastService } from 'src/app/services/toast.service' import { ToastComponent } from '../toast/toast.component' +/** + * Maximum number of popup toasts shown at once + */ +export const MAX_VISIBLE_TOASTS = 3 + @Component({ selector: 'pngx-toasts', templateUrl: './toasts.component.html', @@ -23,18 +27,31 @@ import { ToastComponent } from '../toast/toast.component' export class ToastsComponent { toastService = inject(ToastService) - private readonly closedToast = new Subject() + readonly toasts = signal([]) - readonly toasts = toSignal( - merge( - this.toastService.showToast.pipe(map((toast) => (toast ? [toast] : []))), - this.closedToast.pipe(map(() => [] as Toast[])) - ), - { initialValue: [] as Toast[] } - ) + constructor() { + this.toastService.showToast + .pipe(takeUntilDestroyed()) + .subscribe((toast) => { + if (!toast) { + this.toasts.set([]) + return + } + this.toasts.update((toasts) => + [toast, ...toasts.filter((t) => t.id !== toast.id)].slice( + 0, + MAX_VISIBLE_TOASTS + ) + ) + }) + } - closeToast() { - this.toastService.closeToast(this.toasts()[0]) - this.closedToast.next() + closeToast(toast: Toast) { + this.toastService.closeToast(toast) + this.removePopup(toast) + } + + removePopup(toast: Toast) { + this.toasts.update((toasts) => toasts.filter((t) => t.id !== toast.id)) } } diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.html b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.html new file mode 100644 index 000000000..6cc94b708 --- /dev/null +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.html @@ -0,0 +1,52 @@ +@if (canAddDocuments && getStatus().length > 0) { +
    +
    +
    +
    +
    +

    {{getStatusSummary()}}

    +
    + @if (getStatusCompleted().length > 0) { + + Dismiss completed + + + } + +
    +
    + @if (!collapsed()) { + @for (status of getStatus(); track status) { + + } + } +
    +
    +
    +
    +} + + + +
    {{status.filename}}
    + @if (!isFinished(status) || (isFinished(status) && !status.documentId)) { +

    {{status.message}}

    + } + +
    + @if (isFinished(status)) { +
    + @if (status.documentId) { + + Open document + + + } +
    + } +
    +     +     diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.scss b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.scss new file mode 100644 index 000000000..f79cd6f66 --- /dev/null +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.scss @@ -0,0 +1,36 @@ +:host ::ng-deep i-bs svg { + margin-top: -3px; +} + +.alert-heading { + font-size: 80%; + font-weight: bold; +} + +.btn-open { + line-height: 1; + + i-bs { + margin-top: -1px; + } +} + +.consumer-status-card { + background-color: rgba(var(--bs-body-bg-rgb), .95) !important; +} + +.consumer-status-list { + max-height: 60vh; + z-index: 1030; +} + +.progress { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + height: auto; + mix-blend-mode: soft-light; + pointer-events: none; +} diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts new file mode 100644 index 000000000..3482df1e4 --- /dev/null +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts @@ -0,0 +1,186 @@ +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' +import { provideHttpClientTesting } from '@angular/common/http/testing' +import { ComponentFixture, TestBed } from '@angular/core/testing' +import { By } from '@angular/platform-browser' +import { RouterTestingModule } from '@angular/router/testing' +import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' +import { routes } from 'src/app/app-routing.module' +import { PermissionsGuard } from 'src/app/guards/permissions.guard' +import { PermissionsService } from 'src/app/services/permissions.service' +import { + FileStatus, + FileStatusPhase, + WebsocketStatusService, +} from 'src/app/services/websocket-status.service' +import { UploadStatusTrayComponent } from './upload-status-tray.component' + +const FAILED_STATUSES = [new FileStatus()] +const WORKING_STATUSES = [new FileStatus(), new FileStatus()] +const STARTED_STATUSES = [new FileStatus(), new FileStatus(), new FileStatus()] +const SUCCESS_STATUSES = [ + new FileStatus(), + new FileStatus(), + new FileStatus(), + new FileStatus(), +] +const DEFAULT_STATUSES = [ + new FileStatus(), + new FileStatus(), + new FileStatus(), + new FileStatus(), + new FileStatus(), + new FileStatus(), +] + +describe('UploadStatusTrayComponent', () => { + let component: UploadStatusTrayComponent + let fixture: ComponentFixture + let websocketStatusService: WebsocketStatusService + + beforeEach(async () => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule.withRoutes(routes), + NgxBootstrapIconsModule.pick(allIcons), + UploadStatusTrayComponent, + ], + providers: [ + PermissionsGuard, + { + provide: PermissionsService, + useValue: { + currentUserCan: () => true, + }, + }, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ], + }).compileComponents() + + websocketStatusService = TestBed.inject(WebsocketStatusService) + fixture = TestBed.createComponent(UploadStatusTrayComponent) + component = fixture.componentInstance + + fixture.detectChanges() + }) + + it('should not render without statuses', () => { + expect( + fixture.nativeElement.querySelector('.consumer-status-card') + ).toBeNull() + }) + + it('should render statuses and support collapsing', () => { + const status = new FileStatus() + status.filename = 'invoice.pdf' + status.phase = FileStatusPhase.WORKING + jest + .spyOn(websocketStatusService, 'getConsumerStatus') + .mockReturnValue([status]) + // a mocked return value doesn't mark the zoneless view dirty, so re-create it + fixture = TestBed.createComponent(UploadStatusTrayComponent) + component = fixture.componentInstance + fixture.detectChanges() + const el: HTMLElement = fixture.nativeElement + expect(el.querySelector('.consumer-status-card')).not.toBeNull() + expect(el.textContent).toContain('invoice.pdf') + + component.toggleCollapsed() + fixture.detectChanges() + expect(el.querySelector('.consumer-status-card')).not.toBeNull() + expect(el.textContent).not.toContain('invoice.pdf') + + component.toggleCollapsed() + fixture.detectChanges() + expect(el.textContent).toContain('invoice.pdf') + }) + + it('should expand again once all statuses are dismissed', () => { + const status = websocketStatusService.newFileUpload('invoice.pdf') + fixture.detectChanges() + component.toggleCollapsed() + expect(component.collapsed()).toBe(true) + websocketStatusService.dismiss(status) + fixture.detectChanges() + expect(component.collapsed()).toBe(false) + }) + + it('should generate stats summary', () => { + mockConsumerStatuses(websocketStatusService) + expect(component.getStatusSummary()).toEqual( + 'Processing: 6, Failed: 1, Added: 4' + ) + }) + + it('should report an upload progress summary', () => { + mockConsumerStatuses(websocketStatusService) + expect(component.getTotalUploadProgress()).toEqual(0.75) + }) + + it('should change color by status phase', () => { + const processingStatus = new FileStatus() + processingStatus.phase = FileStatusPhase.WORKING + expect(component.getStatusColor(processingStatus)).toEqual('primary') + processingStatus.phase = FileStatusPhase.UPLOADING + expect(component.getStatusColor(processingStatus)).toEqual('primary') + const failedStatus = new FileStatus() + failedStatus.phase = FileStatusPhase.FAILED + expect(component.getStatusColor(failedStatus)).toEqual('danger') + const successStatus = new FileStatus() + successStatus.phase = FileStatusPhase.SUCCESS + expect(component.getStatusColor(successStatus)).toEqual('success') + }) + + it('should allow dismissing an alert', () => { + const dismissSpy = jest.spyOn(websocketStatusService, 'dismiss') + component.dismiss(new FileStatus()) + expect(dismissSpy).toHaveBeenCalled() + }) + + it('should allow dismissing completed alerts', () => { + jest.useFakeTimers() + mockConsumerStatuses(websocketStatusService) + fixture.detectChanges() + jest + .spyOn(component, 'getStatusCompleted') + .mockImplementation(() => SUCCESS_STATUSES) + const dismissSpy = jest.spyOn(websocketStatusService, 'dismiss') + component.dismissCompleted() + jest.advanceTimersByTime(1000) + fixture.detectChanges() + expect(dismissSpy).toHaveBeenCalledTimes(4) + jest.useRealTimers() + }) +}) + +function mockConsumerStatuses(consumerStatusService) { + const partialUpload1 = new FileStatus() + partialUpload1.currentPhaseProgress = 50 + partialUpload1.currentPhaseMaxProgress = 50 + const partialUpload2 = new FileStatus() + partialUpload2.currentPhaseProgress = 25 + partialUpload2.currentPhaseMaxProgress = 50 + jest + .spyOn(consumerStatusService, 'getConsumerStatus') + .mockImplementation((phase) => { + switch (phase) { + case FileStatusPhase.FAILED: + return FAILED_STATUSES + case FileStatusPhase.WORKING: + return WORKING_STATUSES + case FileStatusPhase.STARTED: + return STARTED_STATUSES + case FileStatusPhase.SUCCESS: + return SUCCESS_STATUSES + case FileStatusPhase.UPLOADING: + return [partialUpload1, partialUpload2] + default: + return DEFAULT_STATUSES + } + }) + jest + .spyOn(consumerStatusService, 'getConsumerStatusNotCompleted') + .mockImplementation(() => { + return DEFAULT_STATUSES + }) +} diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts new file mode 100644 index 000000000..95549c7cf --- /dev/null +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts @@ -0,0 +1,154 @@ +import { NgClass, NgTemplateOutlet } from '@angular/common' +import { Component, effect, inject, signal } from '@angular/core' +import { RouterModule } from '@angular/router' +import { + NgbAlertModule, + NgbProgressbarModule, +} from '@ng-bootstrap/ng-bootstrap' +import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component' +import { SETTINGS_KEYS } from 'src/app/data/ui-settings' +import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' +import { + PermissionAction, + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { SettingsService } from 'src/app/services/settings.service' +import { + FileStatus, + FileStatusPhase, + WebsocketStatusService, +} from 'src/app/services/websocket-status.service' + +/** Floating list of document consumption statuses, shown on every page */ +@Component({ + selector: 'pngx-upload-status-tray', + templateUrl: './upload-status-tray.component.html', + styleUrls: ['./upload-status-tray.component.scss'], + imports: [ + IfPermissionsDirective, + NgClass, + NgTemplateOutlet, + RouterModule, + NgbAlertModule, + NgbProgressbarModule, + NgxBootstrapIconsModule, + ], +}) +export class UploadStatusTrayComponent extends ComponentWithPermissions { + private websocketStatusService = inject(WebsocketStatusService) + private settingsService = inject(SettingsService) + private permissionsService = inject(PermissionsService) + + readonly collapsed = signal(false) + + constructor() { + super() + // start expanded again for the next uploads once everything is dismissed + effect(() => { + if (this.getStatus().length === 0) this.collapsed.set(false) + }) + } + + get canAddDocuments(): boolean { + return this.permissionsService.currentUserCan( + PermissionAction.Add, + PermissionType.Document + ) + } + + getStatus() { + return this.websocketStatusService.getConsumerStatus() + } + + getStatusSummary() { + let strings = [] + let countUploadingAndProcessing = + this.websocketStatusService.getConsumerStatusNotCompleted().length + let countFailed = this.getStatusFailed().length + let countSuccess = this.getStatusSuccess().length + if (countUploadingAndProcessing > 0) { + strings.push($localize`Processing: ${countUploadingAndProcessing}`) + } + if (countFailed > 0) { + strings.push($localize`Failed: ${countFailed}`) + } + if (countSuccess > 0) { + strings.push($localize`Added: ${countSuccess}`) + } + return strings.join( + $localize`:this string is used to separate processing, failed and added on the file upload widget:, ` + ) + } + + getStatusUploading() { + return this.websocketStatusService.getConsumerStatus( + FileStatusPhase.UPLOADING + ) + } + + getStatusFailed() { + return this.websocketStatusService.getConsumerStatus(FileStatusPhase.FAILED) + } + + getStatusSuccess() { + return this.websocketStatusService.getConsumerStatus( + FileStatusPhase.SUCCESS + ) + } + + getStatusCompleted() { + return this.websocketStatusService.getConsumerStatusCompleted() + } + + getTotalUploadProgress() { + let current = 0 + let max = 0 + + this.getStatusUploading().forEach((status) => { + current += status.currentPhaseProgress + max += status.currentPhaseMaxProgress + }) + + return current / Math.max(max, 1) + } + + isFinished(status: FileStatus) { + return ( + status.phase == FileStatusPhase.FAILED || + status.phase == FileStatusPhase.SUCCESS + ) + } + + getStatusColor(status: FileStatus) { + switch (status.phase) { + case FileStatusPhase.UPLOADING: + case FileStatusPhase.STARTED: + case FileStatusPhase.WORKING: + return 'primary' + case FileStatusPhase.FAILED: + return 'danger' + case FileStatusPhase.SUCCESS: + return 'success' + } + } + + toggleCollapsed() { + this.collapsed.update((collapsed) => !collapsed) + } + + dismiss(status: FileStatus) { + this.websocketStatusService.dismiss(status) + } + + dismissCompleted() { + this.getStatusCompleted().forEach((status) => + this.websocketStatusService.dismiss(status) + ) + } + + get slimSidebarEnabled(): boolean { + return this.settingsService.get(SETTINGS_KEYS.SLIM_SIDEBAR) + } +} diff --git a/src-ui/src/app/components/dashboard/dashboard.component.spec.ts b/src-ui/src/app/components/dashboard/dashboard.component.spec.ts index 48bc7353e..77da49c0a 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.spec.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.spec.ts @@ -173,7 +173,7 @@ describe('DashboardComponent', () => { it('should update saved view sorting on drag + drop, show info', () => { const settingsSpy = jest.spyOn(settingsService, 'updateDashboardViewsSort') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true)) component.onDrop({ previousIndex: 0, currentIndex: 1 } as CdkDragDrop< SavedView[] diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index ee0902a0c..5002bf5bf 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -87,7 +87,7 @@ export class DashboardComponent extends ComponentWithPermissions { .updateDashboardViewsSort(this.dashboardViews()) .subscribe({ next: () => { - this.toastService.showInfo($localize`Dashboard updated`) + this.toastService.showSuccess($localize`Dashboard updated`) }, error: (e) => { this.toastService.showError($localize`Error updating dashboard`, e) diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html index 71ac6157f..5121440a6 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html @@ -8,59 +8,5 @@ - @if (getStatus().length > 0) { -
    -
    -
    -
    -
    -
    - @if (getStatus().length > 0) { -

    {{getStatusSummary()}}

    - } - @if (getStatusCompleted().length > 0) { - - Dismiss completed - - - } -
    -
    -
    -
    - @for (status of getStatus(); track status) { -
    - -
    - } -
    -
    -
    -
    -
    -
    - }
    - - - -
    {{status.filename}}
    - @if (!isFinished(status) || (isFinished(status) && !status.documentId)) { -

    {{status.message}}

    - } - -
    - @if (isFinished(status)) { -
    - @if (status.documentId) { - - Open document - - - } -
    - } -
    -     -     diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss index 553719077..faf51eb6c 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss @@ -20,48 +20,6 @@ font-size: 0.75rem; } -.alert-heading { - font-size: 80%; - font-weight: bold; -} - -.alerts-hidden { - .btn { - line-height: 1; - } -} - -.btn-open { - line-height: 1; - - i-bs { - margin-top: -1px; - } -} - -.progress { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - height: auto; - mix-blend-mode: soft-light; - pointer-events: none; -} - ::ng-deep .ngx-file-drop__drop-zone--over { background-color: var(--pngx-primary-faded) !important; } - -.consumer-status-card { - background-color: rgba(var(--bs-body-bg-rgb), .95) !important; -} - -.consumer-status-list { - max-height: calc(100vh - 312px); // e.g. below the upload button, mobile - - @media screen and (min-width: 768px) { - max-height: calc(100vh - 208px); // e.g. below the upload button - } -} diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts index c881149a8..7fe99bb41 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts @@ -9,35 +9,11 @@ import { routes } from 'src/app/app-routing.module' import { PermissionsGuard } from 'src/app/guards/permissions.guard' import { PermissionsService } from 'src/app/services/permissions.service' import { UploadDocumentsService } from 'src/app/services/upload-documents.service' -import { - FileStatus, - FileStatusPhase, - WebsocketStatusService, -} from 'src/app/services/websocket-status.service' import { UploadFileWidgetComponent } from './upload-file-widget.component' -const FAILED_STATUSES = [new FileStatus()] -const WORKING_STATUSES = [new FileStatus(), new FileStatus()] -const STARTED_STATUSES = [new FileStatus(), new FileStatus(), new FileStatus()] -const SUCCESS_STATUSES = [ - new FileStatus(), - new FileStatus(), - new FileStatus(), - new FileStatus(), -] -const DEFAULT_STATUSES = [ - new FileStatus(), - new FileStatus(), - new FileStatus(), - new FileStatus(), - new FileStatus(), - new FileStatus(), -] - describe('UploadFileWidgetComponent', () => { let component: UploadFileWidgetComponent let fixture: ComponentFixture - let websocketStatusService: WebsocketStatusService let uploadDocumentsService: UploadDocumentsService beforeEach(async () => { @@ -61,7 +37,6 @@ describe('UploadFileWidgetComponent', () => { ], }).compileComponents() - websocketStatusService = TestBed.inject(WebsocketStatusService) uploadDocumentsService = TestBed.inject(UploadDocumentsService) fixture = TestBed.createComponent(UploadFileWidgetComponent) component = fixture.componentInstance @@ -91,83 +66,4 @@ describe('UploadFileWidgetComponent', () => { fileInput.nativeElement.dispatchEvent(new Event('change')) expect(uploadSpy).toHaveBeenCalledWith(file) }) - - it('should generate stats summary', () => { - mockConsumerStatuses(websocketStatusService) - expect(component.getStatusSummary()).toEqual( - 'Processing: 6, Failed: 1, Added: 4' - ) - }) - - it('should report an upload progress summary', () => { - mockConsumerStatuses(websocketStatusService) - expect(component.getTotalUploadProgress()).toEqual(0.75) - }) - - it('should change color by status phase', () => { - const processingStatus = new FileStatus() - processingStatus.phase = FileStatusPhase.WORKING - expect(component.getStatusColor(processingStatus)).toEqual('primary') - processingStatus.phase = FileStatusPhase.UPLOADING - expect(component.getStatusColor(processingStatus)).toEqual('primary') - const failedStatus = new FileStatus() - failedStatus.phase = FileStatusPhase.FAILED - expect(component.getStatusColor(failedStatus)).toEqual('danger') - const successStatus = new FileStatus() - successStatus.phase = FileStatusPhase.SUCCESS - expect(component.getStatusColor(successStatus)).toEqual('success') - }) - - it('should allow dismissing an alert', () => { - const dismissSpy = jest.spyOn(websocketStatusService, 'dismiss') - component.dismiss(new FileStatus()) - expect(dismissSpy).toHaveBeenCalled() - }) - - it('should allow dismissing completed alerts', () => { - jest.useFakeTimers() - mockConsumerStatuses(websocketStatusService) - fixture.detectChanges() - jest - .spyOn(component, 'getStatusCompleted') - .mockImplementation(() => SUCCESS_STATUSES) - const dismissSpy = jest.spyOn(websocketStatusService, 'dismiss') - component.dismissCompleted() - jest.advanceTimersByTime(1000) - fixture.detectChanges() - expect(dismissSpy).toHaveBeenCalledTimes(4) - jest.useRealTimers() - }) }) - -function mockConsumerStatuses(consumerStatusService) { - const partialUpload1 = new FileStatus() - partialUpload1.currentPhaseProgress = 50 - partialUpload1.currentPhaseMaxProgress = 50 - const partialUpload2 = new FileStatus() - partialUpload2.currentPhaseProgress = 25 - partialUpload2.currentPhaseMaxProgress = 50 - jest - .spyOn(consumerStatusService, 'getConsumerStatus') - .mockImplementation((phase) => { - switch (phase) { - case FileStatusPhase.FAILED: - return FAILED_STATUSES - case FileStatusPhase.WORKING: - return WORKING_STATUSES - case FileStatusPhase.STARTED: - return STARTED_STATUSES - case FileStatusPhase.SUCCESS: - return SUCCESS_STATUSES - case FileStatusPhase.UPLOADING: - return [partialUpload1, partialUpload2] - default: - return DEFAULT_STATUSES - } - }) - jest - .spyOn(consumerStatusService, 'getConsumerStatusNotCompleted') - .mockImplementation(() => { - return DEFAULT_STATUSES - }) -} diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts index 7d3f402aa..550701edf 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts @@ -1,23 +1,9 @@ -import { NgClass, NgTemplateOutlet } from '@angular/common' -import { Component, QueryList, ViewChildren, inject } from '@angular/core' -import { RouterModule } from '@angular/router' -import { - NgbAlert, - NgbAlertModule, - NgbProgressbarModule, -} from '@ng-bootstrap/ng-bootstrap' +import { Component, inject } from '@angular/core' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component' -import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' -import { SettingsService } from 'src/app/services/settings.service' import { UploadDocumentsService } from 'src/app/services/upload-documents.service' -import { - FileStatus, - FileStatusPhase, - WebsocketStatusService, -} from 'src/app/services/websocket-status.service' import { WidgetFrameComponent } from '../widget-frame/widget-frame.component' @Component({ @@ -27,115 +13,16 @@ import { WidgetFrameComponent } from '../widget-frame/widget-frame.component' imports: [ WidgetFrameComponent, IfPermissionsDirective, - NgClass, - NgTemplateOutlet, - RouterModule, - NgbAlertModule, - NgbProgressbarModule, NgxBootstrapIconsModule, TourNgBootstrap, ], }) export class UploadFileWidgetComponent extends ComponentWithPermissions { - private websocketStatusService = inject(WebsocketStatusService) private uploadDocumentsService = inject(UploadDocumentsService) - settingsService = inject(SettingsService) - - @ViewChildren(NgbAlert) alerts: QueryList - - getStatus() { - return this.websocketStatusService.getConsumerStatus() - } - - getStatusSummary() { - let strings = [] - let countUploadingAndProcessing = - this.websocketStatusService.getConsumerStatusNotCompleted().length - let countFailed = this.getStatusFailed().length - let countSuccess = this.getStatusSuccess().length - if (countUploadingAndProcessing > 0) { - strings.push($localize`Processing: ${countUploadingAndProcessing}`) - } - if (countFailed > 0) { - strings.push($localize`Failed: ${countFailed}`) - } - if (countSuccess > 0) { - strings.push($localize`Added: ${countSuccess}`) - } - return strings.join( - $localize`:this string is used to separate processing, failed and added on the file upload widget:, ` - ) - } - - getStatusUploading() { - return this.websocketStatusService.getConsumerStatus( - FileStatusPhase.UPLOADING - ) - } - - getStatusFailed() { - return this.websocketStatusService.getConsumerStatus(FileStatusPhase.FAILED) - } - - getStatusSuccess() { - return this.websocketStatusService.getConsumerStatus( - FileStatusPhase.SUCCESS - ) - } - - getStatusCompleted() { - return this.websocketStatusService.getConsumerStatusCompleted() - } - - getTotalUploadProgress() { - let current = 0 - let max = 0 - - this.getStatusUploading().forEach((status) => { - current += status.currentPhaseProgress - max += status.currentPhaseMaxProgress - }) - - return current / Math.max(max, 1) - } - - isFinished(status: FileStatus) { - return ( - status.phase == FileStatusPhase.FAILED || - status.phase == FileStatusPhase.SUCCESS - ) - } - - getStatusColor(status: FileStatus) { - switch (status.phase) { - case FileStatusPhase.UPLOADING: - case FileStatusPhase.STARTED: - case FileStatusPhase.WORKING: - return 'primary' - case FileStatusPhase.FAILED: - return 'danger' - case FileStatusPhase.SUCCESS: - return 'success' - } - } - - dismiss(status: FileStatus) { - this.websocketStatusService.dismiss(status) - } - - dismissCompleted() { - this.getStatusCompleted().forEach((status) => - this.websocketStatusService.dismiss(status) - ) - } public onFileSelected(event: Event) { const input = event.target as HTMLInputElement this.uploadDocumentsService.uploadFiles(Array.from(input.files ?? [])) input.value = '' } - - get slimSidebarEnabled(): boolean { - return this.settingsService.get(SETTINGS_KEYS.SLIM_SIDEBAR) - } } diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts index 13bba3f7b..c89c9b89f 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts @@ -60,6 +60,7 @@ import { TagService } from 'src/app/services/rest/tag.service' import { UserService } from 'src/app/services/rest/user.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' +import { TrashService } from 'src/app/services/trash.service' import { WebsocketStatusService } from 'src/app/services/websocket-status.service' import { environment } from 'src/environments/environment' import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component' @@ -137,6 +138,7 @@ describe('DocumentDetailComponent', () => { let openDocumentsService: OpenDocumentsService let modalService: NgbModal let toastService: ToastService + let trashService: TrashService let documentListViewService: DocumentListViewService let settingsService: SettingsService let customFieldsService: CustomFieldsService @@ -285,6 +287,7 @@ describe('DocumentDetailComponent', () => { documentService = TestBed.inject(DocumentService) modalService = TestBed.inject(NgbModal) toastService = TestBed.inject(ToastService) + trashService = TestBed.inject(TrashService) documentListViewService = TestBed.inject(DocumentListViewService) settingsService = TestBed.inject(SettingsService) settingsService.currentUser.set({ id: 1 }) @@ -775,7 +778,7 @@ describe('DocumentDetailComponent', () => { component.title.set('Foo Bar') const closeSpy = jest.spyOn(component, 'close') const patchSpy = jest.spyOn(documentService, 'patch') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') patchSpy.mockImplementation((o) => of(doc)) component.save(true) expect(patchSpy).toHaveBeenCalled() @@ -790,7 +793,7 @@ describe('DocumentDetailComponent', () => { component.title.set('Foo Bar') const closeSpy = jest.spyOn(component, 'close') const patchSpy = jest.spyOn(documentService, 'patch') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') patchSpy.mockImplementation((o) => of(doc)) component.save() expect(patchSpy).toHaveBeenCalled() @@ -836,7 +839,7 @@ describe('DocumentDetailComponent', () => { component.title.set('Foo Bar') const closeSpy = jest.spyOn(component, 'close') const patchSpy = jest.spyOn(documentService, 'patch') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') patchSpy.mockImplementation(() => throwError(() => new Error('failed to save')) ) @@ -957,12 +960,16 @@ describe('DocumentDetailComponent', () => { const modalSpy = jest.spyOn(modalService, 'open') const deleteSpy = jest.spyOn(documentService, 'delete') deleteSpy.mockReturnValue(of(true)) + const notifySpy = jest + .spyOn(trashService, 'notifyMovedToTrash') + .mockImplementation(() => {}) component.delete() expect(modalSpy).toHaveBeenCalled() const modalCloseSpy = jest.spyOn(openModal, 'close') openModal.componentInstance.confirmClicked.next() expect(deleteSpy).toHaveBeenCalled() expect(modalCloseSpy).toHaveBeenCalled() + expect(notifySpy).toHaveBeenCalledWith(expect.any(String), [doc.id]) }) it('should allow retry delete if error', () => { diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 02d461ed6..8b1e7da9d 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -95,6 +95,7 @@ import { TagService } from 'src/app/services/rest/tag.service' import { UserService } from 'src/app/services/rest/user.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' +import { TrashService } from 'src/app/services/trash.service' import { WebsocketStatusService } from 'src/app/services/websocket-status.service' import { getFilenameFromContentDisposition } from 'src/app/utils/http' import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter' @@ -221,6 +222,7 @@ export class DocumentDetailComponent private documentListViewService = inject(DocumentListViewService) private documentTitlePipe = inject(DocumentTitlePipe) private toastService = inject(ToastService) + private trashService = inject(TrashService) private settings = inject(SettingsService) private storagePathService = inject(StoragePathService) private permissionsService = inject(PermissionsService) @@ -1349,7 +1351,7 @@ export class DocumentDetailComponent this.store.next(newValues) this.openDocumentService.setDirty(this.document(), false) this.openDocumentService.save() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Document "${newValues.title}" saved successfully.` ) this.networkActive.set(false) @@ -1377,7 +1379,7 @@ export class DocumentDetailComponent if (!canEdit) { // document was 'given away' this.openDocumentService.setDirty(this.document(), false) - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Document "${this.document().title}" saved successfully.` ) this.close() @@ -1490,6 +1492,10 @@ export class DocumentDetailComponent .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe({ next: () => { + this.trashService.notifyMovedToTrash( + $localize`Moved "${this.document().title}" to the trash`, + [this.document().id] + ) modal.close() this.close() }, diff --git a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts index f0e30197f..15c813c4e 100644 --- a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts @@ -33,7 +33,9 @@ describe('DocumentVersionDropdownComponent', () => { | 'updateVersionLabel' > > - let toastService: jest.Mocked> + let toastService: jest.Mocked< + Pick + > let finished$: Subject<{ taskId: string }> let failed$: Subject<{ taskId: string; message?: string }> let modalService: jest.Mocked> @@ -55,6 +57,7 @@ describe('DocumentVersionDropdownComponent', () => { toastService = { showError: jest.fn(), showInfo: jest.fn(), + showSuccess: jest.fn(), } permissionsService = { currentUserCan: jest.fn().mockReturnValue(true), @@ -416,6 +419,6 @@ describe('DocumentVersionDropdownComponent', () => { expect(selectedEmitSpy).toHaveBeenCalledWith(2) expect(component.newVersionLabel).toEqual('') expect(modal.close).toHaveBeenCalled() - expect(toastService.showInfo).toHaveBeenCalled() + expect(toastService.showSuccess).toHaveBeenCalled() }) }) diff --git a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts index a341cfa16..b408d7d1d 100644 --- a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts +++ b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts @@ -320,7 +320,7 @@ export class DocumentVersionDropdownComponent } this.newVersionLabel = '' modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Existing document added as a version.` ) }, diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts index e8d38c11b..b80c886f9 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -39,6 +39,7 @@ import { TagService } from 'src/app/services/rest/tag.service' import { UserService } from 'src/app/services/rest/user.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' +import { TrashService } from 'src/app/services/trash.service' import { environment } from 'src/environments/environment' import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component' import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' @@ -74,6 +75,7 @@ describe('BulkEditorComponent', () => { let documentListViewService: DocumentListViewService let documentService: DocumentService let toastService: ToastService + let trashService: TrashService let modalService: NgbModal let tagService: TagService let correspondentsService: CorrespondentService @@ -185,6 +187,7 @@ describe('BulkEditorComponent', () => { documentListViewService = TestBed.inject(DocumentListViewService) documentService = TestBed.inject(DocumentService) toastService = TestBed.inject(ToastService) + trashService = TestBed.inject(TrashService) modalService = TestBed.inject(NgbModal) tagService = TestBed.inject(TagService) correspondentsService = TestBed.inject(CorrespondentService) @@ -1164,10 +1167,14 @@ describe('BulkEditorComponent', () => { let req = httpTestingController.expectOne( `${environment.apiBaseUrl}documents/delete/` ) + const notifySpy = jest + .spyOn(trashService, 'notifyMovedToTrash') + .mockImplementation(() => {}) req.flush(true) expect(req.request.body).toEqual({ documents: [3, 4], }) + expect(notifySpy).toHaveBeenCalledWith(expect.any(String), [3, 4]) httpTestingController.match( `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true` ) // list reload @@ -1177,10 +1184,19 @@ describe('BulkEditorComponent', () => { component.showConfirmationDialogs = false fixture.detectChanges() + jest + .spyOn(documentListViewService, 'allSelected', 'get') + .mockReturnValue(true) component.applyDelete() req = httpTestingController.expectOne( `${environment.apiBaseUrl}documents/delete/` ) + req.flush(true) + // ids aren't known when all matching documents are selected, so no undo + expect(notifySpy).toHaveBeenLastCalledWith(expect.any(String), null) + httpTestingController.match( + `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true` + ) // list reload }) it('should not be accessible with insufficient global permissions', () => { @@ -1416,7 +1432,7 @@ describe('BulkEditorComponent', () => { const mergeAsVersionsSpy = jest .spyOn(documentService, 'mergeDocumentsAsVersions') .mockReturnValue(of(true)) - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess') fixture.detectChanges() component.mergeSelectedAsVersions() @@ -1432,7 +1448,9 @@ describe('BulkEditorComponent', () => { `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id` ) expect(documentListViewService.selected.size).toEqual(0) - expect(toastInfoSpy).toHaveBeenCalledWith('Documents merged as versions.') + expect(toastSuccessSpy).toHaveBeenCalledWith( + 'Documents merged as versions.' + ) }) it('should not report success when merging documents as versions fails', () => { @@ -1458,7 +1476,7 @@ describe('BulkEditorComponent', () => { jest .spyOn(documentService, 'mergeDocumentsAsVersions') .mockReturnValue(throwError(() => new Error('failed'))) - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess') const toastErrorSpy = jest.spyOn(toastService, 'showError') fixture.detectChanges() @@ -1467,7 +1485,7 @@ describe('BulkEditorComponent', () => { modal.componentInstance.confirm() expect(toastErrorSpy).toHaveBeenCalled() - expect(toastInfoSpy).not.toHaveBeenCalled() + expect(toastSuccessSpy).not.toHaveBeenCalled() }) it('should support bulk download with archive, originals or both and file formatting', () => { @@ -1846,7 +1864,7 @@ describe('BulkEditorComponent', () => { .spyOn(documentListViewService, 'selected', 'get') .mockReturnValue(new Set([3, 4])) fixture.detectChanges() - const toastServiceShowInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastServiceShowInfoSpy = jest.spyOn(toastService, 'showSuccess') const toastServiceShowErrorSpy = jest.spyOn(toastService, 'showError') const listReloadSpy = jest.spyOn(documentListViewService, 'reload') diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 33181a227..5600c977a 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -20,7 +20,15 @@ import { } from '@ng-bootstrap/ng-bootstrap' import { saveAs } from 'file-saver' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' -import { first, map, Observable, Subject, switchMap, takeUntil } from 'rxjs' +import { + first, + map, + Observable, + Subject, + switchMap, + takeUntil, + tap, +} from 'rxjs' import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' import { CustomField } from 'src/app/data/custom-field' import { MatchingModel } from 'src/app/data/matching-model' @@ -49,6 +57,7 @@ import { StoragePathService } from 'src/app/services/rest/storage-path.service' import { TagService } from 'src/app/services/rest/tag.service' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' +import { TrashService } from 'src/app/services/trash.service' import { flattenTags } from 'src/app/utils/flatten-tags' import { queryParamsFromFilterRules } from 'src/app/utils/query-params' import { MergeAsVersionsConfirmDialogComponent } from '../../common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component' @@ -99,6 +108,7 @@ export class BulkEditorComponent private openDocumentService = inject(OpenDocumentsService) private settings = inject(SettingsService) private toastService = inject(ToastService) + private trashService = inject(TrashService) private storagePathService = inject(StoragePathService) private customFieldService = inject(CustomFieldsService) public readonly permissionService = inject(PermissionsService) @@ -306,7 +316,7 @@ export class BulkEditorComponent next: () => { this.handleOperationSuccess(modal, options.clearSelection ?? false) if (options.successMessage) { - this.toastService.showInfo(options.successMessage) + this.toastService.showSuccess(options.successMessage) } }, error: (error) => this.handleOperationError(modal, error), @@ -884,19 +894,33 @@ export class BulkEditorComponent .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe(() => { modal.componentInstance.buttonsEnabled.set(false) - this.executeDocumentAction( - modal, - this.documentService.deleteDocuments(this.getSelectionQuery()) - ) + this.deleteSelected(modal) }) } else { - this.executeDocumentAction( - null, - this.documentService.deleteDocuments(this.getSelectionQuery()) - ) + this.deleteSelected(null) } } + private deleteSelected(modal: NgbModalRef) { + const documents = this.list.allSelected + ? null + : Array.from(this.list.selected) + const count = this.getSelectionSize() + this.executeDocumentAction( + modal, + this.documentService + .deleteDocuments(this.getSelectionQuery()) + .pipe( + tap(() => + this.trashService.notifyMovedToTrash( + $localize`Moved ${count} document(s) to the trash`, + documents + ) + ) + ) + ) + } + downloadSelected() { this.awaitingDownload.set(true) let downloadFileType: string = @@ -1065,7 +1089,7 @@ export class BulkEditorComponent dialog.selection = this.getSelectionQuery() dialog.selectionCount = this.getSelectionSize() dialog.succeeded.subscribe((result) => { - this.toastService.showInfo($localize`Custom fields updated.`) + this.toastService.showSuccess($localize`Custom fields updated.`) this.list.reload() this.list.reduceSelectionToFilter() this.list.selected.forEach((id) => { diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts index 798abc1c8..202e8f9ac 100644 --- a/src-ui/src/app/components/document-list/document-list.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts @@ -487,7 +487,7 @@ describe('DocumentListComponent', () => { delete modifiedView.name const savedViewServicePatch = jest.spyOn(savedViewService, 'patch') savedViewServicePatch.mockReturnValue(of(modifiedView)) - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') component.saveViewConfig() expect(savedViewServicePatch).toHaveBeenCalledWith(modifiedView) @@ -592,7 +592,7 @@ describe('DocumentListComponent', () => { let openModal: NgbModalRef modalService.activeInstances.subscribe((modal) => (openModal = modal[0])) const modalSpy = jest.spyOn(modalService, 'open') - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') const savedViewServiceCreate = jest.spyOn(savedViewService, 'create') jest .spyOn(savedViewService, 'dashboardViews', 'get') diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 48e4841f3..739a1c8a3 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -418,7 +418,7 @@ export class DocumentListComponent next: (view) => { this.activeSavedView = view this.unmodifiedSavedView = view - this.toastService.showInfo( + this.toastService.showSuccess( $localize`View "${this.list.activeSavedViewTitle}" saved successfully.` ) this.unmodifiedFilterRules.set(this.list.filterRules) @@ -493,7 +493,7 @@ export class DocumentListComponent .subscribe({ next: () => { modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`View "${savedView.name}" created successfully.` ) }, diff --git a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts index 8910b249b..4fbd77be0 100644 --- a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts @@ -107,7 +107,7 @@ describe('CustomFieldsComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reload') component.editField() @@ -131,7 +131,7 @@ describe('CustomFieldsComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reload') const editButton = fixture.debugElement diff --git a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts index 44e02a99c..5d861acef 100644 --- a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts @@ -82,7 +82,9 @@ export class CustomFieldsComponent modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newField) => { - this.toastService.showInfo($localize`Saved field "${newField.name}".`) + this.toastService.showSuccess( + $localize`Saved field "${newField.name}".` + ) this.customFieldsService.clearCache() this.settingsService.initializeDisplayFields() this.documentService.reload() @@ -109,7 +111,9 @@ export class CustomFieldsComponent this.customFieldsService.delete(field).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted field "${field.name}"`) + this.toastService.showSuccess( + $localize`Deleted field "${field.name}"` + ) this.customFieldsService.clearCache() this.settingsService.initializeDisplayFields() this.documentService.reload() diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts index 7f4ff1dc1..4e2d17321 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts @@ -160,7 +160,7 @@ describe('ManagementListComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reloadData') component.openCreateDialog() @@ -183,7 +183,7 @@ describe('ManagementListComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reloadData') component.openEditDialog(tags[0]) @@ -387,7 +387,7 @@ describe('ManagementListComponent', () => { expect(bulkEditPermsSpy).toHaveBeenCalled() expect(errorToastSpy).toHaveBeenCalled() - const successToastSpy = jest.spyOn(toastService, 'showInfo') + const successToastSpy = jest.spyOn(toastService, 'showSuccess') bulkEditPermsSpy.mockReturnValueOnce(of('OK')) modal.componentInstance.confirmClicked.emit({ permissions: {}, @@ -452,7 +452,7 @@ describe('ManagementListComponent', () => { ) expect(errorToastSpy).toHaveBeenCalled() - const successToastSpy = jest.spyOn(toastService, 'showInfo') + const successToastSpy = jest.spyOn(toastService, 'showSuccess') bulkEditSpy.mockReturnValueOnce(of('OK')) modal.componentInstance.confirmClicked.emit(null) expect(bulkEditSpy).toHaveBeenCalled() diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts index 6b58fdd87..dd102668e 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -224,7 +224,7 @@ export abstract class ManagementListComponent activeModal.componentInstance.dialogMode.set(EditDialogMode.CREATE) activeModal.componentInstance.succeeded.subscribe(() => { this.reloadData() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Successfully created ${this.typeName}.` ) }) @@ -244,7 +244,7 @@ export abstract class ManagementListComponent activeModal.componentInstance.dialogMode.set(EditDialogMode.EDIT) activeModal.componentInstance.succeeded.subscribe(() => { this.reloadData() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Successfully updated ${this.typeName} "${object.name}".` ) }) @@ -428,7 +428,7 @@ export abstract class ManagementListComponent .subscribe({ next: () => { modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Permissions updated successfully` ) this.reloadData() @@ -468,7 +468,9 @@ export abstract class ManagementListComponent .subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Objects deleted successfully`) + this.toastService.showSuccess( + $localize`Objects deleted successfully` + ) this.reloadData() }, error: (error) => { diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts index cb2111fcd..b3b3fa119 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts @@ -184,7 +184,7 @@ describe('MailComponent', () => { component.editMailAccount(mailAccounts[0] as MailAccount) let editDialog = modal.componentInstance as MailAccountEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') editDialog.failed.emit() expect(toastErrorSpy).toHaveBeenCalled() editDialog.succeeded.emit(mailAccounts[0] as any) @@ -203,7 +203,7 @@ describe('MailComponent', () => { const deleteDialog = modal.componentInstance as ConfirmDialogComponent const deleteSpy = jest.spyOn(mailAccountService, 'delete') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const listAllSpy = jest.spyOn(mailAccountService, 'listAll') deleteSpy.mockReturnValueOnce( throwError(() => new Error('error deleting mail account')) @@ -242,7 +242,7 @@ describe('MailComponent', () => { component.editMailRule(mailRules[0] as MailRule) const editDialog = modal.componentInstance as MailRuleEditDialogComponent const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') editDialog.failed.emit() expect(toastErrorSpy).toHaveBeenCalled() editDialog.succeeded.emit(mailRules[0] as any) @@ -272,7 +272,7 @@ describe('MailComponent', () => { const deleteDialog = modal.componentInstance as ConfirmDialogComponent const deleteSpy = jest.spyOn(mailRuleService, 'delete') const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const listAllSpy = jest.spyOn(mailRuleService, 'listAll') deleteSpy.mockReturnValueOnce( throwError(() => new Error('error deleting mail rule "rule1"')) @@ -303,7 +303,7 @@ describe('MailComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((refs) => (modal = refs[0])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const rulePatchSpy = jest.spyOn(mailRuleService, 'patch') component.editPermissions(mailRules[0] as MailRule) expect(modal).not.toBeUndefined() @@ -356,7 +356,7 @@ describe('MailComponent', () => { By.css('input[type="checkbox"]') ) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') // fail first patchSpy.mockReturnValueOnce( throwError(() => new Error('Error getting config')) @@ -380,7 +380,7 @@ describe('MailComponent', () => { jest .spyOn(activatedRoute, 'queryParamMap', 'get') .mockReturnValue(of(convertToParamMap(queryParams))) - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') completeSetup() expect(toastInfoSpy).toHaveBeenCalled() }) diff --git a/src-ui/src/app/components/manage/mail/mail.component.ts b/src-ui/src/app/components/manage/mail/mail.component.ts index 2989d1763..483f387de 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.ts @@ -135,7 +135,9 @@ export class MailComponent if (params.get('oauth_success')) { const success = params.get('oauth_success') === '1' if (success) { - this.toastService.showInfo($localize`OAuth2 authentication success`) + this.toastService.showSuccess( + $localize`OAuth2 authentication success` + ) this.oAuthAccountId = parseInt(params.get('account_id')) if (this.mailAccounts().length > 0) { this.editMailAccount( @@ -169,7 +171,7 @@ export class MailComponent modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newMailAccount) => { - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Saved account "${newMailAccount.name}".` ) this.mailAccountService.clearCache() @@ -200,7 +202,7 @@ export class MailComponent this.mailAccountService.delete(account).subscribe({ next: () => { modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Deleted mail account "${account.name}"` ) this.mailAccountService.clearCache() @@ -248,7 +250,9 @@ export class MailComponent modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newMailRule) => { - this.toastService.showInfo($localize`Saved rule "${newMailRule.name}".`) + this.toastService.showSuccess( + $localize`Saved rule "${newMailRule.name}".` + ) this.mailRuleService.clearCache() this.mailRuleService .listAll(null, null, { full_perms: true }) @@ -273,7 +277,7 @@ export class MailComponent onMailRuleEnableToggled(rule: MailRule) { this.mailRuleService.patch(rule).subscribe({ next: () => { - this.toastService.showInfo( + this.toastService.showSuccess( rule.enabled ? $localize`Rule "${rule.name}" enabled.` : $localize`Rule "${rule.name}" disabled.` @@ -302,7 +306,7 @@ export class MailComponent this.mailRuleService.delete(rule).subscribe({ next: () => { modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Deleted mail rule "${rule.name}"` ) this.mailRuleService.clearCache() @@ -338,7 +342,7 @@ export class MailComponent object['set_permissions'] = permissions['set_permissions'] service.patch(object).subscribe({ next: () => { - this.toastService.showInfo($localize`Permissions updated`) + this.toastService.showSuccess($localize`Permissions updated`) modal.close() }, error: (e) => { diff --git a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts index 50f646671..13da4e784 100644 --- a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts @@ -96,7 +96,7 @@ describe('ProcessedMailDialogComponent', () => { // select a couple of mails and delete component.selectedMailIds().add(5) component.selectedMailIds().add(6) - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') component.deleteSelected() const delReq = httpTestingController.expectOne( diff --git a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts index 32db2eb26..867fe3aeb 100644 --- a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts +++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts @@ -67,7 +67,7 @@ export class ProcessedMailDialogComponent implements OnInit { this.processedMailService .bulk_delete(Array.from(this.selectedMailIds())) .subscribe(() => { - this.toastService.showInfo($localize`Processed mail(s) deleted`) + this.toastService.showSuccess($localize`Processed mail(s) deleted`) this.loadProcessedMails() }) } diff --git a/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts b/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts index 05d950366..9c3fb406e 100644 --- a/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts +++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts @@ -227,7 +227,7 @@ describe('SavedViewsComponent', () => { }) it('should support delete saved view', () => { - const toastSpy = jest.spyOn(toastService, 'showInfo') + const toastSpy = jest.spyOn(toastService, 'showSuccess') const deleteSpy = jest.spyOn(savedViewService, 'delete') deleteSpy.mockReturnValue(of(true)) component.deleteSavedView(savedViews[0] as SavedView) diff --git a/src-ui/src/app/components/manage/saved-views/saved-views.component.ts b/src-ui/src/app/components/manage/saved-views/saved-views.component.ts index 0622fc399..c69711b71 100644 --- a/src-ui/src/app/components/manage/saved-views/saved-views.component.ts +++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.ts @@ -183,7 +183,7 @@ export class SavedViewsComponent this.savedViews.update((savedViews) => savedViews.filter((view) => view !== savedView) ) - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Saved view "${savedView.name}" deleted.` ) this.savedViewService.clearCache() @@ -262,7 +262,7 @@ export class SavedViewsComponent saveOperation.subscribe({ next: () => { - this.toastService.showInfo($localize`Views saved successfully.`) + this.toastService.showSuccess($localize`Views saved successfully.`) this.savedViewService.clearCache() this.reloadViews() }, @@ -315,7 +315,7 @@ export class SavedViewsComponent view['set_permissions'] = permissions.set_permissions this.savedViewService.patch(view as SavedView).subscribe({ next: () => { - this.toastService.showInfo($localize`Permissions updated`) + this.toastService.showSuccess($localize`Permissions updated`) modal.close() this.reloadViews() }, diff --git a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts index 085ece5c8..bde7eeb06 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts @@ -22,6 +22,7 @@ class MockShareLinkBundleService { class MockToastService { showInfo = jest.fn() + showSuccess = jest.fn() showError = jest.fn() } @@ -210,7 +211,7 @@ describe('ShareLinkBundleListComponent', () => { component.delete(sampleBundle()) expect(service.delete).toHaveBeenCalled() - expect(toastService.showInfo).toHaveBeenCalledWith( + expect(toastService.showSuccess).toHaveBeenCalledWith( expect.stringContaining('deleted.') ) expect(service.list).toHaveBeenCalledTimes(2) diff --git a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts index 00d04a77e..16f4be567 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts @@ -178,7 +178,7 @@ export class ShareLinkBundleListComponent if (this.bundles().length === 1 && this.page() > 1) { this.page.update((page) => page - 1) } - this.toastService.showInfo($localize`Share link bundle deleted.`) + this.toastService.showSuccess($localize`Share link bundle deleted.`) this.triggerRefresh(false) }, error: (e) => { diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts index 1946b7e78..655fdcb75 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts @@ -15,7 +15,7 @@ describe('ShareLinkListComponent', () => { let fixture: ComponentFixture let service: jest.Mocked> let clipboard: Clipboard - let toastService: jest.Mocked> + let toastService: jest.Mocked> const link = { id: 1, @@ -33,7 +33,7 @@ describe('ShareLinkListComponent', () => { delete: jest.fn().mockReturnValue(of(true)), } toastService = { - showInfo: jest.fn(), + showSuccess: jest.fn(), showError: jest.fn(), } @@ -130,7 +130,7 @@ describe('ShareLinkListComponent', () => { expect(component.copiedID()).toBe(link.id) expect(fixture.nativeElement.querySelector('.badge.show')).not.toBeNull() - expect(toastService.showInfo).not.toHaveBeenCalled() + expect(toastService.showSuccess).not.toHaveBeenCalled() jest.advanceTimersByTime(3000) expect(component.copiedID()).toBeNull() @@ -142,7 +142,7 @@ describe('ShareLinkListComponent', () => { expect(service.delete).toHaveBeenCalledWith(link) expect(service.list).toHaveBeenCalledTimes(2) - expect(toastService.showInfo).toHaveBeenCalled() + expect(toastService.showSuccess).toHaveBeenCalled() }) it('shows an error when loading fails', () => { diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts index 6f30366f4..b13d21701 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts @@ -151,7 +151,7 @@ export class ShareLinkListComponent if (this.links().length === 1 && this.page() > 1) { this.page.update((page) => page - 1) } - this.toastService.showInfo($localize`Share link deleted.`) + this.toastService.showSuccess($localize`Share link deleted.`) this.reload() }, error: (error) => { diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts index c9e5e6ff8..7a64b0b72 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts @@ -128,7 +128,7 @@ describe('WorkflowsComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reload') const createButton = fixture.debugElement.queryAll(By.css('button'))[1] @@ -152,7 +152,7 @@ describe('WorkflowsComponent', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') const reloadSpy = jest.spyOn(component, 'reload') const editButton = fixture.debugElement.queryAll(By.css('button'))[2] @@ -268,7 +268,7 @@ describe('WorkflowsComponent', () => { By.css('input[type="checkbox"]') ) const toastErrorSpy = jest.spyOn(toastService, 'showError') - const toastInfoSpy = jest.spyOn(toastService, 'showInfo') + const toastInfoSpy = jest.spyOn(toastService, 'showSuccess') // fail first patchSpy.mockReturnValueOnce( throwError(() => new Error('Error getting config')) diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.ts b/src-ui/src/app/components/manage/workflows/workflows.component.ts index 7ec0b607c..810519606 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -86,7 +86,7 @@ export class WorkflowsComponent modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe((newWorkflow) => { - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Saved workflow "${newWorkflow.name}".` ) this.workflowService.clearCache() @@ -138,7 +138,7 @@ export class WorkflowsComponent this.workflowService.delete(workflow).subscribe({ next: () => { modal.close() - this.toastService.showInfo( + this.toastService.showSuccess( $localize`Deleted workflow "${workflow.name}".` ) this.workflowService.clearCache() @@ -157,7 +157,7 @@ export class WorkflowsComponent toggleWorkflowEnabled(workflow: Workflow) { this.workflowService.patch(workflow).subscribe({ next: () => { - this.toastService.showInfo( + this.toastService.showSuccess( workflow.enabled ? $localize`Enabled workflow "${workflow.name}"` : $localize`Disabled workflow "${workflow.name}"` diff --git a/src-ui/src/app/data/ui-settings.ts b/src-ui/src/app/data/ui-settings.ts index 32c5242bd..48cf67658 100644 --- a/src-ui/src/app/data/ui-settings.ts +++ b/src-ui/src/app/data/ui-settings.ts @@ -62,14 +62,10 @@ export const SETTINGS_KEYS = { 'general-settings:document-details:pdf-viewer-zoom-setting', DATE_LOCALE: 'general-settings:date-display:date-locale', DATE_FORMAT: 'general-settings:date-display:date-format', - NOTIFICATIONS_CONSUMER_NEW_DOCUMENT: - 'general-settings:notifications:consumer-new-documents', NOTIFICATIONS_CONSUMER_SUCCESS: 'general-settings:notifications:consumer-success', NOTIFICATIONS_CONSUMER_FAILED: 'general-settings:notifications:consumer-failed', - NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD: - 'general-settings:notifications:consumer-suppress-on-dashboard', NOTES_ENABLED: 'general-settings:notes-enabled', AUDITLOG_ENABLED: 'general-settings:auditlog-enabled', SLIM_SIDEBAR: 'general-settings:slim-sidebar', @@ -197,11 +193,6 @@ export const SETTINGS: UiSetting[] = [ type: 'string', default: 'mediumDate', }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, - type: 'boolean', - default: true, - }, { key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, type: 'boolean', @@ -212,11 +203,6 @@ export const SETTINGS: UiSetting[] = [ type: 'boolean', default: true, }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, - type: 'boolean', - default: true, - }, { key: SETTINGS_KEYS.NOTES_ENABLED, type: 'boolean', diff --git a/src-ui/src/app/services/settings.service.spec.ts b/src-ui/src/app/services/settings.service.spec.ts index 010f2f1c7..804d78b17 100644 --- a/src-ui/src/app/services/settings.service.spec.ts +++ b/src-ui/src/app/services/settings.service.spec.ts @@ -167,7 +167,7 @@ describe('SettingsService', () => { expect(settingsService.getLanguage()).toEqual('') expect(settingsService.get(SETTINGS_KEYS.DARK_MODE_ENABLED)).toBeFalsy() expect( - settingsService.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT) + settingsService.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS) ).toBeTruthy() expect(settingsService.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)).toEqual(50) expect(settingsService.get(SETTINGS_KEYS.THEME_COLOR)).toEqual('#9fbf2f') @@ -198,17 +198,14 @@ describe('SettingsService', () => { settingsService.setLanguage('de-de') settingsService.set(SETTINGS_KEYS.DARK_MODE_ENABLED, true) - settingsService.set( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, - false - ) + settingsService.set(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, false) settingsService.set(SETTINGS_KEYS.DOCUMENT_LIST_SIZE, 25) settingsService.set(SETTINGS_KEYS.THEME_COLOR, '#000000') expect(settingsService.getLanguage()).toEqual('de-de') expect(settingsService.get(SETTINGS_KEYS.DARK_MODE_ENABLED)).toBeTruthy() expect( - settingsService.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT) + settingsService.get(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS) ).toBeFalsy() expect(settingsService.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)).toEqual(25) expect(settingsService.get(SETTINGS_KEYS.THEME_COLOR)).toEqual('#000000') diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index ef27e6e55..005c70667 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -679,7 +679,7 @@ export class SettingsService { .subscribe({ next: () => { this.updateAppearanceSettings() - this.toastService.showInfo(successMessage) + this.toastService.showSuccess(successMessage) }, error: (e) => { this.toastService.showError(errorMessage) @@ -741,9 +741,10 @@ export class SettingsService { this.storeSettings() .pipe(first()) .subscribe(() => { - this.toastService.showInfo( - $localize`You can restart the tour from the settings page.` - ) + this.toastService.show({ + content: $localize`You can restart the tour from the settings page.`, + delay: 5000, + }) }) } } diff --git a/src-ui/src/app/services/toast.service.spec.ts b/src-ui/src/app/services/toast.service.spec.ts index ce50b165e..9ddb85620 100644 --- a/src-ui/src/app/services/toast.service.spec.ts +++ b/src-ui/src/app/services/toast.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing' -import { ToastService } from './toast.service' +import { Toast, ToastLevel, ToastService } from './toast.service' describe('ToastService', () => { let toastService: ToastService @@ -68,6 +68,53 @@ describe('ToastService', () => { }) }) + it('keeps showSuccess toasts out of the toast list', () => { + let toasts: Toast[] = [] + const popups: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + toastService.showToast.subscribe((t) => popups.push(t)) + + toastService.showSuccess('Saved') + + expect(popups.map((t) => t.content)).toEqual(['Saved']) + expect(toasts).toHaveLength(0) + }) + + it('keeps showInfo toasts out of the toast list', () => { + let toasts: Toast[] = [] + const popups: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + toastService.showToast.subscribe((t) => popups.push(t)) + + toastService.showInfo('Info toast') + toastService.showError('Error toast') + + expect(popups.map((t) => t.content)).toEqual(['Info toast', 'Error toast']) + expect(toasts.map((t) => t.content)).toEqual(['Error toast']) + }) + + it('adds toasts to the list unless persistent is false', () => { + let toasts: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + + toastService.show({ content: 'kept', delay: 5000 }) + toastService.show({ content: 'kept too', delay: 5000, persistent: true }) + toastService.show({ content: 'popup only', delay: 5000, persistent: false }) + + expect(toasts.map((t) => t.content)).toEqual(['kept too', 'kept']) + }) + + it('still pops up non-persistent toasts while popups are suppressed', () => { + const popups: Toast[] = [] + toastService.suppressPopupToasts = true + toastService.showToast.subscribe((t) => popups.push(t)) + + toastService.show({ content: 'kept', delay: 5000 }) + toastService.showInfo('popup only') + + expect(popups.map((t) => t?.content)).toEqual(['popup only']) + }) + it('removes toast on close', () => { const toast = { title: 'Title', @@ -106,4 +153,46 @@ describe('ToastService', () => { toastService.suppressPopupToasts = true toastService.showInfo('Info toast') }) + + it('sets the level for showSuccess, showInfo and showError', () => { + const shown: Toast[] = [] + toastService.showToast.subscribe((t) => shown.push(t)) + toastService.showSuccess('Saved') + toastService.showInfo('Started') + toastService.showError('Failed') + expect(shown.map((t) => t.level)).toEqual([ + ToastLevel.Success, + undefined, + ToastLevel.Error, + ]) + }) + + it('adds silent toasts to the list without a popup', () => { + let toasts: Toast[] = [] + const popups: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + toastService.showToast.subscribe((t) => popups.push(t)) + + toastService.show({ content: 'Recorded', delay: 5000, silent: true }) + + expect(toasts.map((t) => t.content)).toEqual(['Recorded']) + expect(popups).toHaveLength(0) + }) + + it('timestamps toasts and tracks read state', () => { + let toasts: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + + toastService.showError('Failed') + expect(toasts[0].timestamp).toBeInstanceOf(Date) + expect(toasts[0].read).toBe(false) + + toastService.markAllRead() + expect(toasts[0].read).toBe(true) + + // arriving while the dropdown is open counts as seen + toastService.suppressPopupToasts = true + toastService.showError('Failed again') + expect(toasts[0].read).toBe(true) + }) }) diff --git a/src-ui/src/app/services/toast.service.ts b/src-ui/src/app/services/toast.service.ts index b917bf94b..6d9916143 100644 --- a/src-ui/src/app/services/toast.service.ts +++ b/src-ui/src/app/services/toast.service.ts @@ -2,6 +2,12 @@ import { Injectable } from '@angular/core' import { Subject } from 'rxjs' import { v4 as uuidv4 } from 'uuid' +export enum ToastLevel { + Info = 'info', + Success = 'success', + Error = 'error', +} + export interface Toast { id?: string @@ -9,15 +15,32 @@ export interface Toast { delay: number - delayRemaining?: number - action?: any actionName?: string - classname?: string + /** Defaults to ToastLevel.Info */ + level?: ToastLevel error?: any + + /** + * Whether the toast is kept in the notifications dropdown after its popup + * closes. Defaults to true. + */ + persistent?: boolean + + /** + * Adds the toast to the notifications dropdown without a popup, e.g. when + * the same information is already on screen. Defaults to false. + */ + silent?: boolean + + /** When the toast was shown, set automatically */ + timestamp?: Date + + /** Whether the toast has been seen in the notifications dropdown */ + read?: boolean } @Injectable({ @@ -42,29 +65,51 @@ export class ToastService { if (!toast.id) { toast.id = uuidv4() } + toast.timestamp ??= new Date() if (typeof toast.error === 'string') { try { toast.error = JSON.parse(toast.error) } catch (e) {} } - this.toasts.unshift(toast) - if (!this._suppressPopupToasts) { + const persistent = toast.persistent !== false + if (persistent) { + // the dropdown is open, so it's seen as it arrives + toast.read = !!this._suppressPopupToasts + this.toasts.unshift(toast) + this.toastsSubject.next(this.toasts) + } + // Popups are suppressed while the dropdown is open + if (!toast.silent && (!this._suppressPopupToasts || !persistent)) { this.showToast.next(toast) } - this.toastsSubject.next(this.toasts) } showError(content: string, error: any = null, delay: number = 10000) { this.show({ content: content, delay: delay, - classname: 'error', + level: ToastLevel.Error, error, }) } showInfo(content: string, delay: number = 5000) { - this.show({ content: content, delay: delay }) + this.show({ content: content, delay: delay, persistent: false }) + } + + /** For confirming that something the user did has completed */ + showSuccess(content: string, delay: number = 5000) { + this.show({ + content: content, + delay: delay, + level: ToastLevel.Success, + persistent: false, + }) + } + + markAllRead() { + this.toasts.forEach((toast) => (toast.read = true)) + this.toastsSubject.next(this.toasts) } closeToast(toast: Toast) { diff --git a/src-ui/src/app/services/trash.service.spec.ts b/src-ui/src/app/services/trash.service.spec.ts index 19126be7d..5cdee2dea 100644 --- a/src-ui/src/app/services/trash.service.spec.ts +++ b/src-ui/src/app/services/trash.service.spec.ts @@ -5,11 +5,15 @@ import { HttpTestingController, } from '@angular/common/http/testing' import { environment } from 'src/environments/environment' +import { DocumentListViewService } from './document-list-view.service' +import { Toast, ToastService } from './toast.service' import { TrashService } from './trash.service' describe('TrashService', () => { let service: TrashService let httpTestingController: HttpTestingController + let toastService: ToastService + let documentListViewService: DocumentListViewService beforeEach(() => { TestBed.configureTestingModule({ @@ -17,6 +21,8 @@ describe('TrashService', () => { }) service = TestBed.inject(TrashService) httpTestingController = TestBed.inject(HttpTestingController) + toastService = TestBed.inject(ToastService) + documentListViewService = TestBed.inject(DocumentListViewService) }) it('should call correct endpoint for getTrash', () => { @@ -56,4 +62,47 @@ describe('TrashService', () => { documents: [1, 2, 3], }) }) + + it('should show a persistent moved to trash toast with undo', () => { + let toasts: Toast[] = [] + toastService.getToasts().subscribe((t) => (toasts = [...t])) + const reloadSpy = jest + .spyOn(documentListViewService, 'reload') + .mockImplementation(() => {}) + + service.notifyMovedToTrash('Moved 2 document(s) to the trash', [1, 2]) + expect(toasts).toHaveLength(1) + expect(toasts[0].actionName).toEqual('Undo') + + toasts[0].action() + const req = httpTestingController.expectOne( + `${environment.apiBaseUrl}trash/` + ) + expect(req.request.body).toEqual({ action: 'restore', documents: [1, 2] }) + req.flush('OK') + expect(reloadSpy).toHaveBeenCalled() + expect(toasts[0].content).toEqual('Document(s) restored') + }) + + it('should show an error if undo fails', () => { + let toast: Toast + toastService.getToasts().subscribe((t) => (toast = t[0])) + const errorSpy = jest.spyOn(toastService, 'showError') + + service.notifyMovedToTrash('Moved "Invoice" to the trash', [1]) + toast.action() + httpTestingController + .expectOne(`${environment.apiBaseUrl}trash/`) + .flush('error', { status: 500, statusText: 'Server Error' }) + expect(errorSpy).toHaveBeenCalled() + }) + + it('should not offer undo without document ids', () => { + let toast: Toast + toastService.getToasts().subscribe((t) => (toast = t[0])) + + service.notifyMovedToTrash('Moved 500 document(s) to the trash') + expect(toast.content).toEqual('Moved 500 document(s) to the trash') + expect(toast.action).toBeUndefined() + }) }) diff --git a/src-ui/src/app/services/trash.service.ts b/src-ui/src/app/services/trash.service.ts index 7d608e518..4db55c658 100644 --- a/src-ui/src/app/services/trash.service.ts +++ b/src-ui/src/app/services/trash.service.ts @@ -4,12 +4,16 @@ import { Observable } from 'rxjs' import { environment } from 'src/environments/environment' import { Document } from '../data/document' import { Results } from '../data/results' +import { DocumentListViewService } from './document-list-view.service' +import { ToastLevel, ToastService } from './toast.service' @Injectable({ providedIn: 'root', }) export class TrashService { private http = inject(HttpClient) + private toastService = inject(ToastService) + private documentListViewService = inject(DocumentListViewService) public getTrash(page: number = 1): Observable> { const httpParams = new HttpParams().set('page', page.toString()) @@ -34,4 +38,34 @@ export class TrashService { documents, }) } + + /** + * Shows a toast with an Undo action when possible + */ + public notifyMovedToTrash(content: string, documents?: number[]) { + const canUndo = documents?.length > 0 + this.toastService.show({ + content, + delay: 10000, + level: ToastLevel.Success, + actionName: canUndo ? $localize`Undo` : undefined, + action: canUndo ? () => this.undoMoveToTrash(documents) : undefined, + }) + } + + private undoMoveToTrash(documents: number[]) { + this.restoreDocuments(documents).subscribe({ + next: () => { + this.toastService.show({ + content: $localize`Document(s) restored`, + delay: 5000, + level: ToastLevel.Success, + }) + this.documentListViewService.reload() + }, + error: (e) => { + this.toastService.showError($localize`Error restoring document(s)`, e) + }, + }) + } } diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts index 329ee4e23..c52f5f4c5 100644 --- a/src-ui/src/main.ts +++ b/src-ui/src/main.ts @@ -69,7 +69,9 @@ import { checkLg, chevronDoubleLeft, chevronDoubleRight, + chevronDown, chevronRight, + chevronUp, circle, clipboard, clipboardCheck, @@ -322,7 +324,9 @@ const icons = { checkLg, chevronDoubleLeft, chevronDoubleRight, + chevronDown, chevronRight, + chevronUp, circle, clipboard, clipboardCheck, diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index f3d75369b..c4854864e 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -26,6 +26,14 @@ --pngx-card-hover-border: var(--bs-tertiary-color); --pngx-focus-alpha: 0.3; --pngx-toast-max-width: 340px; + --pngx-toast-bg: rgba(255, 255, 255, 0.94); + --pngx-toast-success: hsl(var(--pngx-primary), 30%); + --pngx-toast-success-bg: hsl(var(--pngx-primary), 94%); + --pngx-toast-info: hsl(211, 86%, 47%); + --pngx-toast-error: hsl(352, 78%, 45%); + --pngx-toast-error-bg: hsl(352, 80%, 96%); + --pngx-toast-row-bg: #f3f5f4; + --pngx-toast-row-hover-bg: #eaeeec; --bs-info: var(--pngx-bg-alt2); --bs-info-rgb: 233, 236, 239; @media screen and (min-width: 1024px) { @@ -55,10 +63,6 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h --bs-form-check-bg-image: #{$form-check-radio-checked-bg-image-dark}; } } - - .toast .btn-close { - filter: none !important; - } } .primary-dark { @@ -90,6 +94,14 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h color-scheme: dark; --pngx-body-color-accent: #{$text-color-dark-bg-accent}; --pngx-bg-alt: #242529; + --pngx-toast-bg: rgba(36, 40, 43, 0.96); + --pngx-toast-success: hsl(var(--pngx-primary), 60%); + --pngx-toast-success-bg: hsl(var(--pngx-primary), 14%); + --pngx-toast-info: hsl(211, 95%, 68%); + --pngx-toast-error: hsl(352, 90%, 68%); + --pngx-toast-error-bg: hsl(352, 45%, 20%); + --pngx-toast-row-bg: #26282c; + --pngx-toast-row-hover-bg: #2d2f34; --pngx-bg-alt2: #232323; --pngx-bg-darker: #121315; --pngx-bg-disabled: var(--pngx-bg-alt); @@ -302,16 +314,6 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h filter: invert(1) grayscale(100%) brightness(200%); } - .toast { - background-color: hsla(var(--pngx-primary), calc(var(--pngx-primary-lightness) - 15%), 0.9); - } - - .toast, - .toast .btn, - .toast .btn-close { - color: var(--pngx-primary-text-contrast); - } - .dropdown-item { --bs-dropdown-color: var(--bs-body-color); --pngx-bg-darker: var(--pngx-bg-alt); From f8e93a535a48529455346d9ad337528d128c304a Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 02:19:58 +0000 Subject: [PATCH 256/258] Auto translate strings --- src-ui/messages.xlf | 593 ++++++++++++++++++++++---------------------- 1 file changed, 302 insertions(+), 291 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index cae6bf712..1d2938b20 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -240,22 +240,22 @@ Document was added to Paperless-ngx. src/app/app.component.ts - 93 - - - src/app/app.component.ts - 102 + 78 Open document src/app/app.component.ts - 95 + 82 src/app/components/admin/trash/trash.component.ts - 147 + 154 + + + src/app/components/common/upload-status-tray/upload-status-tray.component.html + 44,45 src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -269,30 +269,19 @@ src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html 71 - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html - 58,59 - Could not add : src/app/app.component.ts - 117 - - - - Document is being processed by Paperless-ngx. - - src/app/app.component.ts - 132 + 96 Dashboard src/app/app.component.ts - 139 + 108 src/app/components/admin/settings/settings.component.ts @@ -319,7 +308,7 @@ Documents src/app/app.component.ts - 150 + 119 src/app/components/admin/settings/settings.component.html @@ -374,7 +363,7 @@ Settings src/app/app.component.ts - 162 + 131 src/app/components/admin/settings/settings.component.html @@ -397,49 +386,49 @@ The dashboard can be used to show saved views, such as an 'Inbox'. Views are found under Manage > Saved Views once you have created some. src/app/app.component.ts - 171 + 140 Drag-and-drop documents here to start uploading or place them in the consume folder. You can also drag-and-drop documents anywhere on all other pages of the web app. Once you do, Paperless-ngx will start training its machine learning algorithms. src/app/app.component.ts - 178 + 147 The documents list shows all of your documents and allows for filtering as well as bulk-editing. There are three different view styles: list, small cards and large cards. A list of documents currently opened for editing is shown in the sidebar. src/app/app.component.ts - 183 + 152 The filtering tools allow you to quickly find documents using various searches, dates, tags, etc. src/app/app.component.ts - 190 + 159 Any combination of filters can be saved as a 'view' which can then be displayed on the dashboard and / or sidebar. src/app/app.component.ts - 196 + 165 Attributes like tags, correspondents, document types, storage paths and custom fields can all be managed here. They can also be created from the document edit view. src/app/app.component.ts - 201 + 170 Manage e-mail accounts and rules for automatically importing documents. src/app/app.component.ts - 209 + 178 src/app/components/manage/mail/mail.component.html @@ -450,42 +439,42 @@ Workflows give you more control over the document pipeline. src/app/app.component.ts - 217 + 186 Tasks helps you track background work, what needs attention, and what recently completed. src/app/app.component.ts - 225 + 194 Check out the settings for various tweaks to the web app. src/app/app.component.ts - 233 + 202 Thank you! 🙏 src/app/app.component.ts - 241 + 210 There are <em>tons</em> more features and info we didn't cover here, but this should get you started. Check out the documentation or visit the project on GitHub to learn more or to report issues. src/app/app.component.ts - 243 + 212 Lastly, on behalf of every contributor to this community-supported project, thank you for using Paperless-ngx! src/app/app.component.ts - 245 + 214 @@ -571,7 +560,7 @@ src/app/components/admin/settings/settings.component.html - 441,442 + 439,440 src/app/components/common/confirm-dialog/confirm-dialog.component.ts @@ -650,7 +639,7 @@ src/app/components/admin/settings/settings.component.html - 442,443 + 440,441 src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -1373,7 +1362,7 @@ src/app/components/document-detail/document-detail.component.ts - 1907 + 1913 @@ -1643,39 +1632,25 @@ 424,426 - - Show notifications when new documents are detected + + Add notifications when document processing completes successfully src/app/components/admin/settings/settings.component.html 428 - - Show notifications when document processing completes successfully + + These are added to the notifications menu without a popup, processing progress is shown at the bottom of the screen. src/app/components/admin/settings/settings.component.html - 429 + 428 Show notifications when document processing fails src/app/components/admin/settings/settings.component.html - 430 - - - - Suppress notifications on dashboard - - src/app/components/admin/settings/settings.component.html - 431 - - - - This will suppress all messages about document processing status on the dashboard. - - src/app/components/admin/settings/settings.component.html - 431 + 429 @@ -1943,7 +1918,7 @@ Error retrieving users src/app/components/admin/settings/settings.component.ts - 287 + 285 src/app/components/admin/users-groups/users-groups.component.ts @@ -1962,7 +1937,7 @@ Error retrieving groups src/app/components/admin/settings/settings.component.ts - 306 + 304 src/app/components/admin/users-groups/users-groups.component.ts @@ -1981,40 +1956,40 @@ Settings were saved successfully. src/app/components/admin/settings/settings.component.ts - 665 + 649 Settings were saved successfully. Reload is required to apply some changes. src/app/components/admin/settings/settings.component.ts - 669 + 656 Reload now src/app/components/admin/settings/settings.component.ts - 670 + 657 An error occurred while saving settings. src/app/components/admin/settings/settings.component.ts - 680 + 667 src/app/components/app-frame/app-frame.component.ts - 199 + 203 src/app/components/app-frame/app-frame.component.ts - 317 + 321 src/app/components/app-frame/app-frame.component.ts - 346 + 350 @@ -2496,7 +2471,7 @@ src/app/components/document-detail/document-detail.component.ts - 713 + 715 src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.html @@ -2923,7 +2898,7 @@ src/app/components/admin/trash/trash.component.ts - 117 + 119 src/app/components/admin/users-groups/users-groups.component.html @@ -3065,7 +3040,7 @@ src/app/components/admin/trash/trash.component.ts - 111 + 113 src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -3091,7 +3066,7 @@ src/app/components/admin/trash/trash.component.ts - 115 + 117 src/app/components/admin/users-groups/users-groups.component.ts @@ -3099,11 +3074,11 @@ src/app/components/admin/users-groups/users-groups.component.ts - 199 + 203 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 104 + 106 src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -3111,11 +3086,11 @@ src/app/components/manage/mail/mail.component.ts - 195 + 197 src/app/components/manage/mail/mail.component.ts - 297 + 301 src/app/components/manage/workflows/workflows.component.ts @@ -3133,63 +3108,71 @@ Error deleting document "" src/app/components/admin/trash/trash.component.ts - 98 + 100 This operation will permanently delete the selected documents. src/app/components/admin/trash/trash.component.ts - 113 + 115 This operation will permanently delete all documents in the trash. src/app/components/admin/trash/trash.component.ts - 114 + 116 Document(s) deleted src/app/components/admin/trash/trash.component.ts - 125 + 128 Error deleting document(s) src/app/components/admin/trash/trash.component.ts - 132 + 138 Document "" restored src/app/components/admin/trash/trash.component.ts - 145 + 151 Error restoring document "" src/app/components/admin/trash/trash.component.ts - 156 + 163 Document(s) restored src/app/components/admin/trash/trash.component.ts - 168 + 176 + + + src/app/services/trash.service.ts + 60 Error restoring document(s) src/app/components/admin/trash/trash.component.ts - 174 + 185 + + + src/app/services/trash.service.ts + 67 @@ -3406,35 +3389,35 @@ src/app/components/admin/users-groups/users-groups.component.ts - 201 + 205 src/app/components/document-detail/document-detail.component.ts - 1521 + 1527 src/app/components/document-detail/document-detail.component.ts - 1908 + 1914 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 930 + 954 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 969 + 993 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 992 + 1016 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1028 + 1052 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 106 + 108 src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -3442,11 +3425,11 @@ src/app/components/manage/mail/mail.component.ts - 197 + 199 src/app/components/manage/mail/mail.component.ts - 299 + 303 src/app/components/manage/workflows/workflows.component.ts @@ -3457,56 +3440,56 @@ Deleted user "" src/app/components/admin/users-groups/users-groups.component.ts - 154 + 155 Error deleting user "". src/app/components/admin/users-groups/users-groups.component.ts - 161 + 163 Saved group "". src/app/components/admin/users-groups/users-groups.component.ts - 181 + 184 Error saving group. src/app/components/admin/users-groups/users-groups.component.ts - 189 + 193 Confirm delete user group src/app/components/admin/users-groups/users-groups.component.ts - 197 + 201 This operation will permanently delete this user group. src/app/components/admin/users-groups/users-groups.component.ts - 198 + 202 Deleted group "" src/app/components/admin/users-groups/users-groups.component.ts - 207 + 212 Error deleting group "". src/app/components/admin/users-groups/users-groups.component.ts - 214 + 220 @@ -3770,28 +3753,28 @@ Sidebar views updated src/app/components/app-frame/app-frame.component.ts - 482 + 486 Error updating sidebar views src/app/components/app-frame/app-frame.component.ts - 485 + 489 An error occurred while saving update checking settings. src/app/components/app-frame/app-frame.component.ts - 506 + 510 Initiating upload... src/app/components/app-frame/app-frame.component.ts - 521 + 525 src/app/components/file-drop/file-drop.component.ts @@ -3980,14 +3963,14 @@ Clear All src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html - 16,17 + 15 No notifications src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.html - 20,21 + 22 @@ -4169,31 +4152,31 @@ src/app/components/document-detail/document-detail.component.ts - 1474 + 1476 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 562 + 572 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 602 + 612 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 640 + 650 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 678 + 688 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 740 + 750 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 878 + 888 @@ -4313,7 +4296,7 @@ src/app/components/document-detail/document-detail.component.ts - 1961 + 1967 @@ -4324,7 +4307,7 @@ src/app/components/document-detail/document-detail.component.ts - 1962 + 1968 @@ -4335,7 +4318,7 @@ src/app/components/document-detail/document-detail.component.ts - 1963 + 1969 @@ -4421,22 +4404,22 @@ Saved field "". src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts - 132 + 133 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 85 + 86 Error saving field. src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts - 141 + 143 src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 94 + 96 @@ -5371,7 +5354,7 @@ src/app/components/common/toast/toast.component.html - 30,31 + 41,42 src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html @@ -6468,11 +6451,11 @@ src/app/components/document-detail/document-detail.component.ts - 1478 + 1480 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 882 + 892 @@ -7580,36 +7563,36 @@ TOTP activated successfully src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 310 + 311 Error activating TOTP src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 312 + 314 src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 318 + 320 TOTP deactivated successfully src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 334 + 337 Error deactivating TOTP src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 336 + 340 src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts - 341 + 345 @@ -7682,7 +7665,7 @@ src/app/components/common/toast/toast.component.html - 28,29 + 39,40 src/app/components/manage/mail/mail.component.html @@ -8202,9 +8185,57 @@ Copy Raw Error src/app/components/common/toast/toast.component.html - 43 + 54 + + Dismiss completed + + src/app/components/common/upload-status-tray/upload-status-tray.component.html + 11,15 + + This button dismisses all status messages about processed documents in the tray (failed and successful) + + + Toggle document processing status + + src/app/components/common/upload-status-tray/upload-status-tray.component.html + 16 + + + + Processing: + + src/app/components/common/upload-status-tray/upload-status-tray.component.ts + 72 + + + + Failed: + + src/app/components/common/upload-status-tray/upload-status-tray.component.ts + 75 + + + + Added: + + src/app/components/common/upload-status-tray/upload-status-tray.component.ts + 78 + + + + , + + src/app/components/common/upload-status-tray/upload-status-tray.component.ts + 81 + + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 517 + + this string is used to separate processing, failed and added on the file upload widget + Hint: saved views can be created from the documents list @@ -8391,47 +8422,6 @@ 7,8 - - Dismiss completed - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html - 23,27 - - This button dismisses all status messages about processed documents on the dashboard (failed and successful) - - - Processing: - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts - 57 - - - - Failed: - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts - 60 - - - - Added: - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts - 63 - - - - , - - src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts - 66 - - - src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 507 - - this string is used to separate processing, failed and added on the file upload widget - Paperless-ngx is running! @@ -8595,7 +8585,7 @@ src/main.ts - 479 + 483 @@ -8820,81 +8810,81 @@ Error retrieving metadata src/app/components/document-detail/document-detail.component.ts - 463 + 465 An error occurred loading content: src/app/components/document-detail/document-detail.component.ts - 566,568 + 568,570 src/app/components/document-detail/document-detail.component.ts - 1047,1049 + 1049,1051 Document was updated src/app/components/document-detail/document-detail.component.ts - 708 + 710 Document was updated at . src/app/components/document-detail/document-detail.component.ts - 709 + 711 Reload to discard your local unsaved edits and load the latest remote version. src/app/components/document-detail/document-detail.component.ts - 710 + 712 Reload src/app/components/document-detail/document-detail.component.ts - 712 + 714 Document reloaded with latest changes. src/app/components/document-detail/document-detail.component.ts - 768 + 770 Document reloaded. src/app/components/document-detail/document-detail.component.ts - 779 + 781 Next document src/app/components/document-detail/document-detail.component.ts - 881 + 883 Previous document src/app/components/document-detail/document-detail.component.ts - 891 + 893 Close document src/app/components/document-detail/document-detail.component.ts - 899 + 901 src/app/services/open-documents.service.ts @@ -8905,28 +8895,28 @@ Save document src/app/components/document-detail/document-detail.component.ts - 906 + 908 Save and close / next src/app/components/document-detail/document-detail.component.ts - 915 + 917 Error retrieving version content src/app/components/document-detail/document-detail.component.ts - 1029 + 1031 Unsaved Changes src/app/components/document-detail/document-detail.component.ts - 1073 + 1075 src/app/guards/dirty-form.guard.ts @@ -8949,198 +8939,205 @@ You have unsaved changes to the content of this version. src/app/components/document-detail/document-detail.component.ts - 1074 + 1076 Switching versions will discard them. src/app/components/document-detail/document-detail.component.ts - 1075 + 1077 Discard and switch src/app/components/document-detail/document-detail.component.ts - 1077 + 1079 Save and switch src/app/components/document-detail/document-detail.component.ts - 1079 + 1081 Error retrieving suggestions. src/app/components/document-detail/document-detail.component.ts - 1122 + 1124 Document "" saved successfully. src/app/components/document-detail/document-detail.component.ts - 1353 + 1355 src/app/components/document-detail/document-detail.component.ts - 1381 + 1383 Error saving document "" src/app/components/document-detail/document-detail.component.ts - 1387 + 1389 Error saving document src/app/components/document-detail/document-detail.component.ts - 1442 + 1444 Do you really want to move the document "" to the trash? src/app/components/document-detail/document-detail.component.ts - 1475 + 1477 Documents can be restored prior to permanent deletion. src/app/components/document-detail/document-detail.component.ts - 1476 + 1478 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 880 + 890 + + + + Moved "" to the trash + + src/app/components/document-detail/document-detail.component.ts + 1496 Error deleting document src/app/components/document-detail/document-detail.component.ts - 1497 + 1503 Reprocess confirm src/app/components/document-detail/document-detail.component.ts - 1517 + 1523 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 926 + 950 This operation will permanently recreate the archive file for this document. src/app/components/document-detail/document-detail.component.ts - 1518 + 1524 The archive file will be re-generated with the current settings. src/app/components/document-detail/document-detail.component.ts - 1519 + 1525 Reprocess operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1532 + 1538 Error executing operation src/app/components/document-detail/document-detail.component.ts - 1543 + 1549 Error downloading document src/app/components/document-detail/document-detail.component.ts - 1607 + 1613 Page Fit src/app/components/document-detail/document-detail.component.ts - 1685 + 1691 PDF edit operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1928 + 1934 Error executing PDF edit operation src/app/components/document-detail/document-detail.component.ts - 1940 + 1946 Please enter the current password before attempting to remove it. src/app/components/document-detail/document-detail.component.ts - 1951 + 1957 Password removal operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1985 + 1991 Error executing password removal operation src/app/components/document-detail/document-detail.component.ts - 1999 + 2005 Print failed. src/app/components/document-detail/document-detail.component.ts - 2049 + 2055 Error loading document for printing. src/app/components/document-detail/document-detail.component.ts - 2058 + 2064 An error occurred loading tiff: src/app/components/document-detail/document-detail.component.ts - 2141 + 2147 src/app/components/document-detail/document-detail.component.ts - 2147 + 2153 @@ -9424,7 +9421,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1026 + 1050 @@ -9459,25 +9456,25 @@ Error executing bulk operation src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 339 + 349 "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 499 + 509 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 505 + 515 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 501 + 511 This is for messages like 'modify "tag1" and "tag2"' @@ -9485,7 +9482,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 509,511 + 519,521 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -9493,14 +9490,14 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 526 + 536 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 532 + 542 @@ -9509,14 +9506,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 537,539 + 547,549 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 545 + 555 @@ -9525,7 +9522,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 550,552 + 560,562 @@ -9536,84 +9533,84 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 554,558 + 564,568 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 595 + 605 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 597 + 607 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 599 + 609 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 633 + 643 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 635 + 645 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 637 + 647 Confirm storage path assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 671 + 681 This operation will assign the storage path "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 673 + 683 This operation will remove the storage path from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 675 + 685 Confirm custom field assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 704 + 714 This operation will assign the custom field "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 710 + 720 @@ -9622,14 +9619,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 715,717 + 725,727 This operation will remove the custom field "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 723 + 733 @@ -9638,7 +9635,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 728,730 + 738,740 @@ -9649,105 +9646,112 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 732,736 + 742,746 Move selected document(s) to the trash? src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 879 + 889 + + + + Moved document(s) to the trash + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 916 This operation will permanently recreate the archive files for selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 927 + 951 The archive files will be re-generated with the current settings. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 928 + 952 Rotate confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 966 + 990 This operation will add rotated versions of the document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 967 + 991 Merge confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 990 + 1014 This operation will merge selected documents into a new document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 991 + 1015 Merged document will be queued for consumption. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1014 + 1038 The selected documents will become versions of the root document. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1027 + 1051 Documents merged as versions. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1042 + 1066 Custom fields updated. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1068 + 1092 Error updating custom fields. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1077 + 1101 Share link bundle creation requested. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1125 + 1149 Share link bundle creation is not available yet. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 1132 + 1156 @@ -10655,28 +10659,28 @@ Confirm delete field src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 102 + 104 This operation will permanently delete this field. src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 103 + 105 Deleted field "" src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 112 + 115 Error deleting field "". src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts - 121 + 125 @@ -10955,7 +10959,7 @@ src/app/components/manage/mail/mail.component.ts - 346 + 350 src/app/components/manage/saved-views/saved-views.component.ts @@ -10973,14 +10977,14 @@ Objects deleted successfully src/app/components/manage/document-attributes/management-list/management-list.component.ts - 471 + 472 Error deleting objects src/app/components/manage/document-attributes/management-list/management-list.component.ts - 477 + 479 @@ -11142,140 +11146,140 @@ OAuth2 authentication success src/app/components/manage/mail/mail.component.ts - 138 + 139 OAuth2 authentication failed, see logs for details src/app/components/manage/mail/mail.component.ts - 149 + 151 Saved account "". src/app/components/manage/mail/mail.component.ts - 173 + 175 Error saving account. src/app/components/manage/mail/mail.component.ts - 185 + 187 Confirm delete mail account src/app/components/manage/mail/mail.component.ts - 193 + 195 This operation will permanently delete this mail account. src/app/components/manage/mail/mail.component.ts - 194 + 196 Deleted mail account "" src/app/components/manage/mail/mail.component.ts - 204 + 206 Error deleting mail account "". src/app/components/manage/mail/mail.component.ts - 215 + 217 Processing mail account "" src/app/components/manage/mail/mail.component.ts - 227 + 229 Error processing mail account "" src/app/components/manage/mail/mail.component.ts - 232 + 234 Saved rule "". src/app/components/manage/mail/mail.component.ts - 251 + 254 Error saving rule. src/app/components/manage/mail/mail.component.ts - 262 + 266 Rule "" enabled. src/app/components/manage/mail/mail.component.ts - 278 + 282 Rule "" disabled. src/app/components/manage/mail/mail.component.ts - 279 + 283 Error toggling rule "". src/app/components/manage/mail/mail.component.ts - 284 + 288 Confirm delete mail rule src/app/components/manage/mail/mail.component.ts - 295 + 299 This operation will permanently delete this mail rule. src/app/components/manage/mail/mail.component.ts - 296 + 300 Deleted mail rule "" src/app/components/manage/mail/mail.component.ts - 306 + 310 Error deleting mail rule "". src/app/components/manage/mail/mail.component.ts - 317 + 321 Permissions updated src/app/components/manage/mail/mail.component.ts - 341 + 345 src/app/components/manage/saved-views/saved-views.component.ts @@ -13183,6 +13187,13 @@ 745 + + Undo + + src/app/services/trash.service.ts + 51 + + Connecting... @@ -13331,14 +13342,14 @@ Prev src/main.ts - 478 + 482 End src/main.ts - 480 + 484 From 3374debd6a69b1cd3136e996395cb72559b7804b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 19 Oct 2026 20:32:35 -0700 Subject: [PATCH 257/258] Enhancement: add upload count to button, link to tray, reduce notifications (#14501) --- .../app-frame/app-frame.component.html | 17 +++++++++----- .../app-frame/app-frame.component.scss | 17 ++++++++++++-- .../app-frame/app-frame.component.spec.ts | 22 +++++++++++++++++-- .../app-frame/app-frame.component.ts | 22 +++++++++++++++++-- .../upload-status-tray.component.spec.ts | 22 ++++++++++++++++++- .../upload-status-tray.component.ts | 11 ++++++++++ .../file-drop/file-drop.component.spec.ts | 6 ++--- .../file-drop/file-drop.component.ts | 2 -- .../services/upload-documents.service.spec.ts | 13 +++++++++++ .../app/services/upload-documents.service.ts | 11 +++++++++- 10 files changed, 125 insertions(+), 18 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 91fe83222..84b8dea3f 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -31,11 +31,18 @@ [class.mobile-hidden]="mobileSearchHidden()">
    - +
    + + @if (uploadsInProgress > 0) { + + } +
      diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index dc66b50af..933dd9374 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -552,9 +552,22 @@ main { --bs-btn-active-bg: rgba(255, 255, 255, .3); color: var(--pngx-primary-text-contrast) !important; // .navbar .dropdown > .btn in styles.scss - &:not(:focus) { - box-shadow: 0 1px 3px rgba(0, 0, 0, .35), 0 1px 1px rgba(0, 0, 0, .2); // leave room for the .btn:focus ring + & + & { + border-left: 1px solid rgba(255, 255, 255, .2) !important; } + + &:focus { + box-shadow: none; + } + + &:focus-visible { + box-shadow: inset 0 0 0 2px rgba(255, 255, 255, .5); + } +} + +.header-upload-group { + border-radius: var(--bs-border-radius-sm); + box-shadow: 0 1px 3px rgba(0, 0, 0, .35), 0 1px 1px rgba(0, 0, 0, .2); } @media screen and (max-width: 575.98px) { diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index 60fc6b18f..971a4ceeb 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -6,7 +6,7 @@ import { } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { BrowserModule } from '@angular/platform-browser' +import { BrowserModule, By } from '@angular/platform-browser' import { ActivatedRoute, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' import { NgbModal, NgbModalModule, NgbModule } from '@ng-bootstrap/ng-bootstrap' @@ -34,8 +34,10 @@ import { SettingsService } from 'src/app/services/settings.service' import { TasksService } from 'src/app/services/tasks.service' import { ToastService } from 'src/app/services/toast.service' import { UploadDocumentsService } from 'src/app/services/upload-documents.service' +import { WebsocketStatusService } from 'src/app/services/websocket-status.service' import { environment } from 'src/environments/environment' import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component' +import { UploadStatusTrayComponent } from '../common/upload-status-tray/upload-status-tray.component' import { DocumentDetailComponent } from '../document-detail/document-detail.component' import { AppFrameComponent } from './app-frame.component' import { GlobalSearchComponent } from './global-search/global-search.component' @@ -474,10 +476,26 @@ describe('AppFrameComponent', () => { jest.spyOn(input, 'files', 'get').mockReturnValue([file] as any) component.onFileSelected({ target: input } as unknown as Event) - expect(toastSpy).toHaveBeenCalled() + expect(toastSpy).not.toHaveBeenCalled() expect(uploadSpy).toHaveBeenCalledWith([file]) }) + it('should show in-progress uploads and expand the status tray', () => { + const websocketStatusService = TestBed.inject(WebsocketStatusService) + expect(component.uploadsInProgress).toEqual(0) + websocketStatusService.newFileUpload('file.pdf') + expect(component.uploadsInProgress).toEqual(1) + + fixture.detectChanges() + const tray = fixture.debugElement.query( + By.directive(UploadStatusTrayComponent) + ).componentInstance as UploadStatusTrayComponent + tray.toggleCollapsed() + expect(tray.collapsed()).toBe(true) + component.showUploadStatus() + expect(tray.collapsed()).toBe(false) + }) + it('should not upload when no files are selected from the navbar', () => { const uploadDocumentsService = TestBed.inject(UploadDocumentsService) const uploadSpy = jest.spyOn(uploadDocumentsService, 'uploadFiles') diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index f7fcc37f0..4f9a02f6e 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -6,7 +6,14 @@ import { moveItemInArray, } from '@angular/cdk/drag-drop' import { NgClass } from '@angular/common' -import { Component, HostListener, inject, OnInit, signal } from '@angular/core' +import { + Component, + HostListener, + inject, + OnInit, + signal, + viewChild, +} from '@angular/core' import { FormsModule } from '@angular/forms' import { ActivatedRoute, Router, RouterModule } from '@angular/router' import { @@ -49,6 +56,7 @@ import { SettingsService } from 'src/app/services/settings.service' import { TasksService } from 'src/app/services/tasks.service' import { ToastService } from 'src/app/services/toast.service' import { UploadDocumentsService } from 'src/app/services/upload-documents.service' +import { WebsocketStatusService } from 'src/app/services/websocket-status.service' import { environment } from 'src/environments/environment' import { ChatComponent } from '../chat/chat/chat.component' import { SwitchComponent } from '../common/input/switch/switch.component' @@ -105,6 +113,9 @@ export class AppFrameComponent permissionsService = inject(PermissionsService) private djangoMessagesService = inject(DjangoMessagesService) private uploadDocumentsService = inject(UploadDocumentsService) + private websocketStatusService = inject(WebsocketStatusService) + + private readonly uploadStatusTray = viewChild(UploadStatusTrayComponent) readonly appRemoteVersion = signal(null) readonly isMenuCollapsed = signal(true) @@ -522,10 +533,17 @@ export class AppFrameComponent const files = Array.from(input.files ?? []) input.value = '' if (!files.length) return - this.toastService.showInfo($localize`Initiating upload...`, 3000) this.uploadDocumentsService.uploadFiles(files) } + get uploadsInProgress(): number { + return this.websocketStatusService.getConsumerStatusNotCompleted().length + } + + showUploadStatus() { + this.uploadStatusTray()?.expand() + } + onLogout() { this.openDocumentsService.closeAll() } diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts index 3482df1e4..6780b154b 100644 --- a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts @@ -1,12 +1,12 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { By } from '@angular/platform-browser' import { RouterTestingModule } from '@angular/router/testing' import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { routes } from 'src/app/app-routing.module' import { PermissionsGuard } from 'src/app/guards/permissions.guard' import { PermissionsService } from 'src/app/services/permissions.service' +import { UploadDocumentsService } from 'src/app/services/upload-documents.service' import { FileStatus, FileStatusPhase, @@ -105,6 +105,26 @@ describe('UploadStatusTrayComponent', () => { expect(component.collapsed()).toBe(false) }) + it('should expand on request', () => { + component.toggleCollapsed() + expect(component.collapsed()).toBe(true) + component.expand() + expect(component.collapsed()).toBe(false) + }) + + it('should expand when new uploads start', () => { + const uploadDocumentsService = TestBed.inject(UploadDocumentsService) + jest + .spyOn(uploadDocumentsService, 'uploadFile') + .mockImplementation(() => {}) + websocketStatusService.newFileUpload('invoice.pdf') + fixture.detectChanges() + component.toggleCollapsed() + expect(component.collapsed()).toBe(true) + uploadDocumentsService.uploadFiles([new File(['one'], 'one.pdf')]) + expect(component.collapsed()).toBe(false) + }) + it('should generate stats summary', () => { mockConsumerStatuses(websocketStatusService) expect(component.getStatusSummary()).toEqual( diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts index 95549c7cf..c87cc31c8 100644 --- a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts @@ -1,5 +1,6 @@ import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, effect, inject, signal } from '@angular/core' +import { takeUntilDestroyed } from '@angular/core/rxjs-interop' import { RouterModule } from '@angular/router' import { NgbAlertModule, @@ -15,6 +16,7 @@ import { PermissionType, } from 'src/app/services/permissions.service' import { SettingsService } from 'src/app/services/settings.service' +import { UploadDocumentsService } from 'src/app/services/upload-documents.service' import { FileStatus, FileStatusPhase, @@ -40,6 +42,7 @@ export class UploadStatusTrayComponent extends ComponentWithPermissions { private websocketStatusService = inject(WebsocketStatusService) private settingsService = inject(SettingsService) private permissionsService = inject(PermissionsService) + private uploadDocumentsService = inject(UploadDocumentsService) readonly collapsed = signal(false) @@ -49,6 +52,10 @@ export class UploadStatusTrayComponent extends ComponentWithPermissions { effect(() => { if (this.getStatus().length === 0) this.collapsed.set(false) }) + this.uploadDocumentsService + .onUploadsStarted() + .pipe(takeUntilDestroyed()) + .subscribe(() => this.expand()) } get canAddDocuments(): boolean { @@ -138,6 +145,10 @@ export class UploadStatusTrayComponent extends ComponentWithPermissions { this.collapsed.update((collapsed) => !collapsed) } + expand() { + this.collapsed.set(false) + } + dismiss(status: FileStatus) { this.websocketStatusService.dismiss(status) } diff --git a/src-ui/src/app/components/file-drop/file-drop.component.spec.ts b/src-ui/src/app/components/file-drop/file-drop.component.spec.ts index f6ea9572a..e64057643 100644 --- a/src-ui/src/app/components/file-drop/file-drop.component.spec.ts +++ b/src-ui/src/app/components/file-drop/file-drop.component.spec.ts @@ -119,7 +119,7 @@ describe('FileDropComponent', () => { } component.onDrop(dragEvent as DragEvent) advanceTimers(3000) - expect(toastSpy).toHaveBeenCalled() + expect(toastSpy).not.toHaveBeenCalled() expect(uploadSpy).toHaveBeenCalled() }) @@ -159,7 +159,7 @@ describe('FileDropComponent', () => { component.onDrop(dragEvent as DragEvent) await flushPromises() advanceTimers(3000) - expect(toastSpy).toHaveBeenCalled() + expect(toastSpy).not.toHaveBeenCalled() expect(uploadSpy).toHaveBeenCalled() }) @@ -227,7 +227,7 @@ describe('FileDropComponent', () => { } component.onDrop(dragEvent as DragEvent) advanceTimers(3000) - expect(toastSpy).toHaveBeenCalled() + expect(toastSpy).not.toHaveBeenCalled() expect(uploadSpy).toHaveBeenCalled() }) diff --git a/src-ui/src/app/components/file-drop/file-drop.component.ts b/src-ui/src/app/components/file-drop/file-drop.component.ts index a1f1432d0..fdc035f23 100644 --- a/src-ui/src/app/components/file-drop/file-drop.component.ts +++ b/src-ui/src/app/components/file-drop/file-drop.component.ts @@ -134,7 +134,6 @@ export class FileDropComponent { Promise.all(promises) .then((results) => { files.push(...[].concat(...results)) - this.toastService.showInfo($localize`Initiating upload...`, 3000) this.uploadDocumentsService.uploadFiles(files) }) .catch((e) => { @@ -143,7 +142,6 @@ export class FileDropComponent { ) }) } else if (files.length) { - this.toastService.showInfo($localize`Initiating upload...`, 3000) this.uploadDocumentsService.uploadFiles(files) } diff --git a/src-ui/src/app/services/upload-documents.service.spec.ts b/src-ui/src/app/services/upload-documents.service.spec.ts index fbc6b8db6..3431d202d 100644 --- a/src-ui/src/app/services/upload-documents.service.spec.ts +++ b/src-ui/src/app/services/upload-documents.service.spec.ts @@ -66,6 +66,19 @@ describe('UploadDocumentsService', () => { .forEach((req) => req.flush('123-456')) }) + it('emits when uploads start', () => { + const startedSpy = jest.fn() + uploadDocumentsService.onUploadsStarted().subscribe(startedSpy) + uploadDocumentsService.uploadFiles([]) + expect(startedSpy).not.toHaveBeenCalled() + const file = new File(['one'], 'one.pdf') + uploadDocumentsService.uploadFiles([file]) + expect(startedSpy).toHaveBeenCalledWith([file]) + httpTestingController + .match(`${environment.apiBaseUrl}documents/post_document/`) + .forEach((req) => req.flush('123-456')) + }) + it('updates progress during upload and failure', () => { const file = new File( [new Blob(['testing'], { type: 'application/pdf' })], diff --git a/src-ui/src/app/services/upload-documents.service.ts b/src-ui/src/app/services/upload-documents.service.ts index 1eb309846..d5c2bf52c 100644 --- a/src-ui/src/app/services/upload-documents.service.ts +++ b/src-ui/src/app/services/upload-documents.service.ts @@ -1,6 +1,6 @@ import { HttpEventType } from '@angular/common/http' import { Injectable, inject } from '@angular/core' -import { Subscription } from 'rxjs' +import { Subject, Subscription } from 'rxjs' import { DocumentService } from './rest/document.service' import { FileStatusPhase, @@ -16,10 +16,19 @@ export class UploadDocumentsService { private uploadSubscriptions: Array = [] + private readonly uploadsStartedSubject = new Subject() + public uploadFiles(files: Iterable) { + const started: File[] = [] for (const file of files) { this.uploadFile(file) + started.push(file) } + if (started.length) this.uploadsStartedSubject.next(started) + } + + public onUploadsStarted() { + return this.uploadsStartedSubject.asObservable() } public uploadFile(file: File) { From 8bbca8a269bfd740f87a889b56af4e4c91bd777c Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 03:34:03 +0000 Subject: [PATCH 258/258] Auto translate strings --- src-ui/messages.xlf | 172 +++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 90 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 1d2938b20..251a6951c 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -289,15 +289,15 @@ src/app/components/app-frame/app-frame.component.html - 99 + 106 src/app/components/app-frame/app-frame.component.html - 101 + 108 src/app/components/app-frame/app-frame.component.html - 104 + 111 src/app/components/dashboard/dashboard.component.html @@ -320,11 +320,11 @@ src/app/components/app-frame/app-frame.component.html - 111 + 118 src/app/components/app-frame/app-frame.component.html - 113 + 120 src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html @@ -371,15 +371,15 @@ src/app/components/app-frame/app-frame.component.html - 63 + 70 src/app/components/app-frame/app-frame.component.html - 314 + 321 src/app/components/app-frame/app-frame.component.html - 316 + 323 @@ -752,11 +752,11 @@ src/app/components/app-frame/app-frame.component.html - 351 + 358 src/app/components/app-frame/app-frame.component.html - 353 + 360 @@ -1174,15 +1174,15 @@ src/app/components/app-frame/app-frame.component.html - 253 + 260 src/app/components/app-frame/app-frame.component.html - 255 + 262 src/app/components/app-frame/app-frame.component.html - 258 + 265 src/app/components/manage/saved-views/saved-views.component.html @@ -1787,7 +1787,7 @@ src/app/components/app-frame/app-frame.component.html - 224 + 231 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts @@ -1838,7 +1838,7 @@ src/app/components/app-frame/app-frame.component.html - 269 + 276 src/app/components/common/share-links-dialog/share-links-dialog.component.ts @@ -1857,15 +1857,15 @@ src/app/components/app-frame/app-frame.component.html - 277 + 284 src/app/components/app-frame/app-frame.component.html - 279 + 286 src/app/components/app-frame/app-frame.component.html - 282 + 289 src/app/components/manage/workflows/workflows.component.html @@ -1880,15 +1880,15 @@ src/app/components/app-frame/app-frame.component.html - 288 + 295 src/app/components/app-frame/app-frame.component.html - 290 + 297 src/app/components/app-frame/app-frame.component.html - 293 + 300 @@ -1899,19 +1899,19 @@ src/app/components/app-frame/app-frame.component.html - 71 + 78 src/app/components/app-frame/app-frame.component.html - 359,360 + 366,367 src/app/components/app-frame/app-frame.component.html - 362 + 369 src/app/components/app-frame/app-frame.component.html - 365 + 372 @@ -1981,15 +1981,15 @@ src/app/components/app-frame/app-frame.component.ts - 203 + 214 src/app/components/app-frame/app-frame.component.ts - 321 + 332 src/app/components/app-frame/app-frame.component.ts - 350 + 361 @@ -2000,11 +2000,11 @@ src/app/components/app-frame/app-frame.component.html - 337 + 344 src/app/components/app-frame/app-frame.component.html - 339 + 346 @@ -2814,11 +2814,11 @@ src/app/components/app-frame/app-frame.component.html - 298 + 305 src/app/components/app-frame/app-frame.component.html - 300 + 307 @@ -3183,11 +3183,11 @@ src/app/components/app-frame/app-frame.component.html - 328 + 335 src/app/components/app-frame/app-frame.component.html - 330 + 337 @@ -3525,93 +3525,100 @@ 38,39 + + Show document processing status + + src/app/components/app-frame/app-frame.component.html + 41 + + User menu src/app/components/app-frame/app-frame.component.html - 47 + 54 Logged in as src/app/components/app-frame/app-frame.component.html - 55,56 + 62,63 My Profile src/app/components/app-frame/app-frame.component.html - 59 + 66 Logout src/app/components/app-frame/app-frame.component.html - 66 + 73 Upload Files src/app/components/app-frame/app-frame.component.html - 79,81 + 86,88 Saved views src/app/components/app-frame/app-frame.component.html - 121,122 + 128,129 src/app/components/app-frame/app-frame.component.html - 151,152 + 158,159 Open documents src/app/components/app-frame/app-frame.component.html - 160,161 + 167,168 Close all src/app/components/app-frame/app-frame.component.html - 182 + 189 src/app/components/app-frame/app-frame.component.html - 184 + 191 Manage src/app/components/app-frame/app-frame.component.html - 193,194 + 200,201 Attributes src/app/components/app-frame/app-frame.component.html - 201 + 208 src/app/components/app-frame/app-frame.component.html - 203 + 210 Correspondents src/app/components/app-frame/app-frame.component.html - 229 + 236 src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.html @@ -3630,7 +3637,7 @@ Document types src/app/components/app-frame/app-frame.component.html - 234 + 241 src/app/components/manage/document-attributes/document-attributes.component.ts @@ -3641,7 +3648,7 @@ Storage paths src/app/components/app-frame/app-frame.component.html - 239 + 246 src/app/components/manage/document-attributes/document-attributes.component.ts @@ -3652,7 +3659,7 @@ Custom fields src/app/components/app-frame/app-frame.component.html - 244 + 251 src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -3671,11 +3678,11 @@ Share links src/app/components/app-frame/app-frame.component.html - 264 + 271 src/app/components/app-frame/app-frame.component.html - 266 + 273 src/app/components/manage/share-links/share-links.component.html @@ -3686,103 +3693,88 @@ Administration src/app/components/app-frame/app-frame.component.html - 308,309 + 315,316 Configuration src/app/components/app-frame/app-frame.component.html - 321 + 328 src/app/components/app-frame/app-frame.component.html - 323 + 330 GitHub src/app/components/app-frame/app-frame.component.html - 372 + 379 is available. src/app/components/app-frame/app-frame.component.html - 382 + 389 Click to view. src/app/components/app-frame/app-frame.component.html - 382 + 389 Paperless-ngx can automatically check for updates src/app/components/app-frame/app-frame.component.html - 386 + 393 How does this work? src/app/components/app-frame/app-frame.component.html - 394 + 401 Update available src/app/components/app-frame/app-frame.component.html - 406 + 413 Configure update checking src/app/components/app-frame/app-frame.component.html - 411 + 418 Sidebar views updated src/app/components/app-frame/app-frame.component.ts - 486 + 497 Error updating sidebar views src/app/components/app-frame/app-frame.component.ts - 489 + 500 An error occurred while saving update checking settings. src/app/components/app-frame/app-frame.component.ts - 510 - - - - Initiating upload... - - src/app/components/app-frame/app-frame.component.ts - 525 - - - src/app/components/file-drop/file-drop.component.ts - 137 - - - src/app/components/file-drop/file-drop.component.ts - 146 + 521 @@ -8207,28 +8199,28 @@ Processing: src/app/components/common/upload-status-tray/upload-status-tray.component.ts - 72 + 79 Failed: src/app/components/common/upload-status-tray/upload-status-tray.component.ts - 75 + 82 Added: src/app/components/common/upload-status-tray/upload-status-tray.component.ts - 78 + 85 , src/app/components/common/upload-status-tray/upload-status-tray.component.ts - 81 + 88 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -10615,7 +10607,7 @@ Failed to read dropped items: src/app/components/file-drop/file-drop.component.ts - 142 + 141 @@ -13198,28 +13190,28 @@ Connecting... src/app/services/upload-documents.service.ts - 31 + 40 Uploading... src/app/services/upload-documents.service.ts - 44 + 53 Upload complete, waiting... src/app/services/upload-documents.service.ts - 48 + 57 HTTP error: src/app/services/upload-documents.service.ts - 62 + 71
    Original filename {{metadata()?.original_filename}}
    Original SHA256 checksum{{metadata()?.original_checksum}}{{metadata()?.original_checksum}}
    Original file size{{metadata()?.original_mime_type}}
    Archive SHA256 checksum{{metadata()?.archive_checksum}}{{metadata()?.archive_checksum}}