partial-tsx 0.0.4 → 0.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "partial-tsx",
   "description": "Utilities for completing prefix-growing TSX.",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "repository": {
     "type": "git",

package/src/partial.ts

@@ -4,7 +4,7 @@ const BLOCK_CLOSERS = new Set(Object.values(BLOCK_FOLLOWERS));
 export type PartialTsxMode = "streaming" | "final";
 export type PartialTsxOptions = { mode?: PartialTsxMode };
 type BlockKind = "function" | "control" | "arrow" | "class" | "method" | "block" | "other";
-type CompletionFrame = { type: "block"; closer: string; statement: boolean; open?: number; close?: number; jsxExpression?: boolean; statementStart?: number; kind?: BlockKind } | { type: "jsx"; tag: string; open?: number };
+type CompletionFrame = { type: "block"; closer: string; statement: boolean; open?: number; close?: number; headerEnd?: number; jsxExpression?: boolean; statementStart?: number; kind?: BlockKind } | { type: "jsx"; tag: string; open?: number };
 
 // Single source of truth for the JSX-text fast path in the four lexer loops below: only `<` (child tag) and `{` (child
 // expression) leave text mode, so none of them reads `(`/`[`/quotes/`//` in ordinary text as unfinished JavaScript.
@@ -321,10 +321,10 @@ const isLikelyJsxTagStart = (code: string, index: number) => {
   return previousChar !== ">";
 };
 
-const isLikelyStatementBlock = (code: string, index: number, stack: CompletionFrame[]) => {
+const isLikelyStatementBlock = (code: string, index: number, headerEnd: number, stack: CompletionFrame[]) => {
   // A JSX child expression stays an expression even when the preceding prose looks like a JavaScript block header.
   if (code[index] !== "{" || isInsideJsxText(stack)) return false;
-  const before = code.slice(0, index).trimEnd();
+  const before = code.slice(0, headerEnd).trimEnd();
   return /\bfunction(?:\s+[\w$]+)?\s*\([^)]*\)$/.test(before) || /\b(?:if|for|while|switch|with)\s*\([^)]*\)$/.test(before) || /\bcatch(?:\s*\([^)]*\))?$/.test(before) || /(?:^|[^\w$])(?:else|try|finally|do)$/.test(before) || before.endsWith("=>");
 };
 
@@ -1240,10 +1240,13 @@ const scanStreamingSource = (code: string): StreamingScan => {
       statementRegexBoundary = false;
       const inheritedStart = currentStatementStart();
       const jsxExpression = char === "{" && insideJsxText;
-      const kind = jsxExpression ? undefined : getBlockKind(code, index, inheritedStart);
+      // Both classification and later JSX-shell checks must stop before trailing comments. Reuse lexical provenance
+      // instead of rescanning the prefix or stripping comment-like text inside literals (#1814).
+      const headerEnd = lastSignificantEnd;
+      const kind = jsxExpression ? undefined : getBlockKind(code, headerEnd, inheritedStart);
       const statement = !jsxExpression && kind !== "other";
-      const statementStart = statement ? findKeywordStart(code, index, inheritedStart, kind ?? "other") : inheritedStart;
-      stack.push({ type: "block", closer: BLOCK_FOLLOWERS[char], statement, open: index, jsxExpression, statementStart, kind });
+      const statementStart = statement ? findKeywordStart(code, headerEnd, inheritedStart, kind ?? "other") : inheritedStart;
+      stack.push({ type: "block", closer: BLOCK_FOLLOWERS[char], statement, open: index, headerEnd, jsxExpression, statementStart, kind });
       if (statement && char === "{") scopes.push({ statementStart: index + 1 });
       lastSignificantEnd = index + 1;
       index += 1;
@@ -1286,7 +1289,7 @@ const scanStreamingSource = (code: string): StreamingScan => {
   return { stack, closedBlocks, scopes, regexLiteralStarts, lastSignificantEnd, unclosedLiteralStart, unclosedLiteralStatementStart, incompleteJsxTagStart };
 };
 
-const getFrameHeader = (code: string, frame: Extract<CompletionFrame, { type: "block" }>) => code.slice(frame.statementStart ?? 0, frame.open ?? 0).trim();
+const getFrameHeader = (code: string, frame: Extract<CompletionFrame, { type: "block" }>) => code.slice(frame.statementStart ?? 0, frame.headerEnd ?? frame.open ?? 0).trim();
 const isComponentFunctionFrame = (code: string, frame: Extract<CompletionFrame, { type: "block" }>) => /^[A-Z]/.test(FUNCTION_HEADER.exec(getFrameHeader(code, frame))?.[1] ?? "");
 const isFunctionDeclarationFrame = (code: string, frame: Extract<CompletionFrame, { type: "block" }>) => FUNCTION_HEADER.test(getFrameHeader(code, frame));
 const isComponentClassFrame = (code: string, frame: Extract<CompletionFrame, { type: "block" }>) => /^[A-Z]/.test(CLASS_HEADER.exec(getFrameHeader(code, frame))?.[1] ?? "");
@@ -1642,6 +1645,7 @@ export function completePartialTsx(code: string, options: PartialTsxOptions = {}
   };
   const stack: CompletionFrame[] = [];
   let index = 0;
+  let lastSignificantEnd = 0;
   const push = (value: string) => {
     output += value;
   };
@@ -1650,6 +1654,7 @@ export function completePartialTsx(code: string, options: PartialTsxOptions = {}
     // Keep completion and committed-prefix scanning in the same lexical mode; never append ')' or ']' to plain text.
     if (isInsideJsxText(stack) && !isJsxTextBoundary(char)) {
       push(char);
+      if (!/\s/.test(char)) lastSignificantEnd = index + 1;
       index += 1;
       continue;
     }
@@ -1674,16 +1679,22 @@ export function completePartialTsx(code: string, options: PartialTsxOptions = {}
       index = closeIndex + 2;
       continue;
     }
+    // Match scanStreamingSource's header boundary without losing comments from the completed output.
+    const headerEnd = lastSignificantEnd;
+    if (!/\s/.test(char)) lastSignificantEnd = index + 1;
     if (regexLiteralStarts?.has(index) || isLikelyRegexLiteralStart(code, index)) {
       index = consumeRegexLiteral(code, index, push);
+      lastSignificantEnd = index;
       continue;
     }
     if (char === '"' || char === "'") {
       index = consumeStringLiteral(code, index, push);
+      lastSignificantEnd = index;
       continue;
     }
     if (char === "`") {
       index = consumeTemplateLiteral(code, index, push);
+      lastSignificantEnd = index;
       continue;
     }
     if (char === "<" && isInsideJsxText(stack) && !shouldStartJsxTag(code, index, stack) && index < code.length - 1) {
@@ -1712,11 +1723,12 @@ export function completePartialTsx(code: string, options: PartialTsxOptions = {}
       const tagName = match?.[1] ?? (tag === "<>" || tag === "</>" ? "" : null);
       if (!(tagName && VOID_TAGS.has(tagName) && tag.startsWith("</"))) push(tagName && VOID_TAGS.has(tagName) && !tag.endsWith("/>") ? tag.replace(/\s*\/?\s*>$/, " />") : tag);
       index = closeIndex + 1;
+      lastSignificantEnd = index;
       updateJsxStackForTag(stack, tag);
       continue;
     }
     if (char in BLOCK_FOLLOWERS) {
-      stack.push({ type: "block", closer: BLOCK_FOLLOWERS[char], statement: isLikelyStatementBlock(code, index, stack), open: output.length, jsxExpression: char === "{" && isInsideJsxText(stack) });
+      stack.push({ type: "block", closer: BLOCK_FOLLOWERS[char], statement: isLikelyStatementBlock(code, index, headerEnd, stack), open: output.length, jsxExpression: char === "{" && isInsideJsxText(stack) });
       push(char);
       index += 1;
       continue;