@514labs/moose-lsp 1.4.0 → 1.4.1

package/dist/pythonSqlExtractor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/pythonSqlExtractor.ts"],"sourcesContent":["import * as path from 'node:path';\nimport {\n  Language,\n  Parser,\n  type Point,\n  type Node as SyntaxNode,\n} from 'web-tree-sitter';\nimport type { SqlLocation } from './sqlLocations';\n\nlet parser: Parser | null = null;\n\n/**\n * Initialize the web-tree-sitter parser with the Python grammar.\n * Must be called before any extraction functions.\n */\nexport async function initParser(): Promise<void> {\n  if (parser) return;\n\n  await Parser.init();\n  const p = new Parser();\n\n  // Load the Python WASM grammar from dist/ (copied during build)\n  const wasmPath = path.join(__dirname, 'tree-sitter-python.wasm');\n  const Python = await Language.load(wasmPath);\n  p.setLanguage(Python);\n  parser = p;\n}\n\nfunction getParser(): Parser {\n  if (!parser) {\n    throw new Error(\n      'Parser not initialized. Call initParser() before using extraction functions.',\n    );\n  }\n  return parser;\n}\n\n/**\n * Check if the file imports from moose_lib.\n * This is used to filter out sql() calls that aren't from moose-lib.\n */\nfunction fileImportsMooseLib(rootNode: SyntaxNode): boolean {\n  for (const child of rootNode.children) {\n    if (!child) continue;\n    // Handle: import moose_lib\n    if (child.type === 'import_statement') {\n      const moduleName = child.childForFieldName('name');\n      if (moduleName?.text === 'moose_lib') {\n        return true;\n      }\n      // Handle: import moose_lib.sql\n      if (\n        moduleName?.type === 'dotted_name' &&\n        moduleName.text.startsWith('moose_lib')\n      ) {\n        return true;\n      }\n    }\n\n    // Handle: from moose_lib import sql\n    // Handle: from moose_lib.sql import sql\n    if (child.type === 'import_from_statement') {\n      const moduleName = child.childForFieldName('module_name');\n      if (\n        moduleName?.text === 'moose_lib' ||\n        moduleName?.text?.startsWith('moose_lib.')\n      ) {\n        return true;\n      }\n    }\n  }\n\n  return false;\n}\n\n/**\n * Check if a function call is a `sql()` call from moose-lib.\n * We look for calls where the function name is 'sql'.\n */\nfunction isSqlFunctionCall(node: SyntaxNode): boolean {\n  if (node.type !== 'call') return false;\n\n  const functionNode = node.childForFieldName('function');\n  if (!functionNode) return false;\n\n  // Direct call: sql(\"...\")\n  if (functionNode.type === 'identifier' && functionNode.text === 'sql') {\n    return true;\n  }\n\n  // Attribute access: moose_lib.sql(\"...\") or similar\n  if (functionNode.type === 'attribute') {\n    const attribute = functionNode.childForFieldName('attribute');\n    if (attribute?.text === 'sql') {\n      return true;\n    }\n  }\n\n  return false;\n}\n\n/**\n * Extract the SQL string from a sql() function call arguments.\n * Handles both regular strings and f-strings.\n */\nfunction extractSqlFromCall(callNode: SyntaxNode): {\n  text: string;\n  startPosition: Point;\n  endPosition: Point;\n} | null {\n  const arguments_ = callNode.childForFieldName('arguments');\n  if (!arguments_) return null;\n\n  // Get the first argument (the SQL string)\n  for (const child of arguments_.children) {\n    if (!child) continue;\n    if (\n      child.type === 'string' ||\n      child.type === 'concatenated_string' ||\n      child.type === 'formatted_string'\n    ) {\n      const result = extractStringContent(child);\n      if (result) {\n        return {\n          text: result,\n          startPosition: child.startPosition,\n          endPosition: child.endPosition,\n        };\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Extract text content from a string node (regular string or f-string).\n * Converts f-string interpolations to ${...} placeholders.\n */\nfunction extractStringContent(node: SyntaxNode): string | null {\n  const text = node.text;\n  const isFString = /^f['\"]/.test(text);\n\n  if (node.type === 'string') {\n    if (isFString) {\n      // F-string: f\"SELECT {col} FROM users\"\n      return extractFStringContent(text);\n    }\n    // Regular string: \"SELECT * FROM users\"\n    // Remove quotes and extract content\n    return extractQuotedStringContent(text);\n  }\n\n  if (node.type === 'formatted_string') {\n    // F-string: f\"SELECT {col} FROM users\"\n    return extractFStringContent(text);\n  }\n\n  if (node.type === 'concatenated_string') {\n    // Handle concatenated strings: \"SELECT \" \"* FROM users\"\n    let result = '';\n    for (const child of node.children) {\n      if (!child) continue;\n      if (child.type === 'string' || child.type === 'formatted_string') {\n        const content = extractStringContent(child);\n        if (content !== null) {\n          result += content;\n        }\n      }\n    }\n    return result || null;\n  }\n\n  return null;\n}\n\n/**\n * Extract content from a quoted string, removing the quotes.\n */\nfunction extractQuotedStringContent(text: string): string | null {\n  // Handle triple-quoted strings\n  if (\n    text.startsWith('\"\"\"') ||\n    text.startsWith(\"'''\") ||\n    text.startsWith('f\"\"\"') ||\n    text.startsWith(\"f'''\") ||\n    text.startsWith('r\"\"\"') ||\n    text.startsWith(\"r'''\")\n  ) {\n    const prefixLen = text.startsWith('f') || text.startsWith('r') ? 4 : 3;\n    return text.slice(prefixLen, -3);\n  }\n\n  // Handle single/double quoted strings\n  if (\n    text.startsWith('\"') ||\n    text.startsWith(\"'\") ||\n    text.startsWith('f\"') ||\n    text.startsWith(\"f'\") ||\n    text.startsWith('r\"') ||\n    text.startsWith(\"r'\")\n  ) {\n    const prefixLen = text.startsWith('f') || text.startsWith('r') ? 2 : 1;\n    return text.slice(prefixLen, -1);\n  }\n\n  return text;\n}\n\n/**\n * Extract content from an f-string text, converting interpolations to ${...}.\n * Works with raw text (e.g., f\"SELECT {col} FROM users\").\n */\nfunction extractFStringContent(text: string): string {\n  // Remove the f-string prefix (f\", f', f\"\"\", f''')\n  let content: string;\n  if (text.startsWith('f\"\"\"') || text.startsWith(\"f'''\")) {\n    content = text.slice(4, -3);\n  } else if (text.startsWith('f\"') || text.startsWith(\"f'\")) {\n    content = text.slice(2, -1);\n  } else {\n    content = text;\n  }\n\n  // Replace balanced {expr} with ${...} using depth tracking\n  // This handles nested braces like {func({1, 2})} correctly\n  let result = '';\n  let i = 0;\n  while (i < content.length) {\n    if (content[i] === '{') {\n      if (content[i + 1] === '{') {\n        // Escaped {{ → literal {\n        result += '{';\n        i += 2;\n      } else {\n        // Find matching closing brace with depth tracking\n        let depth = 1;\n        let j = i + 1;\n        while (j < content.length && depth > 0) {\n          if (content[j] === '{') depth++;\n          else if (content[j] === '}') depth--;\n          j++;\n        }\n        result += '${...}';\n        i = j;\n      }\n    } else if (content[i] === '}' && content[i + 1] === '}') {\n      // Escaped }} → literal }\n      result += '}';\n      i += 2;\n    } else {\n      result += content[i];\n      i++;\n    }\n  }\n  return result;\n}\n\n/**\n * Check if a string node contains SQL-like content.\n * Used to identify f-strings that might contain SQL even outside sql() calls.\n */\nfunction looksLikeSql(text: string): boolean {\n  const sqlKeywords = [\n    'SELECT',\n    'INSERT',\n    'UPDATE',\n    'DELETE',\n    'CREATE',\n    'DROP',\n    'ALTER',\n    'FROM',\n    'WHERE',\n    'JOIN',\n    'TABLE',\n    'INDEX',\n    'VIEW',\n  ];\n\n  const upperText = text.toUpperCase();\n  return sqlKeywords.some((keyword) => upperText.includes(keyword));\n}\n\n/**\n * Check if a formatted string contains :col format specifier.\n * This is a moose-lib specific pattern for SQL columns.\n */\nfunction hasColFormatSpecifier(node: SyntaxNode): boolean {\n  const text = node.text;\n  // Look for patterns like {var:col} or {Model.field:col}\n  return /:col\\s*\\}/.test(text);\n}\n\n/**\n * Extract SQL location from a node.\n */\nfunction createSqlLocation(\n  filePath: string,\n  text: string,\n  startPosition: Point,\n  endPosition: Point,\n): SqlLocation {\n  return {\n    id: `${filePath}:${startPosition.row + 1}:${startPosition.column + 1}`,\n    file: filePath,\n    line: startPosition.row + 1, // 1-based\n    column: startPosition.column + 1, // 1-based\n    endLine: endPosition.row + 1,\n    endColumn: endPosition.column + 1,\n    templateText: text,\n  };\n}\n\n/**\n * Extract all SQL locations from a Python source file.\n * Finds:\n * 1. sql() function calls with string arguments\n * 2. F-strings with :col format specifiers (moose-lib pattern)\n */\nexport function extractPythonSqlLocations(\n  sourceCode: string,\n  filePath: string,\n): SqlLocation[] {\n  const locations: SqlLocation[] = [];\n\n  const tree = getParser().parse(sourceCode);\n  if (!tree) return locations;\n\n  // Only process sql() calls if the file imports from moose_lib\n  const hasMooseImport = fileImportsMooseLib(tree.rootNode);\n\n  function visit(node: SyntaxNode): void {\n    // Check for sql() function calls (only if file imports moose_lib)\n    if (hasMooseImport && isSqlFunctionCall(node)) {\n      const sqlContent = extractSqlFromCall(node);\n      if (sqlContent) {\n        locations.push(\n          createSqlLocation(\n            filePath,\n            sqlContent.text,\n            sqlContent.startPosition,\n            sqlContent.endPosition,\n          ),\n        );\n      }\n    }\n\n    // Check for f-strings with :col format specifier (moose-lib SQL pattern)\n    // tree-sitter-python may use 'string' or 'formatted_string' for f-strings\n    const isFString =\n      node.type === 'formatted_string' ||\n      (node.type === 'string' && /^f['\"]/.test(node.text));\n\n    if (isFString && hasColFormatSpecifier(node)) {\n      const content = extractFStringContent(node.text);\n      if (content && looksLikeSql(content)) {\n        locations.push(\n          createSqlLocation(\n            filePath,\n            content,\n            node.startPosition,\n            node.endPosition,\n          ),\n        );\n      }\n    }\n\n    // Recursively visit children\n    for (const child of node.children) {\n      if (child) visit(child);\n    }\n  }\n\n  visit(tree.rootNode);\n  return locations;\n}\n\n/**\n * Extract SQL locations from all provided Python files.\n * Used for initial scan of the project.\n */\nexport function extractAllPythonSqlLocations(\n  files: Array<{ path: string; content: string }>,\n): SqlLocation[] {\n  const allLocations: SqlLocation[] = [];\n\n  for (const file of files) {\n    const locations = extractPythonSqlLocations(file.content, file.path);\n    allLocations.push(...locations);\n  }\n\n  return allLocations;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/pythonSqlExtractor.ts"],"sourcesContent":["import * as path from 'node:path';\nimport {\n  Language,\n  Parser,\n  type Point,\n  type Node as SyntaxNode,\n} from 'web-tree-sitter';\nimport type { SqlLocation } from './sqlLocations';\n\nlet parser: Parser | null = null;\n\n/**\n * Initialize the web-tree-sitter parser with the Python grammar.\n * Must be called before any extraction functions.\n */\nexport async function initParser(): Promise<void> {\n  if (parser) return;\n\n  await Parser.init();\n  const p = new Parser();\n\n  // Load the Python WASM grammar from dist/ (copied during build)\n  const wasmPath = path.join(__dirname, 'tree-sitter-python.wasm');\n  const Python = await Language.load(wasmPath);\n  p.setLanguage(Python);\n  parser = p;\n}\n\nfunction getParser(): Parser {\n  if (!parser) {\n    throw new Error(\n      'Parser not initialized. Call initParser() before using extraction functions.',\n    );\n  }\n  return parser;\n}\n\n/**\n * Check if the file imports from moose_lib.\n * This is used to filter out sql() calls that aren't from moose-lib.\n */\nfunction fileImportsMooseLib(rootNode: SyntaxNode): boolean {\n  for (const child of rootNode.children) {\n    if (!child) continue;\n    // Handle: import moose_lib\n    if (child.type === 'import_statement') {\n      const moduleName = child.childForFieldName('name');\n      if (moduleName?.text === 'moose_lib') {\n        return true;\n      }\n      // Handle: import moose_lib.sql\n      if (\n        moduleName?.type === 'dotted_name' &&\n        moduleName.text.startsWith('moose_lib')\n      ) {\n        return true;\n      }\n    }\n\n    // Handle: from moose_lib import sql\n    // Handle: from moose_lib.sql import sql\n    if (child.type === 'import_from_statement') {\n      const moduleName = child.childForFieldName('module_name');\n      if (\n        moduleName?.text === 'moose_lib' ||\n        moduleName?.text?.startsWith('moose_lib.')\n      ) {\n        return true;\n      }\n    }\n  }\n\n  return false;\n}\n\n/**\n * Check if a function call is a `sql()` call from moose-lib.\n * We look for calls where the function name is 'sql'.\n */\nfunction isSqlFunctionCall(node: SyntaxNode): boolean {\n  if (node.type !== 'call') return false;\n\n  const functionNode = node.childForFieldName('function');\n  if (!functionNode) return false;\n\n  // Direct call: sql(\"...\")\n  if (functionNode.type === 'identifier' && functionNode.text === 'sql') {\n    return true;\n  }\n\n  // Attribute access: moose_lib.sql(\"...\") or similar\n  if (functionNode.type === 'attribute') {\n    const attribute = functionNode.childForFieldName('attribute');\n    if (attribute?.text === 'sql') {\n      return true;\n    }\n  }\n\n  return false;\n}\n\n/**\n * Extract the SQL string from a sql() function call arguments.\n * Handles both regular strings and f-strings.\n */\nfunction extractSqlFromCall(callNode: SyntaxNode): {\n  text: string;\n  startPosition: Point;\n  endPosition: Point;\n} | null {\n  const arguments_ = callNode.childForFieldName('arguments');\n  if (!arguments_) return null;\n\n  // Get the first argument (the SQL string)\n  for (const child of arguments_.children) {\n    if (!child) continue;\n    if (\n      child.type === 'string' ||\n      child.type === 'concatenated_string' ||\n      child.type === 'formatted_string'\n    ) {\n      const result = extractStringContent(child);\n      if (result) {\n        return {\n          text: result,\n          startPosition: child.startPosition,\n          endPosition: child.endPosition,\n        };\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Extract text content from a string node (regular string or f-string).\n * Converts f-string interpolations to ${...} placeholders.\n */\nfunction extractStringContent(node: SyntaxNode): string | null {\n  const text = node.text;\n  const isFString = /^f['\"]/.test(text);\n\n  if (node.type === 'string') {\n    if (isFString) {\n      // F-string: f\"SELECT {col} FROM users\"\n      return extractFStringContent(text);\n    }\n    // Regular string: \"SELECT * FROM users\"\n    // Remove quotes and extract content\n    return extractQuotedStringContent(text);\n  }\n\n  if (node.type === 'formatted_string') {\n    // F-string: f\"SELECT {col} FROM users\"\n    return extractFStringContent(text);\n  }\n\n  if (node.type === 'concatenated_string') {\n    // Handle concatenated strings: \"SELECT \" \"* FROM users\"\n    let result = '';\n    for (const child of node.children) {\n      if (!child) continue;\n      if (child.type === 'string' || child.type === 'formatted_string') {\n        const content = extractStringContent(child);\n        if (content !== null) {\n          result += content;\n        }\n      }\n    }\n    return result || null;\n  }\n\n  return null;\n}\n\n/**\n * Extract content from a quoted string, removing the quotes.\n */\nfunction extractQuotedStringContent(text: string): string | null {\n  // Handle triple-quoted strings\n  if (\n    text.startsWith('\"\"\"') ||\n    text.startsWith(\"'''\") ||\n    text.startsWith('f\"\"\"') ||\n    text.startsWith(\"f'''\") ||\n    text.startsWith('r\"\"\"') ||\n    text.startsWith(\"r'''\")\n  ) {\n    const prefixLen = text.startsWith('f') || text.startsWith('r') ? 4 : 3;\n    return text.slice(prefixLen, -3);\n  }\n\n  // Handle single/double quoted strings\n  if (\n    text.startsWith('\"') ||\n    text.startsWith(\"'\") ||\n    text.startsWith('f\"') ||\n    text.startsWith(\"f'\") ||\n    text.startsWith('r\"') ||\n    text.startsWith(\"r'\")\n  ) {\n    const prefixLen = text.startsWith('f') || text.startsWith('r') ? 2 : 1;\n    return text.slice(prefixLen, -1);\n  }\n\n  return text;\n}\n\n/**\n * Extract content from an f-string text, converting interpolations to ${...}.\n * Works with raw text (e.g., f\"SELECT {col} FROM users\").\n */\nfunction extractFStringContent(text: string): string {\n  // Remove the f-string prefix (f\", f', f\"\"\", f''')\n  let content: string;\n  if (text.startsWith('f\"\"\"') || text.startsWith(\"f'''\")) {\n    content = text.slice(4, -3);\n  } else if (text.startsWith('f\"') || text.startsWith(\"f'\")) {\n    content = text.slice(2, -1);\n  } else {\n    content = text;\n  }\n\n  // Replace balanced {expr} with ${...} using depth tracking\n  // This handles nested braces like {func({1, 2})} correctly\n  let result = '';\n  let i = 0;\n  while (i < content.length) {\n    if (content[i] === '{') {\n      if (content[i + 1] === '{') {\n        // Escaped {{ → literal {\n        result += '{';\n        i += 2;\n      } else {\n        // Find matching closing brace with depth tracking\n        let depth = 1;\n        let j = i + 1;\n        while (j < content.length && depth > 0) {\n          if (content[j] === '{') depth++;\n          else if (content[j] === '}') depth--;\n          j++;\n        }\n        result += '${...}';\n        i = j;\n      }\n    } else if (content[i] === '}' && content[i + 1] === '}') {\n      // Escaped }} → literal }\n      result += '}';\n      i += 2;\n    } else {\n      result += content[i];\n      i++;\n    }\n  }\n  return result;\n}\n\n/**\n * Check if a string node contains SQL-like content.\n * Used to identify f-strings that might contain SQL even outside sql() calls.\n */\nfunction looksLikeSql(text: string): boolean {\n  const sqlKeywords = [\n    'SELECT',\n    'INSERT',\n    'UPDATE',\n    'DELETE',\n    'CREATE',\n    'DROP',\n    'ALTER',\n    'FROM',\n    'WHERE',\n    'JOIN',\n    'TABLE',\n    'INDEX',\n    'VIEW',\n  ];\n\n  const upperText = text.toUpperCase();\n  return sqlKeywords.some((keyword) => upperText.includes(keyword));\n}\n\n/**\n * Check if a formatted string contains :col format specifier.\n * This is a moose-lib specific pattern for SQL columns.\n */\nfunction hasColFormatSpecifier(node: SyntaxNode): boolean {\n  const text = node.text;\n  // Look for patterns like {var:col} or {Model.field:col}\n  return /:col\\s*\\}/.test(text);\n}\n\n/**\n * Extract SQL location from a node.\n */\nfunction createSqlLocation(\n  filePath: string,\n  text: string,\n  startPosition: Point,\n  endPosition: Point,\n): SqlLocation {\n  return {\n    id: `${filePath}:${startPosition.row + 1}:${startPosition.column + 1}`,\n    file: filePath,\n    line: startPosition.row + 1, // 1-based\n    column: startPosition.column + 1, // 1-based\n    endLine: endPosition.row + 1,\n    endColumn: endPosition.column + 1,\n    templateText: text,\n    tagKind: 'statement',\n    tagLine: startPosition.row + 1,\n    tagColumn: startPosition.column + 1,\n    tagEndColumn: startPosition.column + 1,\n  };\n}\n\n/**\n * Extract all SQL locations from a Python source file.\n * Finds:\n * 1. sql() function calls with string arguments\n * 2. F-strings with :col format specifiers (moose-lib pattern)\n */\nexport function extractPythonSqlLocations(\n  sourceCode: string,\n  filePath: string,\n): SqlLocation[] {\n  const locations: SqlLocation[] = [];\n\n  const tree = getParser().parse(sourceCode);\n  if (!tree) return locations;\n\n  // Only process sql() calls if the file imports from moose_lib\n  const hasMooseImport = fileImportsMooseLib(tree.rootNode);\n\n  function visit(node: SyntaxNode): void {\n    // Check for sql() function calls (only if file imports moose_lib)\n    if (hasMooseImport && isSqlFunctionCall(node)) {\n      const sqlContent = extractSqlFromCall(node);\n      if (sqlContent) {\n        locations.push(\n          createSqlLocation(\n            filePath,\n            sqlContent.text,\n            sqlContent.startPosition,\n            sqlContent.endPosition,\n          ),\n        );\n      }\n    }\n\n    // Check for f-strings with :col format specifier (moose-lib SQL pattern)\n    // tree-sitter-python may use 'string' or 'formatted_string' for f-strings\n    const isFString =\n      node.type === 'formatted_string' ||\n      (node.type === 'string' && /^f['\"]/.test(node.text));\n\n    if (isFString && hasColFormatSpecifier(node)) {\n      const content = extractFStringContent(node.text);\n      if (content && looksLikeSql(content)) {\n        locations.push(\n          createSqlLocation(\n            filePath,\n            content,\n            node.startPosition,\n            node.endPosition,\n          ),\n        );\n      }\n    }\n\n    // Recursively visit children\n    for (const child of node.children) {\n      if (child) visit(child);\n    }\n  }\n\n  visit(tree.rootNode);\n  return locations;\n}\n\n/**\n * Extract SQL locations from all provided Python files.\n * Used for initial scan of the project.\n */\nexport function extractAllPythonSqlLocations(\n  files: Array<{ path: string; content: string }>,\n): SqlLocation[] {\n  const allLocations: SqlLocation[] = [];\n\n  for (const file of files) {\n    const locations = extractPythonSqlLocations(file.content, file.path);\n    allLocations.push(...locations);\n  }\n\n  return allLocations;\n}\n"],"mappings":"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","names":[]}

package/dist/server.integration.test.js

@@ -287,6 +287,21 @@ const combPrefix = sql\`SELECT sum\`;
 
 // Default context (empty SQL \u2014 triggers Default completions with all kinds)
 const defaultCtx = sql\`\`;
+
+// sql.statement \u2014 valid SQL, should validate
+const stmtValid = sql.statement\`SELECT count() FROM users\`;
+
+// sql.statement \u2014 invalid SQL, should produce error
+const stmtInvalid = sql.statement\`SELCT * FROM users\`;
+
+// sql.fragment \u2014 invalid as standalone SQL, should NOT produce error
+const frag = sql.fragment\`status = 'active' AND amount > 0\`;
+
+// sql.fragment \u2014 hover target
+const fragHover = sql.fragment\`toUInt32(id) > 0\`;
+
+// sql.fragment \u2014 completions target
+const fragComp = sql.fragment\`cou\`;
 `;
 async function createTsFixture() {
   const tmpDir = await fs.mkdtemp(
@@ -329,11 +344,23 @@ async function createTsFixture() {
   );
   await fs.writeFile(
     path.join(mooseLibDir, "index.js"),
-    'module.exports.sql = function sql() { return ""; };\n'
+    `
+const handler = function(strings, ...values) { return strings.join(''); };
+handler.statement = handler;
+handler.fragment = handler;
+module.exports.sql = handler;
+`
   );
   await fs.writeFile(
     path.join(mooseLibDir, "index.d.ts"),
-    "export declare function sql(strings: TemplateStringsArray, ...values: unknown[]): string;\n"
+    `
+interface SqlTemplateTag {
+  (strings: TemplateStringsArray, ...values: unknown[]): string;
+  statement(strings: TemplateStringsArray, ...values: unknown[]): string;
+  fragment(strings: TemplateStringsArray, ...values: unknown[]): string;
+}
+export declare const sql: SqlTemplateTag;
+`
   );
   const appDir = path.join(tmpDir, "app");
   await fs.mkdir(appDir, { recursive: true });
@@ -392,13 +419,13 @@ async function createTsFixtureWithDockerCompose(chVersion) {
       (l) => l.includes("const valid")
     );
     const diagnostics = await client.waitForDiagnostics(tsFileUri());
-    const onValidLine = diagnostics.filter(
-      (d) => d.range.start.line === validLine
+    const errorsOnValidLine = diagnostics.filter(
+      (d) => d.range.start.line === validLine && d.severity === 1
     );
     import_node_assert.default.strictEqual(
-      onValidLine.length,
+      errorsOnValidLine.length,
       0,
-      `Expected no diagnostics on the valid SQL line, got: ${JSON.stringify(onValidLine)}`
+      `Expected no error diagnostics on the valid SQL line, got: ${JSON.stringify(errorsOnValidLine)}`
     );
   });
   (0, import_node_test.test)("invalid SQL produces an error diagnostic", async () => {
@@ -406,14 +433,14 @@ async function createTsFixtureWithDockerCompose(chVersion) {
     const invalidLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
       (l) => l.includes("const invalid")
     );
-    const onInvalidLine = diagnostics.filter(
-      (d) => d.range.start.line === invalidLine
+    const errorsOnInvalidLine = diagnostics.filter(
+      (d) => d.range.start.line === invalidLine && d.severity === 1
     );
     import_node_assert.default.ok(
-      onInvalidLine.length > 0,
-      `Expected at least one diagnostic on the invalid SQL line (${invalidLine})`
+      errorsOnInvalidLine.length > 0,
+      `Expected at least one error diagnostic on the invalid SQL line (${invalidLine})`
     );
-    const diag = onInvalidLine[0];
+    const diag = errorsOnInvalidLine[0];
     import_node_assert.default.strictEqual(diag.severity, 1, "Severity should be Error (1)");
     import_node_assert.default.strictEqual(diag.source, "moose-sql");
   });
@@ -432,18 +459,18 @@ async function createTsFixtureWithDockerCompose(chVersion) {
     let lastDiagnostics = [];
     while (Date.now() < deadline) {
       lastDiagnostics = await client.waitForFreshDiagnostics(tsFileUri());
-      const onFixedLine2 = lastDiagnostics.filter(
-        (d) => d.range.start.line === invalidLine && d.source === "moose-sql"
+      const errorsOnFixedLine2 = lastDiagnostics.filter(
+        (d) => d.range.start.line === invalidLine && d.source === "moose-sql" && d.severity === 1
       );
-      if (onFixedLine2.length === 0) break;
+      if (errorsOnFixedLine2.length === 0) break;
     }
-    const onFixedLine = lastDiagnostics.filter(
-      (d) => d.range.start.line === invalidLine && d.source === "moose-sql"
+    const errorsOnFixedLine = lastDiagnostics.filter(
+      (d) => d.range.start.line === invalidLine && d.source === "moose-sql" && d.severity === 1
     );
     import_node_assert.default.strictEqual(
-      onFixedLine.length,
+      errorsOnFixedLine.length,
       0,
-      `Expected no diagnostic on the fixed line (${invalidLine}), got: ${JSON.stringify(onFixedLine)}`
+      `Expected no error diagnostic on the fixed line (${invalidLine}), got: ${JSON.stringify(errorsOnFixedLine)}`
     );
     client.changeDocument(tsFileUri(), 3, TS_TEST_FILE_CONTENT);
     await new Promise((r) => setTimeout(r, 100));
@@ -825,6 +852,178 @@ async function createTsFixtureWithDockerCompose(chVersion) {
       `Should include "ORDER BY" keyword, got sample: ${labels.slice(0, 30).join(", ")}`
     );
   });
+  (0, import_node_test.test)("sql.statement with valid SQL produces no error diagnostics", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const stmtValidLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const stmtValid")
+    );
+    const errors = diagnostics.filter(
+      (d) => d.range.start.line === stmtValidLine && d.severity === 1
+    );
+    import_node_assert.default.strictEqual(
+      errors.length,
+      0,
+      `Expected no error diagnostics on valid sql.statement line, got: ${JSON.stringify(errors)}`
+    );
+  });
+  (0, import_node_test.test)("sql.statement with invalid SQL produces error diagnostic", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const stmtInvalidLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const stmtInvalid")
+    );
+    const errors = diagnostics.filter(
+      (d) => d.range.start.line === stmtInvalidLine && d.severity === 1
+    );
+    import_node_assert.default.ok(
+      errors.length > 0,
+      `Expected error diagnostic on invalid sql.statement line (${stmtInvalidLine})`
+    );
+    import_node_assert.default.strictEqual(errors[0].source, "moose-sql");
+  });
+  (0, import_node_test.test)("sql.fragment does NOT produce validation errors", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const fragLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const frag =")
+    );
+    const errors = diagnostics.filter(
+      (d) => d.range.start.line === fragLine && d.severity === 1
+    );
+    import_node_assert.default.strictEqual(
+      errors.length,
+      0,
+      `Expected no error diagnostics on sql.fragment line, got: ${JSON.stringify(errors)}`
+    );
+  });
+  (0, import_node_test.test)("hover works inside sql.fragment", async () => {
+    const fragHoverLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const fragHover")
+    );
+    const lineText = TS_TEST_FILE_CONTENT.split("\n")[fragHoverLine];
+    const toUInt32Idx = lineText.indexOf("toUInt32");
+    import_node_assert.default.ok(toUInt32Idx !== -1, "Should find toUInt32 in fragHover line");
+    const response = await client.request("textDocument/hover", {
+      textDocument: { uri: tsFileUri() },
+      position: { line: fragHoverLine, character: toUInt32Idx + 1 }
+    });
+    import_node_assert.default.ok(
+      response.result,
+      "Hover should return a result for toUInt32 inside fragment"
+    );
+    const hover = response.result;
+    import_node_assert.default.ok(
+      hover.contents.value.length > 0,
+      "Hover content should not be empty"
+    );
+  });
+  (0, import_node_test.test)("completions work inside sql.fragment", async () => {
+    const pos = cursorAfter(
+      TS_TEST_FILE_CONTENT,
+      "fragComp = sql.fragment`cou"
+    );
+    const response = await client.request("textDocument/completion", {
+      textDocument: { uri: tsFileUri() },
+      position: pos
+    });
+    const items = response.result;
+    import_node_assert.default.ok(Array.isArray(items), "Result should be an array");
+    import_node_assert.default.ok(items.length > 0, "Should have completion items inside fragment");
+    const labels = items.map((i) => i.label.toLowerCase());
+    import_node_assert.default.ok(
+      labels.some((l) => l.startsWith("count")),
+      `Should include count* completions inside fragment, got: ${labels.slice(0, 10).join(", ")}`
+    );
+  });
+  (0, import_node_test.test)("bare sql tag produces deprecation hint diagnostic", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const validLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const valid = sql`")
+    );
+    const hints = diagnostics.filter(
+      (d) => d.range.start.line === validLine && d.severity === 4
+      // Hint
+    );
+    import_node_assert.default.ok(
+      hints.length > 0,
+      `Expected deprecation hint on bare sql line (${validLine}), got diagnostics: ${JSON.stringify(
+        diagnostics.filter((d) => d.range.start.line === validLine)
+      )}`
+    );
+    import_node_assert.default.ok(
+      hints[0].message.includes("deprecated"),
+      "Hint message should mention deprecated"
+    );
+  });
+  (0, import_node_test.test)("sql.statement does NOT produce deprecation hint", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const stmtValidLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const stmtValid")
+    );
+    const hints = diagnostics.filter(
+      (d) => d.range.start.line === stmtValidLine && d.severity === 4
+    );
+    import_node_assert.default.strictEqual(
+      hints.length,
+      0,
+      `Expected no deprecation hint on sql.statement line, got: ${JSON.stringify(hints)}`
+    );
+  });
+  (0, import_node_test.test)("sql.fragment does NOT produce deprecation hint", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const fragLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const frag =")
+    );
+    const hints = diagnostics.filter(
+      (d) => d.range.start.line === fragLine && d.severity === 4
+    );
+    import_node_assert.default.strictEqual(
+      hints.length,
+      0,
+      `Expected no deprecation hint on sql.fragment line, got: ${JSON.stringify(hints)}`
+    );
+  });
+  (0, import_node_test.test)("code action offers quick fixes for bare sql deprecation", async () => {
+    const diagnostics = await client.waitForDiagnostics(tsFileUri());
+    const validLine = TS_TEST_FILE_CONTENT.split("\n").findIndex(
+      (l) => l.includes("const valid = sql`")
+    );
+    const hints = diagnostics.filter(
+      (d) => d.range.start.line === validLine && d.severity === 4
+    );
+    import_node_assert.default.ok(
+      hints.length > 0,
+      "Should have deprecation hint to pass as context"
+    );
+    const response = await client.request("textDocument/codeAction", {
+      textDocument: { uri: tsFileUri() },
+      range: {
+        start: { line: validLine, character: 15 },
+        end: { line: validLine, character: 15 }
+      },
+      context: { diagnostics: hints }
+    });
+    const actions = response.result;
+    import_node_assert.default.ok(Array.isArray(actions), "Code actions should be an array");
+    const statementAction = actions.find(
+      (a) => a.title.includes("sql.statement")
+    );
+    import_node_assert.default.ok(statementAction, "Should offer Convert to sql.statement action");
+    import_node_assert.default.ok(
+      statementAction.edit?.changes?.[tsFileUri()]?.some(
+        (e) => e.newText === "sql.statement"
+      ),
+      "Statement action should replace with sql.statement"
+    );
+    const fragmentAction = actions.find(
+      (a) => a.title.includes("sql.fragment")
+    );
+    import_node_assert.default.ok(fragmentAction, "Should offer Convert to sql.fragment action");
+    import_node_assert.default.ok(
+      fragmentAction.edit?.changes?.[tsFileUri()]?.some(
+        (e) => e.newText === "sql.fragment"
+      ),
+      "Fragment action should replace with sql.fragment"
+    );
+  });
 });
 (0, import_node_test.describe)("Snippet support toggle", () => {
   (0, import_node_test.test)("snippets enabled: function completion has snippet format", async () => {
@@ -939,16 +1138,13 @@ async function createTsFixtureWithDockerCompose(chVersion) {
       const pyUri = `file://${path.join(tmpDir, "app", "test.py")}`;
       client.openDocument(pyUri, "python", PY_TEST_FILE_CONTENT);
       const diagnostics = await client.waitForDiagnostics(pyUri);
+      const errors = diagnostics.filter((d) => d.severity === 1);
       import_node_assert.default.ok(
-        diagnostics.length > 0,
-        `Expected diagnostics for invalid Python SQL, got none`
-      );
-      import_node_assert.default.strictEqual(
-        diagnostics[0].severity,
-        1,
-        "Should be Error severity"
+        errors.length > 0,
+        `Expected error diagnostics for invalid Python SQL, got none`
       );
-      import_node_assert.default.strictEqual(diagnostics[0].source, "moose-sql");
+      import_node_assert.default.strictEqual(errors[0].severity, 1, "Should be Error severity");
+      import_node_assert.default.strictEqual(errors[0].source, "moose-sql");
     } finally {
       client.close();
       await fs.rm(tmpDir, { recursive: true, force: true });