@algosail/lsp 0.1.12 → 0.2.1

package/debug.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { createParser } from '../parser/index.js'
+import { typecheck } from '../typecheck/index.js'
 import { readFile } from 'node:fs/promises'
 import { pathToFileURL } from 'node:url'
 import { resolve } from 'node:path'
@@ -19,6 +20,16 @@ console.log(`\n=== Parsing: ${absPath} ===\n`)
 
 const parser = await createParser()
 const result = await parser.parseSail(uri, text)
+const checkResults = typecheck(result)
+
+console.log('--- check results ---')
+if (checkResults.length === 0) {
+  console.log('(none)')
+} else {
+  for (const err of checkResults) {
+    console.log(err.message)
+  }
+}
 
 console.log('--- errors ---')
 if (result.errors.length === 0) {
@@ -54,7 +65,7 @@ console.log('\n--- words ---')
 if (result.words.length === 0) {
   console.log('(none)')
 } else {
-  for (const word of result.words) {
+  for (const word of Object.values(result.words)) {
     console.log(`  @${word.name}  sig: ${word.sig ?? '—'}`)
   }
 }

package/lib/completion.js

@@ -75,7 +75,7 @@ export function getCompletionItems(parser, uri) {
       }
     }
 
-    for (const word of module.words) {
+    for (const word of Object.values(module.words)) {
       items.push(item(`~${key}/${word.name}`, CompletionItemKind.Function, word.sig, word.doc))
     }
   }
@@ -124,7 +124,7 @@ export function getCompletionItems(parser, uri) {
     }
   }
 
-  for (const word of ast.words) {
+  for (const word of Object.values(ast.words)) {
     items.push(item(`/${word.name}`, CompletionItemKind.Function, word.sig, word.doc))
   }
 

package/lib/validate.js

@@ -1,4 +1,5 @@
 import { DiagnosticSeverity } from 'vscode-languageserver'
+import { typecheck } from '@algosail/typecheck'
 
 export const validateDocument = async (connection, parser, uri, text) => {
   try {
@@ -20,6 +21,25 @@ export const validateDocument = async (connection, parser, uri, text) => {
       source: 'sail',
     }))
 
+    const checkResults = typecheck(res)
+    diagnostics.push(
+      ...checkResults.map((error) => ({
+        severity: DiagnosticSeverity.Error,
+        range: {
+          start: {
+            line: err.startPosition.row,
+            character: err.startPosition.column,
+          },
+          end: {
+            line: err.endPosition.row,
+            character: err.endPosition.column,
+          },
+        },
+        message: error.message,
+        source: 'sail-typecheck',
+      })),
+    )
+
     connection.sendDiagnostics({ uri, diagnostics })
   } catch (err) {
     connection.console.error(`[sail-lsp] Failed to parse ${uri}: ${err.message}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosail/lsp",
-  "version": "0.1.12",
+  "version": "0.2.1",
   "type": "module",
   "main": "index.js",
   "bin": {
@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@algosail/builtins": "^0.0.1",
-    "@algosail/parser": "^0.0.9",
+    "@algosail/parser": "^0.0.10",
+    "@algosail/typecheck": "^0.0.2",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11"
   }