Merge pull request #1141 from PowerShell/copilot/fix-ed557097-f0ff-4d88-999e-971325dd5d3b

SteveL-MSFT · web-flow · commit f3abfc162a00 · 2025-09-26T17:13:14.000-07:00
Support multiple categories for DSC functions and fix build failures
diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.rs
@@ -709,7 +709,7 @@ fn list_functions(functions: &FunctionDispatcher, function_name: Option<&String>
             };
 
             table.add_row(vec![
-                function.category.to_string(),
+                function.category.iter().map(std::string::ToString::to_string).collect::<Vec<String>>().join(", "),
                 function.name,
                 function.min_args.to_string(),
                 max_args,
diff --git a/dsc_lib/src/functions/add.rs b/dsc_lib/src/functions/add.rs
@@ -16,7 +16,7 @@ impl Function for Add {
         FunctionMetadata {
             name: "add".to_string(),
             description: t!("functions.add.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/and.rs b/dsc_lib/src/functions/and.rs
@@ -16,7 +16,7 @@ impl Function for And {
         FunctionMetadata {
             name: "and".to_string(),
             description: t!("functions.and.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 2,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/array.rs b/dsc_lib/src/functions/array.rs
@@ -16,7 +16,7 @@ impl Function for Array {
         FunctionMetadata {
             name: "array".to_string(),
             description: t!("functions.array.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/base64.rs b/dsc_lib/src/functions/base64.rs
@@ -18,7 +18,7 @@ impl Function for Base64 {
         FunctionMetadata {
             name: "base64".to_string(),
             description: t!("functions.base64.description").to_string(),
-            category: FunctionCategory::String,
+            category: vec![FunctionCategory::String],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/bool.rs b/dsc_lib/src/functions/bool.rs
@@ -16,7 +16,7 @@ impl Function for Bool {
         FunctionMetadata {
             name: "bool".to_string(),
             description: t!("functions.bool.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String, FunctionArgKind::Number]],
diff --git a/dsc_lib/src/functions/coalesce.rs b/dsc_lib/src/functions/coalesce.rs
@@ -16,7 +16,7 @@ impl Function for Coalesce {
         FunctionMetadata {
             name: "coalesce".to_string(),
             description: t!("functions.coalesce.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 1,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![vec![
diff --git a/dsc_lib/src/functions/concat.rs b/dsc_lib/src/functions/concat.rs
@@ -16,7 +16,7 @@ impl Function for Concat {
         FunctionMetadata {
             name: "concat".to_string(),
             description: t!("functions.concat.description").to_string(),
-            category: FunctionCategory::String,
+            category: vec![FunctionCategory::String, FunctionCategory::Array],
             min_args: 2,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/contains.rs b/dsc_lib/src/functions/contains.rs
@@ -16,7 +16,7 @@ impl Function for Contains {
         FunctionMetadata {
             name: "contains".to_string(),
             description: t!("functions.contains.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::String, FunctionCategory::Array],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/context.rs b/dsc_lib/src/functions/context.rs
@@ -23,7 +23,7 @@ impl Function for Context {
         FunctionMetadata {
             name: "context".to_string(),
             description: t!("functions.context.description").to_string(),
-            category: FunctionCategory::System,
+            category: vec![FunctionCategory::Deployment],
             min_args: 0,
             max_args: 0,
             accepted_arg_ordered_types: vec![],
diff --git a/dsc_lib/src/functions/copy_index.rs b/dsc_lib/src/functions/copy_index.rs
@@ -16,7 +16,7 @@ impl Function for CopyIndex {
         FunctionMetadata {
             name: "copyIndex".to_string(),
             description: t!("functions.copyIndex.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 0,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/create_array.rs b/dsc_lib/src/functions/create_array.rs
@@ -16,7 +16,7 @@ impl Function for CreateArray {
         FunctionMetadata {
             name: "createArray".to_string(),
             description: t!("functions.createArray.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array],
             min_args: 0,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![],
diff --git a/dsc_lib/src/functions/create_object.rs b/dsc_lib/src/functions/create_object.rs
@@ -16,7 +16,7 @@ impl Function for CreateObject {
         FunctionMetadata {
             name: "createObject".to_string(),
             description: t!("functions.createObject.description").to_string(),
-            category: FunctionCategory::Object,
+            category: vec![FunctionCategory::Object],
             min_args: 0,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![],
diff --git a/dsc_lib/src/functions/div.rs b/dsc_lib/src/functions/div.rs
@@ -16,7 +16,7 @@ impl Function for Div {
         FunctionMetadata {
             name: "div".to_string(),
             description: t!("functions.div.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/empty.rs b/dsc_lib/src/functions/empty.rs
@@ -16,7 +16,7 @@ impl Function for Empty {
         FunctionMetadata {
             name: "empty".to_string(),
             description: t!("functions.empty.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array, FunctionCategory::Object, FunctionCategory::String],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Array, FunctionArgKind::Object, FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/ends_with.rs b/dsc_lib/src/functions/ends_with.rs
@@ -17,7 +17,7 @@ impl Function for EndsWith {
         FunctionMetadata {
             name: "endsWith".to_string(),
             description: t!("functions.endsWith.description").to_string(),
-            category: FunctionCategory::String,
+            category: vec![FunctionCategory::String],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/envvar.rs b/dsc_lib/src/functions/envvar.rs
@@ -17,7 +17,7 @@ impl Function for Envvar {
         FunctionMetadata {
             name: "envvar".to_string(),
             description: t!("functions.envvar.description").to_string(),
-            category: FunctionCategory::System,
+            category: vec![FunctionCategory::System],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/equals.rs b/dsc_lib/src/functions/equals.rs
@@ -16,7 +16,7 @@ impl Function for Equals {
         FunctionMetadata {
             name: "equals".to_string(),
             description: t!("functions.equals.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/false.rs b/dsc_lib/src/functions/false.rs
@@ -16,7 +16,7 @@ impl Function for False {
         FunctionMetadata {
             name: "false".to_string(),
             description: t!("functions.false.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 0,
             max_args: 0,
             accepted_arg_ordered_types: vec![],
diff --git a/dsc_lib/src/functions/first.rs b/dsc_lib/src/functions/first.rs
@@ -16,7 +16,7 @@ impl Function for First {
         FunctionMetadata {
             name: "first".to_string(),
             description: t!("functions.first.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array, FunctionCategory::String],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Array, FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/format.rs b/dsc_lib/src/functions/format.rs
@@ -87,7 +87,7 @@ impl Function for Format {
         FunctionMetadata {
             name: "format".to_string(),
             description: t!("functions.format.description").to_string(),
-            category: FunctionCategory::String,
+            category: vec![FunctionCategory::String],
             min_args: 2,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/greater.rs b/dsc_lib/src/functions/greater.rs
@@ -16,7 +16,7 @@ impl Function for Greater {
         FunctionMetadata {
             name: "greater".to_string(),
             description: t!("functions.greater.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/greater_or_equals.rs b/dsc_lib/src/functions/greater_or_equals.rs
@@ -16,7 +16,7 @@ impl Function for GreaterOrEquals {
         FunctionMetadata {
             name: "greaterOrEquals".to_string(),
             description: t!("functions.greaterOrEquals.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/if.rs b/dsc_lib/src/functions/if.rs
@@ -16,7 +16,7 @@ impl Function for If {
         FunctionMetadata {
             name: "if".to_string(),
             description: t!("functions.if.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 3,
             max_args: 3,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/index_of.rs b/dsc_lib/src/functions/index_of.rs
@@ -16,7 +16,7 @@ impl Function for IndexOf {
         FunctionMetadata {
             name: "indexOf".to_string(),
             description: t!("functions.indexOf.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array, FunctionCategory::String],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/int.rs b/dsc_lib/src/functions/int.rs
@@ -17,7 +17,7 @@ impl Function for Int {
         FunctionMetadata {
             name: "int".to_string(),
             description: t!("functions.int.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String, FunctionArgKind::Number]],
diff --git a/dsc_lib/src/functions/join.rs b/dsc_lib/src/functions/join.rs
@@ -27,7 +27,7 @@ impl Function for Join {
         FunctionMetadata {
             name: "join".to_string(),
             description: t!("functions.join.description").to_string(),
-            category: FunctionCategory::String,
+            category: vec![FunctionCategory::String],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/last_index_of.rs b/dsc_lib/src/functions/last_index_of.rs
@@ -16,7 +16,7 @@ impl Function for LastIndexOf {
         FunctionMetadata {
             name: "lastIndexOf".to_string(),
             description: t!("functions.lastIndexOf.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array, FunctionCategory::String],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/length.rs b/dsc_lib/src/functions/length.rs
@@ -16,7 +16,7 @@ impl Function for Length {
         FunctionMetadata {
             name: "length".to_string(),
             description: t!("functions.length.description").to_string(),
-            category: FunctionCategory::Array,
+            category: vec![FunctionCategory::Array, FunctionCategory::Object, FunctionCategory::String],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Array, FunctionArgKind::Object, FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/less.rs b/dsc_lib/src/functions/less.rs
@@ -16,7 +16,7 @@ impl Function for Less {
         FunctionMetadata {
             name: "less".to_string(),
             description: t!("functions.less.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/less_or_equals.rs b/dsc_lib/src/functions/less_or_equals.rs
@@ -16,7 +16,7 @@ impl Function for LessOrEquals {
         FunctionMetadata {
             name: "lessOrEquals".to_string(),
             description: t!("functions.lessOrEquals.description").to_string(),
-            category: FunctionCategory::Comparison,
+            category: vec![FunctionCategory::Comparison],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/max.rs b/dsc_lib/src/functions/max.rs
@@ -16,7 +16,7 @@ impl Function for Max {
         FunctionMetadata {
             name: "max".to_string(),
             description: t!("functions.max.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 1,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Number, FunctionArgKind::Array]],
diff --git a/dsc_lib/src/functions/min.rs b/dsc_lib/src/functions/min.rs
@@ -16,7 +16,7 @@ impl Function for Min {
         FunctionMetadata {
             name: "min".to_string(),
             description: t!("functions.min.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 1,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Number, FunctionArgKind::Array]],
diff --git a/dsc_lib/src/functions/mod.rs b/dsc_lib/src/functions/mod.rs
@@ -93,7 +93,7 @@ impl Display for FunctionArgKind {
 pub struct FunctionMetadata {
     pub name: String,
     pub description: String,
-    pub category: FunctionCategory,
+    pub category: Vec<FunctionCategory>,
     pub min_args: usize,
     pub max_args: usize,
     pub accepted_arg_ordered_types: Vec<Vec<FunctionArgKind>>,
@@ -267,7 +267,7 @@ impl FunctionDispatcher {
         self.functions.iter().map(|(name, function)| {
             let metadata = function.get_metadata();
             FunctionDefinition {
-                category: metadata.category,
+                category: metadata.category.clone(),
                 name: name.clone(),
                 description: metadata.description,
                 min_args: metadata.min_args,
@@ -289,7 +289,7 @@ impl Default for FunctionDispatcher {
 #[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, JsonSchema)]
 #[serde(deny_unknown_fields)]
 pub struct FunctionDefinition {
-    pub category: FunctionCategory,
+    pub category: Vec<FunctionCategory>,
     pub name: String,
     pub description: String,
     #[serde(rename = "minArgs")]
diff --git a/dsc_lib/src/functions/mod_function.rs b/dsc_lib/src/functions/mod_function.rs
@@ -16,7 +16,7 @@ impl Function for Mod {
         FunctionMetadata {
             name: "mod".to_string(),
             description: t!("functions.mod.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/mul.rs b/dsc_lib/src/functions/mul.rs
@@ -16,7 +16,7 @@ impl Function for Mul {
         FunctionMetadata {
             name: "mul".to_string(),
             description: t!("functions.mul.description").to_string(),
-            category: FunctionCategory::Numeric,
+            category: vec![FunctionCategory::Numeric],
             min_args: 2,
             max_args: 2,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/not.rs b/dsc_lib/src/functions/not.rs
@@ -16,7 +16,7 @@ impl Function for Not {
         FunctionMetadata {
             name: "not".to_string(),
             description: t!("functions.not.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::Boolean]],
diff --git a/dsc_lib/src/functions/null.rs b/dsc_lib/src/functions/null.rs
@@ -16,7 +16,7 @@ impl Function for Null {
         FunctionMetadata {
             name: "null".to_string(),
             description: t!("functions.null.description").to_string(),
-            category: FunctionCategory::Object,
+            category: vec![FunctionCategory::Object],
             min_args: 0,
             max_args: 0,
             accepted_arg_ordered_types: vec![],
diff --git a/dsc_lib/src/functions/or.rs b/dsc_lib/src/functions/or.rs
@@ -16,7 +16,7 @@ impl Function for Or {
         FunctionMetadata {
             name: "or".to_string(),
             description: t!("functions.or.description").to_string(),
-            category: FunctionCategory::Logical,
+            category: vec![FunctionCategory::Logical],
             min_args: 2,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/parameters.rs b/dsc_lib/src/functions/parameters.rs
@@ -18,7 +18,7 @@ impl Function for Parameters {
         FunctionMetadata {
             name: "parameters".to_string(),
             description: t!("functions.parameters.description").to_string(),
-            category: FunctionCategory::Deployment,
+            category: vec![FunctionCategory::Deployment],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/path.rs b/dsc_lib/src/functions/path.rs
@@ -20,7 +20,7 @@ impl Function for Path {
         FunctionMetadata {
             name: "path".to_string(),
             description: t!("functions.path.description").to_string(),
-            category: FunctionCategory::System,
+            category: vec![FunctionCategory::String],
             min_args: 2,
             max_args: usize::MAX,
             accepted_arg_ordered_types: vec![
diff --git a/dsc_lib/src/functions/reference.rs b/dsc_lib/src/functions/reference.rs
@@ -16,7 +16,7 @@ impl Function for Reference {
         FunctionMetadata {
             name: "reference".to_string(),
             description: t!("functions.reference.description").to_string(),
-            category: FunctionCategory::Resource,
+            category: vec![FunctionCategory::Resource],
             min_args: 1,
             max_args: 1,
             accepted_arg_ordered_types: vec![vec![FunctionArgKind::String]],
diff --git a/dsc_lib/src/functions/resource_id.rs b/dsc_lib/src/functions/resource_id.rs
diff --git a/dsc_lib/src/functions/secret.rs b/dsc_lib/src/functions/secret.rs
diff --git a/dsc_lib/src/functions/skip.rs b/dsc_lib/src/functions/skip.rs
diff --git a/dsc_lib/src/functions/starts_with.rs b/dsc_lib/src/functions/starts_with.rs
diff --git a/dsc_lib/src/functions/string.rs b/dsc_lib/src/functions/string.rs
diff --git a/dsc_lib/src/functions/sub.rs b/dsc_lib/src/functions/sub.rs
diff --git a/dsc_lib/src/functions/system_root.rs b/dsc_lib/src/functions/system_root.rs
diff --git a/dsc_lib/src/functions/true.rs b/dsc_lib/src/functions/true.rs
diff --git a/dsc_lib/src/functions/union.rs b/dsc_lib/src/functions/union.rs
diff --git a/dsc_lib/src/functions/unique_string.rs b/dsc_lib/src/functions/unique_string.rs
diff --git a/dsc_lib/src/functions/utc_now.rs b/dsc_lib/src/functions/utc_now.rs
diff --git a/dsc_lib/src/functions/variables.rs b/dsc_lib/src/functions/variables.rs
