Simplify

Author: theodorejb

src/Compiler.php

@@ -889,15 +889,14 @@ private function compileHelperCall(?string $helperName, Expression $path, array
                 // All-string parts (foo.bar, ../fn, ./fn, @fn): scoped/depth/data paths resolve
                 // from context only; normal paths check the helpers hash first via resolveHelper.
                 $escapedName = self::quote($path->original);
-                $resolverFn = (!$path->data && $path->depth === 0 && !self::scopedId($path))
-                    ? 'resolveHelper'
-                    : 'resolveContextHelper';
+                $checkHelpers = !$path->data && $path->depth === 0 && !self::scopedId($path);
             } else {
                 // SubExpression-headed path (e.g. ((helper).prop args)): context-only resolution.
                 $escapedName = self::quote(implode('.', $stringParts));
-                $resolverFn = 'resolveContextHelper';
+                $checkHelpers = false;
             }
-            $resolved = self::getRuntimeFunc($resolverFn, "\$cx, $escapedName, $varPath");
+            $extraArg = $checkHelpers ? '' : ", false";
+            $resolved = self::getRuntimeFunc('resolveHelper', "\$cx, $escapedName, $varPath$extraArg");
             return self::getRuntimeFunc('hbch', "\$cx, $resolved, $escapedName, $compiledParams, \$in");
         }
 

src/Runtime.php

@@ -423,13 +423,14 @@ public static function in(RuntimeContext $cx, string $name, Closure $partial): s
     }
 
     /**
-     * Resolve a helper by name: check the helper registry, then the pre-resolved callable
-     * (for pathed expressions), then the current context, then fall back to helperMissing.
-     * Throws if a non-null, non-Closure value is found.
+     * Resolve a helper by name: optionally check the helper registry, then the pre-resolved
+     * callable, then fall back to helperMissing. Throws if a non-null, non-Closure value is found.
+     * Pass $checkHelpers = false for scoped (./), depth (../), and data (@) paths, which resolve
+     * from context only, matching HBS.js behaviour.
      */
-    public static function resolveHelper(RuntimeContext $cx, string $name, mixed $callable): Closure
+    public static function resolveHelper(RuntimeContext $cx, string $name, mixed $callable, bool $checkHelpers = true): Closure
     {
-        $helper = $cx->helpers[$name] ?? $callable ?? null;
+        $helper = $checkHelpers ? ($cx->helpers[$name] ?? $callable) : $callable;
         if ($helper instanceof Closure) {
             return $helper;
         }
@@ -439,21 +440,6 @@ public static function resolveHelper(RuntimeContext $cx, string $name, mixed $ca
         return $cx->helpers['helperMissing'];
     }
 
-    /**
-     * Like resolveHelper but skips the helpers hash lookup — for scoped (./), depth (../),
-     * and data (@) paths which resolve from context only, matching HBS.js behaviour.
-     */
-    public static function resolveContextHelper(RuntimeContext $cx, string $name, mixed $callable): Closure
-    {
-        if ($callable instanceof Closure) {
-            return $callable;
-        }
-        if ($callable !== null) {
-            throw new \Exception("Expected $name to be a function, got " . json_encode($callable));
-        }
-        return $cx->helpers['helperMissing'];
-    }
-
     /**
      * Invoke a resolved helper Closure with positional params, hash, and a HelperOptions instance.
      * Used for known helpers and resolved helpers (direct hbch calls from generated code),