rip-lang 3.13.21 → 3.13.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rip-lang",
-  "version": "3.13.21",
+  "version": "3.13.23",
   "description": "A modern language that compiles to JavaScript",
   "type": "module",
   "main": "src/compiler.js",

package/src/components.js

@@ -397,7 +397,17 @@ export function installComponentSupport(CodeGenerator, Lexer) {
       // ─────────────────────────────────────────────────────────────────────
       // Implicit nesting (inject -> before INDENT)
       // ─────────────────────────────────────────────────────────────────────
-      if (nextToken && nextToken[0] === 'INDENT' && !nextToken.fromThen) {
+      if (nextToken && nextToken[0] === 'INDENT') {
+        // Skip fromThen INDENTs inside string interpolation (e.g. "#{if x then y else z}")
+        if (nextToken.fromThen) {
+          let depth = 0;
+          for (let j = i; j >= 0; j--) {
+            let jt = tokens[j][0];
+            if (jt === 'INTERPOLATION_END' || jt === 'STRING_END') depth++;
+            if (jt === 'INTERPOLATION_START' || jt === 'STRING_START') depth--;
+            if (depth < 0) { return 1; }
+          }
+        }
         if (tag === '->' || tag === '=>' || tag === 'CALL_START' || tag === '(') {
           return 1;
         }
@@ -1511,6 +1521,10 @@ export function installComponentSupport(CodeGenerator, Lexer) {
     this._createLines = [];
     this._setupLines = [];
 
+    // Capture enclosing loop variables before pushing current loop
+    const outerLoopParams = this._loopVarStack.map(v => `${v.itemVar}, ${v.indexVar}`).join(', ');
+    const outerExtra = outerLoopParams ? `, ${outerLoopParams}` : '';
+
     this._loopVarStack.push({ itemVar, indexVar });
     const itemNode = this.generateTemplateBlock(body);
     this._loopVarStack.pop();
@@ -1524,7 +1538,7 @@ export function installComponentSupport(CodeGenerator, Lexer) {
 
     // Generate block factory
     const factoryLines = [];
-    factoryLines.push(`function ${blockName}(ctx, ${itemVar}, ${indexVar}) {`);
+    factoryLines.push(`function ${blockName}(ctx, ${itemVar}, ${indexVar}${outerExtra}) {`);
 
     const localVars = new Set();
     for (const line of itemCreateLines) {
@@ -1562,7 +1576,7 @@ export function installComponentSupport(CodeGenerator, Lexer) {
     factoryLines.push(`    },`);
 
     // p() - update
-    factoryLines.push(`    p(ctx, ${itemVar}, ${indexVar}) {`);
+    factoryLines.push(`    p(ctx, ${itemVar}, ${indexVar}${outerExtra}) {`);
     if (hasEffects) {
       factoryLines.push(`      disposers.forEach(d => d());`);
       factoryLines.push(`      disposers = [];`);
@@ -1615,11 +1629,11 @@ export function installComponentSupport(CodeGenerator, Lexer) {
     setupLines.push(`      const __key = ${keyExpr};`);
     setupLines.push(`      let __block = __map.get(__key);`);
     setupLines.push(`      if (!__block) {`);
-    setupLines.push(`        __block = ${blockName}(this, ${itemVar}, ${indexVar});`);
+    setupLines.push(`        __block = ${blockName}(this, ${itemVar}, ${indexVar}${outerExtra});`);
     setupLines.push(`        __block.c();`);
     setupLines.push(`      }`);
     setupLines.push(`      __block.m(__parent, __anchor);`);
-    setupLines.push(`      __block.p(this, ${itemVar}, ${indexVar});`);
+    setupLines.push(`      __block.p(this, ${itemVar}, ${indexVar}${outerExtra});`);
     setupLines.push(`      __newMap.set(__key, __block);`);
     setupLines.push(`    }`);
     setupLines.push(``);