@aws/lsp-codewhisperer 0.0.29 → 0.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +42 -0
- package/CONTRIBUTING.md +28 -0
- package/README.md +1 -1
- package/out/client/streamingClient/codewhispererStreamingClient.js +1 -0
- package/out/client/streamingClient/codewhispererStreamingClient.js.map +1 -1
- package/out/index.d.ts +6 -5
- package/out/index.js +7 -5
- package/out/index.js.map +1 -1
- package/out/language-server/agenticChat/agenticChatController.d.ts +40 -0
- package/out/language-server/agenticChat/agenticChatController.js +414 -0
- package/out/language-server/agenticChat/agenticChatController.js.map +1 -0
- package/out/language-server/agenticChat/qAgenticChatServer.d.ts +6 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js +96 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js.map +1 -0
- package/out/language-server/agenticChat/tools/fsRead.d.ts +38 -0
- package/out/language-server/agenticChat/tools/fsRead.js +96 -0
- package/out/language-server/agenticChat/tools/fsRead.js.map +1 -0
- package/out/language-server/agenticChat/tools/fsWrite.d.ts +73 -0
- package/out/language-server/agenticChat/tools/fsWrite.js +128 -0
- package/out/language-server/agenticChat/tools/fsWrite.js.map +1 -0
- package/out/language-server/agenticChat/tools/toolServer.d.ts +2 -0
- package/out/language-server/agenticChat/tools/toolServer.js +14 -0
- package/out/language-server/agenticChat/tools/toolServer.js.map +1 -0
- package/out/language-server/agenticChat/tools/toolShared.d.ts +7 -0
- package/out/language-server/agenticChat/tools/toolShared.js +5 -0
- package/out/language-server/agenticChat/tools/toolShared.js.map +1 -0
- package/out/language-server/chat/agents/docGeneration/constants.d.ts +59 -0
- package/out/language-server/chat/agents/docGeneration/constants.js +147 -0
- package/out/language-server/chat/agents/docGeneration/constants.js.map +1 -0
- package/out/language-server/chat/agents/docGeneration/errors.d.ts +29 -0
- package/out/language-server/chat/agents/docGeneration/errors.js +67 -0
- package/out/language-server/chat/agents/docGeneration/errors.js.map +1 -0
- package/out/language-server/chat/agents/shared/i18n.d.ts +1 -0
- package/out/language-server/chat/agents/shared/i18n.js +7 -0
- package/out/language-server/chat/agents/shared/i18n.js.map +1 -0
- package/out/language-server/chat/agents/shared/types.d.ts +55 -0
- package/out/language-server/chat/agents/shared/types.js +46 -0
- package/out/language-server/chat/agents/shared/types.js.map +1 -0
- package/out/language-server/chat/chatController.d.ts +9 -6
- package/out/language-server/chat/chatController.js +74 -27
- package/out/language-server/chat/chatController.js.map +1 -1
- package/out/language-server/chat/chatEventParser.d.ts +2 -2
- package/out/language-server/chat/chatSessionManagementService.d.ts +1 -1
- package/out/language-server/chat/chatSessionService.d.ts +1 -1
- package/out/language-server/chat/chatSessionService.js +1 -3
- package/out/language-server/chat/chatSessionService.js.map +1 -1
- package/out/language-server/chat/contexts/documentContext.d.ts +2 -0
- package/out/language-server/chat/contexts/documentContext.js +15 -2
- package/out/language-server/chat/contexts/documentContext.js.map +1 -1
- package/out/language-server/chat/contexts/triggerContext.d.ts +5 -5
- package/out/language-server/chat/contexts/triggerContext.js +3 -3
- package/out/language-server/chat/contexts/triggerContext.js.map +1 -1
- package/out/language-server/{qChatServer.js → chat/qChatServer.js} +15 -11
- package/out/language-server/chat/qChatServer.js.map +1 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.d.ts +3 -3
- package/out/language-server/chat/telemetry/chatTelemetryController.js +3 -3
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/chat/telemetry/clientTelemetry.js +1 -1
- package/out/language-server/chat/telemetry/clientTelemetry.js.map +1 -1
- package/out/language-server/chat/utils.js +1 -1
- package/out/language-server/chat/utils.js.map +1 -1
- package/out/language-server/configuration/qConfigurationServer.d.ts +2 -2
- package/out/language-server/configuration/qConfigurationServer.js +2 -2
- package/out/language-server/configuration/qConfigurationServer.js.map +1 -1
- package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/autoTrigger.d.ts +1 -1
- package/out/language-server/inline-completion/auto-trigger/autoTrigger.js.map +1 -0
- package/out/language-server/{telemetry → inline-completion}/codeDiffTracker.js +1 -1
- package/out/language-server/inline-completion/codeDiffTracker.js.map +1 -0
- package/out/language-server/{telemetry → inline-completion}/codePercentage.d.ts +1 -1
- package/out/language-server/inline-completion/codePercentage.js.map +1 -0
- package/out/language-server/inline-completion/codeWhispererServer.d.ts +7 -0
- package/out/language-server/{codeWhispererServer.js → inline-completion/codeWhispererServer.js} +37 -75
- package/out/language-server/inline-completion/codeWhispererServer.js.map +1 -0
- package/out/language-server/inline-completion/mergeRightUtils.js.map +1 -0
- package/out/language-server/{session → inline-completion/session}/sessionManager.d.ts +3 -3
- package/out/language-server/inline-completion/session/sessionManager.js.map +1 -0
- package/out/language-server/netTransform/artifactManager.d.ts +7 -7
- package/out/language-server/netTransform/artifactManager.js +86 -46
- package/out/language-server/netTransform/artifactManager.js.map +1 -1
- package/out/language-server/netTransform/metrics.js +1 -1
- package/out/language-server/netTransform/metrics.js.map +1 -1
- package/out/language-server/netTransform/models.d.ts +12 -0
- package/out/language-server/netTransform/models.js.map +1 -1
- package/out/language-server/{netTransformServer.d.ts → netTransform/netTransformServer.d.ts} +1 -1
- package/out/language-server/{netTransformServer.js → netTransform/netTransformServer.js} +5 -5
- package/out/language-server/netTransform/netTransformServer.js.map +1 -0
- package/out/language-server/netTransform/tests/mockData.d.ts +2 -21
- package/out/language-server/netTransform/tests/mockData.js +16 -13
- package/out/language-server/netTransform/tests/mockData.js.map +1 -1
- package/out/language-server/netTransform/transformHandler.d.ts +3 -1
- package/out/language-server/netTransform/transformHandler.js +49 -15
- package/out/language-server/netTransform/transformHandler.js.map +1 -1
- package/out/language-server/{codeWhispererSecurityScanServer.js → securityScan/codeWhispererSecurityScanServer.js} +5 -5
- package/out/language-server/securityScan/codeWhispererSecurityScanServer.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/commonUtil.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/constants.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/csharpDependencyGraph.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/dependencyGraph.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/dependencyGraphFactory.js.map +1 -0
- package/out/language-server/securityScan/securityScanHandler.d.ts +1 -1
- package/out/language-server/securityScan/securityScanHandler.js +1 -1
- package/out/language-server/securityScan/securityScanHandler.js.map +1 -1
- package/out/{language-server → shared}/amazonQServiceManager/AmazonQTokenServiceManager.d.ts +6 -3
- package/out/{language-server → shared}/amazonQServiceManager/AmazonQTokenServiceManager.js +48 -84
- package/out/shared/amazonQServiceManager/AmazonQTokenServiceManager.js.map +1 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +7 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.js.map +1 -0
- package/out/shared/amazonQServiceManager/configurationUtils.d.ts +45 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js +130 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js.map +1 -0
- package/out/shared/amazonQServiceManager/errors.js.map +1 -0
- package/out/shared/amazonQServiceManager/factories.d.ts +15 -0
- package/out/shared/amazonQServiceManager/factories.js +47 -0
- package/out/shared/amazonQServiceManager/factories.js.map +1 -0
- package/out/{language-server → shared}/amazonQServiceManager/qDeveloperProfiles.d.ts +1 -3
- package/out/{language-server → shared}/amazonQServiceManager/qDeveloperProfiles.js +2 -2
- package/out/shared/amazonQServiceManager/qDeveloperProfiles.js.map +1 -0
- package/out/shared/codeWhispererService.js.map +1 -0
- package/out/{language-server → shared}/constants.d.ts +5 -0
- package/out/shared/constants.js +16 -0
- package/out/shared/constants.js.map +1 -0
- package/out/shared/languageDetection.js.map +1 -0
- package/out/shared/models/constants.js.map +1 -0
- package/out/shared/models/model.js.map +1 -0
- package/out/{language-server → shared}/proxy-server.d.ts +1 -0
- package/out/shared/proxy-server.js +21 -0
- package/out/shared/proxy-server.js.map +1 -0
- package/out/shared/streamingClientService.d.ts +10 -0
- package/out/shared/streamingClientService.js +42 -0
- package/out/shared/streamingClientService.js.map +1 -0
- package/out/shared/supplementalContextUtil/codeParsingUtil.js.map +1 -0
- package/out/{language-server/utilities → shared}/supplementalContextUtil/crossFileContextUtil.d.ts +1 -1
- package/out/{language-server/utilities → shared}/supplementalContextUtil/crossFileContextUtil.js +1 -1
- package/out/shared/supplementalContextUtil/crossFileContextUtil.js.map +1 -0
- package/out/shared/supplementalContextUtil/rankBm25.js.map +1 -0
- package/out/{language-server/utilities → shared}/supplementalContextUtil/supplementalContextUtil.d.ts +1 -1
- package/out/shared/supplementalContextUtil/supplementalContextUtil.js.map +1 -0
- package/out/shared/telemetry/metric.js.map +1 -0
- package/out/{language-server → shared/telemetry}/telemetryService.d.ts +5 -5
- package/out/{language-server → shared/telemetry}/telemetryService.js +4 -4
- package/out/shared/telemetry/telemetryService.js.map +1 -0
- package/out/{language-server → shared}/telemetry/types.d.ts +2 -2
- package/out/shared/telemetry/types.js.map +1 -0
- package/out/{language-server/utilities → shared}/telemetryUtils.d.ts +1 -1
- package/out/shared/telemetryUtils.js.map +1 -0
- package/out/shared/testUtils.js.map +1 -0
- package/out/shared/utils.js.map +1 -0
- package/package.json +4 -4
- package/out/constants.d.ts +0 -8
- package/out/constants.js +0 -12
- package/out/constants.js.map +0 -1
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js.map +0 -1
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +0 -5
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js.map +0 -1
- package/out/language-server/amazonQServiceManager/errors.js.map +0 -1
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js.map +0 -1
- package/out/language-server/auto-trigger/autoTrigger.js.map +0 -1
- package/out/language-server/codeWhispererSecurityScanServer.js.map +0 -1
- package/out/language-server/codeWhispererServer.d.ts +0 -6
- package/out/language-server/codeWhispererServer.js.map +0 -1
- package/out/language-server/codeWhispererService.js.map +0 -1
- package/out/language-server/constants.js +0 -8
- package/out/language-server/constants.js.map +0 -1
- package/out/language-server/dependencyGraph/commonUtil.js.map +0 -1
- package/out/language-server/dependencyGraph/constants.js.map +0 -1
- package/out/language-server/dependencyGraph/csharpDependencyGraph.js.map +0 -1
- package/out/language-server/dependencyGraph/dependencyGraph.js.map +0 -1
- package/out/language-server/dependencyGraph/dependencyGraphFactory.js.map +0 -1
- package/out/language-server/languageDetection.js.map +0 -1
- package/out/language-server/mergeRightUtils.js.map +0 -1
- package/out/language-server/models/constants.js.map +0 -1
- package/out/language-server/models/model.js.map +0 -1
- package/out/language-server/netTransformServer.js.map +0 -1
- package/out/language-server/proxy-server.js +0 -22
- package/out/language-server/proxy-server.js.map +0 -1
- package/out/language-server/qChatServer.js.map +0 -1
- package/out/language-server/session/sessionManager.js.map +0 -1
- package/out/language-server/telemetry/codeDiffTracker.js.map +0 -1
- package/out/language-server/telemetry/codePercentage.js.map +0 -1
- package/out/language-server/telemetry/metric.js.map +0 -1
- package/out/language-server/telemetry/types.js.map +0 -1
- package/out/language-server/telemetryService.js.map +0 -1
- package/out/language-server/testUtils.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/codeParsingUtil.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/crossFileContextUtil.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/rankBm25.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/supplementalContextUtil.js.map +0 -1
- package/out/language-server/utilities/telemetryUtils.js.map +0 -1
- package/out/language-server/utils.js.map +0 -1
- /package/out/language-server/{qChatServer.d.ts → chat/qChatServer.d.ts} +0 -0
- /package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/autoTrigger.js +0 -0
- /package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/coefficients.json +0 -0
- /package/out/language-server/{telemetry → inline-completion}/codeDiffTracker.d.ts +0 -0
- /package/out/language-server/{telemetry → inline-completion}/codePercentage.js +0 -0
- /package/out/language-server/{mergeRightUtils.d.ts → inline-completion/mergeRightUtils.d.ts} +0 -0
- /package/out/language-server/{mergeRightUtils.js → inline-completion/mergeRightUtils.js} +0 -0
- /package/out/language-server/{session → inline-completion/session}/sessionManager.js +0 -0
- /package/out/language-server/{codeWhispererSecurityScanServer.d.ts → securityScan/codeWhispererSecurityScanServer.d.ts} +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/commonUtil.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/commonUtil.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/constants.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/constants.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/csharpDependencyGraph.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/csharpDependencyGraph.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraph.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraph.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraphFactory.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraphFactory.js +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/BaseAmazonQServiceManager.js +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/errors.d.ts +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/errors.js +0 -0
- /package/out/{language-server → shared}/codeWhispererService.d.ts +0 -0
- /package/out/{language-server → shared}/codeWhispererService.js +0 -0
- /package/out/{language-server → shared}/languageDetection.d.ts +0 -0
- /package/out/{language-server → shared}/languageDetection.js +0 -0
- /package/out/{language-server → shared}/models/constants.d.ts +0 -0
- /package/out/{language-server → shared}/models/constants.js +0 -0
- /package/out/{language-server → shared}/models/model.d.ts +0 -0
- /package/out/{language-server → shared}/models/model.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/codeParsingUtil.d.ts +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/codeParsingUtil.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/rankBm25.d.ts +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/rankBm25.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/supplementalContextUtil.js +0 -0
- /package/out/{language-server → shared}/telemetry/metric.d.ts +0 -0
- /package/out/{language-server → shared}/telemetry/metric.js +0 -0
- /package/out/{language-server → shared}/telemetry/types.js +0 -0
- /package/out/{language-server/utilities → shared}/telemetryUtils.js +0 -0
- /package/out/{language-server → shared}/testUtils.d.ts +0 -0
- /package/out/{language-server → shared}/testUtils.js +0 -0
- /package/out/{language-server → shared}/utils.d.ts +0 -0
- /package/out/{language-server → shared}/utils.js +0 -0
package/out/language-server/{codeWhispererServer.js → inline-completion/codeWhispererServer.js}
RENAMED
|
@@ -3,21 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CodeWhispererServerToken = exports.CodeWhispererServerIAM = exports.CodewhispererServerFactory = exports.CONTEXT_CHARACTERS_LIMIT = void 0;
|
|
4
4
|
const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
|
|
5
5
|
const autoTrigger_1 = require("./auto-trigger/autoTrigger");
|
|
6
|
-
const codeWhispererService_1 = require("
|
|
7
|
-
const languageDetection_1 = require("
|
|
6
|
+
const codeWhispererService_1 = require("../../shared/codeWhispererService");
|
|
7
|
+
const languageDetection_1 = require("../../shared/languageDetection");
|
|
8
8
|
const mergeRightUtils_1 = require("./mergeRightUtils");
|
|
9
9
|
const sessionManager_1 = require("./session/sessionManager");
|
|
10
|
-
const codePercentage_1 = require("./
|
|
11
|
-
const utils_1 = require("
|
|
12
|
-
const telemetryUtils_1 = require("
|
|
13
|
-
const
|
|
14
|
-
const supplementalContextUtil_1 = require("./utilities/supplementalContextUtil/supplementalContextUtil");
|
|
10
|
+
const codePercentage_1 = require("./codePercentage");
|
|
11
|
+
const utils_1 = require("../../shared/utils");
|
|
12
|
+
const telemetryUtils_1 = require("../../shared/telemetryUtils");
|
|
13
|
+
const supplementalContextUtil_1 = require("../../shared/supplementalContextUtil/supplementalContextUtil");
|
|
15
14
|
const lsp_core_1 = require("@aws/lsp-core");
|
|
16
|
-
const telemetryService_1 = require("
|
|
17
|
-
const codeDiffTracker_1 = require("./
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const errors_1 = require("./amazonQServiceManager/errors");
|
|
15
|
+
const telemetryService_1 = require("../../shared/telemetry/telemetryService");
|
|
16
|
+
const codeDiffTracker_1 = require("./codeDiffTracker");
|
|
17
|
+
const errors_1 = require("../../shared/amazonQServiceManager/errors");
|
|
18
|
+
const factories_1 = require("../../shared/amazonQServiceManager/factories");
|
|
21
19
|
const EMPTY_RESULT = { sessionId: '', items: [] };
|
|
22
20
|
exports.CONTEXT_CHARACTERS_LIMIT = 10240;
|
|
23
21
|
// Both clients (token, sigv4) define their own types, this return value needs to match both of them.
|
|
@@ -153,32 +151,18 @@ const mergeSuggestionsWithRightContext = (rightFileContext, suggestions, range)
|
|
|
153
151
|
};
|
|
154
152
|
});
|
|
155
153
|
};
|
|
156
|
-
const CodewhispererServerFactory = (
|
|
154
|
+
const CodewhispererServerFactory = (serviceManager) => ({ credentialsProvider, lsp, workspace, telemetry, logging, runtime, sdkInitializator }) => {
|
|
157
155
|
let lastUserModificationTime;
|
|
158
156
|
let timeSinceLastUserModification = 0;
|
|
159
|
-
let extraContext = undefined;
|
|
160
157
|
const sessionManager = sessionManager_1.SessionManager.getInstance();
|
|
161
|
-
const awsQRegion = runtime.getConfiguration(constants_1.AWS_Q_REGION_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_REGION;
|
|
162
|
-
const awsQEndpointUrl = runtime.getConfiguration(constants_1.AWS_Q_ENDPOINT_URL_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_ENDPOINT_URL;
|
|
163
|
-
const fallbackCodeWhispererService = service(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
164
158
|
// AmazonQTokenServiceManager and TelemetryService are initialized in `onInitialized` handler to make sure Language Server connection is started
|
|
165
159
|
let amazonQServiceManager;
|
|
166
160
|
let telemetryService;
|
|
167
|
-
const serviceType = fallbackCodeWhispererService.constructor.name;
|
|
168
161
|
lsp.addInitializer((params) => {
|
|
169
|
-
// TODO: Review configuration options expected in other features
|
|
170
|
-
fallbackCodeWhispererService.updateClientConfig({
|
|
171
|
-
customUserAgent: (0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo),
|
|
172
|
-
});
|
|
173
162
|
return {
|
|
174
163
|
capabilities: {},
|
|
175
164
|
};
|
|
176
165
|
});
|
|
177
|
-
// Mutable state to track whether code with references should be included in
|
|
178
|
-
// the response. No locking or concurrency controls, filtering is done
|
|
179
|
-
// right before returning and is only guaranteed to be consistent within
|
|
180
|
-
// the context of a single response.
|
|
181
|
-
let includeSuggestionsWithCodeReferences = false;
|
|
182
166
|
// CodePercentage and codeDiff tracker have a dependency on TelemetryService, so initialization is also delayed to `onInitialized` handler
|
|
183
167
|
let codePercentageTracker;
|
|
184
168
|
let codeDiffTracker;
|
|
@@ -264,6 +248,7 @@ const CodewhispererServerFactory = (service) => ({ credentialsProvider, lsp, wor
|
|
|
264
248
|
customizationArn: lsp_core_1.textUtils.undefinedIfEmpty(codeWhispererService.customizationArn),
|
|
265
249
|
});
|
|
266
250
|
// Add extra context to request context
|
|
251
|
+
const { extraContext } = amazonQServiceManager.getConfiguration().inlineSuggestions;
|
|
267
252
|
if (extraContext) {
|
|
268
253
|
requestContext.fileContext.leftFileContent = extraContext + '\n' + requestContext.fileContext.leftFileContent;
|
|
269
254
|
}
|
|
@@ -312,6 +297,11 @@ const CodewhispererServerFactory = (service) => ({ credentialsProvider, lsp, wor
|
|
|
312
297
|
})
|
|
313
298
|
// References setting filter
|
|
314
299
|
.filter(suggestion => {
|
|
300
|
+
// State to track whether code with references should be included in
|
|
301
|
+
// the response. No locking or concurrency controls, filtering is done
|
|
302
|
+
// right before returning and is only guaranteed to be consistent within
|
|
303
|
+
// the context of a single response.
|
|
304
|
+
const { includeSuggestionsWithCodeReferences } = amazonQServiceManager.getConfiguration();
|
|
315
305
|
if (includeSuggestionsWithCodeReferences) {
|
|
316
306
|
return true;
|
|
317
307
|
}
|
|
@@ -410,58 +400,30 @@ const CodewhispererServerFactory = (service) => ({ credentialsProvider, lsp, wor
|
|
|
410
400
|
};
|
|
411
401
|
const updateConfiguration = async () => {
|
|
412
402
|
try {
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
The flag enableTelemetryEventsToDestination is set to true temporarily. It's value will be determined through destination
|
|
424
|
-
configuration post all events migration to STE. It'll be replaced by qConfig['enableTelemetryEventsToDestination'] === true
|
|
425
|
-
*/
|
|
426
|
-
// const enableTelemetryEventsToDestination = true
|
|
427
|
-
// telemetryService.updateEnableTelemetryEventsToDestination(enableTelemetryEventsToDestination)
|
|
428
|
-
const optOutTelemetryPreference = qConfig['optOutTelemetry'] === true ? 'OPTOUT' : 'OPTIN';
|
|
429
|
-
telemetryService.updateOptOutPreference(optOutTelemetryPreference);
|
|
430
|
-
extraContext = qConfig.inlineSuggestions?.extraContext;
|
|
431
|
-
}
|
|
432
|
-
const config = await lsp.workspace.getConfiguration('aws.codeWhisperer');
|
|
433
|
-
if (!config)
|
|
434
|
-
return;
|
|
435
|
-
includeSuggestionsWithCodeReferences = config['includeSuggestionsWithCodeReferences'] === true;
|
|
436
|
-
logging.log(`Configuration updated to ${includeSuggestionsWithCodeReferences ? 'include' : 'exclude'} suggestions with code references`);
|
|
437
|
-
fallbackCodeWhispererService.shareCodeWhispererContentWithAWS =
|
|
438
|
-
config['shareCodeWhispererContentWithAWS'] === true;
|
|
439
|
-
logging.log(`Configuration updated to ${fallbackCodeWhispererService.shareCodeWhispererContentWithAWS ? 'share' : 'not share'} Amazon Q content with AWS`);
|
|
403
|
+
const { customizationArn, optOutTelemetryPreference } = await amazonQServiceManager.handleDidChangeConfiguration();
|
|
404
|
+
codePercentageTracker.customizationArn = customizationArn;
|
|
405
|
+
/*
|
|
406
|
+
The flag enableTelemetryEventsToDestination is set to true temporarily. It's value will be determined through destination
|
|
407
|
+
configuration post all events migration to STE. It'll be replaced by qConfig['enableTelemetryEventsToDestination'] === true
|
|
408
|
+
*/
|
|
409
|
+
// const enableTelemetryEventsToDestination = true
|
|
410
|
+
// telemetryService.updateEnableTelemetryEventsToDestination(enableTelemetryEvetsToDestination)
|
|
411
|
+
telemetryService.updateOptOutPreference(optOutTelemetryPreference);
|
|
412
|
+
logging.log(`TelemetryService OptOutPreference update to ${optOutTelemetryPreference}`);
|
|
440
413
|
}
|
|
441
414
|
catch (error) {
|
|
442
415
|
logging.log(`Error in GetConfiguration: ${error}`);
|
|
443
416
|
}
|
|
444
417
|
};
|
|
445
418
|
const onInitializedHandler = async () => {
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
});
|
|
455
|
-
}
|
|
456
|
-
else {
|
|
457
|
-
// Fallback to default passed service factory for IAM credentials type
|
|
458
|
-
amazonQServiceManager = {
|
|
459
|
-
handleDidChangeConfiguration: async () => { },
|
|
460
|
-
getCodewhispererService: () => {
|
|
461
|
-
return fallbackCodeWhispererService;
|
|
462
|
-
},
|
|
463
|
-
};
|
|
464
|
-
}
|
|
419
|
+
amazonQServiceManager = serviceManager({
|
|
420
|
+
credentialsProvider,
|
|
421
|
+
lsp,
|
|
422
|
+
logging,
|
|
423
|
+
runtime,
|
|
424
|
+
sdkInitializator,
|
|
425
|
+
workspace,
|
|
426
|
+
});
|
|
465
427
|
const clientParams = (0, utils_1.safeGet)(lsp.getClientInitializeParams(), new errors_1.AmazonQServiceInitializationError('TelemetryService initialized before LSP connection was initialized.'));
|
|
466
428
|
telemetryService = new telemetryService_1.TelemetryService(amazonQServiceManager, credentialsProvider, telemetry, logging);
|
|
467
429
|
telemetryService.updateUserContext((0, telemetryUtils_1.makeUserContextObject)(clientParams, runtime.platform, 'INLINE'));
|
|
@@ -506,6 +468,6 @@ const CodewhispererServerFactory = (service) => ({ credentialsProvider, lsp, wor
|
|
|
506
468
|
};
|
|
507
469
|
};
|
|
508
470
|
exports.CodewhispererServerFactory = CodewhispererServerFactory;
|
|
509
|
-
exports.CodeWhispererServerIAM = (0, exports.CodewhispererServerFactory)(
|
|
510
|
-
exports.CodeWhispererServerToken = (0, exports.CodewhispererServerFactory)(
|
|
471
|
+
exports.CodeWhispererServerIAM = (0, exports.CodewhispererServerFactory)(factories_1.initBaseIAMServiceManager);
|
|
472
|
+
exports.CodeWhispererServerToken = (0, exports.CodewhispererServerFactory)(factories_1.initBaseTokenServiceManager);
|
|
511
473
|
//# sourceMappingURL=codeWhispererServer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codeWhispererServer.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/codeWhispererServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeRightUtils.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/mergeRightUtils.ts"],"names":[],"mappings":";;AAIA,wDASC;AAED,0EAeC;AA9BD;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,YAAoB;IAC5E,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACX,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,MAAK;QACT,CAAC;QACD,CAAC,EAAE,CAAA;IACP,CAAC;IACD,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AACnC,CAAC;AAED,SAAgB,+BAA+B,CAAC,gBAAwB,EAAE,UAAkB;IACxF,MAAM,iBAAiB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAA;IAC3C,2CAA2C;IAC3C,MAAM,YAAY,GAAG,gBAAgB;SAChC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC;SAClB,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC;SACxB,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA,CAAC,sCAAsC;IACpE,MAAM,OAAO,GAAG,sBAAsB,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACpD,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QACnD,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAA;IACnD,CAAC;SAAM,CAAC;QACJ,OAAO,UAAU,CAAA;IACrB,CAAC;AACL,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { InlineCompletionStates, Position, TextDocument } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { CodewhispererAutomatedTriggerType, CodewhispererTriggerType } from '../auto-trigger/autoTrigger';
|
|
3
|
-
import { GenerateSuggestionsRequest, ResponseContext, Suggestion } from '
|
|
4
|
-
import { CodewhispererLanguage } from '
|
|
5
|
-
import { CodeWhispererSupplementalContext } from '
|
|
3
|
+
import { GenerateSuggestionsRequest, ResponseContext, Suggestion } from '../../../shared/codeWhispererService';
|
|
4
|
+
import { CodewhispererLanguage } from '../../../shared/languageDetection';
|
|
5
|
+
import { CodeWhispererSupplementalContext } from '../../../shared/models/model';
|
|
6
6
|
type SessionState = 'REQUESTING' | 'ACTIVE' | 'CLOSED' | 'ERROR' | 'DISCARD';
|
|
7
7
|
export type UserDecision = 'Empty' | 'Filter' | 'Discard' | 'Accept' | 'Ignore' | 'Reject' | 'Unseen';
|
|
8
8
|
type UserTriggerDecision = 'Accept' | 'Reject' | 'Empty' | 'Discard';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logging, Workspace } from '@aws/language-server-runtimes/server-interface';
|
|
2
|
-
import { RequirementJson, StartTransformRequest } from './models';
|
|
2
|
+
import { ExternalReference, References, RequirementJson, StartTransformRequest } from './models';
|
|
3
3
|
export declare class ArtifactManager {
|
|
4
4
|
private workspace;
|
|
5
5
|
private logging;
|
|
@@ -9,20 +9,20 @@ export declare class ArtifactManager {
|
|
|
9
9
|
removeDir(dir: string): Promise<void>;
|
|
10
10
|
cleanup(): void;
|
|
11
11
|
removeDuplicateNugetPackagesFolder(request: StartTransformRequest): Promise<void>;
|
|
12
|
-
createRequirementJson(request: StartTransformRequest): Promise<void>;
|
|
13
12
|
copySolutionConfigFiles(request: StartTransformRequest): Promise<void>;
|
|
14
|
-
copySourceFile(solutionRootPath: string, filePath: string): void
|
|
13
|
+
copySourceFile(solutionRootPath: string, filePath: string): Promise<void>;
|
|
15
14
|
createRequirementJsonContent(request: StartTransformRequest): Promise<RequirementJson>;
|
|
15
|
+
processPrivatePackages(request: StartTransformRequest, reference: ExternalReference, artifactReference: References): Promise<void>;
|
|
16
16
|
zipArtifact(): Promise<string>;
|
|
17
|
-
static
|
|
17
|
+
static getSha256Async(fileName: string): Promise<string>;
|
|
18
18
|
getRequirementJsonPath(): string;
|
|
19
19
|
getWorkspaceReferencePathFromRelativePath(relativePath: string): string;
|
|
20
20
|
getWorkspaceCodePathFromRelativePath(relativePath: string): string;
|
|
21
21
|
normalizeSourceFileRelativePath(solutionRootPath: string, fullPath: string): string;
|
|
22
22
|
normalizeReferenceFileRelativePath(relativePath: string, includedInArtifact: boolean): string;
|
|
23
23
|
zipDirectory(sourceDir: string, outPath: string): Promise<void>;
|
|
24
|
-
|
|
24
|
+
writeRequirementJsonAsync(dir: string, fileContent: string): Promise<void>;
|
|
25
25
|
createFolderIfNotExist(dir: string): void;
|
|
26
|
-
copyFile(sourceFilePath: string, destFilePath: string): void
|
|
27
|
-
|
|
26
|
+
copyFile(sourceFilePath: string, destFilePath: string): Promise<void>;
|
|
27
|
+
calculateMD5Async(filePath: string): Promise<string>;
|
|
28
28
|
}
|
|
@@ -11,6 +11,7 @@ const referencesFolderName = 'references';
|
|
|
11
11
|
const zipFileName = 'artifact.zip';
|
|
12
12
|
const sourceCodeFolderName = 'sourceCode';
|
|
13
13
|
const packagesFolderName = 'packages';
|
|
14
|
+
const thirdPartyPackageFolderName = 'thirdpartypackages';
|
|
14
15
|
class ArtifactManager {
|
|
15
16
|
workspace;
|
|
16
17
|
logging;
|
|
@@ -21,10 +22,12 @@ class ArtifactManager {
|
|
|
21
22
|
this.workspacePath = workspacePath;
|
|
22
23
|
}
|
|
23
24
|
async createZip(request) {
|
|
24
|
-
await this.
|
|
25
|
+
const requirementJson = await this.createRequirementJsonContent(request);
|
|
26
|
+
await this.writeRequirementJsonAsync(this.getRequirementJsonPath(), JSON.stringify(requirementJson));
|
|
25
27
|
await this.copySolutionConfigFiles(request);
|
|
26
28
|
await this.removeDuplicateNugetPackagesFolder(request);
|
|
27
|
-
|
|
29
|
+
const zipPath = await this.zipArtifact();
|
|
30
|
+
return zipPath;
|
|
28
31
|
}
|
|
29
32
|
async removeDir(dir) {
|
|
30
33
|
if (await this.workspace.fs.exists(dir)) {
|
|
@@ -35,12 +38,22 @@ class ArtifactManager {
|
|
|
35
38
|
try {
|
|
36
39
|
const artifactFolder = path.join(this.workspacePath, artifactFolderName);
|
|
37
40
|
const zipFile = path.join(this.workspacePath, zipFileName);
|
|
38
|
-
|
|
39
|
-
fs.
|
|
40
|
-
|
|
41
|
+
const packagesFolder = path.join(this.workspacePath, packagesFolderName);
|
|
42
|
+
if (fs.existsSync(artifactFolder)) {
|
|
43
|
+
fs.rmSync(artifactFolder, { recursive: true, force: true });
|
|
44
|
+
}
|
|
45
|
+
if (fs.existsSync(zipFile)) {
|
|
46
|
+
fs.unlinkSync(zipFile);
|
|
47
|
+
}
|
|
48
|
+
if (fs.existsSync(packagesFolder)) {
|
|
49
|
+
fs.rmSync(packagesFolder, { recursive: true, force: true });
|
|
50
|
+
}
|
|
51
|
+
if (fs.existsSync(this.workspacePath)) {
|
|
52
|
+
fs.rmSync(this.workspacePath, { recursive: true, force: true });
|
|
53
|
+
}
|
|
41
54
|
}
|
|
42
55
|
catch (error) {
|
|
43
|
-
this.logging.log('Failed to cleanup:' + error);
|
|
56
|
+
this.logging.log('Failed to cleanup: ' + error);
|
|
44
57
|
}
|
|
45
58
|
}
|
|
46
59
|
async removeDuplicateNugetPackagesFolder(request) {
|
|
@@ -50,34 +63,28 @@ class ArtifactManager {
|
|
|
50
63
|
this.logging.log(`Removed packages folder ${packagesFolder} from source code directory to be uploaded because it is a duplicate of references folder from artifacts`);
|
|
51
64
|
}
|
|
52
65
|
}
|
|
53
|
-
async createRequirementJson(request) {
|
|
54
|
-
const fileContent = await this.createRequirementJsonContent(request);
|
|
55
|
-
const dir = this.getRequirementJsonPath();
|
|
56
|
-
await this.writeRequirmentJsonAsync(dir, JSON.stringify(fileContent));
|
|
57
|
-
this.logging.log('Generated requirement.json at: ' + dir);
|
|
58
|
-
}
|
|
59
66
|
async copySolutionConfigFiles(request) {
|
|
60
67
|
if (request.SolutionConfigPaths && request.SolutionConfigPaths.length > 0) {
|
|
61
68
|
for (const configFilePath of request.SolutionConfigPaths) {
|
|
62
|
-
this.copySourceFile(request.SolutionRootPath, configFilePath);
|
|
69
|
+
await this.copySourceFile(request.SolutionRootPath, configFilePath);
|
|
63
70
|
}
|
|
64
71
|
}
|
|
65
72
|
}
|
|
66
|
-
copySourceFile(solutionRootPath, filePath) {
|
|
73
|
+
async copySourceFile(solutionRootPath, filePath) {
|
|
67
74
|
const relativePath = this.normalizeSourceFileRelativePath(solutionRootPath, filePath);
|
|
68
|
-
this.copyFile(filePath, this.getWorkspaceCodePathFromRelativePath(relativePath));
|
|
75
|
+
await this.copyFile(filePath, this.getWorkspaceCodePathFromRelativePath(relativePath));
|
|
69
76
|
}
|
|
70
77
|
async createRequirementJsonContent(request) {
|
|
71
|
-
|
|
72
|
-
|
|
78
|
+
const projects = [];
|
|
79
|
+
for (const project of request.ProjectMetadata) {
|
|
73
80
|
const sourceCodeFilePaths = project.SourceCodeFilePaths.filter(filePath => filePath);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
81
|
+
const codeFiles = [];
|
|
82
|
+
const references = [];
|
|
83
|
+
for (const filePath of sourceCodeFilePaths) {
|
|
77
84
|
try {
|
|
78
|
-
this.copySourceFile(request.SolutionRootPath, filePath);
|
|
79
|
-
|
|
80
|
-
|
|
85
|
+
await this.copySourceFile(request.SolutionRootPath, filePath);
|
|
86
|
+
const contentHash = await this.calculateMD5Async(filePath);
|
|
87
|
+
const relativePath = this.normalizeSourceFileRelativePath(request.SolutionRootPath, filePath);
|
|
81
88
|
codeFiles.push({
|
|
82
89
|
contentMd5Hash: contentHash,
|
|
83
90
|
relativePath: relativePath,
|
|
@@ -86,27 +93,30 @@ class ArtifactManager {
|
|
|
86
93
|
catch (error) {
|
|
87
94
|
this.logging.log('Failed to process file: ' + error + filePath);
|
|
88
95
|
}
|
|
89
|
-
}
|
|
90
|
-
project.ExternalReferences
|
|
96
|
+
}
|
|
97
|
+
for (const reference of project.ExternalReferences) {
|
|
91
98
|
try {
|
|
92
99
|
const relativePath = this.normalizeReferenceFileRelativePath(reference.RelativePath, reference.IncludedInArtifact);
|
|
93
|
-
this.copyFile(reference.AssemblyFullPath, this.getWorkspaceReferencePathFromRelativePath(relativePath));
|
|
94
|
-
|
|
100
|
+
await this.copyFile(reference.AssemblyFullPath, this.getWorkspaceReferencePathFromRelativePath(relativePath));
|
|
101
|
+
let artifactReference = {
|
|
95
102
|
includedInArtifact: reference.IncludedInArtifact,
|
|
96
103
|
relativePath: relativePath,
|
|
97
|
-
|
|
104
|
+
isThirdPartyPackage: false,
|
|
105
|
+
};
|
|
106
|
+
await this.processPrivatePackages(request, reference, artifactReference);
|
|
107
|
+
references.push(artifactReference);
|
|
98
108
|
}
|
|
99
109
|
catch (error) {
|
|
100
110
|
this.logging.log('Failed to process file: ' + error + reference.AssemblyFullPath);
|
|
101
111
|
}
|
|
102
|
-
}
|
|
112
|
+
}
|
|
103
113
|
projects.push({
|
|
104
114
|
projectFilePath: this.normalizeSourceFileRelativePath(request.SolutionRootPath, project.ProjectPath),
|
|
105
115
|
projectTarget: project.ProjectTargetFramework,
|
|
106
116
|
codeFiles: codeFiles,
|
|
107
117
|
references: references,
|
|
108
118
|
});
|
|
109
|
-
}
|
|
119
|
+
}
|
|
110
120
|
this.logging.log('Total project references: ' + projects.length);
|
|
111
121
|
return {
|
|
112
122
|
EntryPath: this.normalizeSourceFileRelativePath(request.SolutionRootPath, request.SelectedProjectPath),
|
|
@@ -115,6 +125,25 @@ class ArtifactManager {
|
|
|
115
125
|
TransformNetStandardProjects: request.TransformNetStandardProjects,
|
|
116
126
|
};
|
|
117
127
|
}
|
|
128
|
+
async processPrivatePackages(request, reference, artifactReference) {
|
|
129
|
+
if (!request.PackageReferences) {
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
var thirdPartyPackage = request.PackageReferences.find(p => p.IsPrivatePackage && reference.RelativePath.includes(p.Id));
|
|
133
|
+
if (thirdPartyPackage) {
|
|
134
|
+
artifactReference.isThirdPartyPackage = true;
|
|
135
|
+
if (thirdPartyPackage.NetCompatibleAssemblyRelativePath && thirdPartyPackage.NetCompatibleAssemblyPath) {
|
|
136
|
+
const privatePackageRelativePath = path
|
|
137
|
+
.join(referencesFolderName, thirdPartyPackageFolderName, thirdPartyPackage.NetCompatibleAssemblyRelativePath)
|
|
138
|
+
.toLowerCase();
|
|
139
|
+
await this.copyFile(thirdPartyPackage.NetCompatibleAssemblyPath, this.getWorkspaceReferencePathFromRelativePath(privatePackageRelativePath));
|
|
140
|
+
artifactReference.netCompatibleRelativePath = privatePackageRelativePath;
|
|
141
|
+
}
|
|
142
|
+
if (thirdPartyPackage.NetCompatiblePackageVersion) {
|
|
143
|
+
artifactReference.netCompatibleVersion = thirdPartyPackage.NetCompatiblePackageVersion;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
118
147
|
async zipArtifact() {
|
|
119
148
|
const folderPath = path.join(this.workspacePath, artifactFolderName);
|
|
120
149
|
if (!fs.existsSync(folderPath)) {
|
|
@@ -126,9 +155,12 @@ class ArtifactManager {
|
|
|
126
155
|
await this.zipDirectory(folderPath, zipPath);
|
|
127
156
|
return zipPath;
|
|
128
157
|
}
|
|
129
|
-
static
|
|
158
|
+
static async getSha256Async(fileName) {
|
|
130
159
|
const hasher = crypto.createHash('sha256');
|
|
131
|
-
|
|
160
|
+
const stream = fs.createReadStream(fileName);
|
|
161
|
+
for await (const chunk of stream) {
|
|
162
|
+
hasher.update(chunk);
|
|
163
|
+
}
|
|
132
164
|
return hasher.digest('base64');
|
|
133
165
|
}
|
|
134
166
|
getRequirementJsonPath() {
|
|
@@ -168,7 +200,7 @@ class ArtifactManager {
|
|
|
168
200
|
return archive.finalize();
|
|
169
201
|
});
|
|
170
202
|
}
|
|
171
|
-
async
|
|
203
|
+
async writeRequirementJsonAsync(dir, fileContent) {
|
|
172
204
|
const fileName = path.join(dir, requriementJsonFileName);
|
|
173
205
|
fs.writeFileSync(fileName, fileContent);
|
|
174
206
|
}
|
|
@@ -177,24 +209,32 @@ class ArtifactManager {
|
|
|
177
209
|
fs.mkdirSync(dir, { recursive: true });
|
|
178
210
|
}
|
|
179
211
|
}
|
|
180
|
-
copyFile(sourceFilePath, destFilePath) {
|
|
212
|
+
async copyFile(sourceFilePath, destFilePath) {
|
|
181
213
|
const dir = path.dirname(destFilePath);
|
|
182
214
|
this.createFolderIfNotExist(dir);
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
catch (err) {
|
|
187
|
-
if (!fs.existsSync(dir) && dir.includes(packagesFolderName)) {
|
|
188
|
-
//Packages folder has been deleted to avoid duplicates in artifacts.zip
|
|
189
|
-
return;
|
|
190
|
-
}
|
|
191
|
-
this.logging.log(`Failed to copy from ${sourceFilePath} and error is ${err}`);
|
|
215
|
+
if (!fs.existsSync(dir) && dir.includes(packagesFolderName)) {
|
|
216
|
+
//Packages folder has been deleted to avoid duplicates in artifacts.zip
|
|
217
|
+
return;
|
|
192
218
|
}
|
|
219
|
+
return new Promise((resolve, reject) => {
|
|
220
|
+
fs.copyFile(sourceFilePath, destFilePath, err => {
|
|
221
|
+
if (err) {
|
|
222
|
+
this.logging.log(`Failed to copy from ${sourceFilePath} and error is ${err}`);
|
|
223
|
+
reject(err);
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
resolve();
|
|
227
|
+
}
|
|
228
|
+
});
|
|
229
|
+
});
|
|
193
230
|
}
|
|
194
|
-
|
|
231
|
+
async calculateMD5Async(filePath) {
|
|
195
232
|
try {
|
|
196
|
-
const
|
|
197
|
-
const
|
|
233
|
+
const hash = crypto.createHash('md5');
|
|
234
|
+
const stream = fs.createReadStream(filePath);
|
|
235
|
+
for await (const chunk of stream) {
|
|
236
|
+
hash.update(chunk);
|
|
237
|
+
}
|
|
198
238
|
return hash.digest('hex');
|
|
199
239
|
}
|
|
200
240
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifactManager.js","sourceRoot":"","sources":["../../../src/language-server/netTransform/artifactManager.ts"],"names":[],"mappings":";;;AACA,qCAAoC;AACpC,iCAAgC;AAChC,yBAAwB;AAExB,6BAA6B;AAC7B,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AAClD,MAAM,kBAAkB,GAAG,UAAU,CAAA;AACrC,MAAM,oBAAoB,GAAG,YAAY,CAAA;AACzC,MAAM,WAAW,GAAG,cAAc,CAAA;AAClC,MAAM,oBAAoB,GAAG,YAAY,CAAA;AACzC,MAAM,kBAAkB,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"artifactManager.js","sourceRoot":"","sources":["../../../src/language-server/netTransform/artifactManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.emitTransformationJobArtifactsDownloadedFailure = exports.emitTransformationJobArtifactsDownloadedTelemetry = exports.emitTransformationPlanReceivedFailure = exports.emitTransformationPlanReceivedTelemetry = exports.emitTransformationJobPolledForPlanFailure = exports.emitTransformationJobPolledForPlanTelemetry = exports.emitTransformationJobPolledFailure = exports.emitTransformationJobPolledTelemetry = exports.emitTransformationJobCancelledFailure = exports.emitTransformationJobCancelledTelemetry = exports.emitTransformationJobReceivedFailure = exports.emitTransformationJobReceivedTelemetry = exports.emitTransformationJobStartedFailure = exports.emitTransformationJobStartedTelemetry = exports.CODETRANSFORM_CATEGORY = void 0;
|
|
4
|
-
const utils_1 = require("
|
|
4
|
+
const utils_1 = require("../../shared/utils");
|
|
5
5
|
exports.CODETRANSFORM_CATEGORY = 'codeTransform';
|
|
6
6
|
const emitTransformationJobStartedTelemetry = (telemetry, response) => {
|
|
7
7
|
const data = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/language-server/netTransform/metrics.ts"],"names":[],"mappings":";;;AAsBA,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/language-server/netTransform/metrics.ts"],"names":[],"mappings":"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"}
|