Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/sphinxnotes/any/domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -620,29 +620,30 @@ def setup_external_header_anchor(

@dataclass
class PendingObject(UnresolvedContext):
domain: ObjDomain
domain: str
objtype: str
objid: str

@override
def resolve(self) -> ResolvedContext:
def resolve(self, env: BuildEnvironment) -> ResolvedContext:
domain: ObjDomain = cast(ObjDomain, env.get_domain(self.domain))
objid = self.objid
if (self.objtype, objid) not in self.domain.objects:
if (self.objtype, objid) not in domain.objects:
objids = set()
for objtype, objfield, objref in self.domain.references:
for objtype, objfield, objref in domain.references:
if objtype == self.objtype and objref == objid:
objids.update(self.domain.references[objtype, objfield, objref])
objids.update(domain.references[objtype, objfield, objref])

if len(objids) >= 1:
objid = objids.pop()
else:
raise KeyError(f'Object not found: {(self.objtype, objid)}')

_, _, obj = self.domain.objects[self.objtype, objid]
_, _, obj = domain.objects[self.objtype, objid]
return obj

def __hash__(self) -> int:
return hash((self.domain.name, self.objtype, self.objid))
return hash((self.domain, self.objtype, self.objid))


class ObjEmbedDirective(BaseContextDirective):
Expand Down Expand Up @@ -671,7 +672,7 @@ def get_rendered_objects(self) -> list[nodes.Node]:
def current_context(self) -> UnresolvedContext | ResolvedContext:
domain, objtype = self.get_domain_and_type()
objid = self.arguments[0]
return PendingObject(domain, objtype, objid)
return PendingObject(domain.name, objtype, objid)

@override
def current_template(self) -> Template:
Expand Down
19 changes: 11 additions & 8 deletions tests/test_domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@

class TestPendingObjectResolve(unittest.TestCase):
def setUp(self):
self.env = MagicMock()
self.domain = ObjDomain(MagicMock())
self.domain.name = 'obj'
self.domain.data['objects'] = {}
self.domain.data['references'] = {}
self.env.get_domain.return_value = self.domain

def test_resolve_by_id(self):
obj = MagicMock()
self.domain.objects['foo', 'id1'] = ('doc1', 'anchor1', obj)

pending = PendingObject(domain=self.domain, objtype='foo', objid='id1')
result = pending.resolve()
pending = PendingObject(domain='obj', objtype='foo', objid='id1')
result = pending.resolve(self.env)

self.assertIs(result, obj)

Expand All @@ -27,19 +30,19 @@ def test_resolve_by_reference(self):
self.domain.objects['foo', 'id1'] = ('doc1', 'anchor1', obj)
self.domain.references['foo', 'field1', 'ref1'] = {'id1'}

pending = PendingObject(domain=self.domain, objtype='foo', objid='ref1')
result = pending.resolve()
pending = PendingObject(domain='obj', objtype='foo', objid='ref1')
result = pending.resolve(self.env)

self.assertIs(result, obj)

def test_resolve_not_found(self):
self.domain.objects['foo', 'id1'] = ('doc1', 'anchor1', MagicMock())
self.domain.references['foo', 'field1', 'ref1'] = {'id1'}

pending = PendingObject(domain=self.domain, objtype='foo', objid='nonexistent')
pending = PendingObject(domain='obj', objtype='foo', objid='nonexistent')

with self.assertRaises(KeyError):
pending.resolve()
pending.resolve(self.env)

def test_resolve_multiple_references(self):
obj1 = MagicMock()
Expand All @@ -48,8 +51,8 @@ def test_resolve_multiple_references(self):
self.domain.objects['foo', 'id2'] = ('doc2', 'anchor2', obj2)
self.domain.references['foo', 'field1', 'ref1'] = {'id1', 'id2'}

pending = PendingObject(domain=self.domain, objtype='foo', objid='ref1')
result = pending.resolve()
pending = PendingObject(domain='obj', objtype='foo', objid='ref1')
result = pending.resolve(self.env)

self.assertIn(result, [obj1, obj2])

Expand Down
Loading