@lightspeed-js/core 0.4.7 → 0.4.8

package/dist/compile.js

@@ -913,9 +913,9 @@ class BindingEvaluator {
   compileExpression(expr, params = []) {
     return this.compile(expr, params);
   }
-  evaluate(expr, instance, locals = []) {
+  evaluate(expr, instance, locals = [], params = []) {
     try {
-      return this.compile(expr, [])(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
+      return this.compile(expr, params)(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
     } catch (error) {
       warn(`Error evaluating "${expr}" in ${instance.id}:`, error);
       return;

package/dist/index.js

@@ -485,9 +485,9 @@ class BindingEvaluator {
   compileExpression(expr, params = []) {
     return this.compile(expr, params);
   }
-  evaluate(expr, instance, locals = []) {
+  evaluate(expr, instance, locals = [], params = []) {
     try {
-      return this.compile(expr, [])(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
+      return this.compile(expr, params)(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
     } catch (error) {
       warn(`Error evaluating "${expr}" in ${instance.id}:`, error);
       return;
@@ -1569,7 +1569,8 @@ class Mounter {
       outlet.replaceWith(holder);
     }
     for (const [name, nodes] of byName) {
-      if (!nodes.length)
+      const dropped = nodes.filter((node) => node.nodeType === 1 || node.nodeType === 3 && (node.textContent ?? "").trim() !== "");
+      if (!dropped.length)
         continue;
       warn(name ? `No <slot name="${name}"> to receive this content - it was dropped.` : "Content passed to a component with no unnamed <slot> - it was dropped.");
     }
@@ -1920,7 +1921,7 @@ class Mounter {
     return block;
   }
   adoptRows(block, slices, context) {
-    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals);
+    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals, block.params);
     const items = block.toItems(value);
     if (items.length !== slices.length)
       return false;

package/dist/ssg.js

@@ -504,9 +504,9 @@ class BindingEvaluator {
   compileExpression(expr, params = []) {
     return this.compile(expr, params);
   }
-  evaluate(expr, instance, locals = []) {
+  evaluate(expr, instance, locals = [], params = []) {
     try {
-      return this.compile(expr, [])(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
+      return this.compile(expr, params)(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
     } catch (error) {
       warn(`Error evaluating "${expr}" in ${instance.id}:`, error);
       return;
@@ -1592,7 +1592,8 @@ class Mounter {
       outlet.replaceWith(holder);
     }
     for (const [name, nodes] of byName) {
-      if (!nodes.length)
+      const dropped = nodes.filter((node) => node.nodeType === 1 || node.nodeType === 3 && (node.textContent ?? "").trim() !== "");
+      if (!dropped.length)
         continue;
       warn(name ? `No <slot name="${name}"> to receive this content - it was dropped.` : "Content passed to a component with no unnamed <slot> - it was dropped.");
     }
@@ -1943,7 +1944,7 @@ class Mounter {
     return block;
   }
   adoptRows(block, slices, context) {
-    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals);
+    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals, block.params);
     const items = block.toItems(value);
     if (items.length !== slices.length)
       return false;

package/dist/types/src/runtime/bindings/BindingEvaluator.d.ts

@@ -133,7 +133,12 @@ export declare class BindingEvaluator {
     get cellManager(): CellManager;
     /** Compile a standalone expression, e.g. a `$key`. */
     compileExpression(expr: string, params?: string[]): Compiled;
-    evaluate(expr: string, instance: ComponentInstance, locals?: any[]): any;
+    /**
+     * Evaluate once, outside a binding. `params` names the loop aliases `locals`
+     * holds: the compiled table is keyed by scope, so a block inside a `$for`
+     * row has to be looked up with the row's alias in scope, or it misses.
+     */
+    evaluate(expr: string, instance: ComponentInstance, locals?: any[], params?: string[]): any;
     applyBinding(binding: Binding, scope: BindingScope): void;
     /** Re-evaluate everything owned by this instance, including its blocks. */
     updateInstance(instance: ComponentInstance): void;

package/dist/types/test/branch-in-row-adoption.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/vite.js

@@ -243,9 +243,9 @@ class BindingEvaluator {
   compileExpression(expr, params = []) {
     return this.compile(expr, params);
   }
-  evaluate(expr, instance, locals = []) {
+  evaluate(expr, instance, locals = [], params = []) {
     try {
-      return this.compile(expr, [])(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
+      return this.compile(expr, params)(instance.state, instance.props, this.cells.createReadProxy(), this.pendingProbe(), ...locals);
     } catch (error) {
       warn(`Error evaluating "${expr}" in ${instance.id}:`, error);
       return;
@@ -1023,7 +1023,8 @@ class Mounter {
       outlet.replaceWith(holder);
     }
     for (const [name, nodes] of byName) {
-      if (!nodes.length)
+      const dropped = nodes.filter((node) => node.nodeType === 1 || node.nodeType === 3 && (node.textContent ?? "").trim() !== "");
+      if (!dropped.length)
         continue;
       warn(name ? `No <slot name="${name}"> to receive this content - it was dropped.` : "Content passed to a component with no unnamed <slot> - it was dropped.");
     }
@@ -1374,7 +1375,7 @@ class Mounter {
     return block;
   }
   adoptRows(block, slices, context) {
-    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals);
+    const value = this.bindings.evaluate(block.itemsExpr, context.owner, context.locals, block.params);
     const items = block.toItems(value);
     if (items.length !== slices.length)
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightspeed-js/core",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Lightspeed: a compile-first framework for islands of reactivity in static HTML.",
   "keywords": [
     "lightspeed",