Merge pull request #120 from cucumber/rvramesh-javascript-support

Rvramesh javascript support

Author: aslakhellesoy

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Added support for JavaScript - [#42](https://github.com/cucumber/language-service/issues/42), [#115](https://github.com/cucumber/language-service/pull/115), [#120](https://github.com/cucumber/language-service/pull/120)
 
 ## [1.3.0] - 2022-11-28
 ### Added

README.md

@@ -15,7 +15,7 @@ and [Cucumber Monaco](https://github.com/cucumber/monaco#readme).
   - [x] PHP
   - [x] Ruby
   - [x] Rust
-  - [ ] [JavaScript](https://github.com/cucumber/language-service/issues/42)
+  - [x] JavaScript
   - [ ] [Python](https://github.com/cucumber/language-service/issues/49)
 - [x] Go to step definition
 - [x] Generate step definition

src/language/javascriptLanguage.ts

@@ -0,0 +1,11 @@
+import { tsxLanguage } from './tsxLanguage.js'
+import { Language } from './types.js'
+
+export const javascriptLanguage: Language = {
+  ...tsxLanguage,
+  defaultSnippetTemplate: `
+{{ keyword }}('{{ expression }}', ({{ #parameters }}{{ #seenParameter }}, {{ /seenParameter }}{{ name }}{{ /parameters }}) => {
+  // {{ blurb }}
+})
+`,
+}

src/language/languages.ts

@@ -1,5 +1,6 @@
 import { csharpLanguage } from './csharpLanguage.js'
 import { javaLanguage } from './javaLanguage.js'
+import { javascriptLanguage } from './javascriptLanguage.js'
 import { phpLanguage } from './phpLanguage.js'
 import { pythonLanguage } from './pythonLanguage.js'
 import { rubyLanguage } from './rubyLanguage.js'
@@ -15,6 +16,7 @@ const languageByName: Record<LanguageName, Language> = {
   ruby: rubyLanguage,
   rust: rustLanguage,
   python: pythonLanguage,
+  javascript: javascriptLanguage,
 }
 
 export function getLanguage(languageName: LanguageName): Language {

src/language/tsxLanguage.ts

@@ -1,5 +1,5 @@
 import { StringOrRegExp } from '@cucumber/cucumber-expressions'
-import { RegExps } from '@cucumber/cucumber-expressions/dist/cjs/src/ParameterType'
+import { RegExps } from '@cucumber/cucumber-expressions'
 
 import { childrenToString, filter, NO_QUOTES } from './helpers.js'
 import { NO_EXPRESSION } from './SourceAnalyzer.js'

src/language/types.ts

@@ -35,7 +35,16 @@ export type SnippetParameters = Readonly<Record<ParameterTypeName, SnippetParame
 
 export type ParameterTypeMeta = Readonly<{ name: string; regexp: string }>
 
-export const LanguageNames = ['java', 'tsx', 'c_sharp', 'php', 'python', 'ruby', 'rust'] as const
+export const LanguageNames = [
+  'java',
+  'tsx',
+  'c_sharp',
+  'php',
+  'python',
+  'ruby',
+  'rust',
+  'javascript',
+] as const
 export type LanguageName = typeof LanguageNames[number]
 
 export type Source<L> = Readonly<{

src/tree-sitter-node/NodeParserAdapter.ts

@@ -30,6 +30,7 @@ export class NodeParserAdapter implements ParserAdapter {
         this.parser.setLanguage(Java)
         break
       case 'tsx':
+      case 'javascript':
         this.parser.setLanguage(TypeScript.typescript)
         break
       case 'c_sharp':

src/tree-sitter-wasm/WasmParserAdapter.ts

@@ -14,7 +14,16 @@ export class WasmParserAdapter implements ParserAdapter {
 
     const languages = await Promise.all(
       LanguageNames.map((languageName) => {
-        const wasmUrl = `${this.wasmBaseUrl}/${languageName}.wasm`
+        let wasmName: LanguageName
+        switch (languageName) {
+          case 'javascript':
+            wasmName = 'tsx'
+            break
+          default:
+            wasmName = languageName
+        }
+
+        const wasmUrl = `${this.wasmBaseUrl}/${wasmName}.wasm`
         try {
           return WasmParser.Language.load(wasmUrl)
         } catch (err) {

test/language/ExpressionBuilder.test.ts

@@ -13,6 +13,7 @@ import { WasmParserAdapter } from '../../src/tree-sitter-wasm/WasmParserAdapter.
 const cucumberExpressionsSupport: Set<LanguageName> = new Set([
   'c_sharp',
   'java',
+  'javascript',
   'python',
   'ruby',
   'rust',
@@ -73,7 +74,6 @@ function defineContract(makeParserAdapter: () => ParserAdapter) {
             link.targetSelectionRange.end.character <= link.targetRange.end.character
         )
       }
-
       const expressions = result.expressionLinks.map(({ expression }) =>
         expression instanceof CucumberExpression
           ? expression.source

test/language/testdata/javascript/ParameterTypes.js

@@ -0,0 +1,19 @@
+import { defineParameterType } from '@cucumber/cucumber'
+
+defineParameterType({
+  name: 'planet',
+  regexp: [/jupiter/, /mars/, /tellus/],
+  transformer: (name) => name,
+})
+
+defineParameterType({
+  name: 'uuid',
+  regexp: /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/,
+  transformer: (uuid) => uuid,
+})
+
+defineParameterType({
+  name: 'date',
+  regexp: /\d{4}-\d{2}-\d{2}/,
+  transformer: (name) => new Date(name),
+})