@bablr/agast-helpers 0.8.0 → 0.9.0

package/lib/template.js

@@ -8,8 +8,8 @@ import {
   Property,
   BindingTag,
 } from './symbols.js';
-import * as Children from './children.js';
-import { getOpenTag, get, isFragmentNode } from './tree.js';
+import * as Tags from './tags.js';
+import { getOpenTag, isFragmentNode } from './tree.js';
 
 const { freeze } = Object;
 
@@ -18,7 +18,11 @@ export const buildFilledGapFunction = (expressions) => (value) => {
   return t.buildGapTag();
 };
 
-export function* interpolateFragment(node, ref, expressions) {
+export const interpolateFragment = (node, ref, expressions) => {
+  return __interpolateFragment(node, ref, expressions);
+};
+
+function* __interpolateFragment(node, ref, expressions) {
   const open = getOpenTag(node);
 
   const gap = buildFilledGapFunction(expressions);
@@ -27,7 +31,7 @@ export function* interpolateFragment(node, ref, expressions) {
     let currentRef = null;
     let currentBinding = null;
     let isFragment = isFragmentNode(node);
-    for (let tag of Children.traverse(node.children)) {
+    for (let tag of Tags.traverseInner(node.tags)) {
       switch (tag.type) {
         case DoctypeTag: {
           break;
@@ -67,13 +71,13 @@ export function* interpolateFragment(node, ref, expressions) {
 
           if (type === '.') {
             // TODO check/combine flags
-            yield freeze(ref);
-            yield currentBinding;
+            yield ref;
           } else {
             yield currentRef;
-            yield currentBinding;
           }
 
+          yield currentBinding;
+
           yield gap(tag.value.node);
 
           break;