rip-lang 3.13.129 → 3.13.130

package/src/sourcemap-utils.js

@@ -58,6 +58,17 @@ export function findNearestWord(text, word, approx) {
   return bestIdx;
 }
 
+// Check whether an offset falls on an injected function overload signature line
+// (generated by compileForCheck, not from user code).  These are body lines that
+// match `function NAME(...): TYPE;` and have no genToSrc entry.
+export function isInjectedOverload(entry, offset) {
+  const tsLine = offsetToLine(entry.tsContent, offset);
+  if (tsLine < entry.headerLines) return false;
+  if (entry.genToSrc.get(tsLine) !== undefined) return false;
+  const lineText = getLineText(entry.tsContent, tsLine);
+  return /^(?:async\s+)?function\s+\w+\s*\(/.test(lineText) && lineText.trimEnd().endsWith(';');
+}
+
 export function offsetToLine(text, offset) {
   let line = 0;
   for (let i = 0; i < offset && i < text.length; i++) {
@@ -92,6 +103,12 @@ export function mapToSourcePos(entry, offset) {
   if (tsLine < entry.headerLines) {
     // DTS preamble — find the identifier at the offset and locate it in the source
     const genLineText = getLineText(entry.tsContent, tsLine);
+
+    // Skip compiler-injected stdlib declarations (declare function warn, etc.)
+    // — diagnostics on these lines are never user-authored and would incorrectly
+    // match string literals or identifiers in the source.
+    if (/^declare\s+function\s/.test(genLineText)) return null;
+
     let lineStart = 0, curLine = 0;
     for (let i = 0; i < entry.tsContent.length; i++) {
       if (curLine === tsLine) { lineStart = i; break; }
@@ -189,6 +206,25 @@ export function mapToSourcePos(entry, offset) {
     }
   }
 
+  // Injected function overload signatures (e.g. `function fetchUser(id: number): Promise<User>;`)
+  // have no genToSrc entry.  The backward-walk approximation below can map them to
+  // wildly wrong source lines.  Extract the function name and find its `def` in the source.
+  const bodyLine = getLineText(entry.tsContent, tsLine);
+  if (entry.genToSrc.get(tsLine) === undefined && entry.source) {
+    const overloadMatch = bodyLine.match(/^(?:async\s+)?function\s+(\w+)\s*\(/);
+    if (overloadMatch && bodyLine.trimEnd().endsWith(';')) {
+      const fnName = overloadMatch[1];
+      const srcLines = entry.source.split('\n');
+      const defRe = new RegExp('\\bdef\\s+' + fnName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\b');
+      for (let s = 0; s < srcLines.length; s++) {
+        if (defRe.test(srcLines[s])) {
+          const col = srcLines[s].indexOf(fnName);
+          return { line: s, col: col >= 0 ? col : 0 };
+        }
+      }
+    }
+  }
+
   // Resolve source line from genToSrc
   let srcLine = entry.genToSrc.get(tsLine);
   if (srcLine === undefined) {
@@ -235,7 +271,11 @@ export function mapToSourcePos(entry, offset) {
   const srcText = entry.source ? getLineText(entry.source, srcLine) : '';
   // Text-match: find the word at genCol in the gen line, then locate it in the source line
   if (srcText) {
-    const wordAt = genText.slice(genCol).match(/^\w+/);
+    let wordAt = genText.slice(genCol).match(/^\w+/);
+    // Quoted string literal (e.g. __ripEl('tag')) — peek inside the quotes
+    if (!wordAt && (genText[genCol] === "'" || genText[genCol] === '"')) {
+      wordAt = genText.slice(genCol + 1).match(/^\w+/);
+    }
     if (wordAt) {
       let word = wordAt[0];
       let idx = findNearestWord(srcText, word, approx);
@@ -247,7 +287,11 @@ export function mapToSourcePos(entry, offset) {
       if (idx >= 0) return { line: srcLine, col: idx };
     }
     if (genCol > 0 && (!wordAt || genCol >= genText.length)) {
-      const wordBefore = genText.slice(0, genCol).match(/(\w+)$/);
+      let wordBefore = genText.slice(0, genCol).match(/(\w+)$/);
+      // Closing quote — peek inside to find the word (e.g. end of __ripEl('tag'))
+      if (!wordBefore && (genText[genCol - 1] === "'" || genText[genCol - 1] === '"')) {
+        wordBefore = genText.slice(0, genCol - 1).match(/(\w+)$/);
+      }
       if (wordBefore) {
         let word = wordBefore[0];
         let idx = findNearestWord(srcText, word, approx - word.length);

package/src/typecheck.js

@@ -13,7 +13,7 @@
 import { Compiler, getStdlibCode } from './compiler.js';
 import { createRequire } from 'module';
 import { readFileSync, existsSync, readdirSync } from 'fs';
-import { mapToSourcePos, offsetToLine, getLineText, findNearestWord, lineColToOffset, offsetToLineCol, adjustSwitchDiagnostic } from './sourcemap-utils.js';
+import { mapToSourcePos, offsetToLine, getLineText, findNearestWord, lineColToOffset, offsetToLineCol, adjustSwitchDiagnostic, isInjectedOverload } from './sourcemap-utils.js';
 import { resolve, relative, dirname } from 'path';
 import { buildLineMap } from './sourcemaps.js';
 
@@ -250,6 +250,11 @@ export function cleanDiagnosticMessage(msg) {
   msg = msg.replace(/\b__RipProps<['"](\w+)['"]>/g, '<$1> props');
   msg = msg.replace(/\b__RipElementMap\b/g, 'ElementMap');
   msg = msg.replace(/\b__ripEl\b/g, 'element');
+  // Rewrite verbose __ripEl tag union mismatch into a clean JSX-like message
+  msg = msg.replace(
+    /Argument of type '"([\w-]+)"' is not assignable to parameter of type '(?:__RipTag|[^']*\bkeyof HTMLElementTagNameMap\b[^']*)'\./,
+    "'$1' is not a known HTML or SVG element."
+  );
   // Deduplicate consecutive identical lines (unwrapping can collapse nested messages)
   msg = msg.split('\n').filter((line, i, arr) => i === 0 || line.trim() !== arr[i - 1].trim()).join('\n');
   // Remove redundant nested "Type 'X' is not assignable to type 'Y'" when
@@ -563,23 +568,37 @@ export function compileForCheck(filePath, source, compiler) {
     const cl = code.split('\n');
     let changed = false;
     for (let j = 0; j < cl.length; j++) {
-      // Match: constructor(props?: { ... }) or constructor(props: { ... })
-      const cm = cl[j].match(/^\s+constructor\((props)\??\s*:\s*(\{[^}]*\})\)/);
+      // Match: constructor(_props?: { ... }) or constructor(_props: { ... })
+      const cm = cl[j].match(/^\s+constructor\(_props\??\s*:\s*(\{[^}]*\})\)/);
       if (cm) {
-        const propsType = `${cm[1]}: ${cm[2]}`;
+        const propsType = cm[1];
         // Find _init(props) in the same class
         for (let k = j + 1; k < cl.length; k++) {
           if (cl[k].match(/^((?:export\s+)?(?:const|class)\s+)/)) break;
           if (cl[k].match(/^\s+_init\(props\)\s*\{?\s*$/)) {
-            cl[k] = cl[k].replace('_init(props)', `_init(${propsType})`);
+            // Check if the body actually uses `props`
+            let usesProps = false;
+            for (let m = k + 1; m < cl.length; m++) {
+              if (/^\s+\}/.test(cl[m]) || /^((?:export\s+)?(?:const|class)\s+)/.test(cl[m])) break;
+              if (/\bprops\b/.test(cl[m])) { usesProps = true; break; }
+            }
+            const paramName = usesProps ? 'props' : '_props';
+            cl[k] = cl[k].replace('_init(props)', `_init(${paramName}: ${propsType})`);
             changed = true;
             break;
           }
         }
       }
-      // For component classes without typed constructors, type _init(props) as any
+      // For component classes without typed constructors, type _init(props) as any.
+      // Check if the body actually uses `props` — if not, prefix with _ to suppress 6133.
       if (cl[j].match(/^\s+_init\(props\)\s*\{?\s*$/)) {
-        cl[j] = cl[j].replace('_init(props)', '_init(props: Record<string, any>)');
+        let usesProps = false;
+        for (let k = j + 1; k < cl.length; k++) {
+          if (/^\s+\}/.test(cl[k]) || /^((?:export\s+)?(?:const|class)\s+)/.test(cl[k])) break;
+          if (/\bprops\b/.test(cl[k])) { usesProps = true; break; }
+        }
+        const paramName = usesProps ? 'props' : '_props';
+        cl[j] = cl[j].replace('_init(props)', `_init(${paramName}: Record<string, any>)`);
         changed = true;
       }
     }
@@ -737,7 +756,8 @@ export function compileForCheck(filePath, source, compiler) {
       "type __RipDomEl<K extends __RipTag> = Omit<__RipElementMap[K], 'querySelector' | 'querySelectorAll' | 'closest' | 'setAttribute' | 'hidden'> & __RipBrowserElement;",
       "type __RipAttrKeys<T> = { [K in keyof T]-?: K extends 'style' ? never : T[K] extends (...args: any[]) => any ? never : K }[keyof T] & string;",
       'type __RipEvents = { [K in keyof HTMLElementEventMap as `@${K}`]?: ((event: HTMLElementEventMap[K]) => void) | null };',
-      'type __RipProps<K extends __RipTag> = { [P in __RipAttrKeys<__RipElementMap[K]>]?: __RipElementMap[K][P] } & __RipEvents & { ref?: string; class?: string; style?: string; [k: `data-${string}`]: any; [k: `aria-${string}`]: any };',
+      'type __RipClassValue = string | boolean | null | undefined | Record<string, boolean> | __RipClassValue[];',
+      'type __RipProps<K extends __RipTag> = { [P in __RipAttrKeys<__RipElementMap[K]>]?: __RipElementMap[K][P] } & __RipEvents & { ref?: string; class?: __RipClassValue | __RipClassValue[]; style?: string; [k: `data-${string}`]: any; [k: `aria-${string}`]: any };',
       'declare function __ripEl<K extends __RipTag>(tag: K, props?: __RipProps<K>): void;',
     ];
     headerDts = intrinsicDecls.join('\n') + '\n' + headerDts;
@@ -900,7 +920,7 @@ export function compileForCheck(filePath, source, compiler) {
 
 // ── Source mapping helpers (delegated to sourcemap-utils.js) ───────
 
-export { mapToSourcePos, offsetToLine, getLineText, findNearestWord, lineColToOffset, offsetToLineCol, adjustSwitchDiagnostic } from './sourcemap-utils.js';
+export { mapToSourcePos, offsetToLine, getLineText, findNearestWord, lineColToOffset, offsetToLineCol, adjustSwitchDiagnostic, isInjectedOverload } from './sourcemap-utils.js';
 
 // Map a TypeScript diagnostic offset back to a Rip source line number.
 // Returns -1 if the offset falls in the DTS header.
@@ -1100,6 +1120,16 @@ export async function runCheck(targetDir, opts = {}) {
       if (d.start === undefined) continue;
       if (SKIP_CODES.has(d.code)) continue;
 
+      // Skip 6133 on compiler-generated _render() construction variables (_0, _1, …)
+      if ((d.code === 6133 || d.code === 6196) && d.length > 0) {
+        const span = entry.tsContent.substring(d.start, d.start + d.length);
+        if (/^_\d+$/.test(span.trim())) continue;
+      }
+
+      // Skip diagnostics on injected overload signatures — the real function
+      // definition already carries the same diagnostic.
+      if (isInjectedOverload(entry, d.start)) continue;
+
       const pos = mapToSourcePos(entry, d.start);
       if (!pos) continue;
 

package/src/types.js

@@ -1149,7 +1149,7 @@ export function emitTypes(tokens, sexpr = null, source = '') {
     preamble.push("type __RipDomEl<K extends __RipTag> = Omit<__RipElementMap[K], 'querySelector' | 'querySelectorAll' | 'closest' | 'setAttribute' | 'hidden'> & __RipBrowserElement;");
     preamble.push("type __RipAttrKeys<T> = { [K in keyof T]-?: K extends 'style' ? never : T[K] extends (...args: any[]) => any ? never : K }[keyof T] & string;");
     preamble.push('type __RipEvents = { [K in keyof HTMLElementEventMap as `@${K}`]?: ((event: HTMLElementEventMap[K]) => void) | null };');
-    preamble.push('type __RipProps<K extends __RipTag> = { [P in __RipAttrKeys<__RipElementMap[K]>]?: __RipElementMap[K][P] } & __RipEvents & { ref?: string; class?: string; style?: string; [k: `data-${string}`]: any; [k: `aria-${string}`]: any };');
+    preamble.push('type __RipClassValue = string | boolean | null | undefined | Record<string, boolean> | __RipClassValue[]'); preamble.push('type __RipProps<K extends __RipTag> = { [P in __RipAttrKeys<__RipElementMap[K]>]?: __RipElementMap[K][P] } & __RipEvents & { ref?: string; class?: __RipClassValue | __RipClassValue[]; style?: string; [k: `data-${string}`]: any; [k: `aria-${string}`]: any };');
   }
   if (/\bARIA\./.test(source)) {
     preamble.push("type __RipAriaNavHandlers = { next?: () => void; prev?: () => void; first?: () => void; last?: () => void; select?: () => void; dismiss?: () => void; tab?: () => void; char?: () => void; };");
@@ -1320,12 +1320,12 @@ function emitComponentTypes(sexpr, lines, indent, indentLevel, componentVars, so
         hasDefault = false;
         if (!isProp && propName) componentVars.add(propName);
       } else if (mHead === 'object') {
-        // Method definitions: (object (methodName (-> (params...) (block ...)) :))
+        // Method definitions: (object (: methodName (-> (params...) (block ...))))
         for (let i = 1; i < member.length; i++) {
           let entry = member[i];
-          if (!Array.isArray(entry) || entry.length < 2) continue;
-          let methName = entry[0]?.valueOf?.() ?? entry[0];
-          let funcDef = entry[1];
+          if (!Array.isArray(entry) || entry.length < 3) continue;
+          let methName = entry[1]?.valueOf?.() ?? entry[1];
+          let funcDef = entry[2];
           if (!Array.isArray(funcDef)) continue;
           let fHead = funcDef[0]?.valueOf?.() ?? funcDef[0];
           if (fHead !== '->' && fHead !== '=>') continue;