diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 261d1e3a0..82a5f003d 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -125143,7 +125143,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -125154,7 +125154,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 6bc5cbb6c..48bc7584f 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93240,7 +93240,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -93251,7 +93251,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index b688ecf8a..8e958c997 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -88344,7 +88344,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -88355,7 +88355,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/init-action-post.js b/lib/init-action-post.js index ddc895237..4be84eff4 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -129775,7 +129775,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -129786,7 +129786,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/init-action.js b/lib/init-action.js index bf6ab4865..9c3c3adce 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -91508,7 +91508,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -91519,7 +91519,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index c082c90fd..fa58d0d7e 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -88037,7 +88037,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -88048,7 +88048,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 6e207da52..5efa9440d 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -89346,7 +89346,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -89357,7 +89357,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/upload-lib.js b/lib/upload-lib.js index e4fdc40ec..861d0b782 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92062,7 +92062,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -92073,7 +92073,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 610669676..ef57cf4ab 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -92586,7 +92586,7 @@ ${output}` await runCli(cmd, codeqlArgs); } }, - async databaseBundle(databasePath, outputFilePath, databaseName, tryAlsoIncludeRelativePaths) { + async databaseBundle(databasePath, outputFilePath, databaseName, alsoIncludeRelativePaths) { const args = [ "database", "bundle", @@ -92597,7 +92597,7 @@ ${output}` ]; if (await this.supportsFeature("bundleSupportsIncludeOption" /* BundleSupportsIncludeOption */)) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath ]) diff --git a/src/codeql.ts b/src/codeql.ts index be46fa047..f70e5ffa4 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -148,7 +148,8 @@ export interface CodeQL { /** * Run 'codeql database bundle'. * - * @param tryAlsoIncludeRelativePaths Additional paths that should be included in the bundle if possible. + * @param alsoIncludeRelativePaths Additional paths that should be included in the bundle if + * supported by the version of the CodeQL CLI. * * These paths are relative to the database root. * @@ -159,7 +160,7 @@ export interface CodeQL { databasePath: string, outputFilePath: string, dbName: string, - tryAlsoIncludeRelativePaths: string[], + alsoIncludeRelativePaths: string[], ): Promise; /** * Run 'codeql database run-queries'. If no `queries` are specified, then the CLI @@ -919,7 +920,7 @@ async function getCodeQLForCmd( databasePath: string, outputFilePath: string, databaseName: string, - tryAlsoIncludeRelativePaths: string[], + alsoIncludeRelativePaths: string[], ): Promise { const args = [ "database", @@ -933,7 +934,7 @@ async function getCodeQLForCmd( await this.supportsFeature(ToolsFeature.BundleSupportsIncludeOption) ) { args.push( - ...tryAlsoIncludeRelativePaths.flatMap((relativePath) => [ + ...alsoIncludeRelativePaths.flatMap((relativePath) => [ "--include", relativePath, ]),