@sailshq/language-server 0.3.2 → 0.5.0

package/go-to-definitions/go-to-model-attribute.js

@@ -0,0 +1,302 @@
+const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
+
+module.exports = async function goToModelAttribute(
+  document,
+  position,
+  typeMap
+) {
+  const text = document.getText()
+  const offset = document.offsetAt(position)
+
+  try {
+    const ast = acorn.parse(text, {
+      ecmaVersion: 'latest',
+      sourceType: 'module'
+    })
+
+    let result = null
+
+    const checkPropertyForAttribute = (prop, model, document) => {
+      if (prop.type !== 'Property' || !prop.key) return null
+
+      const attrName =
+        prop.key.type === 'Identifier'
+          ? prop.key.name
+          : prop.key.type === 'Literal'
+            ? prop.key.value
+            : null
+
+      if (!attrName) return null
+
+      const keyStart = prop.key.start
+      const keyEnd = prop.key.end
+
+      if (offset >= keyStart && offset <= keyEnd) {
+        const attrInfo = model.attributes?.[attrName]
+        if (attrInfo?.line && attrInfo?.path) {
+          const uri = `file://${attrInfo.path}`
+          return lsp.LocationLink.create(
+            uri,
+            lsp.Range.create(attrInfo.line - 1, 0, attrInfo.line - 1, 0),
+            lsp.Range.create(attrInfo.line - 1, 0, attrInfo.line - 1, 0),
+            lsp.Range.create(
+              document.positionAt(keyStart),
+              document.positionAt(keyEnd)
+            )
+          )
+        }
+      }
+      return null
+    }
+
+    const checkStringLiteralForAttribute = (literal, model, document) => {
+      if (literal.type !== 'Literal' || typeof literal.value !== 'string')
+        return null
+
+      const attrName = literal.value
+      const literalStart = literal.start
+      const literalEnd = literal.end
+
+      if (offset >= literalStart && offset <= literalEnd) {
+        const attrInfo = model.attributes?.[attrName]
+        if (attrInfo?.line && attrInfo?.path) {
+          const uri = `file://${attrInfo.path}`
+          return lsp.LocationLink.create(
+            uri,
+            lsp.Range.create(attrInfo.line - 1, 0, attrInfo.line - 1, 0),
+            lsp.Range.create(attrInfo.line - 1, 0, attrInfo.line - 1, 0),
+            lsp.Range.create(
+              document.positionAt(literalStart),
+              document.positionAt(literalEnd)
+            )
+          )
+        }
+      }
+      return null
+    }
+
+    const checkArrayForAttributes = (arrayNode, model, document) => {
+      if (!arrayNode || arrayNode.type !== 'ArrayExpression') return null
+
+      for (const element of arrayNode.elements) {
+        if (element?.type === 'Literal' && typeof element.value === 'string') {
+          const res = checkStringLiteralForAttribute(element, model, document)
+          if (res) return res
+        } else if (element?.type === 'ObjectExpression') {
+          const res = traverseObjectExpression(element, model, document)
+          if (res) return res
+        }
+      }
+      return null
+    }
+
+    const traverseObjectExpression = (objNode, model, document) => {
+      if (!objNode || objNode.type !== 'ObjectExpression') return null
+
+      for (const prop of objNode.properties) {
+        if (prop.type !== 'Property') continue
+
+        const propName =
+          prop.key.type === 'Identifier'
+            ? prop.key.name
+            : prop.key.type === 'Literal'
+              ? prop.key.value
+              : null
+
+        if (
+          propName === 'where' ||
+          propName === 'or' ||
+          propName === 'and' ||
+          propName === 'not'
+        ) {
+          if (prop.value.type === 'ObjectExpression') {
+            const res = traverseObjectExpression(prop.value, model, document)
+            if (res) return res
+          } else if (prop.value.type === 'ArrayExpression') {
+            for (const element of prop.value.elements) {
+              const res = traverseObjectExpression(element, model, document)
+              if (res) return res
+            }
+          }
+        } else if (propName === 'select' || propName === 'omit') {
+          if (prop.value.type === 'ArrayExpression') {
+            const res = checkArrayForAttributes(prop.value, model, document)
+            if (res) return res
+          }
+        } else if (propName === 'sort') {
+          if (prop.value.type === 'ArrayExpression') {
+            const res = checkArrayForAttributes(prop.value, model, document)
+            if (res) return res
+          } else if (
+            prop.value.type === 'Literal' &&
+            typeof prop.value.value === 'string'
+          ) {
+            const sortString = prop.value.value
+            const attrMatch = sortString.match(/^(\w+)/)
+            if (attrMatch) {
+              const attrName = attrMatch[1]
+              const attrInfo = model.attributes?.[attrName]
+              if (attrInfo?.line && attrInfo?.path) {
+                const sortStart = prop.value.start
+                const sortEnd = prop.value.end
+                if (offset >= sortStart && offset <= sortEnd) {
+                  const uri = `file://${attrInfo.path}`
+                  return lsp.LocationLink.create(
+                    uri,
+                    lsp.Range.create(
+                      attrInfo.line - 1,
+                      0,
+                      attrInfo.line - 1,
+                      0
+                    ),
+                    lsp.Range.create(
+                      attrInfo.line - 1,
+                      0,
+                      attrInfo.line - 1,
+                      0
+                    ),
+                    lsp.Range.create(
+                      document.positionAt(sortStart),
+                      document.positionAt(sortEnd)
+                    )
+                  )
+                }
+              }
+            }
+          }
+        } else {
+          const res = checkPropertyForAttribute(prop, model, document)
+          if (res) return res
+
+          if (prop.value.type === 'ObjectExpression') {
+            const nestedRes = traverseObjectExpression(
+              prop.value,
+              model,
+              document
+            )
+            if (nestedRes) return nestedRes
+          }
+        }
+      }
+      return null
+    }
+
+    const findModelInChain = (node) => {
+      let current = node
+      while (current) {
+        if (
+          current.type === 'CallExpression' &&
+          current.callee?.type === 'MemberExpression'
+        ) {
+          if (current.callee.object?.type === 'Identifier') {
+            const modelName = current.callee.object.name
+            return typeMap.models?.[modelName]
+          }
+          current = current.callee.object
+        } else if (current.type === 'MemberExpression') {
+          current = current.object
+        } else {
+          break
+        }
+      }
+      return null
+    }
+
+    walk.simple(ast, {
+      CallExpression(node) {
+        if (node.callee.type === 'MemberExpression') {
+          const methodName =
+            node.callee.property?.type === 'Identifier'
+              ? node.callee.property.name
+              : null
+
+          if (methodName === 'select' || methodName === 'omit') {
+            const model = findModelInChain(node.callee.object)
+            if (model) {
+              const firstArg = node.arguments?.[0]
+              if (firstArg?.type === 'ArrayExpression') {
+                for (const element of firstArg.elements) {
+                  const res = checkStringLiteralForAttribute(
+                    element,
+                    model,
+                    document
+                  )
+                  if (res) {
+                    result = res
+                    return
+                  }
+                }
+              }
+            }
+          } else if (methodName === 'sort') {
+            const model = findModelInChain(node.callee.object)
+            if (model) {
+              const firstArg = node.arguments?.[0]
+              if (firstArg?.type === 'ArrayExpression') {
+                const res = checkArrayForAttributes(firstArg, model, document)
+                if (res) {
+                  result = res
+                  return
+                }
+              } else if (
+                firstArg?.type === 'Literal' &&
+                typeof firstArg.value === 'string'
+              ) {
+                const sortString = firstArg.value
+                const attrMatch = sortString.match(/^(\w+)/)
+                if (attrMatch) {
+                  const attrName = attrMatch[1]
+                  const attrInfo = model.attributes?.[attrName]
+                  if (attrInfo?.line && attrInfo?.path) {
+                    const sortStart = firstArg.start
+                    const sortEnd = firstArg.end
+                    if (offset >= sortStart && offset <= sortEnd) {
+                      const uri = `file://${attrInfo.path}`
+                      result = lsp.LocationLink.create(
+                        uri,
+                        lsp.Range.create(
+                          attrInfo.line - 1,
+                          0,
+                          attrInfo.line - 1,
+                          0
+                        ),
+                        lsp.Range.create(
+                          attrInfo.line - 1,
+                          0,
+                          attrInfo.line - 1,
+                          0
+                        ),
+                        lsp.Range.create(
+                          document.positionAt(sortStart),
+                          document.positionAt(sortEnd)
+                        )
+                      )
+                      return
+                    }
+                  }
+                }
+              }
+            }
+          } else if (node.callee.object.type === 'Identifier') {
+            const modelName = node.callee.object.name
+            const model = typeMap.models?.[modelName]
+
+            if (!model) return
+
+            const firstArg = node.arguments?.[0]
+            if (firstArg?.type === 'ObjectExpression') {
+              const res = traverseObjectExpression(firstArg, model, document)
+              if (res) result = res
+            }
+          }
+        }
+      }
+    })
+
+    return result
+  } catch (error) {
+    return null
+  }
+}

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

@@ -25,12 +25,13 @@ module.exports = async function goToModel(document, position, typeMap) {
       const model = typeMap.models?.[modelName]
       if (!model?.path) return null
 
+      const targetLine = model.attributesLine ? model.attributesLine - 1 : 0
       const uri = `file://${model.path}`
       return lsp.LocationLink.create(
         uri,
-        lsp.Range.create(0, 0, 0, 0), // target range (usually top of file)
-        lsp.Range.create(0, 0, 0, 0), // target selection range
-        lsp.Range.create(document.positionAt(start), document.positionAt(end)) // origin range
+        lsp.Range.create(targetLine, 0, targetLine, 0),
+        lsp.Range.create(targetLine, 0, targetLine, 0),
+        lsp.Range.create(document.positionAt(start), document.positionAt(end))
       )
     }
   }

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

@@ -11,7 +11,9 @@ const goToView = require('./go-to-definitions/go-to-view')
 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 goToHelperInput = require('./go-to-definitions/go-to-helper-input')
 const goToModel = require('./go-to-definitions/go-to-model')
+const goToModelAttribute = require('./go-to-definitions/go-to-model-attribute')
 
 // Completions
 const actionsCompletion = require('./completions/actions-completion')
@@ -83,14 +85,18 @@ connection.onDefinition(async (params) => {
     pageDefinition,
     policyDefinition,
     helperDefinition,
-    modelDefinition
+    helperInputDefinition,
+    modelDefinition,
+    modelAttributeDefinition
   ] = 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)
+    goToHelperInput(document, params.position, typeMap),
+    goToModel(document, params.position, typeMap),
+    goToModelAttribute(document, params.position, typeMap)
   ])
 
   const definitions = [
@@ -99,8 +105,10 @@ connection.onDefinition(async (params) => {
     pageDefinition,
     policyDefinition,
     helperDefinition,
-    modelDefinition
-  ].filter(Boolean)
+    helperInputDefinition,
+    modelDefinition,
+    modelAttributeDefinition
+  ].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.5.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
 }