specitems 1.6.0__tar.gz → 1.6.2__tar.gz

{specitems-1.6.0 → specitems-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specitems
-Version: 1.6.0
+Version: 1.6.2
 Summary: Provides interfaces to work with specification items.
 Keywords: certification,documentation,markdown,qualification,requirements-management,traceability
 Author: The specitems Authors

{specitems-1.6.0 → specitems-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "specitems"
-version = "1.6.0"
+version = "1.6.2"
 description = "Provides interfaces to work with specification items."
 authors = [
     {name = "The specitems Authors", email = "specthings@embedded-brains.de"}

{specitems-1.6.0 → specitems-1.6.2}/src/specitems/itemmapper.py

@@ -39,8 +39,8 @@ ItemGetValueMap = dict[str, tuple[ItemGetValue, Any]]
 
 _VAR_NAME = "(?:[a-zA-Z0-9._/-]+|\\*):[\\[\\]a-zA-Z0-9._/-]+(?::[^${}]*)?"
 _VAR_SINGLE = re.compile(f"^[$@]\\{{{_VAR_NAME}\\}}$")
-_VAR_TOKENS = re.compile(r"(?:\$\$(?=\{|\$\{))|(?:@@(?=\{|@\{))|"
-                         f"[$@]\\{{{_VAR_NAME}\\}}|(?:[$@]\\{{)")
+_VAR_TOKENS = re.compile(f"(?:(\\$+|@+)\\{{{_VAR_NAME}\\}})|"
+                         r"(?:(\$+|@+)\{)")
 
 
 class _ItemMapperError(Exception):
@@ -65,16 +65,21 @@ class _ItemMapperContext:
 
     def replace(self, mobj: re.Match) -> str:
         """ Replace the match. """
+        designator = mobj.group(1)
         token = mobj.group(0)
-        if len(token) > 2:
+        if designator:
+            brace = len(designator)
+            if brace & 1 == 0:
+                return token[brace // 2:]
             try:
-                return str(
-                    self._mapper.map(token[2:-1], self._item, self._prefix)[2])
+                value = self._mapper.map(token[brace + 1:-1], self._item,
+                                         self._prefix)[2]
             except Exception as err:
                 raise _ItemMapperError(mobj.start(), mobj.end()) from err
-        if token[1] == "{":
+            return f"{token[:brace // 2]}{value}"
+        if len(token) & 1 == 0:
             raise _ItemMapperError(mobj.start(), mobj.end())
-        return token[0]
+        return token[len(token) // 2:]
 
 
 class _GetValueDictionary(dict):

{specitems-1.6.0 → specitems-1.6.2}/src/specitems/items.py

@@ -1206,13 +1206,17 @@ class ItemCache(dict):
 
         The item is not removed from the persistent cache storage.
         """
-        item = self[uid]
+        item = self.pop(uid)
+        for selection in self._selection_stack:
+            selection.pop(uid, None)
+        for view in self._view_stack:
+            view.pop(item, None)
         item.clear_links()
         try:
             self.type_provider.items_by_type[item.type].remove(item)
         except (KeyError, ValueError):
             pass
-        del self[uid]
+        del item
 
     def initialize_links(self, uids: Iterable[str]) -> None:
         """ Initialize the links to parents and children. """