Merge branch 'main' into jeskew/imports

src/Bicep.Core.IntegrationTests/CompileTimeImportTests.cs

@@ -29,7 +29,7 @@ public void Compile_time_imports_are_disabled_unless_feature_is_enabled()
 
  result.Should().HaveDiagnostics(new[]
  {
- ("BCP354", DiagnosticLevel.Error, "Using compile-time import statements requires enabling EXPERIMENTAL feature \"CompileTimeImports\"."),
+ ("BCP355", DiagnosticLevel.Error, "Using compile-time import statements requires enabling EXPERIMENTAL feature \"CompileTimeImports\"."),
  });
  }
 
@@ -46,7 +46,7 @@ public void Importing_unexported_symbol_should_raise_diagnostic()
 
  result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
  {
- ("BCP357", DiagnosticLevel.Error, "The 'foo' symbol was not found in (or was not exported by) the imported template."),
+ ("BCP358", DiagnosticLevel.Error, "The 'foo' symbol was not found in (or was not exported by) the imported template."),
  });
  }
 
@@ -80,7 +80,7 @@ public void Exporting_type_property_should_raise_diagnostic()
 
  result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
  {
- ("BCP358", DiagnosticLevel.Error, "The \"@export()\" decorator must target a top-level statement.")
+ ("BCP359", DiagnosticLevel.Error, "The \"@export()\" decorator must target a top-level statement.")
  });
  }
 
@@ -102,7 +102,7 @@ param bar string
 
  result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
  {
- ("BCP356", DiagnosticLevel.Error, "A compile-time import can only reference a Bicep file, an ARM template, a registry artifact, or a template spec.")
+ ("BCP357", DiagnosticLevel.Error, "A compile-time import can only reference a Bicep file, an ARM template, a registry artifact, or a template spec.")
  });
  }
 
@@ -403,8 +403,8 @@ public void Importing_the_same_symbol_under_two_separate_names_should_raise_diag
 
  result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
  {
- ("BCP359", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."),
- ("BCP359", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."), // The same diagnostic should be raised on each import
+ ("BCP360", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."),
+ ("BCP360", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."), // The same diagnostic should be raised on each import
  });
  }
 
@@ -435,8 +435,8 @@ public void Importing_the_same_symbol_from_json_template_under_two_separate_name
 
  result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
  {
- ("BCP359", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."),
- ("BCP359", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."), // The same diagnostic should be raised on each import
+ ("BCP360", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."),
+ ("BCP360", DiagnosticLevel.Error, "This symbol is imported multiple times under the names 'foo', 'fizz'."), // The same diagnostic should be raised on each import
  });
  }
 }

src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs

@@ -1971,49 +1971,54 @@ public ErrorDiagnostic RuntimeValueNotAllowedInFunctionDeclaration(string? acces
  "BCP350",
  $"Value of type \"{valueType}\" cannot be assigned to an assert. Asserts can take values of type 'bool' only.");
 
- public ErrorDiagnostic ExpectedSymbolListOrWildcard() => new(
+ public ErrorDiagnostic FunctionOnlyValidWithDirectAssignment(string functionName) => new(
  TextSpan,
  "BCP351",
+ $"Function \"{functionName}\" is not valid at this location. It can only be used when directly assigning to a parameter.");
+
+ public ErrorDiagnostic ExpectedSymbolListOrWildcard() => new(
+ TextSpan,
+ "BCP352",
  "Expected left brace ('{') or asterisk ('*') character at this location.");
 
  public ErrorDiagnostic ExpectedExportedSymbolName() => new(
  TextSpan,
- "BCP352",
+ "BCP353",
  "Expected the name of an exported symbol at this location.");
 
  public ErrorDiagnostic ExpectedNamespaceIdentifier() => new(
  TextSpan,
- "BCP353",
+ "BCP354",
  "Expected a valid namespace identifier at this location.");
 
  public ErrorDiagnostic CompileTimeImportsNotSupported() => new(
  TextSpan,
- "BCP354",
+ "BCP355",
  $@"Using compile-time import statements requires enabling EXPERIMENTAL feature ""{nameof(ExperimentalFeaturesEnabled.CompileTimeImports)}"".");
 
  public ErrorDiagnostic PathHasNotBeenSpecified() => new(
  TextSpan,
- "BCP355",
+ "BCP356",
  "This declaration is missing a template file path reference.");
 
  public ErrorDiagnostic CompileTimeImportDeclarationMustReferenceTemplate() => new(
  TextSpan,
- "BCP356",
+ "BCP357",
  "A compile-time import can only reference a Bicep file, an ARM template, a registry artifact, or a template spec.");
 
  public ErrorDiagnostic ImportedSymbolNotFound(string symbolName) => new(
  TextSpan,
- "BCP357",
+ "BCP358",
  $"The '{symbolName}' symbol was not found in (or was not exported by) the imported template.");
 
  public ErrorDiagnostic ExportDecoratorMustTargetStatement() => new(
  TextSpan,
- "BCP358",
+ "BCP359",
  @"The ""@export()"" decorator must target a top-level statement.");
 
  public ErrorDiagnostic SymbolImportedMultipleTimes(params string[] importedAs) => new(
  TextSpan,
- "BCP359",
+ "BCP360",
  $"This symbol is imported multiple times under the names {string.Join(", ", importedAs.Select(identifier => $"'{identifier}'"))}.");
  }
 

src/Bicep.Core/Emit/TemplateWriter.cs

@@ -207,6 +207,11 @@ private static ObjectExpression ApplyTypeModifiers(TypeDeclaringExpression expre
  result = result.MergeProperty("additionalProperties", ExpressionFactory.CreateBooleanLiteral(false, @sealed.SourceSyntax));
  }
 
+ if (expression is DeclaredTypeExpression declaredTypeExpression && declaredTypeExpression.Exported is {} exported)
+ {
+ result = ApplyMetadataProperty(result, LanguageConstants.MetadataExportedPropertyName, ExpressionFactory.CreateBooleanLiteral(true, exported.SourceSyntax));
+ }
+
  foreach (var (modifier, propertyName) in new[]
  {
  (expression.Metadata, LanguageConstants.ParameterMetadataPropertyName),
@@ -215,24 +220,7 @@ private static ObjectExpression ApplyTypeModifiers(TypeDeclaringExpression expre
  (expression.MinValue, LanguageConstants.ParameterMinValuePropertyName),
  (expression.MaxValue, LanguageConstants.ParameterMaxValuePropertyName),
  }) {
- modifications.Add(new(modifier, (result, nonNullModifier) => result.MergeProperty(propertyName, nonNullModifier)));
- }
-
- modifications.Add(new(expression.Description, (result, _) => ApplyDescription(expression, result)));
-
- if (expression is DeclaredTypeExpression declaredTypeExpression)
- {
- modifications.Add(new(declaredTypeExpression.Exported, (result, exported) => ApplyMetadataProperty(result,
- LanguageConstants.MetadataExportedPropertyName,
- ExpressionFactory.CreateBooleanLiteral(true, exported.SourceSyntax))));
- }
-
- // Whether one decorator overrides another is determined by their order in the syntax tree
- // TODO should we change this?
- if (expression.SourceSyntax is DecorableSyntax decorable)
- {
- ConcurrentDictionary<TypeModification, int> modificationIndices = new();
- int GetIndex(TypeModification modification)
+ if (modifier is not null)
  {
  result = result.MergeProperty(propertyName, modifier);
  }
@@ -321,7 +309,7 @@ private void EmitTypeDeclaration(ExpressionEmitter emitter, DeclaredTypeExpressi
  declaredType.SourceSyntax);
  }
 
- private static ObjectExpression TypePropertiesForTypeExpression(TypeExpression typeExpression) => typeExpression switch
+ private ObjectExpression TypePropertiesForTypeExpression(TypeExpression typeExpression) => typeExpression switch
  {
  // references
  AmbientTypeReferenceExpression ambientTypeReference
@@ -419,7 +407,7 @@ private static ObjectExpression GetTypePropertiesForResourceType(ResourceTypeExp
  });
  }
 
- private static ObjectExpression GetTypePropertiesForArrayType(ArrayTypeExpression expression)
+ private ObjectExpression GetTypePropertiesForArrayType(ArrayTypeExpression expression)
  {
  var properties = new List<ObjectPropertyExpression> { TypeProperty(LanguageConstants.ArrayType, expression.SourceSyntax) };
 
@@ -452,7 +440,7 @@ TupleTypeExpression tuple when TypeHelper.IsLiteralType(tuple.ExpressedType) =>
  private static ArrayExpression GetAllowedValuesForUnionType(UnionType unionType, SyntaxBase? sourceSyntax)
  => ExpressionFactory.CreateArray(unionType.Members.Select(ToLiteralValue), sourceSyntax);
 
- private static ObjectExpression GetTypePropertiesForObjectType(ObjectTypeExpression expression)
+ private ObjectExpression GetTypePropertiesForObjectType(ObjectTypeExpression expression)
  {
  var properties = new List<ObjectPropertyExpression> { TypeProperty(LanguageConstants.ObjectType, expression.SourceSyntax) };
  List<ObjectPropertyExpression> propertySchemata = new();
@@ -479,7 +467,7 @@ private static ObjectExpression GetTypePropertiesForObjectType(ObjectTypeExpress
  return ExpressionFactory.CreateObject(properties, expression.SourceSyntax);
  }
 
- private static ObjectExpression GetTypePropertiesForTupleType(TupleTypeExpression expression) => ExpressionFactory.CreateObject(new[]
+ private ObjectExpression GetTypePropertiesForTupleType(TupleTypeExpression expression) => ExpressionFactory.CreateObject(new[]
  {
  TypeProperty(LanguageConstants.ArrayType, expression.SourceSyntax),
  ExpressionFactory.CreateObjectProperty("prefixItems",