@bablr/agast-helpers 0.8.0 → 0.10.0

package/lib/path.js

@@ -1,19 +1,230 @@
 import { WeakStackFrame } from '@bablr/weak-stack';
-import * as btree from '@bablr/agast-helpers/btree';
-import * as Children from './children.js';
+import * as BTree from '@bablr/agast-helpers/btree';
+import * as Tags from './tags.js';
 import {
   ReferenceTag,
-  InitializerTag,
-  DoctypeTag,
-  OpenNodeTag,
   CloseNodeTag,
   GapTag,
   NullTag,
   ShiftTag,
   BindingTag,
   Property,
+  OpenNodeTag,
+  AttributeDefinition,
+  LiteralTag,
+  TreeNode,
+  NullNode,
+  GapNode,
+  Document,
 } from './symbols.js';
-import { isString } from './object.js';
+import {
+  immSet,
+  isPlainObject,
+  isString,
+  has as objHas,
+  get as objGet,
+  isObject,
+  isSymbol,
+} from './object.js';
+import {
+  buildReferenceTag,
+  buildChild,
+  buildProperty,
+  buildGapTag,
+  buildNullTag,
+  buildOpenNodeTag,
+  buildShift,
+  buildPropertyTag,
+} from './builders.js';
+
+export const incrementShift = (shift) => {
+  if (!shift) return buildShift(1, 3);
+
+  return buildShift(shift.index + 1, shift.height + 1);
+};
+
+export const finalizeNode = (node) => {
+  freeze(node);
+  freeze(node.value);
+
+  return node;
+};
+
+export const buildNode = (tags) => {
+  if (isArray(tags) && !Number.isFinite(tags[0])) throw new Error();
+  if (!isArray(tags) && !isSymbol(tags.type)) throw new Error();
+  let tags_ = isArray(tags) ? tags : Tags.fromValues([tags]);
+
+  if (!Number.isFinite(tags_[0])) throw new Error();
+  if (!isArray(tags_[1]) || !tags_[1].length) throw new Error();
+
+  let openTag = tags_[1][0];
+  if (![GapTag, NullTag, OpenNodeTag].includes(openTag.type)) throw new Error();
+  // let tags = openTag ? Tags.fromValues([openTag]) : Tags.fromValues([]);
+
+  if (openTag.type === GapTag) {
+    return finalizeNode({
+      type: GapNode,
+      value: {
+        tags: Tags.fromValues([openTag]),
+      },
+    });
+  } else if (openTag.type === NullTag) {
+    return finalizeNode({
+      type: NullNode,
+      value: { tags: Tags.fromValues([openTag]) },
+    });
+  } else if (openTag.type === OpenNodeTag) {
+    return finalizeNode({
+      type: TreeNode,
+      value: {
+        flags: openTag.value.flags,
+        type: openTag.value.type,
+        name: openTag.value.name,
+        attributes: openTag.value.attributes,
+        tags: tags_,
+        children: tags_[1][1] || Tags.fromValues([]),
+        bounds: buildBoundsFromTags(tags_),
+      },
+    });
+  } else {
+    throw new Error();
+  }
+};
+
+export const buildBoundsFromTags = (tags) => {
+  let gapProperty = buildProperty([buildReferenceTag(), [], buildNode(buildGapTag())]);
+  let bounds = [BTree.fromValues([gapProperty]), BTree.fromValues([gapProperty])];
+  let firstProperty, lastProperty;
+
+  if (Tags.getAt(-1, tags)?.type !== CloseNodeTag) {
+    return freeze(bounds);
+  }
+
+  for (let i = 1; i < Tags.getSize(tags); i++) {
+    let tag = Tags.getAt(i, tags);
+
+    if (tag.type === Property && !isNullNode(tag.value.node)) {
+      firstProperty = tag;
+      break;
+    }
+  }
+
+  for (let i = Tags.getSize(tags) - 2; i >= 0; i--) {
+    let tag = Tags.getAt(i, tags);
+
+    if (tag.type === Property && !isNullNode(tag.value.node)) {
+      lastProperty = tag;
+      break;
+    }
+  }
+
+  if (firstProperty && firstProperty.value.node.type === TreeNode) {
+    let openStack = firstProperty.value.node.value.bounds[0];
+
+    openStack = BTree.pop(openStack);
+    openStack = BTree.push(openStack, firstProperty);
+    openStack = BTree.concat(openStack, BTree.pop(bounds[0]));
+    openStack = BTree.push(
+      openStack,
+      buildPropertyTag([buildReferenceTag(), [], buildNode(buildGapTag())]),
+    );
+
+    bounds[0] = openStack;
+  }
+
+  let closeStack = bounds[1];
+
+  if (lastProperty && lastProperty.value.type === TreeNode) {
+    if (!lastProperty.value.node) throw new Error();
+
+    closeStack = lastProperty.value.node.value.bounds[1];
+
+    closeStack = closeStack
+      ? BTree.replaceAt(-1, closeStack, lastProperty)
+      : BTree.fromValues([lastProperty]);
+
+    closeStack = BTree.push(
+      closeStack,
+      buildPropertyTag([buildReferenceTag(), [], buildNode(buildGapTag())]),
+    );
+    bounds[1] = closeStack;
+  }
+
+  return freeze(bounds);
+};
+
+export const isNode = (value) => {
+  return [TreeNode, NullNode, GapNode].includes(value?.type);
+};
+
+export const endsNode = (tag) => {
+  return (
+    [CloseNodeTag, NullTag, GapTag].includes(tag.type) ||
+    (tag.type === OpenNodeTag && tag.value.selfClosing)
+  );
+};
+
+export const propertyIsFull = (tag) => {
+  if (tag.type !== Property) return true;
+
+  let { tags } = tag.value;
+
+  return tags.length === 3;
+};
+
+export const nodeIsComplete = (node) => {
+  let sigilTag = getOpenTag(node);
+  return sigilTag.type !== OpenNodeTag || sigilTag.value.selfClosing ? true : !!getCloseTag(node);
+};
+
+export const getTags = (node) => {
+  switch (node.type) {
+    case TreeNode:
+      return node.value.tags;
+    case NullNode:
+      return node.value.tags;
+    case GapNode:
+      return node.value.tags;
+    case Document:
+      return getTags(node.value.tree);
+    default:
+      throw new Error();
+  }
+};
+
+export const offsetForTag = (tag) => {
+  switch (tag.type) {
+    case ReferenceTag:
+    case ShiftTag:
+      return [0];
+    case BindingTag:
+      return [1, -1];
+    default:
+      return [];
+  }
+};
+
+export const isNodeTag = (tag) => {
+  switch (tag.type) {
+    case TreeNode:
+    case NullNode:
+    case GapNode:
+      return true;
+    default:
+      return false;
+  }
+};
+
+export const arraysEqual = (a, b) => {
+  if (a.length !== b.length) return false;
+
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false;
+  }
+
+  return true;
+};
 
 export const buildPathSegment = (name, index = null, shiftIndex = null) => {
   if (!name) throw new Error();
@@ -29,90 +240,114 @@ export const buildFullPathSegment = (type, name, index = null, shiftIndex = null
   return { type, name, index, shiftIndex };
 };
 
-export const getRoot = (node, index = 0) => {
-  if (node == null || !isFragmentNode(node)) {
-    return node;
+export const getRootProperty = (node) => {
+  if (node == null || !isCover(node)) {
+    return null;
   }
-  let idx = getPropertyChildrenIndex(node, '.', null, index);
+  let idx = getPropertyTagsIndex(node, '_', null);
 
   if (idx == null) return null;
 
-  let tag = Children.getAt(idx + 2, node.children);
+  let tag = Tags.getAt(idx, getTags(node));
 
   if (tag.type !== Property) throw new Error();
-  return tag.value.node;
+  return tag;
 };
 
-export const getRootArray = (node) => {
-  let arr = [];
-  for (let i = 0; ; i++) {
-    let root = getRoot(node, i);
-    if (root) {
-      arr.push(root);
-    } else {
-      break;
-    }
+// TODO prevent infinite recursion
+export const getRoot = (node, depth = Infinity) => {
+  let node_ = node;
+  let i = 0;
+
+  while (isCover(node_) && i < depth) {
+    node_ = getRootProperty(node_)?.value.node;
+    i++;
   }
-  return arr;
+
+  return node_;
+};
+
+export const getSigilTag = (node) => {
+  return Tags.getValues(getTags(node))[0];
 };
 
 export const getOpenTag = (node) => {
-  if (!node.children.length) return null;
-  let tag = Children.getAt(0, node.children);
-  if (tag.type === NullTag || tag.type === GapTag) return null;
-  if (tag.type === DoctypeTag) {
-    tag = Children.getAt(1, node.children);
-  }
-  if (tag && tag.type !== OpenNodeTag) throw new Error();
-  return tag;
+  let tag = Tags.getValues(getTags(node))[0];
+  return tag.type === OpenNodeTag ? tag : null;
 };
 
 export const getCloseTag = (node) => {
-  const { children } = node;
-  const tag = Children.getAt(-1, children);
-  if (tag.type !== CloseNodeTag) return null;
-  return tag;
+  return Tags.getValues(getTags(node))[2];
 };
 
 export const isNullNode = (node) => {
-  return node && node.type === null && Children.getAt(0, node.children).type === NullTag;
+  return node && Tags.getAt(0, getTags(node)).type === NullTag;
+};
+
+export const isCover = (node) => {
+  return node?.type === TreeNode && node.value.type === Symbol.for('_');
+};
+
+export const getChildren = (node) => {
+  return node?.type === TreeNode ? node.value.children : [];
+};
+
+export const isFragment = (node) => {
+  return node?.type === TreeNode && [Symbol.for('__'), Symbol.for('_')].includes(node.value.type);
 };
 
-export const isFragmentNode = (node) => {
-  return node && node.type === null && getOpenTag(node)?.value.type === null;
+export const isMultiFragment = (node) => {
+  return node?.type === TreeNode && node.value.type === Symbol.for('__');
 };
 
 export const isGapNode = (node) => {
-  return node && node.type === null && Children.getAt(0, node.children).type === GapTag;
+  return node && Tags.getAt(0, getTags(node)).type === GapTag;
 };
 
 export const isStubNode = (node) => {
-  return (
-    node && node.type === null && [GapTag, NullTag].includes(Children.getAt(0, node.children).type)
-  );
+  return node && [GapTag, NullTag].includes(Tags.getAt(0, getTags(node)).type);
+};
+
+export const isStubTag = (tag) => {
+  return [GapTag, NullTag].includes(tag.type);
 };
 
-export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
-  let child = Children.getAt(childrenIndex, agAstNode.children);
+export const getChildPropertyIndex = (agAstNode, tagsIndex) => {
+  let child = Tags.getAt(tagsIndex, agAstNode.value.tags);
+
+  if (child.type !== Property) return null;
 
-  let refIndex = child.type === ShiftTag ? childrenIndex - child.value.index * 3 : childrenIndex;
+  let tag = child.value.tags[0];
 
-  let stack = Children.findPath(refIndex, agAstNode.children);
+  let refIndex = tag.type === ShiftTag ? tagsIndex - tag.value.index : tagsIndex;
+
+  let stack = Tags.findPath(refIndex, agAstNode.value.tags);
   let { node, index: leafIdx } = stack.value;
-  let leaf = Children.getAt(leafIdx, node);
+  let leaf = Tags.getAt(leafIdx, node);
+
+  if (leaf.type !== Property) {
+    return null;
+  }
 
-  if (leaf.type !== ReferenceTag) return null;
+  let leafRefTag = leaf.value.tags[0];
 
-  let { name, isArray } = leaf.value;
+  if (leafRefTag.type !== ReferenceTag) return null;
+
+  let { name, flags } = leafRefTag.value;
   let count = -1;
 
-  if (!isArray) return null;
+  if (!name) throw new Error();
+
+  if (!flags.array) return null;
 
   for (let i = leafIdx; i >= 0; i--) {
-    let value = Children.getAt(i, node);
+    let value = Tags.getAt(i, node);
+    if (value.type === Property) {
+      let firstTag = value.value.tags[0];
 
-    if (value.type === ReferenceTag && value.value.name === name) {
-      count++;
+      if (firstTag.type === ReferenceTag && firstTag.value.name === name) {
+        count++;
+      }
     }
   }
   stack = stack.pop();
@@ -123,11 +358,16 @@ export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
 
   do {
     for (let i = leafIdx - 1; i >= 0; i--) {
-      let childNode = Children.getValues(node)[i];
-      let { references } = Children.getSums(childNode);
+      let value = Tags.getValues(node)[i];
 
-      if (hasOwn(references, name)) {
-        count += references[name];
+      if (Array.isArray(value)) {
+        let childNode = value;
+        let { references } = Tags.getSums(childNode);
+
+        let res;
+        if ((res = Tags.getAtName(name, references))) {
+          count += res;
+        }
       }
     }
     stack = stack.pop();
@@ -141,69 +381,106 @@ export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
   return count - 1;
 };
 
-export const getPropertyChildrenIndex = (agAstNode, type, name, index) => {
-  let firstRefIndex = __getPropertyChildrenIndex(agAstNode, type, name, 0);
-  let nextTag = Children.getAt(firstRefIndex + 1, agAstNode.children);
-  let initializerOffset = nextTag.type === InitializerTag ? 1 : 0;
+export const getPropertyTagsIndex = (agAstNode, type, name, index, shiftIndex) => {
+  let firstPropsIndex = __getPropertyTagsIndex(agAstNode, type, name, 0);
+  let prop = firstPropsIndex == null ? null : Tags.getAt(firstPropsIndex, getTags(agAstNode));
+  let ref = prop?.value.reference;
+  let sums = Tags.getSums(agAstNode.value.tags);
+  let counts = name ? sums.references : sums.specialTypes;
 
-  if (isArray) {
-    if (index == null) {
-      if (type) {
-        index = btree.getSums(agAstNode.children).specialTypes[type] - 1 - initializerOffset;
-      } else {
-        index = btree.getSums(agAstNode.children).references[name] - 1 - initializerOffset;
-      }
+  if (ref?.flags.array) {
+    if (index < 0) {
+      index = Tags.getAtName(type, counts) + index;
+    } else if (index == null) {
+      index = Tags.getAtName(name, counts) - 1;
+
+      if (index < 0) return null;
     }
   }
 
-  return __getPropertyChildrenIndex(agAstNode, type, name, index + initializerOffset);
-};
+  let parentIndex = __getPropertyTagsIndex(agAstNode, type, name, index ?? 0);
+
+  if (parentIndex != null && ref?.flags.expression) {
+    let shiftIndex_ = shiftIndex == null ? -1 : shiftIndex;
+    if (shiftIndex_ < 0) {
+      let shifts = 0;
+      // TODO speed this up for deeply nested shifts
+      // algorithm: make big jump forward, then look at shift index to see if we overshot completely
+      // works because we know the size of the thing and a bigger thing doesn't fit in a smaller one
+      while (Tags.getAt(parentIndex + shifts, agAstNode.value.children)?.value.shift) {
+        shifts++;
+      }
+
+      if (-shiftIndex_ > shifts + 1) return null;
+
+      return parentIndex + shifts + shiftIndex_ + 1;
+    } else {
+      if (parentIndex + shiftIndex_ >= Tags.getSize(agAstNode.value.tags)) {
+        return null;
+      }
+
+      return parentIndex + shiftIndex_;
+    }
+  }
 
-export const getInitializerChildrenIndex = (agAstNode, reference) => {
-  let { type, name } = reference.value;
-  return __getPropertyChildrenIndex(agAstNode, type, name, 0);
+  return parentIndex;
 };
 
-const __getPropertyChildrenIndex = (agAstNode, type, name, index) => {
+const __getPropertyTagsIndex = (agAstNode, type, name, index) => {
   let nameCount = 0;
-  let node = agAstNode.children;
+  let node = Tags.getValues(agAstNode.value.tags)[1];
   let idx = -1;
 
   // drill into subtrees, passing over subtrees with too few references of the desired name
   outer: while (node) {
-    let isLeaf = Children.isLeafNode(node);
-    let sums = Children.getSums(node);
-    let valueNameCount = type == null ? sums.references[name] : sums.specialTypes[type];
+    let sums = Tags.getSums(node);
+
+    if (!sums) return null;
+
+    let valueNameCount =
+      name != null
+        ? Tags.getAtName(name, sums.references)
+        : Tags.getAtName(type, sums.specialTypes);
 
     if (nameCount + valueNameCount < index) {
       return null;
     }
 
-    for (const value of Children.getValues(node)) {
-      if (isLeaf) {
+    for (const value of Tags.getValues(node)) {
+      if (!isArray(value)) {
         idx++;
         let tag = value;
-        if (
-          tag.type === ReferenceTag &&
-          ((name != null && tag.value.name === name) || (type != null && tag.value.type === type))
-        ) {
-          nameCount += 1;
-          if (nameCount > index) {
-            return idx;
+        if (tag.type === Property) {
+          let { tags, reference } = tag.value;
+          if (tags[0].type === ReferenceTag) {
+            if (
+              (name != null && reference.name === name) ||
+              (type != null && reference.type === type)
+            ) {
+              nameCount += 1;
+              if (nameCount > index) {
+                return idx + 1;
+              }
+            }
           }
         }
       } else {
-        let valueSums = Children.getSums(value);
+        let valueSums = Tags.getSums(value);
         if (
-          nameCount + (type == null ? valueSums.references[name] : valueSums.specialTypes[type]) >
+          nameCount +
+            (name != null
+              ? Tags.getAtName(name, valueSums.references)
+              : Tags.getAtName(type, valueSums.specialTypes)) >
           index
         ) {
           node = value;
           continue outer;
         } else {
           nameCount +=
-            (type == null ? valueSums.references[name] : valueSums.specialTypes[type]) ?? 0;
-          idx += Children.getSize(value);
+            (name != null
+              ? Tags.getAtName(name, valueSums.references)
+              : Tags.getAtName(type, valueSums.specialTypes)) ?? 0;
+          idx += Tags.getSize(value);
         }
       }
     }
@@ -217,11 +494,12 @@ const __getPropertyChildrenIndex = (agAstNode, type, name, index) => {
 const { hasOwn, freeze } = Object;
 const { isArray } = Array;
 
-export const getOriginalFirstNode = (node, height = 1) => {
-  for (let child of Children.traverse(node.children)) {
+export const getOriginalFirstNode = (node) => {
+  if (node.type !== TreeNode) return;
+
+  for (let child of Tags.traverse(getTags(node))) {
     if (child.type === Property) {
-      return getProperties(buildPathSegment(child.value.reference.name, 0, height), node.properties)
-        .node;
+      return child.value.node;
     }
   }
   return null;
@@ -232,112 +510,135 @@ export const getFirstNode = (node) => {
 };
 
 export const getFirstNodeProperty = (node) => {
-  for (let child of Children.traverse(node.children)) {
+  for (let child of Tags.traverse(getTags(node))) {
     if (child.type === Property) {
-      return child.value;
+      let ref = child.value.reference;
+      if (!ref.flags.expression) {
+        return child;
+      } else {
+        let tagsIndex = getPropertyTagsIndex(node, ref.type, ref.name, 0, -1);
+        return Tags.getAt(tagsIndex, getTags(node), 2)?.value;
+      }
+      // is it shifted?
     }
   }
   return null;
 };
 
-export const getFirstNodeShiftStack = (node) => {
-  for (let child of Children.traverse(node.children)) {
-    if (child.type === Property) {
-      let { reference } = child.value;
-
-      if (!reference.flags.expression) return null;
-
-      let property = node.properties[reference.name];
-      if (reference.isArray) {
-        property = btree.getAt(-1, property.node);
-      }
-      return property.node;
-    }
-  }
-  return null;
+export const referenceIsSingular = (ref) => {
+  return (ref.name && !['#', '@'].includes(ref.type)) || ref.type === '_';
 };
 
 export const referencesAreEqual = (a, b) => {
   return (
     a === b ||
-    (a.value.name === b.value.name &&
-      a.value.isArray === b.value.isArray &&
-      a.value.flags.hasGap === b.value.flags.hasGap &&
-      a.value.flags.expression === b.value.flags.expression)
+    (a.type === b.type &&
+      a.name === b.name &&
+      a.flags.array === b.flags.array &&
+      a.flags.intrinsic === b.flags.intrinsic &&
+      a.flags.hasGap === b.flags.hasGap &&
+      a.flags.expression === b.flags.expression)
   );
 };
 
-export const getProperties = (pathSegment, properties) => {
-  let pathSegment_ = typeof pathSegment === 'string' ? buildPathSegment(pathSegment) : pathSegment;
-  if (!hasOwn(pathSegment_, 'shiftIndex')) throw new Error();
-  let { name, index, shiftIndex } = pathSegment_;
-
-  if (hasOwn(properties, name)) {
-    let prop = properties[name];
+export const isDefined = (obj, key) => hasOwn(obj, key) && obj[key] !== undefined;
+export const isUndefined = (obj, key) => !hasOwn(obj, key) || obj[key] === undefined;
 
-    if (prop.reference.isArray) {
-      prop = btree.getAt(index ?? -1, prop.node);
+export function* relatedNodes(node) {
+  for (const child of Tags.traverse(getTags(node))) {
+    if (child.type === Property) {
+      yield child.node;
     }
+  }
+}
 
-    if (!prop) return null;
+export const getProperty = (pathSegment, node) => {
+  if (!node || node.type !== TreeNode) return null;
 
-    if (prop.reference.flags.expression) {
-      prop = btree.getAt(shiftIndex ?? -1, prop.node);
-    }
+  if (pathSegment == null) throw new Error('Bad path segment');
 
-    return prop;
-  }
-  return null;
+  let { name, type, index, shiftIndex } =
+    typeof pathSegment === 'string' ? buildPathSegment(pathSegment) : pathSegment;
+
+  let propIndex = getPropertyTagsIndex(node, type, name, index, shiftIndex);
+
+  if (propIndex == null) return null;
+
+  return Tags.getAt(propIndex, getTags(node));
 };
 
-export const isDefined = (obj, key) => hasOwn(obj, key) && obj[key] !== undefined;
-export const isUndefined = (obj, key) => !hasOwn(obj, key) || obj[key] === undefined;
+export const has = (path, node) => {
+  if (!isArray(path)) {
+    path = [path];
+  }
 
-export const get = (path, node) => {
-  if (!node) throw new Error();
+  let pathArr = [...path];
+  let node_ = get(pathArr.slice(0, -1), node);
+  let seg = pathArr[pathArr.length - 1];
 
+  return !!getProperty(seg, node_);
+};
+
+export const get = (path, node) => getOr(null, path, node);
+
+export const getOr = (defaultValue, path, node) => {
   if (path == null) throw new Error('Bad path');
+  if (!node) return null;
 
   if (!isArray(path)) {
     path = [path];
   }
 
-  let node_ = node;
-  for (let i = 0; i < path.length; i++) {
+  let root = getRoot(node);
+  let result = root || node;
+
+  let start = 0;
+  // TODO allow dot dot at all levels
+  if (path[0]?.type === '_') {
+    if (!root) return null;
+    start = 1;
+  }
+
+  for (let i = start; i < path.length; i++) {
     let nameOrSeg = path[i];
     let isName = typeof nameOrSeg === 'string';
     let property;
+    let index = path[i + 1];
 
-    if (!isName && (!nameOrSeg || !hasOwn(nameOrSeg, 'shiftIndex'))) throw new Error('Bad path');
+    if (typeof index === 'number') {
+      i++;
+    } else {
+      index = undefined;
+    }
 
-    let name = isName ? nameOrSeg : nameOrSeg.name;
+    if (!isName && (!nameOrSeg || !hasOwn(nameOrSeg, 'shiftIndex'))) throw new Error('Bad path');
 
-    if (name) {
-      let { index } = nameOrSeg;
+    let seg = isName ? buildPathSegment(nameOrSeg, index) : nameOrSeg;
 
-      property = getProperties(
-        isName ? buildPathSegment(name, index) : nameOrSeg,
-        node_.properties,
-      );
+    property = getProperty(seg, result);
 
-      ({ node: node_ } = property || {});
-    } else if (!isName) {
-      let { type } = nameOrSeg;
-      if (type !== '.') throw new Error('not implemented');
+    if (!property) return defaultValue;
 
-      let refIndex = getPropertyChildrenIndex(node_, '.');
+    result = getRoot(property.value.node);
+  }
 
-      if (refIndex == null) return null;
+  return isNullNode(result) ? null : result;
+};
 
-      node_ = Children.getAt(refIndex + 2, node_.children).value.node;
-    } else {
-      throw new Error();
-    }
+export function* list(name, node) {
+  let count = countList(name, node);
 
-    if (!node_) return null;
+  for (let i = 0; i < count; i++) {
+    yield get(buildPathSegment(name, i, -1), node);
   }
+}
 
-  return node_;
+export const countList = (name, node) => {
+  if (!node) throw new Error();
+
+  if (name == null) throw new Error('Bad path');
+
+  return Tags.getAtName(name, Tags.getSums(getTags(node)).references);
 };
 
 export function* allTagPathsFor(range, options = {}) {
@@ -353,7 +654,7 @@ export function* allTagPathsFor(range, options = {}) {
 
   while (path) {
     if (path.inner && path.previousSibling.tag.type === ReferenceTag) {
-      path = new TagPath(path.inner, 0);
+      path = TagPath.from(path.inner, 0);
     }
 
     if (path.path.depth < startPath.path.depth) {
@@ -362,21 +663,17 @@ export function* allTagPathsFor(range, options = {}) {
 
     yield path;
 
-    if (
-      endPath &&
-      path.childrenIndex === endPath.childrenIndex &&
-      path.path.node === endPath.path.node
-    ) {
+    if (endPath && path.tagsIndex === endPath.tagsIndex && path.path.node === endPath.path.node) {
       return;
     }
 
-    let gapPath = path.path.parent && TagPath.from(path.path.parent, path.path.referenceIndex + 1);
+    let gapPath = path.path.parent && TagPath.from(path.path.parent, path.path.parentIndex, 1);
 
     if (
       endPath &&
       path.tag.type === CloseNodeTag &&
       gapPath &&
-      gapPath.childrenIndex === endPath.childrenIndex &&
+      gapPath.tagsIndex === endPath.tagsIndex &&
       gapPath.path.node === endPath.path.node
     ) {
       return;
@@ -392,7 +689,7 @@ export function* allTagsFor(range, options = {}) {
 }
 
 export const buildFullRange = (node) => {
-  let sum = Children.getSize(node.children);
+  let sum = Tags.getSize(getTags(node));
   return sum ? [0, sum - 1] : null;
 };
 
@@ -404,13 +701,17 @@ export function* ownTagPathsFor(range) {
 
   if (startPath.parent.node !== endPath.parent.node) throw new Error();
 
-  let { children } = startPath.parent.node;
+  let { tags } = startPath.parent.node;
 
-  for (let i = startPath.childrenIndex; i < endPath.childrenIndex; i++) {
-    yield children[i];
+  for (let i = startPath.tagsIndex; i < endPath.tagsIndex; i++) {
+    yield tags[i];
   }
 }
 
+export const buildNullNode = () => {
+  return buildNode(buildNullTag());
+};
+
 const findRight = (arr, predicate) => {
   for (let i = arr.length - 1; i >= 0; i--) {
     let value = arr[i];
@@ -457,57 +758,127 @@ const skipToDepth = (depth, frame) => {
   return parent;
 };
 
+export const getRange = (node) => {
+  const { tags } = node;
+  let path = Path.from(node);
+  return Tags.getSize(tags) ? [TagPath.from(path, 0), TagPath.from(path, -1)] : null;
+};
+
+export const getFlags = (node) => {
+  return node.type === TreeNode ? node.value.flags : null;
+};
+
+export const getAttributes = (node) => {
+  return node.type === TreeNode ? node.value.attributes : freeze({});
+};
+
+export const isSelfClosingTag = (tag) => {
+  return tag.type === OpenNodeTag
+    ? tag.value.selfClosing
+    : [NullTag, GapTag].includes(tag.type)
+    ? true
+    : false;
+};
+
 export let pathForTagPath = (tagPath) => {
   let refTagPath = tagPath;
   let isShift = tagPath.tag.type === ShiftTag;
 
   if (isShift) {
-    refTagPath = tagPath.siblingAt(tagPath.childrenIndex - tagPath.tag.value.index * 3);
+    refTagPath = tagPath.siblingAt(tagPath.tagsIndex - tagPath.tag.value.index);
   }
 
   let { type, name } = refTagPath.tag.value;
 
   if (refTagPath.tag.type !== ReferenceTag) throw new Error();
 
-  let index = getChildPropertyIndex(tagPath.node, refTagPath.childrenIndex);
+  let index = getChildPropertyIndex(tagPath.node, refTagPath.tagsIndex);
   let shiftIndex = isShift ? (tagPath.tag.value.index ?? 0) + 1 : null;
 
   return [{ type, name, index, shiftIndex }];
 };
 
+let getSigilTag_ = (tag) => {
+  switch (tag.type) {
+    case Property:
+      return getTags(tag.value.property.node)[1][0];
+    case TreeNode:
+    case NullNode:
+    case GapNode:
+      return getTags(tag)[1][0];
+    case OpenNodeTag:
+    case GapTag:
+    case NullTag:
+      return tag;
+  }
+};
+
 export const Path = class AgastPath extends WeakStackFrame {
+  static create(node) {
+    return node && new Path(node);
+  }
+
   static from(node) {
-    return node && this.create(node);
+    return node && new Path(node);
   }
 
-  constructor(parent, node, referenceIndex = null) {
-    super(parent);
+  static fromTag(openTag) {
+    return Path.from(buildNode(openTag));
+  }
+
+  static set(node, path, value) {
+    return Path.from(node).replaceAt(path, value).node;
+  }
+
+  static get(node, path) {
+    return Path.from(node).get(path).node;
+  }
+
+  constructor(nodeOrParent, parentIndex = null, isGap = false) {
+    let isRoot = !(nodeOrParent instanceof Path);
+    let parent = isRoot ? null : nodeOrParent;
+    let node = isRoot ? nodeOrParent : parent.getChild(parentIndex - 1).value.node;
+
+    if (isGap) {
+      ({ node } = BTree.getAt(-1, node.value.bounds[0]).value);
+    }
 
-    if (!(hasOwn(node, 'type') && hasOwn(node, 'properties'))) throw new Error();
+    if (!node || ![TreeNode, NullNode, GapNode].includes(node.type)) throw new Error();
 
-    if (parent && referenceIndex == null) throw new Error();
     if (!node) throw new Error();
+    if (!Object.isFrozen(node)) throw new Error();
     if (isArray(node)) throw new Error();
 
+    super(parent);
+
     this.node = node;
-    this.referenceIndex = referenceIndex; // in the parent
+    this.parentIndex = parentIndex;
+    this.isGap = isGap;
+
+    this.name = node.type === TreeNode ? node.value.name : null;
+    this.type = node.type === TreeNode ? node.value.type : null;
+    this.flags = node.type === TreeNode ? node.value.flags : null;
+    this.attributes = node.type === TreeNode ? node.value.attributes : null;
+    this.tags = getTags(node);
 
-    let referenceTag =
-      referenceIndex != null && Children.getAt(referenceIndex, parent.node.children);
+    let parentTag = parentIndex == null ? null : Tags.getAt(parentIndex, getTags(parent.node));
 
-    if (referenceTag && ![ReferenceTag, ShiftTag].includes(referenceTag.type)) {
+    if (parentTag && parentTag.type !== Property) {
       throw new Error();
     }
 
-    if (parent && (!this.reference || ![ReferenceTag, ShiftTag].includes(this.reference.type))) {
+    if (
+      parentIndex != null &&
+      (!this.referenceTag || ![ReferenceTag, ShiftTag].includes(this.referenceTag.type))
+    ) {
       throw new Error();
     }
 
     // if (
     //   parent &&
-    //   (['#', '@'].includes(this.reference.value.type)
-    //     ? parent.tagPathAt(referenceIndex + 1).tag.value
-    //     : get(pathForTagPath(parent.tagPathAt(referenceIndex)), parent.node)) !== node
+    //   (['#', '@'].includes(this.referenceTag.value.type)
+    //     ? parent.tagPathAt(parentIndex, 1).tag.value
+    //     : get(pathForTagPath(parent.tagPathAt(parentIndex)), parent.node)) !== node
     // ) {
     //   throw new Error('Path not reachable');
     // }
@@ -519,240 +890,1042 @@ export const Path = class AgastPath extends WeakStackFrame {
     freeze(this);
   }
 
+  getChild(childrenIndex) {
+    let { node } = this;
+    if (isStubNode(node)) return null;
+    return Tags.getAt(childrenIndex, getChildren(node)) || null;
+  }
+
+  getSigilTagPath() {
+    return TagPath.from(this, 0);
+  }
+
+  tagPathAt(tagsIndex, propertyIndex) {
+    return TagPath.from(this, tagsIndex, propertyIndex);
+  }
+
+  getPropertyTagPath(childrenIndex) {
+    let tagPath = this.tagPathAt(childrenIndex + 1);
+    return tagPath && tagPath.tag.type === Property ? tagPath : null;
+  }
+
+  getReferenceTagPath(childrenIndex) {
+    return this.tagPathAt(childrenIndex + 1, [0]);
+  }
+
+  // getBindings(childrenIndex) {
+  //   let property = this.getPropertyTagPath(childrenIndex);
+  //   return property && Tags.getAt([1], property.value.tags);
+  // }
+
+  getBindingTagPath(childrenIndex, bindingIndex) {
+    return this.tagPathAt(childrenIndex + 1, [1, bindingIndex]);
+  }
+
+  getNodeTagPath(childrenIndex) {
+    return this.tagPathAt(childrenIndex + 1, [2]);
+  }
+
+  getHashTagPath(childrenIndex) {
+    return this.tagPathAt(childrenIndex + 1, [3]);
+  }
+
   get openTagPath() {
     let tagPath = TagPath.from(this, 0);
-    if (tagPath.tag.type === DoctypeTag) {
-      tagPath = tagPath.nextSibling;
-    }
-    return tagPath;
+    return tagPath.tag.type === OpenNodeTag ? tagPath : null;
+  }
+
+  get closeTagPath() {
+    let tagPath = TagPath.from(this, -1);
+    return tagPath.tag.type === CloseNodeTag ? tagPath : null;
   }
 
   get openTag() {
     return this.openTagPath.tag;
   }
 
-  get closeTagPath() {
-    let tagPath = TagPath.from(this, -1);
-    if (tagPath.tag.type !== CloseNodeTag) return null;
-    return tagPath;
+  get open() {
+    return this.openTag.value;
   }
 
   get closeTag() {
     return this.closeTagPath.tag;
   }
 
-  tagPathAt(idx) {
-    return TagPath.from(this, idx);
+  get bindings() {
+    return this.parentPropertyPath?.tag.value.bindings;
+  }
+
+  get bindingTags() {
+    return this.parentPropertyPath?.tag.value.tags[1];
   }
 
   get reference() {
-    return (
-      (this.parent?.node ?? null) && Children.getAt(this.referenceIndex, this.parent.node.children)
-    );
+    return this.referenceTag?.value ?? null;
   }
 
-  get referenceTagPath() {
-    return (this.parent?.node ?? null) && new TagPath(this.parent, this.referenceIndex);
+  get referenceTag() {
+    return this.referenceTagPath?.tag ?? null;
   }
 
-  get(path) {
-    let path_ = path;
-    if (typeof path_ === 'string') {
-      path_ = [path_];
+  get referenceTagPath() {
+    if (!this.parent?.node) {
+      return null;
     }
-    if (!isArray(path_)) throw new Error();
-
-    let pathInst = this;
-    for (let i = 0; i < path_.length; i++) {
-      let nameOrSeg = path_[i];
-
-      if (isString(nameOrSeg)) {
-        nameOrSeg = { type: null, name: nameOrSeg, index: null, shiftIndex: null };
-      }
+    return TagPath.from(this.parent, this.parentIndex, 0).referenceTagPath;
+  }
 
-      let property = getProperties(nameOrSeg, pathInst.node.properties);
+  get propertyKeyTagPath() {
+    if (!this.parent?.node) {
+      return null;
+    }
+    return TagPath.from(this.parent, this.parentIndex, 0);
+  }
 
-      if (!property) return null;
+  get parentPropertyPath() {
+    if (!this.parent?.node || this.parentIndex == null) {
+      return null;
+    }
+    let path = TagPath.from(this.parent, this.parentIndex);
+    if (path.tag.type === ShiftTag) {
+      path = TagPath.from(this.parent, this.parentIndex - path.tag.value.index);
+    }
+    return path;
+  }
 
-      let { node, reference: ref } = property;
+  get parentProperty() {
+    return this.parentPropertyPath?.tag ?? null;
+  }
 
-      let shiftIndex_ = nameOrSeg.shiftIndex;
+  get parentNode() {
+    return this.parent.node;
+  }
 
-      if (shiftIndex_ && shiftIndex_ < 0) {
-        shiftIndex_ = btree.getSize(node) + shiftIndex_;
-      } else if (shiftIndex_ == null && ref.flags.expression) {
-        shiftIndex_ = 0;
+  get firstPropertyTagPath() {
+    let tagPath = this.tagPathAt(0);
+    while (tagPath && (!tagPath.propertyPath || isNullNode(tagPath.propertyPath.tag.value.node))) {
+      tagPath = tagPath.nextSibling;
+      if (tagPath?.propertyPath) {
+        tagPath = tagPath.propertyPath;
       }
-
-      let shiftOffset = shiftIndex_ ? (shiftIndex_ - 1) * 3 : 0;
-
-      pathInst = pathInst.push(
-        node,
-        getPropertyChildrenIndex(pathInst.node, nameOrSeg.type, nameOrSeg.name, nameOrSeg.index) +
-          shiftOffset,
-      );
+    }
+    return tagPath;
+  }
+
+  get lastPropertyTagPath() {
+    let tagPath = this.tagPathAt(-1);
+    while (tagPath && (!tagPath.propertyPath || isNullNode(tagPath.propertyPath.tag.value.node))) {
+      tagPath = tagPath.previousSibling;
+      if (tagPath?.propertyPath) {
+        tagPath = tagPath.propertyPath;
+      }
+    }
+    return tagPath;
+  }
+
+  get coverBoundary() {
+    let path = this;
+
+    if (path.parent && !isFragment(this.node) && isCover(path.parent.node)) {
+      path = path.parent;
+    }
+
+    while (path && isCover(path.node) && path.parent && isCover(path.parent.node)) {
+      path = path.parent;
+    }
+
+    return path;
+  }
+
+  get(path) {
+    let path_ = typeof path === 'string' ? [path] : [...path];
+    let pathInst = this;
+
+    let skippedRootFragment = false;
+
+    if (!(path.length && isObject(path[1]) && path[0].type === '_')) {
+      while (!pathInst.node.value.name && pathInst.node.value.type === Symbol.for('_')) {
+        if (pathInst.depth) throw new Error();
+        skippedRootFragment = true;
+        pathInst = pathInst.push(getPropertyTagsIndex(pathInst.node, '_', null, 0));
+      }
+    }
+
+    for (let i = 0; i < path_.length; i++) {
+      let nameOrSeg = path_[i];
+
+      let seg = nameOrSeg;
+      if (isString(nameOrSeg)) {
+        let index = path_[i + 1];
+        if (typeof index === 'number') {
+          i++;
+        } else {
+          index = undefined;
+        }
+        seg = buildPathSegment(nameOrSeg, index);
+      }
+
+      if (i === 0 && seg.type === '_' && skippedRootFragment) continue;
+
+      let tagsIndex = getPropertyTagsIndex(
+        pathInst.node,
+        seg.type,
+        seg.name,
+        seg.index,
+        seg.shiftIndex,
+      );
+
+      if (tagsIndex == null) return null;
+
+      pathInst = pathInst.push(tagsIndex);
     }
 
     return pathInst;
   }
 
+  replaceWith(node, bindingTags) {
+    let bindings = bindingTags?.map((tag) => tag.value); // TODO improve here
+    if (bindings != null && !isArray(bindings)) throw new Error();
+    if (!isPlainObject(node)) throw new Error();
+
+    if (!node) throw new Error();
+
+    if (!this.parent) {
+      return Path.from(node);
+    }
+
+    let built = node;
+    let path = this.parent;
+    let replacementPath = [];
+
+    let targetShift_ = this.parent?.parentProperty?.value.tags[0];
+    let targetShift = targetShift_ && (targetShift_.type === ReferenceTag ? null : targetShift_);
+    let targetReference = this.reference;
+    let targetBindings = bindings == null ? this.bindings : bindings;
+    let targetParentIndex = this.parentIndex;
+    let held = null;
+    let heldCount = 0;
+    let value;
+
+    while (path) {
+      value = built;
+      built = buildNode(getTags(path.node));
+
+      let { tags, shift } = Tags.getAt(targetParentIndex, getTags(path.node)).value;
+
+      let firstTag = tags[0];
+      let newFirstTag = firstTag;
+      if (shift) {
+        newFirstTag = buildChild(ReferenceTag, targetReference);
+      }
+
+      let tags_ = [
+        firstTag,
+        targetBindings.map((binding) => buildChild(BindingTag, binding)),
+        value,
+      ];
+
+      if (!held && !shift) {
+        built = buildNode(
+          Tags.replaceAt(
+            targetParentIndex,
+            built.value.tags,
+            buildChild(Property, buildProperty(tags_)),
+          ),
+        );
+        replacementPath.push(targetParentIndex);
+      } else {
+        let i = targetParentIndex + 1;
+        let nextProperty = Tags.getAt(i, built.value.tags);
+
+        let nextShift = nextProperty?.type === Property && nextProperty.value.shift;
+
+        if (nextShift) {
+          let { reference, bindings } = BTree.getAt(0, nextProperty.value.node.value.bounds[0]);
+
+          path = path.push(i);
+
+          built = buildNode(
+            Tags.replaceAt(
+              targetParentIndex - shift.index,
+              built.value.tags,
+              buildChild(Property, buildProperty(tags_)),
+            ),
+          );
+
+          targetParentIndex -= shift.index;
+          for (let i = shift.index - 1; i >= 0; i--) {
+            built = buildNode(Tags.removeAt(targetParentIndex + 1, built.value.tags));
+          }
+
+          tags_ = [newFirstTag, tags_[1], tags_[2]];
+
+          targetShift = null;
+          targetReference = reference;
+          targetBindings = bindings;
+          targetParentIndex = getPropertyTagsIndex(
+            nextProperty.value.node,
+            reference.type,
+            reference.name,
+            0,
+            0,
+          );
+          held = null;
+
+          replacementPath.push(targetParentIndex);
+          continue;
+        } else {
+          built = buildNode(
+            Tags.replaceAt(
+              targetParentIndex,
+              getTags(built),
+              buildChild(Property, buildProperty(tags_, shift)),
+            ),
+          );
+          replacementPath.push(targetParentIndex);
+        }
+      }
+
+      held = targetShift ? value : null;
+      heldCount = held ? heldCount + 1 : 0;
+
+      targetShift_ = path?.parentProperty?.value.tags[0];
+      targetShift = targetShift_ && (targetShift_.type === ReferenceTag ? null : targetShift_);
+      targetReference = path.reference;
+      targetBindings = path.bindings;
+      targetParentIndex = path.parentIndex;
+      path = path.parent;
+    }
+
+    return this.mapOnto(built);
+  }
+
+  replaceAt(path, node, bindings) {
+    return this.get(path).replaceWith(node, bindings).atDepth(0);
+  }
+
+  mapOnto(rootNode) {
+    let path = Path.from(rootNode);
+
+    for (let i = 1; i <= this.depth; i++) {
+      let { parentIndex, isGap } = this.atDepth(i);
+      path = path.push(parentIndex, isGap);
+    }
+
+    return path;
+  }
+
   atDepth(depth) {
     return skipToDepth(depth, this);
   }
+
+  get rootNode() {
+    return this.atDepth(0).node;
+  }
+
+  get done() {
+    let { parent, node } = this;
+    let sigilTag = getSigilTag(node);
+
+    return !parent && sigilTag && !!(isSelfClosingTag(sigilTag) || getCloseTag(node));
+  }
+
+  get held() {
+    let tagPath = this.tagPathAt(-1);
+
+    // TODO is this safe
+    if (tagPath.tag.type !== Property) return null;
+
+    let { tags } = tagPath.tag.value;
+
+    if (tags[0]?.type === ShiftTag && !tags[2]) {
+      return TagPath.from(tagPath.path, tagPath.tagsIndex - 1).tag.value;
+    }
+
+    // if we're not at the left side, we aren't held
+    if (
+      !tagPath.equalTo(this.firstPropertyTagPath) ||
+      propertyIsFull(tagPath.tag) ||
+      (tagPath.inner && nodeIsComplete(tagPath.inner.node))
+    ) {
+      return null;
+    }
+
+    let coverParent = this;
+
+    for (;;) {
+      let refPath = coverParent.propertyKeyTagPath;
+
+      if (refPath?.tag.type === ShiftTag) {
+        return TagPath.from(refPath.path, refPath.tagsIndex - 1).tag.value;
+      }
+
+      coverParent = coverParent.parent;
+      if (coverParent?.node.type !== Symbol.for('_')) break;
+    }
+
+    return null;
+  }
+
+  advance(tag) {
+    if (!tag) throw new Error();
+
+    let tagPath = this.tagPathAt(-1, 2);
+
+    if (tagPath?.tag.type === Property ? tagPath?.nextSibling : tagPath?.next) throw new Error();
+
+    if (this.done) throw new Error();
+
+    let resultPath = this;
+
+    switch (tag.type) {
+      case BindingTag: {
+        if (!this.lastPropertyTagPath) {
+          resultPath = this.advanceUnwrapped(buildReferenceTag()).path;
+        }
+        break;
+      }
+
+      case TreeNode:
+      case NullNode:
+      case GapNode:
+      case NullTag:
+      case GapTag:
+      case OpenNodeTag: {
+        let sigilTag = getSigilTag_(tag);
+
+        if (sigilTag.type === OpenNodeTag && sigilTag.value.type === Symbol.for('__')) {
+          break;
+        }
+
+        let lastTagPath = this.lastPropertyTagPath;
+        let newProperty = !lastTagPath || propertyIsFull(lastTagPath.tag);
+        let reference = lastTagPath?.referenceTagPath.tag.value;
+
+        // TODO revisit this condition
+        if (!getFlags(this.node)?.token || reference?.type === '@') {
+          if (newProperty || !lastTagPath.tag.value.tags.length) {
+            resultPath = this.advanceUnwrapped(buildReferenceTag()).path;
+          }
+        }
+
+        break;
+      }
+    }
+
+    if (tag.type === Property) {
+      resultPath = Path.from(buildNode(Tags.push(getTags(resultPath.node), tag)));
+    } else {
+      resultPath = resultPath.advanceUnwrapped(tag).path;
+    }
+
+    if (
+      (tag.type === CloseNodeTag || (tag.type === OpenNodeTag && tag.value.selfClosing)) &&
+      resultPath.depth
+    ) {
+      return resultPath.parent;
+    }
+
+    return resultPath;
+  }
+
+  advanceUnwrapped(tag) {
+    if (!tag) throw new Error();
+
+    let tagPath = this.tagPathAt(-1, [-1, -1]);
+
+    if (
+      [TreeNode, NullNode, GapNode].includes(tagPath?.tag.type)
+        ? tagPath?.nextSibling
+        : tagPath?.next
+    )
+      throw new Error();
+
+    if (this.done) throw new Error();
+
+    let targetPath = tagPath && endsNode(tagPath.tag) ? this.parent : this;
+
+    switch (tag.type) {
+      case ReferenceTag: {
+        let { type, name, flags } = tag.value;
+
+        if ([ReferenceTag, ShiftTag, BindingTag].includes(targetPath.tagPathAt(-1, -1)?.tag.type))
+          throw new Error('invalid location for reference');
+        if (!name && !type) throw new Error();
+
+        if (flags.hasGap && flags.intrinsic) throw new Error();
+        if (type && !['_', '.', '#', '@'].includes(type)) throw new Error();
+        if (flags.array && ['_', '#', '@'].includes(type)) throw new Error();
+        if (getFlags(targetPath.node).token && type !== '@') throw new Error();
+        if (targetPath.open.type === Symbol.for('_') && name != null) throw new Error();
+        if (targetPath.open.type === Symbol.for('_') && !['_', '#'].includes(type))
+          throw new Error();
+
+        if (tag.value.name) {
+          let property = getProperty(tag.value.name, targetPath.node);
+          if (
+            getOr(null, tag.value.name, targetPath.node) &&
+            !property.value.shift &&
+            !referencesAreEqual(tag.value, property.value.reference)
+          ) {
+            throw new Error('mismatched references');
+          }
+        } else if (tag.value.type === '_') {
+          let rootIdx = getPropertyTagsIndex(targetPath.node, '_', null, 0);
+
+          if (
+            rootIdx != null &&
+            !referencesAreEqual(
+              tag.value,
+              Tags.getAt(rootIdx, getTags(targetPath.node)).value.property.reference,
+            )
+          ) {
+            throw new Error('mismatched references');
+          }
+        }
+
+        let property = buildChild(Property, buildProperty([tag]));
+
+        targetPath = targetPath.replaceWith(
+          buildNode(Tags.push(getTags(targetPath.node), property)),
+        );
+        break;
+      }
+
+      case BindingTag: {
+        if (![ReferenceTag, ShiftTag].includes(this.tagPathAt(-1, -1).tag.type)) {
+          throw new Error('Invalid location for BindingTag');
+        }
+        if (!tag.value.segments) throw new Error();
+
+        let refPath = this.tagPathAt(-1, 0);
+        let propPath = TagPath.from(refPath.path, refPath.tagsIndex);
+
+        let { shift } = propPath.tag.value;
+
+        if (![ReferenceTag, ShiftTag].includes(refPath.tag.type)) throw new Error();
+
+        if (refPath.tag.type === ShiftTag) {
+          refPath = TagPath.from(refPath.path, refPath.tagsIndex - shift.index, 0);
+        }
+
+        let { 0: firstTag, 1: bindingTags = [] } = propPath.tag.value.tags;
+        let tags = [firstTag, [...bindingTags, tag]];
+        let property = buildChild(Property, buildProperty(tags, shift));
+
+        targetPath = this.replaceWith(
+          buildNode(Tags.replaceAt(propPath.tagsIndex, getTags(this.node), property)),
+        );
+        break;
+      }
+
+      case OpenNodeTag: {
+        let { literalValue, flags, type } = tag.value;
+
+        if (this.held && flags.token) throw new Error();
+
+        if (type === Symbol.for('__')) {
+          throw new Error('not implemented');
+        }
+
+        let refTag = this.node && Tags.getAt(-1, getChildren(this.node)).value.tags[0];
+
+        if (![ReferenceTag, ShiftTag].includes(refTag.type)) throw new Error();
+
+        let node = buildNode(tag);
+
+        if (literalValue && !flags.token) {
+          throw new Error();
+        }
+
+        targetPath = this.advanceUnwrapped(node).path;
+
+        targetPath = targetPath.tagPathAt(-1).inner;
+
+        break;
+      }
+
+      case GapTag:
+      case NullTag: {
+        // if (getSigilTag(this.node)) throw new Error();
+        if (this.tagPathAt(-1, 0).tag.type !== ReferenceTag) {
+          throw new Error('Invalid location for NullTag');
+        }
+
+        let node = buildNode(tag);
+
+        targetPath = this.advanceUnwrapped(node).path;
+        // targetPath = targetPath.tagPathAt(-1).inner; // ?
+
+        break;
+      }
+
+      case CloseNodeTag: {
+        let { node } = targetPath;
+
+        let lastChild = targetPath.getChild(-1);
+
+        if (lastChild?.type === Property && !propertyIsFull(lastChild)) throw new Error();
+
+        let openTag = getOpenTag(node);
+
+        if (!openTag) throw new Error();
+        if (openTag.value.selfClosing) throw new Error();
+
+        targetPath = targetPath.replaceWith(buildNode(Tags.push(getTags(node), tag)));
+        break;
+      }
+
+      case NullNode:
+      case GapNode:
+      case TreeNode: {
+        let node = tag;
+        let parentPath = targetPath;
+        let { node: parentNode } = parentPath;
+
+        let tagPath = TagPath.from(parentPath, -1);
+
+        if (isMultiFragment(node)) {
+          let existingProperty = tagPath;
+
+          while (existingProperty?.tag.type === AttributeDefinition) {
+            existingProperty = existingProperty.previousSibling.propertyPath;
+          }
+
+          if (
+            existingProperty.tag.type !== OpenNodeTag &&
+            existingProperty.tag &&
+            !propertyIsFull(existingProperty.tag)
+          ) {
+            throw new Error();
+          }
+
+          let newPath = Path.from(buildNode(this.node.value.tags));
+
+          for (let tag of Tags.traverse(node.value.children)) {
+            if (tag.type === Property) {
+              newPath = newPath.advance(tag);
+            } else {
+              newPath = newPath.advanceUnwrapped(tag).path.atDepth(0);
+            }
+          }
+
+          targetPath = this.replaceWith(newPath.node);
+          break;
+        }
+
+        let shift = tagPath.tag.type === Property ? tagPath.tag.value.shift : undefined;
+        let { held } = this;
+
+        if (held) {
+          // let heldProperty = this.tagPathAt(-2, 2).tag.value;
+          let matchesHeld = isGapNode(node);
+          if (getRoot(node)) {
+            matchesHeld =
+              matchesHeld ||
+              isGapNode(node) ||
+              held.node === node ||
+              held.node === (getOriginalFirstNode(getRoot(node)) || held.node);
+            if (!matchesHeld) {
+              // TODO We're passing by the node that shifted if it's a cover!
+              throw new Error();
+            }
+          }
+        }
+
+        if (propertyIsFull(tagPath.tag)) {
+          let tags = [null, [], node];
+          let property = buildChild(Property, buildProperty(tags, shift));
+
+          targetPath = this.replaceWith(buildNode(Tags.push(parentNode.value.tags, property)));
+        } else {
+          let { 0: firstTag, 1: bindingTags = [] } = tagPath.tag.value.tags;
+          let tags = [firstTag, bindingTags, node];
+          let property = buildChild(Property, buildProperty(tags, shift));
+
+          targetPath = this.replaceWith(
+            buildNode(Tags.replaceAt(tagPath.tagsIndex, parentNode.value.tags, property)),
+          );
+        }
+
+        break;
+      }
+
+      case AttributeDefinition: {
+        if (this.held) throw new Error('invalid place for an attribute binding');
+
+        let lastChild = this.getChild(-1);
+
+        if (lastChild?.type === Property && !propertyIsFull(lastChild)) throw new Error();
+
+        // add undefined attributes from value
+        let { node } = this;
+        if (tag.type !== AttributeDefinition) throw new Error();
+
+        let { path, value } = tag.value;
+        let openTag = getOpenTag(node);
+        let { attributes } = node.value;
+
+        if (!objHas(attributes, path) && objGet(attributes, path) !== undefined)
+          throw new Error('Can only define undefined attributes');
+
+        if (value === undefined) throw new Error('cannot define attribute to undefined');
+
+        let { flags, name } = openTag.value;
+        attributes = immSet(attributes, path, value);
+        let newOpenTag = buildOpenNodeTag(flags, name, null, attributes);
+
+        targetPath = this.replaceWith(
+          buildNode(Tags.push(Tags.replaceAt(0, getTags(node), newOpenTag), tag)),
+        );
+        break;
+      }
+
+      case ShiftTag: {
+        let lastPropertyTag = this.tagPathAt(-1).tag;
+
+        if (lastPropertyTag.type !== Property) throw new Error();
+
+        let { reference, shift: heldShift } = lastPropertyTag.value;
+
+        if (!reference) {
+          ({ reference } = this.tagPathAt(-1 - (heldShift?.index ?? 0)).tag.value);
+        }
+
+        if (!reference.flags.expression && reference.type !== '_') throw new Error();
+
+        let shift = heldShift
+          ? buildShift(heldShift.index + 1, heldShift.height + 1)
+          : buildShift(1, 3);
+
+        let property = buildChild(Property, buildProperty([tag], shift));
+
+        targetPath = this.replaceWith(buildNode(Tags.push(this.node.value.tags, property)));
+        break;
+      }
+
+      case LiteralTag:
+        if (typeof tag.value !== 'string') throw new Error();
+
+        targetPath = this.replaceWith(buildNode(Tags.push(this.node.value.tags, tag)));
+        break;
+
+      default:
+        throw new Error();
+    }
+
+    return targetPath && TagPath.from(targetPath, -1, isNodeTag(tag) ? -1 : offsetForTag(tag));
+  }
 };
 
+Object.freeze(Path.prototype);
+
 export const tagPathsAreEqual = (a, b) => {
   if (a == null || b == null) return b == a;
-  return a.path.node === b.path.node && a.childrenIndex === b.childrenIndex;
+  return a.path.node === b.path.node && a.tagsIndex === b.tagsIndex;
 };
 
 export class TagPath {
-  constructor(path, childrenIndex) {
-    if (path == null || childrenIndex == null) throw new Error();
+  static from(path, tagsIndex, propertyIndex) {
+    let tags = getTags(path.node);
+    let size = Tags.getSize(tags);
+    let index = Number.isFinite(tagsIndex) && tagsIndex < 0 ? size + tagsIndex : tagsIndex;
+
+    let propertyIndex_ = typeof propertyIndex === 'number' ? [propertyIndex] : propertyIndex;
+
+    let propTag = Tags.getAt(index, tags);
+
+    if (
+      [OpenNodeTag, CloseNodeTag, LiteralTag, AttributeDefinition, GapTag, NullTag].includes(
+        propTag?.type,
+      )
+    ) {
+      propertyIndex_ = [];
+    }
+
+    let resolvedPropertyIndex =
+      propTag && (propertyIndex_?.length ? Tags.findPath(propertyIndex_, propTag.value.tags) : []);
+
+    return resolvedPropertyIndex && new TagPath(path, index, resolvedPropertyIndex);
+  }
+
+  static fromNode(node, tagsIndex, propertyIndex) {
+    return TagPath.from(Path.from(node), tagsIndex, propertyIndex);
+  }
+
+  static fromTag(openTag) {
+    return TagPath.fromNode(buildNode(openTag), 0);
+  }
+
+  constructor(path, tagsIndex, propertyIndex) {
+    if (path == null) throw new Error();
+    if (path.tag) throw new Error();
+    if (!Number.isFinite(tagsIndex) || tagsIndex < 0) throw new Error();
+    if (!isArray(propertyIndex)) throw new Error();
+
+    let propertyIndex_ = Object.freeze([...propertyIndex]);
 
-    let tag = Children.getAt(childrenIndex, path.node.children);
+    let tag = Tags.getAt(tagsIndex, getTags(path.node));
 
-    if (tag == null) throw new Error();
+    if (propertyIndex_.length) {
+      tag = Tags.getAt(propertyIndex_, tag.value.tags);
+    }
+
+    if (tag == null || isArray(tag)) throw new Error();
+
+    for (let segment of propertyIndex_) {
+      if (!isPlainObject(segment) || !(segment.index === 0 || segment.index > 0)) throw new Error();
+    }
 
     this.path = path;
+    this.tagsIndex = tagsIndex;
+    this.propertyIndex = propertyIndex_;
+
     this.node = path.node;
     this.tag = tag;
-    this.childrenIndex = childrenIndex;
+
+    if (tag.type === Property && propertyIndex_.length) throw new Error();
 
     freeze(this);
   }
 
-  static from(path, childrenIndex) {
-    let size = Children.getSize(path.node.children);
-    let index = childrenIndex < 0 ? size + childrenIndex : childrenIndex;
-
-    return index >= 0 && index < size ? new TagPath(path, index) : null;
+  get child() {
+    return this.tag;
   }
 
-  static fromNode(node, childrenIndex) {
-    return TagPath.from(Path.from(node), childrenIndex);
+  get parentNode() {
+    return this.path.parentNode;
   }
 
-  get child() {
-    return this.tag;
+  get depth() {
+    return this.path.depth;
   }
 
   siblingAt(index) {
     return TagPath.from(this.path, index);
   }
 
+  mapOnto(rootNode) {
+    let path = this.path.mapOnto(rootNode);
+
+    return TagPath.from(path, this.tagsIndex, this.propertyIndex);
+  }
+
+  get referenceTagPath() {
+    let path = TagPath.from(this.path, this.tagsIndex, 0);
+    if (path && path.propertyPath) {
+      let { shift } = path.propertyPath.tag.value;
+      if (shift) {
+        path = TagPath.from(this.path, this.tagsIndex - shift.index, 0);
+      }
+    }
+    return path?.tag.type === ReferenceTag ? path : null;
+  }
+
+  get nextProperty() {
+    let { path, tagsIndex } = this;
+
+    let nextChild = TagPath.from(path, tagsIndex + 1);
+
+    return nextChild?.tag.type === Property ? nextChild : null;
+  }
+
   get nextSibling() {
-    const { path, childrenIndex } = this;
+    let { path, tagsIndex, propertyIndex } = this;
+
+    let propertyIndex0 = propertyIndex[0]?.index;
 
-    const child =
-      childrenIndex + 1 >= Children.getSize(path.node.children)
-        ? null
-        : Children.getAt(childrenIndex + 1, path.node.children);
+    let nextChildIndex = tagsIndex === 0 ? 0 : tagsIndex - 1 + 1;
+    let nextChild = path.getChild(nextChildIndex);
 
-    return child && new TagPath(path, childrenIndex + 1);
+    if (propertyIndex0 == null && !nextChild) {
+      return this.tag.type === CloseNodeTag ? null : path.closeTagPath;
+    }
+
+    switch (propertyIndex0) {
+      case 0:
+      case 1: {
+        let childIndex = tagsIndex - 1;
+        let bindingIndex = propertyIndex[1]?.index ?? -1;
+        let binding = path.getBindingTagPath(childIndex, bindingIndex + 1);
+        if (binding) return binding;
+        return path.getNodeTagPath(childIndex);
+      }
+      case 2:
+      default: {
+        if (!nextChild || nextChild.type !== Property) {
+          return path.tagPathAt(tagsIndex + 1);
+        } else {
+          let ref = path.getReferenceTagPath(nextChildIndex);
+          if (ref) return ref;
+          let binding = path.getBindingTagPath(nextChildIndex, 0);
+          if (binding) return binding;
+          return path.getNodeTagPath(nextChildIndex);
+        }
+      }
+    }
+  }
+
+  get previousSibling() {
+    let { path, tagsIndex, propertyIndex } = this;
+
+    let propertyIndex0 = propertyIndex[0]?.index;
+
+    if (!tagsIndex) return null;
+
+    let prevChildIndex = tagsIndex === 0 ? 0 : tagsIndex - 1 - 1;
+    let prevChild = path.getChild(prevChildIndex);
+
+    if (!prevChild) {
+      return path.getOpenTagPath();
+    }
+
+    if (propertyIndex0) {
+      if (propertyIndex0 > 0) {
+        let property = path.getChild(tagsIndex - 1);
+        let bindingIndex = propertyIndex[1]?.index ?? property.value.bindings.length;
+        let binding = path.getBindingTagPath(tagsIndex - 1, bindingIndex - 1);
+        if (binding) return binding;
+      }
+
+      let ref = path.getReferenceTagPath(tagsIndex - 1);
+      if (ref) return ref;
+    }
+
+    return prevChild && prevChild.type === Property
+      ? path.getNodeTagPath(tagsIndex - 1 - 1)
+      : prevChild;
   }
 
   get next() {
-    let { path, childrenIndex } = this;
+    let { path, tagsIndex, propertyIndex } = this;
+
+    propertyIndex = [...propertyIndex];
 
     let leaving = false;
 
     for (;;) {
-      let prevTag = Children.getAt(childrenIndex - 1, path.node.children);
-      let tag = Children.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
-      let wasLeaving = leaving;
+      let tag = Tags.getAt(tagsIndex, getTags(path.node));
+      let propTag = tag;
+      let lastRef = null;
       leaving = false;
 
       if (!tag) return null;
 
-      // done
-      if (!isInitialTag && tag.type !== Property) {
-        return new TagPath(path, childrenIndex);
-      }
-
-      // in
-      if (tag.type === Property && !wasLeaving) {
-        // jump to gap tag?
-        if (
-          path.parent &&
-          tag.value.reference.flags.expression &&
-          (childrenIndex === 3 ||
-            (childrenIndex === 5 &&
-              Children.getAt(2, path.node.children).type === InitializerTag)) &&
-          Children.getAt(path.referenceIndex, path.parent.node.children)?.type === ShiftTag
-        ) {
-          let { reference: ref } = tag.value;
-          let shiftStack = path.node.properties[ref.name].node;
-
-          if (ref.isArray) {
-            shiftStack = btree.getAt(-1, shiftStack).node;
-          }
-          let gapNode = btree.getAt(0, shiftStack).node;
+      if (tag.type === Property) {
+        if (propertyIndex.length === 0 && !leaving) {
+          propertyIndex.push({ index: 0, node: tag.value.tags });
+        }
 
-          path = new Path(path, gapNode, childrenIndex - 2);
-          childrenIndex = 0;
-          continue;
+        if (propertyIndex != null) {
+          propTag = Tags.getAt(propertyIndex, tag.value.tags);
+          lastRef = Tags.getAt(0, tag.value.tags);
         }
+      }
 
-        path = path.push(tag.value.node, childrenIndex - 2);
-        childrenIndex = 0;
+      if (isArray(propTag)) {
+        if (propTag.length) {
+          // enter bindings array
+          propertyIndex.push({ index: 0, node: propTag });
+          propTag = propTag[propertyIndex[1].index];
+        } else {
+          propertyIndex = [{ index: propertyIndex[0].index + 1, node: tag }];
+        }
         continue;
       }
 
+      let isInitialTag =
+        path.node === this.path.node &&
+        tagsIndex === this.tagsIndex &&
+        arraysEqual(propertyIndex, this.propertyIndex);
+
+      // done
+      if (!isInitialTag && !isNodeTag(propTag)) {
+        return TagPath.from(path, tagsIndex, propertyIndex);
+      }
+
       // shift
-      if (tag.type === BindingTag && prevTag.type === ShiftTag) {
-        let refIndex = childrenIndex - 1 - prevTag.value.index * 3;
+      if (propTag.type === BindingTag && lastRef.type === ShiftTag) {
+        let lastProp = Tags.getAt(tagsIndex, path.tags);
+        let { shift } = lastProp.value;
+        let refIndex = tagsIndex - shift.index;
         if (refIndex < 0) throw new Error();
-        let refTag = Children.getAt(refIndex, path.node.children);
-
-        const { name, isArray } = refTag.value;
-        let pathDesc = buildPathSegment(name);
-        let index;
-        if (isArray) {
-          index = getChildPropertyIndex(path.node, refIndex);
-          pathDesc = buildPathSegment(name, index);
-        }
+        let refTag = Tags.getAt(refIndex, path.tags, 0);
 
-        // HMM
-        pathDesc.shiftIndex = prevTag.value.height;
+        if (refTag.type !== ReferenceTag) throw new Error();
 
-        if (index !== -1) {
-          path = path.get([pathDesc]);
+        let { node } = tag.value;
+        if (!node) return null;
 
-          if (!path) return null;
+        path = new Path(path, tagsIndex);
 
-          childrenIndex = 0;
-          continue;
-        }
+        if (!path) return null;
+
+        tagsIndex = 0;
+        propertyIndex = [];
+        continue;
       }
 
+      let { nextSibling } = this;
+
       // over
-      if (path.node && childrenIndex + 1 < Children.getSize(path.node.children)) {
-        childrenIndex++;
-        continue;
+      if (nextSibling) {
+        ({ tagsIndex, propertyIndex } = nextSibling);
+        // in
+        if (isNodeTag(nextSibling.tag)) {
+          let shiftPath = path;
+
+          while (
+            shiftPath.parent &&
+            !Tags.getAt(shiftPath.parentIndex - 1, shiftPath.parent.node.value.children).value.shift
+          ) {
+            shiftPath = shiftPath.parent;
+          }
+
+          let isGap =
+            path.parent &&
+            tagsIndex === 1 &&
+            shiftPath.parent &&
+            Tags.getAt(shiftPath.parentIndex - 1, shiftPath.parent.node.value.children).value
+              .shift &&
+            tag.value.node ===
+              Tags.getAt(shiftPath.parentIndex - 2, shiftPath.parent.node.value.children).value
+                .node;
+
+          path = new Path(path, tagsIndex, isGap);
+          tagsIndex = 0;
+          propertyIndex = [];
+          continue;
+        } else {
+          return nextSibling;
+        }
       }
 
       // out
-      if (path.referenceIndex != null && path.parent) {
+      if (path.parentIndex != null && path.parent) {
         do {
           if (
-            path.parent &&
-            Children.getAt(path.referenceIndex, path.parent.node.children)?.type === ShiftTag
+            path.coverBoundary.parent &&
+            Tags.getAt(
+              [path.coverBoundary.parentIndex, 0],
+              path.coverBoundary.parent.node.value.tags,
+            )?.type === ShiftTag
           ) {
-            childrenIndex =
-              Children.getSize(path.parent.node.children) > path.referenceIndex + 2
-                ? path.referenceIndex + 2
+            // while
+            tagsIndex =
+              Tags.getSize(path.parent.node.value.tags) > path.parentIndex + 1
+                ? path.parentIndex + 1
                 : null;
           } else {
-            childrenIndex = path.referenceIndex + 2;
+            tagsIndex = path.parentIndex + 1;
           }
 
+          propertyIndex = [];
           path = path.parent;
           leaving = true;
 
           if (!path) return null;
-        } while (childrenIndex == null);
+        } while (tagsIndex == null);
 
         leaving = true;
         continue;
@@ -763,124 +1936,91 @@ export class TagPath {
   }
 
   get nextUnshifted() {
-    let { path, childrenIndex } = this;
+    let { path, tagsIndex, propertyIndex } = this;
+
+    propertyIndex = [...propertyIndex];
 
     let leaving = false;
 
     for (;;) {
-      let tag = Children.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
+      let tag = Tags.getAt(tagsIndex, getTags(path.node));
+      let propTag = tag;
       let wasLeaving = leaving;
       leaving = false;
 
       if (!tag) return null;
 
-      if (tag.type === ReferenceTag && tag.value.flags.expression) {
-        // look forward for another reference
-        let offset = 1;
-        let tag_ = tag;
-        do {
-          tag_ = Children.getAt(childrenIndex + offset, path.node.children);
-          offset++;
-
-          if (tag_?.type === InitializerTag) break;
-        } while (tag_ && [BindingTag, ShiftTag].includes(tag_.type));
-        if (!tag_) {
-          return null;
+      if (tag.type === Property) {
+        if (propertyIndex.length === 0 && !leaving) {
+          propertyIndex.push({ index: 0, node: tag.value.tags });
         }
-      }
 
-      // done
-      if (!isInitialTag && tag.type !== Property) {
-        return new TagPath(path, childrenIndex);
-      }
-
-      // in
-      if (
-        tag.type === Property &&
-        !wasLeaving &&
-        !(Children.getAt(childrenIndex + 1, path.node.children)?.type === ShiftTag)
-      ) {
-        // TODO use properties to skip over a lot of tag walking
-        path = path.push(tag.value.node, childrenIndex - 2);
-        childrenIndex = 0;
-        continue;
+        if (propertyIndex != null) {
+          propTag = Tags.getAt(propertyIndex, tag.value.tags);
+        }
       }
 
-      // over
-      if (path.node && childrenIndex + 1 < Children.getSize(path.node.children)) {
-        childrenIndex++;
+      if (isArray(propTag)) {
+        if (propTag.length) {
+          // enter bindings array
+          propertyIndex.push({ index: 0, node: propTag });
+          propTag = propTag[propertyIndex[1].index];
+        } else {
+          propertyIndex = [{ index: propertyIndex[0].index + 1, node: tag }];
+        }
         continue;
-      }
-
-      // out
-      if (path.referenceIndex != null) {
-        do {
-          childrenIndex = path.referenceIndex + 2;
-
-          path = path.parent;
-          leaving = true;
-        } while (childrenIndex == null);
-
-        leaving = true;
+      } else if (isNodeTag(propTag) && !leaving) {
+        path = path.push(tagsIndex);
+        tagsIndex = 0;
+        propertyIndex = [];
         continue;
       }
 
-      return null;
-    }
-  }
-
-  get previousSibling() {
-    const { path, childrenIndex } = this;
-
-    const child = childrenIndex - 1 < 0 ? null : btree.getAt(childrenIndex - 1, path.node.children);
-
-    return child && new TagPath(path, childrenIndex - 1);
-  }
-
-  get previous() {
-    throw new Error('not implemented');
-  }
+      let isInitialTag =
+        path.node === this.path.node &&
+        tagsIndex === this.tagsIndex &&
+        arraysEqual(propertyIndex, this.propertyIndex);
 
-  get previousUnshifted() {
-    let { path, childrenIndex } = this;
+      if (!wasLeaving && propTag.type === ReferenceTag && propTag.value.flags.expression) {
+        // move past shifts
 
-    let leaving = false;
+        let shifts = 0;
+        let shiftedTag = Tags.getAt(tagsIndex + 1, getTags(path.node));
 
-    for (;;) {
-      let tag = Children.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
-      let wasLeaving = leaving;
-      leaving = false;
+        while (shiftedTag?.type === Property && shiftedTag.value.shift) {
+          shifts++;
+          propertyIndex = [{ index: 1, node: shiftedTag.value.tags }];
+          shiftedTag = Tags.getAt(tagsIndex + 1 + shifts, path.tags);
+        }
 
-      if (!tag) return null;
+        if (shifts) {
+          tagsIndex += shifts;
+          continue;
+        }
+      }
 
       // done
-      if (!isInitialTag && tag.type !== ShiftTag && tag.type !== Property) {
-        return new TagPath(path, childrenIndex);
+      if (!isInitialTag && !isNodeTag(propTag) && !isArray(propTag)) {
+        return TagPath.from(path, tagsIndex, propertyIndex);
       }
 
-      // in
-      if (tag.type === Property && !wasLeaving) {
-        path = path.push(tag.value.node, childrenIndex - 1);
-        childrenIndex = Children.getSize(tag.value.children) - 1;
-        continue;
-      }
+      let { nextSibling } = TagPath.from(path, tagsIndex, propertyIndex);
 
       // over
-      if (path.node && childrenIndex + 1 < Children.getSize(path.node.children)) {
-        childrenIndex--;
+      if (nextSibling) {
+        ({ tagsIndex, propertyIndex } = nextSibling);
         continue;
       }
 
       // out
-      if (path.referenceIndex != null) {
+      if (path.parentIndex != null) {
         do {
-          childrenIndex = path.referenceIndex;
+          tagsIndex = path.parentIndex + 1;
 
           path = path.parent;
           leaving = true;
-        } while (childrenIndex == null);
+          if (!path) return null;
+        } while (tagsIndex == null);
 
         leaving = true;
         continue;
@@ -890,40 +2030,52 @@ export class TagPath {
     }
   }
 
-  get innerNode() {
-    return this.inner?.node;
+  get previous() {
+    throw new Error('not implemented');
   }
 
-  get inner() {
-    let { tag, previousSibling } = this;
+  get previousUnshifted() {
+    throw new Error('not implemented');
+  }
 
-    let refPath = previousSibling?.previousSibling;
+  get propertyPath() {
+    let { path, tagsIndex } = this;
 
-    if (tag.type !== Property) {
-      return null;
-    }
+    let tag = Tags.getAt(tagsIndex, getTags(path.node));
 
-    let shiftPath = null;
-    if (refPath.tag.type === ShiftTag) {
-      shiftPath = refPath;
-      refPath = TagPath.from(this.path, this.childrenIndex - refPath.tag.value.index * 3 - 2);
-    }
+    return tag.type === Property ? path.tagPathAt(tagsIndex) : null;
+  }
 
-    if (refPath.tag.type !== ReferenceTag) throw new Error();
+  get innerNode() {
+    return this.inner?.node;
+  }
 
-    const { type, name } = refPath.tag.value;
+  get inner() {
+    let { tagsIndex, tag } = this;
 
-    return this.path.get([
-      buildFullPathSegment(
-        type,
-        name,
-        getChildPropertyIndex(refPath.path.node, refPath.childrenIndex),
-        shiftPath?.tag.value.index,
-      ),
-    ]);
+    let node;
+    switch (tag.type) {
+      case Property: {
+        ({ node } = tag.value);
+        break;
+      }
+      case TreeNode: {
+        node = tag;
+        break;
+      }
+      default:
+        throw new Error();
+    }
+    return node && this.path.push(tagsIndex);
   }
 
   equalTo(tagPath) {
-    return this.node === tagPath.node && this.childrenIndex === tagPath.childrenIndex;
+    return (
+      this.node === tagPath.node &&
+      this.tagsIndex === tagPath.tagsIndex &&
+      arraysEqual(this.propertyIndex, tagPath.propertyIndex)
+    );
   }
 }
+
+Object.freeze(TagPath.prototype);