refactor: eliminate use of "namespace" #3968

Problem:
namespace is deprecated and unnecessary.

Solution:
remove use of `namespace`.
add a lint rule to prevent it.
clean up old dead code.

Author: justinmk3

.eslintignore

@@ -4,6 +4,6 @@ src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
 src/codewhisperer/client/codewhispereruserclient.d.ts
 **/*.gen.ts
-src/testFixtures/workspaceFolder/ts-plain-sam-app/
+src/testFixtures/**
 dist/**
 types/*.d.ts

.eslintrc.js

@@ -85,9 +85,7 @@ module.exports = {
         // TODO reenable this rule, tests mostly break this one (by changing off to error)
         // This currently produces 700 non fixable by --fix errors
         'sort-imports': 'off',
-        // TODO rennable this rule (by removing this off)
-        // namespaces are not great and we should stop using them
-        '@typescript-eslint/no-namespace': 'off',
+        '@typescript-eslint/no-namespace': 'error',
         // Turn this on by removing off when we fix namespaces
         'no-inner-declarations': 'off',
         // This is off because prettier takes care of it

src/awsexplorer/commands/copyText.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Env } from '../../shared/vscode/env'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
 import { TreeShim } from '../../shared/treeview/utils'
@@ -12,19 +11,18 @@ export type copyableText = 'ARN' | 'name' | 'id'
 
 export async function copyTextCommand(
     node: AWSResourceNode | TreeShim<AWSResourceNode>,
-    text: copyableText,
-    env = Env.vscode()
+    text: copyableText
 ): Promise<void> {
     node = node instanceof TreeShim ? node.node.resource : node
     switch (text) {
         case 'ARN':
-            await copyToClipboard(node.arn, text, env)
+            await copyToClipboard(node.arn, text)
             break
         case 'name':
-            await copyToClipboard(node.name, text, env)
+            await copyToClipboard(node.name, text)
             break
         case 'id':
-            await copyToClipboard(node.id!, text, env)
+            await copyToClipboard(node.id!, text)
             break
     }
 }

src/dynamicResources/commands/copyIdentifier.ts

@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
 import { telemetry } from '../../shared/telemetry/telemetry'
+import { copyToClipboard } from '../../shared/utilities/messages'
 
-export async function copyIdentifier(typeName: string, identifier: string, env = Env.vscode()) {
-    copyToClipboard(identifier, 'identifier', env)
+export async function copyIdentifier(typeName: string, identifier: string) {
+    copyToClipboard(identifier, 'identifier')
     telemetry.dynamicresource_copyIdentifier.emit({ resourceType: typeName })
 }

src/ecr/commands/copyRepositoryUri.ts

@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Env } from '../../shared/vscode/env'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
 import { telemetry } from '../../shared/telemetry/telemetry'
 
-export async function copyRepositoryUri(node: EcrRepositoryNode, env = Env.vscode()): Promise<void> {
+export async function copyRepositoryUri(node: EcrRepositoryNode): Promise<void> {
     const uri = node.repository.repositoryUri
-    await copyToClipboard(uri, 'URI', env)
+    await copyToClipboard(uri, 'URI')
     telemetry.ecr_copyRepositoryUri.emit()
 }

src/ecr/commands/copyTagUri.ts

@@ -4,12 +4,11 @@
  */
 
 import { EcrTagNode } from '../explorer/ecrTagNode'
-import { Env } from '../../shared/vscode/env'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { telemetry } from '../../shared/telemetry/telemetry'
 
-export async function copyTagUri(node: EcrTagNode, env = Env.vscode()): Promise<void> {
+export async function copyTagUri(node: EcrTagNode): Promise<void> {
     const uri = `${node.repository.repositoryUri}:${node.tag}`
-    await copyToClipboard(uri, 'URI', env)
+    await copyToClipboard(uri, 'URI')
     telemetry.ecr_copyTagUri.emit()
 }

src/eventSchemas/models/schemaCodeGenUtils.ts

@@ -65,24 +65,20 @@ class CodeGenPackageBuilder {
 
     public append(segment: string): CodeGenPackageBuilder {
         if (this.builder.length > 0) {
-            this.builder = this.builder.concat(IdentifierFormatter.packageSeparator)
+            this.builder = this.builder.concat(packageSeparator)
         }
-        this.builder = this.builder.concat(IdentifierFormatter.toValidIdentifier(segment.toLowerCase()))
+        this.builder = this.builder.concat(toValidIdentifier(segment.toLowerCase()))
 
         return this
     }
 }
 
-export namespace IdentifierFormatter {
-    export const packageSeparator = '.'
-    const potentialPackageSeparator = '@'
-    const notValidIdentifierRegex = new RegExp(`[^a-zA-Z0-9_${potentialPackageSeparator}]`, 'g')
-    const potentialPackageSeparatorRegex = new RegExp(potentialPackageSeparator, 'g')
-    const underscore = '_'
+export const packageSeparator = '.'
+const potentialPackageSeparator = '@'
+const notValidIdentifierRegex = new RegExp(`[^a-zA-Z0-9_${potentialPackageSeparator}]`, 'g')
+const potentialPackageSeparatorRegex = new RegExp(potentialPackageSeparator, 'g')
+const underscore = '_'
 
-    export function toValidIdentifier(name: string): string {
-        return name
-            .replace(notValidIdentifierRegex, underscore)
-            .replace(potentialPackageSeparatorRegex, packageSeparator)
-    }
+export function toValidIdentifier(name: string): string {
+    return name.replace(notValidIdentifierRegex, underscore).replace(potentialPackageSeparatorRegex, packageSeparator)
 }

src/eventSchemas/templates/schemasAppTemplateUtils.ts

@@ -4,7 +4,7 @@
  */
 
 import _ = require('lodash')
-import { IdentifierFormatter, SchemaCodeGenUtils } from '../../eventSchemas/models/schemaCodeGenUtils'
+import { SchemaCodeGenUtils, toValidIdentifier } from '../../eventSchemas/models/schemaCodeGenUtils'
 import { SchemaClient } from '../../shared/clients/schemaClient'
 
 const xAmazonEventSource = 'x-amazon-events-source'
@@ -92,13 +92,13 @@ function buildRootSchemaEventName(schemaNode: any, awsEventNode: any) {
     if (_.isString(refValue) && refValue.includes(componentsSchemasPath)) {
         const awsEventDetailRef = refValue.split(componentsSchemasPath).pop()
         if (!_.isEmpty(awsEventDetailRef)) {
-            return IdentifierFormatter.toValidIdentifier(awsEventDetailRef!)
+            return toValidIdentifier(awsEventDetailRef!)
         }
     }
 
     const schemaRoots = _.keysIn(_.get(schemaNode, components.concat('.', schemas)))
     if (!_.isEmpty(schemaRoots)) {
-        return IdentifierFormatter.toValidIdentifier(schemaRoots[0])
+        return toValidIdentifier(schemaRoots[0])
     }
 
     return undefined

src/iot/commands/copyEndpoint.ts

@@ -6,7 +6,6 @@
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { IotNode } from '../explorer/iotNodes'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { Env } from '../../shared/vscode/env'
 import { copyToClipboard } from '../../shared/utilities/messages'
 import { getLogger } from '../../shared/logger'
 
@@ -15,7 +14,7 @@ import { getLogger } from '../../shared/logger'
  *
  * Note that the path does not contain the bucket name or a leading slash.
  */
-export async function copyEndpointCommand(node: IotNode, env = Env.vscode()): Promise<void> {
+export async function copyEndpointCommand(node: IotNode): Promise<void> {
     getLogger().debug('CopyPath called for %O', node)
 
     let endpoint: string
@@ -27,5 +26,5 @@ export async function copyEndpointCommand(node: IotNode, env = Env.vscode()): Pr
         return
     }
 
-    copyToClipboard(endpoint, 'URL', env)
+    copyToClipboard(endpoint, 'URL')
 }

src/iot/explorer/iotCertFolderNode.ts

@@ -13,11 +13,12 @@ import { localize } from '../../shared/utilities/vsCodeUtils'
 import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
 import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
 import { inspect } from 'util'
-import { Workspace } from '../../shared/vscode/workspace'
 import { getLogger } from '../../shared/logger'
 import { IotCertWithPoliciesNode } from './iotCertificateNode'
 import { IotNode } from './iotNodes'
 import { Commands } from '../../shared/vscode/commands'
+import { Settings } from '../../shared/settings'
+import { ClassToInterfaceType } from '../../shared/utilities/tsUtils'
 
 /**
  * Represents the group of all IoT Certificates.
@@ -28,7 +29,7 @@ export class IotCertsFolderNode extends AWSTreeNodeBase implements LoadMoreNode
     public constructor(
         public readonly iot: IotClient,
         public readonly parent: IotNode,
-        private readonly workspace = Workspace.vscode()
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
     ) {
         super('Certificates', vscode.TreeItemCollapsibleState.Collapsed)
         this.tooltip = 'IoT Certificates'
@@ -99,6 +100,6 @@ export class IotCertsFolderNode extends AWSTreeNodeBase implements LoadMoreNode
     }
 
     private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
     }
 }