@sailshq/language-server 0.3.2 → 0.4.0

package/go-to-definitions/go-to-page.js

@@ -1,38 +1,52 @@
 const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
+
 module.exports = async function goToPage(document, position, typeMap) {
   const filePath = document.uri
   if (!filePath.includes('/api/controllers/')) return null
   const text = document.getText()
   const offset = document.offsetAt(position)
 
-  const regex =
-    /{[^}]*?\bpage\s*:\s*(?<quote>['"])(?<page>[^'"]+)\k<quote>[^}]*?}/g
-
-  let match
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    })
 
-  while ((match = regex.exec(text)) !== null) {
-    const pageName = match.groups.page
-    const quote = match.groups.quote
-    const fullMatchStart =
-      match.index + match[0].indexOf(quote + pageName + quote)
-    const fullMatchEnd = fullMatchStart + pageName.length + 2 // +2 for quotes
+    let result = null
 
-    if (offset >= fullMatchStart && offset <= fullMatchEnd) {
-      const pagePath = typeMap.pages?.[pageName]
-      if (pagePath) {
-        const uri = `file://${pagePath.path}`
-        return lsp.LocationLink.create(
-          uri,
-          lsp.Range.create(0, 0, 0, 0),
-          lsp.Range.create(0, 0, 0, 0),
-          lsp.Range.create(
-            document.positionAt(fullMatchStart),
-            document.positionAt(fullMatchEnd)
-          )
-        )
+    walk.simple(ast, {
+      Property(node) {
+        if (
+          node.key &&
+          (node.key.name === 'page' || node.key.value === 'page') &&
+          node.value &&
+          node.value.type === 'Literal' &&
+          typeof node.value.value === 'string'
+        ) {
+          const pageName = node.value.value
+          if (offset >= node.value.start && offset <= node.value.end) {
+            const pagePath = typeMap.pages?.[pageName]
+            if (pagePath) {
+              const uri = `file://${pagePath.path}`
+              result = lsp.LocationLink.create(
+                uri,
+                lsp.Range.create(0, 0, 0, 0),
+                lsp.Range.create(0, 0, 0, 0),
+                lsp.Range.create(
+                  document.positionAt(node.value.start),
+                  document.positionAt(node.value.end)
+                )
+              )
+            }
+          }
+        }
       }
-    }
-  }
+    })
 
-  return null
+    return result
+  } catch (error) {
+    return null
+  }
 }

package/go-to-definitions/go-to-view.js

@@ -1,5 +1,7 @@
 const lsp = require('vscode-languageserver/node')
 const path = require('path')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
 
 module.exports = async function goToView(document, position, typeMap) {
   const fileName = path.basename(document.uri)
@@ -12,32 +14,48 @@ module.exports = async function goToView(document, position, typeMap) {
 
   if (!isRoutes && !isController) return null
 
-  const regex =
-    /\b(viewTemplatePath|view)\s*:\s*(?<quote>['"])(?<view>[^'"]+)\k<quote>/g
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    })
 
-  let match
-  while ((match = regex.exec(text)) !== null) {
-    const viewName = match.groups.view
-    const quote = match.groups.quote
-    const fullMatchStart =
-      match.index + match[0].indexOf(quote + viewName + quote)
-    const fullMatchEnd = fullMatchStart + viewName.length + 2
+    let result = null
 
-    if (offset >= fullMatchStart && offset <= fullMatchEnd) {
-      const viewPath = typeMap.views?.[viewName]
-      if (viewPath) {
-        const uri = `file://${viewPath.path}`
-        return lsp.LocationLink.create(
-          uri,
-          lsp.Range.create(0, 0, 0, 0),
-          lsp.Range.create(0, 0, 0, 0),
-          lsp.Range.create(
-            document.positionAt(fullMatchStart),
-            document.positionAt(fullMatchEnd)
-          )
-        )
+    walk.simple(ast, {
+      Property(node) {
+        if (
+          node.key &&
+          (node.key.name === 'viewTemplatePath' ||
+            node.key.value === 'viewTemplatePath' ||
+            node.key.name === 'view' ||
+            node.key.value === 'view') &&
+          node.value &&
+          node.value.type === 'Literal' &&
+          typeof node.value.value === 'string'
+        ) {
+          const viewName = node.value.value
+          if (offset >= node.value.start && offset <= node.value.end) {
+            const viewPath = typeMap.views?.[viewName]
+            if (viewPath) {
+              const uri = `file://${viewPath.path}`
+              result = lsp.LocationLink.create(
+                uri,
+                lsp.Range.create(0, 0, 0, 0),
+                lsp.Range.create(0, 0, 0, 0),
+                lsp.Range.create(
+                  document.positionAt(node.value.start),
+                  document.positionAt(node.value.end)
+                )
+              )
+            }
+          }
+        }
       }
-    }
+    })
+
+    return result
+  } catch (error) {
+    return null
   }
-  return null
 }

package/index.js

@@ -100,7 +100,7 @@ connection.onDefinition(async (params) => {
     policyDefinition,
     helperDefinition,
     modelDefinition
-  ].filter(Boolean)
+  ].filter((def) => def && (Array.isArray(def) ? def.length > 0 : true))
   return definitions
 })
 

package/package.json

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

package/validators/validate-action-exist.js

@@ -1,4 +1,6 @@
 const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
 
 module.exports = function validateActionExist(document, typeMap) {
   const diagnostics = []
@@ -28,23 +30,60 @@ module.exports = function validateActionExist(document, typeMap) {
 
 function extractActionInfo(document) {
   const text = document.getText()
-  const regex = /(['"])(.+?)\1\s*:\s*(?:{?\s*action\s*:\s*)?(['"])(.+?)\3/g
   const actions = []
-  let match
-
-  while ((match = regex.exec(text)) !== null) {
-    const action = match[4]
-    const actionStart = match.index + match[0].lastIndexOf(action)
-    const actionEnd = actionStart + action.length
-
-    actions.push({
-      action,
-      range: lsp.Range.create(
-        document.positionAt(actionStart),
-        document.positionAt(actionEnd)
-      )
+
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
     })
-  }
+
+    walk.simple(ast, {
+      Property(node) {
+        const propertyKey = node.key?.value || node.key?.name
+
+        if (
+          propertyKey === 'action' &&
+          node.value?.type === 'Literal' &&
+          typeof node.value.value === 'string'
+        ) {
+          const actionName = node.value.value
+          actions.push({
+            action: actionName,
+            range: lsp.Range.create(
+              document.positionAt(node.value.start),
+              document.positionAt(node.value.end)
+            )
+          })
+        } else if (
+          typeof propertyKey === 'string' &&
+          (propertyKey.includes('GET') ||
+            propertyKey.includes('POST') ||
+            propertyKey.includes('PUT') ||
+            propertyKey.includes('PATCH') ||
+            propertyKey.includes('DELETE') ||
+            propertyKey.includes('/')) &&
+          node.value?.type === 'Literal' &&
+          typeof node.value.value === 'string'
+        ) {
+          const actionName = node.value.value
+          if (
+            !actionName.startsWith('/') &&
+            !actionName.startsWith('http://') &&
+            !actionName.startsWith('https://')
+          ) {
+            actions.push({
+              action: actionName,
+              range: lsp.Range.create(
+                document.positionAt(node.value.start),
+                document.positionAt(node.value.end)
+              )
+            })
+          }
+        }
+      }
+    })
+  } catch (error) {}
 
   return actions
 }

package/validators/validate-data-type.js

@@ -1,34 +1,97 @@
 const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
 
 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'
-        )
-      )
-    }
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    })
+
+    walk.simple(ast, {
+      ObjectExpression(node) {
+        // Check if this object has both 'type' and other properties that suggest it's a definition
+        // (like 'required', 'description', 'allowNull', 'defaultsTo', 'example', etc.)
+        let hasTypeProperty = false
+        let typePropertyNode = null
+        let typeValue = null
+        let hasDefinitionProperties = false
+
+        for (const prop of node.properties) {
+          if (prop.type !== 'Property') continue
+
+          const keyName = prop.key.name || prop.key.value
+
+          // Check if this is a 'type' property
+          if (keyName === 'type' && prop.value.type === 'Literal') {
+            hasTypeProperty = true
+            typePropertyNode = prop.value
+            typeValue = prop.value.value
+          }
+
+          // Check for properties that indicate this is a model/action/helper definition
+          if (
+            [
+              'required',
+              'description',
+              'allowNull',
+              'defaultsTo',
+              'columnName',
+              'columnType',
+              'autoMigrations',
+              'autoCreatedAt',
+              'autoUpdatedAt',
+              'model',
+              'collection',
+              'via',
+              'through',
+              'unique',
+              'isEmail',
+              'isURL',
+              'isIn',
+              'min',
+              'max',
+              'minLength',
+              'maxLength',
+              'example',
+              'validations',
+              'regex',
+              'extendedDescription',
+              'moreInfoUrl',
+              'whereToGet'
+            ].includes(keyName)
+          ) {
+            hasDefinitionProperties = true
+          }
+        }
+
+        // Only validate if this looks like an attribute/input definition
+        if (hasTypeProperty && hasDefinitionProperties && typeValue) {
+          const isValid = typeMap.dataTypes.some((dt) => dt.type === typeValue)
+
+          if (!isValid) {
+            diagnostics.push(
+              lsp.Diagnostic.create(
+                lsp.Range.create(
+                  document.positionAt(typePropertyNode.start),
+                  document.positionAt(typePropertyNode.end)
+                ),
+                `'${typeValue}' is not a recognized data type. Valid data types are: ${typeMap.dataTypes.map((dataType) => dataType.type).join(', ')}.`,
+                lsp.DiagnosticSeverity.Error,
+                'sails-lsp'
+              )
+            )
+          }
+        }
+      }
+    })
+  } catch (error) {
+    // Ignore parse errors
   }
+
   return diagnostics
 }

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

@@ -1,42 +1,108 @@
 const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
 
 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'
-          )
-        )
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    })
+
+    walk.simple(ast, {
+      CallExpression(node) {
+        // Match sails.helpers.foo.bar.with({ ... })
+        if (
+          node.callee &&
+          node.callee.type === 'MemberExpression' &&
+          node.callee.property.name === 'with' &&
+          node.callee.object &&
+          node.callee.object.type === 'MemberExpression'
+        ) {
+          // Extract helper path from sails.helpers.foo.bar
+          const helperPath = extractHelperPath(node.callee.object)
+          if (!helperPath) return
+
+          const helperInfo = typeMap.helpers && typeMap.helpers[helperPath]
+          if (!helperInfo || !helperInfo.inputs) return
+
+          // Get the object argument to .with()
+          const objArg = node.arguments[0]
+          if (!objArg || objArg.type !== 'ObjectExpression') return
+
+          // Validate each property in the object
+          for (const prop of objArg.properties) {
+            // Handle both regular properties and shorthand properties
+            let key
+            if (prop.type === 'Property') {
+              if (prop.key.type === 'Identifier') {
+                key = prop.key.name
+              } else if (prop.key.type === 'Literal') {
+                key = prop.key.value
+              }
+            } else if (prop.type === 'SpreadElement') {
+              // Skip spread elements
+              continue
+            }
+
+            if (!key) continue
+
+            // Check if this key exists in the helper's inputs
+            if (!Object.prototype.hasOwnProperty.call(helperInfo.inputs, key)) {
+              diagnostics.push(
+                lsp.Diagnostic.create(
+                  lsp.Range.create(
+                    document.positionAt(prop.key.start),
+                    document.positionAt(prop.key.end)
+                  ),
+                  `Unknown input property '${key}' for helper '${helperPath}'.`,
+                  lsp.DiagnosticSeverity.Error,
+                  'sails-lsp'
+                )
+              )
+            }
+          }
+        }
       }
-    }
+    })
+  } catch (error) {
+    // Ignore parse errors
   }
+
   return diagnostics
 }
+
+function extractHelperPath(node) {
+  // Walk up the member expression to extract the full helper path
+  const segments = []
+  let current = node
+
+  // Collect all segments until we reach sails.helpers
+  while (current && current.type === 'MemberExpression') {
+    if (current.property && current.property.type === 'Identifier') {
+      const propName = current.property.name
+      // Stop when we reach 'helpers'
+      if (propName === 'helpers') {
+        // Check if the object is 'sails'
+        if (
+          current.object &&
+          current.object.type === 'Identifier' &&
+          current.object.name === 'sails'
+        ) {
+          // Valid sails.helpers path found
+          const toKebab = (s) =>
+            s.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()
+          return segments.map(toKebab).join('/')
+        }
+        return null
+      }
+      segments.unshift(propName)
+    }
+    current = current.object
+  }
+
+  return null
+}