From 4f617cbcb30c8cef05948d4641789f18d14a8c1e Mon Sep 17 00:00:00 2001
From: mavaylon1 <mavaylon1@berkeley.edu>
Date: Tue, 19 Mar 2024 07:02:41 -0700
Subject: [PATCH] in progress

---
 src/hdmf/build/manager.py   |  2 ++
 src/hdmf/common/__init__.py | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/hdmf/build/manager.py b/src/hdmf/build/manager.py
index 59efe1092..3398cf007 100644
--- a/src/hdmf/build/manager.py
+++ b/src/hdmf/build/manager.py
@@ -5,6 +5,7 @@
 from .builders import DatasetBuilder, GroupBuilder, LinkBuilder, Builder, BaseBuilder
 from .classgenerator import ClassGenerator, CustomClassGenerator, MCIClassGenerator
 from ..container import AbstractContainer, Container, Data
+from ..common import get_type_map()
 from ..term_set import TermSetConfigurator
 from ..spec import DatasetSpec, GroupSpec, NamespaceCatalog
 from ..spec.spec import BaseStorageSpec
@@ -734,6 +735,7 @@ def register_container_type(self, **kwargs):
         self.__container_types.setdefault(namespace, dict())
         self.__container_types[namespace][data_type] = container_cls
         self.__data_types.setdefault(container_cls, (namespace, data_type))
+        container_cls.__type_map = get_type_map()
         if not isinstance(container_cls, TypeSource):
             setattr(container_cls, spec.type_key(), data_type)
             setattr(container_cls, 'namespace', namespace)
diff --git a/src/hdmf/common/__init__.py b/src/hdmf/common/__init__.py
index 45818ad84..2cbedf50e 100644
--- a/src/hdmf/common/__init__.py
+++ b/src/hdmf/common/__init__.py
@@ -65,14 +65,14 @@ def register_class(**kwargs):
         def _dec(cls):
             _set_exp(cls)
             __TYPE_MAP.register_container_type(namespace, data_type, cls)
-            cls.type_map = __TYPE_MAP
-            cls.namespace = namespace
+            # cls.type_map = __TYPE_MAP
+            # cls.namespace = namespace
             return cls
     else:
         def _dec(cls):
             __TYPE_MAP.register_container_type(namespace, data_type, cls)
-            cls.type_map = __TYPE_MAP
-            cls.namespace = namespace
+            # cls.type_map = __TYPE_MAP
+            # cls.namespace = namespace
             return cls
 
     if container_cls is None:
@@ -183,6 +183,9 @@ def get_type_map(**kwargs):
             type_map.load_namespaces(extensions)
         elif isinstance(extensions, TypeMap):
             type_map.merge(extensions)
+    global_config = __TYPE_MAP.ts_config
+    if global_config is not None:
+        type_map.ts_config = global_config
     return type_map