@bablr/agast-vm 0.6.0 → 0.6.1

package/lib/context.js

@@ -3,10 +3,7 @@ import {
   getCooked as getCookedFromTree,
   sourceTextFor as sourceTextForTree,
 } from '@bablr/agast-helpers/tree';
-import {
-  getCooked as getCookedFromStream,
-  sourceTextFor as sourceTextForStream,
-} from '@bablr/agast-helpers/stream';
+import { getCooked as getCookedFromStream } from '@bablr/agast-helpers/stream';
 import { OpenNodeTag, CloseNodeTag } from '@bablr/agast-helpers/symbols';
 import { facades, actuals } from './facades.js';
 
@@ -52,6 +49,10 @@ export const ContextFacade = class AgastContextFacade {
     return actuals.get(this).buildRange(tags);
   }
 
+  nodeForTag(tag) {
+    return actuals.get(this).nodeForTag(tag);
+  }
+
   unbox(value) {
     return actuals.get(this).unbox(value);
   }
@@ -65,6 +66,7 @@ export const Context = class AgastContext {
   constructor() {
     this.prevTags = new WeakMap();
     this.nextTags = new WeakMap();
+    this.tagNodes = new WeakMap();
     this.unboxedValues = new WeakMap();
     this.facade = new ContextFacade();
 
@@ -100,6 +102,10 @@ export const Context = class AgastContext {
     return this.nextTags.get(token);
   }
 
+  nodeForTag(tag) {
+    return this.tagNodes.get(tag);
+  }
+
   sourceTextFor(node) {
     return sourceTextForTree(node);
   }

package/lib/evaluate.js

@@ -72,7 +72,7 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
         s = s.accept();
 
         if (s.depth === 0) {
-          yield* s.emit();
+          yield* s.emit(options);
         }
 
         returnValue = facades.get(s);
@@ -87,7 +87,7 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
       }
 
       case 'advance': {
-        const { 0: embeddedTag, 1: options } = args;
+        const { 0: embeddedTag, 1: advanceOptions } = args;
 
         const tag = embeddedTag.value;
 
@@ -186,7 +186,7 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
 
             returnValue = s.advance(
               buildNodeOpenTag(flags, language, type, attributes),
-              getEmbeddedExpression(options),
+              getEmbeddedExpression(advanceOptions),
             );
             break;
           }
@@ -194,7 +194,10 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
           case OpenFragmentTag: {
             const { flags } = tag.value;
 
-            returnValue = s.advance(buildFragmentOpenTag(flags), getEmbeddedExpression(options));
+            returnValue = s.advance(
+              buildFragmentOpenTag(flags),
+              getEmbeddedExpression(advanceOptions),
+            );
             break;
           }
 
@@ -214,7 +217,7 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
             throw new Error();
         }
 
-        yield* s.emit();
+        yield* s.emit(options);
 
         break;
       }
@@ -274,7 +277,7 @@ const __evaluate = function* agast(ctx, strategy, options = {}) {
         }
 
         if (!unboundAttributes.size) {
-          yield* s.emit();
+          yield* s.emit(options);
         }
 
         returnValue = getRange(s.node);

package/lib/state.js

@@ -17,6 +17,8 @@ import * as btree from '@bablr/agast-helpers/btree';
 import {
   buildBeginningOfStreamToken,
   buildEmbeddedNode,
+  buildEffect,
+  buildYieldEffect,
 } from '@bablr/agast-vm-helpers/internal-builders';
 import {
   DoctypeTag,
@@ -148,7 +150,7 @@ export const State = class AgastState extends WeakStackFrame {
   }
 
   get tagNodes() {
-    return this.internalContext.tagNodes;
+    return this.context.tagNodes;
   }
 
   get unboundAttributes() {
@@ -423,7 +425,7 @@ export const State = class AgastState extends WeakStackFrame {
     return tag;
   }
 
-  *emit() {
+  *emit(options) {
     const { nextTags } = this.context;
     if (!this.depth) {
       let emittable = this.emitted ? nextTags.get(this.emitted) : this.result;
@@ -436,7 +438,8 @@ export const State = class AgastState extends WeakStackFrame {
           nodeStates.get(this.nodeForTag(emittable)).unboundAttributes?.size
         )
       ) {
-        yield emittable;
+        yield options.emitEffects ? buildYieldEffect(emittable) : emittable;
+
         this.emitted = emittable;
         emittable = nextTags.get(this.emitted);
       }

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "@bablr/agast-vm",
   "description": "A VM providing DOM-like guarantees about agAST trees",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
-  "files": [
-    "lib"
-  ],
+  "files": ["lib"],
   "exports": {
     ".": "./lib/index.js"
   },