Merge branch 'main' into language_parsing

lib/codeql.js

@@ -225,6 +225,7 @@ function getCodeQLForCmd(cmd) {
                 'trace-command',
                 databasePath,
                 ...compilerSpecArg,
+                ...getExtraOptionsFromEnv(['database', 'trace-command']),
                 process.execPath,
                 path.resolve(__dirname, 'tracer-env.js'),
                 envFile
@@ -238,6 +239,7 @@ function getCodeQLForCmd(cmd) {
                 databasePath,
                 '--language=' + language,
                 '--source-root=' + sourceRoot,
+                ...getExtraOptionsFromEnv(['database', 'init']),
             ]);
         },
         runAutobuild: async function (language) {
@@ -259,7 +261,8 @@ function getCodeQLForCmd(cmd) {
                 'resolve',
                 'extractor',
                 '--format=json',
-                '--language=' + language
+                '--language=' + language,
+                ...getExtraOptionsFromEnv(['resolve', 'extractor']),
             ], {
                 silent: true,
                 listeners: {
@@ -274,6 +277,7 @@ function getCodeQLForCmd(cmd) {
             await exec.exec(cmd, [
                 'database',
                 'trace-command',
+                ...getExtraOptionsFromEnv(['database', 'trace-command']),
                 databasePath,
                 '--',
                 traceCommand
@@ -283,6 +287,7 @@ function getCodeQLForCmd(cmd) {
             await exec.exec(cmd, [
                 'database',
                 'finalize',
+                ...getExtraOptionsFromEnv(['database', 'finalize']),
                 databasePath
             ]);
         },
@@ -291,7 +296,8 @@ function getCodeQLForCmd(cmd) {
                 'resolve',
                 'queries',
                 ...queries,
-                '--format=bylanguage'
+                '--format=bylanguage',
+                ...getExtraOptionsFromEnv(['resolve', 'queries'])
             ];
             if (extraSearchPath !== undefined) {
                 codeqlArgs.push('--search-path', extraSearchPath);
@@ -316,9 +322,54 @@ function getCodeQLForCmd(cmd) {
                 '--format=sarif-latest',
                 '--output=' + sarifFile,
                 '--no-sarif-add-snippets',
+                ...getExtraOptionsFromEnv(['database', 'analyze']),
                 querySuite
             ]);
         }
     };
 }
+/**
+ * Gets the options for `path` of `options` as an array of extra option strings.
+ */
+function getExtraOptionsFromEnv(path) {
+    let options = util.getExtraOptionsEnvParam();
+    return getExtraOptions(options, path, []);
+}
+/**
+ * Gets the options for `path` of `options` as an array of extra option strings.
+ *
+ * - the special terminal step name '*' in `options` matches all path steps
+ * - throws an exception if this conversion is impossible.
+ */
+function getExtraOptions(options, path, pathInfo) {
+    var _a, _b, _c;
+    /**
+     * Gets `options` as an array of extra option strings.
+     *
+     * - throws an exception mentioning `pathInfo` if this conversion is impossible.
+     */
+    function asExtraOptions(options, pathInfo) {
+        if (options === undefined) {
+            return [];
+        }
+        if (!Array.isArray(options)) {
+            const msg = `The extra options for '${pathInfo.join('.')}' ('${JSON.stringify(options)}') are not in an array.`;
+            throw new Error(msg);
+        }
+        return options.map(o => {
+            const t = typeof o;
+            if (t !== 'string' && t !== 'number' && t !== 'boolean') {
+                const msg = `The extra option for '${pathInfo.join('.')}' ('${JSON.stringify(o)}') is not a primitive value.`;
+                throw new Error(msg);
+            }
+            return o + '';
+        });
+    }
+    let all = asExtraOptions((_a = options) === null || _a === void 0 ? void 0 : _a['*'], pathInfo.concat('*'));
+    let specific = path.length === 0 ?
+        asExtraOptions(options, pathInfo) :
+        getExtraOptions((_b = options) === null || _b === void 0 ? void 0 : _b[path[0]], (_c = path) === null || _c === void 0 ? void 0 : _c.slice(1), pathInfo.concat(path[0]));
+    return all.concat(specific);
+}
+exports.getExtraOptions = getExtraOptions;
 //# sourceMappingURL=codeql.js.map