@sailshq/language-server 0.4.0 → 0.5.1

package/SailsParser.js

@@ -229,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' &&
@@ -241,7 +245,9 @@ class SailsParser {
                       inner.value?.type === 'ObjectExpression'
                     ) {
                       defaultAttributes = context.#extractObjectLiteral(
-                        inner.value
+                        inner.value,
+                        true,
+                        configCode
                       )
                     }
                   }
@@ -262,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
+                  )
                 }
               }
             }
@@ -279,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 {
@@ -302,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)
                 }
               }
             }
@@ -315,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) {
@@ -325,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)
                 }
               }
             }
@@ -339,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
@@ -482,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 &&
@@ -513,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 &&
@@ -539,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)
                       }
                     }
                   })
@@ -574,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) {
@@ -583,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'
@@ -601,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-attributes-completion.js

@@ -274,6 +274,7 @@ module.exports = function modelAttributesCompletion(
           let hasAttributes = false
           let hasQueryOptions = false
           let hasOperators = false
+          let hasModifiers = false
           for (const prop of objNode.properties) {
             if (!prop.key) continue
             const keyName = prop.key.name || prop.key.value
@@ -281,7 +282,9 @@ module.exports = function modelAttributesCompletion(
               hasQueryOptions = true
             } else if (WATERLINE_OPERATORS.includes(keyName)) {
               hasOperators = true
-            } else if (!WATERLINE_MODIFIERS.includes(keyName)) {
+            } else if (WATERLINE_MODIFIERS.includes(keyName)) {
+              hasModifiers = true
+            } else {
               // Check if it's a valid attribute
               const model = getModelByName(astModelName)
               if (
@@ -303,12 +306,13 @@ module.exports = function modelAttributesCompletion(
           // - If we have query options (like where, select, limit), this is a query options object
           // - If we're explicitly inside a where clause (isInsideWhere), show attributes
           // - If we have attributes but no query options, it's a criteria object
+          // - Modifiers at top level don't make this a criteria object (only inside them)
           const isCriteriaMode =
             isInsideWhere || (hasAttributes && !hasQueryOptions)
 
-          // If we have query options and we're not inside where, this is NOT a criteria context
+          // If we have query options or modifiers and we're not inside where, this is NOT a criteria context
           // Don't show attribute completions at the query options level
-          if (hasQueryOptions && !isInsideWhere) {
+          if ((hasQueryOptions || hasModifiers) && !isInsideWhere) {
             // But we still need to check if we're typing a new key after existing query options
             // Check if cursor is in a position to type a new key
             const isTypingNewKey =
@@ -352,7 +356,7 @@ module.exports = function modelAttributesCompletion(
               }
             }
 
-            // If it's a modifier (or/and/not), check inside the array
+            // If it's a modifier (or/and/not), check inside the array or object at any level
             if (WATERLINE_MODIFIERS.includes(keyName)) {
               if (
                 prop.value &&
@@ -364,6 +368,8 @@ module.exports = function modelAttributesCompletion(
                     if (checkObjectForCursor(el, true)) return true
                   }
                 }
+              } else if (prop.value && prop.value.type === 'ObjectExpression') {
+                if (checkObjectForCursor(prop.value, true)) return true
               }
             }
 

package/go-to-definitions/go-to-helper-input.js

@@ -0,0 +1,112 @@
+const lsp = require('vscode-languageserver/node')
+const acorn = require('acorn')
+const walk = require('acorn-walk')
+
+module.exports = async function goToHelperInput(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
+
+    walk.simple(ast, {
+      CallExpression(node) {
+        if (
+          node.callee &&
+          node.callee.type === 'MemberExpression' &&
+          node.callee.property.name === 'with' &&
+          node.callee.object &&
+          node.callee.object.type === 'MemberExpression'
+        ) {
+          const helperPath = extractHelperPath(node.callee.object)
+          if (!helperPath) return
+
+          const helperInfo = typeMap.helpers && typeMap.helpers[helperPath]
+          if (!helperInfo || !helperInfo.inputs) return
+
+          const objArg = node.arguments[0]
+          if (!objArg || objArg.type !== 'ObjectExpression') return
+
+          for (const prop of objArg.properties) {
+            if (prop.type !== 'Property' || !prop.key) continue
+
+            const inputName =
+              prop.key.type === 'Identifier'
+                ? prop.key.name
+                : prop.key.type === 'Literal'
+                  ? prop.key.value
+                  : null
+
+            if (!inputName) continue
+
+            const keyStart = prop.key.start
+            const keyEnd = prop.key.end
+
+            if (offset >= keyStart && offset <= keyEnd) {
+              const inputInfo = helperInfo.inputs[inputName]
+              if (inputInfo?.line) {
+                const uri = `file://${helperInfo.path}`
+                result = lsp.LocationLink.create(
+                  uri,
+                  lsp.Range.create(
+                    inputInfo.line - 1,
+                    0,
+                    inputInfo.line - 1,
+                    0
+                  ),
+                  lsp.Range.create(
+                    inputInfo.line - 1,
+                    0,
+                    inputInfo.line - 1,
+                    0
+                  ),
+                  lsp.Range.create(
+                    document.positionAt(keyStart),
+                    document.positionAt(keyEnd)
+                  )
+                )
+                return
+              }
+            }
+          }
+        }
+      }
+    })
+
+    return result
+  } catch (error) {
+    return null
+  }
+}
+
+function extractHelperPath(node) {
+  const segments = []
+  let current = node
+
+  while (current && current.type === 'MemberExpression') {
+    if (current.property && current.property.type === 'Identifier') {
+      const propName = current.property.name
+      if (propName === 'helpers') {
+        if (
+          current.object &&
+          current.object.type === 'Identifier' &&
+          current.object.name === 'sails'
+        ) {
+          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
+}

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/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,7 +105,9 @@ connection.onDefinition(async (params) => {
     pageDefinition,
     policyDefinition,
     helperDefinition,
-    modelDefinition
+    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.4.0",
+  "version": "0.5.1",
   "description": "Language Server Protocol server for Sails Language Service",
   "homepage": "https://sailjs.com",
   "repository": {

package/validators/validate-model-attribute-exist.js

@@ -61,6 +61,14 @@ function validateCriteriaAttributes(
             )
           }
         }
+      } else if (prop.value && prop.value.type === 'ObjectExpression') {
+        validateCriteriaAttributes(
+          prop.value,
+          model,
+          document,
+          diagnostics,
+          effectiveModelName
+        )
       }
       continue
     }
@@ -455,6 +463,23 @@ module.exports = function validateModelAttributeExist(document, typeMap) {
                     effectiveModelName
                   )
                   continue
+                } else if (
+                  WATERLINE_MODIFIERS.includes(attribute) &&
+                  prop.value &&
+                  prop.value.type === 'ArrayExpression'
+                ) {
+                  for (const el of prop.value.elements) {
+                    if (el && el.type === 'ObjectExpression') {
+                      validateCriteriaAttributes(
+                        el,
+                        model,
+                        document,
+                        diagnostics,
+                        effectiveModelName
+                      )
+                    }
+                  }
+                  continue
                 }
                 if (
                   (attribute === 'select' || attribute === 'omit') &&

package/validators/validate-model-exist.js

@@ -8,16 +8,18 @@ const lsp = require('vscode-languageserver/node')
 module.exports = function validateModelExist(document, typeMap) {
   const diagnostics = []
   const text = document.getText()
-  // Build a lowercased model map for robust case-insensitive lookup
-  const modelMap = {}
-  if (typeMap.models) {
-    for (const key of Object.keys(typeMap.models)) {
-      modelMap[key.toLowerCase()] = typeMap.models[key]
-    }
+  const models = typeMap.models || {}
+  const lowercasedModelMap = {}
+  for (const key of Object.keys(models)) {
+    lowercasedModelMap[key.toLowerCase()] = models[key]
   }
   function modelExists(name) {
     if (!name) return false
-    return !!modelMap[name.toLowerCase()]
+    return !!models[name]
+  }
+  function modelExistsLowercased(name) {
+    if (!name) return false
+    return !!lowercasedModelMap[name.toLowerCase()]
   }
 
   const knownGlobals = [
@@ -30,9 +32,9 @@ module.exports = function validateModelExist(document, typeMap) {
     'process'
   ]
 
-  // User.find() or User.create() etc
+  // User.find() or User.create() etc (only PascalCase identifiers)
   const modelCallRegex =
-    /\b([A-Za-z0-9_]+)\s*\.(?:find|findOne|create|createEach|update|destroy|count|sum|where|findOrCreate)\s*\(/g
+    /\b([A-Z][A-Za-z0-9_]*)\s*\.(?:find|findOne|create|createEach|update|destroy|count|sum|where|findOrCreate)\s*\(/g
   let match
   while ((match = modelCallRegex.exec(text)) !== null) {
     const modelName = match[1]
@@ -58,7 +60,7 @@ module.exports = function validateModelExist(document, typeMap) {
     /sails\.models\.([A-Za-z0-9_]+)\s*\.(?:find|findOne|create|createEach|update|destroy|count|sum|where|findOrCreate)\s*\(/g
   while ((match = sailsModelCallRegex.exec(text)) !== null) {
     const modelName = match[1]
-    if (!modelExists(modelName)) {
+    if (!modelExistsLowercased(modelName)) {
       diagnostics.push(
         lsp.Diagnostic.create(
           lsp.Range.create(

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

@@ -49,9 +49,10 @@ module.exports = function validateRequiredHelperInput(document, typeMap) {
           for (const [inputKey, inputDef] of Object.entries(
             helperInfo.inputs
           )) {
+            const requiredValue =
+              inputDef?.value?.required?.value ?? inputDef?.required
             const isRequired =
-              inputDef &&
-              (inputDef.required === true || inputDef.required === 'true')
+              requiredValue === true || requiredValue === 'true'
             if (isRequired && !providedKeys.has(inputKey)) {
               diagnostics.push(
                 lsp.Diagnostic.create(