@sailshq/language-server 0.0.5 → 0.2.0

package/index.js

@@ -1,40 +1,74 @@
 const lsp = require('vscode-languageserver/node')
 const TextDocument = require('vscode-languageserver-textdocument').TextDocument
+const SailsParser = require('./SailsParser')
 
 // Validators
 const validateDocument = require('./validators/validate-document')
 
 // Go-to definitions
 const goToAction = require('./go-to-definitions/go-to-action')
-const goToPolicy = require('./go-to-definitions/go-to-policy')
 const goToView = require('./go-to-definitions/go-to-view')
-const goToInertiaPage = require('./go-to-definitions/go-to-inertia-page')
+const goToPage = require('./go-to-definitions/go-to-page')
+const goToPolicy = require('./go-to-definitions/go-to-policy')
 const goToHelper = require('./go-to-definitions/go-to-helper')
+const goToModel = require('./go-to-definitions/go-to-model')
 
 // Completions
-const sailsCompletions = require('./completions/sails-completions')
+const actionsCompletion = require('./completions/actions-completion')
+const dataTypesCompletion = require('./completions/data-types-completion')
+const modelAttributePropsCompletion = require('./completions/model-attribute-props-completion')
+const inputPropsCompletion = require('./completions/input-props-completion')
+const inertiaPagesCompletion = require('./completions/inertia-pages-completion')
+const modelsCompletion = require('./completions/models-completion')
+const policiesCompletion = require('./completions/policies-completion')
+const viewsCompletion = require('./completions/views-completion')
+const modelMethodsCompletion = require('./completions/model-methods-completion')
+const modelAttributesCompletion = require('./completions/model-attributes-completion')
+const helperInputsCompletion = require('./completions/helper-inputs-completion')
+const helpersCompletion = require('./completions/helpers-completion')
 
 const connection = lsp.createConnection(lsp.ProposedFeatures.all)
 const documents = new lsp.TextDocuments(TextDocument)
 
-connection.onInitialize((params) => {
+// Create a new SailsParser instance
+const sailsParser = new SailsParser()
+let typeMap
+
+connection.onInitialize(async (params) => {
+  const rootPath = params.workspaceFolders?.[0]?.uri
+    ? new URL(params.workspaceFolders[0].uri).pathname
+    : undefined
+
+  sailsParser.setRootDir(rootPath)
+  typeMap = await sailsParser.buildTypeMap()
+
   return {
     capabilities: {
       textDocumentSync: lsp.TextDocumentSyncKind.Incremental,
       definitionProvider: true,
       completionProvider: {
-        triggerCharacters: ['"', "'", '.']
+        triggerCharacters: ['"', "'", '.', '{', ',', ' ', '\n']
       }
     }
   }
 })
 
 documents.onDidOpen((open) => {
-  validateDocument(connection, open.document)
+  if (typeMap) {
+    validateDocument(connection, open.document, typeMap)
+  }
 })
 
-documents.onDidChangeContent((change) => {
-  validateDocument(connection, change.document)
+documents.onDidChangeContent(async (change) => {
+  const documentUri = change.document.uri
+  if (documentUri.includes('api/') || documentUri.includes('config')) {
+    typeMap = await sailsParser.buildTypeMap()
+    connection.console.log('Type map updated due to file change.')
+  }
+
+  if (typeMap) {
+    validateDocument(connection, change.document, typeMap)
+  }
 })
 
 connection.onDefinition(async (params) => {
@@ -43,20 +77,30 @@ connection.onDefinition(async (params) => {
     return null
   }
 
-  const actionDefinition = await goToAction(document, params.position)
-  const policyDefinition = await goToPolicy(document, params.position)
-  const viewDefinition = await goToView(document, params.position)
-  const inertiaPageDefinition = await goToInertiaPage(document, params.position)
-  const helperDefinition = await goToHelper(document, params.position)
+  const [
+    actionDefinition,
+    viewDefinition,
+    pageDefinition,
+    policyDefinition,
+    helperDefinition,
+    modelDefinition
+  ] = await Promise.all([
+    goToAction(document, params.position, typeMap),
+    goToView(document, params.position, typeMap),
+    goToPage(document, params.position, typeMap),
+    goToPolicy(document, params.position, typeMap),
+    goToHelper(document, params.position, typeMap),
+    goToModel(document, params.position, typeMap)
+  ])
 
   const definitions = [
     actionDefinition,
-    policyDefinition,
     viewDefinition,
-    inertiaPageDefinition,
-    helperDefinition
+    pageDefinition,
+    policyDefinition,
+    helperDefinition,
+    modelDefinition
   ].filter(Boolean)
-
   return definitions.length > 0 ? definitions : null
 })
 
@@ -65,8 +109,48 @@ connection.onCompletion(async (params) => {
   if (!document) {
     return null
   }
-
-  const completions = await sailsCompletions(document, params.position)
+  const [
+    actionCompletion,
+    dataTypeCompletion,
+    modelAttributePropCompletion,
+    inputPropCompletion,
+    inertiaPageCompletion,
+    modelCompletion,
+    policyCompletion,
+    viewCompletion,
+    modelMethodCompletion,
+    modelAttributeCompletion,
+    helperCompletion,
+    helperInputCompletion
+  ] = await Promise.all([
+    actionsCompletion(document, params.position, typeMap),
+    dataTypesCompletion(document, params.position, typeMap),
+    modelAttributePropsCompletion(document, params.position, typeMap),
+    inputPropsCompletion(document, params.position, typeMap),
+    inertiaPagesCompletion(document, params.position, typeMap),
+    modelsCompletion(document, params.position, typeMap),
+    policiesCompletion(document, params.position, typeMap),
+    viewsCompletion(document, params.position, typeMap),
+    modelMethodsCompletion(document, params.position, typeMap),
+    modelAttributesCompletion(document, params.position, typeMap),
+    helpersCompletion(document, params.position, typeMap),
+    helperInputsCompletion(document, params.position, typeMap)
+  ])
+
+  const completions = [
+    ...actionCompletion,
+    ...dataTypeCompletion,
+    ...modelAttributePropCompletion,
+    ...inputPropCompletion,
+    ...inertiaPageCompletion,
+    ...modelCompletion,
+    ...policyCompletion,
+    ...viewCompletion,
+    ...modelMethodCompletion,
+    ...modelAttributeCompletion,
+    ...helperCompletion,
+    ...helperInputCompletion
+  ].filter(Boolean)
 
   if (completions) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailshq/language-server",
-  "version": "0.0.5",
+  "version": "0.2.0",
   "description": "Language Server Protocol server for Sails Language Service",
   "homepage": "https://sailjs.com",
   "repository": {

package/validators/validate-action-exist.js

@@ -1,55 +1,40 @@
 const lsp = require('vscode-languageserver/node')
-const path = require('path')
-const fs = require('fs')
-const url = require('url')
-module.exports = function validateActionExist(document) {
-  const diagnostics = []
-
-  if (!document.uri.endsWith('routes.js')) {
-    return diagnostics // Return empty diagnostics if not routes.js
-  }
-  const actionInfo = extractActionInfo(document)
 
-  if (!actionInfo) {
-    return diagnostics
-  }
+module.exports = function validateActionExist(document, typeMap) {
+  const diagnostics = []
 
-  const projectRoot = path.dirname(path.dirname(document.uri))
-  const actions = extractActionInfo(document) // Get all actions
+  if (!document.uri.endsWith('routes.js')) return diagnostics
+  const actions = extractActionInfo(document)
 
   for (const { action, range } of actions) {
-    if (isUrlOrRedirect(action)) {
-      continue
-    }
-
-    const fullActionPath = resolveActionPath(projectRoot, action)
-    if (!fs.existsSync(url.fileURLToPath(fullActionPath))) {
-      const diagnostic = {
-        severity: lsp.DiagnosticSeverity.Error,
-        range,
-        message: `Action '${action}' does not exist. Please check the controller file.`,
-        source: 'Sails Validator'
-      }
-      diagnostics.push(diagnostic)
+    if (isUrlOrRedirect(action)) continue
+    const routeExists = Object.values(typeMap.routes || {}).some(
+      (route) => route.action?.name === action
+    )
+
+    if (!routeExists) {
+      diagnostics.push(
+        lsp.Diagnostic.create(
+          range,
+          `'${action}' action does not exist. Please check the name or create it.`,
+          lsp.DiagnosticSeverity.Error,
+          'sails-lsp'
+        )
+      )
     }
   }
-
   return diagnostics
 }
 
 function extractActionInfo(document) {
   const text = document.getText()
-
-  // This regex matches both object and string notations
-  const regex = /(['"])(.+?)\1:\s*(?:{?\s*action\s*:\s*)?(['"])(.+?)\3/g
-  let match
+  const regex = /(['"])(.+?)\1\s*:\s*(?:{?\s*action\s*:\s*)?(['"])(.+?)\3/g
   const actions = []
+  let match
 
   while ((match = regex.exec(text)) !== null) {
-    const [fullMatch, , route, , action] = match
-
-    // Store the action and its range
-    const actionStart = match.index + fullMatch.indexOf(action)
+    const action = match[4]
+    const actionStart = match.index + match[0].lastIndexOf(action)
     const actionEnd = actionStart + action.length
 
     actions.push({
@@ -61,21 +46,13 @@ function extractActionInfo(document) {
     })
   }
 
-  return actions // Return an array of actions
-}
-
-function resolveActionPath(projectRoot, actionPath) {
-  return path.join(projectRoot, 'api', 'controllers', `${actionPath}.js`)
+  return actions
 }
 
 function isUrlOrRedirect(action) {
-  if (action.startsWith('http://') || action.startsWith('https://')) {
-    return true
-  }
-
-  if (action.startsWith('/')) {
-    return true
-  }
-
-  return false
+  return (
+    action.startsWith('http://') ||
+    action.startsWith('https://') ||
+    action.startsWith('/')
+  )
 }

package/validators/validate-data-type.js

@@ -0,0 +1,34 @@
+const lsp = require('vscode-languageserver/node')
+
+module.exports = function validateDataType(document, typeMap) {
+  const diagnostics = []
+
+  const text = document.getText()
+
+  // Regex to match lines like: type: 'string' or type: "number"
+  const regex = /type\s*:\s*['"]([a-zA-Z0-9_-]+)['"]/g
+
+  let match
+  while ((match = regex.exec(text)) !== null) {
+    const dataType = match[1]
+    const typeStart = match.index + match[0].indexOf(dataType)
+    const typeEnd = typeStart + dataType.length
+
+    const isValid = typeMap.dataTypes.some((dt) => dt.type === dataType)
+
+    if (!isValid) {
+      diagnostics.push(
+        lsp.Diagnostic.create(
+          lsp.Range.create(
+            document.positionAt(typeStart),
+            document.positionAt(typeEnd)
+          ),
+          `'${dataType}' is not a recognized data type. Valid data types are: ${typeMap.dataTypes.map((dataType) => dataType.type).join(', ')}.`,
+          lsp.DiagnosticSeverity.Error,
+          'sails-lsp'
+        )
+      )
+    }
+  }
+  return diagnostics
+}

package/validators/validate-document.js

@@ -1,13 +1,51 @@
 const validateAutomigrationStrategy = require('./validate-auto-migration-strategy')
 const validateActionExist = require('./validate-action-exist')
+const validatePageExist = require('./validate-page-exist')
+const validateDataTypes = require('./validate-data-type')
+const validatePolicyExist = require('./validate-policy-exist')
+const validateModelAttributeExist = require('./validate-model-attribute-exist')
+const validateViewExist = require('./validate-view-exist')
+const validateHelperInputExist = require('./validate-helper-input-exist')
+const validateRequiredHelperInput = require('./validate-required-helper-input')
+const validateRequiredModelAttribute = require('./validate-required-model-attribute')
+const validateModelExist = require('./validate-model-exist')
 
-module.exports = function validateDocument(connection, document) {
+module.exports = function validateDocument(connection, document, typeMap) {
   const diagnostics = []
 
   const modelDiagnostics = validateAutomigrationStrategy(document)
-  const actionDiagnostics = validateActionExist(document)
-
-  diagnostics.push(...modelDiagnostics, ...actionDiagnostics)
+  const actionDiagnostics = validateActionExist(document, typeMap)
+  const pageDiagnostics = validatePageExist(document, typeMap)
+  const dataTypeDiagnostics = validateDataTypes(document, typeMap)
+  const policyDiagnostics = validatePolicyExist(document, typeMap)
+  const modelAttributeDiagnostics = validateModelAttributeExist(
+    document,
+    typeMap
+  )
+  const viewDiagnostics = validateViewExist(document, typeMap)
+  const helperInputDiagnostics = validateHelperInputExist(document, typeMap)
+  const requiredHelperInputDiagnostics = validateRequiredHelperInput(
+    document,
+    typeMap
+  )
+  const requiredModelAttributeDiagnostics = validateRequiredModelAttribute(
+    document,
+    typeMap
+  )
+  const modelExistDiagnostics = validateModelExist(document, typeMap)
+  diagnostics.push(
+    ...modelDiagnostics,
+    ...actionDiagnostics,
+    ...pageDiagnostics,
+    ...dataTypeDiagnostics,
+    ...policyDiagnostics,
+    ...modelAttributeDiagnostics,
+    ...viewDiagnostics,
+    ...helperInputDiagnostics,
+    ...requiredHelperInputDiagnostics,
+    ...requiredModelAttributeDiagnostics,
+    ...modelExistDiagnostics
+  )
 
   connection.sendDiagnostics({ uri: document.uri, diagnostics })
 }

package/validators/validate-helper-input-exist.js

@@ -0,0 +1,42 @@
+const lsp = require('vscode-languageserver/node')
+
+module.exports = function validateHelperInputExist(document, typeMap) {
+  const diagnostics = []
+  const text = document.getText()
+
+  // Regex to match sails.helpers.foo.bar.with({ ... })
+  // Captures: 1) helper path, 2) object literal content
+  const regex = /sails\.helpers((?:\.[a-zA-Z0-9_]+)+)\.with\s*\(\s*\{([^}]*)\}/g
+  let match
+  while ((match = regex.exec(text)) !== null) {
+    // Build helper name: e.g. .foo.bar => foo/bar
+    const segments = match[1].split('.').filter(Boolean)
+    const toKebab = (s) => s.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()
+    const fullHelperName = segments.map(toKebab).join('/')
+    const helperInfo = typeMap.helpers && typeMap.helpers[fullHelperName]
+    if (!helperInfo || !helperInfo.inputs) continue
+
+    // Find all property names in the object literal
+    const propsRegex = /([a-zA-Z0-9_]+)\s*:/g
+    let propMatch
+    while ((propMatch = propsRegex.exec(match[2])) !== null) {
+      const key = propMatch[1]
+      if (!Object.prototype.hasOwnProperty.call(helperInfo.inputs, key)) {
+        const start = match.index + match[0].indexOf(key)
+        const end = start + key.length
+        diagnostics.push(
+          lsp.Diagnostic.create(
+            lsp.Range.create(
+              document.positionAt(start),
+              document.positionAt(end)
+            ),
+            `Unknown input property '${key}' for helper '${fullHelperName}'.`,
+            lsp.DiagnosticSeverity.Error,
+            'sails-lsp'
+          )
+        )
+      }
+    }
+  }
+  return diagnostics
+}