Merge branch 'main' into Issue3632

Author: timotheeguerin

.chronus/changes/deprecate-get-asset-emitter-2024-5-4-16-18-29.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/compiler"
+---
+
+Deprecate getAssetEmitter and recommend calling `createAssetEmitter` directly

.chronus/changes/deprecate-get-asset-emitter-2024-5-4-16-38-47.md

@@ -0,0 +1,9 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/json-schema"
+  - "@typespec/openapi3"
+---
+
+Fix issue that could result in invalid document generation when running `tsp compile` from another directory

docs/extending-typespec/create-decorators.md

@@ -81,7 +81,7 @@ Decorators can be implemented in JavaScript by prefixing the function name with
 // model.ts
 import type { DecoratorContext, Type } from "@typespec/compiler";
 
-export function $logType(context: DecoratorContext, target: Type, name: valueof string) {
+export function $logType(context: DecoratorContext, target: Type, name: string) {
   console.log(name + ": " + targetType.kind);
 }
 ```

packages/compiler/src/core/types.ts

@@ -2639,6 +2639,8 @@ export interface EmitContext<TOptions extends object = Record<string, never>> {
   /**
    * Get an asset emitter to write emitted output to disk using a TypeEmitter
    *
+   * @deprecated call {@link createAssetEmitter} directly instead.
+   *
    * @param TypeEmitterClass The TypeEmitter to construct your emitted output
    */
   getAssetEmitter<T>(TypeEmitterClass: typeof TypeEmitter<T, TOptions>): AssetEmitter<T, TOptions>;

packages/http-client-csharp/generator/Microsoft.Generator.CSharp.ClientModel/src/Providers/ClientPipelineExtensionsProvider.cs

@@ -17,10 +17,6 @@ namespace Microsoft.Generator.CSharp.ClientModel.Providers
 {
     internal class ClientPipelineExtensionsProvider : TypeProvider
     {
-        private static readonly Lazy<ClientPipelineExtensionsProvider> _instance = new(() => new ClientPipelineExtensionsProvider());
-
-        public static ClientPipelineExtensionsProvider Instance => _instance.Value;
-
         private const string _processMessageAsync = "ProcessMessageAsync";
         private const string _processMessage = "ProcessMessage";
         private const string _processHeadAsBoolMessageAsync = "ProcessHeadAsBoolMessageAsync";

packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Expressions/CatchExpression.cs

@@ -14,11 +14,13 @@ internal override void Write(CodeWriter writer)
             {
                 writer.AppendRaw(" (");
                 Exception.Write(writer);
-                writer.AppendRaw(")");
+                writer.WriteRawLine(")");
+            }
+
+            using (writer.Scope())
+            {
+                Body.Write(writer);
             }
-            writer.WriteRawLine("{");
-            Body.Write(writer);
-            writer.WriteRawLine("}");
         }
     }
 }

packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Statements/TryCatchFinallyStatement.cs

@@ -31,9 +31,10 @@ public TryCatchFinallyStatement(MethodBodyStatement Try, CatchExpression Catch,
         internal override void Write(CodeWriter writer)
         {
             writer.WriteRawLine("try");
-            writer.WriteRawLine("{");
-            Try.Write(writer);
-            writer.WriteRawLine("}");
+            using (writer.Scope())
+            {
+                Try.Write(writer);
+            }
 
             foreach (var catchStatement in Catches)
             {
@@ -43,9 +44,10 @@ internal override void Write(CodeWriter writer)
             if (Finally != null)
             {
                 writer.WriteRawLine("finally");
-                writer.WriteRawLine("{");
-                Finally.Write(writer);
-                writer.WriteRawLine("}");
+                using (writer.Scope())
+                {
+                    Finally.Write(writer);
+                }
             }
         }
     }

packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Statements/StatementTests.cs

@@ -359,17 +359,39 @@ public void TryCatchFinallyStatementWithTryCatchAndFinally()
         public void TryCatchFinallyStatementWithMultipleCatches()
         {
             var tryStatement = new MethodBodyStatement();
+            var var1 = new DeclarationExpression(typeof(UnauthorizedAccessException), "ex1");
+            var var2 = new DeclarationExpression(typeof(Exception), "ex2");
             var catchStatements = new[]
             {
-                new CatchExpression(null, new MethodBodyStatement()),
-                new CatchExpression(null, new MethodBodyStatement())
+                new CatchExpression(var1, new MethodBodyStatement()),
+                new CatchExpression(var2, new MethodBodyStatement())
             };
             var finallyStatement = new MethodBodyStatement();
             var tryCatchFinally = new TryCatchFinallyStatement(tryStatement, catchStatements, finallyStatement);
 
             Assert.AreEqual(tryStatement, tryCatchFinally.Try);
             CollectionAssert.AreEqual(catchStatements, tryCatchFinally.Catches);
             Assert.AreEqual(finallyStatement, tryCatchFinally.Finally);
+
+            var mockTypeProvider = new Mock<TypeProvider>();
+
+            // Create a method declaration statement
+            var method = new MethodProvider(
+                new MethodSignature(
+                    Name: "Foo",
+                    Modifiers: MethodSignatureModifiers.Public,
+                    ReturnType: new CSharpType(typeof(bool)),
+                    Parameters: [],
+                    Description: null, ReturnDescription: null),
+                new MethodBodyStatement[] { tryCatchFinally },
+                mockTypeProvider.Object);
+
+            // Verify the expected behavior
+            using var writer = new CodeWriter();
+            writer.WriteMethod(method);
+            var expectedResult = Helpers.GetExpectedFromFile();
+            var test = writer.ToString(false);
+            Assert.AreEqual(expectedResult, test);
         }
 
         [Test]

packages/http-client-csharp/generator/Microsoft.Generator.CSharp/test/Statements/TestData/StatementTests/TryCatchFinallyStatementWithMultipleCatches.cs

@@ -0,0 +1,15 @@
+public bool Foo()
+{
+    try
+    {
+    }
+    catch (global::System.UnauthorizedAccessException ex1)
+    {
+    }
+    catch (global::System.Exception ex2)
+    {
+    }
+    finally
+    {
+    }
+}

packages/json-schema/src/index.ts

@@ -14,6 +14,7 @@ import {
   setTypeSpecNamespace,
   typespecTypeToJson,
 } from "@typespec/compiler";
+import { createAssetEmitter } from "@typespec/compiler/emitter-framework";
 import { ValidatesRawJsonDecorator } from "../generated-defs/TypeSpec.JsonSchema.Private.js";
 import {
   BaseUriDecorator,
@@ -45,7 +46,7 @@ export type JsonSchemaDeclaration = Model | Union | Enum | Scalar;
 const jsonSchemaKey = createStateSymbol("JsonSchema");
 
 export async function $onEmit(context: EmitContext<JSONSchemaEmitterOptions>) {
-  const emitter = context.getAssetEmitter(JsonSchemaEmitter);
+  const emitter = createAssetEmitter(context.program, JsonSchemaEmitter as any, context);
 
   if (emitter.getOptions().emitAllModels) {
     emitter.emitProgram({ emitTypeSpecNamespace: false });

packages/openapi3/src/openapi.ts

@@ -301,12 +301,14 @@ function createOAPIEmitter(
       service.type,
       options.omitUnreachableTypes
     );
-    schemaEmitter = context.getAssetEmitter(
+    schemaEmitter = createAssetEmitter(
+      program,
       class extends OpenAPI3SchemaEmitter {
         constructor(emitter: AssetEmitter<Record<string, any>, OpenAPI3EmitterOptions>) {
           super(emitter, metadataInfo, visibilityUsage, options);
         }
-      } as any
+      } as any,
+      context
     );
 
     const securitySchemes = getOpenAPISecuritySchemes(allHttpAuthentications);

packages/website/static/1ds-init.js

@@ -81,7 +81,7 @@ Decorators can be implemented in JavaScript by prefixing the function name with
 // model.ts
 import type { DecoratorContext, Type } from "@typespec/compiler";
 
-export function $logType(context: DecoratorContext, target: Type, name: valueof string) {
+export function $logType(context: DecoratorContext, target: Type, name: string) {
   console.log(name + ": " + targetType.kind);
 }
 ```