(maint) Simple eslint fixes

Apply all eslint automated fixes using existing rulesets.

Author: jpogran

src/configuration.ts

@@ -139,7 +139,7 @@ export class AggregateConfiguration implements IAggregateConfiguration {
   }
 
   private safeJoin(...paths: string[]): string {
-    let foundUndefined: Boolean = false;
+    let foundUndefined = false;
     // path.join makes sure that no elements are 'undefined' and throws if there is. Instead
     // we can search for it and just return undefined ourself.
     paths.forEach((item) => {
@@ -182,24 +182,24 @@ export class AggregateConfiguration implements IAggregateConfiguration {
     puppetBaseDir: string,
     rubydir: string,
   ): string {
-    return new Array(
+    return [
       path.join(puppetDir, 'bin'),
       path.join(facterDir, 'bin'),
       // path.join(hieraDir, 'bin'),
       path.join(puppetBaseDir, 'bin'),
       path.join(rubydir, 'bin'),
       path.join(puppetBaseDir, 'sys', 'tools', 'bin'),
-    ).join(PathResolver.pathEnvSeparator());
+    ].join(PathResolver.pathEnvSeparator());
   }
 
   // RUBYLIB=%PUPPET_DIR%\lib;%FACTERDIR%\lib;%HIERA_DIR%\lib;%RUBYLIB%
   private calculateRubylib(puppetDir: string, facterDir: string): string {
     return this.replaceSlashes(
-      new Array(
+      [
         path.join(puppetDir, 'lib'),
         path.join(facterDir, 'lib'),
         // path.join(this.hieraDir, 'lib'),
-      ).join(PathResolver.pathEnvSeparator()),
+      ].join(PathResolver.pathEnvSeparator()),
     );
   }
 
@@ -232,7 +232,7 @@ export class AggregateConfiguration implements IAggregateConfiguration {
   }
 
   private getAgentBasePath() {
-    let programFiles = PathResolver.getprogramFiles();
+    const programFiles = PathResolver.getprogramFiles();
     switch (process.platform) {
       case 'win32':
         // On Windows we have a subfolder called 'Puppet' that has
@@ -245,7 +245,7 @@ export class AggregateConfiguration implements IAggregateConfiguration {
   }
 
   private getPdkBasePath() {
-    let programFiles = PathResolver.getprogramFiles();
+    const programFiles = PathResolver.getprogramFiles();
     switch (process.platform) {
       case 'win32':
         return path.join(programFiles, 'Puppet Labs', 'DevelopmentKit');
@@ -255,9 +255,9 @@ export class AggregateConfiguration implements IAggregateConfiguration {
   }
 
   private getPdkVersionFromFile(puppetBaseDir: string) {
-    let basePath = path.join(puppetBaseDir, 'PDK_VERSION');
+    const basePath = path.join(puppetBaseDir, 'PDK_VERSION');
     if (fs.existsSync(basePath)) {
-      let contents = fs.readFileSync(basePath, 'utf8').toString();
+      const contents = fs.readFileSync(basePath, 'utf8').toString();
       return contents.trim();
     } else {
       return '';
@@ -268,8 +268,8 @@ export class AggregateConfiguration implements IAggregateConfiguration {
     if (!fs.existsSync(rootDir)) {
       return undefined;
     }
-    var files = fs.readdirSync(rootDir);
-    let result = files.sort((a, b) => a.localeCompare(b, undefined, { numeric: true })).reverse()[0];
+    const files = fs.readdirSync(rootDir);
+    const result = files.sort((a, b) => a.localeCompare(b, undefined, { numeric: true })).reverse()[0];
     return path.join(rootDir, result);
   }
 

src/configuration/pathResolver.ts

@@ -18,12 +18,12 @@ export class PathResolver {
   }
 
   public static resolveSubDirectory(rootDir: string, subDir: string) {
-    var versionDir = path.join(rootDir, subDir);
+    const versionDir = path.join(rootDir, subDir);
 
     if (fs.existsSync(versionDir)) {
       return versionDir;
     } else {
-      var subdir = PathResolver.getDirectories(rootDir)[1];
+      const subdir = PathResolver.getDirectories(rootDir)[1];
       return subdir;
     }
   }

src/configuration/pdkResolver.ts

@@ -84,7 +84,7 @@ class PDKRubyInstances implements IPDKRubyInstances {
       return this.rubyInstances;
     }
 
-    var rubyDir = path.join(this.pdkDirectory, 'private', 'ruby');
+    const rubyDir = path.join(this.pdkDirectory, 'private', 'ruby');
     if (!fs.existsSync(rubyDir)) {
       return this.rubyInstances;
     }
@@ -199,7 +199,7 @@ class PDKRubyInstance implements IPDKRubyInstance {
       return this._puppetVersions;
     }
     this._puppetVersions = [];
-    let gemdir = path.join(this._rubyVerDir, 'gems');
+    const gemdir = path.join(this._rubyVerDir, 'gems');
     if (!fs.existsSync(gemdir)) {
       return this._puppetVersions;
     }
@@ -208,7 +208,7 @@ class PDKRubyInstance implements IPDKRubyInstance {
     // the gem cache is just as easy and doesn't need to spawn a ruby process per
     // ruby version.
     fs.readdirSync(gemdir).forEach((item) => {
-      let pathMatch = item.match(/^puppet-(\d+\.\d+\.\d+)(?:(-|$))/);
+      const pathMatch = item.match(/^puppet-(\d+\.\d+\.\d+)(?:(-|$))/);
       if (pathMatch !== null) {
         this._puppetVersions.push(pathMatch[1]);
       }
@@ -242,7 +242,7 @@ class PDKRubyInstance implements IPDKRubyInstance {
     // This is a little naive however there doesn't appear to be a native semver module
     // loaded in VS Code. The gem path is always the <Major>.<Minor>.0 version of the
     // corresponding Ruby version
-    let gemDirName = this._rubyVersion.replace(/\.\d+$/, '.0');
+    const gemDirName = this._rubyVersion.replace(/\.\d+$/, '.0');
     // Calculate gem paths
     this._rubyVerDir = path.join(pdkDirectory, 'private', 'puppet', 'ruby', gemDirName);
     this._gemVerDir = path.join(this._rubyDir, 'lib', 'ruby', 'gems', gemDirName);

src/extension.ts

@@ -36,9 +36,9 @@ let configSettings: IAggregateConfiguration;
 let extensionFeatures: IFeature[] = [];
 
 export function activate(context: vscode.ExtensionContext) {
-  let pkg = vscode.extensions.getExtension('jpogran.puppet-vscode');
+  const pkg = vscode.extensions.getExtension('jpogran.puppet-vscode');
   if (pkg) {
-    let message =
+    const message =
       'The "jpogran.puppet-vscode" extension has been detected, which will conflict with the "puppet.puppet-vscode" extension. This will cause problems activating when each extension tries to load at the same time and may cause errors. Please uninstall it by executing the following from the commandline: "code --uninstall-extension jpogran.puppet-vscode"';
     vscode.window.showWarningMessage(message, { modal: false });
   }
@@ -116,7 +116,7 @@ export function activate(context: vscode.ExtensionContext) {
     extensionFeatures.push(new PuppetModuleHoverFeature(extContext, logger));
   }
 
-  let facts = new PuppetFactsProvider(connectionHandler);
+  const facts = new PuppetFactsProvider(connectionHandler);
   vscode.window.registerTreeDataProvider('puppetFacts', facts);
 }
 
@@ -134,9 +134,9 @@ export function deactivate() {
 
 function checkForLegacySettings() {
   // Raise a warning if we detect any legacy settings
-  const legacySettingValues: Map<string, Object> = legacySettings();
+  const legacySettingValues: Map<string, Record<string, any>> = legacySettings();
   if (legacySettingValues.size > 0) {
-    let settingNames: string[] = [];
+    const settingNames: string[] = [];
     for (const [settingName, _value] of legacySettingValues) {
       settingNames.push(settingName);
     }
@@ -163,7 +163,7 @@ function checkInstallDirectory(config: IAggregateConfiguration, logger: ILogger)
     // Need to use SettingsFromWorkspace() here because the AggregateConfiguration
     // changes the installType from Auto, to its calculated value
     if (SettingsFromWorkspace().installType === PuppetInstallType.AUTO) {
-      let m = [
+      const m = [
         'The extension failed to find a Puppet installation automatically in the default locations for PDK and for Puppet Agent.',
         'While syntax highlighting and grammar detection will still work, intellisense and other advanced features will not.',
       ];

src/feature/BoltFeature.ts

@@ -8,7 +8,7 @@ export class BoltFeature implements IFeature {
   dispose() {}
 
   showDeprecation() {
-    let message =
+    const message =
       'The "Open Bolt User Configuration File" and "Open Bolt User Inventory File" commands will be removed in a future release. Do you think they should be kept? Think there are other ways for this extension to help using Puppet Bolt? Let us know by clicking "Feedback" to add a comment to Github Issue #639';
     window.showWarningMessage(message, { modal: false }, { title: 'Feedback' }).then((result) => {
       if (result === undefined) {
@@ -26,7 +26,7 @@ export class BoltFeature implements IFeature {
       commands.registerCommand('puppet-bolt.OpenUserConfigFile', () => {
         this.showDeprecation();
 
-        let userInventoryFile = path.join(process.env['USERPROFILE'] || '~', '.puppetlabs', 'bolt', 'bolt.yaml');
+        const userInventoryFile = path.join(process.env['USERPROFILE'] || '~', '.puppetlabs', 'bolt', 'bolt.yaml');
 
         this.openOrCreateFile(
           userInventoryFile,
@@ -44,7 +44,7 @@ export class BoltFeature implements IFeature {
       commands.registerCommand('puppet-bolt.OpenUserInventoryFile', () => {
         this.showDeprecation();
 
-        let userInventoryFile = path.join(process.env['USERPROFILE'] || '~', '.puppetlabs', 'bolt', 'inventory.yaml');
+        const userInventoryFile = path.join(process.env['USERPROFILE'] || '~', '.puppetlabs', 'bolt', 'inventory.yaml');
 
         this.openOrCreateFile(
           userInventoryFile,

src/feature/DebuggingFeature.ts

@@ -36,15 +36,15 @@ export class DebugAdapterDescriptorFactory implements vscode.DebugAdapterDescrip
   ): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
     // Right now we don't care about session as we only have one type of adapter, which is launch.  When
     // we add the ability to attach to a debugger remotely we'll need to switch scenarios based on `session`
-    let thisFactory = this;
+    const thisFactory = this;
 
     return new Promise<vscode.DebugAdapterDescriptor>(function (resolve, reject) {
-      let debugServer = CommandEnvironmentHelper.getDebugServerRubyEnvFromConfiguration(
+      const debugServer = CommandEnvironmentHelper.getDebugServerRubyEnvFromConfiguration(
         thisFactory.Context.asAbsolutePath(thisFactory.Config.ruby.debugServerPath),
         thisFactory.Config,
       );
 
-      let spawn_options: cp.SpawnOptions = {};
+      const spawn_options: cp.SpawnOptions = {};
       spawn_options.env = debugServer.options.env;
       spawn_options.stdio = 'pipe';
       if (process.platform !== 'win32') {
@@ -54,17 +54,17 @@ export class DebugAdapterDescriptorFactory implements vscode.DebugAdapterDescrip
       thisFactory.Logger.verbose(
         'Starting the Debug Server with ' + debugServer.command + ' ' + debugServer.args.join(' '),
       );
-      let debugServerProc = cp.spawn(debugServer.command, debugServer.args, spawn_options);
+      const debugServerProc = cp.spawn(debugServer.command, debugServer.args, spawn_options);
       thisFactory.ChildProcesses.push(debugServerProc);
 
-      let debugSessionRunning: boolean = false;
+      let debugSessionRunning = false;
       debugServerProc.stdout.on('data', (data) => {
         thisFactory.Logger.debug('Debug Server STDOUT: ' + data.toString());
         // If the debug client isn't already running and it's sent the trigger text, start up a client
         if (!debugSessionRunning && data.toString().match('DEBUG SERVER RUNNING') !== null) {
           debugSessionRunning = true;
 
-          var p = data.toString().match(/DEBUG SERVER RUNNING (.*):(\d+)/);
+          const p = data.toString().match(/DEBUG SERVER RUNNING (.*):(\d+)/);
           if (p === null) {
             reject('Debug Server started but unable to parse hostname and port');
           } else {
@@ -119,7 +119,7 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
   }
 
   private createLaunchConfigFromContext(folder: vscode.WorkspaceFolder | undefined): vscode.DebugConfiguration {
-    let config = {
+    const config = {
       type: this.debugType,
       request: 'launch',
       name: 'Puppet Apply current file',

src/feature/FormatDocumentFeature.ts

@@ -32,7 +32,7 @@ class FormatDocumentProvider {
       return [];
     }
 
-    let requestParams = new RequestParams();
+    const requestParams = new RequestParams();
     requestParams.documentUri = document.uri.toString(false);
     requestParams.alwaysReturnContent = false;
 

src/feature/PDKFeature.ts

@@ -53,12 +53,12 @@ export class PDKFeature implements IFeature {
   }
 
   private pdkNewModuleCommand() {
-    let nameOpts: vscode.QuickPickOptions = {
+    const nameOpts: vscode.QuickPickOptions = {
       placeHolder: 'Enter a name for the new Puppet module',
       matchOnDescription: true,
       matchOnDetail: true,
     };
-    let dirOpts: vscode.QuickPickOptions = {
+    const dirOpts: vscode.QuickPickOptions = {
       placeHolder: 'Enter a path for the new Puppet module',
       matchOnDescription: true,
       matchOnDetail: true,
@@ -81,7 +81,7 @@ export class PDKFeature implements IFeature {
   }
 
   private pdkNewClassCommand() {
-    let nameOpts: vscode.QuickPickOptions = {
+    const nameOpts: vscode.QuickPickOptions = {
       placeHolder: 'Enter a name for the new Puppet class',
       matchOnDescription: true,
       matchOnDetail: true,
@@ -96,7 +96,7 @@ export class PDKFeature implements IFeature {
   }
 
   private pdkNewTaskCommand() {
-    let nameOpts: vscode.QuickPickOptions = {
+    const nameOpts: vscode.QuickPickOptions = {
       placeHolder: 'Enter a name for the new Puppet Task',
       matchOnDescription: true,
       matchOnDetail: true,

src/feature/PuppetModuleHoverFeature.ts

@@ -5,7 +5,7 @@ import { ILogger } from '../logging';
 
 export class PuppetModuleHoverFeature implements IFeature {
   constructor(public context: vscode.ExtensionContext, public logger: ILogger) {
-    let selector = [{ language: 'json', scheme: '*', pattern: '**/metadata.json' }];
+    const selector = [{ language: 'json', scheme: '*', pattern: '**/metadata.json' }];
     context.subscriptions.push(vscode.languages.registerHoverProvider(selector, new PuppetModuleHoverProvider(logger)));
   }
 
@@ -40,10 +40,10 @@ export class PuppetModuleHoverProvider implements vscode.HoverProvider {
 
     this.logger.debug('Metadata hover info found ' + word + ' module');
 
-    let name = word.replace('"', '').replace('"', '').replace('/', '-');
+    const name = word.replace('"', '').replace('"', '').replace('/', '-');
 
     return this.getModuleInfo(name).then(function (result: any) {
-      let msg: string[] = [];
+      const msg: string[] = [];
       msg.push(`### ${result.slug}`);
 
       const releaseDate = new Date(result.releases[0].created_at);
@@ -64,14 +64,14 @@ export class PuppetModuleHoverProvider implements vscode.HoverProvider {
         msg.push(`\nProject: \[${result.homepage_url}\](${result.homepage_url})\n`);
       }
 
-      let md = msg.join('\n');
+      const md = msg.join('\n');
 
       return Promise.resolve(new vscode.Hover(new vscode.MarkdownString(md), range));
     });
   }
 
   private getModuleInfo(name: string) {
-    var options = {
+    const options = {
       url: `https://forgeapi.puppet.com/v3/modules/${name}?exclude_fields=readme%20changelog%20license%20reference`,
     };
     return new Promise(function (resolve, reject) {

src/feature/PuppetNodeGraphFeature.ts

@@ -40,7 +40,7 @@ export class PuppetNodeGraphFeature implements IFeature {
           return;
         }
 
-        let provider = new NodeGraphWebViewProvider(
+        const provider = new NodeGraphWebViewProvider(
           vscode.window.activeTextEditor.document.uri,
           handler,
           logger,
@@ -81,7 +81,7 @@ class NodeGraphWebViewProvider implements vscode.Disposable {
     protected logger: ILogger,
     protected context: vscode.ExtensionContext,
   ) {
-    let fileName = path.basename(resource.fsPath);
+    const fileName = path.basename(resource.fsPath);
     this.panel = vscode.window.createWebviewPanel(
       'puppetNodeGraph', // Identifies the type of the webview. Used internally
       `Node Graph '${fileName}'`, // Title of the panel displayed to the user
@@ -104,8 +104,8 @@ class NodeGraphWebViewProvider implements vscode.Disposable {
     });
   }
 
-  async show(redraw: boolean = false) {
-    let notificationType = this.getNotificationType();
+  async show(redraw = false) {
+    const notificationType = this.getNotificationType();
     if (notificationType === undefined) {
       return this.connectionHandler.languageClient
         .sendRequest(PuppetNodeGraphRequest.type, {
@@ -165,7 +165,7 @@ class NodeGraphWebViewProvider implements vscode.Disposable {
     // Calculate where the progress message should go, if at all.
     const currentSettings: ISettings = SettingsFromWorkspace();
 
-    var notificationType = vscode.ProgressLocation.Notification;
+    let notificationType = vscode.ProgressLocation.Notification;
 
     if (currentSettings.notification !== undefined && currentSettings.notification.nodeGraph !== undefined) {
       switch (currentSettings.notification.nodeGraph.toLowerCase()) {
@@ -187,17 +187,17 @@ class NodeGraphWebViewProvider implements vscode.Disposable {
   }
 
   private getHtml(extensionPath: string): string {
-    let cytoPath = this.panel.webview.asWebviewUri(
+    const cytoPath = this.panel.webview.asWebviewUri(
       vscode.Uri.file(path.join(extensionPath, 'vendor', 'cytoscape', 'cytoscape.min.js')),
     );
-    let mainScript = this.panel.webview.asWebviewUri(
+    const mainScript = this.panel.webview.asWebviewUri(
       vscode.Uri.file(path.join(extensionPath, 'assets', 'js', 'main.js')),
     );
-    let mainCss = this.panel.webview.asWebviewUri(
+    const mainCss = this.panel.webview.asWebviewUri(
       vscode.Uri.file(path.join(extensionPath, 'assets', 'css', 'main.css')),
     );
 
-    let html = `<!DOCTYPE html>
+    const html = `<!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">