@sailshq/language-server 0.3.2 → 0.5.0

package/SailsParser.js

@@ -60,30 +60,68 @@ class SailsParser {
     const actionsRoot = path.join(this.rootDir, 'api', 'controllers')
     const content = await this.#readFile(routesPath)
     const routes = {}
+    const actionsToParse = []
 
-    const regex = /['"]([^'"]+)['"]\s*:\s*['"]([^'"]+)['"]/g
-    let match
-    while ((match = regex.exec(content))) {
-      const route = match[1]
-      const actionName = match[2]
+    try {
+      const ast = acorn.parse(content, {
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      })
 
-      // Skip redirects and external URLs
-      // Routes that start with '/' or contain '://' are redirects, not actions
-      if (actionName.startsWith('/') || actionName.includes('://')) {
-        continue
-      }
+      walk.simple(ast, {
+        Property(node) {
+          const routePattern = node.key?.value || node.key?.name
+          if (!routePattern) return
 
-      const filePath = path.join(actionsRoot, ...actionName.split('/')) + '.js'
+          let actionName = null
 
-      const actionInfo = await this.#parseAction(filePath)
+          if (
+            node.value?.type === 'Literal' &&
+            typeof node.value.value === 'string'
+          ) {
+            actionName = node.value.value
+          } else if (
+            node.value?.type === 'ObjectExpression' &&
+            node.value.properties
+          ) {
+            for (const prop of node.value.properties) {
+              if (
+                prop.type === 'Property' &&
+                (prop.key?.name === 'action' || prop.key?.value === 'action') &&
+                prop.value?.type === 'Literal' &&
+                typeof prop.value.value === 'string'
+              ) {
+                actionName = prop.value.value
+                break
+              }
+            }
+          }
 
-      routes[route] = {
-        action: {
-          name: actionName,
-          path: filePath,
-          ...actionInfo
+          if (
+            actionName &&
+            !actionName.startsWith('/') &&
+            !actionName.includes('://')
+          ) {
+            actionsToParse.push({ routePattern, actionName })
+          }
+        }
+      })
+
+      for (const { routePattern, actionName } of actionsToParse) {
+        const filePath =
+          path.join(actionsRoot, ...actionName.split('/')) + '.js'
+        const actionInfo = await this.#parseAction(filePath)
+
+        routes[routePattern] = {
+          action: {
+            name: actionName,
+            path: filePath,
+            ...actionInfo
+          }
         }
       }
+    } catch (error) {
+      console.error('Error parsing routes:', error)
     }
 
     return routes
@@ -191,7 +229,11 @@ class SailsParser {
                   prop.key?.name === 'attributes' &&
                   prop.value?.type === 'ObjectExpression'
                 ) {
-                  defaultAttributes = context.#extractObjectLiteral(prop.value)
+                  defaultAttributes = context.#extractObjectLiteral(
+                    prop.value,
+                    true,
+                    configCode
+                  )
                 }
                 if (
                   prop.key?.name === 'models' &&
@@ -203,7 +245,9 @@ class SailsParser {
                       inner.value?.type === 'ObjectExpression'
                     ) {
                       defaultAttributes = context.#extractObjectLiteral(
-                        inner.value
+                        inner.value,
+                        true,
+                        configCode
                       )
                     }
                   }
@@ -224,7 +268,11 @@ class SailsParser {
                   prop.key?.name === 'attributes' &&
                   prop.value?.type === 'ObjectExpression'
                 ) {
-                  defaultAttributes = context.#extractObjectLiteral(prop.value)
+                  defaultAttributes = context.#extractObjectLiteral(
+                    prop.value,
+                    true,
+                    configCode
+                  )
                 }
               }
             }
@@ -241,6 +289,7 @@ class SailsParser {
       const name = file.slice(0, -3)
       const modelPath = path.join(dir, file)
       let attributes = {}
+      let attributesLine = 0
       const context = this
 
       try {
@@ -264,7 +313,12 @@ class SailsParser {
                   prop.key?.name === 'attributes' &&
                   prop.value?.type === 'ObjectExpression'
                 ) {
-                  attributes = context.#extractObjectLiteral(prop.value)
+                  attributes = context.#extractObjectLiteral(
+                    prop.value,
+                    true,
+                    code
+                  )
+                  attributesLine = context.#getLineNumber(prop.key.start, code)
                 }
               }
             }
@@ -277,7 +331,11 @@ class SailsParser {
               node.left.property.name === 'attributes' &&
               node.right.type === 'ObjectExpression'
             ) {
-              attributes = context.#extractObjectLiteral(node.right)
+              attributes = context.#extractObjectLiteral(node.right, true, code)
+              attributesLine = context.#getLineNumber(
+                node.left.property.start,
+                code
+              )
             }
           },
           ExportDefaultDeclaration(node) {
@@ -287,7 +345,12 @@ class SailsParser {
                   prop.key?.name === 'attributes' &&
                   prop.value?.type === 'ObjectExpression'
                 ) {
-                  attributes = context.#extractObjectLiteral(prop.value)
+                  attributes = context.#extractObjectLiteral(
+                    prop.value,
+                    true,
+                    code
+                  )
+                  attributesLine = context.#getLineNumber(prop.key.start, code)
                 }
               }
             }
@@ -301,13 +364,22 @@ class SailsParser {
       // Merge defaultAttributes first, then model attributes (model overrides default)
       const mergedAttributes = {}
       for (const key of Object.keys(defaultAttributes)) {
-        mergedAttributes[key] = defaultAttributes[key]
+        const attr = defaultAttributes[key]
+        mergedAttributes[key] = {
+          ...attr,
+          path: modelsConfigPath
+        }
       }
       for (const key of Object.keys(attributes)) {
-        mergedAttributes[key] = attributes[key]
+        const attr = attributes[key]
+        mergedAttributes[key] = {
+          ...attr,
+          path: modelPath
+        }
       }
       models[name] = {
         path: modelPath,
+        attributesLine,
         methods: STATIC_METHODS,
         chainableMethods: CHAINABLE_METHODS,
         attributes: mergedAttributes
@@ -444,7 +516,11 @@ class SailsParser {
                         prop.key.name === 'inputs' &&
                         prop.value.type === 'ObjectExpression'
                       ) {
-                        inputs = context.#extractObjectLiteral(prop.value)
+                        inputs = context.#extractObjectLiteral(
+                          prop.value,
+                          true,
+                          content
+                        )
                       }
                       if (
                         prop.key &&
@@ -475,7 +551,11 @@ class SailsParser {
                         prop.key.name === 'inputs' &&
                         prop.value.type === 'ObjectExpression'
                       ) {
-                        inputs = context.#extractObjectLiteral(prop.value)
+                        inputs = context.#extractObjectLiteral(
+                          prop.value,
+                          true,
+                          content
+                        )
                       }
                       if (
                         prop.key &&
@@ -501,14 +581,13 @@ class SailsParser {
               const match = content.match(/inputs\s*:\s*\{([\s\S]*?)\n\s*\}/m)
               if (match) {
                 try {
-                  // Try to parse as JS object
                   const fakeObj = `({${match[1]}})`
                   const ast = acorn.parse(fakeObj, { ecmaVersion: 'latest' })
                   let obj = {}
                   walk.simple(ast, {
                     ObjectExpression(node) {
                       if (!obj || Object.keys(obj).length === 0) {
-                        obj = context.#extractObjectLiteral(node)
+                        obj = context.#extractObjectLiteral(node, true, content)
                       }
                     }
                   })
@@ -536,7 +615,7 @@ class SailsParser {
     return helpers
   }
 
-  #extractObjectLiteral(node) {
+  #extractObjectLiteral(node, withLineNumbers = false, sourceCode = null) {
     if (node.type !== 'ObjectExpression') return undefined
     const obj = {}
     for (const prop of node.properties) {
@@ -545,11 +624,15 @@ class SailsParser {
           prop.key.type === 'Identifier' ? prop.key.name : prop.key.value
         let value
         if (prop.value.type === 'ObjectExpression') {
-          value = this.#extractObjectLiteral(prop.value)
+          value = this.#extractObjectLiteral(
+            prop.value,
+            withLineNumbers,
+            sourceCode
+          )
         } else if (prop.value.type === 'ArrayExpression') {
           value = prop.value.elements.map((el) =>
             el.type === 'ObjectExpression'
-              ? this.#extractObjectLiteral(el)
+              ? this.#extractObjectLiteral(el, withLineNumbers, sourceCode)
               : el.type === 'Literal'
                 ? el.value
                 : el.type === 'Identifier'
@@ -563,11 +646,20 @@ class SailsParser {
         } else {
           value = undefined
         }
-        obj[key] = value
+        if (withLineNumbers && sourceCode) {
+          const line = this.#getLineNumber(prop.key.start, sourceCode)
+          obj[key] = { value, line }
+        } else {
+          obj[key] = value
+        }
       }
     }
     return obj
   }
+  #getLineNumber(offset, sourceCode) {
+    const lines = sourceCode.substring(0, offset).split('\n')
+    return lines.length
+  }
   #getDataTypes() {
     return [
       {

package/completions/helper-inputs-completion.js

@@ -13,9 +13,14 @@ function getHelperPath(line) {
 function getInputCompletionItems(inputsObj) {
   if (!inputsObj || typeof inputsObj !== 'object') return []
   return Object.entries(inputsObj).map(([inputName, inputDef]) => {
-    let type = inputDef?.type
-    let required = inputDef?.required ? 'required' : 'optional'
-    let description = inputDef?.description || ''
+    const typeValue = inputDef?.value?.type?.value ?? inputDef?.type
+    const requiredValue = inputDef?.value?.required?.value ?? inputDef?.required
+    const descriptionValue =
+      inputDef?.value?.description?.value ?? inputDef?.description
+
+    let type = typeValue
+    let required = requiredValue ? 'required' : 'optional'
+    let description = descriptionValue || ''
     let detail = type ? `${type} (${required})` : required
     return {
       label: inputName,

package/completions/model-attribute-props-completion.js

@@ -21,30 +21,31 @@ module.exports = function modelAttributePropsCompletion(
   const insideAttributes = /attributes\s*:\s*{([\s\S]*)$/.exec(before)
   if (!insideAttributes) return []
 
-  // Use a stack to track braces and find if we're inside a property block
-  let braceStack = []
-  let insideProperty = false
-  for (let i = lines.length - 1; i >= 0; i--) {
+  // Count nesting depth from attributes: { to current position
+  // We want depth > 1 (inside a property) not depth === 1 (top level of attributes)
+  let depth = 0
+  let foundAttributesBlock = false
+
+  for (let i = 0; i < lines.length; i++) {
     const line = lines[i]
-    for (let j = line.length - 1; j >= 0; j--) {
-      if (line[j] === '}') braceStack.push('}')
-      if (line[j] === '{') {
-        if (braceStack.length > 0) {
-          braceStack.pop()
-        } else {
-          const propMatch = lines[i]
-            .slice(0, j + 1)
-            .match(/([a-zA-Z0-9_]+)\s*:\s*{$/)
-          if (propMatch) insideProperty = true
-          break
-        }
+
+    if (/attributes\s*:\s*{/.test(line)) {
+      foundAttributesBlock = true
+      depth = 1
+      continue
+    }
+
+    if (foundAttributesBlock) {
+      for (let j = 0; j < line.length; j++) {
+        if (line[j] === '{') depth++
+        if (line[j] === '}') depth--
       }
     }
-    if (insideProperty) break
-    if (/^\s*attributes\s*:\s*{/.test(line)) break
   }
 
-  if (!insideProperty) return []
+  // Only provide completions if we're nested inside a property (depth > 1)
+  // depth === 1 means we're at the top level of attributes: {}
+  if (depth <= 1) return []
 
   return typeMap.modelAttributeProps.map(({ label, detail }) => ({
     label,