Fix accessory lookups for optional pointers

Author: Nycto

src/necsus/compiletime/converters.nim

@@ -39,7 +39,7 @@ proc newAdapter*(
 
 proc addAccessoryCondition(existing: NimNode, adapter: TupleAdapter, predicate: NimNode): NimNode =
     ## Adds a boolean check to see if an accessory component passes a predicate
-    if adapter.optionIn and not adapter.optionOut:
+    if adapter.optionIn and (not adapter.optionOut or adapter.pointerOut):
         let read = nnkBracketExpr.newTree(adapter.source, adapter.index.newLit)
         return quote: `existing` and `predicate`(`read`)
     else:
@@ -76,6 +76,8 @@ proc copyTuple(fromArch: Archetype[ComponentDef], newVals: openarray[ComponentDe
 
             of DirectiveArgKind.Optional:
                 if adapter.index >= 0:
+                    if adapter.optionIn:
+                        condition = condition.addAccessoryCondition(adapter, bindSym("isSome"))
                     adapter.build()
                 else:
                     newCall(nnkBracketExpr.newTree(bindSym("none"), arg.type))

tests/t_accessory_lookup.nim

@@ -13,18 +13,22 @@ proc exec(
     spawn3: FullSpawn[(Person, Name, Age)],
     lookup1: Lookup[(Name, Not[Age])],
     lookup2: Lookup[(Name, Age)],
+    lookup3: Lookup[(Name, Option[ptr Age])],
 ) =
     let first = spawn1.with(Person())
     check(first.lookup1().isNone())
     check(first.lookup2().isNone())
+    check(first.lookup3().isNone())
 
     let second = spawn2.with(Person(), "Jack")
     check(second.lookup1().get()[0] == "Jack")
     check(second.lookup2().isNone())
+    check(second.lookup3().isNone())
 
     let third = spawn3.with(Person(), "Jack", 25)
-    check(third.lookup1().get()[0] == "Jack")
+    check(third.lookup1().isNone())
     check(third.lookup2() == some(("Jack", 25)))
+    check(third.lookup3().isSome())
 
 proc runner(tick: proc(): void) = tick()