@sailshq/language-server 0.5.2 → 0.6.0

package/SailsParser.js

@@ -1,3 +1,4 @@
+const fsSync = require('fs')
 const fs = require('fs').promises
 const path = require('path')
 const acorn = require('acorn')
@@ -110,12 +111,14 @@ class SailsParser {
       for (const { routePattern, actionName } of actionsToParse) {
         const filePath =
           path.join(actionsRoot, ...actionName.split('/')) + '.js'
-        const actionInfo = await this.#parseAction(filePath)
+        const exists = fsSync.existsSync(filePath)
+        const actionInfo = exists ? await this.#parseAction(filePath) : {}
 
         routes[routePattern] = {
           action: {
             name: actionName,
             path: filePath,
+            exists,
             ...actionInfo
           }
         }

package/code-actions/create-generator.js

@@ -0,0 +1,65 @@
+const lsp = require('vscode-languageserver/node')
+
+const COMMAND_TIMEOUT = 30000
+
+module.exports = function createGenerator({
+  type,
+  diagnosticCode,
+  dataKey,
+  validationRegex
+}) {
+  function isValid(name) {
+    return name && validationRegex.test(name)
+  }
+
+  return {
+    diagnosticCode,
+    command: `sails.generate${type.charAt(0).toUpperCase() + type.slice(1)}`,
+
+    createCodeAction(diagnostic) {
+      const name = diagnostic.data?.[dataKey]
+      if (!isValid(name)) return null
+
+      return {
+        title: `Generate ${type} '${name}'`,
+        kind: lsp.CodeActionKind.QuickFix,
+        diagnostics: [diagnostic],
+        isPreferred: true,
+        command: {
+          title: `Generate ${type} '${name}'`,
+          command: this.command,
+          arguments: [name]
+        }
+      }
+    },
+
+    async executeCommand(args, { rootDir, execAsync, connection }) {
+      const name = args[0]
+      if (!isValid(name)) return
+
+      if (!rootDir) {
+        connection.window.showErrorMessage(
+          `Cannot generate ${type}: workspace root not found.`
+        )
+        return
+      }
+
+      try {
+        connection.window.showInformationMessage(
+          `Generating ${type} '${name}'...`
+        )
+        await execAsync(`npx sails generate ${type} ${name}`, {
+          cwd: rootDir,
+          timeout: COMMAND_TIMEOUT
+        })
+        connection.window.showInformationMessage(
+          `${type.charAt(0).toUpperCase() + type.slice(1)} '${name}' generated successfully.`
+        )
+      } catch (error) {
+        connection.window.showErrorMessage(
+          `Failed to generate ${type}: ${error.message}`
+        )
+      }
+    }
+  }
+}

package/code-actions/generate-action.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'action',
+  diagnosticCode: 'action-not-found',
+  dataKey: 'actionName',
+  validationRegex: /^[a-zA-Z0-9/_-]+$/
+})

package/code-actions/generate-adapter.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'adapter',
+  diagnosticCode: null,
+  dataKey: null,
+  validationRegex: /^[a-zA-Z0-9_-]+$/
+})

package/code-actions/generate-helper.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'helper',
+  diagnosticCode: null, // No diagnostic triggers this - manual command only
+  dataKey: null,
+  validationRegex: /^[a-zA-Z0-9/_-]+$/
+})

package/code-actions/generate-hook.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'hook',
+  diagnosticCode: null, // No diagnostic triggers this - manual command only
+  dataKey: null,
+  validationRegex: /^[a-zA-Z0-9_-]+$/
+})

package/code-actions/generate-model.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'model',
+  diagnosticCode: 'model-not-found',
+  dataKey: 'modelName',
+  validationRegex: /^[A-Za-z0-9_]+$/
+})

package/code-actions/generate-response.js

@@ -0,0 +1,8 @@
+const createGenerator = require('./create-generator')
+
+module.exports = createGenerator({
+  type: 'response',
+  diagnosticCode: null,
+  dataKey: null,
+  validationRegex: /^[a-zA-Z0-9_-]+$/
+})

package/code-actions/index.js

@@ -0,0 +1,33 @@
+const handlers = [
+  require('./generate-action'),
+  require('./generate-model'),
+  require('./generate-helper'),
+  require('./generate-hook'),
+  require('./generate-response'),
+  require('./generate-adapter')
+]
+
+module.exports = {
+  getCommands() {
+    return handlers.map((h) => h.command)
+  },
+
+  getCodeActions(params) {
+    const actions = []
+    for (const diagnostic of params.context.diagnostics) {
+      const handler = handlers.find((h) => h.diagnosticCode === diagnostic.code)
+      if (handler) {
+        const action = handler.createCodeAction(diagnostic)
+        if (action) actions.push(action)
+      }
+    }
+    return actions
+  },
+
+  async executeCommand(params, context) {
+    const handler = handlers.find((h) => h.command === params.command)
+    if (handler) {
+      await handler.executeCommand(params.arguments, context)
+    }
+  }
+}

package/index.js

@@ -1,10 +1,16 @@
 const lsp = require('vscode-languageserver/node')
 const TextDocument = require('vscode-languageserver-textdocument').TextDocument
+const { exec } = require('child_process')
+const { promisify } = require('util')
+const execAsync = promisify(exec)
 const SailsParser = require('./SailsParser')
 
 // Validators
 const validateDocument = require('./validators/validate-document')
 
+// Code Actions
+const codeActions = require('./code-actions')
+
 // Go-to definitions
 const goToAction = require('./go-to-definitions/go-to-action')
 const goToView = require('./go-to-definitions/go-to-view')
@@ -50,11 +56,49 @@ connection.onInitialize(async (params) => {
       definitionProvider: true,
       completionProvider: {
         triggerCharacters: ['"', "'", '.', '{', ',', ' ', '\n']
+      },
+      codeActionProvider: {
+        codeActionKinds: [lsp.CodeActionKind.QuickFix]
+      },
+      executeCommandProvider: {
+        commands: codeActions.getCommands()
       }
     }
   }
 })
 
+connection.onInitialized(() => {
+  // Register for file create/delete notifications in api/ and config/ directories
+  connection.client.register(lsp.DidChangeWatchedFilesNotification.type, {
+    watchers: [
+      { globPattern: '**/api/**/*.js' },
+      { globPattern: '**/api/**/*.ejs' },
+      { globPattern: '**/config/**/*.js' },
+      { globPattern: '**/views/**/*.ejs' },
+      { globPattern: '**/assets/js/pages/**/*.{vue,js,ts,jsx,tsx,svelte,html}' }
+    ]
+  })
+})
+
+connection.onDidChangeWatchedFiles(async (params) => {
+  // Check if any relevant files were created or deleted
+  const hasRelevantChange = params.changes.some(
+    (change) =>
+      change.type === lsp.FileChangeType.Created ||
+      change.type === lsp.FileChangeType.Deleted
+  )
+
+  if (hasRelevantChange) {
+    typeMap = await sailsParser.buildTypeMap()
+    connection.console.log('Type map updated due to file create/delete.')
+
+    // Re-validate all open documents
+    for (const document of documents.all()) {
+      validateDocument(connection, document, typeMap)
+    }
+  }
+})
+
 documents.onDidOpen((open) => {
   if (typeMap) {
     validateDocument(connection, open.document, typeMap)
@@ -170,6 +214,16 @@ connection.onCompletion(async (params) => {
   return null
 })
 
+connection.onCodeAction((params) => codeActions.getCodeActions(params))
+
+connection.onExecuteCommand(async (params) => {
+  await codeActions.executeCommand(params, {
+    rootDir: sailsParser.rootDir,
+    execAsync,
+    connection
+  })
+})
+
 documents.listen(connection)
 connection.listen()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailshq/language-server",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Language Server Protocol server for Sails Language Service",
   "homepage": "https://sailjs.com",
   "repository": {
@@ -27,8 +27,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "devDependencies": {
-    "@sailshq/language-server": "^0.2.1"
   }
 }

package/validators/validate-action-exist.js

@@ -5,24 +5,30 @@ const walk = require('acorn-walk')
 module.exports = function validateActionExist(document, typeMap) {
   const diagnostics = []
 
-  if (!document.uri.endsWith('routes.js')) return diagnostics
+  if (!document.uri.endsWith('config/routes.js')) return diagnostics
+
   const actions = extractActionInfo(document)
 
   for (const { action, range } of actions) {
     if (isUrlOrRedirect(action)) continue
-    const routeExists = Object.values(typeMap.routes || {}).some(
+
+    // Find any route entry that references this action and check if it exists
+    const routeEntry = Object.values(typeMap.routes || {}).find(
       (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'
-        )
+    // Action exists if we found a route entry with exists: true
+    // If no route entry found, the action was just added and typeMap is stale,
+    // so we need to check exists flag which was set when typeMap was built
+    if (routeEntry && routeEntry.action?.exists === false) {
+      const diagnostic = lsp.Diagnostic.create(
+        range,
+        `'${action}' action does not exist. Please check the name or create it.`,
+        lsp.DiagnosticSeverity.Error,
+        'action-not-found'
       )
+      diagnostic.data = { actionName: action }
+      diagnostics.push(diagnostic)
     }
   }
   return diagnostics

package/validators/validate-model-exist.js

@@ -49,17 +49,17 @@ module.exports = function validateModelExist(document, typeMap) {
       continue
     }
     if (!modelExists(modelName)) {
-      diagnostics.push(
-        lsp.Diagnostic.create(
-          lsp.Range.create(
-            document.positionAt(match.index),
-            document.positionAt(match.index + modelName.length)
-          ),
-          `Model '${modelName}' not found. Make sure it exists under your api/models directory.`,
-          lsp.DiagnosticSeverity.Error,
-          'sails-lsp'
-        )
+      const diagnostic = lsp.Diagnostic.create(
+        lsp.Range.create(
+          document.positionAt(match.index),
+          document.positionAt(match.index + modelName.length)
+        ),
+        `Model '${modelName}' not found. Make sure it exists under your api/models directory.`,
+        lsp.DiagnosticSeverity.Error,
+        'model-not-found'
       )
+      diagnostic.data = { modelName }
+      diagnostics.push(diagnostic)
     }
   }
   // sails.models.user.find() or sails.models.User.find()
@@ -68,19 +68,19 @@ module.exports = function validateModelExist(document, typeMap) {
   while ((match = sailsModelCallRegex.exec(text)) !== null) {
     const modelName = match[1]
     if (!modelExistsLowercased(modelName)) {
-      diagnostics.push(
-        lsp.Diagnostic.create(
-          lsp.Range.create(
-            document.positionAt(match.index + 'sails.models.'.length),
-            document.positionAt(
-              match.index + 'sails.models.'.length + modelName.length
-            )
-          ),
-          `Model '${modelName}' does not exist in this Sails project.`,
-          lsp.DiagnosticSeverity.Error,
-          'sails-lsp'
-        )
+      const diagnostic = lsp.Diagnostic.create(
+        lsp.Range.create(
+          document.positionAt(match.index + 'sails.models.'.length),
+          document.positionAt(
+            match.index + 'sails.models.'.length + modelName.length
+          )
+        ),
+        `Model '${modelName}' does not exist in this Sails project.`,
+        lsp.DiagnosticSeverity.Error,
+        'model-not-found'
       )
+      diagnostic.data = { modelName }
+      diagnostics.push(diagnostic)
     }
   }
   return diagnostics