diff --git a/lib/entry-points.js b/lib/entry-points.js index b8479554a..7f85887bb 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -181833,7 +181833,7 @@ async function getRemoteConfig(actionState, configFile, apiDetails) { ); } -// src/diff-informed-analysis-utils.ts +// src/diff-informed/index.ts var fs8 = __toESM(require("fs")); async function getDiffInformedAnalysisBranches(codeql, features, logger2) { if (!await features.getValue("diff_informed_queries" /* DiffInformedQueries */, codeql)) { diff --git a/src/analyze.ts b/src/analyze.ts index 692d2ef1d..7e32d4036 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -18,10 +18,7 @@ import { getJavaTempDependencyDir, } from "./dependency-caching"; import { addDiagnostic, makeDiagnostic } from "./diagnostics"; -import { - DiffThunkRange, - readDiffRangesJsonFile, -} from "./diff-informed-analysis-utils"; +import { type DiffThunkRange, readDiffRangesJsonFile } from "./diff-informed"; import { EnvVar } from "./environment"; import { FeatureEnablement, Feature } from "./feature-flags"; import { getGitRoot } from "./git-utils"; diff --git a/src/config-utils.ts b/src/config-utils.ts index b59149e47..33f1f3cd0 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -48,7 +48,7 @@ import { addNoLanguageDiagnostic, makeTelemetryDiagnostic, } from "./diagnostics"; -import { prepareDiffInformedAnalysis } from "./diff-informed-analysis-utils"; +import { prepareDiffInformedAnalysis } from "./diff-informed"; import { EnvVar, exportEnvVar, getEnv } from "./environment"; import * as errorMessages from "./error-messages"; import { Feature, FeatureEnablement, FeatureWithoutCLI } from "./feature-flags"; diff --git a/src/diff-informed-analysis-utils.test.ts b/src/diff-informed/index.test.ts similarity index 96% rename from src/diff-informed-analysis-utils.test.ts rename to src/diff-informed/index.test.ts index 76e5f33b4..73460dade 100644 --- a/src/diff-informed-analysis-utils.test.ts +++ b/src/diff-informed/index.test.ts @@ -1,16 +1,11 @@ import test, { ExecutionContext } from "ava"; import * as sinon from "sinon"; -import * as actionsUtil from "./actions-util"; -import type { PullRequestBranches } from "./actions-util"; -import * as apiClient from "./api-client"; -import { - getDiffInformedAnalysisBranches, - prepareDiffInformedAnalysis, - exportedForTesting, -} from "./diff-informed-analysis-utils"; -import { Feature, FeatureEnablement, initFeatures } from "./feature-flags"; -import { parseRepositoryNwo } from "./repository"; +import * as actionsUtil from "../actions-util"; +import type { PullRequestBranches } from "../actions-util"; +import * as apiClient from "../api-client"; +import { Feature, FeatureEnablement, initFeatures } from "../feature-flags"; +import { parseRepositoryNwo } from "../repository"; import { setupTests, createFeatures, @@ -19,9 +14,15 @@ import { setupActionsVars, makeMacro, RecordingLogger, -} from "./testing-utils"; -import { GitHubVariant, withTmpDir } from "./util"; -import type { GitHubVersion } from "./util"; +} from "../testing-utils"; +import { GitHubVariant, withTmpDir } from "../util"; +import type { GitHubVersion } from "../util"; + +import { + getDiffInformedAnalysisBranches, + prepareDiffInformedAnalysis, + exportedForTesting, +} from "."; setupTests(test); diff --git a/src/diff-informed-analysis-utils.ts b/src/diff-informed/index.ts similarity index 96% rename from src/diff-informed-analysis-utils.ts rename to src/diff-informed/index.ts index b8e9c6915..fb181fb15 100644 --- a/src/diff-informed-analysis-utils.ts +++ b/src/diff-informed/index.ts @@ -1,13 +1,13 @@ import * as fs from "fs"; -import * as actionsUtil from "./actions-util"; -import type { PullRequestBranches } from "./actions-util"; -import { getApiClient, getGitHubVersion } from "./api-client"; -import type { CodeQL } from "./codeql"; -import { Feature, FeatureEnablement } from "./feature-flags"; -import { Logger } from "./logging"; -import { getRepositoryNwoFromEnv } from "./repository"; -import { getErrorMessage, GitHubVariant, satisfiesGHESVersion } from "./util"; +import * as actionsUtil from "../actions-util"; +import type { PullRequestBranches } from "../actions-util"; +import { getApiClient, getGitHubVersion } from "../api-client"; +import type { CodeQL } from "../codeql"; +import { Feature, FeatureEnablement } from "../feature-flags"; +import { Logger } from "../logging"; +import { getRepositoryNwoFromEnv } from "../repository"; +import { getErrorMessage, GitHubVariant, satisfiesGHESVersion } from "../util"; /** * This interface is an abbreviated version of the file diff object returned by diff --git a/src/upload-lib.test.ts b/src/upload-lib.test.ts index 028cce504..d207c526a 100644 --- a/src/upload-lib.test.ts +++ b/src/upload-lib.test.ts @@ -9,7 +9,7 @@ import * as sinon from "sinon"; import * as analyses from "./analyses"; import { AnalysisKind, CodeQuality, CodeScanning } from "./analyses"; import * as api from "./api-client"; -import * as diffUtils from "./diff-informed-analysis-utils"; +import * as diffUtils from "./diff-informed"; import { getEnv } from "./environment"; import { Logger } from "./logging"; import * as sarif from "./sarif"; diff --git a/src/upload-lib.ts b/src/upload-lib.ts index 52f6fdba6..e9e094e29 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -13,7 +13,7 @@ import * as api from "./api-client"; import { getGitHubVersion, wrapApiConfigurationError } from "./api-client"; import { CodeQL, getCodeQL } from "./codeql"; import type { ActionConfig } from "./config/action-config"; -import { readDiffRangesJsonFile } from "./diff-informed-analysis-utils"; +import { readDiffRangesJsonFile } from "./diff-informed"; import { ActionsEnvVars, EnvVar, exportEnvVar } from "./environment"; import { FeatureEnablement } from "./feature-flags"; import * as fingerprints from "./fingerprints";