@bablr/bablr-vm 0.20.1 → 0.22.0

package/lib/context.js

@@ -2,14 +2,17 @@ import { buildDependentLanguages } from '@bablr/helpers/grammar';
 import { facades, actuals } from './facades.js';
 import { getPrototypeOf } from '@bablr/helpers/object';
 import { states as nodeStates } from './node.js';
+import { PathFacade as Path } from '@bablr/agast-vm';
 
 import { sourceTextFor } from '@bablr/agast-helpers/stream';
 import { streamFromTree } from '@bablr/agast-helpers/tree';
-import { allTagsFor, buildFullRange, Path, TagPath } from '@bablr/agast-helpers/path';
+import { allTagsFor } from '@bablr/agast-helpers/path-facade';
+import { buildEmbeddedNode } from '@bablr/agast-vm-helpers/builders';
 
 export const ContextFacade = class BABLRContextFacade {
   constructor(actual) {
     facades.set(actual, this);
+    Object.freeze(this);
   }
 
   get languages() {
@@ -37,18 +40,16 @@ export const ContextFacade = class BABLRContextFacade {
       fragmentStream = streamFromTree(node);
     } else if (nodeStates.has(node)) {
       let state = nodeStates.get(node);
-      let { childrenIndexRange } = state;
+      let { tagsIndexRange } = state;
       let path = Path.from(state.fragmentNode);
 
-      if (!childrenIndexRange) {
-        childrenIndexRange = buildFullRange(state.node);
+      if (!tagsIndexRange) {
+        let nodePath = Path.from(state.node);
+        tagsIndexRange = [0, nodePath.tagPathAt(-1).tagsIndex];
       }
 
       fragmentStream = allTagsFor(
-        [
-          TagPath.from(path, childrenIndexRange[0]),
-          TagPath.from(path, childrenIndexRange[1] ?? undefined),
-        ],
+        [path.tagPathAt(tagsIndexRange[0], 0), path.tagPathAt(tagsIndexRange[1], -1)],
         { unshift: true },
       );
     } else {