ci(lint): rule to detect index.ts imports in core

.eslintrc.js

@@ -180,6 +180,7 @@ module.exports = {
         'aws-toolkits/no-console-log': 'error',
         'aws-toolkits/no-json-stringify-in-log': 'error',
         'aws-toolkits/no-printf-mismatch': 'error',
+        'aws-toolkits/no-index-import': 'error',
         'no-restricted-imports': [
             'error',
             {

packages/core/src/amazonq/commons/connector/baseMessenger.ts

@@ -5,7 +5,6 @@
 
 import { ChatItemAction, ProgressField } from '@aws/mynah-ui'
 import { AuthFollowUpType, AuthMessageDataMap } from '../../../amazonq/auth/model'
-import { FeatureAuthState } from '../../../codewhisperer'
 import { i18n } from '../../../shared/i18n-helper'
 import { CodeReference } from '../../../amazonq/webview/ui/connector'
 
@@ -28,6 +27,7 @@ import {
 import { FollowUpTypes } from '../types'
 import { messageWithConversationId } from '../../../amazonqFeatureDev/userFacingText'
 import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
+import { FeatureAuthState } from '../../../codewhisperer/util/authUtil'
 
 export class Messenger {
     public constructor(

packages/core/src/amazonq/commons/controllers/contentController.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import path from 'path'
 import { Position, TextEditor, window } from 'vscode'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { amazonQDiffScheme, amazonQTabSuffix } from '../../../shared/constants'
 import { disposeOnEditorClose } from '../../../shared/utilities/editorUtilities'
 import {
@@ -15,7 +15,9 @@ import {
     getIndentedCode,
     getSelectionFromRange,
 } from '../../../shared/utilities/textDocumentUtilities'
-import { extractFileAndCodeSelectionFromMessage, fs, getErrorMsg, ToolkitError } from '../../../shared'
+import { ToolkitError, getErrorMsg } from '../../../shared/errors'
+import fs from '../../../shared/fs/fs'
+import { extractFileAndCodeSelectionFromMessage } from '../../../shared/utilities/textUtilities'
 import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
 
 export class ContentProvider implements vscode.TextDocumentContentProvider {

packages/core/src/amazonq/commons/diff.ts

@@ -4,7 +4,7 @@
  */
 
 import * as vscode from 'vscode'
-import { fs } from '../../shared'
+import { fs } from '../../shared/fs/fs'
 import { diffLines } from 'diff'
 
 export async function openDiff(leftPath: string, rightPath: string, tabId: string, scheme: string) {

packages/core/src/amazonq/commons/session/sessionConfigFactory.ts

@@ -5,8 +5,9 @@
 
 import * as vscode from 'vscode'
 import { WorkspaceFolderNotFoundError } from '../../../amazonqFeatureDev/errors'
-import { VirtualFileSystem, VirtualMemoryFile } from '../../../shared'
 import { CurrentWsFolders } from '../../../amazonqFeatureDev/types'
+import { VirtualFileSystem } from '../../../shared/virtualFilesystem'
+import { VirtualMemoryFile } from '../../../shared/virtualMemoryFile'
 
 export interface SessionConfig {
     // The paths on disk to where the source code lives

packages/core/src/amazonq/explorer/amazonQChildrenNodes.ts

@@ -11,8 +11,10 @@ import { installAmazonQExtension } from '../../codewhisperer/commands/basicComma
 import { amazonQHelpUrl } from '../../shared/constants'
 import { cwTreeNodeSource } from '../../codewhisperer/commands/types'
 import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
-import { globals, setContext } from '../../shared'
-import { ExtStartUpSources, telemetry } from '../../shared/telemetry'
+import globals from '../../shared/extensionGlobals'
+import { setContext } from '../../shared/vscode/setContext'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ExtStartUpSources } from '../../shared/telemetry/util'
 import { ExtensionUse } from '../../auth/utils'
 
 const localize = nls.loadMessageBundle()

packages/core/src/amazonq/extApi.ts

@@ -4,11 +4,11 @@
  */
 
 import vscode from 'vscode'
-import { VSCODE_EXTENSION_ID } from '../shared/utilities'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
 import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
 import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
 import { FeatureAuthState } from '../codewhisperer/util/authUtil'
-import { ToolkitError } from '../shared'
+import { ToolkitError } from '../shared/errors'
 
 /**
  * This interface is used and exported by the amazon q extension. If you make a change here then

packages/core/src/amazonq/index.ts

@@ -43,7 +43,7 @@ export { ExtensionMessage } from '../amazonq/webview/ui/commands'
 export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { extractAuthFollowUp } from './util/authUtils'
 export { Messenger } from './commons/connector/baseMessenger'
-import { FeatureContext } from '../shared'
+import { FeatureContext } from '../shared/featureConfig'
 
 /**
  * main from createMynahUI is a purely browser dependency. Due to this

packages/core/src/amazonq/lsp/lspClient.ts

@@ -32,7 +32,9 @@ import {
 } from './types'
 import { Writable } from 'stream'
 import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings'
-import { fs, getLogger, globals } from '../../shared'
+import { fs } from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+import globals from '../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
 

packages/core/src/amazonq/lsp/lspController.ts

@@ -16,9 +16,11 @@ import AdmZip from 'adm-zip'
 import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import { activate as activateLsp } from './lspClient'
-import { telemetry } from '../../shared/telemetry'
+import { telemetry } from '../../shared/telemetry/telemetry'
 import { isCloud9 } from '../../shared/extensionUtilities'
-import { fs, globals, ToolkitError } from '../../shared'
+import { fs } from '../../shared/fs/fs'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
 import { isWeb } from '../../shared/extensionGlobals'
 import { getUserAgent } from '../../shared/telemetry/util'
 import { isAmazonInternalOs } from '../../shared/vscode/env'

packages/core/src/amazonq/messages/chatMessageDuration.ts

@@ -4,8 +4,8 @@
  */
 
 import AsyncLock from 'async-lock'
-import { globals } from '../../shared'
-import { telemetry } from '../../shared/telemetry'
+import globals from '../../shared/extensionGlobals'
+import { telemetry } from '../../shared/telemetry/telemetry'
 import { Event, uiEventRecorder } from '../util/eventRecorder'
 import { CWCTelemetryHelper } from '../../codewhispererChat/controllers/chat/telemetryHelper'
 import { TabType } from '../webview/ui/storages/tabsStorage'

packages/core/src/amazonq/onboardingPage/walkthrough.ts

@@ -6,7 +6,7 @@
 import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
 import globals, { isWeb } from '../../shared/extensionGlobals'
 import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { Commands, placeholder } from '../../shared/vscode/commands2'
 import vscode from 'vscode'

packages/core/src/amazonq/util/authUtils.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { FeatureAuthState } from '../../codewhisperer'
+import { FeatureAuthState } from '../../codewhisperer/util/authUtil'
 import { AuthFollowUpType, AuthMessageDataMap } from '../auth/model'
 
 /**

packages/core/src/amazonq/webview/generators/webViewContent.ts

@@ -6,7 +6,9 @@
 import path from 'path'
 import { Uri, Webview } from 'vscode'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
-import { FeatureConfigProvider, FeatureContext, globals, isSageMaker } from '../../../shared'
+import { FeatureConfigProvider, FeatureContext } from '../../../shared/featureConfig'
+import globals from '../../../shared/extensionGlobals'
+import { isSageMaker } from '../../../shared/extensionUtilities'
 
 export class WebViewContentGenerator {
     private async generateFeatureConfigsData(): Promise<string> {

packages/core/src/amazonq/webview/messages/messageDispatcher.ts

@@ -7,12 +7,13 @@ import { Webview, Uri } from 'vscode'
 import { MessagePublisher } from '../../messages/messagePublisher'
 import { MessageListener } from '../../messages/messageListener'
 import { TabType } from '../ui/storages/tabsStorage'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { amazonqMark } from '../../../shared/performance/marks'
-import { telemetry } from '../../../shared/telemetry'
+import { telemetry } from '../../../shared/telemetry/telemetry'
 import { AmazonQChatMessageDuration } from '../../messages/chatMessageDuration'
-import { globals, openUrl } from '../../../shared'
 import { isClickTelemetry, isOpenAgentTelemetry } from '../ui/telemetry/actions'
+import globals from '../../../shared/extensionGlobals'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { DefaultAmazonQAppInitContext } from '../../apps/initContext'
 
 export function dispatchWebViewMessagesToApps(

packages/core/src/amazonq/webview/ui/main.ts

@@ -26,7 +26,7 @@ import { TextMessageHandler } from './messages/handler'
 import { MessageController } from './messages/controller'
 import { getActions, getDetails } from './diffTree/actions'
 import { DiffTreeFileInfo } from './diffTree/types'
-import { FeatureContext } from '../../../shared'
+import { FeatureContext } from '../../../shared/featureConfig'
 import { tryNewMap } from '../../util/functionUtils'
 import { welcomeScreenTabData } from './walkthrough/welcome'
 import { agentWalkthroughDataModel } from './walkthrough/agent'

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -9,7 +9,7 @@ import { FollowUpGenerator } from '../followUps/generator'
 import { QuickActionGenerator } from '../quickActions/generator'
 import { TabTypeDataMap } from './constants'
 import { agentWalkthroughDataModel } from '../walkthrough/agent'
-import { FeatureContext } from '../../../../shared'
+import { FeatureContext } from '../../../../shared/featureConfig'
 
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean

packages/core/src/amazonqDoc/app.ts

@@ -9,7 +9,7 @@ import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
 import { MessagePublisher } from '../amazonq/messages/messagePublisher'
 import { MessageListener } from '../amazonq/messages/messageListener'
 import { fromQueryToParameters } from '../shared/utilities/uriUtils'
-import { getLogger } from '../shared/logger'
+import { getLogger } from '../shared/logger/logger'
 import { AuthUtil } from '../codewhisperer/util/authUtil'
 import { debounce } from 'lodash'
 import { DocChatSessionStorage } from './storages/chatSession'

packages/core/src/amazonqDoc/controllers/chat/controller.ts

@@ -18,7 +18,7 @@ import {
     findReadmePath,
 } from '../../constants'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 
 import { Session } from '../../session/session'
 import { i18n } from '../../../shared/i18n-helper'

packages/core/src/amazonqDoc/controllers/docGenerationTask.ts

@@ -9,7 +9,7 @@ import {
     DocV2AcceptanceEvent,
     DocV2GenerationEvent,
 } from '../../codewhisperer/client/codewhispereruserclient'
-import { getLogger } from '../../shared'
+import { getLogger } from '../../shared/logger/logger'
 
 export class DocGenerationTask {
     // Telemetry fields

packages/core/src/amazonqDoc/messenger.ts

@@ -4,7 +4,7 @@
  */
 import { Messenger } from '../amazonq/commons/connector/baseMessenger'
 import { AppToWebViewMessageDispatcher } from '../amazonq/commons/connector/connectorMessages'
-import { messageWithConversationId } from '../amazonqFeatureDev'
+import { messageWithConversationId } from '../amazonqFeatureDev/userFacingText'
 import { i18n } from '../shared/i18n-helper'
 import { docGenerationProgressMessage, DocGenerationStep, Mode, NewSessionFollowUps } from './constants'
 import { inProgress } from './types'

packages/core/src/amazonqDoc/session/session.ts

@@ -7,10 +7,8 @@ import { docScheme, featureName, Mode } from '../constants'
 import { DeletedFileInfo, Interaction, NewFileInfo, SessionState, SessionStateConfig } from '../types'
 import { PrepareCodeGenState } from './sessionState'
 import { telemetry } from '../../shared/telemetry/telemetry'
-import { extensionVersion, fs, getLogger, globals } from '../../shared'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { SessionConfig } from '../../amazonq/commons/session/sessionConfigFactory'
-import { ReferenceLogViewProvider } from '../../codewhisperer'
 import path from 'path'
 import { FeatureDevClient } from '../../amazonqFeatureDev/client/featureDev'
 import { TelemetryHelper } from '../../amazonqFeatureDev/util/telemetryHelper'
@@ -27,6 +25,11 @@ import {
 import { getClientId, getOperatingSystem, getOptOutPreference } from '../../shared/telemetry/util'
 import { DocMessenger } from '../messenger'
 import { computeDiff } from '../../amazonq/commons/diff'
+import { ReferenceLogViewProvider } from '../../codewhisperer/service/referenceLogViewProvider'
+import fs from '../../shared/fs/fs'
+import globals from '../../shared/extensionGlobals'
+import { extensionVersion } from '../../shared/vscode/env'
+import { getLogger } from '../../shared/logger/logger'
 
 export class Session {
     private _state?: SessionState | Omit<SessionState, 'uploadId'>

packages/core/src/amazonqDoc/session/sessionState.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import { ToolkitError } from '../../shared/errors'
 import globals from '../../shared/extensionGlobals'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { VirtualFileSystem } from '../../shared/virtualFilesystem'
 import { DocGenerationStep, docScheme, getFileSummaryPercentage, Mode } from '../constants'
@@ -28,14 +28,10 @@ import {
     SessionStateInteraction,
     SessionStatePhase,
 } from '../types'
-import {
-    EmptyCodeGenID,
-    Intent,
-    TelemetryHelper,
-    getDeletedFileInfos,
-    prepareRepoData,
-    registerNewFiles,
-} from '../../amazonqFeatureDev'
+import { TelemetryHelper } from '../../amazonqFeatureDev/util/telemetryHelper'
+import { EmptyCodeGenID, getDeletedFileInfos, registerNewFiles } from '../../amazonqFeatureDev/session/sessionState'
+import { Intent } from '../../amazonqFeatureDev/types'
+import { prepareRepoData } from '../../amazonqFeatureDev/util/files'
 import { uploadCode } from '../../amazonqFeatureDev/util/upload'
 import {
     ContentLengthError,

packages/core/src/amazonqFeatureDev/app.ts

@@ -10,7 +10,7 @@ import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
 import { MessagePublisher } from '../amazonq/messages/messagePublisher'
 import { MessageListener } from '../amazonq/messages/messageListener'
 import { fromQueryToParameters } from '../shared/utilities/uriUtils'
-import { getLogger } from '../shared/logger'
+import { getLogger } from '../shared/logger/logger'
 import { TabIdNotFoundError } from './errors'
 import { featureDevChat, featureDevScheme } from './constants'
 import globals from '../shared/extensionGlobals'

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -8,7 +8,7 @@ import { omit } from 'lodash'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { ServiceOptions } from '../../shared/awsClientBuilder'
 import globals from '../../shared/extensionGlobals'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import * as FeatureDevProxyClient from './featuredevproxyclient'
 import { featureName } from '../constants'
 import { CodeReference } from '../../amazonq/webview/ui/connector'
@@ -25,7 +25,7 @@ import { createCodeWhispererChatStreamingClient } from '../../shared/clients/cod
 import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
 import { extensionVersion } from '../../shared/vscode/env'
 import apiConfig = require('./codewhispererruntime-2022-11-11.json')
-import { UserWrittenCodeTracker } from '../../codewhisperer'
+import { UserWrittenCodeTracker } from '../../codewhisperer/tracker/userWrittenCodeTracker'
 import {
     FeatureDevCodeAcceptanceEvent,
     FeatureDevCodeGenerationEvent,

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -33,7 +33,7 @@ import { featureDevScheme, featureName, generateDevFilePrompt } from '../../cons
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { submitFeedback } from '../../../feedback/vue/submitFeedback'
 import { placeholder } from '../../../shared/vscode/commands2'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
@@ -44,8 +44,8 @@ import { getWorkspaceFoldersByPrefixes } from '../../../shared/utilities/workspa
 import { openDeletedDiff, openDiff } from '../../../amazonq/commons/diff'
 import { i18n } from '../../../shared/i18n-helper'
 import globals from '../../../shared/extensionGlobals'
-import { CodeWhispererSettings } from '../../../codewhisperer'
-import { randomUUID } from '../../../shared'
+import { CodeWhispererSettings } from '../../../codewhisperer/util/codewhispererSettings'
+import { randomUUID } from '../../../shared/crypto'
 import { FollowUpTypes } from '../../../amazonq/commons/types'
 import { Messenger } from '../../../amazonq/commons/connector/baseMessenger'
 import { BaseChatSessionStorage } from '../../../amazonq/commons/baseChatStorage'

packages/core/src/amazonqFeatureDev/session/session.ts

@@ -23,7 +23,7 @@ import { telemetry } from '../../shared/telemetry/telemetry'
 import { TelemetryHelper } from '../util/telemetryHelper'
 import { ReferenceLogViewProvider } from '../../codewhisperer/service/referenceLogViewProvider'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
-import { getLogger } from '../../shared'
+import { getLogger } from '../../shared/logger/logger'
 import { logWithConversationId } from '../userFacingText'
 import { CodeReference } from '../../amazonq/webview/ui/connector'
 import { MynahIcons } from '@aws/mynah-ui'

packages/core/src/amazonqFeatureDev/session/sessionState.ts

@@ -8,7 +8,7 @@ import * as path from 'path'
 import * as vscode from 'vscode'
 import { ToolkitError } from '../../shared/errors'
 import globals from '../../shared/extensionGlobals'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { VirtualFileSystem } from '../../shared/virtualFilesystem'
 import { VirtualMemoryFile } from '../../shared/virtualMemoryFile'

packages/core/src/amazonqFeatureDev/util/files.ts

@@ -16,8 +16,8 @@ import { AmazonqCreateUpload, Span, telemetry as amznTelemetry } from '../../sha
 import { TelemetryHelper } from './telemetryHelper'
 import { maxRepoSizeBytes } from '../constants'
 import { isCodeFile } from '../../shared/filetypes'
-import { fs } from '../../shared'
-import { CodeWhispererSettings } from '../../codewhisperer'
+import { fs } from '../../shared/fs/fs'
+import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings'
 import { ZipStream } from '../../shared/utilities/zipStream'
 
 export async function checkForDevFile(root: string) {

packages/core/src/amazonqFeatureDev/util/telemetryHelper.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { globals } from '../../shared'
+import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger/logger'
 import { AmazonqApproachInvoke, AmazonqCodeGenerationInvoke, Span } from '../../shared/telemetry/telemetry'
 import { LLMResponseType } from '../types'

packages/core/src/amazonqFeatureDev/util/upload.ts

@@ -8,7 +8,7 @@ import { getLogger } from '../../shared/logger/logger'
 import { featureName } from '../constants'
 
 import { UploadCodeError, UploadURLExpired } from '../errors'
-import { ToolkitError } from '../../shared'
+import { ToolkitError } from '../../shared/errors'
 import { i18n } from '../../shared/i18n-helper'
 
 /**

packages/core/src/amazonqGumby/activation.ts

@@ -16,7 +16,7 @@ import { transformByQState } from '../codewhisperer/models/model'
 import { ProposedTransformationExplorer } from '../codewhisperer/service/transformByQ/transformationResultsViewProvider'
 import { CodeTransformTelemetryState } from './telemetry/codeTransformTelemetryState'
 import { telemetry } from '../shared/telemetry/telemetry'
-import { setContext } from '../shared'
+import { setContext } from '../shared/vscode/setContext'
 
 export async function activate(context: ExtContext) {
     void setContext('gumby.wasQCodeTransformationUsed', false)