@aws/lsp-codewhisperer 0.0.3 → 0.0.5

package/out/language-server/languageDetection.js

@@ -1,35 +1,92 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSupportedLanguageId = void 0;
+exports.getLanguageId = exports.getSupportedLanguageId = exports.qLanguageIdByDocumentLanguageId = exports.languageByExtension = exports.supportedSecurityScanLanguages = void 0;
 // This will be extended as more language features
 // are integrated into the language server and clients.
 // See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.18/specification/#textDocumentItem
-const supportedFileTypes = ['c', 'cpp', 'csharp', 'javascript', 'python', 'typescript'];
-const supportedExtensions = {
+const supportedFileTypes = [
+    'c',
+    'cpp',
+    'csharp',
+    'java',
+    'javascript',
+    'jsx',
+    'python',
+    'typescript',
+    'json',
+    'yaml',
+];
+exports.supportedSecurityScanLanguages = ['csharp'];
+exports.languageByExtension = {
     '.c': 'c',
-    '.h': 'c',
     '.cpp': 'cpp',
-    '.hpp': 'cpp',
     '.cs': 'csharp',
+    '.h': 'c',
+    '.hpp': 'cpp',
+    '.go': 'go',
+    '.kt': 'kotlin',
+    '.kts': 'kotlin',
+    '.java': 'java',
     '.js': 'javascript',
+    '.json': 'json',
+    '.jsx': 'jsx',
+    '.php': 'php',
     '.py': 'python',
+    '.rb': 'ruby',
+    '.rs': 'rust',
+    '.sc': 'scala',
+    '.scala': 'scala',
+    '.sh': 'shell',
+    '.sql': 'sql',
+    '.tf': 'tf',
     '.ts': 'typescript',
+    '.tsx': 'tsx',
+    '.vue': 'vue',
+    '.yaml': 'yaml',
+    '.yml': 'yaml',
+};
+// some are exact match and some like javascriptreact and shellscript are not
+exports.qLanguageIdByDocumentLanguageId = {
+    c: 'c',
+    cpp: 'cpp',
+    csharp: 'csharp',
+    go: 'go',
+    java: 'java',
+    javascript: 'javascript',
+    javascriptreact: 'jsx',
+    json: 'json',
+    jsx: 'jsx',
+    kotlin: 'kotlin',
+    php: 'php',
+    python: 'python',
+    ruby: 'ruby',
+    rust: 'rust',
+    scala: 'scala',
+    shell: 'shell',
+    shellscript: 'shell',
+    sql: 'sql',
+    tf: 'tf',
+    typescript: 'typescript',
+    typescriptreact: 'tsx',
+    vue: 'vue',
+    yaml: 'yaml',
 };
-const getSupportedLanguageId = (textDocument) => {
+const getSupportedLanguageId = (textDocument, supportedLanguageIds = supportedFileTypes) => {
     if (!textDocument) {
         return;
     }
-    const languageId = getCodeWhispererLanguageIdByTextDocumentLanguageId(textDocument.languageId);
-    if (languageId !== undefined) {
-        return languageId;
-    }
-    for (const extension in supportedExtensions) {
-        if (textDocument.uri.endsWith(extension)) {
-            return supportedExtensions[extension];
-        }
-    }
+    const languageId = (0, exports.getLanguageId)(textDocument);
+    return languageId && supportedLanguageIds.includes(languageId) ? languageId : undefined;
 };
 exports.getSupportedLanguageId = getSupportedLanguageId;
+const getLanguageId = (textDocument) => {
+    if (!textDocument) {
+        return undefined;
+    }
+    return (getCodeWhispererLanguageIdByTextDocumentLanguageId(textDocument.languageId) ||
+        getCodeWhispererLanguageIdByExtension(textDocument));
+};
+exports.getLanguageId = getLanguageId;
 /**
  * Used to map different IDE values for TextDocument languageIds to CodeWhisperer languageIds.
  * Examples of the CodeWhisperer defined language ids can be found in service-2.json, near "ProgrammingLanguageLanguageNameString"
@@ -40,15 +97,23 @@ function getCodeWhispererLanguageIdByTextDocumentLanguageId(textDocumentLanguage
     if (textDocumentLanguageId === undefined) {
         return undefined;
     }
-    if (supportedFileTypes.includes(textDocumentLanguageId)) {
-        return textDocumentLanguageId;
+    else if (exports.qLanguageIdByDocumentLanguageId[textDocumentLanguageId]) {
+        return exports.qLanguageIdByDocumentLanguageId[textDocumentLanguageId];
     }
     // IDEs can identify a file's languageId using non-standardized values
     // Eg: 'CSHARP', 'CSharp' => 'csharp'
     // Try to map case-insensitive matches to increase the likelihood of supporting the file in an IDE.
-    for (const supportedFileType of supportedFileTypes) {
-        if (textDocumentLanguageId.toLowerCase() === supportedFileType.toLowerCase()) {
-            return supportedFileType;
+    for (const [languageId, cwprLanguageId] of Object.entries(exports.qLanguageIdByDocumentLanguageId)) {
+        if (textDocumentLanguageId.toLowerCase() === languageId.toLowerCase()) {
+            return cwprLanguageId;
+        }
+    }
+    return undefined;
+}
+function getCodeWhispererLanguageIdByExtension(textDocument) {
+    for (const [extension, languageId] of Object.entries(exports.languageByExtension)) {
+        if (textDocument.uri.endsWith(extension)) {
+            return languageId;
         }
     }
     return undefined;

package/out/language-server/languageDetection.js.map

@@ -1 +1 @@
-{"version":3,"file":"languageDetection.js","sourceRoot":"","sources":["../../src/language-server/languageDetection.ts"],"names":[],"mappings":";;;AAwBA,kDAAkD;AAClD,uDAAuD;AACvD,oHAAoH;AACpH,MAAM,kBAAkB,GAA4B,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;AAChH,MAAM,mBAAmB,GAA6C;IAClE,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE,YAAY;CACtB,CAAA;AAEM,MAAM,sBAAsB,GAAG,CAAC,YAAsC,EAAqC,EAAE;IAChH,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAM;IACV,CAAC;IAED,MAAM,UAAU,GAAG,kDAAkD,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IAC9F,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE,CAAC;QAC1C,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACvC,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAA;QACzC,CAAC;IACL,CAAC;AACL,CAAC,CAAA;AAfY,QAAA,sBAAsB,0BAelC;AAED;;;;;GAKG;AACH,SAAS,kDAAkD,CACvD,sBAAsD;IAEtD,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,IAAI,kBAAkB,CAAC,QAAQ,CAAC,sBAA+C,CAAC,EAAE,CAAC;QAC/E,OAAO,sBAA+C,CAAA;IAC1D,CAAC;IAED,sEAAsE;IACtE,qCAAqC;IACrC,mGAAmG;IACnG,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;QACjD,IAAI,sBAAsB,CAAC,WAAW,EAAE,KAAK,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC;YAC3E,OAAO,iBAA0C,CAAA;QACrD,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAA;AACpB,CAAC"}
+{"version":3,"file":"languageDetection.js","sourceRoot":"","sources":["../../src/language-server/languageDetection.ts"],"names":[],"mappings":"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"}

package/out/language-server/languageDetection.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/language-server/languageDetection.test.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = require("assert");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const languageDetection_1 = require("./languageDetection");
+describe('LanguageDetection', () => {
+    describe('getLanguageId', () => {
+        it('matches all document language ids that are defined in qLanguageIdByDocumentId', () => {
+            for (const [documentLanguageId, qLanguageId] of Object.entries(languageDetection_1.qLanguageIdByDocumentLanguageId)) {
+                assert.strictEqual((0, languageDetection_1.getLanguageId)(vscode_languageserver_textdocument_1.TextDocument.create(`test://test.xxx`, documentLanguageId, 1, '')), qLanguageId);
+            }
+        });
+        it('able to match language ids regardless of casing', () => {
+            assert.strictEqual((0, languageDetection_1.getLanguageId)(vscode_languageserver_textdocument_1.TextDocument.create(`test://test.xxx`, 'CSHarp', 1, '')), 'csharp');
+            assert.strictEqual((0, languageDetection_1.getLanguageId)(vscode_languageserver_textdocument_1.TextDocument.create(`test://test.xxx`, 'TyPeScRipT', 1, '')), 'typescript');
+        });
+        it(`fallbacks to extension check if document's languageId does not exist`, () => {
+            for (const [extension, languageId] of Object.entries(languageDetection_1.languageByExtension)) {
+                assert.strictEqual((0, languageDetection_1.getLanguageId)(vscode_languageserver_textdocument_1.TextDocument.create(`test://test.${extension}`, undefined, 1, '')), languageId);
+            }
+        });
+    });
+    describe('getSupportedLanguageId', () => {
+        const typescriptDocument = vscode_languageserver_textdocument_1.TextDocument.create('test://test.ts', 'typescript', 1, '');
+        it('should return language id if it is in the list of supported languages', () => {
+            assert.ok((0, languageDetection_1.getSupportedLanguageId)(typescriptDocument, ['typescript', 'javascript']));
+            assert.ok(!(0, languageDetection_1.getSupportedLanguageId)(typescriptDocument, ['javascript']));
+        });
+    });
+});
+//# sourceMappingURL=languageDetection.test.js.map

package/out/language-server/languageDetection.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"languageDetection.test.js","sourceRoot":"","sources":["../../src/language-server/languageDetection.test.ts"],"names":[],"mappings":";;AAAA,iCAAgC;AAChC,2FAAiE;AACjE,2DAK4B;AAE5B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACrF,KAAK,MAAM,CAAC,kBAAkB,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mDAA+B,CAAC,EAAE,CAAC;gBAC9F,MAAM,CAAC,WAAW,CACd,IAAA,iCAAa,EAAC,iDAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAChF,WAAW,CACd,CAAA;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACvD,MAAM,CAAC,WAAW,CAAC,IAAA,iCAAa,EAAC,iDAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACpG,MAAM,CAAC,WAAW,CAAC,IAAA,iCAAa,EAAC,iDAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QAChH,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;YAC5E,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uCAAmB,CAAC,EAAE,CAAC;gBACxE,MAAM,CAAC,WAAW,CACd,IAAA,iCAAa,EAAC,iDAAY,CAAC,MAAM,CAAC,eAAe,SAAS,EAAE,EAAE,SAAgB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EACvF,UAAU,CACb,CAAA;YACL,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACpC,MAAM,kBAAkB,GAAG,iDAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QACrF,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC7E,MAAM,CAAC,EAAE,CAAC,IAAA,0CAAsB,EAAC,kBAAkB,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;YACnF,MAAM,CAAC,EAAE,CAAC,CAAC,IAAA,0CAAsB,EAAC,kBAAkB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAC1E,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/out/language-server/netTransformServer.d.ts

@@ -0,0 +1,12 @@
+import { Server, CredentialsProvider } from '@aws/language-server-runtimes/server-interface';
+import { CodeWhispererServiceToken } from './codeWhispererService';
+/**
+ *
+ * @param createService Inject service instance based on credentials provider.
+ * @returns  NetTransform server
+ */
+export declare const NetTransformServerFactory: (createService: (credentialsProvider: CredentialsProvider) => CodeWhispererServiceToken) => Server;
+/**
+ * Default NetTransformServer using Token authentication.
+ */
+export declare const NetTransformServer: Server;

package/out/language-server/netTransformServer.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetTransformServer = exports.NetTransformServerFactory = void 0;
+const codeWhispererService_1 = require("./codeWhispererService");
+/**
+ *
+ * @param createService Inject service instance based on credentials provider.
+ * @returns  NetTransform server
+ */
+const NetTransformServerFactory = createService => ({ credentialsProvider, lsp, workspace, telemetry, logging }) => {
+    const service = createService(credentialsProvider);
+    const onExecuteCommandHandler = async (params, _token) => {
+        //Placeholder for logic
+    };
+    // Do the thing
+    lsp.onExecuteCommand(onExecuteCommandHandler);
+    // Disposable
+    return () => {
+        // Do nothing
+    };
+};
+exports.NetTransformServerFactory = NetTransformServerFactory;
+/**
+ * Default NetTransformServer using Token authentication.
+ */
+exports.NetTransformServer = (0, exports.NetTransformServerFactory)(credentialsProvider => new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, {}));
+//# sourceMappingURL=netTransformServer.js.map

package/out/language-server/netTransformServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"netTransformServer.js","sourceRoot":"","sources":["../../src/language-server/netTransformServer.ts"],"names":[],"mappings":";;;AAMA,iEAAkE;AAElE;;;;GAIG;AACI,MAAM,yBAAyB,GAGlC,aAAa,CAAC,EAAE,CAChB,CAAC,EAAE,mBAAmB,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5D,MAAM,OAAO,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAClD,MAAM,uBAAuB,GAAG,KAAK,EACjC,MAA4B,EAC5B,MAAyB,EACb,EAAE;QACd,uBAAuB;IAC3B,CAAC,CAAA;IAED,eAAe;IACf,GAAG,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,CAAA;IAE7C,aAAa;IACb,OAAO,GAAG,EAAE;QACR,aAAa;IACjB,CAAC,CAAA;AACL,CAAC,CAAA;AApBQ,QAAA,yBAAyB,6BAoBjC;AAEL;;GAEG;AACU,QAAA,kBAAkB,GAAG,IAAA,iCAAyB,EACvD,mBAAmB,CAAC,EAAE,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAChF,CAAA"}

package/out/language-server/proxy-server.d.ts

@@ -1,2 +1,3 @@
-export declare const CodeWhispererServerTokenProxy: import("@aws/language-server-runtimes").Server;
-export declare const CodeWhispererSecurityScanServerTokenProxy: import("@aws/language-server-runtimes").Server;
+export declare const CodeWhispererServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
+export declare const CodeWhispererSecurityScanServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
+export declare const QChatServerProxy: import("@aws/language-server-runtimes/server-interface").Server;

package/out/language-server/proxy-server.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeWhispererSecurityScanServerTokenProxy = exports.CodeWhispererServerTokenProxy = void 0;
+exports.QChatServerProxy = exports.CodeWhispererSecurityScanServerTokenProxy = exports.CodeWhispererServerTokenProxy = void 0;
+const chatSessionManagementService_1 = require("./chat/chatSessionManagementService");
 const codeWhispererSecurityScanServer_1 = require("./codeWhispererSecurityScanServer");
 const codeWhispererServer_1 = require("./codeWhispererServer");
 const codeWhispererService_1 = require("./codeWhispererService");
+const qChatServer_1 = require("./qChatServer");
 exports.CodeWhispererServerTokenProxy = (0, codeWhispererServer_1.CodewhispererServerFactory)(credentialsProvider => {
     let additionalAwsConfig = {};
     const proxyUrl = process.env.HTTPS_PROXY ?? process.env.https_proxy;
@@ -32,4 +34,36 @@ exports.CodeWhispererSecurityScanServerTokenProxy = (0, codeWhispererSecuritySca
     }
     return new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, additionalAwsConfig);
 });
+exports.QChatServerProxy = (0, qChatServer_1.QChatServer)(credentialsProvider => {
+    let clientOptions;
+    const proxyUrl = process.env.HTTPS_PROXY ?? process.env.https_proxy;
+    if (proxyUrl) {
+        const { NodeHttpHandler } = require('@smithy/node-http-handler');
+        /**
+         * TODO: consolidate the libraries we need for http proxy
+         *
+         * proxy-http-agent is not compatible with smithy's node-http-handler,
+         *  so we will use hpagent to create a new http handler
+         *
+         * At the same time, hpagent is not compatible with v2 sdk
+         */
+        const { HttpsProxyAgent } = require('hpagent');
+        // passing client options as a function so a new http handler can be created
+        clientOptions = () => {
+            // this mimics aws-sdk-v3-js-proxy
+            const agent = new HttpsProxyAgent({
+                proxy: proxyUrl,
+            });
+            return {
+                requestHandler: new NodeHttpHandler({
+                    httpAgent: agent,
+                    httpsAgent: agent,
+                }),
+            };
+        };
+    }
+    return chatSessionManagementService_1.ChatSessionManagementService.getInstance()
+        .withCredentialsProvider(credentialsProvider)
+        .withConfig(clientOptions);
+});
 //# sourceMappingURL=proxy-server.js.map

package/out/language-server/proxy-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/language-server/proxy-server.ts"],"names":[],"mappings":";;;AAAA,uFAA2E;AAC3E,+DAAkE;AAClE,iEAAkE;AAErD,QAAA,6BAA6B,GAAG,IAAA,gDAA0B,EAAC,mBAAmB,CAAC,EAAE;IAC1F,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEnE,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,iBAAiB,CAAC;YACjC,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAA;QACF,mBAAmB,GAAG;YAClB,KAAK,EAAE,UAAU;SACpB,CAAA;IACL,CAAC;IACD,OAAO,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA;AAEW,QAAA,yCAAyC,GAAG,IAAA,yDAAuB,EAAC,mBAAmB,CAAC,EAAE;IACnG,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEnE,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,iBAAiB,CAAC;YACjC,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAA;QACF,mBAAmB,GAAG;YAClB,KAAK,EAAE,UAAU;SACpB,CAAA;IACL,CAAC;IACD,OAAO,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA"}
+{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/language-server/proxy-server.ts"],"names":[],"mappings":";;;AAAA,sFAAkF;AAElF,uFAA2E;AAC3E,+DAAkE;AAClE,iEAAkE;AAClE,+CAA2C;AAE9B,QAAA,6BAA6B,GAAG,IAAA,gDAA0B,EAAC,mBAAmB,CAAC,EAAE;IAC1F,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEnE,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,iBAAiB,CAAC;YACjC,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAA;QACF,mBAAmB,GAAG;YAClB,KAAK,EAAE,UAAU;SACpB,CAAA;IACL,CAAC;IACD,OAAO,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA;AAEW,QAAA,yCAAyC,GAAG,IAAA,yDAAuB,EAAC,mBAAmB,CAAC,EAAE;IACnG,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEnE,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,iBAAiB,CAAC;YACjC,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAA;QACF,mBAAmB,GAAG;YAClB,KAAK,EAAE,UAAU;SACpB,CAAA;IACL,CAAC;IACD,OAAO,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA;AAEW,QAAA,gBAAgB,GAAG,IAAA,yBAAW,EAAC,mBAAmB,CAAC,EAAE;IAC9D,IAAI,aAAmD,CAAA;IAEvD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;IAEnE,IAAI,QAAQ,EAAE,CAAC;QACX,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;QAEhE;;;;;;;WAOG;QACH,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;QAE9C,4EAA4E;QAC5E,aAAa,GAAG,GAAG,EAAE;YACjB,kCAAkC;YAClC,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC;gBAC9B,KAAK,EAAE,QAAQ;aAClB,CAAC,CAAA;YAEF,OAAO;gBACH,cAAc,EAAE,IAAI,eAAe,CAAC;oBAChC,SAAS,EAAE,KAAK;oBAChB,UAAU,EAAE,KAAK;iBACpB,CAAC;aACL,CAAA;QACL,CAAC,CAAA;IACL,CAAC;IAED,OAAO,2DAA4B,CAAC,WAAW,EAAE;SAC5C,uBAAuB,CAAC,mBAAmB,CAAC;SAC5C,UAAU,CAAC,aAAa,CAAC,CAAA;AAClC,CAAC,CAAC,CAAA"}

package/out/language-server/qChatServer.d.ts

@@ -0,0 +1,3 @@
+import { CredentialsProvider, Server } from '@aws/language-server-runtimes/server-interface';
+import { ChatSessionManagementService } from './chat/chatSessionManagementService';
+export declare const QChatServer: (service: (credentialsProvider: CredentialsProvider) => ChatSessionManagementService) => Server;

package/out/language-server/qChatServer.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QChatServer = void 0;
+const chatController_1 = require("./chat/chatController");
+const QChatServer = (service) => features => {
+    const { chat, credentialsProvider, logging } = features;
+    const chatSessionManagementService = service(credentialsProvider);
+    const chatController = new chatController_1.ChatController(chatSessionManagementService, features);
+    chat.onTabAdd((...params) => {
+        logging.log('Received tab add request');
+        return chatController.onTabAdd(...params);
+    });
+    chat.onTabRemove((...params) => {
+        logging.log('Received tab remove request');
+        return chatController.onTabRemove(...params);
+    });
+    chat.onEndChat((...params) => {
+        logging.log('Received end chat request');
+        return chatController.onEndChat(...params);
+    });
+    chat.onChatPrompt((...params) => {
+        logging.log('Received chat prompt');
+        return chatController.onChatPrompt(...params);
+    });
+    logging.log('Q Chat server has been initialized');
+    return () => {
+        chatSessionManagementService.dispose();
+    };
+};
+exports.QChatServer = QChatServer;
+//# sourceMappingURL=qChatServer.js.map

package/out/language-server/qChatServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"qChatServer.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.ts"],"names":[],"mappings":";;;AACA,0DAAsD;AAG/C,MAAM,WAAW,GACpB,CAAC,OAAmF,EAAU,EAAE,CAChG,QAAQ,CAAC,EAAE;IACP,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;IAEvD,MAAM,4BAA4B,GAAiC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAE/F,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;IAEjF,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;QACvC,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE;QAC3B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;QAC1C,OAAO,cAAc,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE;QACzB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;QACxC,OAAO,cAAc,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE;QAC5B,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACnC,OAAO,cAAc,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,CAAA;IACjD,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;IAEjD,OAAO,GAAG,EAAE;QACR,4BAA4B,CAAC,OAAO,EAAE,CAAA;IAC1C,CAAC,CAAA;AACL,CAAC,CAAA;AAlCQ,QAAA,WAAW,eAkCnB"}

package/out/language-server/qChatServer.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/language-server/qChatServer.test.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const testing_1 = require("@aws/language-server-runtimes/testing");
+const ts_sinon_1 = require("ts-sinon");
+const chatController_1 = require("./chat/chatController");
+const chatSessionManagementService_1 = require("./chat/chatSessionManagementService");
+const qChatServer_1 = require("./qChatServer");
+describe('QChatServer', () => {
+    const mockTabId = 'mockTabId';
+    let disposeStub;
+    let testFeatures;
+    let disposeServer;
+    let chatSessionManagementService;
+    beforeEach(() => {
+        testFeatures = new testing_1.TestFeatures();
+        disposeStub = ts_sinon_1.default.stub(chatSessionManagementService_1.ChatSessionManagementService.prototype, 'dispose');
+        chatSessionManagementService = chatSessionManagementService_1.ChatSessionManagementService.getInstance().withCredentialsProvider(testFeatures.credentialsProvider);
+        const chatServerFactory = (0, qChatServer_1.QChatServer)(() => chatSessionManagementService);
+        disposeServer = chatServerFactory(testFeatures);
+    });
+    afterEach(() => {
+        ts_sinon_1.default.restore();
+        chatSessionManagementService_1.ChatSessionManagementService.reset();
+        testFeatures.dispose();
+    });
+    it('dispose should dispose all chat session services', () => {
+        disposeServer();
+        ts_sinon_1.default.assert.calledOnce(disposeStub);
+    });
+    it('calls the corresponding controller when tabAdd notification is received', () => {
+        const tabAddStub = ts_sinon_1.default.stub(chatController_1.ChatController.prototype, 'onTabAdd');
+        testFeatures.chat.onTabAdd.firstCall.firstArg({ tabId: mockTabId });
+        ts_sinon_1.default.assert.calledOnce(tabAddStub);
+    });
+    it('calls the corresponding controller when tabRemove notification is received', () => {
+        const tabRemoveStub = ts_sinon_1.default.stub(chatController_1.ChatController.prototype, 'onTabRemove');
+        testFeatures.chat.onTabRemove.firstCall.firstArg({ tabId: mockTabId });
+        ts_sinon_1.default.assert.calledOnce(tabRemoveStub);
+    });
+    it('calls the corresponding controller when endChat request is received', () => {
+        const endChatStub = ts_sinon_1.default.stub(chatController_1.ChatController.prototype, 'onEndChat');
+        testFeatures.chat.onEndChat.firstCall.firstArg({ tabId: mockTabId });
+        ts_sinon_1.default.assert.calledOnce(endChatStub);
+    });
+    it('calls the corresponding controller when chatPrompt request is received', () => {
+        const chatPromptStub = ts_sinon_1.default.stub(chatController_1.ChatController.prototype, 'onChatPrompt');
+        testFeatures.chat.onChatPrompt.firstCall.firstArg({ tabId: mockTabId, prompt: { prompt: 'Hello' } }, {});
+        ts_sinon_1.default.assert.calledOnce(chatPromptStub);
+    });
+});
+//# sourceMappingURL=qChatServer.test.js.map

package/out/language-server/qChatServer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"qChatServer.test.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/securityScan/securityScanDiagnosticsProvider.d.ts

@@ -0,0 +1,28 @@
+import { Diagnostic, Logging, Lsp, Position, Range, TextDocumentContentChangeEvent } from '@aws/language-server-runtimes/server-interface';
+import { AggregatedCodeScanIssue, CodeScanIssue } from './types';
+declare class SecurityScanDiagnosticsProvider {
+    private diagnostics;
+    private lsp;
+    private logging;
+    private findings;
+    constructor(lsp: Lsp, logging: Logging);
+    resetDiagnostics(): Promise<void>;
+    createDiagnostics(findings: AggregatedCodeScanIssue[]): Promise<void>;
+    mapScanIssueToDiagnostics(issue: CodeScanIssue): Diagnostic;
+    validateDiagnostics(uri: string, e: TextDocumentContentChangeEvent): Promise<void>;
+    getChangedDiagnosticRange(diagnosticRange: Range, documentChangeRange?: Range): Range;
+    isPositionInRange: (position: Position, range: Range) => boolean;
+    getLineOffset(range: Range, text: string): number;
+    createDiagnosticsRange(startLine: number, endLine: number): {
+        start: {
+            line: number;
+            character: number;
+        };
+        end: {
+            line: number;
+            character: number;
+        };
+    };
+    publishDiagnostics(uri: string, diagnostics: Diagnostic[]): Promise<void>;
+}
+export default SecurityScanDiagnosticsProvider;

package/out/language-server/securityScan/securityScanDiagnosticsProvider.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
+const vscode_uri_1 = require("vscode-uri");
+class SecurityScanDiagnosticsProvider {
+    constructor(lsp, logging) {
+        this.isPositionInRange = (position, range) => {
+            if (position.line < range.start.line || position.line > range.end.line) {
+                return false;
+            }
+            return true;
+        };
+        this.diagnostics = new Map();
+        this.lsp = lsp;
+        this.logging = logging;
+        this.findings = [];
+    }
+    async resetDiagnostics() {
+        await Promise.all(this.findings.map(finding => {
+            this.logging.log(`reset diagnostics for: ${finding.filePath}`);
+            this.publishDiagnostics(finding.filePath, []);
+        }));
+        this.diagnostics = new Map();
+    }
+    async createDiagnostics(findings) {
+        this.findings = findings;
+        for (const finding of findings) {
+            const path = vscode_uri_1.URI.file(finding.filePath).path;
+            const diagnostics = finding.issues.map(issue => this.mapScanIssueToDiagnostics(issue));
+            if (!this.diagnostics.has(path)) {
+                this.diagnostics.set(path, diagnostics);
+            }
+            this.diagnostics.set(path, [...(this.diagnostics.get(finding.filePath) || []), ...diagnostics]);
+            await this.publishDiagnostics(finding.filePath, diagnostics);
+        }
+    }
+    mapScanIssueToDiagnostics(issue) {
+        return server_interface_1.Diagnostic.create(this.createDiagnosticsRange(issue.startLine, issue.endLine), `${issue.detectorName} - ${issue.description.text}`, server_interface_1.DiagnosticSeverity.Warning, issue.relatedVulnerabilities.join(','), 'CodeWhisperer');
+    }
+    async validateDiagnostics(uri, e) {
+        const path = vscode_uri_1.URI.parse(uri).path;
+        const currentDiagnostics = this.diagnostics.get(path);
+        if (!currentDiagnostics) {
+            return;
+        }
+        // range will be omitted if the change is for entire document
+        const changeStartLine = e.range?.start?.line;
+        const changeEndLine = e.range?.end?.line;
+        const nextDiagnostics = currentDiagnostics.map(diagnostic => {
+            if (changeStartLine && changeStartLine > diagnostic.range.end.line) {
+                // change has no overlap with diagnostic
+                return diagnostic;
+            }
+            else if (changeEndLine && changeEndLine < diagnostic.range.start.line) {
+                // change is before diagnostic range, update diagnostic range
+                const lineOffset = this.getLineOffset(e.range, e.text);
+                return {
+                    ...diagnostic,
+                    range: this.createDiagnosticsRange(diagnostic.range.start.line + lineOffset, diagnostic.range.end.line + lineOffset),
+                };
+            }
+            else {
+                // change is within diagnostic range, update range and messaging to re-scan
+                const newRange = this.getChangedDiagnosticRange(diagnostic.range, e.range);
+                return diagnostic.severity === 2
+                    ? {
+                        ...diagnostic,
+                        severity: 3,
+                        message: `Re-scan to validate the fix: ${diagnostic.message}`,
+                        range: newRange,
+                    }
+                    : diagnostic;
+            }
+        });
+        this.diagnostics.set(path, nextDiagnostics);
+        await this.publishDiagnostics(uri, nextDiagnostics);
+    }
+    getChangedDiagnosticRange(diagnosticRange, documentChangeRange) {
+        if (!documentChangeRange) {
+            return diagnosticRange;
+        }
+        const start = Math.max(diagnosticRange.start.line, documentChangeRange.start.line);
+        const end = Math.min(diagnosticRange.end.line, documentChangeRange.end.line);
+        return this.createDiagnosticsRange(start, end === start ? start + 1 : end);
+    }
+    getLineOffset(range, text) {
+        const originLines = range.end.line - range.start.line + 1;
+        const changedLines = text.split('\n').length;
+        return changedLines - originLines;
+    }
+    createDiagnosticsRange(startLine, endLine) {
+        return {
+            start: {
+                line: startLine,
+                character: 0,
+            },
+            end: {
+                line: endLine,
+                character: 0,
+            },
+        };
+    }
+    async publishDiagnostics(uri, diagnostics) {
+        await this.lsp.publishDiagnostics({
+            uri,
+            diagnostics: diagnostics,
+        });
+    }
+}
+exports.default = SecurityScanDiagnosticsProvider;
+//# sourceMappingURL=securityScanDiagnosticsProvider.js.map

package/out/language-server/securityScan/securityScanDiagnosticsProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"securityScanDiagnosticsProvider.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanDiagnosticsProvider.ts"],"names":[],"mappings":"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"}

package/out/language-server/securityScan/securityScanHandler.d.ts

@@ -1,17 +1,24 @@
 /// <reference types="node" />
-import { Workspace } from '@aws/language-server-runtimes/out/features';
+import { Logging, Workspace, CancellationToken, CancellationTokenSource } from '@aws/language-server-runtimes/server-interface';
 import { ArtifactMap, CreateUploadUrlResponse } from '../../client/token/codewhispererbearertokenclient';
 import { CodeWhispererServiceToken } from '../codeWhispererService';
-import { AggregatedCodeScanIssue, RawCodeScanIssue } from './types';
+import { AggregatedCodeScanIssue } from './types';
 export declare class SecurityScanHandler {
     private client;
     private workspace;
-    constructor(client: CodeWhispererServiceToken, workspace: Workspace);
+    private logging;
+    tokenSource: CancellationTokenSource;
+    constructor(client: CodeWhispererServiceToken, workspace: Workspace, logging: Logging);
     getMd5(content: Buffer): string;
+    throwIfCancelled(token: CancellationToken): void;
+    cancelSecurityScan(): void;
     createCodeResourcePresignedUrlHandler(zipContent: Buffer): Promise<ArtifactMap>;
-    uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<import("got").Response<string>>;
+    uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<void>;
     createScanJob(artifactMap: ArtifactMap, languageName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
     pollScanJobStatus(jobId: string): Promise<string>;
     listScanResults(jobId: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
-    mapToAggregatedList(codeScanIssueMap: Map<string, RawCodeScanIssue[]>, aggregatedCodeScanIssueList: AggregatedCodeScanIssue[], json: string, projectPath: string): void;
+    mapToAggregatedList(json: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
+}
+export declare class SecurityScanCancelledError extends Error {
+    constructor(message?: string);
 }