Move createTimestampFile out of helpers

extensions/ql-vscode/src/helpers.ts

@@ -1,4 +1,4 @@
-import { ensureDir, ensureDirSync, writeFile } from "fs-extra";
+import { ensureDirSync } from "fs-extra";
 import { join } from "path";
 import { dirSync } from "tmp-promise";
 import { extLogger } from "./common";
@@ -23,16 +23,3 @@ export const tmpDirDisposal = {
     }
   },
 };
-
-/**
- * Creates a file in the query directory that indicates when this query was created.
- * This is important for keeping track of when queries should be removed.
- *
- * @param queryPath The directory that will contain all files relevant to a query result.
- * It does not need to exist.
- */
-export async function createTimestampFile(storagePath: string) {
-  const timestampPath = join(storagePath, "timestamp");
-  await ensureDir(storagePath);
-  await writeFile(timestampPath, Date.now().toString(), "utf8");
-}

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -16,7 +16,6 @@ import { extLogger, TeeLogger } from "../common";
 import { isCanary, MAX_QUERIES } from "../config";
 import { gatherQlFiles } from "../pure/files";
 import { basename } from "path";
-import { createTimestampFile } from "../helpers";
 import { showBinaryChoiceDialog } from "../common/vscode/dialog";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
 import { displayQuickQuery } from "./quick-query";
@@ -27,6 +26,7 @@ import { ResultsView } from "./results-view";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import {
   createInitialQueryInfo,
+  createTimestampFile,
   getQuickEvalContext,
   promptUserToSaveChanges,
   QueryOutputDir,

extensions/ql-vscode/src/run-queries-shared.ts

@@ -2,7 +2,6 @@ import * as messages from "./pure/messages-shared";
 import * as legacyMessages from "./pure/legacy-messages";
 import { DatabaseInfo, QueryMetadata } from "./pure/interface-types";
 import { join, parse, dirname, basename } from "path";
-import { createTimestampFile } from "./helpers";
 import {
   ConfigurationTarget,
   Range,
@@ -19,6 +18,8 @@ import {
   createWriteStream,
   remove,
   readdir,
+  ensureDir,
+  writeFile,
 } from "fs-extra";
 import { ensureMetadataIsComplete, InitialQueryInfo } from "./query-results";
 import { isQuickQueryPath } from "./local-queries";
@@ -160,14 +161,6 @@ export class QueryEvaluationInfo extends QueryOutputDir {
     return join(this.querySaveDir, `sortedResults-${resultSetName}.bqrs`);
   }
 
-  /**
-   * Creates a file in the query directory that indicates when this query was created.
-   * This is important for keeping track of when queries should be removed.
-   */
-  async createTimestampFile() {
-    await createTimestampFile(this.querySaveDir);
-  }
-
   /**
    * Holds if this query can in principle produce interpreted results.
    */
@@ -693,3 +686,16 @@ export async function logEndSummary(
     );
   }
 }
+
+/**
+ * Creates a file in the query directory that indicates when this query was created.
+ * This is important for keeping track of when queries should be removed.
+ *
+ * @param storagePath The directory that will contain all files relevant to a query result.
+ * It does not need to exist.
+ */
+export async function createTimestampFile(storagePath: string) {
+  const timestampPath = join(storagePath, "timestamp");
+  await ensureDir(storagePath);
+  await writeFile(timestampPath, Date.now().toString(), "utf8");
+}

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -43,7 +43,7 @@ import {
   processVariantAnalysisRepositoryTask,
 } from "./variant-analysis-processor";
 import PQueue from "p-queue";
-import { createTimestampFile } from "../helpers";
+import { createTimestampFile } from "../run-queries-shared";
 import { readFile, remove, pathExists } from "fs-extra";
 import { EOL } from "os";
 import { cancelVariantAnalysis } from "./gh-api/gh-actions-api-client";

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts

@@ -33,7 +33,7 @@ import {
   createMockScannedRepo,
   createMockScannedRepos,
 } from "../../../factories/variant-analysis/shared/scanned-repositories";
-import { createTimestampFile } from "../../../../src/helpers";
+import { createTimestampFile } from "../../../../src/run-queries-shared";
 import { createMockVariantAnalysisRepoTask } from "../../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
 import { VariantAnalysisRepoTask } from "../../../../src/variant-analysis/gh-api/variant-analysis";
 import { SortKey } from "../../../../src/pure/variant-analysis-filter-sort";