rip-lang 3.13.63 → 3.13.65

package/package.json

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

package/src/compiler.js

@@ -1072,7 +1072,7 @@ export class CodeGenerator {
   generateReturn(head, rest, context, sexpr) {
     if (rest.length === 0) return 'return';
     let [expr] = rest;
-    if (this.sideEffectOnly) return 'return';
+    if (this.sideEffectOnly && !(this.is(expr, '->') || this.is(expr, '=>'))) return 'return';
 
     if (this.is(expr, 'if')) {
       let [, condition, body, ...elseParts] = expr;

package/src/components.js

@@ -112,6 +112,8 @@ function isPublicProp(target) {
 
 export function installComponentSupport(CodeGenerator, Lexer) {
 
+  let meta = (node, key) => node instanceof String ? node[key] : undefined;
+
   // ==========================================================================
   // Lexer: Context-sensitive 'offer'/'accept' (only inside component bodies)
   // ==========================================================================
@@ -261,16 +263,18 @@ export function installComponentSupport(CodeGenerator, Lexer) {
       if (!inRender) return 1;
 
       // ─────────────────────────────────────────────────────────────────────
-      // Expression output: = expr → "#{expr}" (text node, never a tag)
+      // Expression output: = expr → text node (stamp .text, skip tag detection)
       // ─────────────────────────────────────────────────────────────────────
       if (tag === '=' && i > 0) {
         let prev = tokens[i - 1][0];
         if (prev === 'TERMINATOR' || prev === 'INDENT' || prev === 'RENDER') {
-          let end = i + 1;
-          while (end < tokens.length && tokens[end][0] !== 'TERMINATOR' && tokens[end][0] !== 'INDENT' && tokens[end][0] !== 'OUTDENT') end++;
-          tokens.splice(end, 0, gen('INTERPOLATION_END', ')', token), gen('STRING', '""', token), gen('STRING_END', ')', token));
-          tokens.splice(i, 1, gen('STRING_START', '(', token), gen('STRING', '""', token), gen('INTERPOLATION_START', '(', token));
-          return 3;
+          tokens.splice(i, 1);
+          if (tokens[i] && tokens[i][0] === 'IDENTIFIER') {
+            let val = tokens[i][1];
+            if (typeof val === 'string') { val = new String(val); tokens[i][1] = val; }
+            val.text = true;
+          }
+          return 0;
         }
       }
 
@@ -485,7 +489,19 @@ export function installComponentSupport(CodeGenerator, Lexer) {
         }
 
         if (isTemplateElement) {
-          let isClassOrIdTail = tag === 'PROPERTY' && i > 0 && (tokens[i - 1][0] === '.' || tokens[i - 1][0] === '#');
+          let isClassOrIdTail = false;
+          if (tag === 'PROPERTY' && i > 0 && tokens[i - 1][0] === '.') {
+            // Trace backward through the .PROPERTY chain to find its root —
+            // only a CSS class tail if the chain starts from a line-starting template tag
+            let j = i;
+            while (j >= 2 && tokens[j - 1][0] === '.' && tokens[j - 2][0] === 'PROPERTY') j -= 2;
+            if (j >= 2 && tokens[j - 1][0] === '.' && tokens[j - 2][0] === 'IDENTIFIER' && isTemplateTag(tokens[j - 2][1])) {
+              let before = j >= 3 ? tokens[j - 3][0] : null;
+              if (!before || before === 'INDENT' || before === 'OUTDENT' || before === 'TERMINATOR' || before === 'RENDER') {
+                isClassOrIdTail = true;
+              }
+            }
+          }
           let isBareTag = isClsxCallEnd || (tag === 'IDENTIFIER' && isTemplateTag(token[1])) || isClassOrIdTail;
 
           if (isBareTag) {
@@ -560,11 +576,11 @@ export function installComponentSupport(CodeGenerator, Lexer) {
       current = current[1];
     }
     let raw = typeof current === 'string' ? current : (current instanceof String ? current.valueOf() : null);
-    if (raw === null) return { tag: null, classes, id: undefined };
+    if (raw === null) return { tag: null, classes, id: undefined, base: current };
     // Split tag#id — e.g. "div#content" → tag: "div", id: "content"
     let [tag, id] = raw.split('#');
     if (!tag) tag = 'div';  // bare #id → div
-    return { tag, classes, id };
+    return { tag, classes, id, base: current };
   };
 
   // ==========================================================================
@@ -1061,7 +1077,7 @@ export function installComponentSupport(CodeGenerator, Lexer) {
     }
 
     // HTML tag (possibly with #id, e.g. div#content)
-    if (headStr && this.isHtmlTag(headStr)) {
+    if (headStr && this.isHtmlTag(headStr) && !meta(head, 'text')) {
       let [tagName, id] = headStr.split('#');
       return this.generateTag(tagName || 'div', [], rest, id);
     }
@@ -1084,9 +1100,9 @@ export function installComponentSupport(CodeGenerator, Lexer) {
         return slotVar;
       }
 
-      // HTML tag with classes (div.class) and optional #id
-      const { tag, classes, id } = this.collectTemplateClasses(sexpr);
-      if (tag && this.isHtmlTag(tag)) {
+      // HTML tag with classes (div.class) — skip if base is marked .text by = prefix
+      const { tag, classes, id, base } = this.collectTemplateClasses(sexpr);
+      if (!meta(base, 'text') && tag && this.isHtmlTag(tag)) {
         return this.generateTag(tag, classes, [], id);
       }
 
@@ -1438,7 +1454,11 @@ export function installComponentSupport(CodeGenerator, Lexer) {
             this._pushEffect(`${elVar}.setAttribute('${key}', ${valueCode});`);
           }
         } else {
-          this._createLines.push(`${elVar}.setAttribute('${key}', ${valueCode});`);
+          if (Array.isArray(value) && value[0] === 'presence') {
+            this._createLines.push(`{ const __v = ${valueCode}; __v == null ? void 0 : ${elVar}.setAttribute('${key}', __v); }`);
+          } else {
+            this._createLines.push(`${elVar}.setAttribute('${key}', ${valueCode});`);
+          }
         }
       }
     }
@@ -1885,6 +1905,15 @@ export function installComponentSupport(CodeGenerator, Lexer) {
       return true;
     }
 
+    // Method call on component: [['.', 'this', method], ...args]
+    // Methods may read reactive state internally — treat as reactive so the
+    // call gets wrapped in __effect and re-runs when dependencies change.
+    if (Array.isArray(sexpr[0]) && sexpr[0][0] === '.' && sexpr[0][1] === 'this') {
+      const m = sexpr[0][2];
+      const name = typeof m === 'string' ? m : m instanceof String ? m.valueOf() : null;
+      if (name && this.componentMembers?.has(name)) return true;
+    }
+
     for (const child of sexpr) {
       if (this.hasReactiveDeps(child)) return true;
     }