Merge pull request #604 from bash-lsp/zod-install

Fix missing zod install + add more shebang support

Author: skovhus

server/package.json

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "publisher": "mads-hartmann",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
@@ -25,7 +25,8 @@
     "urijs": "1.19.11",
     "vscode-languageserver": "8.0.2",
     "vscode-languageserver-textdocument": "1.0.7",
-    "web-tree-sitter": "0.20.7"
+    "web-tree-sitter": "0.20.7",
+    "zod": "3.19.1"
   },
   "scripts": {
     "prepublishOnly": "cd ../ && yarn run compile"

server/src/util/__tests__/shebang.test.ts

@@ -21,11 +21,14 @@ describe('analyzeShebang', () => {
 
   test.each([
     ['#!/bin/sh -', 'sh'],
-    ['#!/usr/bin/env bash', 'bash'],
     ['#!/bin/sh', 'sh'],
+    ['#!/bin/env sh', 'sh'],
+    ['#!/usr/bin/env bash', 'bash'],
+    ['#!/bin/env bash', 'bash'],
     ['#!/bin/bash', 'bash'],
     ['#!/bin/bash -u', 'bash'],
     ['#! /bin/bash', 'bash'],
+    ['#! /bin/dash', 'dash'],
     ['#!/usr/bin/bash', 'bash'],
   ])('returns a bash dialect for %p', (command, expectedDialect) => {
     expect(analyzeShebang(command).shellDialect).toBe(expectedDialect)

server/src/util/shebang.ts

@@ -1,8 +1,8 @@
 const SHEBANG_REGEXP = /^#!(.*)/
+const SHELL_REGEXP = /bin[/](?:env )?(\w+)/
 
-// TODO: at some point we could let this return all known shells (like dash, ksh, etc)
-// and make the call side decide what to support.
-type SupportedBashDialect = 'bash' | 'sh'
+const BASH_DIALECTS = ['sh', 'bash', 'dash', 'ksh'] as const
+type SupportedBashDialect = typeof BASH_DIALECTS[number]
 
 export function getShebang(fileContent: string): string | null {
   const match = SHEBANG_REGEXP.exec(fileContent)
@@ -14,16 +14,12 @@ export function getShebang(fileContent: string): string | null {
 }
 
 export function getShellDialect(shebang: string): SupportedBashDialect | null {
-  if (shebang.startsWith('/bin/sh') || shebang.startsWith('/usr/bin/env sh')) {
-    return 'sh'
-  }
-
-  if (
-    shebang.startsWith('/bin/bash') ||
-    shebang.startsWith('/usr/bin/bash') ||
-    shebang.startsWith('/usr/bin/env bash')
-  ) {
-    return 'bash'
+  const match = SHELL_REGEXP.exec(shebang)
+  if (match && match[1]) {
+    const bashDialect = match[1].trim() as any
+    if (BASH_DIALECTS.includes(bashDialect)) {
+      return bashDialect
+    }
   }
 
   return null

server/yarn.lock

@@ -268,3 +268,8 @@ whatwg-url@^5.0.0:
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
+
+zod@3.19.1:
+  version "3.19.1"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.19.1.tgz#112f074a97b50bfc4772d4ad1576814bd8ac4473"
+  integrity sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==