Autofix import/no-namespace

I'm leaving the rule turned off as it still has 100+ offenses that aren't
autofixable.

Author: elenatanasoiu

extensions/ql-vscode/gulpfile.ts/appInsights.ts

@@ -1,4 +1,4 @@
-import * as gulp from "gulp";
+import { src, dest } from "gulp";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const replace = require("gulp-replace");
 
@@ -13,8 +13,7 @@ export function injectAppInsightsKey() {
   }
 
   // replace the key
-  return gulp
-    .src(["out/telemetry.js"])
+  return src(["out/telemetry.js"])
     .pipe(replace(/REPLACE-APP-INSIGHTS-KEY/, process.env.APP_INSIGHTS_KEY))
-    .pipe(gulp.dest("out/"));
+    .pipe(dest("out/"));
 }

extensions/ql-vscode/gulpfile.ts/deploy.ts

@@ -1,5 +1,13 @@
-import * as fs from "fs-extra";
-import * as path from "path";
+import {
+  copy,
+  readFile,
+  mkdirs,
+  readdir,
+  unlinkSync,
+  remove,
+  writeFile,
+} from "fs-extra";
+import { resolve, join } from "path";
 
 export interface DeployedPackage {
   distPath: string;
@@ -25,12 +33,9 @@ async function copyPackage(
 ): Promise<void> {
   for (const file of packageFiles) {
     console.log(
-      `copying ${path.resolve(sourcePath, file)} to ${path.resolve(
-        destPath,
-        file,
-      )}`,
+      `copying ${resolve(sourcePath, file)} to ${resolve(destPath, file)}`,
     );
-    await fs.copy(path.resolve(sourcePath, file), path.resolve(destPath, file));
+    await copy(resolve(sourcePath, file), resolve(destPath, file));
   }
 }
 
@@ -39,13 +44,13 @@ export async function deployPackage(
 ): Promise<DeployedPackage> {
   try {
     const packageJson: any = JSON.parse(
-      await fs.readFile(packageJsonPath, "utf8"),
+      await readFile(packageJsonPath, "utf8"),
     );
 
     // Default to development build; use flag --release to indicate release build.
     const isDevBuild = !process.argv.includes("--release");
-    const distDir = path.join(__dirname, "../../../dist");
-    await fs.mkdirs(distDir);
+    const distDir = join(__dirname, "../../../dist");
+    await mkdirs(distDir);
 
     if (isDevBuild) {
       // NOTE: rootPackage.name had better not have any regex metacharacters
@@ -54,11 +59,11 @@ export async function deployPackage(
       );
       // Dev package filenames are of the form
       //    vscode-codeql-0.0.1-dev.2019.9.27.19.55.20.vsix
-      (await fs.readdir(distDir))
+      (await readdir(distDir))
         .filter((name) => name.match(oldDevBuildPattern))
         .map((build) => {
           console.log(`Deleting old dev build ${build}...`);
-          fs.unlinkSync(path.join(distDir, build));
+          unlinkSync(join(distDir, build));
         });
       const now = new Date();
       packageJson.version =
@@ -69,16 +74,16 @@ export async function deployPackage(
         `.${now.getUTCHours()}.${now.getUTCMinutes()}.${now.getUTCSeconds()}`;
     }
 
-    const distPath = path.join(distDir, packageJson.name);
-    await fs.remove(distPath);
-    await fs.mkdirs(distPath);
+    const distPath = join(distDir, packageJson.name);
+    await remove(distPath);
+    await mkdirs(distPath);
 
-    await fs.writeFile(
-      path.join(distPath, "package.json"),
+    await writeFile(
+      join(distPath, "package.json"),
       JSON.stringify(packageJson, null, 2),
     );
 
-    const sourcePath = path.join(__dirname, "..");
+    const sourcePath = join(__dirname, "..");
     console.log(
       `Copying package '${packageJson.name}' and its dependencies to '${distPath}'...`,
     );

extensions/ql-vscode/gulpfile.ts/index.ts

@@ -1,14 +1,14 @@
-import * as gulp from "gulp";
+import { series, parallel } from "gulp";
 import { compileTypeScript, watchTypeScript, cleanOutput } from "./typescript";
 import { compileTextMateGrammar } from "./textmate";
 import { copyTestData, watchTestData } from "./tests";
 import { compileView, watchView } from "./webpack";
 import { packageExtension } from "./package";
 import { injectAppInsightsKey } from "./appInsights";
 
-export const buildWithoutPackage = gulp.series(
+export const buildWithoutPackage = series(
   cleanOutput,
-  gulp.parallel(
+  parallel(
     compileTypeScript,
     compileTextMateGrammar,
     compileView,
@@ -27,7 +27,7 @@ export {
   injectAppInsightsKey,
   compileView,
 };
-export default gulp.series(
+export default series(
   buildWithoutPackage,
   injectAppInsightsKey,
   packageExtension,

extensions/ql-vscode/gulpfile.ts/package.ts

@@ -1,22 +1,22 @@
-import * as path from "path";
+import { resolve } from "path";
 import { deployPackage } from "./deploy";
-import * as childProcess from "child-process-promise";
+import { spawn } from "child-process-promise";
 
 export async function packageExtension(): Promise<void> {
-  const deployedPackage = await deployPackage(path.resolve("package.json"));
+  const deployedPackage = await deployPackage(resolve("package.json"));
   console.log(
     `Packaging extension '${deployedPackage.name}@${deployedPackage.version}'...`,
   );
   const args = [
     "package",
     "--out",
-    path.resolve(
+    resolve(
       deployedPackage.distPath,
       "..",
       `${deployedPackage.name}-${deployedPackage.version}.vsix`,
     ),
   ];
-  const proc = childProcess.spawn("./node_modules/.bin/vsce", args, {
+  const proc = spawn("./node_modules/.bin/vsce", args, {
     cwd: deployedPackage.distPath,
   });
   proc.childProcess.stdout!.on("data", (data) => {

extensions/ql-vscode/gulpfile.ts/tests.ts

@@ -1,21 +1,21 @@
-import * as gulp from "gulp";
+import { watch, src, dest } from "gulp";
 
 export function copyTestData() {
   return Promise.all([copyNoWorkspaceData(), copyCliIntegrationData()]);
 }
 
 export function watchTestData() {
-  return gulp.watch(["src/vscode-tests/*/data/**/*"], copyTestData);
+  return watch(["src/vscode-tests/*/data/**/*"], copyTestData);
 }
 
 function copyNoWorkspaceData() {
-  return gulp
-    .src("src/vscode-tests/no-workspace/data/**/*")
-    .pipe(gulp.dest("out/vscode-tests/no-workspace/data"));
+  return src("src/vscode-tests/no-workspace/data/**/*").pipe(
+    dest("out/vscode-tests/no-workspace/data"),
+  );
 }
 
 function copyCliIntegrationData() {
-  return gulp
-    .src("src/vscode-tests/cli-integration/data/**/*")
-    .pipe(gulp.dest("out/vscode-tests/cli-integration/data"));
+  return src("src/vscode-tests/cli-integration/data/**/*").pipe(
+    dest("out/vscode-tests/cli-integration/data"),
+  );
 }

extensions/ql-vscode/gulpfile.ts/textmate.ts

@@ -1,6 +1,6 @@
-import * as gulp from "gulp";
-import * as jsYaml from "js-yaml";
-import * as through from "through2";
+import { src, dest } from "gulp";
+import { load } from "js-yaml";
+import { obj } from "through2";
 import * as PluginError from "plugin-error";
 import * as Vinyl from "vinyl";
 
@@ -219,7 +219,7 @@ function transformFile(yaml: any) {
 }
 
 export function transpileTextMateGrammar() {
-  return through.obj(
+  return obj(
     (
       file: Vinyl,
       _encoding: string,
@@ -230,7 +230,7 @@ export function transpileTextMateGrammar() {
       } else if (file.isBuffer()) {
         const buf: Buffer = file.contents;
         const yamlText: string = buf.toString("utf8");
-        const jsonData: any = jsYaml.load(yamlText);
+        const jsonData: any = load(yamlText);
         transformFile(jsonData);
 
         file.contents = Buffer.from(JSON.stringify(jsonData, null, 2), "utf8");
@@ -247,8 +247,7 @@ export function transpileTextMateGrammar() {
 }
 
 export function compileTextMateGrammar() {
-  return gulp
-    .src("syntaxes/*.tmLanguage.yml")
+  return src("syntaxes/*.tmLanguage.yml")
     .pipe(transpileTextMateGrammar())
-    .pipe(gulp.dest("out/syntaxes"));
+    .pipe(dest("out/syntaxes"));
 }

extensions/ql-vscode/gulpfile.ts/typescript.ts

@@ -1,6 +1,6 @@
-import * as colors from "ansi-colors";
-import * as gulp from "gulp";
-import * as sourcemaps from "gulp-sourcemaps";
+import { gray, red } from "ansi-colors";
+import { dest, watch } from "gulp";
+import { init, write } from "gulp-sourcemaps";
 import * as ts from "gulp-typescript";
 import * as del from "del";
 
@@ -10,9 +10,9 @@ function goodReporter(): ts.reporter.Reporter {
       if (error.tsFile) {
         console.log(
           "[" +
-            colors.gray("gulp-typescript") +
+            gray("gulp-typescript") +
             "] " +
-            colors.red(
+            red(
               error.fullFilename +
                 "(" +
                 (error.startPosition!.line + 1) +
@@ -46,17 +46,17 @@ export function cleanOutput() {
 export function compileTypeScript() {
   return tsProject
     .src()
-    .pipe(sourcemaps.init())
+    .pipe(init())
     .pipe(tsProject(goodReporter()))
     .pipe(
-      sourcemaps.write(".", {
+      write(".", {
         includeContent: false,
         sourceRoot: ".",
       }),
     )
-    .pipe(gulp.dest("out"));
+    .pipe(dest("out"));
 }
 
 export function watchTypeScript() {
-  gulp.watch("src/**/*.ts", compileTypeScript);
+  watch("src/**/*.ts", compileTypeScript);
 }

extensions/ql-vscode/gulpfile.ts/webpack.config.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { resolve } from "path";
 import * as webpack from "webpack";
 import * as MiniCssExtractPlugin from "mini-css-extract-plugin";
 
@@ -8,7 +8,7 @@ export const config: webpack.Configuration = {
     webview: "./src/view/webview.tsx",
   },
   output: {
-    path: path.resolve(__dirname, "..", "out"),
+    path: resolve(__dirname, "..", "out"),
     filename: "[name].js",
   },
   devtool: "inline-source-map",

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

@@ -11,8 +11,8 @@
  * Usage: npx ts-node scripts/add-fields-to-scenarios.ts
  */
 
-import * as fs from "fs-extra";
-import * as path from "path";
+import { pathExists, readJson, writeJson } from "fs-extra";
+import { resolve, relative } from "path";
 
 import { Octokit, type RestEndpointMethodTypes } from "@octokit/rest";
 import { throttling } from "@octokit/plugin-throttling";
@@ -23,11 +23,8 @@ import { isGetVariantAnalysisRequest } from "../src/mocks/gh-api-request";
 import { VariantAnalysis } from "../src/remote-queries/gh-api/variant-analysis";
 import { RepositoryWithMetadata } from "../src/remote-queries/gh-api/repository";
 
-const extensionDirectory = path.resolve(__dirname, "..");
-const scenariosDirectory = path.resolve(
-  extensionDirectory,
-  "src/mocks/scenarios",
-);
+const extensionDirectory = resolve(__dirname, "..");
+const scenariosDirectory = resolve(extensionDirectory, "src/mocks/scenarios");
 
 // Make sure we don't run into rate limits by automatically waiting until we can
 // make another request.
@@ -84,7 +81,7 @@ async function addFieldsToRepository(repository: RepositoryWithMetadata) {
 }
 
 async function addFieldsToScenarios() {
-  if (!(await fs.pathExists(scenariosDirectory))) {
+  if (!(await pathExists(scenariosDirectory))) {
     console.error("Scenarios directory does not exist: " + scenariosDirectory);
     return;
   }
@@ -94,7 +91,7 @@ async function addFieldsToScenarios() {
       continue;
     }
 
-    const data: GitHubApiRequest = await fs.readJson(file);
+    const data: GitHubApiRequest = await readJson(file);
 
     if (!isGetVariantAnalysisRequest(data)) {
       continue;
@@ -104,9 +101,7 @@ async function addFieldsToScenarios() {
       continue;
     }
 
-    console.log(
-      `Adding fields to '${path.relative(scenariosDirectory, file)}'`,
-    );
+    console.log(`Adding fields to '${relative(scenariosDirectory, file)}'`);
 
     const variantAnalysis = data.response.body as VariantAnalysis;
 
@@ -137,7 +132,7 @@ async function addFieldsToScenarios() {
       }
     }
 
-    await fs.writeJson(file, data, { spaces: 2 });
+    await writeJson(file, data, { spaces: 2 });
   }
 }