Refactor combining queries into its own function

Author: mbg

lib/init-action.js

@@ -361,23 +361,42 @@ function parseQueriesFromInput(
   return trimmedInput.split(",").map((query) => ({ uses: query.trim() }));
 }
 
-export function generateCodeScanningConfig(
-  originalUserInput: UserConfig,
+/**
+ * Combines queries from various configuration sources.
+ *
+ * @param augmentedConfig The loaded configuration file (either `config-file` or `config` input).
+ * @param augmentationProperties Additional configuration data from other sources.
+ * @returns Returns `augmentedConfig` with `queries` set to the computed array of queries.
+ */
+function combineQueries(
+  augmentedConfig: UserConfig,
   augmentationProperties: AugmentationProperties,
-): UserConfig {
-  // make a copy so we can modify it
-  const augmentedConfig = cloneObject(originalUserInput);
-
-  // Inject the queries from the input
+): QuerySpec[] | undefined {
   if (augmentationProperties.queriesInput) {
     if (augmentationProperties.queriesInputCombines) {
-      augmentedConfig.queries = (augmentedConfig.queries || []).concat(
+      return (augmentedConfig.queries || []).concat(
         augmentationProperties.queriesInput,
       );
     } else {
-      augmentedConfig.queries = augmentationProperties.queriesInput;
+      return augmentationProperties.queriesInput;
     }
   }
+
+  return augmentedConfig.queries;
+}
+
+export function generateCodeScanningConfig(
+  originalUserInput: UserConfig,
+  augmentationProperties: AugmentationProperties,
+): UserConfig {
+  // make a copy so we can modify it
+  const augmentedConfig = cloneObject(originalUserInput);
+
+  // Inject the queries from the input
+  augmentedConfig.queries = combineQueries(
+    augmentedConfig,
+    augmentationProperties,
+  );
   if (augmentedConfig.queries?.length === 0) {
     delete augmentedConfig.queries;
   }