@514labs/moose-lsp 1.4.0 → 1.4.1

package/dist/server.js

@@ -3584,11 +3584,11 @@ var require_main2 = __commonJS({
         DiagnosticSeverity3.Information = 3;
         DiagnosticSeverity3.Hint = 4;
       })(DiagnosticSeverity2 || (exports3.DiagnosticSeverity = DiagnosticSeverity2 = {}));
-      var DiagnosticTag;
-      (function(DiagnosticTag2) {
-        DiagnosticTag2.Unnecessary = 1;
-        DiagnosticTag2.Deprecated = 2;
-      })(DiagnosticTag || (exports3.DiagnosticTag = DiagnosticTag = {}));
+      var DiagnosticTag2;
+      (function(DiagnosticTag3) {
+        DiagnosticTag3.Unnecessary = 1;
+        DiagnosticTag3.Deprecated = 2;
+      })(DiagnosticTag2 || (exports3.DiagnosticTag = DiagnosticTag2 = {}));
       var CodeDescription;
       (function(CodeDescription2) {
         function is(value) {
@@ -4375,18 +4375,18 @@ var require_main2 = __commonJS({
         }
         DocumentSymbol2.is = is;
       })(DocumentSymbol || (exports3.DocumentSymbol = DocumentSymbol = {}));
-      var CodeActionKind2;
-      (function(CodeActionKind3) {
-        CodeActionKind3.Empty = "";
-        CodeActionKind3.QuickFix = "quickfix";
-        CodeActionKind3.Refactor = "refactor";
-        CodeActionKind3.RefactorExtract = "refactor.extract";
-        CodeActionKind3.RefactorInline = "refactor.inline";
-        CodeActionKind3.RefactorRewrite = "refactor.rewrite";
-        CodeActionKind3.Source = "source";
-        CodeActionKind3.SourceOrganizeImports = "source.organizeImports";
-        CodeActionKind3.SourceFixAll = "source.fixAll";
-      })(CodeActionKind2 || (exports3.CodeActionKind = CodeActionKind2 = {}));
+      var CodeActionKind3;
+      (function(CodeActionKind4) {
+        CodeActionKind4.Empty = "";
+        CodeActionKind4.QuickFix = "quickfix";
+        CodeActionKind4.Refactor = "refactor";
+        CodeActionKind4.RefactorExtract = "refactor.extract";
+        CodeActionKind4.RefactorInline = "refactor.inline";
+        CodeActionKind4.RefactorRewrite = "refactor.rewrite";
+        CodeActionKind4.Source = "source";
+        CodeActionKind4.SourceOrganizeImports = "source.organizeImports";
+        CodeActionKind4.SourceFixAll = "source.fixAll";
+      })(CodeActionKind3 || (exports3.CodeActionKind = CodeActionKind3 = {}));
       var CodeActionTriggerKind;
       (function(CodeActionTriggerKind2) {
         CodeActionTriggerKind2.Invoked = 1;
@@ -219722,7 +219722,7 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
 init_cjs_shims();
 var path8 = __toESM(require("path"));
 var import_moose_sql_validator_wasm2 = require("@514labs/moose-sql-validator-wasm");
-var import_node3 = __toESM(require_node3());
+var import_node4 = __toESM(require_node3());
 
 // ../../node_modules/.pnpm/vscode-languageserver-textdocument@1.0.12/node_modules/vscode-languageserver-textdocument/lib/esm/main.js
 init_cjs_shims();
@@ -220129,6 +220129,7 @@ async function loadClickHouseData(requestedVersion) {
 // src/codeActions.ts
 init_cjs_shims();
 var import_typescript = __toESM(require_typescript());
+var import_node = __toESM(require_node3());
 
 // src/formatting.ts
 init_cjs_shims();
@@ -220277,17 +220278,21 @@ function createFormatSqlEdit(sourceFile, node) {
 }
 function findTemplateNodeById(sourceFile, locationId) {
   let targetNode;
+  function isSqlTag(tag) {
+    if (import_typescript.default.isIdentifier(tag) && tag.text === "sql") return true;
+    if (import_typescript.default.isPropertyAccessExpression(tag) && import_typescript.default.isIdentifier(tag.expression) && tag.expression.text === "sql" && (tag.name.text === "statement" || tag.name.text === "fragment")) {
+      return true;
+    }
+    return false;
+  }
   function visit(node) {
-    if (import_typescript.default.isTaggedTemplateExpression(node)) {
-      const tag = node.tag;
-      if (import_typescript.default.isIdentifier(tag) && tag.text === "sql") {
-        const start = sourceFile.getLineAndCharacterOfPosition(
-          node.template.getStart()
-        );
-        const id = `${sourceFile.fileName}:${start.line + 1}:${start.character + 1}`;
-        if (id === locationId) {
-          targetNode = node;
-        }
+    if (import_typescript.default.isTaggedTemplateExpression(node) && isSqlTag(node.tag)) {
+      const start = sourceFile.getLineAndCharacterOfPosition(
+        node.template.getStart()
+      );
+      const id = `${sourceFile.fileName}:${start.line + 1}:${start.character + 1}`;
+      if (id === locationId) {
+        targetNode = node;
       }
     }
     if (!targetNode) {
@@ -220297,10 +220302,50 @@ function findTemplateNodeById(sourceFile, locationId) {
   visit(sourceFile);
   return targetNode;
 }
+function createDeprecationCodeActions(uri, diagnostics) {
+  const actions = [];
+  for (const diagnostic of diagnostics) {
+    const data = diagnostic.data;
+    if (data?.type !== "deprecated-sql-tag") continue;
+    actions.push(
+      {
+        title: "Convert to 'sql.statement'",
+        kind: import_node.CodeActionKind.QuickFix,
+        diagnostics: [diagnostic],
+        edit: {
+          changes: {
+            [uri]: [
+              {
+                range: diagnostic.range,
+                newText: "sql.statement"
+              }
+            ]
+          }
+        }
+      },
+      {
+        title: "Convert to 'sql.fragment'",
+        kind: import_node.CodeActionKind.QuickFix,
+        diagnostics: [diagnostic],
+        edit: {
+          changes: {
+            [uri]: [
+              {
+                range: diagnostic.range,
+                newText: "sql.fragment"
+              }
+            ]
+          }
+        }
+      }
+    );
+  }
+  return actions;
+}
 
 // src/diagnostics.ts
 init_cjs_shims();
-var import_node = __toESM(require_node3());
+var import_node2 = __toESM(require_node3());
 function createLocationDiagnostic(location, validationError) {
   const uri = `file://${location.file}`;
   const range2 = {
@@ -220315,16 +220360,38 @@ function createLocationDiagnostic(location, validationError) {
   };
   const diagnostic = {
     range: range2,
-    severity: import_node.DiagnosticSeverity.Error,
+    severity: import_node2.DiagnosticSeverity.Error,
     message: `Invalid SQL: ${validationError.message}`,
     source: "moose-sql"
   };
   return { uri, diagnostic };
 }
+function createDeprecationDiagnostic(location) {
+  const uri = `file://${location.file}`;
+  const range2 = {
+    start: {
+      line: location.tagLine - 1,
+      character: location.tagColumn - 1
+    },
+    end: {
+      line: location.tagLine - 1,
+      character: location.tagEndColumn - 1
+    }
+  };
+  const diagnostic = {
+    range: range2,
+    severity: import_node2.DiagnosticSeverity.Hint,
+    tags: [import_node2.DiagnosticTag.Deprecated],
+    message: "The 'sql' tag is deprecated. Use 'sql.statement' for complete SQL statements or 'sql.fragment' for SQL expressions and conditions.",
+    source: "moose-sql",
+    data: { type: "deprecated-sql-tag" }
+  };
+  return { uri, diagnostic };
+}
 
 // src/hover.ts
 init_cjs_shims();
-var import_node2 = __toESM(require_node3());
+var import_node3 = __toESM(require_node3());
 function getWordAtPosition(text, position) {
   if (position < 0 || position > text.length) {
     return "";
@@ -220497,7 +220564,7 @@ function createHoverContent(info, data) {
     }
   }
   return {
-    kind: import_node2.MarkupKind.Markdown,
+    kind: import_node3.MarkupKind.Markdown,
     value: parts.join("\n\n")
   };
 }
@@ -227643,7 +227710,11 @@ function createSqlLocation(filePath, text, startPosition, endPosition) {
     // 1-based
     endLine: endPosition.row + 1,
     endColumn: endPosition.column + 1,
-    templateText: text
+    templateText: text,
+    tagKind: "statement",
+    tagLine: startPosition.row + 1,
+    tagColumn: startPosition.column + 1,
+    tagEndColumn: startPosition.column + 1
   };
 }
 function extractPythonSqlLocations(sourceCode, filePath) {
@@ -227805,6 +227876,14 @@ function isPythonFile(filePath) {
 function validateSqlLocations(sqlLocations, validateSql2, createDiagnostic) {
   const diagnosticsMap = /* @__PURE__ */ new Map();
   for (const location of sqlLocations) {
+    if (location.tagKind === "bare") {
+      const { uri, diagnostic } = createDeprecationDiagnostic(location);
+      if (!diagnosticsMap.has(uri)) {
+        diagnosticsMap.set(uri, []);
+      }
+      diagnosticsMap.get(uri)?.push(diagnostic);
+    }
+    if (location.tagKind === "fragment") continue;
     const preparedSql = prepareSqlForValidation(location.templateText);
     const result = validateSql2(preparedSql);
     if (!result.valid && result.error) {
@@ -227821,23 +227900,43 @@ function validateSqlLocations(sqlLocations, validateSql2, createDiagnostic) {
 // src/sqlExtractor.ts
 init_cjs_shims();
 var import_typescript2 = __toESM(require_typescript());
-function isMooseLibSqlTag(node, typeChecker) {
+function getMooseSqlTagKind(node, typeChecker) {
   const tag = node.tag;
-  if (!import_typescript2.default.isIdentifier(tag) || tag.text !== "sql") {
-    return false;
+  let sqlIdentifier;
+  let tagKind;
+  if (import_typescript2.default.isIdentifier(tag) && tag.text === "sql") {
+    sqlIdentifier = tag;
+    tagKind = "bare";
+  } else if (import_typescript2.default.isPropertyAccessExpression(tag) && import_typescript2.default.isIdentifier(tag.expression) && tag.expression.text === "sql") {
+    const propName = tag.name.text;
+    if (propName === "statement") {
+      tagKind = "statement";
+    } else if (propName === "fragment") {
+      tagKind = "fragment";
+    } else {
+      return null;
+    }
+    sqlIdentifier = tag.expression;
+  } else {
+    return null;
+  }
+  const symbol = typeChecker.getSymbolAtLocation(sqlIdentifier);
+  if (!symbol) {
+    return tagKind;
   }
-  const symbol = typeChecker.getSymbolAtLocation(tag);
-  if (symbol?.declarations?.length) {
-    const isFromMooseLib = symbol.declarations.some((decl) => {
+  const resolvedSymbol = symbol.flags & import_typescript2.default.SymbolFlags.Alias ? typeChecker.getAliasedSymbol(symbol) : symbol;
+  if (resolvedSymbol?.declarations?.length) {
+    const isFromMooseLib = resolvedSymbol.declarations.some((decl) => {
       const sourceFile = decl.getSourceFile();
       const fileName = sourceFile.fileName;
       return fileName.includes("moose-lib") || fileName.includes("@514labs/moose-lib") || fileName.includes("514labs/moose-lib") || fileName.includes("sqlHelpers");
     });
     if (isFromMooseLib) {
-      return true;
+      return tagKind;
     }
+    return null;
   }
-  return true;
+  return tagKind;
 }
 function extractTemplateText2(template) {
   if (import_typescript2.default.isNoSubstitutionTemplateLiteral(template)) {
@@ -227849,11 +227948,15 @@ function extractTemplateText2(template) {
   }
   return text;
 }
-function extractSqlLocation(node, sourceFile) {
+function extractSqlLocation(node, sourceFile, tagKind) {
   const start = sourceFile.getLineAndCharacterOfPosition(
     node.template.getStart()
   );
   const end = sourceFile.getLineAndCharacterOfPosition(node.template.getEnd());
+  const tagStart = sourceFile.getLineAndCharacterOfPosition(
+    node.tag.getStart()
+  );
+  const tagEnd = sourceFile.getLineAndCharacterOfPosition(node.tag.getEnd());
   return {
     id: `${sourceFile.fileName}:${start.line + 1}:${start.character + 1}`,
     file: sourceFile.fileName,
@@ -227863,14 +227966,21 @@ function extractSqlLocation(node, sourceFile) {
     // 1-based
     endLine: end.line + 1,
     endColumn: end.character + 1,
-    templateText: extractTemplateText2(node.template)
+    templateText: extractTemplateText2(node.template),
+    tagKind,
+    tagLine: tagStart.line + 1,
+    tagColumn: tagStart.character + 1,
+    tagEndColumn: tagEnd.character + 1
   };
 }
 function extractSqlLocations(sourceFile, typeChecker) {
   const locations = [];
   function visit(node) {
-    if (import_typescript2.default.isTaggedTemplateExpression(node) && isMooseLibSqlTag(node, typeChecker)) {
-      locations.push(extractSqlLocation(node, sourceFile));
+    if (import_typescript2.default.isTaggedTemplateExpression(node)) {
+      const tagKind = getMooseSqlTagKind(node, typeChecker);
+      if (tagKind !== null) {
+        locations.push(extractSqlLocation(node, sourceFile, tagKind));
+      }
     }
     import_typescript2.default.forEachChild(node, visit);
   }
@@ -227989,8 +228099,8 @@ function createTypeScriptService() {
 }
 
 // src/server.ts
-var connection = (0, import_node3.createConnection)(import_node3.ProposedFeatures.all);
-var documents = new import_node3.TextDocuments(TextDocument);
+var connection = (0, import_node4.createConnection)(import_node4.ProposedFeatures.all);
+var documents = new import_node4.TextDocuments(TextDocument);
 var mooseProjectRoot = null;
 var mooseProjectType = null;
 var tsService = null;
@@ -228259,14 +228369,14 @@ connection.onInitialize(
       capabilities: {
         textDocumentSync: {
           openClose: true,
-          change: import_node3.TextDocumentSyncKind.Full,
+          change: import_node4.TextDocumentSyncKind.Full,
           // Full sync for as-you-type validation
           save: {
             includeText: true
           }
         },
         codeActionProvider: {
-          codeActionKinds: ["source.formatSql"]
+          codeActionKinds: [import_node4.CodeActionKind.QuickFix, "source.formatSql"]
         },
         completionProvider: {
           triggerCharacters: [".", "(", " "],
@@ -228320,59 +228430,71 @@ connection.onCodeAction((params) => {
   if (!document2) return [];
   const filePath = new URL(params.textDocument.uri).pathname;
   if (!shouldValidateFile(filePath, mooseProjectRoot)) return [];
-  if (!isTypeScriptFile(filePath) || !tsService?.isHealthy()) return [];
-  try {
-    const sourceFile = tsService.getSourceFile(filePath);
-    if (!sourceFile) return [];
-    const sqlLocations = extractSqlLocations(
-      sourceFile,
-      tsService.getTypeChecker()
-    );
-    const location = findSqlTemplateAtPosition(
-      sqlLocations,
-      params.range.start.line,
-      params.range.start.character
+  const actions = [];
+  if (params.context.diagnostics.length > 0) {
+    actions.push(
+      ...createDeprecationCodeActions(
+        params.textDocument.uri,
+        params.context.diagnostics
+      )
     );
-    if (!location) return [];
-    const node = findTemplateNodeById(sourceFile, location.id);
-    if (!node) return [];
-    const edit = createFormatSqlEdit(sourceFile, node);
-    if (!edit) return [];
-    return [
-      {
-        title: "Format SQL",
-        kind: `${import_node3.CodeActionKind.Source}.formatSql`,
-        edit: {
-          changes: {
-            [params.textDocument.uri]: [edit]
+  }
+  if (isTypeScriptFile(filePath) && tsService?.isHealthy()) {
+    try {
+      const sourceFile = tsService.getSourceFile(filePath);
+      if (sourceFile) {
+        const sqlLocations = extractSqlLocations(
+          sourceFile,
+          tsService.getTypeChecker()
+        );
+        const location = findSqlTemplateAtPosition(
+          sqlLocations,
+          params.range.start.line,
+          params.range.start.character
+        );
+        if (location) {
+          const node = findTemplateNodeById(sourceFile, location.id);
+          if (node) {
+            const edit = createFormatSqlEdit(sourceFile, node);
+            if (edit) {
+              actions.push({
+                title: "Format SQL",
+                kind: `${import_node4.CodeActionKind.Source}.formatSql`,
+                edit: {
+                  changes: {
+                    [params.textDocument.uri]: [edit]
+                  }
+                }
+              });
+            }
           }
         }
       }
-    ];
-  } catch {
-    return [];
+    } catch {
+    }
   }
+  return actions;
 });
 function mapCompletionItemKind(kind) {
   switch (kind) {
     case "function":
-      return import_node3.CompletionItemKind.Function;
+      return import_node4.CompletionItemKind.Function;
     case "aggregate_function":
-      return import_node3.CompletionItemKind.Method;
+      return import_node4.CompletionItemKind.Method;
     case "table_function":
-      return import_node3.CompletionItemKind.Function;
+      return import_node4.CompletionItemKind.Function;
     case "keyword":
-      return import_node3.CompletionItemKind.Keyword;
+      return import_node4.CompletionItemKind.Keyword;
     case "data_type":
-      return import_node3.CompletionItemKind.TypeParameter;
+      return import_node4.CompletionItemKind.TypeParameter;
     case "table_engine":
-      return import_node3.CompletionItemKind.Class;
+      return import_node4.CompletionItemKind.Class;
     case "format":
-      return import_node3.CompletionItemKind.Constant;
+      return import_node4.CompletionItemKind.Constant;
     case "setting":
-      return import_node3.CompletionItemKind.Property;
+      return import_node4.CompletionItemKind.Property;
     default:
-      return import_node3.CompletionItemKind.Text;
+      return import_node4.CompletionItemKind.Text;
   }
 }
 function toRustCompletionItem(rustItem, useSnippets) {
@@ -228382,10 +228504,10 @@ function toRustCompletionItem(rustItem, useSnippets) {
   if (rustItem.hasParams) {
     if (useSnippets) {
       insertText = `${rustItem.label}($1)$0`;
-      insertTextFormat = import_node3.InsertTextFormat.Snippet;
+      insertTextFormat = import_node4.InsertTextFormat.Snippet;
     } else {
       insertText = `${rustItem.label}()`;
-      insertTextFormat = import_node3.InsertTextFormat.PlainText;
+      insertTextFormat = import_node4.InsertTextFormat.PlainText;
     }
   }
   return {