@bablr/agast-helpers 0.7.1 → 0.9.0

package/lib/path.js

@@ -1,72 +1,154 @@
 import { WeakStackFrame } from '@bablr/weak-stack';
-import * as btree from '@bablr/agast-helpers/btree';
-import * as sumtree from '@bablr/agast-helpers/sumtree';
+import * as BTree from '@bablr/agast-helpers/btree';
+import * as Tags from './tags.js';
 import {
   ReferenceTag,
   InitializerTag,
-  EmbeddedNode,
   DoctypeTag,
-  OpenNodeTag,
   CloseNodeTag,
   GapTag,
   NullTag,
   ShiftTag,
+  BindingTag,
+  PropertyWrapper,
+  Property,
 } from './symbols.js';
-import {
-  buildInitializerTag,
-  buildEmbeddedNode,
-  buildGapTag,
-  buildReferenceTag,
-  buildShiftTag,
-} from './builders.js';
+import { isPlainObject, isString } from './object.js';
+import { buildBinding, buildChild, buildProperty, buildPropertyWrapper } from './builders.js';
+import { buildReferenceTag, finalizeNode } from './tree.js';
 
-export const getOpenTag = (node) => {
-  if (!node.children.length) return null;
-  let tag = sumtree.getAt(0, node.children);
-  if (tag.type === NullTag || tag.type === GapTag) return null;
-  if (tag.type === DoctypeTag) {
-    tag = sumtree.getAt(1, node.children);
+export const wrapperIsFull = (wrapper) => {
+  let { tags } = wrapper.value;
+
+  if (tags[1]?.type === InitializerTag) {
+    return true;
+  } else {
+    return tags.length === 3;
+  }
+};
+
+export const offsetForTag = (tag) => {
+  switch (tag.type) {
+    case ReferenceTag:
+    case ShiftTag:
+      return 0;
+    case BindingTag:
+    case InitializerTag:
+      return 1;
+  }
+};
+
+export const buildPathSegment = (name, index = null, shiftIndex = null) => {
+  if (!name) throw new Error();
+  return { type: null, name, index, shiftIndex };
+};
+
+export const buildTypePathSegment = (type, index = null, shiftIndex = null) => {
+  if (!type) throw new Error();
+  return { type, name: null, index, shiftIndex };
+};
+
+export const buildFullPathSegment = (type, name, index = null, shiftIndex = null) => {
+  return { type, name, index, shiftIndex };
+};
+
+export const getRootProperty = (node, index = 0) => {
+  if (node == null || !isFragmentNode(node)) {
+    return null;
+  }
+  let idx = getPropertyTagsIndex(node, '.', null, index);
+
+  if (idx == null) return null;
+
+  let tag = Tags.getAt(idx, node.tags);
+
+  if (tag.type !== PropertyWrapper) throw new Error();
+  return tag.value.property;
+};
+
+export const getRoot = (node, index = 0) => {
+  if (!isFragmentNode(node)) {
+    return node;
   }
-  if (tag && tag.type !== OpenNodeTag) throw new Error();
-  return tag;
+
+  return getRootProperty(node, index)?.node;
+};
+
+export const getRootArray = (node) => {
+  let arr = [];
+  for (let i = 0; ; i++) {
+    let root = getRoot(node, i);
+    if (root) {
+      arr.push(root);
+    } else {
+      break;
+    }
+  }
+  return arr;
+};
+
+export const getOpenTag = (node) => {
+  return Tags.getValues(node.tags)[0];
 };
 
 export const getCloseTag = (node) => {
-  const { children } = node;
-  const tag = sumtree.getAt(-1, children);
-  if (tag.type !== CloseNodeTag) return null;
-  return tag;
+  return Tags.getValues(node.tags)[2];
 };
 
 export const isNullNode = (node) => {
-  return node && node.type === null && sumtree.getAt(0, node.children).type === NullTag;
+  return node && node.type === null && Tags.getAt(0, node.tags).type === NullTag;
 };
 
 export const isFragmentNode = (node) => {
-  return node && node.type === null && getOpenTag(node)?.value.type === null;
+  return node && node.type === null && getOpenTag(node)?.value?.type === null;
 };
 
 export const isGapNode = (node) => {
-  return node && node.type === null && sumtree.getAt(0, node.children).type === GapTag;
+  return node && node.type === null && Tags.getAt(0, node.tags).type === GapTag;
 };
 
-export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
-  let stack = sumtree.findPath(childrenIndex, agAstNode.children);
+export const isStubNode = (node) => {
+  return node && node.type === null && [GapTag, NullTag].includes(Tags.getAt(0, node.tags).type);
+};
+
+export const isStubTag = (tag) => {
+  return [GapTag, NullTag].includes(tag.type);
+};
+
+export const getChildPropertyIndex = (agAstNode, tagsIndex) => {
+  let child = Tags.getAt(tagsIndex, agAstNode.tags);
+
+  if (child.type !== PropertyWrapper) return null;
+
+  let tag = child.value.tags[0];
+
+  let refIndex = tag.type === ShiftTag ? tagsIndex - tag.value.index : tagsIndex;
+
+  let stack = Tags.findPath(refIndex, agAstNode.tags);
   let { node, index: leafIdx } = stack.value;
-  let leaf = sumtree.getAt(leafIdx, node);
+  let leaf = Tags.getAt(leafIdx, node);
 
-  if (leaf.type !== ReferenceTag) return null;
+  if (leaf.type !== PropertyWrapper) {
+    return null;
+  }
+
+  let leafRefTag = leaf.value.tags[0];
+
+  if (leafRefTag.type !== ReferenceTag) return null;
 
-  let { name, isArray } = leaf.value;
+  let { name, isArray } = leafRefTag.value;
   let count = -1;
 
   if (!isArray) return null;
 
   for (let i = leafIdx; i >= 0; i--) {
-    let value = sumtree.getAt(i, node);
+    let value = Tags.getAt(i, node);
+    if (value.type === PropertyWrapper) {
+      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();
@@ -77,11 +159,17 @@ export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
 
   do {
     for (let i = leafIdx - 1; i >= 0; i--) {
-      let childNode = sumtree.getValues(node)[i];
-      let { references } = sumtree.getSums(childNode);
+      let value = Tags.getValues(node)[i];
+
+      if (Array.isArray(value)) {
+        let childNode = value;
+        let { references } = Tags.getSums(childNode);
 
-      if (hasOwn(references, name)) {
-        count += references[name];
+        let res;
+        if ((res = Tags.getAtName(name, references))) {
+          count += res;
+        }
+      } else {
       }
     }
     stack = stack.pop();
@@ -95,61 +183,129 @@ export const getChildPropertyIndex = (agAstNode, childrenIndex) => {
   return count - 1;
 };
 
-export const getPropertyChildrenIndex = (agAstNode, reference) => {
-  let { index, name } = reference.value;
-  if (isArray) {
-    if (index == null) {
-      index = btree.getSize(agAstNode.properties[name]) - 1;
+export const getPropertyTagsIndex = (agAstNode, type, name, index, shiftIndex) => {
+  let firstPropsIndex = __getPropertyTagsIndex(agAstNode, type, name, 0);
+  let prop = firstPropsIndex == null ? null : Tags.getAt(firstPropsIndex, agAstNode.tags);
+  let initializerOffset = prop?.value.tags[1]?.type === InitializerTag ? 1 : 0;
+  let ref = prop?.value.property.reference;
+  let sums = Tags.getSums(agAstNode.tags);
+
+  if (ref?.isArray) {
+    if (index < 0) {
+      if (name) {
+        index = Tags.getAtName(name, sums.references) - initializerOffset + index;
+      } else {
+        index = Tags.getAtName(type, sums.specialTypes) - initializerOffset + index;
+      }
+    } else if (index == null) {
+      if (name) {
+        index = Tags.getAtName(name, sums.references) - 1 - initializerOffset;
+      } else {
+        index = Tags.getAtName(type, sums.specialTypes) - 1 - initializerOffset;
+      }
+
+      if (index < 0) return null;
     }
   }
 
-  let firstRefIndex = __getPropertyChildrenIndex(agAstNode, name, 0);
-  let nextTag = sumtree.getAt(firstRefIndex + 1, agAstNode.children);
+  let parentIndex = __getPropertyTagsIndex(agAstNode, type, name, (index ?? 0) + initializerOffset);
+
+  if (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 + 1, agAstNode.tags, 0)?.type === ShiftTag) {
+        shifts++;
+      }
 
-  return __getPropertyChildrenIndex(
-    agAstNode,
-    name,
-    index + (nextTag.type === InitializerTag ? 1 : 0),
-  );
+      if (-shiftIndex_ > shifts + 1) return null;
+
+      return parentIndex + shifts + shiftIndex_ + 1;
+    } else {
+      if (parentIndex + shiftIndex_ >= Tags.getSize(agAstNode.tags)) {
+        return null;
+      }
+
+      return parentIndex + shiftIndex_;
+    }
+  }
+
+  return parentIndex;
 };
 
-export const getInitializerChildrenIndex = (agAstNode, reference) => {
-  return __getPropertyChildrenIndex(agAstNode, reference.value.name, 0);
+export const getInitializerTagsIndex = (agAstNode, referenceTag) => {
+  let { type, name } = referenceTag.value;
+
+  if (type === '#') return null;
+
+  let index = __getPropertyTagsIndex(agAstNode, type, name, 0);
+
+  if (index == null) return null;
+
+  let nextTag = Tags.getAt(index, agAstNode.tags, 1);
+
+  return nextTag?.type === InitializerTag ? index : null;
 };
 
-const __getPropertyChildrenIndex = (agAstNode, name, index) => {
+const __getPropertyTagsIndex = (agAstNode, type, name, index) => {
   let nameCount = 0;
-  let node = agAstNode.children;
+  let node = Tags.getValues(agAstNode.tags)[1];
   let idx = -1;
 
   // drill into subtrees, passing over subtrees with too few references of the desired name
   outer: while (node) {
-    let isLeaf = sumtree.isLeafNode(node);
-    let sums = sumtree.getSums(node);
-    let valueNameCount = sums.references[name];
+    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 sumtree.getValues(node)) {
-      if (isLeaf) {
+    for (const value of Tags.getValues(node)) {
+      if (!isArray(value)) {
         idx++;
         let tag = value;
-        if (tag.type === ReferenceTag && tag.value.name === name) {
-          nameCount += 1;
-          if (nameCount > index) {
-            return idx;
+        if (tag.type === PropertyWrapper) {
+          let { tags, property } = tag.value;
+          let { reference } = property;
+          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 = sumtree.getSums(value);
-        if (nameCount + valueSums.references[name] > index) {
+        let valueSums = Tags.getSums(value);
+        if (
+          nameCount +
+            (name != null
+              ? Tags.getAtName(name, valueSums.references)
+              : Tags.getAtName(type, valueSums.specialTypes)) >
+          index
+        ) {
           node = value;
           continue outer;
         } else {
-          nameCount += valueSums.references[name] ?? 0;
-          idx += sumtree.getSize(value);
+          nameCount +=
+            (name != null
+              ? Tags.getAtName(name, valueSums.references)
+              : Tags.getAtName(type, valueSums.specialTypes)) ?? 0;
+          idx += Tags.getSize(value);
         }
       }
     }
@@ -160,176 +316,161 @@ const __getPropertyChildrenIndex = (agAstNode, name, index) => {
   return null;
 };
 
-const { hasOwn } = Object;
+const { hasOwn, freeze } = Object;
 const { isArray } = Array;
 
+export const getOriginalFirstNode = (node, height = 1) => {
+  for (let child of Tags.traverse(node.tags)) {
+    if (child.type === PropertyWrapper) {
+      return child.value.property.node;
+    }
+  }
+  return null;
+};
+
+export const getFirstNode = (node) => {
+  return getFirstNodeProperty(node)?.node;
+};
+
+export const getFirstNodeProperty = (node) => {
+  for (let child of Tags.traverse(node.tags)) {
+    if (child.type === PropertyWrapper) {
+      let ref = child.value.reference;
+      if (!ref.flags.expression) {
+        return child.value;
+      } else {
+        let tagsIndex = getPropertyTagsIndex(node, ref.type, ref.name, 0, -1);
+        return Tags.getAt(tagsIndex, node.tags + 2)?.value.node;
+      }
+      // is it shifted?
+    }
+  }
+  return null;
+};
+
 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.isArray === b.isArray &&
+      a.flags.hasGap === b.flags.hasGap &&
+      a.flags.expression === b.flags.expression)
   );
 };
 
-export const getProperties = (ref, properties) => {
-  const { name, index, isArray } = ref.value;
+export const isDefined = (obj, key) => hasOwn(obj, key) && obj[key] !== undefined;
+export const isUndefined = (obj, key) => !hasOwn(obj, key) || obj[key] === undefined;
 
-  if (name === '.') {
-    if (!hasOwn(properties, name)) {
-      return null;
+export function* relatedNodes(node) {
+  for (const child of Tags.traverse(node.tags)) {
+    if (child.type === PropertyWrapper) {
+      yield child.node;
     }
   }
+}
 
-  if (isArray || Array.isArray(properties[name])) {
-    return btree.getAt(index ?? -1, properties[name]);
-  } else {
-    return properties[name];
-  }
-};
+export const getProperty = (pathSegment, node) => {
+  if (!node) throw new Error();
 
-export const getPropertiesSimple = (ref, properties) => {
-  const { name, index, isArray } = ref.value;
+  if (pathSegment == null) throw new Error('Bad path segment');
 
-  if (!hasOwn(properties, name)) {
-    return null;
-  }
+  let { name, type, index, shiftIndex } =
+    typeof pathSegment === 'string' ? buildPathSegment(pathSegment) : pathSegment;
 
-  if (isArray) {
-    return properties[name][index == null ? properties[name].length - 1 : index];
-  } else {
-    return properties[name];
-  }
+  let propIndex = getPropertyTagsIndex(node, type, name, index, shiftIndex);
+
+  if (propIndex == null) return null;
+
+  return Tags.getAt(propIndex, node.tags)?.value.property;
 };
 
-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 = (ref, node) => {
-  const result = getProperties(ref, node.properties);
-  const { flags } = result.reference.value;
+  let pathArr = [...path];
+  let node_ = get(pathArr.slice(0, -1), node);
+  let seg = pathArr[pathArr.length - 1];
+  let name = typeof seg === 'string' ? seg : seg.name;
 
-  return flags.expression ? btree.getAt(-1, result.node) : result?.node;
+  return (
+    !!getProperty(seg, node_) ||
+    getInitializerTagsIndex(node_, buildReferenceTag(null, name)) != null
+  );
 };
 
-export const getShifted = (shiftIndex, ref, node) => {
-  const { flags } = ref.value;
+export const get = (path, node) => getOr(null, path, node);
 
-  const result = getProperties(ref, node.properties);
-  return flags.expression ? btree.getAt(shiftIndex ?? -1, result.node) : result?.node;
-};
+export const getOr = (defaultValue, path, node) => {
+  if (!node) throw new Error();
+
+  if (path == null) throw new Error('Bad path');
 
-export const add = (node, reference, value, shift = null) => {
-  if (node == null || reference == null) throw new Error('invalid arguments to add');
-  if (value === node) {
-    throw new Error('cannot add a node to itself');
+  if (!isArray(path)) {
+    path = [path];
   }
 
-  const { properties } = node;
-  const { name, isArray, flags } = reference.value;
+  let root = getRoot(node);
+  let result = root || node;
 
-  if (node.type && name === '.') {
-    throw new Error('Only fragments can have . properties');
+  let start = 0;
+  if (path[0]?.type === '.') {
+    if (!root) return null;
+    start = 1;
   }
 
-  if (Array.isArray(value) && !isArray) throw new Error();
-  if (Array.isArray(value) && value.length) throw new Error();
+  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 (typeof index === 'number') {
+      i++;
+    } else {
+      index = undefined;
+    }
+
+    if (!isName && (!nameOrSeg || !hasOwn(nameOrSeg, 'shiftIndex'))) throw new Error('Bad path');
+
+    let seg = isName ? buildPathSegment(nameOrSeg, index) : nameOrSeg;
 
-  if (name == null) throw new Error();
+    property = getProperty(seg, result);
 
-  const lastChild = sumtree.getAt(-1, node.children);
+    if (!property) return defaultValue;
 
-  if (lastChild.type === ReferenceTag) {
-    if (!referencesAreEqual(lastChild, reference)) throw new Error();
-  } else if (lastChild.type !== ShiftTag) {
-    if ([ShiftTag, ReferenceTag].includes(sumtree.getAt(-1, node.children).type)) throw new Error();
-    node.children = sumtree.push(node.children, shift > 0 ? buildShiftTag(shift) : reference);
+    result = property.node;
   }
 
-  if (name === '#' || name === '@') {
-    node.children = sumtree.push(node.children, buildEmbeddedNode(value));
-  } else {
-    if (isArray) {
-      let isInitializer = Array.isArray(value);
-      let exists = !isInitializer && isDefined(properties, name);
-
-      let existed = exists;
-      if (!existed) {
-        if (isInitializer && value.length)
-          throw new Error('Array value only allowed for initialization');
-
-        properties[name] = [];
-        node.children = sumtree.push(node.children, buildInitializerTag(true));
-        exists = !isInitializer;
-      }
+  return result;
+};
 
-      if (exists) {
-        if (!existed) {
-          if (sumtree.getAt(-1, node.children).type === ReferenceTag) throw new Error();
-          node.children = sumtree.push(node.children, reference);
-        }
+export function* list(name, node) {
+  let count = countList(name, node);
 
-        let newBinding;
-        if (flags.expression) {
-          let shiftedNodes = shift > 0 ? btree.getAt(-1, properties[name])?.node : [];
+  for (let i = 0; i < count; i++) {
+    yield get(buildPathSegment(name, i, -1), node);
+  }
+}
 
-          newBinding = {
-            reference,
-            node: btree.push(shiftedNodes, value),
-          };
-        } else {
-          newBinding = { reference, node: value };
-        }
+export const countList = (name, node) => {
+  if (!node) throw new Error();
 
-        properties[name] =
-          shift > 0
-            ? btree.replaceAt(-1, properties[name], newBinding)
-            : btree.push(properties[name], newBinding);
+  if (name == null) throw new Error('Bad path');
 
-        node.children = sumtree.push(node.children, buildGapTag(value));
-      }
-    } else {
-      if (value === undefined) {
-        if (isUndefined(properties, name)) {
-          let newBinding;
-          if (flags.expression) {
-            let shiftedNodes = shift > 0 ? btree.getAt(-1, properties[name])?.node : [];
-
-            newBinding = {
-              reference,
-              node: btree.push(shiftedNodes, undefined),
-            };
-          } else {
-            newBinding = { reference, node: undefined };
-          }
-          properties[name] = newBinding;
-          node.children = sumtree.push(node.children, buildInitializerTag());
-        }
-      } else {
-        if (flags.expression) {
-          if (shift == null) {
-            throw new Error();
-          }
+  let hasInitializer = getInitializerTagsIndex(node, buildReferenceTag(null, name)) != null;
 
-          let shiftedNodes = shift ? properties[name]?.node : [];
-          properties[name] = { reference, node: btree.push(shiftedNodes, value) };
-        } else {
-          if (shift != null) throw new Error();
-          if (hasOwn(properties, name) && properties[name].node !== undefined) {
-            throw new Error();
-          }
-          properties[name] = { reference, node: value };
-        }
-        node.children = sumtree.push(node.children, buildGapTag(value));
-      }
-    }
-  }
+  return Tags.getAtName(name, Tags.getSums(node.tags).references) - (hasInitializer ? 1 : 0);
 };
 
 export function* allTagPathsFor(range, options = {}) {
   if (range == null) return;
 
+  if (range[0] && !(range[0] instanceof TagPath)) throw new Error();
+  if (range[1] && !(range[1] instanceof TagPath)) throw new Error();
+
   const { unshift = false } = options;
   let startPath = range[0];
   let endPath = range[1];
@@ -337,7 +478,7 @@ export function* allTagPathsFor(range, options = {}) {
 
   while (path) {
     if (path.inner && path.previousSibling.tag.type === ReferenceTag) {
-      path = new TagPath(path.innerPath, 0);
+      path = new TagPath(path.inner, 0);
     }
 
     if (path.path.depth < startPath.path.depth) {
@@ -346,21 +487,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;
@@ -370,34 +507,34 @@ export function* allTagPathsFor(range, options = {}) {
 }
 
 export function* allTagsFor(range, options = {}) {
-  for (const path of allTagPathsFor(range, options)) {
+  for (let path of allTagPathsFor(range, options)) {
     yield path.tag;
   }
 }
 
 export const buildFullRange = (node) => {
-  const sum = sumtree.getSize(node.children);
+  let sum = Tags.getSize(node.tags);
   return sum ? [0, sum - 1] : null;
 };
 
 export function* ownTagPathsFor(range) {
   if (!isArray(range)) throw new Error();
 
-  const startPath = range[0];
-  const endPath = range[1];
+  let startPath = range[0];
+  let endPath = range[1];
 
-  if (startPath.outer !== endPath.outer) throw new Error();
+  if (startPath.parent.node !== endPath.parent.node) throw new Error();
 
-  const { children } = startPath.outer;
+  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];
   }
 }
 
 const findRight = (arr, predicate) => {
   for (let i = arr.length - 1; i >= 0; i--) {
-    const value = arr[i];
+    let value = arr[i];
     if (predicate(value)) return value;
   }
   return null;
@@ -420,7 +557,7 @@ const buildSkips = (frame) => {
       skipsByFrame.set(frame, skips);
     }
 
-    skips[skipIdx] = frame.at(frame.depth - skipAmount);
+    skips[skipIdx] = frame.atDepth(frame.depth - skipAmount);
 
     skipIdx++;
     skipAmount = skipAmounts[skipIdx];
@@ -441,41 +578,79 @@ const skipToDepth = (depth, frame) => {
   return parent;
 };
 
+export let pathForTagPath = (tagPath) => {
+  let refTagPath = tagPath;
+  let isShift = tagPath.tag.type === ShiftTag;
+
+  if (isShift) {
+    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.tagsIndex);
+  let shiftIndex = isShift ? (tagPath.tag.value.index ?? 0) + 1 : null;
+
+  return [{ type, name, index, shiftIndex }];
+};
+
 export const Path = class AgastPath extends WeakStackFrame {
   static from(node) {
-    return this.create(node);
+    let node_ = isPlainObject(node) ? node : node.node;
+    return node_ && this.create(node_);
   }
 
-  constructor(parent, node, referenceIndex = null) {
+  constructor(parent, node, parentIndex = null) {
     super(parent);
 
-    if (!(hasOwn(node, 'type') && hasOwn(node, 'language'))) throw new Error();
+    if (!node || !(hasOwn(node, 'type') && hasOwn(node, 'tags'))) throw new Error();
 
-    if (parent && referenceIndex == null) throw new Error();
+    if (parent && parentIndex == null) throw new Error();
     if (!node) throw new Error();
     if (isArray(node)) throw new Error();
 
     this.node = node;
-    this.referenceIndex = referenceIndex; // in the parent
+    this.parentIndex = parentIndex; // in the parent
 
-    if (
-      referenceIndex != null &&
-      ![ReferenceTag, ShiftTag].includes(sumtree.getAt(referenceIndex, parent.node.children).type)
-    ) {
+    let parentTag = parent && Tags.getAt(parentIndex, parent.node.tags);
+
+    if (parentTag && parentTag.type !== PropertyWrapper) {
       throw new Error();
     }
 
-    if (parent && (!this.reference || ![ReferenceTag, ShiftTag].includes(this.reference.type))) {
+    parentIndex != null && parentTag?.value.tags[0];
+
+    if (
+      parent &&
+      (!this.referenceTag || ![ReferenceTag, ShiftTag].includes(this.referenceTag.type))
+    ) {
       throw new Error();
     }
 
+    // if (
+    //   parent &&
+    //   (['#', '@'].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');
+    // }
+
     if (!Number.isFinite(this.depth)) throw new Error();
 
     buildSkips(this);
+
+    freeze(this);
   }
 
   get openTagPath() {
-    return TagPath.from(this, 0);
+    let tagPath = TagPath.from(this, 0);
+    if (tagPath.tag.type === DoctypeTag) {
+      tagPath = tagPath.nextSibling;
+    }
+    return tagPath;
   }
 
   get openTag() {
@@ -483,271 +658,421 @@ export const Path = class AgastPath extends WeakStackFrame {
   }
 
   get closeTagPath() {
-    return TagPath.from(this, -1);
+    let tagPath = TagPath.from(this, -1);
+    if (tagPath.tag.type !== CloseNodeTag) return null;
+    return tagPath;
   }
 
   get closeTag() {
     return this.closeTagPath.tag;
   }
 
+  tagPathAt(idx, offset) {
+    return TagPath.from(this, idx, offset);
+  }
+
+  get binding() {
+    return this.bindingTag?.value ?? null;
+  }
+
+  get bindingTag() {
+    return this.bindingTagPath?.tag ?? null;
+  }
+
+  get bindingTagPath() {
+    return (this.parent?.node ?? null) && new TagPath(this.parent, this.parentIndex, 1);
+  }
+
   get reference() {
-    return this.outer && sumtree.getAt(this.referenceIndex, this.outer.children);
+    return this.referenceTag?.value ?? null;
+  }
+
+  get referenceTag() {
+    return this.referenceTagPath?.tag ?? null;
+  }
+
+  get referenceTagPath() {
+    if (!this.parent?.node) {
+      return null;
+    }
+    let path = new TagPath(this.parent, this.parentIndex, 0);
+    if (path.tag.type === ShiftTag) {
+      path = new TagPath(this.parent, this.parentIndex - path.tag.value.index, 0);
+    }
+    return path;
   }
 
-  get referencePath() {
-    return this.outer && new TagPath(this.parent, this.referenceIndex);
+  get parentPropertyPath() {
+    if (!this.parent?.node) {
+      return null;
+    }
+    let path = new TagPath(this.parent, this.parentIndex);
+    if (path.tag.type === ShiftTag) {
+      path = new TagPath(this.parent, this.parentIndex - path.tag.value.index);
+    }
+    return path;
   }
 
-  get gap() {
-    return this.outer && sumtree.getAt(this.referenceIndex + 1, this.outer.children);
+  get parentProperty() {
+    return this.parentPropertyPath?.tag ?? null;
   }
 
-  get gapPath() {
-    return this.outer && new TagPath(this.parent, this.referenceIndex + 1);
+  get(path) {
+    let path_ = path;
+    if (typeof path_ === 'string') {
+      path_ = [path_];
+    }
+    if (!isArray(path_)) throw new Error();
+
+    let pathInst = this;
+
+    if (!pathInst.node.type && pathInst.node.flags.cover) {
+      if (pathInst.depth) throw new Error();
+      pathInst = pathInst.push(
+        getRoot(pathInst.node),
+        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);
+      }
+
+      let tagsIndex = getPropertyTagsIndex(
+        pathInst.node,
+        seg.type,
+        seg.name,
+        seg.index,
+        seg.shiftIndex,
+      );
+
+      let { property } = Tags.getAt(tagsIndex, pathInst.node.tags).value;
+
+      if (!property) return null;
+
+      let { node } = property;
+
+      pathInst = pathInst.push(node, tagsIndex);
+    }
+
+    return pathInst;
   }
 
-  get outer() {
-    return this.parent?.node;
+  replaceWith(node, binding = buildBinding()) {
+    return this.replaceAt([], node, binding);
   }
 
-  get(reference, shiftIndex) {
-    let node = getShifted(shiftIndex, reference, this.node);
+  replaceAt(path, node, binding = buildBinding()) {
+    throw new Error('not working yet');
+
+    let built;
+    let path_ = path;
+    if (typeof path_ === 'string') {
+      path_ = [path_];
+    }
+    if (!isArray(path_)) throw new Error();
+
+    let pathInst = this;
+
+    if (!pathInst.node.type && pathInst.node.flags.cover) {
+      if (pathInst.depth) throw new Error();
+      pathInst = pathInst.push(
+        getRoot(pathInst.node),
+        getPropertyTagsIndex(pathInst.node, '.', null, 0),
+      );
+    }
+
+    for (let i = 0; i < path_.length; i++) {
+      let nameOrSeg = path_[i];
+
+      built = { ...pathInst.node };
+
+      let seg = nameOrSeg;
+      if (isString(nameOrSeg)) {
+        let index = path_[i + 1];
+        if (typeof index === 'number') {
+          i++;
+        } else {
+          index = undefined;
+        }
+        seg = buildPathSegment(nameOrSeg, index);
+      }
+
+      let tagsIndex = getPropertyTagsIndex(
+        pathInst.node,
+        seg.type,
+        seg.name,
+        seg.index,
+        seg.shiftIndex,
+      );
+
+      let tagPath = TagPath.from(pathInst, tagsIndex);
+
+      let {
+        property,
+        tags: { 0: refTag },
+      } = tagPath.tag.value;
+
+      if (refTag.type === ShiftTag) {
+        let { index } = refTag.value;
+
+        for (let i = 0; i < index - 1; i++) {
+          // update bounds!
+        }
+        tagsIndex -= index;
+        pathInst = pathInst.replace(built, tagsIndex);
+      }
+
+      if (!property) return null;
+
+      let { node } = property;
+
+      pathInst = pathInst.push(node, tagsIndex);
+    }
+
+    let node_ = isPlainObject(node) ? node : node.node;
+
+    if (!node_) throw new Error();
+
+    path = pathInst.parent;
+    let replacementPath = [];
+
+    let targetReference = pathInst.reference;
+    let targetBinding = binding;
+    let targetParentIndex = pathInst.parentIndex;
+
+    while (path) {
+      let value = built;
+      built = { ...path.node };
+
+      let { tags } = Tags.getAt(targetParentIndex, path.node.tags).value;
+      let property = buildProperty(targetReference, targetBinding, value);
+
+      let tags_ = [tags[0], buildChild(BindingTag, targetBinding), buildChild(Property, property)];
+
+      built.tags = Tags.replaceAt(
+        targetParentIndex,
+        built.tags,
+        buildChild(PropertyWrapper, buildPropertyWrapper(tags_, property)),
+      );
 
-    let shiftOffset = (shiftIndex ?? 0) * 2;
+      finalizeNode(built);
 
-    return node && this.push(node, getPropertyChildrenIndex(this.node, reference) + shiftOffset);
+      if (targetReference.name) {
+        replacementPath.push(
+          buildPathSegment(
+            targetReference.name,
+            getChildPropertyIndex(path.node, targetParentIndex),
+          ),
+        );
+      }
+
+      targetReference = path.reference;
+      targetBinding = path.binding;
+      targetParentIndex = path.parentIndex;
+      path = path.parent;
+    }
+
+    replacementPath.reverse();
+
+    return Path.from(built).get(replacementPath).atDepth(this.depth);
   }
 
-  at(depth) {
+  atDepth(depth) {
     return skipToDepth(depth, this);
   }
 };
 
 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();
+  constructor(path, tagsIndex, wrapperIndex) {
+    if (path == null || tagsIndex == null) throw new Error();
+
+    let tag = Tags.getAt(tagsIndex, path.node.tags);
+
+    if (tag == null) throw new Error();
+
+    if (tag.type === PropertyWrapper && wrapperIndex != null) {
+      tag = tag.value.tags[wrapperIndex];
+    }
 
     this.path = path;
-    this.childrenIndex = childrenIndex;
+    this.node = path.node;
+    this.tag = tag;
+    this.tagsIndex = tagsIndex;
+    this.wrapperIndex = wrapperIndex;
 
-    if (this.tag == null) throw new Error();
+    freeze(this);
   }
 
-  static from(path, childrenIndex) {
-    let size = sumtree.getSize(path.node.children);
-    let index = childrenIndex < 0 ? size + childrenIndex : childrenIndex;
+  static from(path, tagsIndex, wrapperIndex) {
+    let size = Tags.getSize(path.node.tags);
+    let index = tagsIndex < 0 ? size + tagsIndex : tagsIndex;
 
-    return index >= 0 && index < size ? new TagPath(path, index) : null;
-  }
+    let tag = Tags.getAt(index, path.node.tags);
 
-  static fromNode(node, childrenIndex) {
-    return TagPath.from(Path.from(node), childrenIndex);
-  }
+    if (!tag) return null;
 
-  get tag() {
-    return this.child;
-  }
+    let offset =
+      wrapperIndex == null || tag.type !== PropertyWrapper
+        ? null
+        : wrapperIndex < 0
+        ? tag.value.tags.length + wrapperIndex
+        : wrapperIndex;
 
-  get node() {
-    return this.path.node;
+    return index >= 0 && index < size ? new TagPath(path, index, offset) : null;
   }
 
-  get child() {
-    return sumtree.getAt(this.childrenIndex, this.path.node.children);
+  static fromNode(node, tagsIndex, wrapperIndex) {
+    return TagPath.from(Path.from(node), tagsIndex, wrapperIndex);
   }
 
-  siblingPathAt(index) {
-    return TagPath.from(this.path, index);
+  get child() {
+    return this.tag;
   }
 
   siblingAt(index) {
-    return this.siblingPathAt(index)?.tag;
+    return TagPath.from(this.path, index);
   }
 
   get nextSibling() {
-    const { path, childrenIndex } = this;
+    const { path, tagsIndex, wrapperIndex } = this;
 
-    const child =
-      childrenIndex + 1 >= sumtree.getSize(path.node.children)
-        ? null
-        : sumtree.getAt(childrenIndex + 1, path.node.children);
+    let propPath = new TagPath(path, tagsIndex);
 
-    return child && new TagPath(path, childrenIndex + 1);
+    if (wrapperIndex != null && wrapperIndex + 1 < Tags.getSize(propPath.tag.value.tags)) {
+      return new TagPath(path, tagsIndex, wrapperIndex + 1);
+    } else if (tagsIndex + 1 < Tags.getSize(path.node.tags)) {
+      return new TagPath(path, tagsIndex + 1, 0);
+    }
+
+    return TagPath.from(path, tagsIndex + 1, 0);
   }
 
   get next() {
-    let { path, childrenIndex } = this;
+    let { path, tagsIndex, wrapperIndex } = this;
 
     let leaving = false;
 
     for (;;) {
-      let prevTag = sumtree.getAt(childrenIndex - 1, path.node.children);
-      let tag = sumtree.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
+      let lastRef = Tags.getAt(tagsIndex, path.node.tags, 0);
+      let tag = Tags.getAt(tagsIndex, path.node.tags);
+      let wrapperTag = tag;
+      let isInitialTag =
+        path.node === this.path.node &&
+        tagsIndex === this.tagsIndex &&
+        wrapperIndex === this.wrapperIndex;
       let wasLeaving = leaving;
       leaving = false;
 
       if (!tag) return null;
 
-      // done
-      if (
-        !isInitialTag &&
-        tag.type !== EmbeddedNode &&
-        (tag.type !== GapTag || isGapNode(path.node) || prevTag.type === ShiftTag)
-      ) {
-        return new TagPath(path, childrenIndex);
+      wrapperIndex =
+        tag.type === PropertyWrapper ? (wrapperIndex == null ? 0 : wrapperIndex) : null;
+
+      if (wrapperIndex != null) {
+        wrapperTag = tag.value.tags[wrapperIndex];
       }
 
-      // in
-      if (tag.type === EmbeddedNode && !wasLeaving) {
-        path = path.push(tag.value, childrenIndex - 1);
-        childrenIndex = 0;
-        continue;
+      // done
+      if (!isInitialTag && wrapperTag.type !== Property) {
+        return new TagPath(path, tagsIndex, wrapperIndex);
       }
 
       // in
-      if (tag.type === GapTag && !wasLeaving && !isGapNode(path.node)) {
-        let refIndex = childrenIndex - 1;
-        let refTag;
-        let prevTag = sumtree.getAt(childrenIndex - 1, path.node.children);
-        let nextTag = sumtree.getAt(childrenIndex + 1, path.node.children);
-
-        if (
-          path.parent &&
-          sumtree.getAt(path.referenceIndex, path.outer.children)?.type === ShiftTag
-        ) {
-          let third = sumtree.getAt(2, path.node.children);
-          if (childrenIndex === 2 || (childrenIndex === 4 && third.type === InitializerTag)) {
-            childrenIndex = path.referenceIndex + 1;
-            path = path.parent;
-            leaving = true;
-            continue;
-          }
-        }
-
-        if (prevTag.type === ReferenceTag) {
-          refTag = prevTag;
-
-          if (nextTag && nextTag.type === ShiftTag) {
-            const shifts = getProperties(refTag, path.node.properties).node;
-
-            if (!Array.isArray(shifts)) throw new Error();
-
-            const { name, isArray, flags } = refTag.value;
-            let resolvedReference = refTag;
-            if (isArray) {
-              let index = getChildPropertyIndex(path.node, refIndex);
-              resolvedReference =
-                index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
-            }
+      if (wrapperTag.type === Property && !wasLeaving) {
+        if (tag.value.tags[1]?.type === InitializerTag || !tag.value.property.node) {
+        } else {
+          // jump to gap tag?
+          let tag1;
+          if (
+            path.parent &&
+            tag.value.property.reference.flags.expression &&
+            (tagsIndex === 1 ||
+              (tagsIndex === 2 &&
+                (tag1 = Tags.getAt(1, path.node.tags)).type === PropertyWrapper &&
+                tag1.value.tags[1].type === InitializerTag)) &&
+            Tags.getAt(path.parentIndex, path.parent.node.tags, 0)?.type === ShiftTag
+          ) {
+            let shiftStack = tag.value.property.node.bounds[0];
 
-            path = path.get(resolvedReference, 0);
-            childrenIndex = 0;
+            let gapNode = BTree.getAt(-1, shiftStack).node;
 
-            if (!path) {
-              return null;
-            }
+            path = new Path(path, gapNode, tagsIndex);
+            tagsIndex = 0;
             continue;
-          } else {
-            if (
-              !['#', '@'].includes(refTag.value.name) &&
-              (!refTag.value.isArray || getChildPropertyIndex(path.node, refIndex) != null)
-            ) {
-              const { name, isArray, flags } = refTag.value;
-              let resolvedReference = refTag;
-              if (isArray) {
-                let index = getChildPropertyIndex(path.node, refIndex);
-                resolvedReference =
-                  index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
-              }
-
-              if (resolvedReference) {
-                path = path.get(resolvedReference);
-                childrenIndex = 0;
-
-                if (!path) {
-                  return null;
-                }
-                continue;
-              }
-            }
-          }
-        } else if (prevTag.type === ShiftTag) {
-          let refIndex = childrenIndex - prevTag.value.index * 2 - 1;
-          let refTag = sumtree.getAt(refIndex, path.node.children);
-
-          const { name, isArray, flags } = refTag.value;
-          let resolvedReference = refTag;
-          if (isArray) {
-            let index = getChildPropertyIndex(path.node, refIndex);
-            resolvedReference =
-              index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
           }
 
-          if (resolvedReference) {
-            path = path.get(resolvedReference, prevTag.value.index);
-            // this was introducing errors
-            // caused us to return to a point before we left
-            path.referenceIndex = childrenIndex;
-            childrenIndex = sumtree.getAt(2, path.node.children).type === InitializerTag ? 5 : 3;
-            continue;
-          }
-        } else {
-          throw new Error();
+          path = new Path(path, tag.value.property.node, tagsIndex);
+          tagsIndex = 0;
+          continue;
         }
       }
 
+      tag;
       // shift
-      if (tag.type === ShiftTag) {
-        let refIndex = childrenIndex - tag.value.index * 2;
-        let refTag = sumtree.getAt(refIndex, path.node.children);
-
-        const { name, isArray, flags } = refTag.value;
-        let resolvedReference = null;
-        if (isArray) {
-          let index = getChildPropertyIndex(path.node, refIndex);
-          resolvedReference =
-            index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
-        } else {
-          resolvedReference = refTag;
-        }
+      if (wrapperTag.type === BindingTag && lastRef.type === ShiftTag) {
+        let refIndex = tagsIndex - lastRef.value.index;
+        if (refIndex < 0) throw new Error();
+        let refTag = Tags.getAt(refIndex, path.node.tags, 0);
+
+        if (refTag.type !== ReferenceTag) throw new Error();
 
-        if (resolvedReference) {
-          path = path.get(resolvedReference, tag.value.index);
+        if (Tags.getAt(refIndex, path.node.tags, 1).type !== InitializerTag) {
+          path = new Path(path, tag.value.property.node, tagsIndex);
 
           if (!path) return null;
 
-          childrenIndex = 0;
+          tagsIndex = 0;
           continue;
         }
       }
 
       // over
-      if (path.node && childrenIndex + 1 < sumtree.getSize(path.node.children)) {
-        childrenIndex++;
+      if (tag.type === PropertyWrapper && wrapperIndex + 1 < tag.value.tags.length) {
+        wrapperIndex++;
+        continue;
+      } else if (path.node && tagsIndex + 1 < Tags.getSize(path.node.tags)) {
+        tagsIndex++;
+        wrapperIndex = 0;
         continue;
       }
 
       // out
-      if (path.referenceIndex != null) {
+      if (path.parentIndex != null && path.parent) {
         do {
-          if (sumtree.getAt(path.referenceIndex + 2, path.outer.children)?.type === ShiftTag) {
-            childrenIndex =
-              sumtree.getSize(path.outer.children) > path.referenceIndex + 2
-                ? path.referenceIndex + 2
+          if (
+            path.parent &&
+            Tags.getAt(path.parentIndex, path.parent.node.tags, 0)?.type === ShiftTag
+          ) {
+            tagsIndex =
+              Tags.getSize(path.parent.node.tags) > path.parentIndex + 1
+                ? path.parentIndex + 1
                 : null;
           } else {
-            childrenIndex = path.referenceIndex + 1;
+            tagsIndex = path.parentIndex + 1;
           }
 
+          wrapperIndex = 0;
           path = path.parent;
           leaving = true;
-        } while (childrenIndex == null);
+
+          if (!path) return null;
+        } while (tagsIndex == null);
 
         leaving = true;
         continue;
@@ -758,87 +1083,77 @@ export class TagPath {
   }
 
   get nextUnshifted() {
-    let { path, childrenIndex } = this;
+    let { path, tagsIndex, wrapperIndex } = this;
 
     let leaving = false;
 
     for (;;) {
-      let tag = sumtree.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
+      let tag = Tags.getAt(tagsIndex, path.node.tags);
+      let wrapperTag = tag;
+      let isInitialTag =
+        path.node === this.path.node &&
+        tagsIndex === this.tagsIndex &&
+        wrapperIndex === this.wrapperIndex;
       let wasLeaving = leaving;
       leaving = false;
 
       if (!tag) return null;
 
-      // done
-      if (
-        !isInitialTag &&
-        tag.type !== EmbeddedNode &&
-        tag.type !== ShiftTag &&
-        (tag.type !== GapTag || isGapNode(path.node))
-      ) {
-        return new TagPath(path, childrenIndex);
-      }
+      wrapperIndex =
+        tag.type === PropertyWrapper ? (wrapperIndex == null ? 0 : wrapperIndex) : null;
 
-      // in
-      if (tag.type === EmbeddedNode && !wasLeaving) {
-        path = path.push(tag.value, childrenIndex - 1);
-        childrenIndex = 0;
-        continue;
+      if (wrapperIndex != null) {
+        wrapperTag = tag.value.tags[wrapperIndex];
       }
 
-      // in
-      if (tag.type === GapTag && !wasLeaving && !isGapNode(path.node)) {
-        let refIndex = childrenIndex - 1;
-        let refTag;
-        let prevTag = sumtree.getAt(childrenIndex - 1, path.node.children);
+      if (wrapperTag.type === ReferenceTag && wrapperTag.value.flags.expression) {
+        // move past shifts
 
-        if (prevTag.type === ShiftTag) {
-          // continue
-        } else if (prevTag.type === ReferenceTag) {
-          refTag = prevTag;
+        let shifts = 0;
+        let tag = Tags.getAt(tagsIndex + 1, path.node.tags);
 
-          if (
-            !['#', '@'].includes(refTag.value.name) &&
-            (!refTag.value.isArray || getChildPropertyIndex(path.node, refIndex) != null)
-          ) {
-            const { name, isArray, flags } = refTag.value;
-            let resolvedReference = refTag;
-            if (isArray) {
-              let index = getChildPropertyIndex(path.node, refIndex);
-              resolvedReference =
-                index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
-            }
+        while (tag?.type === PropertyWrapper && tag.value.tags[0].type === ShiftTag) {
+          shifts++;
+          wrapperIndex = 1;
+          tag = Tags.getAt(tagsIndex + shifts + 1, path.node.tags);
+        }
+        if (shifts) {
+          tagsIndex += shifts;
+          continue;
+        }
+      }
 
-            if (resolvedReference) {
-              path = path.get(resolvedReference);
-              childrenIndex = 0;
+      // done
+      if (!isInitialTag && wrapperTag.type !== Property) {
+        return new TagPath(path, tagsIndex, wrapperIndex);
+      }
 
-              if (!path) {
-                return null;
-              }
-              continue;
-            }
-          }
-        } else {
-          throw new Error();
+      // in
+      if (tag.type === PropertyWrapper) {
+        if (wrapperIndex + 1 < tag.value.tags.length) {
+          wrapperIndex++;
+          continue;
+        } else if (!wasLeaving && tag.value.tags[1] && tag.value.tags[1].type !== InitializerTag) {
+          path = path.push(tag.value.property.node, tagsIndex);
+          tagsIndex = 0;
+          continue;
         }
       }
 
       // over
-      if (path.node && childrenIndex + 1 < sumtree.getSize(path.node.children)) {
-        childrenIndex++;
+      if (path.node && tagsIndex + 1 < Tags.getSize(path.node.tags)) {
+        tagsIndex++;
         continue;
       }
 
       // out
-      if (path.referenceIndex != null) {
+      if (path.parentIndex != null) {
         do {
-          childrenIndex = path.referenceIndex + 1;
+          tagsIndex = path.parentIndex + 1;
 
           path = path.parent;
           leaving = true;
-        } while (childrenIndex == null);
+        } while (tagsIndex == null);
 
         leaving = true;
         continue;
@@ -849,143 +1164,52 @@ export class TagPath {
   }
 
   get previousSibling() {
-    const { path, childrenIndex } = this;
+    const { path, tagsIndex, wrapperIndex } = this;
 
-    const child = childrenIndex - 1 < 0 ? null : btree.getAt(childrenIndex - 1, path.node.children);
+    if (wrapperIndex > 0) {
+      return new TagPath(path, tagsIndex, wrapperIndex - 1);
+    }
 
-    return child && new TagPath(path, childrenIndex - 1);
-  }
+    const child = tagsIndex - 1 < 0 ? null : BTree.getAt(tagsIndex - 1, path.node.tags);
 
-  get previous() {
-    throw new Error('not implemented');
+    return child && TagPath.from(path, tagsIndex - 1, -1);
   }
 
-  get previousUnshifted() {
-    let { path, childrenIndex } = this;
-
-    let leaving = false;
-
-    for (;;) {
-      let tag = sumtree.getAt(childrenIndex, path.node.children);
-      let isInitialTag = path.node === this.path.node && childrenIndex === this.childrenIndex;
-      let wasLeaving = leaving;
-      leaving = false;
-
-      if (!tag) return null;
-
-      // done
-      if (
-        !isInitialTag &&
-        tag.type !== EmbeddedNode &&
-        tag.type !== ShiftTag &&
-        (tag.type !== GapTag || isGapNode(path.node))
-      ) {
-        return new TagPath(path, childrenIndex);
-      }
-
-      // in
-      if (tag.type === EmbeddedNode && !wasLeaving) {
-        path = path.push(tag.value, childrenIndex - 1);
-        childrenIndex = sumtree.getSize(tag.value.children) - 1;
-        continue;
-      }
-
-      // in
-      if (tag.type === GapTag && !wasLeaving && !isGapNode(path.node)) {
-        let refIndex = childrenIndex - 1;
-        let refTag;
-        let prevTag = sumtree.getAt(childrenIndex - 1, path.node.children);
-
-        if (prevTag.type === ShiftTag) {
-          // continue
-        } else if (prevTag.type === ReferenceTag) {
-          refTag = prevTag;
-
-          if (
-            !['#', '@'].includes(refTag.value.name) &&
-            (!refTag.value.isArray || getChildPropertyIndex(path.node, refIndex) != null)
-          ) {
-            const { name, isArray, flags } = refTag.value;
-            let resolvedReference = refTag;
-            if (isArray) {
-              let index = getChildPropertyIndex(path.node, refIndex);
-              resolvedReference =
-                index === -1 ? null : buildReferenceTag(name, index != null, flags, index);
-            }
-
-            if (resolvedReference) {
-              path = path.get(resolvedReference);
-              childrenIndex = 0;
-
-              if (!path) {
-                return null;
-              }
-              continue;
-            }
-          }
-        } else {
-          throw new Error();
-        }
-      }
-
-      // over
-      if (path.node && childrenIndex + 1 < sumtree.getSize(path.node.children)) {
-        childrenIndex--;
-        continue;
-      }
-
-      // out
-      if (path.referenceIndex != null) {
-        do {
-          childrenIndex = path.referenceIndex;
-
-          path = path.parent;
-          leaving = true;
-        } while (childrenIndex == null);
-
-        leaving = true;
-        continue;
-      }
-
-      return null;
-    }
+  get innerNode() {
+    return this.inner?.node;
   }
 
   get inner() {
-    return this.innerPath?.node;
-  }
+    let { path, tagsIndex, tag, previousSibling } = this;
 
-  get innerPath() {
-    let { tag, previousSibling: refPath } = this;
+    let refPath = TagPath.from(path, tagsIndex, 0);
 
-    if (tag.type !== GapTag || isGapNode(this.node)) {
+    if (tag.type !== PropertyWrapper) {
       return null;
     }
 
     let shiftPath = null;
     if (refPath.tag.type === ShiftTag) {
       shiftPath = refPath;
-      refPath = TagPath.from(this.path, this.childrenIndex - refPath.tag.value.index * 2 - 1);
+      throw new Error('not implemented');
+      refPath = TagPath.from(this.path, this.tagsIndex - refPath.tag.value.index - 2);
     }
 
     if (refPath.tag.type !== ReferenceTag) throw new Error();
 
-    let resolvedRef = refPath.tag;
+    const { type, name } = refPath.tag.value;
 
-    if (refPath.tag.value.isArray) {
-      const { name, flags, isArray } = refPath.tag.value;
-      resolvedRef = buildReferenceTag(
+    return this.path.get([
+      buildFullPathSegment(
+        type,
         name,
-        isArray,
-        flags,
-        getChildPropertyIndex(refPath.path.node, refPath.childrenIndex),
-      );
-    }
-
-    return this.path.get(resolvedRef, shiftPath?.tag.value.index);
+        getChildPropertyIndex(refPath.path.node, refPath.tagsIndex),
+        shiftPath?.tag.value.index,
+      ),
+    ]);
   }
 
   equalTo(tagPath) {
-    return this.node === tagPath.node && this.childrenIndex === tagPath.childrenIndex;
+    return this.node === tagPath.node && this.tagsIndex === tagPath.tagsIndex;
   }
 }