Merge pull request #13 from constewart9/conorstw/types-NEW

Conorstw/types new

Author: constewart9

.github/workflows/types-codegen-pr.yaml

@@ -0,0 +1,55 @@
+name: Chat Types PR Validation
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'types/codegen/schema/chatTypes.json'
+  workflow_dispatch:
+
+jobs:
+  validate-pr:
+    name: Validate PR with chatTypes.json changes
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          #should we cache: 'npm'
+
+      # - name: Install root dependencies
+      #   working-directory: .
+      #   run: npm install
+        
+      - name: Install codegen dependencies
+        working-directory: types/codegen
+        run: npm install
+
+      - name: Generate types
+        working-directory: types/codegen
+        run: npm run generate
+
+      - name: Build TypeScript
+        working-directory: types/codegen/generated/typescript
+        run: |
+          npm i
+          npm run build
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+          cache: 'maven'
+
+      - name: Build Java with Maven
+        working-directory: types/codegen/generated/java
+        run: |
+          # Install the LSP4J dependency before compiling
+          mvn dependency:get -Dartifact=org.eclipse.lsp4j:org.eclipse.lsp4j:0.22.0
+          mvn clean compile -Djava.version=21

chat-client-ui-types/package.json

@@ -18,6 +18,7 @@
     "author": "Amazon Web Services",
     "license": "Apache-2.0",
     "dependencies": {
-        "@aws/language-server-runtimes-types": "^0.1.56"
+        "@aws/language-server-runtimes-types": "^0.1.56",
+        "@local/language-server-runtimes-generated-types": "file:../types/codegen/generated/typescript"
     }
 }

chat-client-ui-types/src/uiContracts.ts

@@ -1,17 +1,16 @@
+import { OPEN_TAB_REQUEST_METHOD, GET_SERIALIZED_CHAT_REQUEST_METHOD } from '@aws/language-server-runtimes-types'
 import {
     InsertToCursorPositionParams,
     ChatOptions,
     CodeSelectionType,
     ReferenceTrackerInformation,
-    OPEN_TAB_REQUEST_METHOD,
     OpenTabResult,
-    GET_SERIALIZED_CHAT_REQUEST_METHOD,
     GetSerializedChatResult,
     ChatPrompt,
     OpenFileDialogParams,
     DropFilesParams,
-} from '@aws/language-server-runtimes-types'
-export { InsertToCursorPositionParams } from '@aws/language-server-runtimes-types'
+} from '@local/language-server-runtimes-generated-types'
+export { InsertToCursorPositionParams } from '@local/language-server-runtimes-generated-types'
 
 export type AuthFollowUpType = 'full-auth' | 're-auth' | 'missing_scopes' | 'use-supported-auth'
 export function isValidAuthFollowUpType(value: string): value is AuthFollowUpType {

package-lock.json

@@ -11,6 +11,7 @@
     ],
     "workspaces": [
         "types",
+        "types/codegen/generated/typescript",
         "runtimes",
         "chat-client-ui-types"
     ],
@@ -36,7 +37,8 @@
         "test": "npm run test --workspaces --if-present",
         "preversion": "npm run test",
         "version": "npm run compile && git add -A .",
-        "watch": "tsc --build --watch"
+        "watch": "tsc --build --watch",
+        "gen-comp": "cd ./types/codegen/ && npm run generate && cd ./generated/typescript && npm run build && cd ../../../ && npm run compile"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.8.1",

package.json

@@ -31,6 +31,7 @@
     },
     "dependencies": {
         "@aws/language-server-runtimes-types": "^0.1.56",
+        "@local/language-server-runtimes-generated-types": "file:../types/codegen/generated/typescript",
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/api-logs": "^0.200.0",
         "@opentelemetry/core": "^2.0.0",

runtimes/package.json

@@ -1,18 +1,4 @@
 import {
-    ChatParams,
-    ChatResult,
-    EndChatParams,
-    EndChatResult,
-    FeedbackParams,
-    FollowUpClickParams,
-    InfoLinkClickParams,
-    InsertToCursorPositionParams,
-    LinkClickParams,
-    QuickActionParams,
-    SourceLinkClickParams,
-    TabAddParams,
-    TabChangeParams,
-    TabRemoveParams,
     ProtocolNotificationType,
     ProtocolRequestType,
     CHAT_REQUEST_METHOD,
@@ -29,63 +15,77 @@ import {
     TAB_CHANGE_NOTIFICATION_METHOD,
     TAB_REMOVE_NOTIFICATION_METHOD,
     AutoParameterStructuresProtocolRequestType,
+    OPEN_TAB_REQUEST_METHOD,
+    CHAT_UPDATE_NOTIFICATION_METHOD,
+    FILE_CLICK_NOTIFICATION_METHOD,
+    INLINE_CHAT_REQUEST_METHOD,
+    CONTEXT_COMMAND_NOTIFICATION_METHOD,
+    CREATE_PROMPT_NOTIFICATION_METHOD,
+    INLINE_CHAT_RESULT_NOTIFICATION_METHOD,
+    PINNED_CONTEXT_NOTIFICATION_METHOD,
+    LIST_CONVERSATIONS_REQUEST_METHOD,
+    CONVERSATION_CLICK_REQUEST_METHOD,
+    GET_SERIALIZED_CHAT_REQUEST_METHOD,
+    TAB_BAR_ACTION_REQUEST_METHOD,
+    CHAT_OPTIONS_UPDATE_NOTIFICATION_METHOD,
+    PROMPT_INPUT_OPTION_CHANGE_METHOD,
+    BUTTON_CLICK_REQUEST_METHOD,
+    LIST_MCP_SERVERS_REQUEST_METHOD,
+    MCP_SERVER_CLICK_REQUEST_METHOD,
+    RULE_CLICK_REQUEST_METHOD,
+    LIST_RULES_REQUEST_METHOD,
+    PINNED_CONTEXT_ADD_NOTIFICATION_METHOD,
+    PINNED_CONTEXT_REMOVE_NOTIFICATION_METHOD,
+    ACTIVE_EDITOR_CHANGED_NOTIFICATION_METHOD,
+    OPEN_FILE_DIALOG_METHOD,
+    ChatParams,
+    ChatResult,
+    EndChatParams,
+    EndChatResult,
+    FeedbackParams,
+    FollowUpClickParams,
+    InfoLinkClickParams,
+    InsertToCursorPositionParams,
+    LinkClickParams,
+    QuickActionParams,
+    SourceLinkClickParams,
+    TabAddParams,
+    TabChangeParams,
+    TabRemoveParams,
     EncryptedChatParams,
     EncryptedQuickActionParams,
     QuickActionResult,
-    OPEN_TAB_REQUEST_METHOD,
     OpenTabParams,
     OpenTabResult,
-    CHAT_UPDATE_NOTIFICATION_METHOD,
-    FILE_CLICK_NOTIFICATION_METHOD,
     ChatUpdateParams,
     FileClickParams,
-    INLINE_CHAT_REQUEST_METHOD,
     InlineChatParams,
     InlineChatResult,
-    CONTEXT_COMMAND_NOTIFICATION_METHOD,
     ContextCommandParams,
-    CREATE_PROMPT_NOTIFICATION_METHOD,
     CreatePromptParams,
-    INLINE_CHAT_RESULT_NOTIFICATION_METHOD,
-    PINNED_CONTEXT_NOTIFICATION_METHOD,
     InlineChatResultParams,
     ListConversationsParams,
     ListConversationsResult,
-    LIST_CONVERSATIONS_REQUEST_METHOD,
     ConversationClickParams,
     ConversationClickResult,
-    CONVERSATION_CLICK_REQUEST_METHOD,
     GetSerializedChatParams,
     GetSerializedChatResult,
-    GET_SERIALIZED_CHAT_REQUEST_METHOD,
     TabBarActionParams,
     TabBarActionResult,
-    TAB_BAR_ACTION_REQUEST_METHOD,
     ChatOptionsUpdateParams,
-    CHAT_OPTIONS_UPDATE_NOTIFICATION_METHOD,
     PromptInputOptionChangeParams,
-    PROMPT_INPUT_OPTION_CHANGE_METHOD,
     ButtonClickParams,
     ButtonClickResult,
-    BUTTON_CLICK_REQUEST_METHOD,
     ListMcpServersParams,
     ListMcpServersResult,
-    LIST_MCP_SERVERS_REQUEST_METHOD,
+    ListRulesResult,
+    RuleClickResult,
+    PinnedContextParams,
     McpServerClickParams,
     McpServerClickResult,
-    MCP_SERVER_CLICK_REQUEST_METHOD,
     ListRulesParams,
     RuleClickParams,
-    RULE_CLICK_REQUEST_METHOD,
-    LIST_RULES_REQUEST_METHOD,
-    ListRulesResult,
-    RuleClickResult,
-    PinnedContextParams,
-    PINNED_CONTEXT_ADD_NOTIFICATION_METHOD,
-    PINNED_CONTEXT_REMOVE_NOTIFICATION_METHOD,
     ActiveEditorChangedParams,
-    ACTIVE_EDITOR_CHANGED_NOTIFICATION_METHOD,
-    OPEN_FILE_DIALOG_METHOD,
     OpenFileDialogParams,
     OpenFileDialogResult,
     LIST_AVAILABLE_MODELS_REQUEST_METHOD,

runtimes/protocol/chat.ts

@@ -12,10 +12,13 @@ import {
     RegistrationType,
     RequestType,
 } from 'vscode-languageserver-protocol'
-import { ChatOptions } from '@aws/language-server-runtimes-types'
+import { ChatOptions } from '@local/language-server-runtimes-generated-types'
 import { LogLevel } from '../runtimes/util/loggingUtil'
 
+//Changed so only METHODS are exported from ./chat
 export * from '@aws/language-server-runtimes-types'
+
+export * from '@local/language-server-runtimes-generated-types'
 export { TextDocument } from 'vscode-languageserver-textdocument'
 
 // LSP protocol is a core dependency for LSP feature provided by runtimes.

runtimes/protocol/lsp.ts

@@ -1,3 +1,6 @@
 LICENSE
 NOTICE
-SECURITY.md
+SECURITY.md
+codegen/scripts/**/*
+codegen/generated/**/*
+codegen/tests/fixtures/**/*

types/.gitignore

@@ -0,0 +1,14 @@
+# Generated code
+generated/
+
+# Template bank
+typescript-template-bank/
+
+# OpenAPI generator metadata
+.openapi-generator/
+
+# Node.js dependencies
+node_modules/
+
+# Build outputs
+dist/