fix modifier context (ii)

Author: mattfysh

packages/get/src/calls.ts

@@ -16,13 +16,9 @@ export async function callModifier(
 ) {
   const entry = await registry.importMod(mod)
   if (entry) {
-    let ctx: any
-    if (entry?.useContext) {
-      if (context && entry.materialize) {
-        ctx = materialize(context)
-      } else {
-        ctx = context?.data
-      }
+    let ctx: any = {}
+    if (entry.useContext && context) {
+      ctx = entry.materialize ? materialize(context) : context.data
     }
     return entry.mod(ctx, args)
   }

packages/get/src/registry.ts

@@ -90,13 +90,15 @@ export class Registry {
       const info = analyze(ast)
       const imports = [...info.imports]
       const contextMods: string[] = []
-      for (const mod of info.modifiers) {
+      for (const mod of info.modifiers.keys()) {
         const entry = await this.importMod(mod)
         if (entry?.useContext ?? true) {
           contextMods.push(mod)
         }
       }
-      const isMacro = info.hasUnboundSelector || contextMods.length > 0
+      const isMacro =
+        info.hasUnboundSelector ||
+        contextMods.some(mod => info.modifiers.get(mod))
       return { ast, imports, contextMods, isMacro }
     })
     return this.info[module]

packages/parser/src/passes/analyze.ts

@@ -5,7 +5,7 @@ export function analyze(ast: Program) {
   const scope = new ScopeTracker()
   const inputs = new Set<string>()
   const calls = new Set<string>()
-  const modifiers = new Set<string>()
+  const modifiers = new Map<string, boolean>()
   const imports = new Set<string>()
   let hasUnboundSelector = false
 
@@ -22,7 +22,10 @@ export function analyze(ast: Program) {
       hasUnboundSelector ||= !scope.context
     },
     ModifierExpr(node) {
-      modifiers.add(node.modifier.value)
+      const mod = node.modifier.value
+      if (!modifiers.get(mod)) {
+        modifiers.set(mod, !scope.context)
+      }
     },
   })