Bump core from edf272d to 72d544c

.chronus/changes/dependabot-submodules-core-72d544c-2024-6-31-8-54-14.md

@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-autorest"
+---
+
+Add support for encoding numeric types as string

.chronus/changes/dependabot-submodules-core-72d544c-2024-6-31-8-54-18.md

@@ -0,0 +1,6 @@
+---
+changeKind: internal
+packages:
+  - "@azure-tools/typespec-azure-core"
+---
+

packages/typespec-autorest/src/openapi.ts

@@ -2180,12 +2180,12 @@ export async function getOpenAPIForService(
   }
   function mergeFormatAndEncoding(
     format: string | undefined,
-    encoding: string,
+    encoding: string | undefined,
     encodeAsFormat: string | undefined
-  ): string {
+  ): string | undefined {
     switch (format) {
       case undefined:
-        return encodeAsFormat ?? encoding;
+        return encodeAsFormat ?? encoding ?? format;
       case "date-time":
         switch (encoding) {
           case "rfc3339":
@@ -2205,7 +2205,7 @@ export async function getOpenAPIForService(
             return encodeAsFormat ?? encoding;
         }
       default:
-        return encodeAsFormat ?? encoding;
+        return encodeAsFormat ?? encoding ?? format;
     }
   }
 

packages/typespec-autorest/test/primitive-types.test.ts

@@ -221,11 +221,16 @@ describe("typespec-autorest: primitives", () => {
     async function testEncode(
       scalar: string,
       expectedOpenApi: OpenAPI2Schema,
-      encoding?: string,
+      encoding?: string | null,
       encodeAs?: string
     ) {
       const encodeAsParam = encodeAs ? `, ${encodeAs}` : "";
-      const encodeDecorator = encoding ? `@encode("${encoding}"${encodeAsParam})` : "";
+      const encodeDecorator =
+        encoding === null
+          ? `@encode(${encodeAs})`
+          : encoding !== undefined
+            ? `@encode("${encoding}"${encodeAsParam})`
+            : "";
       const res1 = await oapiForModel("s", `${encodeDecorator} scalar s extends ${scalar};`);
       deepStrictEqual(res1.defs.s, expectedOpenApi);
       const res2 = await oapiForModel("Test", `model Test {${encodeDecorator} prop: ${scalar}};`);
@@ -287,5 +292,19 @@ describe("typespec-autorest: primitives", () => {
       it("set format to base64url when encoding bytes as base64url", () =>
         testEncode("bytes", { type: "string", format: "base64url" }, "base64url"));
     });
+
+    describe("int64", () => {
+      it("set type: integer and format to 'int64' by default", () =>
+        testEncode("int64", { type: "integer", format: "int64" }));
+      it("set type: string and format to int64 when @encode(string)", () =>
+        testEncode("int64", { type: "string", format: "int64" }, null, "string"));
+    });
+
+    describe("decimal128", () => {
+      it("set type: integer and format to 'int64' by default", () =>
+        testEncode("decimal128", { type: "number", format: "decimal" }));
+      it("set type: string and format to int64 when @encode(string)", () =>
+        testEncode("decimal128", { type: "string", format: "decimal" }, null, "string"));
+    });
   });
 });

packages/typespec-azure-core/src/rules/known-encoding.ts

@@ -22,7 +22,7 @@ export const knownEncodingRule = createRule({
   create(context) {
     function checkEncoding(type: ModelProperty | Scalar) {
       const encode = getEncode(context.program, type);
-      if (encode) {
+      if (encode && encode.encoding) {
         if (!knownEncodings.has(encode.encoding)) {
           context.reportDiagnostic({
             format: {

packages/typespec-client-generator-core/test/types/general-decorators-list.test.ts

@@ -75,9 +75,9 @@ describe("typespec-client-generator-core: general decorators list", () => {
     strictEqual(models.length, 1);
     strictEqual(models[0].properties[0].decorators[0].name, "TypeSpec.@encode");
     const encodeInfo = models[0].properties[0].decorators[0].arguments[
-      "encoding"
+      "encodingOrEncodeAs"
     ] as SdkEnumValueType;
-    strictEqual(encodeInfo.value, "base64url");
+    strictEqual((encodeInfo.value as any).value, "base64url");
     expectDiagnostics(runner.context.diagnostics, []);
   });